From aa3729ea4c0849613509d4fc770d570d9eb57df7 Mon Sep 17 00:00:00 2001 From: Sergei Lissianoi <54454955+selissia@users.noreply.github.com> Date: Fri, 27 Oct 2023 12:15:17 -0400 Subject: [PATCH 01/41] Disable Extended Discovery in Silabs apps (#30059) --- examples/chef/silabs/include/CHIPProjectConfig.h | 2 -- examples/light-switch-app/silabs/include/CHIPProjectConfig.h | 2 -- examples/lighting-app/silabs/include/CHIPProjectConfig.h | 2 -- examples/lock-app/silabs/include/CHIPProjectConfig.h | 2 -- examples/pump-app/silabs/include/CHIPProjectConfig.h | 2 -- examples/smoke-co-alarm-app/silabs/include/CHIPProjectConfig.h | 2 -- examples/thermostat/silabs/include/CHIPProjectConfig.h | 2 -- examples/window-app/silabs/include/CHIPProjectConfig.h | 2 -- 8 files changed, 16 deletions(-) diff --git a/examples/chef/silabs/include/CHIPProjectConfig.h b/examples/chef/silabs/include/CHIPProjectConfig.h index 75c8d194f8f319..3d58f864782be3 100644 --- a/examples/chef/silabs/include/CHIPProjectConfig.h +++ b/examples/chef/silabs/include/CHIPProjectConfig.h @@ -120,5 +120,3 @@ * */ #define CHIP_CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL (2000_ms32) - -#define CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY 1 diff --git a/examples/light-switch-app/silabs/include/CHIPProjectConfig.h b/examples/light-switch-app/silabs/include/CHIPProjectConfig.h index 3141defe9c5133..59aa54b25a0eb1 100644 --- a/examples/light-switch-app/silabs/include/CHIPProjectConfig.h +++ b/examples/light-switch-app/silabs/include/CHIPProjectConfig.h @@ -100,5 +100,3 @@ * */ #define CHIP_CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL (2000_ms32) - -#define CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY 1 diff --git a/examples/lighting-app/silabs/include/CHIPProjectConfig.h b/examples/lighting-app/silabs/include/CHIPProjectConfig.h index 00df921596102a..fc137c8d61d7d9 100644 --- a/examples/lighting-app/silabs/include/CHIPProjectConfig.h +++ b/examples/lighting-app/silabs/include/CHIPProjectConfig.h @@ -100,5 +100,3 @@ * */ #define CHIP_CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL (2000_ms32) - -#define CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY 1 diff --git a/examples/lock-app/silabs/include/CHIPProjectConfig.h b/examples/lock-app/silabs/include/CHIPProjectConfig.h index ae0cbaf1b3ac68..87d7485558c659 100644 --- a/examples/lock-app/silabs/include/CHIPProjectConfig.h +++ b/examples/lock-app/silabs/include/CHIPProjectConfig.h @@ -100,5 +100,3 @@ * */ #define CHIP_CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL (2000_ms32) - -#define CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY 1 diff --git a/examples/pump-app/silabs/include/CHIPProjectConfig.h b/examples/pump-app/silabs/include/CHIPProjectConfig.h index 00df921596102a..fc137c8d61d7d9 100644 --- a/examples/pump-app/silabs/include/CHIPProjectConfig.h +++ b/examples/pump-app/silabs/include/CHIPProjectConfig.h @@ -100,5 +100,3 @@ * */ #define CHIP_CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL (2000_ms32) - -#define CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY 1 diff --git a/examples/smoke-co-alarm-app/silabs/include/CHIPProjectConfig.h b/examples/smoke-co-alarm-app/silabs/include/CHIPProjectConfig.h index 692a486448d6c7..4d5f7f1a9807b9 100644 --- a/examples/smoke-co-alarm-app/silabs/include/CHIPProjectConfig.h +++ b/examples/smoke-co-alarm-app/silabs/include/CHIPProjectConfig.h @@ -98,5 +98,3 @@ * */ #define CHIP_CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL (2000_ms32) - -#define CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY 1 diff --git a/examples/thermostat/silabs/include/CHIPProjectConfig.h b/examples/thermostat/silabs/include/CHIPProjectConfig.h index 614361fb34e9f5..2e2f08628fa609 100644 --- a/examples/thermostat/silabs/include/CHIPProjectConfig.h +++ b/examples/thermostat/silabs/include/CHIPProjectConfig.h @@ -108,5 +108,3 @@ * */ #define CHIP_CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL (2000_ms32) - -#define CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY 1 diff --git a/examples/window-app/silabs/include/CHIPProjectConfig.h b/examples/window-app/silabs/include/CHIPProjectConfig.h index f1a69277f06079..2ee5e8735b2192 100644 --- a/examples/window-app/silabs/include/CHIPProjectConfig.h +++ b/examples/window-app/silabs/include/CHIPProjectConfig.h @@ -129,5 +129,3 @@ * */ #define CHIP_CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL (2000_ms32) - -#define CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY 1 From 367c28e1dd6b989d0f7e34c2e92b1b09cec12ff8 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Fri, 27 Oct 2023 12:51:25 -0400 Subject: [PATCH 02/41] Fix memory leak in UnauthenticatedSessionTable. (#30025) UnauthenticatedSessionTable essentially assumed that non-heap pools were used and was: 1) Never releasing its entries back to the pool. 2) Assuming that the pool would fill up and then its "reuse already allocated entry with zero refcount" code would kick in. Since heap pools never fill up, this meant that every single UnauthenticatedSession allocated was leaked. And we had a helpful "release them all on destruction" to cover up the leak at shutdown and prevent leak tools from finding it. This fix: * Preserves existing behavior for non-heap pools. * Switches to releasing UnauthenticatedSessions back to the pool in the heap case. --- src/transport/UnauthenticatedSessionTable.h | 105 +++++++++++++++++--- 1 file changed, 91 insertions(+), 14 deletions(-) diff --git a/src/transport/UnauthenticatedSessionTable.h b/src/transport/UnauthenticatedSessionTable.h index 29193bc0c4060f..1a698db312d52e 100644 --- a/src/transport/UnauthenticatedSessionTable.h +++ b/src/transport/UnauthenticatedSessionTable.h @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -34,8 +35,7 @@ namespace Transport { * @brief * An UnauthenticatedSession stores the binding of TransportAddress, and message counters. */ -class UnauthenticatedSession : public Session, - public ReferenceCounted, 0> +class UnauthenticatedSession : public Session, public ReferenceCounted { public: enum class SessionRole @@ -44,6 +44,7 @@ class UnauthenticatedSession : public Session, kResponder, }; +protected: UnauthenticatedSession(SessionRole sessionRole, NodeId ephemeralInitiatorNodeID, const ReliableMessageProtocolConfig & config) : mEphemeralInitiatorNodeId(ephemeralInitiatorNodeID), mSessionRole(sessionRole), mLastActivityTime(System::SystemClock().GetMonotonicTimestamp()), @@ -52,6 +53,7 @@ class UnauthenticatedSession : public Session, {} ~UnauthenticatedSession() override { VerifyOrDie(GetReferenceCount() == 0); } +public: UnauthenticatedSession(const UnauthenticatedSession &) = delete; UnauthenticatedSession & operator=(const UnauthenticatedSession &) = delete; UnauthenticatedSession(UnauthenticatedSession &&) = delete; @@ -68,8 +70,8 @@ class UnauthenticatedSession : public Session, Session::SessionType GetSessionType() const override { return Session::SessionType::kUnauthenticated; } - void Retain() override { ReferenceCounted, 0>::Retain(); } - void Release() override { ReferenceCounted, 0>::Release(); } + void Retain() override { ReferenceCounted::Retain(); } + void Release() override { ReferenceCounted::Release(); } bool IsActiveSession() const override { return true; } @@ -132,6 +134,23 @@ class UnauthenticatedSession : public Session, PeerMessageCounter & GetPeerMessageCounter() { return mPeerMessageCounter; } + static void Release(UnauthenticatedSession * obj) + { + // When using heap pools, we need to make sure to release ourselves back to + // the pool. When not using heap pools, we don't want the extra cost of the + // table pointer here, and the table itself handles entry reuse and cleanup + // as needed. +#if CHIP_SYSTEM_CONFIG_POOL_USE_HEAP + obj->ReleaseSelfToPool(); +#else + // Just do nothing. +#endif // CHIP_SYSTEM_CONFIG_POOL_USE_HEAP + } + +#if CHIP_SYSTEM_CONFIG_POOL_USE_HEAP + virtual void ReleaseSelfToPool() = 0; +#endif // CHIP_SYSTEM_CONFIG_POOL_USE_HEAP + private: const NodeId mEphemeralInitiatorNodeId; const SessionRole mSessionRole; @@ -142,6 +161,35 @@ class UnauthenticatedSession : public Session, PeerMessageCounter mPeerMessageCounter; }; +template +class UnauthenticatedSessionTable; + +namespace detail { + +template +class UnauthenticatedSessionPoolEntry : public UnauthenticatedSession +{ +public: + UnauthenticatedSessionPoolEntry(SessionRole sessionRole, NodeId ephemeralInitiatorNodeID, + const ReliableMessageProtocolConfig & config, + UnauthenticatedSessionTable & sessionTable) : + UnauthenticatedSession(sessionRole, ephemeralInitiatorNodeID, config) +#if CHIP_SYSTEM_CONFIG_POOL_USE_HEAP + , + mSessionTable(sessionTable) +#endif // CHIP_SYSTEM_CONFIG_POOL_USE_HEAP + {} + +private: +#if CHIP_SYSTEM_CONFIG_POOL_USE_HEAP + virtual void ReleaseSelfToPool(); + + UnauthenticatedSessionTable & mSessionTable; +#endif // CHIP_SYSTEM_CONFIG_POOL_USE_HEAP +}; + +} // namespace detail + /* * @brief * An table which manages UnauthenticatedSessions @@ -153,7 +201,17 @@ template class UnauthenticatedSessionTable { public: - ~UnauthenticatedSessionTable() { mEntries.ReleaseAll(); } + ~UnauthenticatedSessionTable() + { +#if !CHIP_SYSTEM_CONFIG_POOL_USE_HEAP + // When not using heap pools, our entries never actually get released + // back to the pool (which lets us make the entries 4 bytes smaller by + // not storing a reference to the table in them) and we LRU reuse ones + // that have 0 refcount. But we should release them all here, to ensure + // that we don't hit fatal asserts in our pool destructor. + mEntries.ReleaseAll(); +#endif // CHIP_SYSTEM_CONFIG_POOL_USE_HEAP + } /** * Get a responder session with the given ephemeralInitiatorNodeID. If the session doesn't exist in the cache, allocate a new @@ -203,6 +261,9 @@ class UnauthenticatedSessionTable } private: + using EntryType = detail::UnauthenticatedSessionPoolEntry; + friend EntryType; + /** * Allocates a new session out of the internal resource pool. * @@ -213,17 +274,23 @@ class UnauthenticatedSessionTable CHIP_ERROR AllocEntry(UnauthenticatedSession::SessionRole sessionRole, NodeId ephemeralInitiatorNodeID, const ReliableMessageProtocolConfig & config, UnauthenticatedSession *& entry) { - entry = mEntries.CreateObject(sessionRole, ephemeralInitiatorNodeID, config); - if (entry != nullptr) + auto entryToUse = mEntries.CreateObject(sessionRole, ephemeralInitiatorNodeID, config, *this); + if (entryToUse != nullptr) + { + entry = entryToUse; return CHIP_NO_ERROR; + } - entry = FindLeastRecentUsedEntry(); - if (entry == nullptr) +#if !CHIP_SYSTEM_CONFIG_POOL_USE_HEAP + entryToUse = FindLeastRecentUsedEntry(); +#endif // CHIP_SYSTEM_CONFIG_POOL_USE_HEAP + if (entryToUse == nullptr) { return CHIP_ERROR_NO_MEMORY; } - mEntries.ResetObject(entry, sessionRole, ephemeralInitiatorNodeID, config); + mEntries.ResetObject(entryToUse, sessionRole, ephemeralInitiatorNodeID, config, *this); + entry = entryToUse; return CHIP_NO_ERROR; } @@ -242,12 +309,12 @@ class UnauthenticatedSessionTable return result; } - UnauthenticatedSession * FindLeastRecentUsedEntry() + EntryType * FindLeastRecentUsedEntry() { - UnauthenticatedSession * result = nullptr; + EntryType * result = nullptr; System::Clock::Timestamp oldestTime = System::Clock::Timestamp(std::numeric_limits::max()); - mEntries.ForEachActiveObject([&](UnauthenticatedSession * entry) { + mEntries.ForEachActiveObject([&](EntryType * entry) { if (entry->GetReferenceCount() == 0 && entry->GetLastActivityTime() < oldestTime) { result = entry; @@ -259,8 +326,18 @@ class UnauthenticatedSessionTable return result; } - ObjectPool mEntries; + void ReleaseEntry(EntryType * entry) { mEntries.ReleaseObject(entry); } + + ObjectPool mEntries; }; +#if CHIP_SYSTEM_CONFIG_POOL_USE_HEAP +template +void detail::UnauthenticatedSessionPoolEntry::ReleaseSelfToPool() +{ + mSessionTable.ReleaseEntry(this); +} +#endif // CHIP_SYSTEM_CONFIG_POOL_USE_HEAP + } // namespace Transport } // namespace chip From 9656351f912f31c381618f4f0ee374da7d6759a9 Mon Sep 17 00:00:00 2001 From: Junior Martinez <67972863+jmartinez-silabs@users.noreply.github.com> Date: Fri, 27 Oct 2023 13:35:33 -0400 Subject: [PATCH 03/41] disable tcp endpoint on wifi platform (#30040) --- src/platform/silabs/wifi_args.gni | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/platform/silabs/wifi_args.gni b/src/platform/silabs/wifi_args.gni index 3f09ad1994298c..ef7155e54132aa 100644 --- a/src/platform/silabs/wifi_args.gni +++ b/src/platform/silabs/wifi_args.gni @@ -49,7 +49,7 @@ chip_enable_openthread = false chip_inet_config_enable_ipv4 = false chip_inet_config_enable_dns_resolver = false -chip_inet_config_enable_tcp_endpoint = true +chip_inet_config_enable_tcp_endpoint = false chip_build_tests = false chip_config_memory_management = "platform" From 0371c056fdeb42911c031a6a74ba68e0036903c8 Mon Sep 17 00:00:00 2001 From: C Freeman Date: Fri, 27 Oct 2023 13:47:13 -0400 Subject: [PATCH 04/41] TC-DGGEN-3.1: Add (#30024) * TC-DGGEN-3.1: Add * Restyled by whitespace * Restyled by prettier-yaml --------- Co-authored-by: Restyled.io --- .../certification/Test_TC_DGGEN_3_1.yaml | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 src/app/tests/suites/certification/Test_TC_DGGEN_3_1.yaml diff --git a/src/app/tests/suites/certification/Test_TC_DGGEN_3_1.yaml b/src/app/tests/suites/certification/Test_TC_DGGEN_3_1.yaml new file mode 100644 index 00000000000000..bbfdb221792a68 --- /dev/null +++ b/src/app/tests/suites/certification/Test_TC_DGGEN_3_1.yaml @@ -0,0 +1,39 @@ +# Copyright (c) 2023 Project CHIP Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +name: 88.2.4. [TC-DGGEN-3.1] Matter Specification 1.2 errata [DUT as Server] + +PICS: + - DGGEN.S + +config: + nodeId: 0x12344321 + cluster: "General Diagnostics" + endpoint: 0 + +tests: + - label: "Step 1: Wait for the commissioned device to be retrieved" + cluster: "DelayCommands" + command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId + + - label: "Step 2: TH reads AttributeList attribute" + command: "readAttribute" + attribute: "AttributeList" + response: + constraints: + excludes: [0x09] From ef16809fff2212bb03dc5a52618e574f34959441 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Fri, 27 Oct 2023 13:51:27 -0400 Subject: [PATCH 05/41] Don't generate Objective-C compatibility headers for Matter.framework Swift APIs. (#30028) --- src/darwin/Framework/Matter.xcodeproj/project.pbxproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/darwin/Framework/Matter.xcodeproj/project.pbxproj b/src/darwin/Framework/Matter.xcodeproj/project.pbxproj index fc995f1ad61efa..fcc5d770f64889 100644 --- a/src/darwin/Framework/Matter.xcodeproj/project.pbxproj +++ b/src/darwin/Framework/Matter.xcodeproj/project.pbxproj @@ -2039,6 +2039,7 @@ SDKROOT = iphoneos; SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos appletvos appletvsimulator watchos watchsimulator"; SUPPORTS_TEXT_BASED_API = NO; + SWIFT_INSTALL_OBJC_HEADER = NO; TARGETED_DEVICE_FAMILY = "1,2,3,4"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -2211,6 +2212,7 @@ SDKROOT = iphoneos; SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos appletvos appletvsimulator watchos watchsimulator"; SUPPORTS_TEXT_BASED_API = YES; + SWIFT_INSTALL_OBJC_HEADER = NO; TARGETED_DEVICE_FAMILY = "1,2,3,4"; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; From e3a27679c534b75f3c0a1a5e3be1c5c212cdc779 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Fri, 27 Oct 2023 14:09:56 -0400 Subject: [PATCH 06/41] Add python CSA DM XML parsing support for derived clusters (#30036) * Start preparing to store derived clusters * reformat, make sure parsing works * More leniency to allow ModeBase parsing * More leniency and documentation, be ready to attach base clusters * Refactor to add some separate derivation logic * Restyle * More work on actually handling inheritance * Restyle * Implement actual base class derivation * Add unit test for derived, make diffs a LOT better * Restyle * Switch to unified diff for a nicer diff view * Return after the first assert * Make type checker happy at places * Make mypy happy even on an edge case * Fix linter errors * Restyle * more typing for attrs * Some name changes for base clusters: use abstract to make it clear that other clusters could be base too * Also change variable name --------- Co-authored-by: Andrei Litvin --- scripts/py_matter_idl/files.gni | 1 + .../data_model_xml/handlers/__init__.py | 21 ++- .../data_model_xml/handlers/context.py | 15 +- .../data_model_xml/handlers/derivation.py | 173 ++++++++++++++++++ .../data_model_xml/handlers/handlers.py | 144 ++++++++++----- .../data_model_xml/handlers/parsing.py | 38 +++- .../matter_idl/generators/idl/__init__.py | 10 +- .../matter_idl/matter_idl_parser.py | 4 +- .../matter_idl/test_data_model_xml.py | 168 ++++++++++++++++- 9 files changed, 510 insertions(+), 64 deletions(-) create mode 100644 scripts/py_matter_idl/matter_idl/data_model_xml/handlers/derivation.py diff --git a/scripts/py_matter_idl/files.gni b/scripts/py_matter_idl/files.gni index fb9f3991b87c4c..dab10a26bffbdc 100644 --- a/scripts/py_matter_idl/files.gni +++ b/scripts/py_matter_idl/files.gni @@ -27,6 +27,7 @@ matter_idl_generator_sources = [ "${chip_root}/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/__init__.py", "${chip_root}/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/base.py", "${chip_root}/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/context.py", + "${chip_root}/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/derivation.py", "${chip_root}/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/handlers.py", "${chip_root}/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/parsing.py", "${chip_root}/scripts/py_matter_idl/matter_idl/generators/__init__.py", diff --git a/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/__init__.py b/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/__init__.py index a2192ee010c46d..b1ece298a904db 100644 --- a/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/__init__.py +++ b/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/__init__.py @@ -12,11 +12,22 @@ # See the License for the specific language governing permissions and # limitations under the License. +import logging +from xml.sax.xmlreader import AttributesImpl + from matter_idl.matter_idl_types import Idl from .base import BaseHandler from .context import Context from .handlers import ClusterHandler +from .parsing import NormalizeName + +LOGGER = logging.getLogger('data-model-xml-data-parsing') + + +def contains_valid_cluster_id(attrs: AttributesImpl) -> bool: + # Does not check numeric format ... assuming scraper is smart enough for that + return 'id' in attrs and len(attrs['id']) > 0 class DataModelXmlHandler(BaseHandler): @@ -27,8 +38,14 @@ def __init__(self, context: Context, idl: Idl): super().__init__(context) self._idl = idl - def GetNextProcessor(self, name, attrs): + def GetNextProcessor(self, name, attrs: AttributesImpl): if name.lower() == 'cluster': - return ClusterHandler(self.context, self._idl, attrs) + if contains_valid_cluster_id(attrs): + return ClusterHandler.ForAttributes(self.context, self._idl, attrs) + + LOGGER.info( + "Found an abstract base cluster (no id): '%s'", attrs['name']) + + return ClusterHandler.IntoCluster(self.context, self._idl, self.context.AddAbstractBaseCluster(NormalizeName(attrs['name']), self.context.GetCurrentLocationMeta())) else: return BaseHandler(self.context) diff --git a/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/context.py b/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/context.py index 3e3220ee699c87..fe96836da37463 100644 --- a/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/context.py +++ b/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/context.py @@ -16,7 +16,7 @@ import xml.sax.xmlreader from typing import List, Optional -from matter_idl.matter_idl_types import Idl, ParseMetaData +from matter_idl.matter_idl_types import Cluster, ClusterSide, Idl, ParseMetaData class IdlPostProcessor: @@ -82,6 +82,19 @@ def __init__(self, locator: Optional[xml.sax.xmlreader.Locator] = None): self.file_name = None self._not_handled: set[str] = set() self._idl_post_processors: list[IdlPostProcessor] = [] + self.abstract_base_clusters: dict[str, Cluster] = {} + + def AddAbstractBaseCluster(self, name: str, parse_meta: Optional[ParseMetaData] = None) -> Cluster: + """Creates a new cluster entry for the given name in the list of known + base clusters. + """ + assert name not in self.abstract_base_clusters # be unique + + cluster = Cluster(side=ClusterSide.CLIENT, name=name, + code=-1, parse_meta=parse_meta) + self.abstract_base_clusters[name] = cluster + + return cluster def GetCurrentLocationMeta(self) -> Optional[ParseMetaData]: if not self.locator: diff --git a/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/derivation.py b/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/derivation.py new file mode 100644 index 00000000000000..ff4bd9ddc664c8 --- /dev/null +++ b/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/derivation.py @@ -0,0 +1,173 @@ +# +# Copyright (c) 2023 Project CHIP Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +import logging +from typing import Iterable, Optional, Protocol, TypeVar + +from matter_idl.matter_idl_types import Attribute, Bitmap, Cluster, Command, Enum, Event, Idl, Struct + +from .context import Context, IdlPostProcessor +from .parsing import NormalizeName + +LOGGER = logging.getLogger('data-model-xml-data-parsing') + +T = TypeVar("T") + + +class HasName(Protocol): + name: str + + +NAMED = TypeVar('NAMED', bound=HasName) + + +def get_item_with_name(items: Iterable[NAMED], name: str) -> Optional[NAMED]: + """Find an item with the given name. + + Returns none if that item does not exist + """ + for item in items: + if item.name == name: + return item + return None + + +def merge_enum_into(e: Enum, cluster: Cluster): + existing = get_item_with_name(cluster.enums, e.name) + + if existing: + # Remove existing but merge constants into e + cluster.enums.remove(existing) + for value in existing.entries: + if not get_item_with_name(e.entries, value.name): + e.entries.append(value) + + cluster.enums.append(e) + + +def merge_bitmap_into(b: Bitmap, cluster: Cluster): + existing = get_item_with_name(cluster.bitmaps, b.name) + + if existing: + # Remove existing but merge constants into e + cluster.bitmaps.remove(existing) + for value in existing.entries: + if not get_item_with_name(b.entries, value.name): + b.entries.append(value) + + cluster.bitmaps.append(b) + + +def merge_event_into(e: Event, cluster: Cluster): + existing = get_item_with_name(cluster.events, e.name) + if existing: + LOGGER.error("TODO: Do not know how to merge event for %s::%s", + cluster.name, existing.name) + cluster.events.remove(existing) + + cluster.events.append(e) + + +def merge_attribute_into(a: Attribute, cluster: Cluster): + existing: Optional[Attribute] = None + for existing_a in cluster.attributes: + if existing_a.definition.name == a.definition.name: + existing = existing_a + break + + if existing: + # Do not provide merging as it seems only conformance is changed from + # the base cluster + # + # This should fix the correct types + # + # LOGGER.error("TODO: Do not know how to merge attribute for %s::%s", cluster.name, existing.definition.name) + cluster.attributes.remove(existing) + + cluster.attributes.append(a) + + +def merge_struct_into(s: Struct, cluster: Cluster): + existing = get_item_with_name(cluster.structs, s.name) + if existing: + # Do not provide merging as it seems XML only adds + # constraints and conformance to struct elements + # + # TODO: at some point we may be able to merge some things, + # if we find that derived clusters actually add useful things here + # + # LOGGER.error("TODO: Do not know how to merge structs for %s::%s", cluster.name, existing.name) + cluster.structs.remove(existing) + + cluster.structs.append(s) + + +def merge_command_into(c: Command, cluster: Cluster): + existing = get_item_with_name(cluster.commands, c.name) + + if existing: + LOGGER.error("TODO: Do not know how to merge command for %s::%s", + cluster.name, existing.name) + cluster.commands.remove(existing) + + cluster.commands.append(c) + + +def inherit_cluster_data(from_cluster: Cluster, into_cluster: Cluster): + for e in from_cluster.enums: + merge_enum_into(e, into_cluster) + + for b in from_cluster.bitmaps: + merge_bitmap_into(b, into_cluster) + + for ev in from_cluster.events: + merge_event_into(ev, into_cluster) + + for a in from_cluster.attributes: + merge_attribute_into(a, into_cluster) + + for s in from_cluster.structs: + merge_struct_into(s, into_cluster) + + for c in from_cluster.commands: + merge_command_into(c, into_cluster) + + +class AddBaseInfoPostProcessor(IdlPostProcessor): + def __init__(self, destination_cluster: Cluster, source_cluster_name: str, context: Context): + self.destination = destination_cluster + self.source_name = NormalizeName(source_cluster_name) + self.context = context + + def FinalizeProcessing(self, idl: Idl): + # attempt to find the base. It may be in the "names without ID" however it may also be inside + # existing clusters (e.g. Basic Information) + base: Optional[Cluster] = None + if self.source_name in self.context.abstract_base_clusters: + base = self.context.abstract_base_clusters[self.source_name] + else: + for c in idl.clusters: + if c.name == self.source_name: + base = c + break + + if not base: + LOGGER.error( + "Could not find the base cluster named '%s'", self.source_name) + return + + LOGGER.info("Copying base data from '%s' into '%s'", + base.name, self.destination.name) + inherit_cluster_data(from_cluster=base, into_cluster=self.destination) diff --git a/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/handlers.py b/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/handlers.py index a162e62bfb5e15..0cae26bf5207ec 100644 --- a/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/handlers.py +++ b/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/handlers.py @@ -12,20 +12,36 @@ # See the License for the specific language governing permissions and # limitations under the License. +import enum import logging from typing import Optional +from xml.sax.xmlreader import AttributesImpl -from matter_idl.matter_idl_types import (Attribute, AttributeQuality, Bitmap, Cluster, ClusterSide, Command, CommandQuality, - ConstantEntry, DataType, Enum, Field, FieldQuality, Idl, Struct, StructTag) +from matter_idl.matter_idl_types import (ApiMaturity, Attribute, AttributeQuality, Bitmap, Cluster, ClusterSide, Command, + CommandQuality, ConstantEntry, DataType, Enum, Field, FieldQuality, Idl, Struct, StructTag) from .base import BaseHandler, HandledDepth from .context import Context +from .derivation import AddBaseInfoPostProcessor from .parsing import (ApplyConstraint, AttributesToAttribute, AttributesToBitFieldConstantEntry, AttributesToCommand, AttributesToEvent, AttributesToField, NormalizeDataType, NormalizeName, ParseInt, StringToAccessPrivilege) LOGGER = logging.getLogger('data-model-xml-parser') +def is_unused_name(attrs: AttributesImpl): + """Existing XML adds various entries for base/derived reserved items. + + Those items seem to have no actual meaning. + + https://github.com/csa-data-model/projects/issues/363 + """ + if 'name' not in attrs: + return False + + return attrs['name'] in {'base reserved', 'derived reserved'} + + class FeaturesHandler(BaseHandler): def __init__(self, context: Context, cluster: Cluster): @@ -37,10 +53,15 @@ def EndProcessing(self): if self._bitmap.entries: self._cluster.bitmaps.append(self._bitmap) - def GetNextProcessor(self, name: str, attrs): + def GetNextProcessor(self, name: str, attrs: AttributesImpl): if name in {"section", "optionalConform"}: return BaseHandler(self.context, handled=HandledDepth.ENTIRE_TREE) elif name == "feature": + if is_unused_name(attrs): + LOGGER.warning( + f"Ignoring feature constant data for {attrs['name']}") + return BaseHandler(self.context, handled=HandledDepth.ENTIRE_TREE) + self._bitmap.entries.append( AttributesToBitFieldConstantEntry(attrs)) # assume everything handled. Sub-item is only section @@ -50,7 +71,7 @@ def GetNextProcessor(self, name: str, attrs): class BitmapHandler(BaseHandler): - def __init__(self, context: Context, cluster: Cluster, attrs): + def __init__(self, context: Context, cluster: Cluster, attrs: AttributesImpl): super().__init__(context, handled=HandledDepth.SINGLE_TAG) self._cluster = cluster @@ -85,7 +106,7 @@ def EndProcessing(self): self._cluster.bitmaps.append(self._bitmap) - def GetNextProcessor(self, name: str, attrs): + def GetNextProcessor(self, name: str, attrs: AttributesImpl): if name == "section": # Documentation data, skipped return BaseHandler(self.context, handled=HandledDepth.ENTIRE_TREE) @@ -104,7 +125,7 @@ def __init__(self, context: Context, field: Field): self._field = field self._hadConditions = False - def GetNextProcessor(self, name: str, attrs): + def GetNextProcessor(self, name: str, attrs: AttributesImpl): self._hadConditions = True return BaseHandler(self.context, handled=HandledDepth.ENTIRE_TREE) @@ -120,7 +141,7 @@ def __init__(self, context: Context, field: Field): super().__init__(context, handled=HandledDepth.SINGLE_TAG) self._field = field - def GetNextProcessor(self, name: str, attrs): + def GetNextProcessor(self, name: str, attrs: AttributesImpl): if name == "constraint": ApplyConstraint(attrs, self._field) return BaseHandler(self.context, handled=HandledDepth.SINGLE_TAG) @@ -162,7 +183,7 @@ def GetNextProcessor(self, name: str, attrs): class StructHandler(BaseHandler): - def __init__(self, context: Context, cluster: Cluster, attrs): + def __init__(self, context: Context, cluster: Cluster, attrs: AttributesImpl): super().__init__(context, handled=HandledDepth.SINGLE_TAG) self._cluster = cluster self._struct = Struct(name=NormalizeName(attrs["name"]), fields=[]) @@ -170,7 +191,7 @@ def __init__(self, context: Context, cluster: Cluster, attrs): def EndProcessing(self): self._cluster.structs.append(self._struct) - def GetNextProcessor(self, name: str, attrs): + def GetNextProcessor(self, name: str, attrs: AttributesImpl): if name == "section": # Documentation data, skipped return BaseHandler(self.context, handled=HandledDepth.ENTIRE_TREE) @@ -183,7 +204,7 @@ def GetNextProcessor(self, name: str, attrs): class EventHandler(BaseHandler): - def __init__(self, context: Context, cluster: Cluster, attrs): + def __init__(self, context: Context, cluster: Cluster, attrs: AttributesImpl): super().__init__(context, handled=HandledDepth.SINGLE_TAG) self._cluster = cluster self._event = AttributesToEvent(attrs) @@ -191,7 +212,7 @@ def __init__(self, context: Context, cluster: Cluster, attrs): def EndProcessing(self): self._cluster.events.append(self._event) - def GetNextProcessor(self, name: str, attrs): + def GetNextProcessor(self, name: str, attrs: AttributesImpl): if name == "section": # Documentation data, skipped return BaseHandler(self.context, handled=HandledDepth.ENTIRE_TREE) @@ -212,7 +233,7 @@ def GetNextProcessor(self, name: str, attrs): class EnumHandler(BaseHandler): - def __init__(self, context: Context, cluster: Cluster, attrs): + def __init__(self, context: Context, cluster: Cluster, attrs: AttributesImpl): super().__init__(context, handled=HandledDepth.SINGLE_TAG) self._cluster = cluster @@ -239,7 +260,7 @@ def EndProcessing(self): self._cluster.enums.append(self._enum) - def GetNextProcessor(self, name: str, attrs): + def GetNextProcessor(self, name: str, attrs: AttributesImpl): if name == "section": # Documentation data, skipped return BaseHandler(self.context, handled=HandledDepth.ENTIRE_TREE) @@ -266,7 +287,7 @@ def __init__(self, context: Context, cluster: Cluster): super().__init__(context, handled=HandledDepth.SINGLE_TAG) self._cluster = cluster - def GetNextProcessor(self, name: str, attrs): + def GetNextProcessor(self, name: str, attrs: AttributesImpl): if name == "section": # Documentation data, skipped return BaseHandler(self.context, handled=HandledDepth.ENTIRE_TREE) @@ -277,7 +298,7 @@ def GetNextProcessor(self, name: str, attrs): class AttributeHandler(BaseHandler): - def __init__(self, context: Context, cluster: Cluster, attrs): + def __init__(self, context: Context, cluster: Cluster, attrs: AttributesImpl): super().__init__(context, handled=HandledDepth.SINGLE_TAG) self._cluster = cluster self._attribute = AttributesToAttribute(attrs) @@ -290,7 +311,7 @@ def EndProcessing(self): self._cluster.attributes.append(self._attribute) - def GetNextProcessor(self, name: str, attrs): + def GetNextProcessor(self, name: str, attrs: AttributesImpl): if name == "enum": LOGGER.warning( f"Anonymous enumeration not supported when handling attribute {self._cluster.name}::{self._attribute.definition.name}") @@ -330,6 +351,9 @@ def GetNextProcessor(self, name: str, attrs): return BaseHandler(self.context, handled=HandledDepth.ENTIRE_TREE) elif name == "mandatoryConform": return MandatoryConformFieldHandler(self.context, self._attribute.definition) + elif name == "provisionalConform": + self._attribute.api_maturity = ApiMaturity.PROVISIONAL + return BaseHandler(self.context, handled=HandledDepth.ENTIRE_TREE) elif name == "deprecateConform": self._deprecated = True return BaseHandler(self.context, handled=HandledDepth.ENTIRE_TREE) @@ -345,15 +369,18 @@ def __init__(self, context: Context, cluster: Cluster): super().__init__(context, handled=HandledDepth.SINGLE_TAG) self._cluster = cluster - def GetNextProcessor(self, name: str, attrs): + def GetNextProcessor(self, name: str, attrs: AttributesImpl): if name == "attribute": + if is_unused_name(attrs): + LOGGER.warning(f"Ignoring attribute data for {attrs['name']}") + return BaseHandler(self.context, handled=HandledDepth.ENTIRE_TREE) return AttributeHandler(self.context, self._cluster, attrs) else: return BaseHandler(self.context) class CommandHandler(BaseHandler): - def __init__(self, context: Context, cluster: Cluster, attrs): + def __init__(self, context: Context, cluster: Cluster, attrs: AttributesImpl): super().__init__(context, handled=HandledDepth.SINGLE_TAG) self._cluster = cluster self._command: Optional[Command] = None @@ -382,8 +409,8 @@ def __init__(self, context: Context, cluster: Cluster, attrs): elif ("direction" in attrs) and attrs["direction"] == "responseFromServer": is_command = False # response else: - LOGGER.warn("Could not clearly determine command direction: %s" % - [item for item in attrs.items()]) + LOGGER.warning("Could not clearly determine command direction: %s" % + [item for item in attrs.items()]) # Do a best-guess. However we should NOT need to guess once # we have a good data set is_command = not attrs["name"].endswith("Response") @@ -414,7 +441,7 @@ def EndProcessing(self): if self._command: self._cluster.commands.append(self._command) - def GetNextProcessor(self, name: str, attrs): + def GetNextProcessor(self, name: str, attrs: AttributesImpl): if name in {"mandatoryConform", "optionalConform", "disallowConform"}: # Unclear how commands may be optional or mandatory return BaseHandler(self.context, handled=HandledDepth.ENTIRE_TREE) @@ -425,7 +452,7 @@ def GetNextProcessor(self, name: str, attrs): self._command.invokeacl = StringToAccessPrivilege( attrs["invokePrivilege"]) else: - LOGGER.warn( + LOGGER.warning( f"Ignoring invoke privilege for {self._struct.name}") if self._command: @@ -449,8 +476,20 @@ def __init__(self, context: Context, cluster: Cluster): super().__init__(context, handled=HandledDepth.SINGLE_TAG) self._cluster = cluster - def GetNextProcessor(self, name: str, attrs): + def GetNextProcessor(self, name: str, attrs: AttributesImpl): if name == "command": + if is_unused_name(attrs): + LOGGER.warning(f"Ignoring command data for {attrs['name']}") + return BaseHandler(self.context, handled=HandledDepth.ENTIRE_TREE) + + if 'id' not in attrs: + LOGGER.error( + f"Could not process command {attrs['name']}: no id") + # TODO: skip over these without failing the processing + # + # https://github.com/csa-data-model/projects/issues/364 + return BaseHandler(self.context, handled=HandledDepth.ENTIRE_TREE) + return CommandHandler(self.context, self._cluster, attrs) elif name in {"mandatoryConform", "optionalConform"}: # Nothing to tag conformance @@ -464,7 +503,7 @@ def __init__(self, context: Context, cluster: Cluster): super().__init__(context, handled=HandledDepth.SINGLE_TAG) self._cluster = cluster - def GetNextProcessor(self, name: str, attrs): + def GetNextProcessor(self, name: str, attrs: AttributesImpl): if name == "section": # Documentation data, skipped return BaseHandler(self.context, handled=HandledDepth.ENTIRE_TREE) @@ -483,24 +522,43 @@ def GetNextProcessor(self, name: str, attrs): return BaseHandler(self.context) +class ClusterHandlerPostProcessing(enum.Enum): + FINALIZE_AND_ADD_TO_IDL = enum.auto() + NO_POST_PROCESSING = enum.auto() + + class ClusterHandler(BaseHandler): """ Handling /cluster elements.""" - def __init__(self, context: Context, idl: Idl, attrs): - super().__init__(context, handled=HandledDepth.SINGLE_TAG) - self._idl = idl - + @staticmethod + def ForAttributes(context: Context, idl: Idl, attrs: AttributesImpl): assert ("name" in attrs) assert ("id" in attrs) - self._cluster = Cluster( - side=ClusterSide.CLIENT, - name=NormalizeName(attrs["name"]), - code=ParseInt(attrs["id"]), - parse_meta=context.GetCurrentLocationMeta() - ) + return ClusterHandler(context, idl, + Cluster( + side=ClusterSide.CLIENT, + name=NormalizeName(attrs["name"]), + code=ParseInt(attrs["id"]), + parse_meta=context.GetCurrentLocationMeta() + ), ClusterHandlerPostProcessing.FINALIZE_AND_ADD_TO_IDL) + + @staticmethod + def IntoCluster(context: Context, idl: Idl, cluster: Cluster): + return ClusterHandler(context, idl, cluster, ClusterHandlerPostProcessing.NO_POST_PROCESSING) + + def __init__(self, context: Context, idl: Idl, cluster: Cluster, post_process: ClusterHandlerPostProcessing): + super().__init__(context, handled=HandledDepth.SINGLE_TAG) + self._idl = idl + self._cluster = cluster + self._post_processing = post_process def EndProcessing(self): + if self._post_processing == ClusterHandlerPostProcessing.NO_POST_PROCESSING: + return + + assert self._post_processing == ClusterHandlerPostProcessing.FINALIZE_AND_ADD_TO_IDL + # Global things MUST be available everywhere to_add = [ # type, code, name, is_list @@ -521,7 +579,7 @@ def EndProcessing(self): ), qualities=AttributeQuality.READABLE)) self._idl.clusters.append(self._cluster) - def GetNextProcessor(self, name: str, attrs): + def GetNextProcessor(self, name: str, attrs: AttributesImpl): if name == "revisionHistory": # Revision history COULD be used to find the latest revision of a cluster # however current IDL files do NOT have a revision info field @@ -533,12 +591,16 @@ def GetNextProcessor(self, name: str, attrs): # Documentation data, skipped return BaseHandler(self.context, handled=HandledDepth.ENTIRE_TREE) elif name == "classification": - # Not an obvious mapping in the existing data model. - # - # TODO IFF hierarchy == derived, we should use baseCluster - # - # Other elements like role, picsCode, scope and primaryTransaction seem - # to not be used + if attrs['hierarchy'] == 'derived': + # This is a derived cluster. We have to add everything from the + # base cluster + self.context.AddIdlPostProcessor(AddBaseInfoPostProcessor( + destination_cluster=self._cluster, + source_cluster_name=attrs['baseCluster'], + context=self.context + )) + # other elements like picsCode, scope and primaryTransaction seem to have + # no direct mapping in the data model return BaseHandler(self.context, handled=HandledDepth.ENTIRE_TREE) elif name == "features": return FeaturesHandler(self.context, self._cluster) diff --git a/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/parsing.py b/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/parsing.py index c2753d4221cab4..948d698a5d4a6e 100644 --- a/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/parsing.py +++ b/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/parsing.py @@ -16,6 +16,7 @@ import re from dataclasses import dataclass from typing import Optional +from xml.sax.xmlreader import AttributesImpl from matter_idl.generators.types import GetDataTypeSizeInBits, IsSignedDataType from matter_idl.matter_idl_types import AccessPrivilege, Attribute, Command, ConstantEntry, DataType, Event, EventPriority, Field @@ -145,12 +146,21 @@ def FieldName(name: str) -> str: return name[0].lower() + name[1:] -def AttributesToField(attrs) -> Field: +def AttributesToField(attrs: AttributesImpl) -> Field: assert "name" in attrs assert "id" in attrs - assert "type" in attrs - t = ParseType(attrs["type"]) + if "type" in attrs: + attr_type = NormalizeDataType(attrs["type"]) + else: + # TODO: Generally we should not have this, however current implementation + # for derived clusters for example want to add things (like conformance + # specifically) WITHOUT re-stating things like types + # + # https://github.com/csa-data-model/projects/issues/365 + LOGGER.error(f"Attribute {attrs['name']} has no type") + attr_type = "sint32" + t = ParseType(attr_type) return Field( name=FieldName(attrs["name"]), @@ -160,16 +170,26 @@ def AttributesToField(attrs) -> Field: ) -def AttributesToBitFieldConstantEntry(attrs) -> ConstantEntry: +def AttributesToBitFieldConstantEntry(attrs: AttributesImpl) -> ConstantEntry: """Creates a constant entry appropriate for bitmaps. """ - assert ("name" in attrs) - assert ("bit" in attrs) + assert "name" in attrs + + if 'bit' not in attrs: + # TODO: multi-bit fields not supported in XML currently. Be lenient here to have some + # diff + # Issue: https://github.com/csa-data-model/projects/issues/347 + + LOGGER.error( + f"Constant {attrs['name']} has no bit value (may be multibit)") + return ConstantEntry(name="k" + NormalizeName(attrs["name"]), code=0) + + assert "bit" in attrs return ConstantEntry(name="k" + NormalizeName(attrs["name"]), code=1 << ParseInt(attrs["bit"])) -def AttributesToAttribute(attrs) -> Attribute: +def AttributesToAttribute(attrs: AttributesImpl) -> Attribute: assert "name" in attrs assert "id" in attrs @@ -193,7 +213,7 @@ def AttributesToAttribute(attrs) -> Attribute: ) -def AttributesToEvent(attrs) -> Event: +def AttributesToEvent(attrs: AttributesImpl) -> Event: assert "name" in attrs assert "id" in attrs assert "priority" in attrs @@ -231,7 +251,7 @@ def StringToAccessPrivilege(value: str) -> AccessPrivilege: raise Exception("UNKNOWN privilege level: %r" % value) -def AttributesToCommand(attrs) -> Command: +def AttributesToCommand(attrs: AttributesImpl) -> Command: assert "id" in attrs assert "name" in attrs diff --git a/scripts/py_matter_idl/matter_idl/generators/idl/__init__.py b/scripts/py_matter_idl/matter_idl/generators/idl/__init__.py index f53e35a7aba8e0..9ac9085f0cc68b 100644 --- a/scripts/py_matter_idl/matter_idl/generators/idl/__init__.py +++ b/scripts/py_matter_idl/matter_idl/generators/idl/__init__.py @@ -33,12 +33,16 @@ def human_text_string(value: Union[ClusterSide, StructTag, StructQuality, EventP if value == StructTag.RESPONSE: return "response" elif type(value) is FieldQuality: + # mypy seems confused if using `FieldQuality.OPTIONAL in value` + # directly, so do a useless cast here + quality: FieldQuality = value + result = "" - if FieldQuality.OPTIONAL in value: + if FieldQuality.OPTIONAL in quality: result += "optional " - if FieldQuality.NULLABLE in value: + if FieldQuality.NULLABLE in quality: result += "nullable " - if FieldQuality.FABRIC_SENSITIVE in value: + if FieldQuality.FABRIC_SENSITIVE in quality: result += "fabric_sensitive " return result.strip() elif type(value) is StructQuality: diff --git a/scripts/py_matter_idl/matter_idl/matter_idl_parser.py b/scripts/py_matter_idl/matter_idl/matter_idl_parser.py index 711e2535887b5e..ba909cb8fd24a8 100755 --- a/scripts/py_matter_idl/matter_idl/matter_idl_parser.py +++ b/scripts/py_matter_idl/matter_idl/matter_idl_parser.py @@ -310,10 +310,10 @@ def command_with_access(self, args): # NOTE: awkward inline because the order of 'meta, children' vs 'children, meta' was flipped # between lark versions in https://github.com/lark-parser/lark/pull/993 @v_args(meta=True, inline=True) - def command(self, meta, *args): + def command(self, meta, *tuple_args): # The command takes 4 arguments if no input argument, 5 if input # argument is provided - args = list(args) # convert from tuple + args = list(tuple_args) # convert from tuple if len(args) != 5: args.insert(2, None) diff --git a/scripts/py_matter_idl/matter_idl/test_data_model_xml.py b/scripts/py_matter_idl/matter_idl/test_data_model_xml.py index dfb4870d29d360..eea2308323abec 100755 --- a/scripts/py_matter_idl/matter_idl/test_data_model_xml.py +++ b/scripts/py_matter_idl/matter_idl/test_data_model_xml.py @@ -15,7 +15,8 @@ import io import unittest -from typing import List, Union +from difflib import unified_diff +from typing import List, Optional, Union try: from matter_idl.data_model_xml import ParseSource, ParseXmls @@ -27,10 +28,34 @@ os.path.join(os.path.dirname(__file__), '..'))) from matter_idl.data_model_xml import ParseSource, ParseXmls +from matter_idl.generators import GeneratorStorage +from matter_idl.generators.idl import IdlGenerator from matter_idl.matter_idl_parser import CreateParser from matter_idl.matter_idl_types import Idl +class GeneratorContentStorage(GeneratorStorage): + def __init__(self): + super().__init__() + self.content: Optional[str] = None + + def get_existing_data(self, relative_path: str): + # Force re-generation each time + return None + + def write_new_data(self, relative_path: str, content: str): + if self.content: + raise Exception( + "Unexpected extra data: single file generation expected") + self.content = content + + +def RenderAsIdlTxt(idl: Idl) -> str: + storage = GeneratorContentStorage() + IdlGenerator(storage=storage, idl=idl).render(dry_run=False) + return storage.content or "" + + def XmlToIdl(what: Union[str, List[str]]) -> Idl: if not isinstance(what, list): what = [what] @@ -53,6 +78,23 @@ def __init__(self, *args, **kargs): super().__init__(*args, **kargs) self.maxDiff = None + def assertIdlEqual(self, a: Idl, b: Idl): + if a == b: + # seems the same. This will just pass + self.assertEqual(a, b) + return + + # Not the same. Try to make a human readable diff: + a_txt = RenderAsIdlTxt(a) + b_txt = RenderAsIdlTxt(b) + + delta = unified_diff(a_txt.splitlines(keepends=True), + b_txt.splitlines(keepends=True), + fromfile='actual.matter', + tofile='expected.matter', + ) + self.assertEqual(a, b, '\n' + ''.join(delta)) + def testBasicInput(self): xml_idl = XmlToIdl(''' @@ -70,7 +112,121 @@ def testBasicInput(self): } ''') - self.assertEqual(xml_idl, expected_idl) + self.assertIdlEqual(xml_idl, expected_idl) + + def testClusterDerivation(self): + # This test is based on a subset of ModeBase and Mode_Dishwasher original xml files + + xml_idl = XmlToIdl([ + # base ... + ''' + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ''', + # derived ... + ''' + + + + + + + + + + + + + + + + + + + + + + + + + + + ''', + ]) + + expected_idl = IdlTextToIdl(''' + client cluster DishwasherMode = 89 { + bitmap Feature: bitmap32 { + kOnOff = 0x1; + } + + struct ModeOptionStruct { + char_string<64> label = 0; + int8u mode = 1; + ModeTagStruct modeTags[] = 2; + } + + readonly attribute attrib_id attributeList[] = 65531; + readonly attribute event_id eventList[] = 65530; + readonly attribute command_id acceptedCommandList[] = 65529; + readonly attribute command_id generatedCommandList[] = 65528; + readonly attribute bitmap32 featureMap = 65532; + readonly attribute int16u clusterRevision = 65533; + + // baseline inserted after, so to pass the test add this at the end + readonly attribute ModeOptionStruct supportedModes[] = 0; + } + ''') + + self.assertIdlEqual(xml_idl, expected_idl) def testSignedTypes(self): @@ -108,7 +264,7 @@ def testSignedTypes(self): } ''') - self.assertEqual(xml_idl, expected_idl) + self.assertIdlEqual(xml_idl, expected_idl) def testEnumRange(self): # Check heuristic for enum ranges @@ -183,7 +339,7 @@ def testEnumRange(self): } ''') - self.assertEqual(xml_idl, expected_idl) + self.assertIdlEqual(xml_idl, expected_idl) def testAttributes(self): # Validate an attribute with a type list @@ -237,7 +393,7 @@ def testAttributes(self): } ''') - self.assertEqual(xml_idl, expected_idl) + self.assertIdlEqual(xml_idl, expected_idl) def testComplexInput(self): # This parses a known copy of Switch.xml which happens to be fully @@ -434,7 +590,7 @@ def testComplexInput(self): } ''') - self.assertEqual(xml_idl, expected_idl) + self.assertIdlEqual(xml_idl, expected_idl) if __name__ == '__main__': From 638eb935cbd052943c152a2e8b19ed006c45deea Mon Sep 17 00:00:00 2001 From: lpbeliveau-silabs <112982107+lpbeliveau-silabs@users.noreply.github.com> Date: Fri, 27 Oct 2023 14:52:23 -0400 Subject: [PATCH 07/41] Added reporting attribute change callback in the group server where actions are modifying the group table (#30055) --- src/app/clusters/groups-server/groups-server.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/app/clusters/groups-server/groups-server.cpp b/src/app/clusters/groups-server/groups-server.cpp index 7318523c118fbe..10aa34351230b7 100644 --- a/src/app/clusters/groups-server/groups-server.cpp +++ b/src/app/clusters/groups-server/groups-server.cpp @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -90,6 +91,8 @@ static Status GroupAdd(FabricIndex fabricIndex, EndpointId endpointId, GroupId g } if (CHIP_NO_ERROR == err) { + MatterReportingAttributeChangeCallback(kRootEndpointId, GroupKeyManagement::Id, + GroupKeyManagement::Attributes::GroupTable::Id); return Status::Success; } @@ -109,6 +112,8 @@ static EmberAfStatus GroupRemove(FabricIndex fabricIndex, EndpointId endpointId, CHIP_ERROR err = provider->RemoveEndpoint(fabricIndex, groupId, endpointId); if (CHIP_NO_ERROR == err) { + MatterReportingAttributeChangeCallback(kRootEndpointId, GroupKeyManagement::Id, + GroupKeyManagement::Attributes::GroupTable::Id); return EMBER_ZCL_STATUS_SUCCESS; } @@ -322,7 +327,7 @@ bool emberAfGroupsClusterRemoveAllGroupsCallback(app::CommandHandler * commandOb provider->RemoveEndpoint(fabricIndex, commandPath.mEndpointId); status = Status::Success; - + MatterReportingAttributeChangeCallback(kRootEndpointId, GroupKeyManagement::Id, GroupKeyManagement::Attributes::GroupTable::Id); exit: commandObj->AddStatus(commandPath, status); if (Status::Success != status) From b3c844bd669a4af978e1e65b195ce0a65fb26b3e Mon Sep 17 00:00:00 2001 From: C Freeman Date: Fri, 27 Oct 2023 15:01:14 -0400 Subject: [PATCH 08/41] Re enable spec parsing (#30066) * Reapply "Cluster conformance checker script (#29895)" This reverts commit 8140975925a0f7d1662d6a57fe5aab2b722b14d7. * More resiliance to mismatches in spec * Restyled by isort --------- Co-authored-by: Restyled.io --- .github/workflows/tests.yaml | 1 + .../TC_DeviceBasicComposition.py | 128 +++- src/python_testing/TestConformanceSupport.py | 575 ++++++++++++++++++ src/python_testing/conformance_support.py | 263 ++++++++ src/python_testing/matter_testing_support.py | 21 +- src/python_testing/spec_parsing_support.py | 343 +++++++++++ 6 files changed, 1326 insertions(+), 5 deletions(-) create mode 100644 src/python_testing/TestConformanceSupport.py create mode 100644 src/python_testing/conformance_support.py create mode 100644 src/python_testing/spec_parsing_support.py diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 97897e8086c941..d6c580e643e9ff 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -468,6 +468,7 @@ jobs: scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_RVCCLEANM_1_2.py" --script-args "--int-arg PIXIT_ENDPOINT:1 --storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"' scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_RVCRUNM_1_2.py" --script-args "--int-arg PIXIT_ENDPOINT:1 --storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"' scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --script "src/python_testing/TestMatterTestingSupport.py" --script-args "--trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"' + scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --script "src/python_testing/TestConformanceSupport.py" --script-args "--trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"' scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-lock-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-lock-app --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_DRLK_2_2.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --PICS src/app/tests/suites/certification/ci-pics-values --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"' scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-lock-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-lock-app --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_DRLK_2_3.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --PICS src/app/tests/suites/certification/ci-pics-values --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"' scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-lock-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-lock-app --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_DRLK_2_12.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --PICS src/app/tests/suites/certification/ci-pics-values --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"' diff --git a/src/python_testing/TC_DeviceBasicComposition.py b/src/python_testing/TC_DeviceBasicComposition.py index b333085fa2eef1..1f5dc38813a975 100644 --- a/src/python_testing/TC_DeviceBasicComposition.py +++ b/src/python_testing/TC_DeviceBasicComposition.py @@ -31,8 +31,11 @@ import chip.clusters.ClusterObjects import chip.tlv from chip.clusters.Attribute import ValueDecodeFailure -from matter_testing_support import AttributePathLocation, MatterBaseTest, async_test_body, default_matter_test_main +from conformance_support import ConformanceDecision, conformance_allowed +from matter_testing_support import (AttributePathLocation, ClusterPathLocation, CommandPathLocation, MatterBaseTest, + async_test_body, default_matter_test_main) from mobly import asserts +from spec_parsing_support import CommandType, build_xml_clusters def MatterTlvToJson(tlv_data: dict[int, Any]) -> dict[str, Any]: @@ -870,6 +873,129 @@ def test_DESC_2_2(self): if problems or root_problems: self.fail_current_test("Problems with tags lists") + def test_spec_conformance(self): + success = True + # TODO: provisional needs to be an input parameter + allow_provisional = True + clusters, problems = build_xml_clusters() + self.problems = self.problems + problems + for id in sorted(list(clusters.keys())): + print(f'{id} 0x{id:02x}: {clusters[id].name}') + for endpoint_id, endpoint in self.endpoints_tlv.items(): + for cluster_id, cluster in endpoint.items(): + if cluster_id not in clusters.keys(): + if (cluster_id & 0xFFFF_0000) != 0: + # manufacturer cluster + continue + location = ClusterPathLocation(endpoint_id=endpoint_id, cluster_id=cluster_id) + # TODO: update this from a warning once we have all the data + self.record_warning(self.get_test_name(), location=location, + problem='Standard cluster found on device, but is not present in spec data') + continue + + # TODO: switch to use global FEATURE_MAP_ID etc. once the IDM-10.1 change is merged. + FEATURE_MAP_ID = 0xFFFC + ATTRIBUTE_LIST_ID = 0xFFFB + ACCEPTED_COMMAND_ID = 0xFFF9 + GENERATED_COMMAND_ID = 0xFFF8 + + feature_map = cluster[FEATURE_MAP_ID] + attribute_list = cluster[ATTRIBUTE_LIST_ID] + all_command_list = cluster[ACCEPTED_COMMAND_ID] + cluster[GENERATED_COMMAND_ID] + + # Feature conformance checking + feature_masks = [1 << i for i in range(32) if feature_map & (1 << i)] + for f in feature_masks: + location = AttributePathLocation(endpoint_id=endpoint_id, cluster_id=cluster_id, attribute_id=FEATURE_MAP_ID) + if f not in clusters[cluster_id].features.keys(): + self.record_error(self.get_test_name(), location=location, problem=f'Unknown feature with mask 0x{f:02x}') + success = False + continue + xml_feature = clusters[cluster_id].features[f] + conformance_decision = xml_feature.conformance(feature_map, attribute_list, all_command_list) + if not conformance_allowed(conformance_decision, allow_provisional): + self.record_error(self.get_test_name(), location=location, + problem=f'Disallowed feature with mask 0x{f:02x}') + success = False + for feature_mask, xml_feature in clusters[cluster_id].features.items(): + conformance_decision = xml_feature.conformance(feature_map, attribute_list, all_command_list) + if conformance_decision == ConformanceDecision.MANDATORY and feature_mask not in feature_masks: + self.record_error(self.get_test_name(), location=location, + problem=f'Required feature with mask 0x{f:02x} is not present in feature map') + success = False + + # Attribute conformance checking + for attribute_id, attribute in cluster.items(): + location = AttributePathLocation(endpoint_id=endpoint_id, cluster_id=cluster_id, attribute_id=attribute_id) + if attribute_id not in clusters[cluster_id].attributes.keys(): + # TODO: Consolidate the range checks with IDM-10.1 once that lands + if attribute_id <= 0x4FFF: + # manufacturer attribute + self.record_error(self.get_test_name(), location=location, + problem='Standard attribute found on device, but not in spec') + success = False + continue + xml_attribute = clusters[cluster_id].attributes[attribute_id] + conformance_decision = xml_attribute.conformance(feature_map, attribute_list, all_command_list) + if not conformance_allowed(conformance_decision, allow_provisional): + location = AttributePathLocation(endpoint_id=endpoint_id, cluster_id=cluster_id, attribute_id=attribute_id) + self.record_error(self.get_test_name(), location=location, + problem=f'Attribute 0x{attribute_id:02x} is included, but is disallowed by conformance') + success = False + for attribute_id, xml_attribute in clusters[cluster_id].attributes.items(): + conformance_decision = xml_attribute.conformance(feature_map, attribute_list, all_command_list) + if conformance_decision == ConformanceDecision.MANDATORY and attribute_id not in cluster.keys(): + location = AttributePathLocation(endpoint_id=endpoint_id, cluster_id=cluster_id, attribute_id=attribute_id) + self.record_error(self.get_test_name(), location=location, + problem=f'Attribute 0x{attribute_id:02x} is required, but is not present on the DUT') + success = False + + def check_spec_conformance_for_commands(command_type: CommandType) -> bool: + success = True + # TODO: once IDM-10.1 lands, use the globals + global_attribute_id = 0xFFF9 if command_type == CommandType.ACCEPTED else 0xFFF8 + xml_commands_dict = clusters[cluster_id].accepted_commands if command_type == CommandType.ACCEPTED else clusters[cluster_id].generated_commands + command_list = cluster[global_attribute_id] + for command_id in command_list: + location = CommandPathLocation(endpoint_id=endpoint_id, cluster_id=cluster_id, command_id=command_id) + if command_id not in xml_commands_dict: + # TODO: Consolidate range checks with IDM-10.1 once that lands + if command_id <= 0xFF: + # manufacturer command + continue + self.record_error(self.get_test_name(), location=location, + problem='Standard command found on device, but not in spec') + success = False + continue + xml_command = xml_commands_dict[command_id] + conformance_decision = xml_command.conformance(feature_map, attribute_list, all_command_list) + if not conformance_allowed(conformance_decision, allow_provisional): + self.record_error(self.get_test_name(), location=location, + problem=f'Command 0x{command_id:02x} is included, but disallowed by conformance') + success = False + for command_id, xml_command in xml_commands_dict.items(): + conformance_decision = xml_command.conformance(feature_map, attribute_list, all_command_list) + if conformance_decision == ConformanceDecision.MANDATORY and command_id not in command_list: + location = CommandPathLocation(endpoint_id=endpoint_id, cluster_id=cluster_id, command_id=command_id) + self.record_error(self.get_test_name(), location=location, + problem=f'Command 0x{command_id:02x} is required, but is not present on the DUT') + success = False + return success + + # Command conformance checking + cmd_success = check_spec_conformance_for_commands(CommandType.ACCEPTED) + success = False if not cmd_success else success + cmd_success = check_spec_conformance_for_commands(CommandType.GENERATED) + success = False if not cmd_success else success + + # TODO: Add choice checkers + + if not success: + # TODO: Right now, we have failures in all-cluster, so we can't fail this test and keep it in CI. For now, just log. + # Issue tracking: #29812 + # self.fail_current_test("Problems with conformance") + logging.error("Problems found with conformance, this should turn into a test failure once #29812 is resolved") + if __name__ == "__main__": default_matter_test_main() diff --git a/src/python_testing/TestConformanceSupport.py b/src/python_testing/TestConformanceSupport.py new file mode 100644 index 00000000000000..53f9e885ff9449 --- /dev/null +++ b/src/python_testing/TestConformanceSupport.py @@ -0,0 +1,575 @@ +# +# Copyright (c) 2023 Project CHIP Authors +# All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +import xml.etree.ElementTree as ElementTree + +from conformance_support import ConformanceDecision, ConformanceParseParameters, parse_callable_from_xml +from matter_testing_support import MatterBaseTest, async_test_body, default_matter_test_main +from mobly import asserts + + +class TestConformanceSupport(MatterBaseTest): + @async_test_body + async def setup_class(self): + super().setup_class() + # a small feature map + self.feature_names_to_bits = {'AB': 0x01, 'CD': 0x02} + + # none, AB, CD, AB&CD + self.feature_maps = [0x00, 0x01, 0x02, 0x03] + self.has_ab = [False, True, False, True] + self.has_cd = [False, False, True, True] + + self.attribute_names_to_values = {'attr1': 0x00, 'attr2': 0x01} + self.attribute_lists = [[], [0x00], [0x01], [0x00, 0x01]] + self.has_attr1 = [False, True, False, True] + self.has_attr2 = [False, False, True, True] + + self.command_names_to_values = {'cmd1': 0x00, 'cmd2': 0x01} + self.cmd_lists = [[], [0x00], [0x01], [0x00, 0x01]] + self.has_cmd1 = [False, True, False, True] + self.has_cmd2 = [False, False, True, True] + self.params = ConformanceParseParameters( + feature_map=self.feature_names_to_bits, attribute_map=self.attribute_names_to_values, command_map=self.command_names_to_values) + + @async_test_body + async def test_conformance_mandatory(self): + xml = '' + et = ElementTree.fromstring(xml) + xml_callable = parse_callable_from_xml(et, self.params) + for f in self.feature_maps: + asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.MANDATORY) + + @async_test_body + async def test_conformance_optional(self): + xml = '' + et = ElementTree.fromstring(xml) + xml_callable = parse_callable_from_xml(et, self.params) + for f in self.feature_maps: + asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.OPTIONAL) + + @async_test_body + async def test_conformance_disallowed(self): + xml = '' + et = ElementTree.fromstring(xml) + xml_callable = parse_callable_from_xml(et, self.params) + for f in self.feature_maps: + asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.DISALLOWED) + + xml = '' + et = ElementTree.fromstring(xml) + xml_callable = parse_callable_from_xml(et, self.params) + for f in self.feature_maps: + asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.DISALLOWED) + + @async_test_body + async def test_conformance_provisional(self): + xml = '' + et = ElementTree.fromstring(xml) + xml_callable = parse_callable_from_xml(et, self.params) + for f in self.feature_maps: + asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.PROVISIONAL) + + @async_test_body + async def test_conformance_mandatory_on_condition(self): + xml = ('' + '' + '') + et = ElementTree.fromstring(xml) + xml_callable = parse_callable_from_xml(et, self.params) + for i, f in enumerate(self.feature_maps): + if self.has_ab[i]: + asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.MANDATORY) + else: + asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.NOT_APPLICABLE) + + xml = ('' + '' + '') + et = ElementTree.fromstring(xml) + xml_callable = parse_callable_from_xml(et, self.params) + for i, f in enumerate(self.feature_maps): + if self.has_cd[i]: + asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.MANDATORY) + else: + asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.NOT_APPLICABLE) + + # single attribute mandatory + xml = ('' + '' + '') + et = ElementTree.fromstring(xml) + xml_callable = parse_callable_from_xml(et, self.params) + for i, a in enumerate(self.attribute_lists): + if self.has_attr1[i]: + asserts.assert_equal(xml_callable(0x00, a, []), ConformanceDecision.MANDATORY) + else: + asserts.assert_equal(xml_callable(0x00, a, []), ConformanceDecision.NOT_APPLICABLE) + + xml = ('' + '' + '') + et = ElementTree.fromstring(xml) + xml_callable = parse_callable_from_xml(et, self.params) + for i, a in enumerate(self.attribute_lists): + if self.has_attr2[i]: + asserts.assert_equal(xml_callable(0x00, a, []), ConformanceDecision.MANDATORY) + else: + asserts.assert_equal(xml_callable(0x00, a, []), ConformanceDecision.NOT_APPLICABLE) + + # test command in optional and in boolean - this is the same as attribute essentially, so testing every permutation is overkill + + @async_test_body + async def test_conformance_optional_on_condition(self): + # single feature optional + xml = ('' + '' + '') + et = ElementTree.fromstring(xml) + xml_callable = parse_callable_from_xml(et, self.params) + for i, f in enumerate(self.feature_maps): + if self.has_ab[i]: + asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.OPTIONAL) + else: + asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.NOT_APPLICABLE) + + xml = ('' + '' + '') + et = ElementTree.fromstring(xml) + xml_callable = parse_callable_from_xml(et, self.params) + for i, f in enumerate(self.feature_maps): + if self.has_cd[i]: + asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.OPTIONAL) + else: + asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.NOT_APPLICABLE) + + # single attribute optional + xml = ('' + '' + '') + et = ElementTree.fromstring(xml) + xml_callable = parse_callable_from_xml(et, self.params) + for i, a in enumerate(self.attribute_lists): + if self.has_attr1[i]: + asserts.assert_equal(xml_callable(0x00, a, []), ConformanceDecision.OPTIONAL) + else: + asserts.assert_equal(xml_callable(0x00, a, []), ConformanceDecision.NOT_APPLICABLE) + + xml = ('' + '' + '') + et = ElementTree.fromstring(xml) + xml_callable = parse_callable_from_xml(et, self.params) + for i, a in enumerate(self.attribute_lists): + if self.has_attr2[i]: + asserts.assert_equal(xml_callable(0x00, a, []), ConformanceDecision.OPTIONAL) + else: + asserts.assert_equal(xml_callable(0x00, a, []), ConformanceDecision.NOT_APPLICABLE) + + # single command optional + xml = ('' + '' + '') + et = ElementTree.fromstring(xml) + xml_callable = parse_callable_from_xml(et, self.params) + for i, c in enumerate(self.cmd_lists): + if self.has_cmd1[i]: + asserts.assert_equal(xml_callable(0x00, [], c), ConformanceDecision.OPTIONAL) + else: + asserts.assert_equal(xml_callable(0x00, [], c), ConformanceDecision.NOT_APPLICABLE) + + xml = ('' + '' + '') + et = ElementTree.fromstring(xml) + xml_callable = parse_callable_from_xml(et, self.params) + for i, c in enumerate(self.cmd_lists): + if self.has_cmd2[i]: + asserts.assert_equal(xml_callable(0x00, [], c), ConformanceDecision.OPTIONAL) + else: + asserts.assert_equal(xml_callable(0x00, [], c), ConformanceDecision.NOT_APPLICABLE) + + @async_test_body + async def test_conformance_not_term_mandatory(self): + # single feature not mandatory + xml = ('' + '' + '' + '' + '') + et = ElementTree.fromstring(xml) + xml_callable = parse_callable_from_xml(et, self.params) + for i, f in enumerate(self.feature_maps): + if not self.has_ab[i]: + asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.MANDATORY) + else: + asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.NOT_APPLICABLE) + + xml = ('' + '' + '' + '' + '') + et = ElementTree.fromstring(xml) + xml_callable = parse_callable_from_xml(et, self.params) + for i, f in enumerate(self.feature_maps): + if not self.has_cd[i]: + asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.MANDATORY) + else: + asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.NOT_APPLICABLE) + + # single attribute not mandatory + xml = ('' + '' + '' + '' + '') + et = ElementTree.fromstring(xml) + xml_callable = parse_callable_from_xml(et, self.params) + for i, a in enumerate(self.attribute_lists): + if not self.has_attr1[i]: + asserts.assert_equal(xml_callable(0x00, a, []), ConformanceDecision.MANDATORY) + else: + asserts.assert_equal(xml_callable(0x00, a, []), ConformanceDecision.NOT_APPLICABLE) + + xml = ('' + '' + '' + '' + '') + et = ElementTree.fromstring(xml) + xml_callable = parse_callable_from_xml(et, self.params) + for i, a in enumerate(self.attribute_lists): + if not self.has_attr2[i]: + asserts.assert_equal(xml_callable(0x00, a, []), ConformanceDecision.MANDATORY) + else: + asserts.assert_equal(xml_callable(0x00, a, []), ConformanceDecision.NOT_APPLICABLE) + + @async_test_body + async def test_conformance_not_term_optional(self): + # single feature not optional + xml = ('' + '' + '' + '' + '') + et = ElementTree.fromstring(xml) + xml_callable = parse_callable_from_xml(et, self.params) + for i, f in enumerate(self.feature_maps): + if not self.has_ab[i]: + asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.OPTIONAL) + else: + asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.NOT_APPLICABLE) + + xml = ('' + '' + '' + '' + '') + et = ElementTree.fromstring(xml) + xml_callable = parse_callable_from_xml(et, self.params) + for i, f in enumerate(self.feature_maps): + if not self.has_cd[i]: + asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.OPTIONAL) + else: + asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.NOT_APPLICABLE) + + @async_test_body + async def test_conformance_and_term(self): + # and term for features only + xml = ('' + '' + '' + '' + '' + '') + et = ElementTree.fromstring(xml) + xml_callable = parse_callable_from_xml(et, self.params) + for i, f in enumerate(self.feature_maps): + if self.has_ab[i] and self.has_cd[i]: + asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.MANDATORY) + else: + asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.NOT_APPLICABLE) + + # and term for attributes only + xml = ('' + '' + '' + '' + '' + '') + et = ElementTree.fromstring(xml) + xml_callable = parse_callable_from_xml(et, self.params) + for i, a in enumerate(self.attribute_lists): + if self.has_attr1[i] and self.has_attr2[i]: + asserts.assert_equal(xml_callable(0x00, a, []), ConformanceDecision.MANDATORY) + else: + asserts.assert_equal(xml_callable(0x00, a, []), ConformanceDecision.NOT_APPLICABLE) + + # and term for feature and attribute + xml = ('' + '' + '' + '' + '' + '') + et = ElementTree.fromstring(xml) + xml_callable = parse_callable_from_xml(et, self.params) + for i, f in enumerate(self.feature_maps): + for j, a in enumerate(self.attribute_lists): + if self.has_ab[i] and self.has_attr2[j]: + asserts.assert_equal(xml_callable(f, a, []), ConformanceDecision.MANDATORY) + else: + asserts.assert_equal(xml_callable(f, a, []), ConformanceDecision.NOT_APPLICABLE) + + @async_test_body + async def test_conformance_or_term(self): + # or term feature only + xml = ('' + '' + '' + '' + '' + '') + et = ElementTree.fromstring(xml) + xml_callable = parse_callable_from_xml(et, self.params) + for i, f in enumerate(self.feature_maps): + if self.has_ab[i] or self.has_cd[i]: + asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.MANDATORY) + else: + asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.NOT_APPLICABLE) + + # or term attribute only + xml = ('' + '' + '' + '' + '' + '') + et = ElementTree.fromstring(xml) + xml_callable = parse_callable_from_xml(et, self.params) + for i, a in enumerate(self.attribute_lists): + if self.has_attr1[i] or self.has_attr2[i]: + asserts.assert_equal(xml_callable(0x00, a, []), ConformanceDecision.MANDATORY) + else: + asserts.assert_equal(xml_callable(0x00, a, []), ConformanceDecision.NOT_APPLICABLE) + + # or term feature and attribute + xml = ('' + '' + '' + '' + '' + '') + et = ElementTree.fromstring(xml) + xml_callable = parse_callable_from_xml(et, self.params) + for i, f in enumerate(self.feature_maps): + for j, a in enumerate(self.attribute_lists): + if self.has_ab[i] or self.has_attr2[j]: + asserts.assert_equal(xml_callable(f, a, []), ConformanceDecision.MANDATORY) + else: + asserts.assert_equal(xml_callable(f, a, []), ConformanceDecision.NOT_APPLICABLE) + + @async_test_body + async def test_conformance_and_term_with_not(self): + # and term with not + xml = ('' + '' + '' + '' + '' + '' + '' + '') + et = ElementTree.fromstring(xml) + xml_callable = parse_callable_from_xml(et, self.params) + for i, f in enumerate(self.feature_maps): + if not self.has_ab[i] and self.has_cd[i]: + asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.OPTIONAL) + else: + asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.NOT_APPLICABLE) + + @async_test_body + async def test_conformance_or_term_with_not(self): + # or term with not on second feature + xml = ('' + '' + '' + '' + '' + '' + '' + '') + et = ElementTree.fromstring(xml) + xml_callable = parse_callable_from_xml(et, self.params) + for i, f in enumerate(self.feature_maps): + if self.has_ab[i] or not self.has_cd[i]: + asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.MANDATORY) + else: + asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.NOT_APPLICABLE) + + # not around or term with + xml = ('' + '' + '' + '' + '' + '' + '' + '') + et = ElementTree.fromstring(xml) + xml_callable = parse_callable_from_xml(et, self.params) + for i, f in enumerate(self.feature_maps): + if not (self.has_ab[i] or self.has_cd[i]): + asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.OPTIONAL) + else: + asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.NOT_APPLICABLE) + + @async_test_body + async def test_conformance_and_term_with_three_terms(self): + # and term with three features + xml = ('' + '' + '' + '' + '' + '' + '') + self.feature_names_to_bits['EF'] = 0x04 + et = ElementTree.fromstring(xml) + xml_callable = parse_callable_from_xml(et, self.params) + # no features + asserts.assert_equal(xml_callable(0x00, [], []), ConformanceDecision.NOT_APPLICABLE) + # one feature + asserts.assert_equal(xml_callable(0x01, [], []), ConformanceDecision.NOT_APPLICABLE) + # all features + asserts.assert_equal(xml_callable(0x07, [], []), ConformanceDecision.OPTIONAL) + + # and term with one of each + xml = ('' + '' + '' + '' + '' + '' + '') + et = ElementTree.fromstring(xml) + xml_callable = parse_callable_from_xml(et, self.params) + for i, f in enumerate(self.feature_maps): + for j, a in enumerate(self.attribute_lists): + for k, c in enumerate(self.cmd_lists): + if self.has_ab[i] and self.has_attr1[j] and self.has_cmd1[k]: + asserts.assert_equal(xml_callable(f, a, c), ConformanceDecision.OPTIONAL) + else: + asserts.assert_equal(xml_callable(f, a, c), ConformanceDecision.NOT_APPLICABLE) + + @async_test_body + async def test_conformance_or_term_with_three_terms(self): + # or term with three features + xml = ('' + '' + '' + '' + '' + '' + '') + et = ElementTree.fromstring(xml) + xml_callable = parse_callable_from_xml(et, self.params) + # no features + asserts.assert_equal(xml_callable(0x00, [], []), ConformanceDecision.NOT_APPLICABLE) + # one feature + asserts.assert_equal(xml_callable(0x01, [], []), ConformanceDecision.OPTIONAL) + # all features + asserts.assert_equal(xml_callable(0x07, [], []), ConformanceDecision.OPTIONAL) + + # or term with one of each + xml = ('' + '' + '' + '' + '' + '' + '') + et = ElementTree.fromstring(xml) + xml_callable = parse_callable_from_xml(et, self.params) + for i, f in enumerate(self.feature_maps): + for j, a in enumerate(self.attribute_lists): + for k, c in enumerate(self.cmd_lists): + if self.has_ab[i] or self.has_attr1[j] or self.has_cmd1[k]: + asserts.assert_equal(xml_callable(f, a, c), ConformanceDecision.OPTIONAL) + else: + asserts.assert_equal(xml_callable(f, a, c), ConformanceDecision.NOT_APPLICABLE) + + def test_conformance_otherwise(self): + # AB, O + xml = ('' + '' + '' + '' + '' + '') + et = ElementTree.fromstring(xml) + xml_callable = parse_callable_from_xml(et, self.params) + for i, f in enumerate(self.feature_maps): + if self.has_ab[i]: + asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.MANDATORY) + else: + asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.OPTIONAL) + + # AB, [CD] + xml = ('' + '' + '' + '' + '' + '' + '' + '') + et = ElementTree.fromstring(xml) + xml_callable = parse_callable_from_xml(et, self.params) + for i, f in enumerate(self.feature_maps): + if self.has_ab[i]: + asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.MANDATORY) + elif self.has_cd[i]: + asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.OPTIONAL) + else: + asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.NOT_APPLICABLE) + + # AB & !CD, P + xml = ('' + '' + '' + '' + '' + '' + '' + '' + '' + '' + '') + et = ElementTree.fromstring(xml) + xml_callable = parse_callable_from_xml(et, self.params) + for i, f in enumerate(self.feature_maps): + if self.has_ab[i] and not self.has_cd[i]: + asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.MANDATORY) + else: + asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.PROVISIONAL) + + +if __name__ == "__main__": + default_matter_test_main() diff --git a/src/python_testing/conformance_support.py b/src/python_testing/conformance_support.py new file mode 100644 index 00000000000000..2dabb584c9d0f7 --- /dev/null +++ b/src/python_testing/conformance_support.py @@ -0,0 +1,263 @@ +# +# Copyright (c) 2023 Project CHIP Authors +# All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +import xml.etree.ElementTree as ElementTree +from dataclasses import dataclass +from enum import Enum, auto +from typing import Callable + +from chip.tlv import uint + +OTHERWISE_CONFORM = 'otherwiseConform' +OPTIONAL_CONFORM = 'optionalConform' +PROVISIONAL_CONFORM = 'provisionalConform' +MANDATORY_CONFORM = 'mandatoryConform' +DEPRECATE_CONFORM = 'deprecateConform' +DISALLOW_CONFORM = 'disallowConform' +AND_TERM = 'andTerm' +OR_TERM = 'orTerm' +NOT_TERM = 'notTerm' +FEATURE_TAG = 'feature' +ATTRIBUTE_TAG = 'attribute' +COMMAND_TAG = 'command' + + +class ConformanceException(Exception): + def __init__(self, msg): + self.msg = msg + + def __str__(self): + return f"ConformanceException({self.msg})" + + +class ConformanceDecision(Enum): + MANDATORY = auto() + OPTIONAL = auto() + NOT_APPLICABLE = auto() + DISALLOWED = auto() + PROVISIONAL = auto() + + +@dataclass +class ConformanceParseParameters: + feature_map: dict[str, uint] + attribute_map: dict[str, uint] + command_map: dict[str, uint] + + +def conformance_allowed(conformance_decision: ConformanceDecision, allow_provisional: bool): + if conformance_decision == ConformanceDecision.NOT_APPLICABLE or conformance_decision == ConformanceDecision.DISALLOWED: + return False + if conformance_decision == ConformanceDecision.PROVISIONAL: + return allow_provisional + return True + + +def mandatory(feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision: + return ConformanceDecision.MANDATORY + + +def optional(feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision: + return ConformanceDecision.OPTIONAL + + +def deprecated(feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision: + return ConformanceDecision.DISALLOWED + + +def disallowed(feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision: + return ConformanceDecision.DISALLOWED + + +def provisional(feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision: + return ConformanceDecision.PROVISIONAL + + +def feature(requiredFeature: uint) -> Callable: + def feature_inner(feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision: + if requiredFeature & feature_map != 0: + return ConformanceDecision.MANDATORY + return ConformanceDecision.NOT_APPLICABLE + return feature_inner + + +def attribute(requiredAttribute: uint) -> Callable: + def attribute_inner(feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision: + if requiredAttribute in attribute_list: + return ConformanceDecision.MANDATORY + return ConformanceDecision.NOT_APPLICABLE + return attribute_inner + + +def command(requiredCommand: uint) -> Callable: + def command_inner(feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision: + if requiredCommand in all_command_list: + return ConformanceDecision.MANDATORY + return ConformanceDecision.NOT_APPLICABLE + return command_inner + + +def optional_wrapper(op: Callable) -> Callable: + def optional_wrapper_inner(feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision: + decision = op(feature_map, attribute_list, all_command_list) + if decision == ConformanceDecision.MANDATORY or decision == ConformanceDecision.OPTIONAL: + return ConformanceDecision.OPTIONAL + elif decision == ConformanceDecision.NOT_APPLICABLE: + return ConformanceDecision.NOT_APPLICABLE + else: + raise ConformanceException(f'Optional wrapping invalid op {decision}') + return optional_wrapper_inner + + +def mandatory_wrapper(op: Callable) -> Callable: + def mandatory_wrapper_inner(feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision: + return op(feature_map, attribute_list, all_command_list) + return mandatory_wrapper_inner + + +def not_operation(op: Callable): + def not_operation_inner(feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision: + # not operations can't be used with anything that returns DISALLOWED + # not operations also can't be used with things that are optional + # ie, ![AB] doesn't make sense, nor does !O + decision = op(feature_map, attribute_list, all_command_list) + if decision == ConformanceDecision.OPTIONAL or decision == ConformanceDecision.DISALLOWED or decision == ConformanceDecision.PROVISIONAL: + raise ConformanceException('NOT operation on optional or disallowed item') + elif decision == ConformanceDecision.NOT_APPLICABLE: + return ConformanceDecision.MANDATORY + elif decision == ConformanceDecision.MANDATORY: + return ConformanceDecision.NOT_APPLICABLE + else: + raise ConformanceException('NOT called on item with non-conformance value') + return not_operation_inner + + +def and_operation(op_list: list[Callable]) -> Callable: + def and_operation_inner(feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision: + for op in op_list: + decision = op(feature_map, attribute_list, all_command_list) + # and operations can't happen on optional or disallowed + if decision == ConformanceDecision.OPTIONAL or decision == ConformanceDecision.DISALLOWED or decision == ConformanceDecision.PROVISIONAL: + raise ConformanceException('AND operation on optional or disallowed item') + elif decision == ConformanceDecision.NOT_APPLICABLE: + return ConformanceDecision.NOT_APPLICABLE + elif decision == ConformanceDecision.MANDATORY: + continue + else: + raise ConformanceException('Oplist item returned non-conformance value') + return ConformanceDecision.MANDATORY + return and_operation_inner + + +def or_operation(op_list: list[Callable]) -> Callable: + def or_operation_inner(feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision: + for op in op_list: + decision = op(feature_map, attribute_list, all_command_list) + if decision == ConformanceDecision.DISALLOWED or decision == ConformanceDecision.PROVISIONAL: + raise ConformanceException('OR operation on optional or disallowed item') + elif decision == ConformanceDecision.NOT_APPLICABLE: + continue + elif decision == ConformanceDecision.MANDATORY: + return ConformanceDecision.MANDATORY + elif decision == ConformanceDecision.OPTIONAL: + return ConformanceDecision.OPTIONAL + else: + raise ConformanceException('Oplist item returned non-conformance value') + return ConformanceDecision.NOT_APPLICABLE + return or_operation_inner + +# TODO: add xor operation once it's required +# TODO: how would equal and unequal operations work here? + + +def otherwise(op_list: list[Callable]) -> Callable: + def otherwise_inner(feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision: + # Otherwise operations apply from left to right. If any of them + # has a definite decision (optional, mandatory or disallowed), that is the one that applies + # Provisional items are meant to be marked as the first item in the list + # Deprecated items are either on their own, or follow an O as O,D. + # For O,D, optional applies (leftmost), but we should consider some way to warn here as well, + # possibly in another function + for op in op_list: + decision = op(feature_map, attribute_list, all_command_list) + if decision == ConformanceDecision.NOT_APPLICABLE: + continue + return decision + return ConformanceDecision.NOT_APPLICABLE + return otherwise_inner + + +def parse_callable_from_xml(element: ElementTree.Element, params: ConformanceParseParameters) -> Callable: + if len(list(element)) == 0: + # no subchildren here, so this can only be mandatory, optional, provisional, deprecated, disallowed, feature or attribute + if element.tag == MANDATORY_CONFORM: + return mandatory + elif element.tag == OPTIONAL_CONFORM: + return optional + elif element.tag == PROVISIONAL_CONFORM: + return provisional + elif element.tag == DEPRECATE_CONFORM: + return deprecated + elif element.tag == DISALLOW_CONFORM: + return disallowed + elif element.tag == FEATURE_TAG: + try: + return feature(params.feature_map[element.get('name')]) + except KeyError: + raise ConformanceException(f'Conformance specifies feature not in feature table: {element.get("name")}') + elif element.tag == ATTRIBUTE_TAG: + # Some command conformance tags are marked as attribute, so if this key isn't in attribute, try command + name = element.get('name') + if name in params.attribute_map: + return attribute(params.attribute_map[name]) + elif name in params.command_map: + return command(params.command_map[name]) + else: + raise ConformanceException(f'Conformance specifies attribute or command not in table: {name}') + elif element.tag == COMMAND_TAG: + return command(params.command_map[element.get('name')]) + else: + raise ConformanceException( + f'Unexpected xml conformance element with no children {str(element.tag)} {str(element.attrib)}') + + # First build the list, then create the callable for this element + ops = [] + for sub in element: + ops.append(parse_callable_from_xml(sub, params)) + + # optional can be a wrapper as well as a standalone + # This can be any of the boolean operations, optional or otherwise + if element.tag == OPTIONAL_CONFORM: + if len(ops) > 1: + raise ConformanceException(f'OPTIONAL term found with more than one subelement {list(element)}') + return optional_wrapper(ops[0]) + elif element.tag == MANDATORY_CONFORM: + if len(ops) > 1: + raise ConformanceException(f'MANDATORY term found with more than one subelement {list(element)}') + return mandatory_wrapper(ops[0]) + elif element.tag == AND_TERM: + return and_operation(ops) + elif element.tag == OR_TERM: + return or_operation(ops) + elif element.tag == NOT_TERM: + if len(ops) > 1: + raise ConformanceException(f'NOT term found with more than one subelement {list(element)}') + return not_operation(ops[0]) + elif element.tag == OTHERWISE_CONFORM: + return otherwise(ops) + else: + raise ConformanceException(f'Unexpected conformance tag with children {element}') diff --git a/src/python_testing/matter_testing_support.py b/src/python_testing/matter_testing_support.py index a394952445de60..398a01f6cd9d17 100644 --- a/src/python_testing/matter_testing_support.py +++ b/src/python_testing/matter_testing_support.py @@ -333,6 +333,19 @@ class CommandPathLocation: cluster_id: int command_id: int + +@dataclass +class ClusterPathLocation: + endpoint_id: int + cluster_id: int + + +@dataclass +class FeaturePathLocation: + endpoint_id: int + cluster_id: int + feature_code: str + # ProblemSeverity is not using StrEnum, but rather Enum, since StrEnum only # appeared in 3.11. To make it JSON serializable easily, multiple inheritance # from `str` is used. See https://stackoverflow.com/a/51976841. @@ -347,7 +360,7 @@ class ProblemSeverity(str, Enum): @dataclass class ProblemNotice: test_name: str - location: Union[AttributePathLocation, EventPathLocation, CommandPathLocation] + location: Union[AttributePathLocation, EventPathLocation, CommandPathLocation, ClusterPathLocation, FeaturePathLocation] severity: ProblemSeverity problem: str spec_location: str = "" @@ -551,13 +564,13 @@ async def send_single_cmd( def print_step(self, stepnum: typing.Union[int, str], title: str) -> None: logging.info(f'***** Test Step {stepnum} : {title}') - def record_error(self, test_name: str, location: Union[AttributePathLocation, EventPathLocation, CommandPathLocation], problem: str, spec_location: str = ""): + def record_error(self, test_name: str, location: Union[AttributePathLocation, EventPathLocation, CommandPathLocation, ClusterPathLocation, FeaturePathLocation], problem: str, spec_location: str = ""): self.problems.append(ProblemNotice(test_name, location, ProblemSeverity.ERROR, problem, spec_location)) - def record_warning(self, test_name: str, location: Union[AttributePathLocation, EventPathLocation, CommandPathLocation], problem: str, spec_location: str = ""): + def record_warning(self, test_name: str, location: Union[AttributePathLocation, EventPathLocation, CommandPathLocation, ClusterPathLocation, FeaturePathLocation], problem: str, spec_location: str = ""): self.problems.append(ProblemNotice(test_name, location, ProblemSeverity.WARNING, problem, spec_location)) - def record_note(self, test_name: str, location: Union[AttributePathLocation, EventPathLocation, CommandPathLocation], problem: str, spec_location: str = ""): + def record_note(self, test_name: str, location: Union[AttributePathLocation, EventPathLocation, CommandPathLocation, ClusterPathLocation, FeaturePathLocation], problem: str, spec_location: str = ""): self.problems.append(ProblemNotice(test_name, location, ProblemSeverity.NOTE, problem, spec_location)) def get_setup_payload_info(self) -> SetupPayloadInfo: diff --git a/src/python_testing/spec_parsing_support.py b/src/python_testing/spec_parsing_support.py new file mode 100644 index 00000000000000..9e014aa95dd2aa --- /dev/null +++ b/src/python_testing/spec_parsing_support.py @@ -0,0 +1,343 @@ +# +# Copyright (c) 2023 Project CHIP Authors +# All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +import glob +import logging +import os +import xml.etree.ElementTree as ElementTree +from copy import deepcopy +from dataclasses import dataclass +from enum import Enum, auto +from typing import Callable + +from chip.tlv import uint +from conformance_support import (DEPRECATE_CONFORM, DISALLOW_CONFORM, MANDATORY_CONFORM, OPTIONAL_CONFORM, OTHERWISE_CONFORM, + PROVISIONAL_CONFORM, ConformanceDecision, ConformanceException, ConformanceParseParameters, + or_operation, parse_callable_from_xml) +from matter_testing_support import (AttributePathLocation, ClusterPathLocation, CommandPathLocation, EventPathLocation, + FeaturePathLocation, ProblemNotice, ProblemSeverity) + + +@dataclass +class XmlFeature: + code: str + name: str + conformance: Callable[[uint], ConformanceDecision] + + +@dataclass +class XmlAttribute: + name: str + datatype: str + conformance: Callable[[uint], ConformanceDecision] + + +@dataclass +class XmlCommand: + name: str + conformance: Callable[[uint], ConformanceDecision] + + +@dataclass +class XmlEvent: + name: str + conformance: Callable[[uint], ConformanceDecision] + + +@dataclass +class XmlCluster: + name: str + revision: int + derived: str + feature_map: dict[str, uint] + attribute_map: dict[str, uint] + command_map: dict[str, uint] + features: dict[str, XmlFeature] + attributes: dict[uint, XmlAttribute] + accepted_commands: dict[uint, XmlCommand] + generated_commands: dict[uint, XmlCommand] + events: dict[uint, XmlEvent] + + +class CommandType(Enum): + ACCEPTED = auto() + GENERATED = auto() + + +def has_zigbee_conformance(conformance: ElementTree.Element) -> bool: + # For clusters, things with zigbee conformance can share IDs with the matter elements, so we don't want them + + # TODO: it's actually possible for a thing to have a zigbee conformance AND to have other conformances, and we should check + # for that, but for now, this is fine because that hasn't happened in the cluster conformances YET. + # It does happen for device types, so we need to be careful there. + condition = conformance.iter('condition') + for c in condition: + try: + c.attrib['name'].lower() == "zigbee" + return True + except KeyError: + continue + return False + + +class ClusterParser: + def __init__(self, cluster, cluster_id, name): + self._problems: list[ProblemNotice] = [] + self._cluster = cluster + self._cluster_id = cluster_id + self._name = name + + self._derived = None + try: + classification = next(cluster.iter('classification')) + hierarchy = classification.attrib['hierarchy'] + if hierarchy.lower() == 'derived': + self._derived = classification.attrib['baseCluster'] + except (KeyError, StopIteration): + self._derived = None + + self.feature_elements = self.get_all_feature_elements() + self.attribute_elements = self.get_all_attribute_elements() + self.command_elements = self.get_all_command_elements() + self.event_elements = self.get_all_event_elements() + self.params = ConformanceParseParameters(feature_map=self.create_feature_map(), attribute_map=self.create_attribute_map(), + command_map=self.create_command_map()) + + def get_conformance(self, element: ElementTree.Element) -> ElementTree.Element: + for sub in element: + if sub.tag == OTHERWISE_CONFORM or sub.tag == MANDATORY_CONFORM or sub.tag == OPTIONAL_CONFORM or sub.tag == PROVISIONAL_CONFORM or sub.tag == DEPRECATE_CONFORM or sub.tag == DISALLOW_CONFORM: + return sub + + # Conformance is missing, so let's record the problem and treat it as optional for lack of a better choice + if element.tag == 'feature': + location = FeaturePathLocation(endpoint_id=0, cluster_id=self._cluster_id, feature_code=element.attrib['code']) + elif element.tag == 'command': + location = CommandPathLocation(endpoint_id=0, cluster_id=self._cluster_id, command_id=element.attrib['id']) + elif element.tag == 'attribute': + location = AttributePathLocation(endpoint_id=0, cluster_id=self._cluster_id, attribute_id=element.attrib['id']) + elif element.tag == 'event': + location = EventPathLocation(endpoint_id=0, cluster_id=self._cluster_id, event_id=element.attrib['id']) + else: + location = ClusterPathLocation(endpoing_id=0, cluster_id=self._cluster_id) + self._problems.append(ProblemNotice(test_name='Spec XML parsing', location=location, + severity=ProblemSeverity.WARNING, problem='Unable to find conformance element')) + + return ElementTree.Element(OPTIONAL_CONFORM) + + def get_all_type(self, type_container: str, type_name: str, key_name: str) -> list[tuple[ElementTree.Element, ElementTree.Element]]: + ret = [] + container_tags = self._cluster.iter(type_container) + for container in container_tags: + elements = container.iter(type_name) + for element in elements: + try: + element.attrib[key_name] + except KeyError: + # This is a conformance tag, which uses the same name + continue + conformance = self.get_conformance(element) + if has_zigbee_conformance(conformance): + continue + ret.append((element, conformance)) + return ret + + def get_all_feature_elements(self) -> list[tuple[ElementTree.Element, ElementTree.Element]]: + ''' Returns a list of features and their conformances''' + return self.get_all_type('features', 'feature', 'code') + + def get_all_attribute_elements(self) -> list[tuple[ElementTree.Element, ElementTree.Element]]: + ''' Returns a list of attributes and their conformances''' + return self.get_all_type('attributes', 'attribute', 'id') + + def get_all_command_elements(self) -> list[tuple[ElementTree.Element, ElementTree.Element]]: + ''' Returns a list of commands and their conformances ''' + return self.get_all_type('commands', 'command', 'id') + + def get_all_event_elements(self) -> list[tuple[ElementTree.Element, ElementTree.Element]]: + ''' Returns a list of events and their conformances''' + return self.get_all_type('events', 'event', 'id') + + def create_feature_map(self) -> dict[str, uint]: + features = {} + for element, conformance in self.feature_elements: + features[element.attrib['code']] = 1 << int(element.attrib['bit'], 0) + return features + + def create_attribute_map(self) -> dict[str, uint]: + attributes = {} + for element, conformance in self.attribute_elements: + attributes[element.attrib['name']] = int(element.attrib['id'], 0) + return attributes + + def create_command_map(self) -> dict[str, uint]: + commands = {} + for element, conformance in self.command_elements: + commands[element.attrib['name']] = int(element.attrib['id'], 0) + return commands + + def parse_conformance(self, conformance_xml: ElementTree.Element) -> Callable: + try: + return parse_callable_from_xml(conformance_xml, self.params) + except ConformanceException as ex: + # Just point to the general cluster, because something is mismatched, but it's not clear what + location = ClusterPathLocation(endpoint_id=0, cluster_id=self._cluster_id) + self._problems.append(ProblemNotice(test_name='Spec XML parsing', location=location, + severity=ProblemSeverity.WARNING, problem=str(ex))) + return None + + def parse_features(self) -> dict[uint, XmlFeature]: + features = {} + for element, conformance_xml in self.feature_elements: + mask = 1 << int(element.attrib['bit'], 0) + conformance = self.parse_conformance(conformance_xml) + if conformance is None: + continue + features[mask] = XmlFeature(code=element.attrib['code'], name=element.attrib['name'], + conformance=conformance) + return features + + def parse_attributes(self) -> dict[uint, XmlAttribute]: + attributes = {} + for element, conformance_xml in self.attribute_elements: + code = int(element.attrib['id'], 0) + # Some deprecated attributes don't have their types included, for now, lets just fallback to UNKNOWN + try: + datatype = element.attrib['type'] + except KeyError: + datatype = 'UNKNOWN' + conformance = self.parse_conformance(conformance_xml) + if conformance is None: + continue + if code in attributes: + # This is one of those fun ones where two different rows have the same id and name, but differ in conformance and ranges + # I don't have a good way to relate the ranges to the conformance, but they're both acceptable, so let's just or them. + conformance = or_operation([conformance, attributes[code].conformance]) + attributes[code] = XmlAttribute(name=element.attrib['name'], datatype=datatype, + conformance=conformance) + return attributes + + def parse_commands(self, command_type: CommandType) -> dict[uint, XmlAttribute]: + commands = {} + for element, conformance_xml in self.command_elements: + code = int(element.attrib['id'], 0) + dir = CommandType.ACCEPTED + try: + if element.attrib['direction'].lower() == 'responsefromserver': + dir = CommandType.GENERATED + except KeyError: + pass + if dir != command_type: + continue + code = int(element.attrib['id'], 0) + conformance = self.parse_conformance(conformance_xml) + if conformance is None: + continue + if code in commands: + conformance = or_operation([conformance, commands[code].conformance]) + commands[code] = XmlCommand(name=element.attrib['name'], conformance=conformance) + return commands + + def parse_events(self) -> dict[uint, XmlAttribute]: + events = {} + for element, conformance_xml in self.event_elements: + code = int(element.attrib['id'], 0) + conformance = self.parse_conformance(conformance_xml) + if conformance is None: + continue + if code in events: + conformance = or_operation([conformance, events[code].conformance]) + events[code] = XmlEvent(name=element.attrib['name'], conformance=conformance) + return events + + def create_cluster(self) -> XmlCluster: + return XmlCluster(revision=self._cluster.attrib['revision'], derived=self._derived, + name=self._name, feature_map=self.params.feature_map, + attribute_map=self.params.attribute_map, command_map=self.params.command_map, + features=self.parse_features(), + attributes=self.parse_attributes(), + accepted_commands=self.parse_commands(CommandType.ACCEPTED), + generated_commands=self.parse_commands(CommandType.GENERATED), + events=self.parse_events()) + + def get_problems(self) -> list[ProblemNotice]: + return self._problems + + +def build_xml_clusters() -> tuple[list[XmlCluster], list[ProblemNotice]]: + dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), '..', '..', 'data_model', 'clusters') + clusters: dict[int, XmlCluster] = {} + derived_clusters: dict[str, XmlCluster] = {} + ids_by_name = {} + problems = [] + for xml in glob.glob(f"{dir}/*.xml"): + logging.info(f'Parsing file {xml}') + tree = ElementTree.parse(f'{xml}') + root = tree.getroot() + cluster = root.iter('cluster') + for c in cluster: + name = c.attrib['name'] + if not c.attrib['id']: + # Fully derived clusters have no id, but also shouldn't appear on a device. + # We do need to keep them, though, because we need to update the derived + # clusters. We keep them in a special dict by name, so they can be thrown + # away later. + cluster_id = None + else: + cluster_id = int(c.attrib['id'], 0) + ids_by_name[name] = cluster_id + + parser = ClusterParser(c, cluster_id, name) + new = parser.create_cluster() + problems = problems + parser.get_problems() + + if cluster_id: + clusters[cluster_id] = new + else: + derived_clusters[name] = new + + # We have the information now about which clusters are derived, so we need to fix them up. Apply first the base cluster, + # then add the specific cluster overtop + for id, c in clusters.items(): + if c.derived: + base_name = c.derived + if base_name in ids_by_name: + base = clusters[ids_by_name[c.derived]] + else: + base = derived_clusters[base_name] + + feature_map = deepcopy(base.feature_map) + feature_map.update(c.feature_map) + attribute_map = deepcopy(base.attribute_map) + attribute_map.update(c.attribute_map) + command_map = deepcopy(base.command_map) + command_map.update(c.command_map) + features = deepcopy(base.features) + features.update(c.features) + attributes = deepcopy(base.attributes) + attributes.update(c.attributes) + accepted_commands = deepcopy(base.accepted_commands) + accepted_commands.update(c.accepted_commands) + generated_commands = deepcopy(base.generated_commands) + generated_commands.update(c.generated_commands) + events = deepcopy(base.events) + events.update(c.events) + new = XmlCluster(revision=c.revision, derived=c.derived, name=c.name, + feature_map=feature_map, attribute_map=attribute_map, command_map=command_map, + features=features, attributes=attributes, accepted_commands=accepted_commands, + generated_commands=generated_commands, events=events) + clusters[id] = new + return clusters, problems From aff06def68166c35a04ec79bd1caa6347c33b131 Mon Sep 17 00:00:00 2001 From: Karsten Sperling <113487422+ksperling-apple@users.noreply.github.com> Date: Sat, 28 Oct 2023 08:49:12 +1300 Subject: [PATCH 09/41] Add support for CertDecodeFlags to DecodeChipCert (#30013) * Add support for CertDecodeFlags to DecodeChipCert This moves support for generating the TBSHash during decoding from ChipCertificateSet::LoadCert to DecodeChipCert. LoadCert can now delegate to DecodeChipCert and only contains a few extra checks to retain existing behavior. * Add ASN1Writer.IsNullWriter() and use it internally * Avoid conversion work in DecodeConvertECDSASignature if using a null writer The original LoadCert avoided this work by calling DecodeECDSASignature directly, so this brings the refactored version back to baseline. * Add test for DecodeChipCert with different options --- src/credentials/CHIPCert.cpp | 72 +++----------------------- src/credentials/CHIPCert.h | 5 +- src/credentials/CHIPCertToX509.cpp | 65 ++++++++++++++++++----- src/credentials/tests/TestChipCert.cpp | 29 +++++++++++ src/lib/asn1/ASN1.h | 2 + src/lib/asn1/ASN1Writer.cpp | 45 +++++++--------- 6 files changed, 111 insertions(+), 107 deletions(-) diff --git a/src/credentials/CHIPCert.cpp b/src/credentials/CHIPCert.cpp index 8a651e78b7b21b..425d30a2d9a396 100644 --- a/src/credentials/CHIPCert.cpp +++ b/src/credentials/CHIPCert.cpp @@ -54,9 +54,6 @@ using namespace chip::TLV; using namespace chip::Protocols; using namespace chip::Crypto; -extern CHIP_ERROR DecodeConvertTBSCert(TLVReader & reader, ASN1Writer & writer, ChipCertificateData & certData); -extern CHIP_ERROR DecodeECDSASignature(TLVReader & reader, ChipCertificateData & certData); - ChipCertificateSet::ChipCertificateSet() { mCerts = nullptr; @@ -137,76 +134,21 @@ CHIP_ERROR ChipCertificateSet::LoadCert(const ByteSpan chipCert, BitFlags decodeFlags, ByteSpan chipCert) { - ASN1Writer writer; // ASN1Writer is used to encode TBS portion of the certificate for the purpose of signature - // validation, which should be performed on the TBS data encoded in ASN.1 DER form. ChipCertificateData cert; - cert.Clear(); - - // Must be positioned on the structure element representing the certificate. - VerifyOrReturnError(reader.GetType() == kTLVType_Structure, CHIP_ERROR_INVALID_ARGUMENT); - - cert.mCertificate = chipCert; - - { - TLVType containerType; + ReturnErrorOnFailure(DecodeChipCert(reader, cert, decodeFlags)); - // Enter the certificate structure... - ReturnErrorOnFailure(reader.EnterContainer(containerType)); + // Verify the cert has both the Subject Key Id and Authority Key Id extensions present. + // Only certs with both these extensions are supported for the purposes of certificate validation. + VerifyOrReturnError(cert.mCertFlags.HasAll(CertFlags::kExtPresent_SubjectKeyId, CertFlags::kExtPresent_AuthKeyId), + CHIP_ERROR_UNSUPPORTED_CERT_FORMAT); - // If requested to generate the TBSHash. - if (decodeFlags.Has(CertDecodeFlags::kGenerateTBSHash)) - { - chip::Platform::ScopedMemoryBuffer asn1TBSBuf; - ReturnErrorCodeIf(!asn1TBSBuf.Alloc(kMaxCHIPCertDecodeBufLength), CHIP_ERROR_NO_MEMORY); - - // Initialize an ASN1Writer and convert the TBS (to-be-signed) portion of the certificate to ASN.1 DER - // encoding. At the same time, parse various components within the certificate and set the corresponding - // fields in the CertificateData object. - writer.Init(asn1TBSBuf.Get(), kMaxCHIPCertDecodeBufLength); - ReturnErrorOnFailure(DecodeConvertTBSCert(reader, writer, cert)); - - // Generate a SHA hash of the encoded TBS certificate. - chip::Crypto::Hash_SHA256(asn1TBSBuf.Get(), writer.GetLengthWritten(), cert.mTBSHash); - - cert.mCertFlags.Set(CertFlags::kTBSHashPresent); - } - else - { - // Initialize an ASN1Writer as a NullWriter. - writer.InitNullWriter(); - ReturnErrorOnFailure(DecodeConvertTBSCert(reader, writer, cert)); - } - - // Verify the cert has both the Subject Key Id and Authority Key Id extensions present. - // Only certs with both these extensions are supported for the purposes of certificate validation. - VerifyOrReturnError(cert.mCertFlags.HasAll(CertFlags::kExtPresent_SubjectKeyId, CertFlags::kExtPresent_AuthKeyId), - CHIP_ERROR_UNSUPPORTED_CERT_FORMAT); - - // Verify the cert was signed with ECDSA-SHA256. This is the only signature algorithm currently supported. - VerifyOrReturnError(cert.mSigAlgoOID == kOID_SigAlgo_ECDSAWithSHA256, CHIP_ERROR_UNSUPPORTED_SIGNATURE_TYPE); - - // Decode the certificate's signature... - ReturnErrorOnFailure(DecodeECDSASignature(reader, cert)); - - // Verify no more elements in the certificate. - ReturnErrorOnFailure(reader.VerifyEndOfContainer()); - - ReturnErrorOnFailure(reader.ExitContainer(containerType)); - } - - // If requested by the caller, mark the certificate as trusted. - if (decodeFlags.Has(CertDecodeFlags::kIsTrustAnchor)) - { - cert.mCertFlags.Set(CertFlags::kIsTrustAnchor); - } + // Verify the cert was signed with ECDSA-SHA256. This is the only signature algorithm currently supported. + VerifyOrReturnError(cert.mSigAlgoOID == kOID_SigAlgo_ECDSAWithSHA256, CHIP_ERROR_UNSUPPORTED_SIGNATURE_TYPE); // Check if this cert matches any currently loaded certificates for (uint32_t i = 0; i < mCertCount; i++) diff --git a/src/credentials/CHIPCert.h b/src/credentials/CHIPCert.h index caa47babae7375..69041f018d773d 100644 --- a/src/credentials/CHIPCert.h +++ b/src/credentials/CHIPCert.h @@ -458,7 +458,7 @@ struct ChipCertificateData * * @return Returns a CHIP_ERROR on error, CHIP_NO_ERROR otherwise **/ -CHIP_ERROR DecodeChipCert(const ByteSpan chipCert, ChipCertificateData & certData); +CHIP_ERROR DecodeChipCert(const ByteSpan chipCert, ChipCertificateData & certData, BitFlags decodeFlags = {}); /** * @brief Decode CHIP certificate. @@ -470,7 +470,8 @@ CHIP_ERROR DecodeChipCert(const ByteSpan chipCert, ChipCertificateData & certDat * * @return Returns a CHIP_ERROR on error, CHIP_NO_ERROR otherwise **/ -CHIP_ERROR DecodeChipCert(chip::TLV::TLVReader & reader, ChipCertificateData & certData); +CHIP_ERROR DecodeChipCert(chip::TLV::TLVReader & reader, ChipCertificateData & certData, + BitFlags decodeFlags = {}); /** * @brief Decode CHIP Distinguished Name (DN). diff --git a/src/credentials/CHIPCertToX509.cpp b/src/credentials/CHIPCertToX509.cpp index 85e75147458d62..228aaf276796bf 100644 --- a/src/credentials/CHIPCertToX509.cpp +++ b/src/credentials/CHIPCertToX509.cpp @@ -454,7 +454,7 @@ static CHIP_ERROR DecodeConvertExtensions(TLVReader & reader, ASN1Writer & write return err; } -CHIP_ERROR DecodeECDSASignature(TLVReader & reader, ChipCertificateData & certData) +static CHIP_ERROR DecodeECDSASignature(TLVReader & reader, ChipCertificateData & certData) { ReturnErrorOnFailure(reader.Next(kTLVType_ByteString, ContextTag(kTag_ECDSASignature))); ReturnErrorOnFailure(reader.Get(certData.mSignature)); @@ -467,6 +467,9 @@ static CHIP_ERROR DecodeConvertECDSASignature(TLVReader & reader, ASN1Writer & w ReturnErrorOnFailure(DecodeECDSASignature(reader, certData)); + // Converting the signature is a bit of work, so explicitly check if we have a null writer + ReturnErrorCodeIf(writer.IsNullWriter(), CHIP_NO_ERROR); + // signatureValue BIT STRING // Per RFC3279, the ECDSA signature value is encoded in DER encapsulated in the signatureValue BIT STRING. ASN1_START_BIT_STRING_ENCAPSULATED @@ -492,7 +495,7 @@ static CHIP_ERROR DecodeConvertECDSASignature(TLVReader & reader, ASN1Writer & w * * @return Returns a CHIP_ERROR on error, CHIP_NO_ERROR otherwise **/ -CHIP_ERROR DecodeConvertTBSCert(TLVReader & reader, ASN1Writer & writer, ChipCertificateData & certData) +static CHIP_ERROR DecodeConvertTBSCert(TLVReader & reader, ASN1Writer & writer, ChipCertificateData & certData) { CHIP_ERROR err; @@ -550,7 +553,18 @@ CHIP_ERROR DecodeConvertTBSCert(TLVReader & reader, ASN1Writer & writer, ChipCer return err; } -static CHIP_ERROR DecodeConvertCert(TLVReader & reader, ASN1Writer & writer, ChipCertificateData & certData) +/** + * Decode a CHIP TLV certificate and convert it to X.509 DER form. + * + * This helper function takes separate ASN1Writers for the whole Certificate + * and the TBSCertificate, to allow the caller to control which part (if any) + * to capture. + * + * If `writer` is NOT a null writer, then `tbsWriter` MUST be a reference + * to the same writer, otherwise the overall Certificate written will not be + * valid. + */ +static CHIP_ERROR DecodeConvertCert(TLVReader & reader, ASN1Writer & writer, ASN1Writer & tbsWriter, ChipCertificateData & certData) { CHIP_ERROR err; TLVType containerType; @@ -568,7 +582,7 @@ static CHIP_ERROR DecodeConvertCert(TLVReader & reader, ASN1Writer & writer, Chi ASN1_START_SEQUENCE { // tbsCertificate TBSCertificate, - ReturnErrorOnFailure(DecodeConvertTBSCert(reader, writer, certData)); + ReturnErrorOnFailure(DecodeConvertTBSCert(reader, tbsWriter, certData)); // signatureAlgorithm AlgorithmIdentifier // AlgorithmIdentifier ::= SEQUENCE @@ -603,31 +617,56 @@ DLL_EXPORT CHIP_ERROR ConvertChipCertToX509Cert(const ByteSpan chipCert, Mutable certData.Clear(); - ReturnErrorOnFailure(DecodeConvertCert(reader, writer, certData)); + ReturnErrorOnFailure(DecodeConvertCert(reader, writer, writer, certData)); x509Cert.reduce_size(writer.GetLengthWritten()); return CHIP_NO_ERROR; } -CHIP_ERROR DecodeChipCert(const ByteSpan chipCert, ChipCertificateData & certData) +CHIP_ERROR DecodeChipCert(const ByteSpan chipCert, ChipCertificateData & certData, BitFlags decodeFlags) { TLVReader reader; reader.Init(chipCert); - - return DecodeChipCert(reader, certData); + return DecodeChipCert(reader, certData, decodeFlags); } -CHIP_ERROR DecodeChipCert(TLVReader & reader, ChipCertificateData & certData) +CHIP_ERROR DecodeChipCert(TLVReader & reader, ChipCertificateData & certData, BitFlags decodeFlags) { - ASN1Writer writer; - - writer.InitNullWriter(); + ASN1Writer nullWriter; + nullWriter.InitNullWriter(); certData.Clear(); - return DecodeConvertCert(reader, writer, certData); + if (decodeFlags.Has(CertDecodeFlags::kGenerateTBSHash)) + { + // Create a buffer and writer to capture the TBS (to-be-signed) portion of the certificate + // when we decode (and convert) the certificate, so we can hash it to create the TBSHash. + chip::Platform::ScopedMemoryBuffer asn1TBSBuf; + VerifyOrReturnError(asn1TBSBuf.Alloc(kMaxCHIPCertDecodeBufLength), CHIP_ERROR_NO_MEMORY); + ASN1Writer tbsWriter; + tbsWriter.Init(asn1TBSBuf.Get(), kMaxCHIPCertDecodeBufLength); + + ReturnErrorOnFailure(DecodeConvertCert(reader, nullWriter, tbsWriter, certData)); + + // Hash the encoded TBS certificate. Only SHA256 is supported. + VerifyOrReturnError(certData.mSigAlgoOID == kOID_SigAlgo_ECDSAWithSHA256, CHIP_ERROR_UNSUPPORTED_SIGNATURE_TYPE); + chip::Crypto::Hash_SHA256(asn1TBSBuf.Get(), tbsWriter.GetLengthWritten(), certData.mTBSHash); + certData.mCertFlags.Set(CertFlags::kTBSHashPresent); + } + else + { + ReturnErrorOnFailure(DecodeConvertCert(reader, nullWriter, nullWriter, certData)); + } + + // If requested by the caller, mark the certificate as trusted. + if (decodeFlags.Has(CertDecodeFlags::kIsTrustAnchor)) + { + certData.mCertFlags.Set(CertFlags::kIsTrustAnchor); + } + + return CHIP_NO_ERROR; } CHIP_ERROR DecodeChipDN(TLVReader & reader, ChipDN & dn) diff --git a/src/credentials/tests/TestChipCert.cpp b/src/credentials/tests/TestChipCert.cpp index 1a8da833c06173..ff79157815a79e 100644 --- a/src/credentials/tests/TestChipCert.cpp +++ b/src/credentials/tests/TestChipCert.cpp @@ -1275,6 +1275,34 @@ static void TestChipCert_CertId(nlTestSuite * inSuite, void * inContext) } } +static void TestChipCert_DecodingOptions(nlTestSuite * inSuite, void * inContext) +{ + CHIP_ERROR err; + ByteSpan cert; + ChipCertificateData certData; + + err = GetTestCert(TestCert::kRoot01, sNullLoadFlag, cert); + NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR); + + // Decode with default (null) options + err = DecodeChipCert(cert, certData); + NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR); + NL_TEST_ASSERT(inSuite, !certData.mCertFlags.Has(CertFlags::kIsTrustAnchor)); + + // Decode as trust anchor + err = DecodeChipCert(cert, certData, CertDecodeFlags::kIsTrustAnchor); + NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR); + NL_TEST_ASSERT(inSuite, certData.mCertFlags.Has(CertFlags::kIsTrustAnchor)); + + // Decode with TBS Hash calculation + err = DecodeChipCert(cert, certData, CertDecodeFlags::kGenerateTBSHash); + NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR); + NL_TEST_ASSERT(inSuite, certData.mCertFlags.Has(CertFlags::kTBSHashPresent)); + // When the TBS hash is available signature verification should work + err = VerifyCertSignature(certData, certData); // test cert is a self-signed root + NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR); +} + static void TestChipCert_LoadDuplicateCerts(nlTestSuite * inSuite, void * inContext) { CHIP_ERROR err; @@ -2147,6 +2175,7 @@ static const nlTest sTests[] = { NL_TEST_DEF("Test CHIP Certificate Usage", TestChipCert_CertUsage), NL_TEST_DEF("Test CHIP Certificate Type", TestChipCert_CertType), NL_TEST_DEF("Test CHIP Certificate ID", TestChipCert_CertId), + NL_TEST_DEF("Test CHIP Certificate Decoding Options", TestChipCert_DecodingOptions), NL_TEST_DEF("Test Loading Duplicate Certificates", TestChipCert_LoadDuplicateCerts), NL_TEST_DEF("Test CHIP Generate Root Certificate", TestChipCert_GenerateRootCert), NL_TEST_DEF("Test CHIP Generate Root Certificate with Fabric", TestChipCert_GenerateRootFabCert), diff --git a/src/lib/asn1/ASN1.h b/src/lib/asn1/ASN1.h index fd7c51872ab076..1ba31661bca4ac 100644 --- a/src/lib/asn1/ASN1.h +++ b/src/lib/asn1/ASN1.h @@ -210,6 +210,8 @@ class DLL_EXPORT ASN1Writer void InitNullWriter(void); size_t GetLengthWritten(void) const; + bool IsNullWriter() const { return mBuf == nullptr; } + CHIP_ERROR PutInteger(int64_t val); CHIP_ERROR PutBoolean(bool val); CHIP_ERROR PutObjectId(const uint8_t * val, uint16_t valLen); diff --git a/src/lib/asn1/ASN1Writer.cpp b/src/lib/asn1/ASN1Writer.cpp index 09b73d49823370..643d79038bca92 100644 --- a/src/lib/asn1/ASN1Writer.cpp +++ b/src/lib/asn1/ASN1Writer.cpp @@ -75,6 +75,8 @@ size_t ASN1Writer::GetLengthWritten() const CHIP_ERROR ASN1Writer::PutInteger(int64_t val) { + ReturnErrorCodeIf(IsNullWriter(), CHIP_NO_ERROR); + uint8_t encodedVal[sizeof(int64_t)]; uint8_t valStart, valLen; @@ -95,8 +97,7 @@ CHIP_ERROR ASN1Writer::PutInteger(int64_t val) CHIP_ERROR ASN1Writer::PutBoolean(bool val) { - // Do nothing for a null writer. - VerifyOrReturnError(mBuf != nullptr, CHIP_NO_ERROR); + ReturnErrorCodeIf(IsNullWriter(), CHIP_NO_ERROR); ReturnErrorOnFailure(EncodeHead(kASN1TagClass_Universal, kASN1UniversalTag_Boolean, false, 1)); @@ -172,11 +173,9 @@ static uint8_t HighestBit(uint32_t v) CHIP_ERROR ASN1Writer::PutBitString(uint32_t val) { - uint8_t len; - - // Do nothing for a null writer. - VerifyOrReturnError(mBuf != nullptr, CHIP_NO_ERROR); + ReturnErrorCodeIf(IsNullWriter(), CHIP_NO_ERROR); + uint8_t len; if (val == 0) len = 1; else if (val < 256) @@ -222,8 +221,7 @@ CHIP_ERROR ASN1Writer::PutBitString(uint32_t val) CHIP_ERROR ASN1Writer::PutBitString(uint8_t unusedBitCount, const uint8_t * encodedBits, uint16_t encodedBitsLen) { - // Do nothing for a null writer. - VerifyOrReturnError(mBuf != nullptr, CHIP_NO_ERROR); + ReturnErrorCodeIf(IsNullWriter(), CHIP_NO_ERROR); ReturnErrorOnFailure(EncodeHead(kASN1TagClass_Universal, kASN1UniversalTag_BitString, false, encodedBitsLen + 1)); @@ -236,11 +234,9 @@ CHIP_ERROR ASN1Writer::PutBitString(uint8_t unusedBitCount, const uint8_t * enco CHIP_ERROR ASN1Writer::PutBitString(uint8_t unusedBitCount, chip::TLV::TLVReader & tlvReader) { - ByteSpan encodedBits; - - // Do nothing for a null writer. - VerifyOrReturnError(mBuf != nullptr, CHIP_NO_ERROR); + ReturnErrorCodeIf(IsNullWriter(), CHIP_NO_ERROR); + ByteSpan encodedBits; ReturnErrorOnFailure(tlvReader.Get(encodedBits)); VerifyOrReturnError(CanCastTo(encodedBits.size() + 1), ASN1_ERROR_LENGTH_OVERFLOW); @@ -257,6 +253,8 @@ CHIP_ERROR ASN1Writer::PutBitString(uint8_t unusedBitCount, chip::TLV::TLVReader CHIP_ERROR ASN1Writer::PutTime(const ASN1UniversalTime & val) { + ReturnErrorCodeIf(IsNullWriter(), CHIP_NO_ERROR); + char buf[ASN1UniversalTime::kASN1TimeStringMaxLength]; MutableCharSpan bufSpan(buf); uint8_t tag; @@ -281,8 +279,7 @@ CHIP_ERROR ASN1Writer::PutNull() CHIP_ERROR ASN1Writer::PutConstructedType(const uint8_t * val, uint16_t valLen) { - // Do nothing for a null writer. - VerifyOrReturnError(mBuf != nullptr, CHIP_NO_ERROR); + ReturnErrorCodeIf(IsNullWriter(), CHIP_NO_ERROR); // Make sure we have enough space to write VerifyOrReturnError((mWritePoint + valLen) <= mBufEnd, ASN1_ERROR_OVERFLOW); @@ -304,8 +301,7 @@ CHIP_ERROR ASN1Writer::EndConstructedType() CHIP_ERROR ASN1Writer::StartEncapsulatedType(uint8_t cls, uint8_t tag, bool bitStringEncoding) { - // Do nothing for a null writer. - VerifyOrReturnError(mBuf != nullptr, CHIP_NO_ERROR); + ReturnErrorCodeIf(IsNullWriter(), CHIP_NO_ERROR); ReturnErrorOnFailure(EncodeHead(cls, tag, false, kUnknownLength)); @@ -328,8 +324,7 @@ CHIP_ERROR ASN1Writer::EndEncapsulatedType() CHIP_ERROR ASN1Writer::PutValue(uint8_t cls, uint8_t tag, bool isConstructed, const uint8_t * val, uint16_t valLen) { - // Do nothing for a null writer. - VerifyOrReturnError(mBuf != nullptr, CHIP_NO_ERROR); + ReturnErrorCodeIf(IsNullWriter(), CHIP_NO_ERROR); ReturnErrorOnFailure(EncodeHead(cls, tag, isConstructed, valLen)); @@ -340,11 +335,9 @@ CHIP_ERROR ASN1Writer::PutValue(uint8_t cls, uint8_t tag, bool isConstructed, co CHIP_ERROR ASN1Writer::PutValue(uint8_t cls, uint8_t tag, bool isConstructed, chip::TLV::TLVReader & tlvReader) { - ByteSpan val; - - // Do nothing for a null writer. - VerifyOrReturnError(mBuf != nullptr, CHIP_NO_ERROR); + ReturnErrorCodeIf(IsNullWriter(), CHIP_NO_ERROR); + ByteSpan val; ReturnErrorOnFailure(tlvReader.Get(val)); VerifyOrReturnError(CanCastTo(val.size()), ASN1_ERROR_LENGTH_OVERFLOW); @@ -358,12 +351,11 @@ CHIP_ERROR ASN1Writer::PutValue(uint8_t cls, uint8_t tag, bool isConstructed, ch CHIP_ERROR ASN1Writer::EncodeHead(uint8_t cls, uint8_t tag, bool isConstructed, int32_t len) { + ReturnErrorCodeIf(IsNullWriter(), CHIP_NO_ERROR); + uint8_t bytesForLen; uint32_t totalLen; - // Do nothing for a null writer. - VerifyOrReturnError(mBuf != nullptr, CHIP_NO_ERROR); - // Only tags < 31 supported. The implication of this is that encoded tags are exactly 1 byte long. VerifyOrReturnError(tag < 0x1F, ASN1_ERROR_UNSUPPORTED_ENCODING); @@ -410,8 +402,7 @@ CHIP_ERROR ASN1Writer::EncodeHead(uint8_t cls, uint8_t tag, bool isConstructed, CHIP_ERROR ASN1Writer::WriteDeferredLength() { - // Do nothing for a null writer. - VerifyOrReturnError(mBuf != nullptr, CHIP_NO_ERROR); + ReturnErrorCodeIf(IsNullWriter(), CHIP_NO_ERROR); VerifyOrReturnError(mDeferredLengthCount > 0, ASN1_ERROR_INVALID_STATE); From 5656986aa418ea4b4b83fb83d93fa768ed6f2d9b Mon Sep 17 00:00:00 2001 From: mkardous-silabs <84793247+mkardous-silabs@users.noreply.github.com> Date: Fri, 27 Oct 2023 16:29:52 -0400 Subject: [PATCH 10/41] [ICD] Update ICDM cluster revision (#30033) * update cluster revision * generated files * Restyled by prettier-yaml --------- Co-authored-by: Restyled.io --- .../all-clusters-common/all-clusters-app.matter | 2 +- .../all-clusters-common/all-clusters-app.zap | 2 +- .../light-switch-common/light-switch-app.matter | 2 +- .../light-switch-common/light-switch-app.zap | 2 +- examples/lock-app/lock-common/lock-app.matter | 2 +- examples/lock-app/lock-common/lock-app.zap | 5 +++-- .../smoke-co-alarm-common/smoke-co-alarm-app.matter | 2 +- .../smoke-co-alarm-common/smoke-co-alarm-app.zap | 2 +- src/app/tests/suites/certification/Test_TC_ICDM_1_1.yaml | 2 +- .../darwin-framework-tool/zap-generated/test/Commands.h | 2 +- 10 files changed, 12 insertions(+), 11 deletions(-) diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter index 7f3601b0078991..b394d6937818f7 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 @@ -5624,7 +5624,7 @@ endpoint 0 { callback attribute acceptedCommandList; callback attribute attributeList; ram attribute featureMap default = 1; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 2; handle command RegisterClient; handle command RegisterClientResponse; diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap index ba7c60dd255ce2..cd217d22fa0e14 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap @@ -6031,7 +6031,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "2", "reportable": 1, "minInterval": 1, "maxInterval": 65534, 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 625104b359a561..16ce5bbb18a884 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 @@ -2665,7 +2665,7 @@ endpoint 0 { callback attribute activeModeDuration default = 300; callback attribute activeModeThreshold default = 300; ram attribute featureMap default = 0x0000; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 2; } } endpoint 1 { diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.zap b/examples/light-switch-app/light-switch-common/light-switch-app.zap index 7d0f450be2d913..d3f709dc000bbb 100644 --- a/examples/light-switch-app/light-switch-common/light-switch-app.zap +++ b/examples/light-switch-app/light-switch-common/light-switch-app.zap @@ -4521,7 +4521,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "2", "reportable": 1, "minInterval": 1, "maxInterval": 65534, diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter index 31f872b3d4e004..48958285bd8da8 100644 --- a/examples/lock-app/lock-common/lock-app.matter +++ b/examples/lock-app/lock-common/lock-app.matter @@ -2702,7 +2702,7 @@ endpoint 0 { callback attribute activeModeDuration default = 300; callback attribute activeModeThreshold default = 300; ram attribute featureMap default = 0x0000; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 2; } } endpoint 1 { diff --git a/examples/lock-app/lock-common/lock-app.zap b/examples/lock-app/lock-common/lock-app.zap index 632811ef1e3682..9f32ac3eef58dd 100644 --- a/examples/lock-app/lock-common/lock-app.zap +++ b/examples/lock-app/lock-common/lock-app.zap @@ -5112,7 +5112,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "2", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -6644,5 +6644,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file 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 87eec6aa7cd4ad..cb5f49eaa38f65 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 @@ -2012,7 +2012,7 @@ endpoint 0 { callback attribute acceptedCommandList; callback attribute attributeList; ram attribute featureMap default = 1; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 2; handle command RegisterClient; handle command RegisterClientResponse; diff --git a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.zap b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.zap index 4b8051b8b51cfd..4ecc3ccf0b6b45 100644 --- a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.zap +++ b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.zap @@ -3674,7 +3674,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "2", "reportable": 1, "minInterval": 1, "maxInterval": 65534, diff --git a/src/app/tests/suites/certification/Test_TC_ICDM_1_1.yaml b/src/app/tests/suites/certification/Test_TC_ICDM_1_1.yaml index 5e8af70f3a8fc0..0f649db450f85a 100755 --- a/src/app/tests/suites/certification/Test_TC_ICDM_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_ICDM_1_1.yaml @@ -35,7 +35,7 @@ tests: command: "readAttribute" attribute: "ClusterRevision" response: - value: 1 + value: 2 constraints: type: int16u 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 3d3737a78c4347..5cce9bf5cd4a62 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h @@ -51881,7 +51881,7 @@ class Test_TC_ICDM_1_1 : public TestCommandBridge { { id actualValue = value; - VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 1U)); + VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 2U)); } VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u")); From c037636b23b9d3f50e7be7d5407d3429b29f4517 Mon Sep 17 00:00:00 2001 From: mkardous-silabs <84793247+mkardous-silabs@users.noreply.github.com> Date: Fri, 27 Oct 2023 17:18:07 -0400 Subject: [PATCH 11/41] [ICD] Add User active mode trigger types and attributes (#30053) * update xml to add UAT attributes * Generated files * fix type and id * fix zap --- .../all-clusters-app.matter | 20 ++ .../light-switch-app.matter | 20 ++ examples/lock-app/lock-common/lock-app.matter | 20 ++ .../smoke-co-alarm-app.matter | 20 ++ .../chip/icd-management-cluster.xml | 23 +++ .../zcl/zcl-with-test-extensions.json | 4 +- src/app/zap-templates/zcl/zcl.json | 4 +- .../data_model/controller-clusters.matter | 22 +++ .../chip/devicecontroller/ChipClusters.java | 28 +++ .../devicecontroller/ClusterIDMapping.java | 2 + .../devicecontroller/ClusterReadMapping.java | 22 +++ .../CHIPAttributeTLVValueDecoder.cpp | 28 +++ .../python/chip/clusters/CHIPClusters.py | 12 ++ .../python/chip/clusters/Objects.py | 55 ++++++ .../MTRAttributeSpecifiedCheck.mm | 6 + .../MTRAttributeTLVValueDecoder.mm | 31 +++ .../CHIP/zap-generated/MTRBaseClusters.h | 32 ++++ .../CHIP/zap-generated/MTRBaseClusters.mm | 72 +++++++ .../CHIP/zap-generated/MTRClusterConstants.h | 2 + .../CHIP/zap-generated/MTRClusters.h | 4 + .../CHIP/zap-generated/MTRClusters.mm | 10 + .../app-common/zap-generated/cluster-enums.h | 22 +++ .../zap-generated/cluster-objects.cpp | 4 + .../zap-generated/cluster-objects.h | 28 +++ .../app-common/zap-generated/ids/Attributes.h | 8 + .../zap-generated/cluster/Commands.h | 18 +- .../cluster/logging/DataModelLogger.cpp | 10 + .../zap-generated/cluster/Commands.h | 180 ++++++++++++++++++ 28 files changed, 704 insertions(+), 3 deletions(-) diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter index b394d6937818f7..a2f4ff3e3c28ed 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 @@ -2463,6 +2463,26 @@ server cluster IcdManagement = 70 { kLongIdleTimeSupport = 0x4; } + bitmap UserActiveModeTriggerBitmap : bitmap32 { + kPowerCycle = 0x1; + kSettingsMenu = 0x2; + kCustomInstruction = 0x4; + kDeviceManual = 0x8; + kActuateSensor = 0x10; + kActuateSensorSeconds = 0x20; + kActuateSensorTimes = 0x40; + kActuateSensorLightsBlink = 0x80; + kResetButton = 0x100; + kResetButtonLightsBlink = 0x200; + kResetButtonSeconds = 0x400; + kResetButtonTimes = 0x800; + kSetupButton = 0x1000; + kSetupButtonSeconds = 0x2000; + kSetupButtonLightsBlink = 0x4000; + kSetupButtonTimes = 0x8000; + kAppDefinedButton = 0x10000; + } + fabric_scoped struct MonitoringRegistrationStruct { fabric_sensitive node_id checkInNodeID = 1; fabric_sensitive int64u monitoredSubject = 2; 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 16ce5bbb18a884..dfc5e4a71586d7 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 @@ -1956,6 +1956,26 @@ server cluster IcdManagement = 70 { kLongIdleTimeSupport = 0x4; } + bitmap UserActiveModeTriggerBitmap : bitmap32 { + kPowerCycle = 0x1; + kSettingsMenu = 0x2; + kCustomInstruction = 0x4; + kDeviceManual = 0x8; + kActuateSensor = 0x10; + kActuateSensorSeconds = 0x20; + kActuateSensorTimes = 0x40; + kActuateSensorLightsBlink = 0x80; + kResetButton = 0x100; + kResetButtonLightsBlink = 0x200; + kResetButtonSeconds = 0x400; + kResetButtonTimes = 0x800; + kSetupButton = 0x1000; + kSetupButtonSeconds = 0x2000; + kSetupButtonLightsBlink = 0x4000; + kSetupButtonTimes = 0x8000; + kAppDefinedButton = 0x10000; + } + fabric_scoped struct MonitoringRegistrationStruct { fabric_sensitive node_id checkInNodeID = 1; fabric_sensitive int64u monitoredSubject = 2; diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter index 48958285bd8da8..4c89338e602a9d 100644 --- a/examples/lock-app/lock-common/lock-app.matter +++ b/examples/lock-app/lock-common/lock-app.matter @@ -1687,6 +1687,26 @@ server cluster IcdManagement = 70 { kLongIdleTimeSupport = 0x4; } + bitmap UserActiveModeTriggerBitmap : bitmap32 { + kPowerCycle = 0x1; + kSettingsMenu = 0x2; + kCustomInstruction = 0x4; + kDeviceManual = 0x8; + kActuateSensor = 0x10; + kActuateSensorSeconds = 0x20; + kActuateSensorTimes = 0x40; + kActuateSensorLightsBlink = 0x80; + kResetButton = 0x100; + kResetButtonLightsBlink = 0x200; + kResetButtonSeconds = 0x400; + kResetButtonTimes = 0x800; + kSetupButton = 0x1000; + kSetupButtonSeconds = 0x2000; + kSetupButtonLightsBlink = 0x4000; + kSetupButtonTimes = 0x8000; + kAppDefinedButton = 0x10000; + } + fabric_scoped struct MonitoringRegistrationStruct { fabric_sensitive node_id checkInNodeID = 1; fabric_sensitive int64u monitoredSubject = 2; 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 cb5f49eaa38f65..b1f953f847ecfa 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 @@ -1569,6 +1569,26 @@ server cluster IcdManagement = 70 { kLongIdleTimeSupport = 0x4; } + bitmap UserActiveModeTriggerBitmap : bitmap32 { + kPowerCycle = 0x1; + kSettingsMenu = 0x2; + kCustomInstruction = 0x4; + kDeviceManual = 0x8; + kActuateSensor = 0x10; + kActuateSensorSeconds = 0x20; + kActuateSensorTimes = 0x40; + kActuateSensorLightsBlink = 0x80; + kResetButton = 0x100; + kResetButtonLightsBlink = 0x200; + kResetButtonSeconds = 0x400; + kResetButtonTimes = 0x800; + kSetupButton = 0x1000; + kSetupButtonSeconds = 0x2000; + kSetupButtonLightsBlink = 0x4000; + kSetupButtonTimes = 0x8000; + kAppDefinedButton = 0x10000; + } + fabric_scoped struct MonitoringRegistrationStruct { fabric_sensitive node_id checkInNodeID = 1; fabric_sensitive int64u monitoredSubject = 2; diff --git a/src/app/zap-templates/zcl/data-model/chip/icd-management-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/icd-management-cluster.xml index 6f0951831ccf9a..90a335b46b1988 100644 --- a/src/app/zap-templates/zcl/data-model/chip/icd-management-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/icd-management-cluster.xml @@ -25,6 +25,27 @@ limitations under the License. + + + + + + + + + + + + + + + + + + + + + @@ -56,6 +77,8 @@ limitations under the License. ClientsSupportedPerFabric + UserActiveModeTriggerHint + UserActiveModeTriggerInstruction Register a client to the end device 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 d5e8f55dfdf964..543a902517da97 100644 --- a/src/app/zap-templates/zcl/zcl-with-test-extensions.json +++ b/src/app/zap-templates/zcl/zcl-with-test-extensions.json @@ -202,7 +202,9 @@ "ActiveModeThreshold", "RegisteredClients", "ICDCounter", - "ClientsSupportedPerFabric" + "ClientsSupportedPerFabric", + "UserActiveModeTriggerHint", + "UserActiveModeTriggerInstruction" ], "Operational Credentials": [ "SupportedFabrics", diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json index 77462935f97592..c047c56557e2fa 100644 --- a/src/app/zap-templates/zcl/zcl.json +++ b/src/app/zap-templates/zcl/zcl.json @@ -200,7 +200,9 @@ "ActiveModeThreshold", "RegisteredClients", "ICDCounter", - "ClientsSupportedPerFabric" + "ClientsSupportedPerFabric", + "UserActiveModeTriggerHint", + "UserActiveModeTriggerInstruction" ], "Operational Credentials": [ "SupportedFabrics", diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index caabe18f4fa4b4..23a39b6f7dbe82 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -2727,6 +2727,26 @@ client cluster IcdManagement = 70 { kLongIdleTimeSupport = 0x4; } + bitmap UserActiveModeTriggerBitmap : bitmap32 { + kPowerCycle = 0x1; + kSettingsMenu = 0x2; + kCustomInstruction = 0x4; + kDeviceManual = 0x8; + kActuateSensor = 0x10; + kActuateSensorSeconds = 0x20; + kActuateSensorTimes = 0x40; + kActuateSensorLightsBlink = 0x80; + kResetButton = 0x100; + kResetButtonLightsBlink = 0x200; + kResetButtonSeconds = 0x400; + kResetButtonTimes = 0x800; + kSetupButton = 0x1000; + kSetupButtonSeconds = 0x2000; + kSetupButtonLightsBlink = 0x4000; + kSetupButtonTimes = 0x8000; + kAppDefinedButton = 0x10000; + } + fabric_scoped struct MonitoringRegistrationStruct { fabric_sensitive node_id checkInNodeID = 1; fabric_sensitive int64u monitoredSubject = 2; @@ -2739,6 +2759,8 @@ client cluster IcdManagement = 70 { readonly attribute access(read: administer) optional MonitoringRegistrationStruct registeredClients[] = 3; readonly attribute access(read: administer) optional int32u ICDCounter = 4; readonly attribute optional int16u clientsSupportedPerFabric = 5; + readonly attribute optional UserActiveModeTriggerBitmap userActiveModeTriggerHint = 6; + readonly attribute optional char_string<128> userActiveModeTriggerInstruction = 7; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; diff --git a/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java b/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java index e79b8954570243..62c12f62001130 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java @@ -10938,6 +10938,26 @@ public void subscribeClientsSupportedPerFabricAttribute( subscribeClientsSupportedPerFabricAttribute(chipClusterPtr, callback, minInterval, maxInterval); } + public void readUserActiveModeTriggerHintAttribute( + LongAttributeCallback callback) { + readUserActiveModeTriggerHintAttribute(chipClusterPtr, callback); + } + + public void subscribeUserActiveModeTriggerHintAttribute( + LongAttributeCallback callback, int minInterval, int maxInterval) { + subscribeUserActiveModeTriggerHintAttribute(chipClusterPtr, callback, minInterval, maxInterval); + } + + public void readUserActiveModeTriggerInstructionAttribute( + CharStringAttributeCallback callback) { + readUserActiveModeTriggerInstructionAttribute(chipClusterPtr, callback); + } + + public void subscribeUserActiveModeTriggerInstructionAttribute( + CharStringAttributeCallback callback, int minInterval, int maxInterval) { + subscribeUserActiveModeTriggerInstructionAttribute(chipClusterPtr, callback, minInterval, maxInterval); + } + public void readGeneratedCommandListAttribute( GeneratedCommandListAttributeCallback callback) { readGeneratedCommandListAttribute(chipClusterPtr, callback); @@ -11022,6 +11042,14 @@ public void subscribeClusterRevisionAttribute( private native void subscribeClientsSupportedPerFabricAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval); + private native void readUserActiveModeTriggerHintAttribute(long chipClusterPtr, LongAttributeCallback callback); + + private native void subscribeUserActiveModeTriggerHintAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval); + + private native void readUserActiveModeTriggerInstructionAttribute(long chipClusterPtr, CharStringAttributeCallback callback); + + private native void subscribeUserActiveModeTriggerInstructionAttribute(long chipClusterPtr, CharStringAttributeCallback callback, int minInterval, int maxInterval); + private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback); private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval); diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java index c5d09f3834e59b..413541bdf799b4 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java @@ -5968,6 +5968,8 @@ public enum Attribute { RegisteredClients(3L), ICDCounter(4L), ClientsSupportedPerFabric(5L), + UserActiveModeTriggerHint(6L), + UserActiveModeTriggerInstruction(7L), GeneratedCommandList(65528L), AcceptedCommandList(65529L), EventList(65530L), diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java index 8cd4db031a7831..8fc29e53155f78 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java @@ -5917,6 +5917,28 @@ private static Map readIcdManagementInteractionInfo() { readIcdManagementClientsSupportedPerFabricCommandParams ); result.put("readClientsSupportedPerFabricAttribute", readIcdManagementClientsSupportedPerFabricAttributeInteractionInfo); + Map readIcdManagementUserActiveModeTriggerHintCommandParams = new LinkedHashMap(); + InteractionInfo readIcdManagementUserActiveModeTriggerHintAttributeInteractionInfo = new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.IcdManagementCluster) cluster).readUserActiveModeTriggerHintAttribute( + (ChipClusters.LongAttributeCallback) callback + ); + }, + () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), + readIcdManagementUserActiveModeTriggerHintCommandParams + ); + result.put("readUserActiveModeTriggerHintAttribute", readIcdManagementUserActiveModeTriggerHintAttributeInteractionInfo); + Map readIcdManagementUserActiveModeTriggerInstructionCommandParams = new LinkedHashMap(); + InteractionInfo readIcdManagementUserActiveModeTriggerInstructionAttributeInteractionInfo = new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.IcdManagementCluster) cluster).readUserActiveModeTriggerInstructionAttribute( + (ChipClusters.CharStringAttributeCallback) callback + ); + }, + () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), + readIcdManagementUserActiveModeTriggerInstructionCommandParams + ); + result.put("readUserActiveModeTriggerInstructionAttribute", readIcdManagementUserActiveModeTriggerInstructionAttributeInteractionInfo); Map readIcdManagementGeneratedCommandListCommandParams = new LinkedHashMap(); InteractionInfo readIcdManagementGeneratedCommandListAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp index 5e2b611d121792..a6d9ea102648fb 100644 --- a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp +++ b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp @@ -12497,6 +12497,34 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR value); return value; } + case Attributes::UserActiveModeTriggerHint::Id: { + using TypeInfo = Attributes::UserActiveModeTriggerHint::TypeInfo; + TypeInfo::DecodableType cppValue; + *aError = app::DataModel::Decode(aReader, cppValue); + if (*aError != CHIP_NO_ERROR) + { + return nullptr; + } + jobject value; + std::string valueClassName = "java/lang/Long"; + std::string valueCtorSignature = "(J)V"; + jlong jnivalue = static_cast(cppValue.Raw()); + chip::JniReferences::GetInstance().CreateBoxedObject(valueClassName.c_str(), valueCtorSignature.c_str(), + jnivalue, value); + return value; + } + case Attributes::UserActiveModeTriggerInstruction::Id: { + using TypeInfo = Attributes::UserActiveModeTriggerInstruction::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::GeneratedCommandList::Id: { using TypeInfo = Attributes::GeneratedCommandList::TypeInfo; TypeInfo::DecodableType cppValue; diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py index e5efbe902213d2..efa9adc53cfdab 100644 --- a/src/controller/python/chip/clusters/CHIPClusters.py +++ b/src/controller/python/chip/clusters/CHIPClusters.py @@ -4266,6 +4266,18 @@ class ChipClusters: "type": "int", "reportable": True, }, + 0x00000006: { + "attributeName": "UserActiveModeTriggerHint", + "attributeId": 0x00000006, + "type": "int", + "reportable": True, + }, + 0x00000007: { + "attributeName": "UserActiveModeTriggerInstruction", + "attributeId": 0x00000007, + "type": "str", + "reportable": True, + }, 0x0000FFF8: { "attributeName": "GeneratedCommandList", "attributeId": 0x0000FFF8, diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index e67077ba62feb3..88586082873a12 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -14705,6 +14705,8 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor(Label="registeredClients", Tag=0x00000003, Type=typing.Optional[typing.List[IcdManagement.Structs.MonitoringRegistrationStruct]]), ClusterObjectFieldDescriptor(Label="ICDCounter", Tag=0x00000004, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="clientsSupportedPerFabric", Tag=0x00000005, Type=typing.Optional[uint]), + ClusterObjectFieldDescriptor(Label="userActiveModeTriggerHint", Tag=0x00000006, Type=typing.Optional[uint]), + ClusterObjectFieldDescriptor(Label="userActiveModeTriggerInstruction", Tag=0x00000007, Type=typing.Optional[str]), 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]), @@ -14719,6 +14721,8 @@ def descriptor(cls) -> ClusterObjectDescriptor: registeredClients: 'typing.Optional[typing.List[IcdManagement.Structs.MonitoringRegistrationStruct]]' = None ICDCounter: 'typing.Optional[uint]' = None clientsSupportedPerFabric: 'typing.Optional[uint]' = None + userActiveModeTriggerHint: 'typing.Optional[uint]' = None + userActiveModeTriggerInstruction: 'typing.Optional[str]' = None generatedCommandList: 'typing.List[uint]' = None acceptedCommandList: 'typing.List[uint]' = None eventList: 'typing.List[uint]' = None @@ -14732,6 +14736,25 @@ class Feature(IntFlag): kUserActiveModeTrigger = 0x2 kLongIdleTimeSupport = 0x4 + class UserActiveModeTriggerBitmap(IntFlag): + kPowerCycle = 0x1 + kSettingsMenu = 0x2 + kCustomInstruction = 0x4 + kDeviceManual = 0x8 + kActuateSensor = 0x10 + kActuateSensorSeconds = 0x20 + kActuateSensorTimes = 0x40 + kActuateSensorLightsBlink = 0x80 + kResetButton = 0x100 + kResetButtonLightsBlink = 0x200 + kResetButtonSeconds = 0x400 + kResetButtonTimes = 0x800 + kSetupButton = 0x1000 + kSetupButtonSeconds = 0x2000 + kSetupButtonLightsBlink = 0x4000 + kSetupButtonTimes = 0x8000 + kAppDefinedButton = 0x10000 + class Structs: @dataclass class MonitoringRegistrationStruct(ClusterObject): @@ -14915,6 +14938,38 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: 'typing.Optional[uint]' = None + @dataclass + class UserActiveModeTriggerHint(ClusterAttributeDescriptor): + @ChipUtility.classproperty + def cluster_id(cls) -> int: + return 0x00000046 + + @ChipUtility.classproperty + def attribute_id(cls) -> int: + return 0x00000006 + + @ChipUtility.classproperty + def attribute_type(cls) -> ClusterObjectFieldDescriptor: + return ClusterObjectFieldDescriptor(Type=typing.Optional[uint]) + + value: 'typing.Optional[uint]' = None + + @dataclass + class UserActiveModeTriggerInstruction(ClusterAttributeDescriptor): + @ChipUtility.classproperty + def cluster_id(cls) -> int: + return 0x00000046 + + @ChipUtility.classproperty + def attribute_id(cls) -> int: + return 0x00000007 + + @ChipUtility.classproperty + def attribute_type(cls) -> ClusterObjectFieldDescriptor: + return ClusterObjectFieldDescriptor(Type=typing.Optional[str]) + + value: 'typing.Optional[str]' = None + @dataclass class GeneratedCommandList(ClusterAttributeDescriptor): @ChipUtility.classproperty diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm index f034ce2ef1cb3c..6400bbbdf26e85 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm @@ -1890,6 +1890,12 @@ static BOOL AttributeIsSpecifiedInICDManagementCluster(AttributeId aAttributeId) case Attributes::ClientsSupportedPerFabric::Id: { return YES; } + case Attributes::UserActiveModeTriggerHint::Id: { + return YES; + } + case Attributes::UserActiveModeTriggerInstruction::Id: { + return YES; + } case Attributes::GeneratedCommandList::Id: { return YES; } diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm index 4fcd7e0c8bd86f..5ce56aaa434625 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm @@ -5198,6 +5198,37 @@ static id _Nullable DecodeAttributeValueForICDManagementCluster(AttributeId aAtt value = [NSNumber numberWithUnsignedShort:cppValue]; return value; } +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + case Attributes::UserActiveModeTriggerHint::Id: { + using TypeInfo = Attributes::UserActiveModeTriggerHint::TypeInfo; + TypeInfo::DecodableType cppValue; + *aError = DataModel::Decode(aReader, cppValue); + if (*aError != CHIP_NO_ERROR) { + return nil; + } + NSNumber * _Nonnull value; + value = [NSNumber numberWithUnsignedInt:cppValue.Raw()]; + return value; + } +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + case Attributes::UserActiveModeTriggerInstruction::Id: { + using TypeInfo = Attributes::UserActiveModeTriggerInstruction::TypeInfo; + TypeInfo::DecodableType cppValue; + *aError = DataModel::Decode(aReader, cppValue); + if (*aError != CHIP_NO_ERROR) { + return nil; + } + NSString * _Nonnull value; + value = AsString(cppValue); + if (value == nil) { + CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT; + *aError = err; + return nil; + } + return value; + } #endif // MTR_ENABLE_PROVISIONAL default: { break; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index 43dde2ac143c4e..8fafd59791f602 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -4533,6 +4533,18 @@ MTR_PROVISIONALLY_AVAILABLE reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE; + (void)readAttributeClientsSupportedPerFabricWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; +- (void)readAttributeUserActiveModeTriggerHintWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; +- (void)subscribeAttributeUserActiveModeTriggerHintWithParams:(MTRSubscribeParams *)params + subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished + reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE; ++ (void)readAttributeUserActiveModeTriggerHintWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; + +- (void)readAttributeUserActiveModeTriggerInstructionWithCompletion:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; +- (void)subscribeAttributeUserActiveModeTriggerInstructionWithParams:(MTRSubscribeParams *)params + subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished + reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE; ++ (void)readAttributeUserActiveModeTriggerInstructionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; + - (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; - (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams *)params subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished @@ -14256,6 +14268,26 @@ typedef NS_OPTIONS(uint32_t, MTRICDManagementFeature) { MTRICDManagementFeatureLongIdleTimeSupport MTR_PROVISIONALLY_AVAILABLE = 0x4, } MTR_PROVISIONALLY_AVAILABLE; +typedef NS_OPTIONS(uint32_t, MTRICDManagementUserActiveModeTriggerBitmap) { + MTRICDManagementUserActiveModeTriggerBitmapPowerCycle MTR_PROVISIONALLY_AVAILABLE = 0x1, + MTRICDManagementUserActiveModeTriggerBitmapSettingsMenu MTR_PROVISIONALLY_AVAILABLE = 0x2, + MTRICDManagementUserActiveModeTriggerBitmapCustomInstruction MTR_PROVISIONALLY_AVAILABLE = 0x4, + MTRICDManagementUserActiveModeTriggerBitmapDeviceManual MTR_PROVISIONALLY_AVAILABLE = 0x8, + MTRICDManagementUserActiveModeTriggerBitmapActuateSensor MTR_PROVISIONALLY_AVAILABLE = 0x10, + MTRICDManagementUserActiveModeTriggerBitmapActuateSensorSeconds MTR_PROVISIONALLY_AVAILABLE = 0x20, + MTRICDManagementUserActiveModeTriggerBitmapActuateSensorTimes MTR_PROVISIONALLY_AVAILABLE = 0x40, + MTRICDManagementUserActiveModeTriggerBitmapActuateSensorLightsBlink MTR_PROVISIONALLY_AVAILABLE = 0x80, + MTRICDManagementUserActiveModeTriggerBitmapResetButton MTR_PROVISIONALLY_AVAILABLE = 0x100, + MTRICDManagementUserActiveModeTriggerBitmapResetButtonLightsBlink MTR_PROVISIONALLY_AVAILABLE = 0x200, + MTRICDManagementUserActiveModeTriggerBitmapResetButtonSeconds MTR_PROVISIONALLY_AVAILABLE = 0x400, + MTRICDManagementUserActiveModeTriggerBitmapResetButtonTimes MTR_PROVISIONALLY_AVAILABLE = 0x800, + MTRICDManagementUserActiveModeTriggerBitmapSetupButton MTR_PROVISIONALLY_AVAILABLE = 0x1000, + MTRICDManagementUserActiveModeTriggerBitmapSetupButtonSeconds MTR_PROVISIONALLY_AVAILABLE = 0x2000, + MTRICDManagementUserActiveModeTriggerBitmapSetupButtonLightsBlink MTR_PROVISIONALLY_AVAILABLE = 0x4000, + MTRICDManagementUserActiveModeTriggerBitmapSetupButtonTimes MTR_PROVISIONALLY_AVAILABLE = 0x8000, + MTRICDManagementUserActiveModeTriggerBitmapAppDefinedButton MTR_PROVISIONALLY_AVAILABLE = 0x10000, +} MTR_PROVISIONALLY_AVAILABLE; + typedef NS_OPTIONS(uint32_t, MTRModeSelectFeature) { MTRModeSelectFeatureOnOff MTR_AVAILABLE(ios(17.0), macos(14.0), watchos(10.0), tvos(17.0)) = 0x1, MTRModeSelectFeatureDEPONOFF MTR_DEPRECATED("Please use MTRModeSelectFeatureOnOff", ios(16.1, 17.0), macos(13.0, 14.0), watchos(9.1, 10.0), tvos(16.1, 17.0)) = 0x1, diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm index 12d57c62be25db..ec55b1beca255a 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm @@ -38857,6 +38857,78 @@ + (void)readAttributeClientsSupportedPerFabricWithClusterStateCache:(MTRClusterS completion:completion]; } +- (void)readAttributeUserActiveModeTriggerHintWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion +{ + using TypeInfo = IcdManagement::Attributes::UserActiveModeTriggerHint::TypeInfo; + [self.device _readKnownAttributeWithEndpointID:@(self.endpoint) + clusterID:@(TypeInfo::GetClusterId()) + attributeID:@(TypeInfo::GetAttributeId()) + params:nil + queue:self.callbackQueue + completion:completion]; +} + +- (void)subscribeAttributeUserActiveModeTriggerHintWithParams:(MTRSubscribeParams * _Nonnull)params + subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished + reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler +{ + using TypeInfo = IcdManagement::Attributes::UserActiveModeTriggerHint::TypeInfo; + [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint) + clusterID:@(TypeInfo::GetClusterId()) + attributeID:@(TypeInfo::GetAttributeId()) + params:params + queue:self.callbackQueue + reportHandler:reportHandler + subscriptionEstablished:subscriptionEstablished]; +} + ++ (void)readAttributeUserActiveModeTriggerHintWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion +{ + using TypeInfo = IcdManagement::Attributes::UserActiveModeTriggerHint::TypeInfo; + [clusterStateCacheContainer + _readKnownCachedAttributeWithEndpointID:static_cast([endpoint unsignedShortValue]) + clusterID:TypeInfo::GetClusterId() + attributeID:TypeInfo::GetAttributeId() + queue:queue + completion:completion]; +} + +- (void)readAttributeUserActiveModeTriggerInstructionWithCompletion:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completion +{ + using TypeInfo = IcdManagement::Attributes::UserActiveModeTriggerInstruction::TypeInfo; + [self.device _readKnownAttributeWithEndpointID:@(self.endpoint) + clusterID:@(TypeInfo::GetClusterId()) + attributeID:@(TypeInfo::GetAttributeId()) + params:nil + queue:self.callbackQueue + completion:completion]; +} + +- (void)subscribeAttributeUserActiveModeTriggerInstructionWithParams:(MTRSubscribeParams * _Nonnull)params + subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished + reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler +{ + using TypeInfo = IcdManagement::Attributes::UserActiveModeTriggerInstruction::TypeInfo; + [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint) + clusterID:@(TypeInfo::GetClusterId()) + attributeID:@(TypeInfo::GetAttributeId()) + params:params + queue:self.callbackQueue + reportHandler:reportHandler + subscriptionEstablished:subscriptionEstablished]; +} + ++ (void)readAttributeUserActiveModeTriggerInstructionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completion +{ + using TypeInfo = IcdManagement::Attributes::UserActiveModeTriggerInstruction::TypeInfo; + [clusterStateCacheContainer + _readKnownCachedAttributeWithEndpointID:static_cast([endpoint unsignedShortValue]) + clusterID:TypeInfo::GetClusterId() + attributeID:TypeInfo::GetAttributeId() + queue:queue + completion:completion]; +} + - (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion { using TypeInfo = IcdManagement::Attributes::GeneratedCommandList::TypeInfo; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h index d2307978241522..c42739771e0925 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h @@ -2240,6 +2240,8 @@ typedef NS_ENUM(uint32_t, MTRAttributeIDType) { MTRAttributeIDTypeClusterICDManagementAttributeRegisteredClientsID MTR_PROVISIONALLY_AVAILABLE = 0x00000003, MTRAttributeIDTypeClusterICDManagementAttributeICDCounterID MTR_PROVISIONALLY_AVAILABLE = 0x00000004, MTRAttributeIDTypeClusterICDManagementAttributeClientsSupportedPerFabricID MTR_PROVISIONALLY_AVAILABLE = 0x00000005, + MTRAttributeIDTypeClusterICDManagementAttributeUserActiveModeTriggerHintID MTR_PROVISIONALLY_AVAILABLE = 0x00000006, + MTRAttributeIDTypeClusterICDManagementAttributeUserActiveModeTriggerInstructionID MTR_PROVISIONALLY_AVAILABLE = 0x00000007, MTRAttributeIDTypeClusterICDManagementAttributeGeneratedCommandListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeGeneratedCommandListID, MTRAttributeIDTypeClusterICDManagementAttributeAcceptedCommandListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeAcceptedCommandListID, MTRAttributeIDTypeClusterICDManagementAttributeEventListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeEventListID, diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h index 78984c02bd52a4..bbc0a86180ec83 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h @@ -2210,6 +2210,10 @@ MTR_PROVISIONALLY_AVAILABLE - (NSDictionary * _Nullable)readAttributeClientsSupportedPerFabricWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE; +- (NSDictionary * _Nullable)readAttributeUserActiveModeTriggerHintWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE; + +- (NSDictionary * _Nullable)readAttributeUserActiveModeTriggerInstructionWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE; + - (NSDictionary * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE; - (NSDictionary * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm index 3c33dee7774b9e..9650aaf7d0e7a6 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm @@ -6934,6 +6934,16 @@ - (void)stayActiveRequestWithParams:(MTRICDManagementClusterStayActiveRequestPar return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeICDManagementID) attributeID:@(MTRAttributeIDTypeClusterICDManagementAttributeClientsSupportedPerFabricID) params:params]; } +- (NSDictionary * _Nullable)readAttributeUserActiveModeTriggerHintWithParams:(MTRReadParams * _Nullable)params +{ + return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeICDManagementID) attributeID:@(MTRAttributeIDTypeClusterICDManagementAttributeUserActiveModeTriggerHintID) params:params]; +} + +- (NSDictionary * _Nullable)readAttributeUserActiveModeTriggerInstructionWithParams:(MTRReadParams * _Nullable)params +{ + return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeICDManagementID) attributeID:@(MTRAttributeIDTypeClusterICDManagementAttributeUserActiveModeTriggerInstructionID) params:params]; +} + - (NSDictionary * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params { return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeICDManagementID) attributeID:@(MTRAttributeIDTypeClusterICDManagementAttributeGeneratedCommandListID) params:params]; 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 67788b9dd4318d..01562874f35f53 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 @@ -1491,6 +1491,28 @@ enum class Feature : uint32_t kUserActiveModeTrigger = 0x2, kLongIdleTimeSupport = 0x4, }; + +// Bitmap for UserActiveModeTriggerBitmap +enum class UserActiveModeTriggerBitmap : uint32_t +{ + kPowerCycle = 0x1, + kSettingsMenu = 0x2, + kCustomInstruction = 0x4, + kDeviceManual = 0x8, + kActuateSensor = 0x10, + kActuateSensorSeconds = 0x20, + kActuateSensorTimes = 0x40, + kActuateSensorLightsBlink = 0x80, + kResetButton = 0x100, + kResetButtonLightsBlink = 0x200, + kResetButtonSeconds = 0x400, + kResetButtonTimes = 0x800, + kSetupButton = 0x1000, + kSetupButtonSeconds = 0x2000, + kSetupButtonLightsBlink = 0x4000, + kSetupButtonTimes = 0x8000, + kAppDefinedButton = 0x10000, +}; } // namespace IcdManagement namespace ModeSelect { 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 c59f529bde4a5f..139fc46ed756bf 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 @@ -10437,6 +10437,10 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre return DataModel::Decode(reader, ICDCounter); case Attributes::ClientsSupportedPerFabric::TypeInfo::GetAttributeId(): return DataModel::Decode(reader, clientsSupportedPerFabric); + case Attributes::UserActiveModeTriggerHint::TypeInfo::GetAttributeId(): + return DataModel::Decode(reader, userActiveModeTriggerHint); + case Attributes::UserActiveModeTriggerInstruction::TypeInfo::GetAttributeId(): + return DataModel::Decode(reader, userActiveModeTriggerInstruction); case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId(): return DataModel::Decode(reader, generatedCommandList); case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId(): diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h index 26ad7ac20b2b50..e0ded3fa26632b 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 @@ -14116,6 +14116,31 @@ struct TypeInfo static constexpr bool MustUseTimedWrite() { return false; } }; } // namespace ClientsSupportedPerFabric +namespace UserActiveModeTriggerHint { +struct TypeInfo +{ + using Type = chip::BitMask; + using DecodableType = chip::BitMask; + using DecodableArgType = chip::BitMask; + + static constexpr ClusterId GetClusterId() { return Clusters::IcdManagement::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::UserActiveModeTriggerHint::Id; } + static constexpr bool MustUseTimedWrite() { return false; } +}; +} // namespace UserActiveModeTriggerHint +namespace UserActiveModeTriggerInstruction { +struct TypeInfo +{ + using Type = chip::CharSpan; + using DecodableType = chip::CharSpan; + using DecodableArgType = chip::CharSpan; + + static constexpr ClusterId GetClusterId() { return Clusters::IcdManagement::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::UserActiveModeTriggerInstruction::Id; } + static constexpr bool MustUseTimedWrite() { return false; } + static constexpr size_t MaxLength() { return 128; } +}; +} // namespace UserActiveModeTriggerInstruction namespace GeneratedCommandList { struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo { @@ -14167,6 +14192,9 @@ struct TypeInfo Attributes::RegisteredClients::TypeInfo::DecodableType registeredClients; Attributes::ICDCounter::TypeInfo::DecodableType ICDCounter = static_cast(0); Attributes::ClientsSupportedPerFabric::TypeInfo::DecodableType clientsSupportedPerFabric = static_cast(0); + Attributes::UserActiveModeTriggerHint::TypeInfo::DecodableType userActiveModeTriggerHint = + static_cast>(0); + Attributes::UserActiveModeTriggerInstruction::TypeInfo::DecodableType userActiveModeTriggerInstruction; Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList; Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList; Attributes::EventList::TypeInfo::DecodableType eventList; 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 c636d2caa06ee1..d58e6eb18dd62a 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 @@ -2410,6 +2410,14 @@ namespace ClientsSupportedPerFabric { static constexpr AttributeId Id = 0x00000005; } // namespace ClientsSupportedPerFabric +namespace UserActiveModeTriggerHint { +static constexpr AttributeId Id = 0x00000006; +} // namespace UserActiveModeTriggerHint + +namespace UserActiveModeTriggerInstruction { +static constexpr AttributeId Id = 0x00000007; +} // namespace UserActiveModeTriggerInstruction + namespace GeneratedCommandList { static constexpr AttributeId Id = Globals::Attributes::GeneratedCommandList::Id; } // namespace GeneratedCommandList diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index bd1852ca31af5a..8b0b717eb30aae 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -4498,6 +4498,8 @@ class GroupKeyManagementKeySetReadAllIndices : public ClusterCommand | * RegisteredClients | 0x0003 | | * ICDCounter | 0x0004 | | * ClientsSupportedPerFabric | 0x0005 | +| * UserActiveModeTriggerHint | 0x0006 | +| * UserActiveModeTriggerInstruction | 0x0007 | | * GeneratedCommandList | 0xFFF8 | | * AcceptedCommandList | 0xFFF9 | | * EventList | 0xFFFA | @@ -14985,6 +14987,10 @@ void registerClusterIcdManagement(Commands & commands, CredentialIssuerCommands make_unique(Id, "registered-clients", Attributes::RegisteredClients::Id, credsIssuerConfig), // make_unique(Id, "icdcounter", Attributes::ICDCounter::Id, credsIssuerConfig), // make_unique(Id, "clients-supported-per-fabric", Attributes::ClientsSupportedPerFabric::Id, + credsIssuerConfig), // + make_unique(Id, "user-active-mode-trigger-hint", Attributes::UserActiveModeTriggerHint::Id, + credsIssuerConfig), // + make_unique(Id, "user-active-mode-trigger-instruction", Attributes::UserActiveModeTriggerInstruction::Id, credsIssuerConfig), // make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // @@ -15007,6 +15013,12 @@ void registerClusterIcdManagement(Commands & commands, CredentialIssuerCommands make_unique>(Id, "clients-supported-per-fabric", 0, UINT16_MAX, Attributes::ClientsSupportedPerFabric::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "user-active-mode-trigger-hint", 0, UINT32_MAX, Attributes::UserActiveModeTriggerHint::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "user-active-mode-trigger-instruction", + Attributes::UserActiveModeTriggerInstruction::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // make_unique>>( Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // @@ -15027,7 +15039,11 @@ void registerClusterIcdManagement(Commands & commands, CredentialIssuerCommands make_unique(Id, "registered-clients", Attributes::RegisteredClients::Id, credsIssuerConfig), // make_unique(Id, "icdcounter", Attributes::ICDCounter::Id, credsIssuerConfig), // make_unique(Id, "clients-supported-per-fabric", Attributes::ClientsSupportedPerFabric::Id, - credsIssuerConfig), // + credsIssuerConfig), // + make_unique(Id, "user-active-mode-trigger-hint", Attributes::UserActiveModeTriggerHint::Id, + credsIssuerConfig), // + make_unique(Id, "user-active-mode-trigger-instruction", + Attributes::UserActiveModeTriggerInstruction::Id, credsIssuerConfig), // make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // make_unique(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig), // diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp index ae45b6d5ef70c7..037fd3a4af6e9b 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -7998,6 +7998,16 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("ClientsSupportedPerFabric", 1, value); } + case IcdManagement::Attributes::UserActiveModeTriggerHint::Id: { + chip::BitMask value; + ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); + return DataModelLogger::LogValue("UserActiveModeTriggerHint", 1, value); + } + case IcdManagement::Attributes::UserActiveModeTriggerInstruction::Id: { + chip::CharSpan value; + ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); + return DataModelLogger::LogValue("UserActiveModeTriggerInstruction", 1, value); + } case IcdManagement::Attributes::GeneratedCommandList::Id: { chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); 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 ab996359816e33..519a27da8c68ba 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h @@ -48937,6 +48937,8 @@ class SubscribeAttributeBooleanStateClusterRevision : public SubscribeAttribute | * RegisteredClients | 0x0003 | | * ICDCounter | 0x0004 | | * ClientsSupportedPerFabric | 0x0005 | +| * UserActiveModeTriggerHint | 0x0006 | +| * UserActiveModeTriggerInstruction | 0x0007 | | * GeneratedCommandList | 0xFFF8 | | * AcceptedCommandList | 0xFFF9 | | * EventList | 0xFFFA | @@ -49630,6 +49632,176 @@ class SubscribeAttributeIcdManagementClientsSupportedPerFabric : public Subscrib #endif // MTR_ENABLE_PROVISIONAL #if MTR_ENABLE_PROVISIONAL +/* + * Attribute UserActiveModeTriggerHint + */ +class ReadIcdManagementUserActiveModeTriggerHint : public ReadAttribute { +public: + ReadIcdManagementUserActiveModeTriggerHint() + : ReadAttribute("user-active-mode-trigger-hint") + { + } + + ~ReadIcdManagementUserActiveModeTriggerHint() + { + } + + CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::IcdManagement::Id; + constexpr chip::AttributeId attributeId = chip::app::Clusters::IcdManagement::Attributes::UserActiveModeTriggerHint::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId); + + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); + __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + [cluster readAttributeUserActiveModeTriggerHintWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) { + NSLog(@"ICDManagement.UserActiveModeTriggerHint response %@", [value description]); + if (error == nil) { + RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value); + } else { + LogNSError("ICDManagement UserActiveModeTriggerHint read Error", error); + RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error); + } + SetCommandExitStatus(error); + }]; + return CHIP_NO_ERROR; + } +}; + +class SubscribeAttributeIcdManagementUserActiveModeTriggerHint : public SubscribeAttribute { +public: + SubscribeAttributeIcdManagementUserActiveModeTriggerHint() + : SubscribeAttribute("user-active-mode-trigger-hint") + { + } + + ~SubscribeAttributeIcdManagementUserActiveModeTriggerHint() + { + } + + CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::IcdManagement::Id; + constexpr chip::CommandId attributeId = chip::app::Clusters::IcdManagement::Attributes::UserActiveModeTriggerHint::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId); + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); + __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; + if (mKeepSubscriptions.HasValue()) { + params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); + } + if (mFabricFiltered.HasValue()) { + params.filterByFabric = mFabricFiltered.Value(); + } + if (mAutoResubscribe.HasValue()) { + params.resubscribeAutomatically = mAutoResubscribe.Value(); + } + [cluster subscribeAttributeUserActiveModeTriggerHintWithParams:params + subscriptionEstablished:^() { mSubscriptionEstablished = YES; } + reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { + NSLog(@"ICDManagement.UserActiveModeTriggerHint response %@", [value description]); + if (error == nil) { + RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value); + } else { + RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error); + } + SetCommandExitStatus(error); + }]; + + return CHIP_NO_ERROR; + } +}; + +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + +/* + * Attribute UserActiveModeTriggerInstruction + */ +class ReadIcdManagementUserActiveModeTriggerInstruction : public ReadAttribute { +public: + ReadIcdManagementUserActiveModeTriggerInstruction() + : ReadAttribute("user-active-mode-trigger-instruction") + { + } + + ~ReadIcdManagementUserActiveModeTriggerInstruction() + { + } + + CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::IcdManagement::Id; + constexpr chip::AttributeId attributeId = chip::app::Clusters::IcdManagement::Attributes::UserActiveModeTriggerInstruction::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId); + + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); + __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + [cluster readAttributeUserActiveModeTriggerInstructionWithCompletion:^(NSString * _Nullable value, NSError * _Nullable error) { + NSLog(@"ICDManagement.UserActiveModeTriggerInstruction response %@", [value description]); + if (error == nil) { + RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value); + } else { + LogNSError("ICDManagement UserActiveModeTriggerInstruction read Error", error); + RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error); + } + SetCommandExitStatus(error); + }]; + return CHIP_NO_ERROR; + } +}; + +class SubscribeAttributeIcdManagementUserActiveModeTriggerInstruction : public SubscribeAttribute { +public: + SubscribeAttributeIcdManagementUserActiveModeTriggerInstruction() + : SubscribeAttribute("user-active-mode-trigger-instruction") + { + } + + ~SubscribeAttributeIcdManagementUserActiveModeTriggerInstruction() + { + } + + CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::IcdManagement::Id; + constexpr chip::CommandId attributeId = chip::app::Clusters::IcdManagement::Attributes::UserActiveModeTriggerInstruction::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId); + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); + __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; + if (mKeepSubscriptions.HasValue()) { + params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); + } + if (mFabricFiltered.HasValue()) { + params.filterByFabric = mFabricFiltered.Value(); + } + if (mAutoResubscribe.HasValue()) { + params.resubscribeAutomatically = mAutoResubscribe.Value(); + } + [cluster subscribeAttributeUserActiveModeTriggerInstructionWithParams:params + subscriptionEstablished:^() { mSubscriptionEstablished = YES; } + reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) { + NSLog(@"ICDManagement.UserActiveModeTriggerInstruction response %@", [value description]); + if (error == nil) { + RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value); + } else { + RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error); + } + SetCommandExitStatus(error); + }]; + + return CHIP_NO_ERROR; + } +}; + +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + /* * Attribute GeneratedCommandList */ @@ -155235,6 +155407,14 @@ void registerClusterIcdManagement(Commands & commands) make_unique(), // make_unique(), // #endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + make_unique(), // + make_unique(), // +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + make_unique(), // + make_unique(), // +#endif // MTR_ENABLE_PROVISIONAL #if MTR_ENABLE_PROVISIONAL make_unique(), // make_unique(), // From b3327f8c51c9e0545a52060480141831bddb2228 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Fri, 27 Oct 2023 17:23:02 -0400 Subject: [PATCH 12/41] Update `Ethernet Diagnostics Cluster` to match the spec (#30064) * Add manage restriction to ResetCounts to EthDiag * Zap regen --- .../air-quality-sensor-app.matter | 2 +- .../all-clusters-common/all-clusters-app.matter | 2 +- .../all-clusters-common/all-clusters-minimal-app.matter | 2 +- examples/bridge-app/bridge-common/bridge-app.matter | 2 +- .../devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter | 2 +- .../contact-sensor-common/contact-sensor-app.matter | 2 +- .../light-switch-common/light-switch-app.matter | 2 +- .../bouffalolab/data_model/lighting-app-ethernet.matter | 2 +- examples/lighting-app/lighting-common/lighting-app.matter | 2 +- examples/lock-app/lock-common/lock-app.matter | 2 +- examples/placeholder/linux/apps/app1/config.matter | 2 +- examples/placeholder/linux/apps/app2/config.matter | 2 +- .../resource-monitoring-app.matter | 2 +- .../temperature-measurement.matter | 2 +- examples/tv-app/tv-common/tv-app.matter | 2 +- .../tv-casting-app/tv-casting-common/tv-casting-app.matter | 2 +- .../virtual-device-common/virtual-device-app.matter | 2 +- .../tests/outputs/all-clusters-app/app-templates/access.h | 3 +++ .../zap/tests/outputs/lighting-app/app-templates/access.h | 3 +++ .../chip/ethernet-network-diagnostics-cluster.xml | 7 ++++--- src/controller/data_model/controller-clusters.matter | 2 +- 21 files changed, 28 insertions(+), 21 deletions(-) diff --git a/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter b/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter index 3396daa5fda28d..032dbbe7c26d2b 100644 --- a/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter +++ b/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter @@ -1006,7 +1006,7 @@ server cluster EthernetNetworkDiagnostics = 55 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetCounts(): DefaultSuccess = 0; + command access(invoke: manage) ResetCounts(): DefaultSuccess = 0; } /** Commands to trigger a Node to allow a new Administrator to commission it. */ 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 a2f4ff3e3c28ed..818ae5bb5e831a 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 @@ -1979,7 +1979,7 @@ server cluster EthernetNetworkDiagnostics = 55 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetCounts(): DefaultSuccess = 0; + command access(invoke: manage) ResetCounts(): DefaultSuccess = 0; } /** Accurate time is required for a number of reasons, including scheduling, display and validating security materials. */ 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 e2ee1bc8b3f7ce..ac2225d1ef30cb 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 @@ -1734,7 +1734,7 @@ server cluster EthernetNetworkDiagnostics = 55 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetCounts(): DefaultSuccess = 0; + command access(invoke: manage) ResetCounts(): DefaultSuccess = 0; } /** This cluster exposes interactions with a switch device, for the purpose of using those interactions by other devices. diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter index 3d05af89e14d94..3fb3ad1098657a 100644 --- a/examples/bridge-app/bridge-common/bridge-app.matter +++ b/examples/bridge-app/bridge-common/bridge-app.matter @@ -1310,7 +1310,7 @@ server cluster EthernetNetworkDiagnostics = 55 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetCounts(): DefaultSuccess = 0; + command access(invoke: manage) ResetCounts(): DefaultSuccess = 0; } /** This cluster exposes interactions with a switch device, for the purpose of using those interactions by other devices. diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter index 4f9b3b56f0b5e4..c6530ebd74bd0b 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter @@ -1188,7 +1188,7 @@ server cluster EthernetNetworkDiagnostics = 55 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetCounts(): DefaultSuccess = 0; + command access(invoke: manage) ResetCounts(): DefaultSuccess = 0; } /** Commands to trigger a Node to allow a new Administrator to commission it. */ 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 5f63e3f131f054..286d0943178c3c 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 @@ -1173,7 +1173,7 @@ server cluster EthernetNetworkDiagnostics = 55 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetCounts(): DefaultSuccess = 0; + command access(invoke: manage) ResetCounts(): DefaultSuccess = 0; } /** Commands to trigger a Node to allow a new Administrator to commission it. */ 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 dfc5e4a71586d7..eb236fc027f126 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 @@ -1487,7 +1487,7 @@ server cluster EthernetNetworkDiagnostics = 55 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetCounts(): DefaultSuccess = 0; + command access(invoke: manage) ResetCounts(): DefaultSuccess = 0; } /** Accurate time is required for a number of reasons, including scheduling, display and validating security materials. */ diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter index ceed04f9f23c14..e49cf70fe9ebc8 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter @@ -1106,7 +1106,7 @@ server cluster EthernetNetworkDiagnostics = 55 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetCounts(): DefaultSuccess = 0; + command access(invoke: manage) ResetCounts(): DefaultSuccess = 0; } /** Commands to trigger a Node to allow a new Administrator to commission it. */ diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter index d2949059cc557e..9c80cb25f6e38d 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -1491,7 +1491,7 @@ server cluster EthernetNetworkDiagnostics = 55 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetCounts(): DefaultSuccess = 0; + command access(invoke: manage) ResetCounts(): DefaultSuccess = 0; } /** This cluster exposes interactions with a switch device, for the purpose of using those interactions by other devices. diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter index 4c89338e602a9d..a406d82ab875c5 100644 --- a/examples/lock-app/lock-common/lock-app.matter +++ b/examples/lock-app/lock-common/lock-app.matter @@ -1410,7 +1410,7 @@ server cluster EthernetNetworkDiagnostics = 55 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetCounts(): DefaultSuccess = 0; + command access(invoke: manage) ResetCounts(): DefaultSuccess = 0; } /** Commands to trigger a Node to allow a new Administrator to commission it. */ diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index 5ff8d4573fef7f..45d3d97e0c5383 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -2157,7 +2157,7 @@ server cluster EthernetNetworkDiagnostics = 55 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetCounts(): DefaultSuccess = 0; + command access(invoke: manage) ResetCounts(): DefaultSuccess = 0; } /** This Cluster serves two purposes towards a Node communicating with a Bridge: indicate that the functionality on diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index 4250eaf837efb1..597a4142603e0c 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -2116,7 +2116,7 @@ server cluster EthernetNetworkDiagnostics = 55 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetCounts(): DefaultSuccess = 0; + command access(invoke: manage) ResetCounts(): DefaultSuccess = 0; } /** This Cluster serves two purposes towards a Node communicating with a Bridge: indicate that the functionality on diff --git a/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter b/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter index 36d84a6b36fe0e..478a98e2976219 100644 --- a/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter +++ b/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter @@ -1173,7 +1173,7 @@ server cluster EthernetNetworkDiagnostics = 55 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetCounts(): DefaultSuccess = 0; + command access(invoke: manage) ResetCounts(): DefaultSuccess = 0; } /** This cluster exposes interactions with a switch device, for the purpose of using those interactions by other devices. 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 7a4db1544c56bf..e4411dc96ff263 100644 --- a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter +++ b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter @@ -757,7 +757,7 @@ server cluster EthernetNetworkDiagnostics = 55 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetCounts(): DefaultSuccess = 0; + command access(invoke: manage) ResetCounts(): DefaultSuccess = 0; } /** Commands to trigger a Node to allow a new Administrator to commission it. */ diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter index 05d80184740cde..6f987a961de244 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -1413,7 +1413,7 @@ server cluster EthernetNetworkDiagnostics = 55 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetCounts(): DefaultSuccess = 0; + command access(invoke: manage) ResetCounts(): DefaultSuccess = 0; } /** Commands to trigger a Node to allow a new Administrator to commission it. */ 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 29aa34023694ca..57b5751770c639 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 @@ -1093,7 +1093,7 @@ server cluster EthernetNetworkDiagnostics = 55 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetCounts(): DefaultSuccess = 0; + command access(invoke: manage) ResetCounts(): DefaultSuccess = 0; } /** Commands to trigger a Node to allow a new Administrator to commission it. */ diff --git a/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter b/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter index 5910114fc99122..2d6d9c13d74b5c 100644 --- a/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter +++ b/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter @@ -1548,7 +1548,7 @@ server cluster EthernetNetworkDiagnostics = 55 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetCounts(): DefaultSuccess = 0; + command access(invoke: manage) ResetCounts(): DefaultSuccess = 0; } /** Commands to trigger a Node to allow a new Administrator to commission it. */ diff --git a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/access.h b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/access.h index 119829602ee10d..f5a63477523b60 100644 --- a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/access.h +++ b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/access.h @@ -410,6 +410,7 @@ 0x00000031, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \ 0x00000031, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \ 0x00000033, /* Cluster: General Diagnostics, Command: TestEventTrigger, Privilege: manage */ \ + 0x00000037, /* Cluster: Ethernet Network Diagnostics, Command: ResetCounts, Privilege: manage */ \ 0x0000003C, /* Cluster: Administrator Commissioning, Command: OpenCommissioningWindow, Privilege: administer */ \ 0x0000003C, /* Cluster: Administrator Commissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \ 0x0000003C, /* Cluster: Administrator Commissioning, Command: RevokeCommissioning, Privilege: administer */ \ @@ -462,6 +463,7 @@ 0x00000006, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \ 0x00000008, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \ 0x00000000, /* Cluster: General Diagnostics, Command: TestEventTrigger, Privilege: manage */ \ + 0x00000000, /* Cluster: Ethernet Network Diagnostics, Command: ResetCounts, Privilege: manage */ \ 0x00000000, /* Cluster: Administrator Commissioning, Command: OpenCommissioningWindow, Privilege: administer */ \ 0x00000001, /* Cluster: Administrator Commissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \ 0x00000002, /* Cluster: Administrator Commissioning, Command: RevokeCommissioning, Privilege: administer */ \ @@ -514,6 +516,7 @@ kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \ kMatterAccessPrivilegeManage, /* Cluster: General Diagnostics, Command: TestEventTrigger, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Ethernet Network Diagnostics, Command: ResetCounts, Privilege: manage */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Administrator Commissioning, Command: OpenCommissioningWindow, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Administrator Commissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Administrator Commissioning, Command: RevokeCommissioning, Privilege: administer */ \ diff --git a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/access.h b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/access.h index b9946f3ca9162d..fce25f61ac1f50 100644 --- a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/access.h +++ b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/access.h @@ -172,6 +172,7 @@ 0x00000031, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \ 0x00000031, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \ 0x00000033, /* Cluster: General Diagnostics, Command: TestEventTrigger, Privilege: manage */ \ + 0x00000037, /* Cluster: Ethernet Network Diagnostics, Command: ResetCounts, Privilege: manage */ \ 0x0000003C, /* Cluster: Administrator Commissioning, Command: OpenCommissioningWindow, Privilege: administer */ \ 0x0000003C, /* Cluster: Administrator Commissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \ 0x0000003C, /* Cluster: Administrator Commissioning, Command: RevokeCommissioning, Privilege: administer */ \ @@ -207,6 +208,7 @@ 0x00000006, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \ 0x00000008, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \ 0x00000000, /* Cluster: General Diagnostics, Command: TestEventTrigger, Privilege: manage */ \ + 0x00000000, /* Cluster: Ethernet Network Diagnostics, Command: ResetCounts, Privilege: manage */ \ 0x00000000, /* Cluster: Administrator Commissioning, Command: OpenCommissioningWindow, Privilege: administer */ \ 0x00000001, /* Cluster: Administrator Commissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \ 0x00000002, /* Cluster: Administrator Commissioning, Command: RevokeCommissioning, Privilege: administer */ \ @@ -242,6 +244,7 @@ kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \ kMatterAccessPrivilegeManage, /* Cluster: General Diagnostics, Command: TestEventTrigger, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Ethernet Network Diagnostics, Command: ResetCounts, Privilege: manage */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Administrator Commissioning, Command: OpenCommissioningWindow, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Administrator Commissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Administrator Commissioning, Command: RevokeCommissioning, Privilege: administer */ \ diff --git a/src/app/zap-templates/zcl/data-model/chip/ethernet-network-diagnostics-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/ethernet-network-diagnostics-cluster.xml index f3b6192bbef2b3..3dd3e9d814aa02 100644 --- a/src/app/zap-templates/zcl/data-model/chip/ethernet-network-diagnostics-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/ethernet-network-diagnostics-cluster.xml @@ -27,13 +27,13 @@ limitations under the License. - + - + General Ethernet Network Diagnostics @@ -51,6 +51,7 @@ limitations under the License. TimeSinceReset Reception of this command SHALL reset the attributes: PacketRxCount, PacketTxCount, TxErrCount, CollisionCount, OverrunCount to 0 - + + diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 23a39b6f7dbe82..213eb39c8ba56a 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -2110,7 +2110,7 @@ client cluster EthernetNetworkDiagnostics = 55 { readonly attribute int16u clusterRevision = 65533; /** Reception of this command SHALL reset the attributes: PacketRxCount, PacketTxCount, TxErrCount, CollisionCount, OverrunCount to 0 */ - command ResetCounts(): DefaultSuccess = 0; + command access(invoke: manage) ResetCounts(): DefaultSuccess = 0; } /** Accurate time is required for a number of reasons, including scheduling, display and validating security materials. */ From 0da67afddbb2dfcde4f5fb7ca339d8b6d31c09e5 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Fri, 27 Oct 2023 17:28:25 -0400 Subject: [PATCH 13/41] Update `Operational Credential Cluster` to match the spec (#30061) * More updates to match sizes of thins * Zap regen --- .../air-purifier-app.matter | 18 +++++----- .../air-quality-sensor-app.matter | 18 +++++----- .../all-clusters-app.matter | 18 +++++----- .../all-clusters-minimal-app.matter | 18 +++++----- .../bridge-common/bridge-app.matter | 18 +++++----- ...p_rootnode_dimmablelight_bCwGYSDpoe.matter | 18 +++++----- ...umiditysensor_thermostat_56de3d5f45.matter | 18 +++++----- ...ootnode_airqualitysensor_e63187f6c9.matter | 18 +++++----- ...ootnode_basicvideoplayer_0ff86e943b.matter | 18 +++++----- ...de_colortemperaturelight_hbUnzYVeyn.matter | 18 +++++----- .../rootnode_contactsensor_lFAGG1bfRO.matter | 18 +++++----- .../rootnode_dimmablelight_bCwGYSDpoe.matter | 18 +++++----- .../rootnode_dishwasher_cc105034fe.matter | 18 +++++----- .../rootnode_doorlock_aNKYAreMXE.matter | 18 +++++----- ...tnode_extendedcolorlight_8lcaaYJVAa.matter | 18 +++++----- .../devices/rootnode_fan_7N2TobIlOX.matter | 18 +++++----- .../rootnode_flowsensor_1zVxHedlaV.matter | 18 +++++----- .../rootnode_genericswitch_9866e35d0b.matter | 18 +++++----- ...tnode_heatingcoolingunit_ncdGai1E5a.matter | 18 +++++----- .../rootnode_humiditysensor_Xyj4gda6Hb.matter | 18 +++++----- .../rootnode_laundrywasher_fb10d238c8.matter | 18 +++++----- .../rootnode_lightsensor_lZQycTFcJK.matter | 18 +++++----- ...rootnode_occupancysensor_iHyVgifZuo.matter | 18 +++++----- .../rootnode_onofflight_bbs1b7IaOV.matter | 18 +++++----- .../rootnode_onofflight_samplemei.matter | 18 +++++----- ...ootnode_onofflightswitch_FsPlMr090Q.matter | 18 +++++----- ...rootnode_onoffpluginunit_Wtf8ss5EBY.matter | 18 +++++----- .../rootnode_pressuresensor_s0qC9wLH4k.matter | 18 +++++----- .../devices/rootnode_pump_5f904818cc.matter | 18 +++++----- .../devices/rootnode_pump_a811bb33a0.matter | 18 +++++----- ...eraturecontrolledcabinet_ffdb696680.matter | 18 +++++----- ...ode_roboticvacuumcleaner_1807ff0c49.matter | 18 +++++----- ...tnode_roomairconditioner_9cf3607804.matter | 18 +++++----- .../rootnode_smokecoalarm_686fe0dcb8.matter | 18 +++++----- .../rootnode_speaker_RpzeXdimqA.matter | 18 +++++----- ...otnode_temperaturesensor_Qy1zkNW7c3.matter | 18 +++++----- .../rootnode_thermostat_bm3fb8dhYi.matter | 18 +++++----- .../rootnode_windowcovering_RLCxaGi9Yx.matter | 18 +++++----- .../contact-sensor-app.matter | 18 +++++----- .../dishwasher-common/dishwasher-app.matter | 18 +++++----- .../light-switch-app.matter | 18 +++++----- .../data_model/lighting-app-ethernet.matter | 18 +++++----- .../data_model/lighting-app-thread.matter | 18 +++++----- .../data_model/lighting-app-wifi.matter | 18 +++++----- .../lighting-common/lighting-app.matter | 18 +++++----- .../nxp/zap/lighting-on-off.matter | 18 +++++----- examples/lighting-app/qpg/zap/light.matter | 18 +++++----- .../data_model/lighting-thread-app.matter | 18 +++++----- .../data_model/lighting-wifi-app.matter | 18 +++++----- examples/lock-app/lock-common/lock-app.matter | 18 +++++----- examples/lock-app/nxp/zap/lock-app.matter | 18 +++++----- examples/lock-app/qpg/zap/lock.matter | 18 +++++----- .../log-source-common/log-source-app.matter | 18 +++++----- .../ota-provider-app.matter | 18 +++++----- .../ota-requestor-app.matter | 18 +++++----- .../placeholder/linux/apps/app1/config.matter | 36 +++++++++---------- .../placeholder/linux/apps/app2/config.matter | 36 +++++++++---------- examples/pump-app/pump-common/pump-app.matter | 18 +++++----- .../silabs/data_model/pump-thread-app.matter | 18 +++++----- .../silabs/data_model/pump-wifi-app.matter | 18 +++++----- .../pump-controller-app.matter | 18 +++++----- .../refrigerator-app.matter | 18 +++++----- .../resource-monitoring-app.matter | 18 +++++----- examples/rvc-app/rvc-common/rvc-app.matter | 18 +++++----- .../smoke-co-alarm-app.matter | 18 +++++----- .../temperature-measurement.matter | 18 +++++----- .../nxp/zap/thermostat_matter_thread.matter | 18 +++++----- .../nxp/zap/thermostat_matter_wifi.matter | 18 +++++----- .../thermostat-common/thermostat.matter | 18 +++++----- examples/tv-app/tv-common/tv-app.matter | 36 +++++++++---------- .../tv-casting-common/tv-casting-app.matter | 18 +++++----- .../virtual-device-app.matter | 18 +++++----- examples/window-app/common/window-app.matter | 18 +++++----- .../chip/operational-credentials-cluster.xml | 18 +++++----- .../data_model/controller-clusters.matter | 18 +++++----- 75 files changed, 702 insertions(+), 702 deletions(-) diff --git a/examples/air-purifier-app/air-purifier-common/air-purifier-app.matter b/examples/air-purifier-app/air-purifier-common/air-purifier-app.matter index f82745976b5f70..d210cebb350c3a 100644 --- a/examples/air-purifier-app/air-purifier-common/air-purifier-app.matter +++ b/examples/air-purifier-app/air-purifier-common/air-purifier-app.matter @@ -836,7 +836,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -844,14 +844,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -874,12 +874,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -890,7 +890,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter b/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter index 032dbbe7c26d2b..757daa911b73e7 100644 --- a/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter +++ b/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter @@ -1103,7 +1103,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -1111,14 +1111,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -1141,12 +1141,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -1157,7 +1157,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; 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 818ae5bb5e831a..0e5e992f2a80d8 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 @@ -2268,7 +2268,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -2276,14 +2276,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -2306,12 +2306,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -2322,7 +2322,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter index ac2225d1ef30cb..dca5447c74ece8 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 @@ -1878,7 +1878,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -1886,14 +1886,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -1916,12 +1916,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -1932,7 +1932,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter index 3fb3ad1098657a..2e5edabc01249d 100644 --- a/examples/bridge-app/bridge-common/bridge-app.matter +++ b/examples/bridge-app/bridge-common/bridge-app.matter @@ -1460,7 +1460,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -1468,14 +1468,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -1498,12 +1498,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -1514,7 +1514,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter index c6530ebd74bd0b..9122d0776bde85 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter @@ -1285,7 +1285,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -1293,14 +1293,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -1323,12 +1323,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -1339,7 +1339,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter b/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter index fcd2e9524a1f7b..fc5295bf533e44 100644 --- a/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter +++ b/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter @@ -756,7 +756,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -764,14 +764,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -794,12 +794,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -810,7 +810,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter b/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter index fed80ee6a4c088..f0586b4412dc61 100644 --- a/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter +++ b/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter @@ -919,7 +919,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -927,14 +927,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -957,12 +957,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -973,7 +973,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter index 0d7a34db5a73cd..c1f34dfec009da 100644 --- a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter +++ b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter @@ -924,7 +924,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -932,14 +932,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -962,12 +962,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -978,7 +978,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter index 1785abe0718d04..c94c88d292bb1b 100644 --- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter +++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter @@ -1101,7 +1101,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -1109,14 +1109,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -1139,12 +1139,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -1155,7 +1155,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter index a1368474e20d04..a5e95aa3724459 100644 --- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter +++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter @@ -1007,7 +1007,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -1015,14 +1015,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -1045,12 +1045,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -1061,7 +1061,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter index 94497ea9517999..a3b3a03ff7d084 100644 --- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter @@ -1157,7 +1157,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -1165,14 +1165,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -1195,12 +1195,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -1211,7 +1211,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter b/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter index bcf10370da4989..d762a94ba1f721 100644 --- a/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter +++ b/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter @@ -802,7 +802,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -810,14 +810,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -840,12 +840,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -856,7 +856,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter index 94537055c7bfa4..c47f66f299dd04 100644 --- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter +++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter @@ -1007,7 +1007,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -1015,14 +1015,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -1045,12 +1045,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -1061,7 +1061,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter index 1d213db26a0bf1..c633c224718dd7 100644 --- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter +++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter @@ -1157,7 +1157,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -1165,14 +1165,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -1195,12 +1195,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -1211,7 +1211,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter index 649d845d2cedd7..bdaa7cf53f05f1 100644 --- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter +++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter @@ -994,7 +994,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -1002,14 +1002,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -1032,12 +1032,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -1048,7 +1048,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter index 4572534ad53621..5fe7d7dd1b78d4 100644 --- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter +++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter @@ -1013,7 +1013,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -1021,14 +1021,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -1051,12 +1051,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -1067,7 +1067,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/chef/devices/rootnode_genericswitch_9866e35d0b.matter b/examples/chef/devices/rootnode_genericswitch_9866e35d0b.matter index c3459693bcf57b..3305b751649ce5 100644 --- a/examples/chef/devices/rootnode_genericswitch_9866e35d0b.matter +++ b/examples/chef/devices/rootnode_genericswitch_9866e35d0b.matter @@ -739,7 +739,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -747,14 +747,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -777,12 +777,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -793,7 +793,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter index 456ffdd0022833..2d71bc7ead0b2e 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter @@ -1151,7 +1151,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -1159,14 +1159,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -1189,12 +1189,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -1205,7 +1205,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter index 4de43fc8c67207..aa56178ebd3882 100644 --- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter +++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter @@ -1013,7 +1013,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -1021,14 +1021,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -1051,12 +1051,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -1067,7 +1067,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter b/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter index 91083daf90c449..8dbae5065b0756 100644 --- a/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter +++ b/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter @@ -802,7 +802,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -810,14 +810,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -840,12 +840,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -856,7 +856,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter index 58af6be5dacaa0..2616596fe6e398 100644 --- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter +++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter @@ -1013,7 +1013,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -1021,14 +1021,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -1051,12 +1051,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -1067,7 +1067,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter index 298803acb4842b..b8e8679827989d 100644 --- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter +++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter @@ -1013,7 +1013,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -1021,14 +1021,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -1051,12 +1051,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -1067,7 +1067,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter index 2ad1a8a8395b82..43832bbd05b10a 100644 --- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter +++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter @@ -1157,7 +1157,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -1165,14 +1165,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -1195,12 +1195,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -1211,7 +1211,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/chef/devices/rootnode_onofflight_samplemei.matter b/examples/chef/devices/rootnode_onofflight_samplemei.matter index f119f510914456..c8e86599111235 100644 --- a/examples/chef/devices/rootnode_onofflight_samplemei.matter +++ b/examples/chef/devices/rootnode_onofflight_samplemei.matter @@ -1157,7 +1157,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -1165,14 +1165,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -1195,12 +1195,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -1211,7 +1211,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter index c47c0ff2178ab6..6715aca6c31645 100644 --- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter +++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter @@ -1121,7 +1121,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -1129,14 +1129,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -1159,12 +1159,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -1175,7 +1175,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter index 3fe9884671f64a..154c09b088284e 100644 --- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter +++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter @@ -1056,7 +1056,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -1064,14 +1064,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -1094,12 +1094,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -1110,7 +1110,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter index c16b6fc6a441f1..cb5100556ae8ea 100644 --- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter +++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter @@ -1013,7 +1013,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -1021,14 +1021,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -1051,12 +1051,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -1067,7 +1067,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/chef/devices/rootnode_pump_5f904818cc.matter b/examples/chef/devices/rootnode_pump_5f904818cc.matter index d1422b6307504c..fc8f6d32e6a6c8 100644 --- a/examples/chef/devices/rootnode_pump_5f904818cc.matter +++ b/examples/chef/devices/rootnode_pump_5f904818cc.matter @@ -758,7 +758,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -766,14 +766,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -796,12 +796,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -812,7 +812,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/chef/devices/rootnode_pump_a811bb33a0.matter b/examples/chef/devices/rootnode_pump_a811bb33a0.matter index 39f5ef1a9769d9..7f814f43e64f10 100644 --- a/examples/chef/devices/rootnode_pump_a811bb33a0.matter +++ b/examples/chef/devices/rootnode_pump_a811bb33a0.matter @@ -758,7 +758,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -766,14 +766,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -796,12 +796,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -812,7 +812,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter b/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter index f31c4cdbf57406..3479c924b2a5db 100644 --- a/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter +++ b/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter @@ -802,7 +802,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -810,14 +810,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -840,12 +840,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -856,7 +856,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter index b85baa83661958..ab6ae185cb21dc 100644 --- a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter +++ b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter @@ -756,7 +756,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -764,14 +764,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -794,12 +794,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -810,7 +810,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter index ec3b0ebc2ab633..cb0b194a489307 100644 --- a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter +++ b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter @@ -801,7 +801,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -809,14 +809,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -839,12 +839,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -855,7 +855,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter b/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter index d202497a28e0ee..1ff0419a1af95d 100644 --- a/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter +++ b/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter @@ -988,7 +988,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -996,14 +996,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -1026,12 +1026,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -1042,7 +1042,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter index ee7ff1b79b7891..a9543c16f40ff4 100644 --- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter +++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter @@ -1082,7 +1082,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -1090,14 +1090,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -1120,12 +1120,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -1136,7 +1136,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter index a8748e38982e24..82b38670997e4f 100644 --- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter +++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter @@ -1013,7 +1013,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -1021,14 +1021,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -1051,12 +1051,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -1067,7 +1067,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter index 1759c382206b3a..a6c5f4c54d06bc 100644 --- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter +++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter @@ -1007,7 +1007,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -1015,14 +1015,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -1045,12 +1045,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -1061,7 +1061,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter index 1ba5b2d9d35021..3047f73f5a54bb 100644 --- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter +++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter @@ -1007,7 +1007,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -1015,14 +1015,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -1045,12 +1045,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -1061,7 +1061,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; 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 286d0943178c3c..190d78c9c05892 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 @@ -1270,7 +1270,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -1278,14 +1278,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -1308,12 +1308,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -1324,7 +1324,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter b/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter index cbfef17a9af063..3ed55a9ed4b283 100644 --- a/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter +++ b/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter @@ -890,7 +890,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -898,14 +898,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -928,12 +928,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -944,7 +944,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; 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 eb236fc027f126..8a7c646fdf7dad 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 @@ -1776,7 +1776,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -1784,14 +1784,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -1814,12 +1814,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -1830,7 +1830,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter index e49cf70fe9ebc8..320d90679f6c9b 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter @@ -1203,7 +1203,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -1211,14 +1211,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -1241,12 +1241,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -1257,7 +1257,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; 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 e66503d6af8c9b..14275388158fb2 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter @@ -1326,7 +1326,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -1334,14 +1334,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -1364,12 +1364,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -1380,7 +1380,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; 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 6e05bea7ee5e59..532d346f6fc1fc 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter @@ -1236,7 +1236,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -1244,14 +1244,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -1274,12 +1274,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -1290,7 +1290,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter index 9c80cb25f6e38d..e69c91577158ca 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -1640,7 +1640,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -1648,14 +1648,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -1678,12 +1678,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -1694,7 +1694,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.matter b/examples/lighting-app/nxp/zap/lighting-on-off.matter index a3b640bec36a33..8cf9aaefc7f49c 100644 --- a/examples/lighting-app/nxp/zap/lighting-on-off.matter +++ b/examples/lighting-app/nxp/zap/lighting-on-off.matter @@ -1200,7 +1200,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -1208,14 +1208,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -1238,12 +1238,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -1254,7 +1254,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/lighting-app/qpg/zap/light.matter b/examples/lighting-app/qpg/zap/light.matter index e70cc6d81deac9..0f1c6d97ce4561 100644 --- a/examples/lighting-app/qpg/zap/light.matter +++ b/examples/lighting-app/qpg/zap/light.matter @@ -1266,7 +1266,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -1274,14 +1274,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -1304,12 +1304,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -1320,7 +1320,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; 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 7fba724a460eac..7c500008381e80 100644 --- a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter +++ b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter @@ -1732,7 +1732,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -1740,14 +1740,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -1770,12 +1770,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -1786,7 +1786,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; 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 7a76484abf4fa3..96787523fa0d33 100644 --- a/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter +++ b/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter @@ -1622,7 +1622,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -1630,14 +1630,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -1660,12 +1660,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -1676,7 +1676,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter index a406d82ab875c5..7f8b6d004493db 100644 --- a/examples/lock-app/lock-common/lock-app.matter +++ b/examples/lock-app/lock-common/lock-app.matter @@ -1507,7 +1507,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -1515,14 +1515,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -1545,12 +1545,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -1561,7 +1561,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/lock-app/nxp/zap/lock-app.matter b/examples/lock-app/nxp/zap/lock-app.matter index b0b78a78d95ffc..1020b464b61a4d 100644 --- a/examples/lock-app/nxp/zap/lock-app.matter +++ b/examples/lock-app/nxp/zap/lock-app.matter @@ -818,7 +818,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -826,14 +826,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -856,12 +856,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -872,7 +872,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/lock-app/qpg/zap/lock.matter b/examples/lock-app/qpg/zap/lock.matter index b195e0e68c1cbc..3e953684c4ca5f 100644 --- a/examples/lock-app/qpg/zap/lock.matter +++ b/examples/lock-app/qpg/zap/lock.matter @@ -1099,7 +1099,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -1107,14 +1107,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -1137,12 +1137,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -1153,7 +1153,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; 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 df7f7fe64beaef..207575f2e08c50 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 @@ -367,7 +367,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -375,14 +375,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -400,12 +400,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -416,7 +416,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; 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 10737bfd5a1bfe..f06772b7d23f79 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 @@ -803,7 +803,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -811,14 +811,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -841,12 +841,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -857,7 +857,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; 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 fa22896c19fc20..cadac4c45ea769 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 @@ -986,7 +986,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -994,14 +994,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -1024,12 +1024,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -1040,7 +1040,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index 45d3d97e0c5383..119e2b6eba63d1 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -2441,12 +2441,12 @@ client cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } request struct CertificateChainRequestRequest { @@ -2454,11 +2454,11 @@ client cluster OperationalCredentials = 62 { } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } @@ -2468,9 +2468,9 @@ client cluster OperationalCredentials = 62 { } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -2483,7 +2483,7 @@ client cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } request struct UpdateFabricLabelRequest { @@ -2565,7 +2565,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -2573,14 +2573,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -2603,12 +2603,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -2619,7 +2619,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index 597a4142603e0c..0fd6a2c6d0c1b2 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -2400,12 +2400,12 @@ client cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } request struct CertificateChainRequestRequest { @@ -2413,11 +2413,11 @@ client cluster OperationalCredentials = 62 { } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } @@ -2427,9 +2427,9 @@ client cluster OperationalCredentials = 62 { } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -2442,7 +2442,7 @@ client cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } request struct UpdateFabricLabelRequest { @@ -2524,7 +2524,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -2532,14 +2532,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -2562,12 +2562,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -2578,7 +2578,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter index 6f2564240c2e86..b73ddb2d490f40 100644 --- a/examples/pump-app/pump-common/pump-app.matter +++ b/examples/pump-app/pump-common/pump-app.matter @@ -1058,7 +1058,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -1066,14 +1066,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -1096,12 +1096,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -1112,7 +1112,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/pump-app/silabs/data_model/pump-thread-app.matter b/examples/pump-app/silabs/data_model/pump-thread-app.matter index ecff28c2b3f874..1738d10a837777 100644 --- a/examples/pump-app/silabs/data_model/pump-thread-app.matter +++ b/examples/pump-app/silabs/data_model/pump-thread-app.matter @@ -1058,7 +1058,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -1066,14 +1066,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -1096,12 +1096,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -1112,7 +1112,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/pump-app/silabs/data_model/pump-wifi-app.matter b/examples/pump-app/silabs/data_model/pump-wifi-app.matter index ecff28c2b3f874..1738d10a837777 100644 --- a/examples/pump-app/silabs/data_model/pump-wifi-app.matter +++ b/examples/pump-app/silabs/data_model/pump-wifi-app.matter @@ -1058,7 +1058,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -1066,14 +1066,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -1096,12 +1096,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -1112,7 +1112,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; 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 8e772d50f88fb8..0f95bb9b2ac941 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 @@ -983,7 +983,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -991,14 +991,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -1021,12 +1021,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -1037,7 +1037,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/refrigerator-app/refrigerator-common/refrigerator-app.matter b/examples/refrigerator-app/refrigerator-common/refrigerator-app.matter index 38c1f5042b6363..90aec364488d93 100644 --- a/examples/refrigerator-app/refrigerator-common/refrigerator-app.matter +++ b/examples/refrigerator-app/refrigerator-common/refrigerator-app.matter @@ -757,7 +757,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -765,14 +765,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -795,12 +795,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -811,7 +811,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter b/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter index 478a98e2976219..10a315c77baa95 100644 --- a/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter +++ b/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter @@ -1322,7 +1322,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -1330,14 +1330,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -1360,12 +1360,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -1376,7 +1376,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/rvc-app/rvc-common/rvc-app.matter b/examples/rvc-app/rvc-common/rvc-app.matter index 2b09d5cd27e3d9..4822febc1d0239 100644 --- a/examples/rvc-app/rvc-common/rvc-app.matter +++ b/examples/rvc-app/rvc-common/rvc-app.matter @@ -687,7 +687,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -695,14 +695,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -725,12 +725,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -741,7 +741,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; 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 b1f953f847ecfa..d6d288d445433c 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 @@ -1389,7 +1389,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -1397,14 +1397,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -1427,12 +1427,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -1443,7 +1443,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; 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 e4411dc96ff263..ad188caf841c77 100644 --- a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter +++ b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter @@ -854,7 +854,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -862,14 +862,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -892,12 +892,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -908,7 +908,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/thermostat/nxp/zap/thermostat_matter_thread.matter b/examples/thermostat/nxp/zap/thermostat_matter_thread.matter index 7ce046e5c72fc2..88b3c1b390f486 100644 --- a/examples/thermostat/nxp/zap/thermostat_matter_thread.matter +++ b/examples/thermostat/nxp/zap/thermostat_matter_thread.matter @@ -1524,7 +1524,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -1532,14 +1532,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -1562,12 +1562,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -1578,7 +1578,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter b/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter index 52de8d4d2f25d6..5b9518590b59c4 100644 --- a/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter +++ b/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter @@ -1433,7 +1433,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -1441,14 +1441,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -1471,12 +1471,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -1487,7 +1487,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter index 9da24508679c42..1c8eb24f2e4dfe 100644 --- a/examples/thermostat/thermostat-common/thermostat.matter +++ b/examples/thermostat/thermostat-common/thermostat.matter @@ -1357,7 +1357,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -1365,14 +1365,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -1395,12 +1395,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -1411,7 +1411,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter index 6f987a961de244..3f80e94dd80635 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -1510,12 +1510,12 @@ client cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } request struct CertificateChainRequestRequest { @@ -1523,11 +1523,11 @@ client cluster OperationalCredentials = 62 { } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } @@ -1537,9 +1537,9 @@ client cluster OperationalCredentials = 62 { } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -1552,7 +1552,7 @@ client cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } request struct UpdateFabricLabelRequest { @@ -1634,7 +1634,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -1642,14 +1642,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -1672,12 +1672,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -1688,7 +1688,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; 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 57b5751770c639..02fcda0cfd0cab 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 @@ -1190,7 +1190,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -1198,14 +1198,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -1228,12 +1228,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -1244,7 +1244,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter b/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter index 2d6d9c13d74b5c..4f934ebe6de8c8 100644 --- a/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter +++ b/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter @@ -1645,7 +1645,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -1653,14 +1653,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -1683,12 +1683,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -1699,7 +1699,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter index 9ca68b8aad1419..7108c8045a2cc2 100644 --- a/examples/window-app/common/window-app.matter +++ b/examples/window-app/common/window-app.matter @@ -1489,7 +1489,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } request struct CertificateChainRequestRequest { @@ -1497,14 +1497,14 @@ server cluster OperationalCredentials = 62 { } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -1527,12 +1527,12 @@ server cluster OperationalCredentials = 62 { } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } response struct CSRResponse = 5 { @@ -1543,7 +1543,7 @@ server cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; diff --git a/src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml index 0590efbe501263..d79cbb845c7827 100644 --- a/src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml @@ -71,14 +71,14 @@ limitations under the License. Sender is requesting attestation information from the receiver. - + An attestation information confirmation from the server. - - + + @@ -89,12 +89,12 @@ limitations under the License. A device attestation certificate (DAC) or product attestation intermediate (PAI) certificate from the server. - + Sender is requesting a certificate signing request (CSR) from the receiver. - + @@ -108,9 +108,9 @@ limitations under the License. Sender is requesting to add the new node operational certificates. - - - + + + @@ -127,7 +127,7 @@ limitations under the License. Response to AddNOC or UpdateNOC commands. - + diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 213eb39c8ba56a..38db3098172601 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -2490,12 +2490,12 @@ client cluster OperationalCredentials = 62 { readonly attribute int16u clusterRevision = 65533; request struct AttestationRequestRequest { - octet_string attestationNonce = 0; + octet_string<32> attestationNonce = 0; } response struct AttestationResponse = 1 { - octet_string attestationElements = 0; - octet_string attestationSignature = 1; + octet_string<900> attestationElements = 0; + octet_string<64> attestationSignature = 1; } request struct CertificateChainRequestRequest { @@ -2503,11 +2503,11 @@ client cluster OperationalCredentials = 62 { } response struct CertificateChainResponse = 3 { - octet_string certificate = 0; + octet_string<600> certificate = 0; } request struct CSRRequestRequest { - octet_string CSRNonce = 0; + octet_string<32> CSRNonce = 0; optional boolean isForUpdateNOC = 1; } @@ -2517,9 +2517,9 @@ client cluster OperationalCredentials = 62 { } request struct AddNOCRequest { - octet_string NOCValue = 0; - optional octet_string ICACValue = 1; - octet_string IPKValue = 2; + octet_string<400> NOCValue = 0; + optional octet_string<400> ICACValue = 1; + octet_string<16> IPKValue = 2; int64u caseAdminSubject = 3; vendor_id adminVendorId = 4; } @@ -2532,7 +2532,7 @@ client cluster OperationalCredentials = 62 { response struct NOCResponse = 8 { NodeOperationalCertStatusEnum statusCode = 0; optional fabric_idx fabricIndex = 1; - optional char_string debugText = 2; + optional char_string<128> debugText = 2; } request struct UpdateFabricLabelRequest { From 851b001349f8e937ee46c65c88248033086581fc Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Fri, 27 Oct 2023 17:28:49 -0400 Subject: [PATCH 14/41] Make `Media Input Cluster` match the spec (#30060) * Change media input xml to spec * Zap regen * minor change to kick CI * minor change to kick CI (featuremap already supported) --- .../all-clusters-minimal-app.matter | 4 ++-- .../rootnode_basicvideoplayer_0ff86e943b.matter | 4 ++-- examples/placeholder/linux/apps/app1/config.matter | 12 ++++++------ examples/placeholder/linux/apps/app2/config.matter | 12 ++++++------ examples/tv-app/tv-common/tv-app.matter | 6 +++--- .../tv-casting-common/tv-casting-app.matter | 6 +++--- .../outputs/all-clusters-app/app-templates/access.h | 3 +++ .../zcl/data-model/chip/media-input-cluster.xml | 9 +++++---- src/controller/data_model/controller-clusters.matter | 6 +++--- 9 files changed, 33 insertions(+), 29 deletions(-) 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 dca5447c74ece8..b741110eb920da 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 @@ -3283,8 +3283,8 @@ server cluster MediaInput = 1287 { struct InputInfoStruct { int8u index = 0; InputTypeEnum inputType = 1; - char_string<32> name = 2; - char_string<32> description = 3; + char_string name = 2; + char_string description = 3; } readonly attribute InputInfoStruct inputList[] = 0; diff --git a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter index c1f34dfec009da..c948b0ebad4741 100644 --- a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter +++ b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter @@ -1259,8 +1259,8 @@ server cluster MediaInput = 1287 { struct InputInfoStruct { int8u index = 0; InputTypeEnum inputType = 1; - char_string<32> name = 2; - char_string<32> description = 3; + char_string name = 2; + char_string description = 3; } readonly attribute InputInfoStruct inputList[] = 0; diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index 119e2b6eba63d1..6799ca2bdacf12 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -5666,8 +5666,8 @@ client cluster MediaInput = 1287 { struct InputInfoStruct { int8u index = 0; InputTypeEnum inputType = 1; - char_string<32> name = 2; - char_string<32> description = 3; + char_string name = 2; + char_string description = 3; } readonly attribute InputInfoStruct inputList[] = 0; @@ -5695,7 +5695,7 @@ client cluster MediaInput = 1287 { /** Upon receipt, this SHALL hide the input list from the screen. */ command HideInputStatus(): DefaultSuccess = 2; /** Upon receipt, this SHALL rename the input at a specific index in the Input List. Updates to the input name SHALL appear in the TV settings menus. */ - command RenameInput(RenameInputRequest): DefaultSuccess = 3; + command access(invoke: manage) RenameInput(RenameInputRequest): DefaultSuccess = 3; } /** This cluster provides an interface for controlling the Input Selector on a media device such as a TV. */ @@ -5722,8 +5722,8 @@ server cluster MediaInput = 1287 { struct InputInfoStruct { int8u index = 0; InputTypeEnum inputType = 1; - char_string<32> name = 2; - char_string<32> description = 3; + char_string name = 2; + char_string description = 3; } readonly attribute InputInfoStruct inputList[] = 0; @@ -5747,7 +5747,7 @@ server cluster MediaInput = 1287 { command SelectInput(SelectInputRequest): DefaultSuccess = 0; command ShowInputStatus(): DefaultSuccess = 1; command HideInputStatus(): DefaultSuccess = 2; - command RenameInput(RenameInputRequest): DefaultSuccess = 3; + command access(invoke: manage) RenameInput(RenameInputRequest): DefaultSuccess = 3; } /** This cluster provides an interface for managing low power mode on a device. */ diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index 0fd6a2c6d0c1b2..7b1180739f8e62 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -5625,8 +5625,8 @@ client cluster MediaInput = 1287 { struct InputInfoStruct { int8u index = 0; InputTypeEnum inputType = 1; - char_string<32> name = 2; - char_string<32> description = 3; + char_string name = 2; + char_string description = 3; } readonly attribute InputInfoStruct inputList[] = 0; @@ -5654,7 +5654,7 @@ client cluster MediaInput = 1287 { /** Upon receipt, this SHALL hide the input list from the screen. */ command HideInputStatus(): DefaultSuccess = 2; /** Upon receipt, this SHALL rename the input at a specific index in the Input List. Updates to the input name SHALL appear in the TV settings menus. */ - command RenameInput(RenameInputRequest): DefaultSuccess = 3; + command access(invoke: manage) RenameInput(RenameInputRequest): DefaultSuccess = 3; } /** This cluster provides an interface for controlling the Input Selector on a media device such as a TV. */ @@ -5681,8 +5681,8 @@ server cluster MediaInput = 1287 { struct InputInfoStruct { int8u index = 0; InputTypeEnum inputType = 1; - char_string<32> name = 2; - char_string<32> description = 3; + char_string name = 2; + char_string description = 3; } readonly attribute InputInfoStruct inputList[] = 0; @@ -5706,7 +5706,7 @@ server cluster MediaInput = 1287 { command SelectInput(SelectInputRequest): DefaultSuccess = 0; command ShowInputStatus(): DefaultSuccess = 1; command HideInputStatus(): DefaultSuccess = 2; - command RenameInput(RenameInputRequest): DefaultSuccess = 3; + command access(invoke: manage) RenameInput(RenameInputRequest): DefaultSuccess = 3; } /** This cluster provides an interface for managing low power mode on a device. */ diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter index 3f80e94dd80635..d8031ff7e42f5f 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -2026,8 +2026,8 @@ server cluster MediaInput = 1287 { struct InputInfoStruct { int8u index = 0; InputTypeEnum inputType = 1; - char_string<32> name = 2; - char_string<32> description = 3; + char_string name = 2; + char_string description = 3; } readonly attribute InputInfoStruct inputList[] = 0; @@ -2051,7 +2051,7 @@ server cluster MediaInput = 1287 { command SelectInput(SelectInputRequest): DefaultSuccess = 0; command ShowInputStatus(): DefaultSuccess = 1; command HideInputStatus(): DefaultSuccess = 2; - command RenameInput(RenameInputRequest): DefaultSuccess = 3; + command access(invoke: manage) RenameInput(RenameInputRequest): DefaultSuccess = 3; } /** This cluster provides an interface for managing low power mode on a device. */ 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 02fcda0cfd0cab..c217b7db6236b8 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 @@ -1560,8 +1560,8 @@ client cluster MediaInput = 1287 { struct InputInfoStruct { int8u index = 0; InputTypeEnum inputType = 1; - char_string<32> name = 2; - char_string<32> description = 3; + char_string name = 2; + char_string description = 3; } readonly attribute InputInfoStruct inputList[] = 0; @@ -1589,7 +1589,7 @@ client cluster MediaInput = 1287 { /** Upon receipt, this SHALL hide the input list from the screen. */ command HideInputStatus(): DefaultSuccess = 2; /** Upon receipt, this SHALL rename the input at a specific index in the Input List. Updates to the input name SHALL appear in the TV settings menus. */ - command RenameInput(RenameInputRequest): DefaultSuccess = 3; + command access(invoke: manage) RenameInput(RenameInputRequest): DefaultSuccess = 3; } /** This cluster provides an interface for managing low power mode on a device. */ diff --git a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/access.h b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/access.h index f5a63477523b60..e0369d57a9f387 100644 --- a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/access.h +++ b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/access.h @@ -437,6 +437,7 @@ 0x00000101, /* Cluster: Door Lock, Command: SetCredential, Privilege: administer */ \ 0x00000101, /* Cluster: Door Lock, Command: GetCredentialStatus, Privilege: administer */ \ 0x00000101, /* Cluster: Door Lock, Command: ClearCredential, Privilege: administer */ \ + 0x00000507, /* Cluster: Media Input, Command: RenameInput, Privilege: manage */ \ 0xFFF1FC06, /* Cluster: Fault Injection, Command: FailAtFault, Privilege: manage */ \ 0xFFF1FC06, /* Cluster: Fault Injection, Command: FailRandomlyAtFault, Privilege: manage */ \ } @@ -490,6 +491,7 @@ 0x00000022, /* Cluster: Door Lock, Command: SetCredential, Privilege: administer */ \ 0x00000024, /* Cluster: Door Lock, Command: GetCredentialStatus, Privilege: administer */ \ 0x00000026, /* Cluster: Door Lock, Command: ClearCredential, Privilege: administer */ \ + 0x00000003, /* Cluster: Media Input, Command: RenameInput, Privilege: manage */ \ 0x00000000, /* Cluster: Fault Injection, Command: FailAtFault, Privilege: manage */ \ 0x00000001, /* Cluster: Fault Injection, Command: FailRandomlyAtFault, Privilege: manage */ \ } @@ -543,6 +545,7 @@ kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: SetCredential, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: GetCredentialStatus, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: ClearCredential, Privilege: administer */ \ + kMatterAccessPrivilegeManage, /* Cluster: Media Input, Command: RenameInput, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Fault Injection, Command: FailAtFault, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Fault Injection, Command: FailRandomlyAtFault, Privilege: manage */ \ } diff --git a/src/app/zap-templates/zcl/data-model/chip/media-input-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/media-input-cluster.xml index e2841a1d6fb7d1..495160b10b473c 100644 --- a/src/app/zap-templates/zcl/data-model/chip/media-input-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/media-input-cluster.xml @@ -1,6 +1,6 @@ + This cluster provides an interface for controlling the Input Selector on a media device such as a TV. InputList CurrentInput @@ -43,6 +43,7 @@ limitations under the License. Upon receipt, this SHALL rename the input at a specific index in the Input List. Updates to the input name SHALL appear in the TV settings menus. + @@ -53,8 +54,8 @@ limitations under the License. - - + + diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 38db3098172601..585acb569d2acd 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -6006,8 +6006,8 @@ client cluster MediaInput = 1287 { struct InputInfoStruct { int8u index = 0; InputTypeEnum inputType = 1; - char_string<32> name = 2; - char_string<32> description = 3; + char_string name = 2; + char_string description = 3; } readonly attribute InputInfoStruct inputList[] = 0; @@ -6035,7 +6035,7 @@ client cluster MediaInput = 1287 { /** Upon receipt, this SHALL hide the input list from the screen. */ command HideInputStatus(): DefaultSuccess = 2; /** Upon receipt, this SHALL rename the input at a specific index in the Input List. Updates to the input name SHALL appear in the TV settings menus. */ - command RenameInput(RenameInputRequest): DefaultSuccess = 3; + command access(invoke: manage) RenameInput(RenameInputRequest): DefaultSuccess = 3; } /** This cluster provides an interface for managing low power mode on a device. */ From bd8aa07c79dc515576543e8da553a8420fa69198 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Fri, 27 Oct 2023 18:12:37 -0400 Subject: [PATCH 15/41] Make group cluster match the spec (#30056) * Set the max length of the group name in command arguments * ZAP regen * minor change to kick CI * NOOP change to kick ci --- .../all-clusters-common/all-clusters-app.matter | 6 +++--- .../all-clusters-common/all-clusters-minimal-app.matter | 6 +++--- .../devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter | 6 +++--- ...aturesensor_humiditysensor_thermostat_56de3d5f45.matter | 6 +++--- .../rootnode_colortemperaturelight_hbUnzYVeyn.matter | 6 +++--- .../chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter | 6 +++--- .../chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter | 6 +++--- examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter | 6 +++--- .../devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter | 6 +++--- examples/chef/devices/rootnode_fan_7N2TobIlOX.matter | 6 +++--- .../chef/devices/rootnode_flowsensor_1zVxHedlaV.matter | 6 +++--- .../devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter | 6 +++--- .../chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter | 6 +++--- .../chef/devices/rootnode_lightsensor_lZQycTFcJK.matter | 6 +++--- .../devices/rootnode_occupancysensor_iHyVgifZuo.matter | 6 +++--- .../chef/devices/rootnode_onofflight_bbs1b7IaOV.matter | 6 +++--- examples/chef/devices/rootnode_onofflight_samplemei.matter | 6 +++--- .../devices/rootnode_onofflightswitch_FsPlMr090Q.matter | 6 +++--- .../devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter | 6 +++--- .../chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter | 6 +++--- .../rootnode_roboticvacuumcleaner_1807ff0c49.matter | 6 +++--- .../devices/rootnode_roomairconditioner_9cf3607804.matter | 6 +++--- .../chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter | 6 +++--- .../devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter | 6 +++--- .../chef/devices/rootnode_thermostat_bm3fb8dhYi.matter | 6 +++--- .../chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter | 6 +++--- .../contact-sensor-common/contact-sensor-app.matter | 6 +++--- .../dishwasher-app/dishwasher-common/dishwasher-app.matter | 6 +++--- .../light-switch-common/light-switch-app.matter | 6 +++--- .../bouffalolab/data_model/lighting-app-ethernet.matter | 6 +++--- .../bouffalolab/data_model/lighting-app-thread.matter | 6 +++--- .../bouffalolab/data_model/lighting-app-wifi.matter | 6 +++--- examples/lighting-app/lighting-common/lighting-app.matter | 6 +++--- examples/lighting-app/nxp/zap/lighting-on-off.matter | 6 +++--- examples/lighting-app/qpg/zap/light.matter | 6 +++--- .../silabs/data_model/lighting-thread-app.matter | 6 +++--- .../silabs/data_model/lighting-wifi-app.matter | 6 +++--- examples/lock-app/qpg/zap/lock.matter | 6 +++--- .../ota-requestor-common/ota-requestor-app.matter | 6 +++--- examples/placeholder/linux/apps/app1/config.matter | 6 +++--- examples/placeholder/linux/apps/app2/config.matter | 6 +++--- .../resource-monitoring-app.matter | 6 +++--- .../smoke-co-alarm-common/smoke-co-alarm-app.matter | 6 +++--- .../thermostat/nxp/zap/thermostat_matter_thread.matter | 6 +++--- examples/thermostat/nxp/zap/thermostat_matter_wifi.matter | 6 +++--- examples/thermostat/thermostat-common/thermostat.matter | 6 +++--- .../tv-casting-app/tv-casting-common/tv-casting-app.matter | 6 +++--- .../virtual-device-common/virtual-device-app.matter | 6 +++--- examples/window-app/common/window-app.matter | 6 +++--- .../zap-templates/zcl/data-model/chip/groups-cluster.xml | 7 +++---- src/controller/data_model/controller-clusters.matter | 6 +++--- 51 files changed, 153 insertions(+), 154 deletions(-) diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter index 0e5e992f2a80d8..bd7df6702e4446 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 @@ -67,7 +67,7 @@ server cluster Groups = 4 { request struct AddGroupRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } request struct ViewGroupRequest { @@ -84,7 +84,7 @@ server cluster Groups = 4 { request struct AddGroupIfIdentifyingRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } response struct AddGroupResponse = 0 { @@ -95,7 +95,7 @@ server cluster Groups = 4 { response struct ViewGroupResponse = 1 { enum8 status = 0; group_id groupID = 1; - char_string groupName = 2; + char_string<16> groupName = 2; } response struct GetGroupMembershipResponse = 2 { 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 b741110eb920da..29030db6eee1e0 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 @@ -67,7 +67,7 @@ server cluster Groups = 4 { request struct AddGroupRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } request struct ViewGroupRequest { @@ -84,7 +84,7 @@ server cluster Groups = 4 { request struct AddGroupIfIdentifyingRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } response struct AddGroupResponse = 0 { @@ -95,7 +95,7 @@ server cluster Groups = 4 { response struct ViewGroupResponse = 1 { enum8 status = 0; group_id groupID = 1; - char_string groupName = 2; + char_string<16> groupName = 2; } response struct GetGroupMembershipResponse = 2 { diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter index 9122d0776bde85..08cf480a0dc8a8 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter @@ -61,7 +61,7 @@ server cluster Groups = 4 { request struct AddGroupRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } request struct ViewGroupRequest { @@ -78,7 +78,7 @@ server cluster Groups = 4 { request struct AddGroupIfIdentifyingRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } response struct AddGroupResponse = 0 { @@ -89,7 +89,7 @@ server cluster Groups = 4 { response struct ViewGroupResponse = 1 { enum8 status = 0; group_id groupID = 1; - char_string groupName = 2; + char_string<16> groupName = 2; } response struct GetGroupMembershipResponse = 2 { diff --git a/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter b/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter index fc5295bf533e44..309178d53e154c 100644 --- a/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter +++ b/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter @@ -67,7 +67,7 @@ server cluster Groups = 4 { request struct AddGroupRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } request struct ViewGroupRequest { @@ -84,7 +84,7 @@ server cluster Groups = 4 { request struct AddGroupIfIdentifyingRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } response struct AddGroupResponse = 0 { @@ -95,7 +95,7 @@ server cluster Groups = 4 { response struct ViewGroupResponse = 1 { enum8 status = 0; group_id groupID = 1; - char_string groupName = 2; + char_string<16> groupName = 2; } response struct GetGroupMembershipResponse = 2 { diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter index c94c88d292bb1b..201d637db8d550 100644 --- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter +++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter @@ -67,7 +67,7 @@ server cluster Groups = 4 { request struct AddGroupRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } request struct ViewGroupRequest { @@ -84,7 +84,7 @@ server cluster Groups = 4 { request struct AddGroupIfIdentifyingRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } response struct AddGroupResponse = 0 { @@ -95,7 +95,7 @@ server cluster Groups = 4 { response struct ViewGroupResponse = 1 { enum8 status = 0; group_id groupID = 1; - char_string groupName = 2; + char_string<16> groupName = 2; } response struct GetGroupMembershipResponse = 2 { diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter index a5e95aa3724459..1294ec299c7bef 100644 --- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter +++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter @@ -61,7 +61,7 @@ server cluster Groups = 4 { request struct AddGroupRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } request struct ViewGroupRequest { @@ -78,7 +78,7 @@ server cluster Groups = 4 { request struct AddGroupIfIdentifyingRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } response struct AddGroupResponse = 0 { @@ -89,7 +89,7 @@ server cluster Groups = 4 { response struct ViewGroupResponse = 1 { enum8 status = 0; group_id groupID = 1; - char_string groupName = 2; + char_string<16> groupName = 2; } response struct GetGroupMembershipResponse = 2 { diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter index a3b3a03ff7d084..89b71e5d0e3dc9 100644 --- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter @@ -61,7 +61,7 @@ server cluster Groups = 4 { request struct AddGroupRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } request struct ViewGroupRequest { @@ -78,7 +78,7 @@ server cluster Groups = 4 { request struct AddGroupIfIdentifyingRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } response struct AddGroupResponse = 0 { @@ -89,7 +89,7 @@ server cluster Groups = 4 { response struct ViewGroupResponse = 1 { enum8 status = 0; group_id groupID = 1; - char_string groupName = 2; + char_string<16> groupName = 2; } response struct GetGroupMembershipResponse = 2 { diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter index c47f66f299dd04..8fb1a6298bfeb9 100644 --- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter +++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter @@ -61,7 +61,7 @@ server cluster Groups = 4 { request struct AddGroupRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } request struct ViewGroupRequest { @@ -78,7 +78,7 @@ server cluster Groups = 4 { request struct AddGroupIfIdentifyingRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } response struct AddGroupResponse = 0 { @@ -89,7 +89,7 @@ server cluster Groups = 4 { response struct ViewGroupResponse = 1 { enum8 status = 0; group_id groupID = 1; - char_string groupName = 2; + char_string<16> groupName = 2; } response struct GetGroupMembershipResponse = 2 { diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter index c633c224718dd7..632c70a5f1bf48 100644 --- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter +++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter @@ -61,7 +61,7 @@ server cluster Groups = 4 { request struct AddGroupRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } request struct ViewGroupRequest { @@ -78,7 +78,7 @@ server cluster Groups = 4 { request struct AddGroupIfIdentifyingRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } response struct AddGroupResponse = 0 { @@ -89,7 +89,7 @@ server cluster Groups = 4 { response struct ViewGroupResponse = 1 { enum8 status = 0; group_id groupID = 1; - char_string groupName = 2; + char_string<16> groupName = 2; } response struct GetGroupMembershipResponse = 2 { diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter index bdaa7cf53f05f1..4555a630035672 100644 --- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter +++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter @@ -67,7 +67,7 @@ server cluster Groups = 4 { request struct AddGroupRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } request struct ViewGroupRequest { @@ -84,7 +84,7 @@ server cluster Groups = 4 { request struct AddGroupIfIdentifyingRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } response struct AddGroupResponse = 0 { @@ -95,7 +95,7 @@ server cluster Groups = 4 { response struct ViewGroupResponse = 1 { enum8 status = 0; group_id groupID = 1; - char_string groupName = 2; + char_string<16> groupName = 2; } response struct GetGroupMembershipResponse = 2 { diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter index 5fe7d7dd1b78d4..db39ae1ec96e05 100644 --- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter +++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter @@ -61,7 +61,7 @@ client cluster Groups = 4 { request struct AddGroupRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } response struct AddGroupResponse = 0 { @@ -76,7 +76,7 @@ client cluster Groups = 4 { response struct ViewGroupResponse = 1 { enum8 status = 0; group_id groupID = 1; - char_string groupName = 2; + char_string<16> groupName = 2; } request struct GetGroupMembershipRequest { @@ -99,7 +99,7 @@ client cluster Groups = 4 { request struct AddGroupIfIdentifyingRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } /** Command description for AddGroup */ diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter index 2d71bc7ead0b2e..03646575903076 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter @@ -61,7 +61,7 @@ server cluster Groups = 4 { request struct AddGroupRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } request struct ViewGroupRequest { @@ -78,7 +78,7 @@ server cluster Groups = 4 { request struct AddGroupIfIdentifyingRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } response struct AddGroupResponse = 0 { @@ -89,7 +89,7 @@ server cluster Groups = 4 { response struct ViewGroupResponse = 1 { enum8 status = 0; group_id groupID = 1; - char_string groupName = 2; + char_string<16> groupName = 2; } response struct GetGroupMembershipResponse = 2 { diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter index aa56178ebd3882..b010a3597bb3df 100644 --- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter +++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter @@ -61,7 +61,7 @@ client cluster Groups = 4 { request struct AddGroupRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } response struct AddGroupResponse = 0 { @@ -76,7 +76,7 @@ client cluster Groups = 4 { response struct ViewGroupResponse = 1 { enum8 status = 0; group_id groupID = 1; - char_string groupName = 2; + char_string<16> groupName = 2; } request struct GetGroupMembershipRequest { @@ -99,7 +99,7 @@ client cluster Groups = 4 { request struct AddGroupIfIdentifyingRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } /** Command description for AddGroup */ diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter index 2616596fe6e398..e59638afec116e 100644 --- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter +++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter @@ -61,7 +61,7 @@ client cluster Groups = 4 { request struct AddGroupRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } response struct AddGroupResponse = 0 { @@ -76,7 +76,7 @@ client cluster Groups = 4 { response struct ViewGroupResponse = 1 { enum8 status = 0; group_id groupID = 1; - char_string groupName = 2; + char_string<16> groupName = 2; } request struct GetGroupMembershipRequest { @@ -99,7 +99,7 @@ client cluster Groups = 4 { request struct AddGroupIfIdentifyingRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } /** Command description for AddGroup */ diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter index b8e8679827989d..77f148218ccb0b 100644 --- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter +++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter @@ -61,7 +61,7 @@ client cluster Groups = 4 { request struct AddGroupRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } response struct AddGroupResponse = 0 { @@ -76,7 +76,7 @@ client cluster Groups = 4 { response struct ViewGroupResponse = 1 { enum8 status = 0; group_id groupID = 1; - char_string groupName = 2; + char_string<16> groupName = 2; } request struct GetGroupMembershipRequest { @@ -99,7 +99,7 @@ client cluster Groups = 4 { request struct AddGroupIfIdentifyingRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } /** Command description for AddGroup */ diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter index 43832bbd05b10a..ce4f41eb65ef0a 100644 --- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter +++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter @@ -61,7 +61,7 @@ server cluster Groups = 4 { request struct AddGroupRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } request struct ViewGroupRequest { @@ -78,7 +78,7 @@ server cluster Groups = 4 { request struct AddGroupIfIdentifyingRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } response struct AddGroupResponse = 0 { @@ -89,7 +89,7 @@ server cluster Groups = 4 { response struct ViewGroupResponse = 1 { enum8 status = 0; group_id groupID = 1; - char_string groupName = 2; + char_string<16> groupName = 2; } response struct GetGroupMembershipResponse = 2 { diff --git a/examples/chef/devices/rootnode_onofflight_samplemei.matter b/examples/chef/devices/rootnode_onofflight_samplemei.matter index c8e86599111235..a851b44be091c2 100644 --- a/examples/chef/devices/rootnode_onofflight_samplemei.matter +++ b/examples/chef/devices/rootnode_onofflight_samplemei.matter @@ -61,7 +61,7 @@ server cluster Groups = 4 { request struct AddGroupRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } request struct ViewGroupRequest { @@ -78,7 +78,7 @@ server cluster Groups = 4 { request struct AddGroupIfIdentifyingRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } response struct AddGroupResponse = 0 { @@ -89,7 +89,7 @@ server cluster Groups = 4 { response struct ViewGroupResponse = 1 { enum8 status = 0; group_id groupID = 1; - char_string groupName = 2; + char_string<16> groupName = 2; } response struct GetGroupMembershipResponse = 2 { diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter index 6715aca6c31645..f87b8039cdff89 100644 --- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter +++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter @@ -61,7 +61,7 @@ server cluster Groups = 4 { request struct AddGroupRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } request struct ViewGroupRequest { @@ -78,7 +78,7 @@ server cluster Groups = 4 { request struct AddGroupIfIdentifyingRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } response struct AddGroupResponse = 0 { @@ -89,7 +89,7 @@ server cluster Groups = 4 { response struct ViewGroupResponse = 1 { enum8 status = 0; group_id groupID = 1; - char_string groupName = 2; + char_string<16> groupName = 2; } response struct GetGroupMembershipResponse = 2 { diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter index 154c09b088284e..13a79bc0cee434 100644 --- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter +++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter @@ -61,7 +61,7 @@ server cluster Groups = 4 { request struct AddGroupRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } request struct ViewGroupRequest { @@ -78,7 +78,7 @@ server cluster Groups = 4 { request struct AddGroupIfIdentifyingRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } response struct AddGroupResponse = 0 { @@ -89,7 +89,7 @@ server cluster Groups = 4 { response struct ViewGroupResponse = 1 { enum8 status = 0; group_id groupID = 1; - char_string groupName = 2; + char_string<16> groupName = 2; } response struct GetGroupMembershipResponse = 2 { diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter index cb5100556ae8ea..fafd5a73ac5880 100644 --- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter +++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter @@ -61,7 +61,7 @@ client cluster Groups = 4 { request struct AddGroupRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } response struct AddGroupResponse = 0 { @@ -76,7 +76,7 @@ client cluster Groups = 4 { response struct ViewGroupResponse = 1 { enum8 status = 0; group_id groupID = 1; - char_string groupName = 2; + char_string<16> groupName = 2; } request struct GetGroupMembershipRequest { @@ -99,7 +99,7 @@ client cluster Groups = 4 { request struct AddGroupIfIdentifyingRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } /** Command description for AddGroup */ diff --git a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter index ab6ae185cb21dc..a5a8b6afc1c7a0 100644 --- a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter +++ b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter @@ -67,7 +67,7 @@ server cluster Groups = 4 { request struct AddGroupRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } request struct ViewGroupRequest { @@ -84,7 +84,7 @@ server cluster Groups = 4 { request struct AddGroupIfIdentifyingRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } response struct AddGroupResponse = 0 { @@ -95,7 +95,7 @@ server cluster Groups = 4 { response struct ViewGroupResponse = 1 { enum8 status = 0; group_id groupID = 1; - char_string groupName = 2; + char_string<16> groupName = 2; } response struct GetGroupMembershipResponse = 2 { diff --git a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter index cb0b194a489307..3f2fb5857276cc 100644 --- a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter +++ b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter @@ -67,7 +67,7 @@ server cluster Groups = 4 { request struct AddGroupRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } request struct ViewGroupRequest { @@ -84,7 +84,7 @@ server cluster Groups = 4 { request struct AddGroupIfIdentifyingRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } response struct AddGroupResponse = 0 { @@ -95,7 +95,7 @@ server cluster Groups = 4 { response struct ViewGroupResponse = 1 { enum8 status = 0; group_id groupID = 1; - char_string groupName = 2; + char_string<16> groupName = 2; } response struct GetGroupMembershipResponse = 2 { diff --git a/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter b/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter index 1ff0419a1af95d..e27712afd4ce61 100644 --- a/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter +++ b/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter @@ -67,7 +67,7 @@ server cluster Groups = 4 { request struct AddGroupRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } request struct ViewGroupRequest { @@ -84,7 +84,7 @@ server cluster Groups = 4 { request struct AddGroupIfIdentifyingRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } response struct AddGroupResponse = 0 { @@ -95,7 +95,7 @@ server cluster Groups = 4 { response struct ViewGroupResponse = 1 { enum8 status = 0; group_id groupID = 1; - char_string groupName = 2; + char_string<16> groupName = 2; } response struct GetGroupMembershipResponse = 2 { diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter index 82b38670997e4f..5ccbaacefebb96 100644 --- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter +++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter @@ -61,7 +61,7 @@ client cluster Groups = 4 { request struct AddGroupRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } response struct AddGroupResponse = 0 { @@ -76,7 +76,7 @@ client cluster Groups = 4 { response struct ViewGroupResponse = 1 { enum8 status = 0; group_id groupID = 1; - char_string groupName = 2; + char_string<16> groupName = 2; } request struct GetGroupMembershipRequest { @@ -99,7 +99,7 @@ client cluster Groups = 4 { request struct AddGroupIfIdentifyingRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } /** Command description for AddGroup */ diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter index a6c5f4c54d06bc..9df995db024cb4 100644 --- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter +++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter @@ -61,7 +61,7 @@ server cluster Groups = 4 { request struct AddGroupRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } request struct ViewGroupRequest { @@ -78,7 +78,7 @@ server cluster Groups = 4 { request struct AddGroupIfIdentifyingRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } response struct AddGroupResponse = 0 { @@ -89,7 +89,7 @@ server cluster Groups = 4 { response struct ViewGroupResponse = 1 { enum8 status = 0; group_id groupID = 1; - char_string groupName = 2; + char_string<16> groupName = 2; } response struct GetGroupMembershipResponse = 2 { diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter index 3047f73f5a54bb..f2d39b10b0a3ef 100644 --- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter +++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter @@ -61,7 +61,7 @@ server cluster Groups = 4 { request struct AddGroupRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } request struct ViewGroupRequest { @@ -78,7 +78,7 @@ server cluster Groups = 4 { request struct AddGroupIfIdentifyingRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } response struct AddGroupResponse = 0 { @@ -89,7 +89,7 @@ server cluster Groups = 4 { response struct ViewGroupResponse = 1 { enum8 status = 0; group_id groupID = 1; - char_string groupName = 2; + char_string<16> groupName = 2; } response struct GetGroupMembershipResponse = 2 { 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 190d78c9c05892..87f2caaf581a7f 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 @@ -67,7 +67,7 @@ server cluster Groups = 4 { request struct AddGroupRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } request struct ViewGroupRequest { @@ -84,7 +84,7 @@ server cluster Groups = 4 { request struct AddGroupIfIdentifyingRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } response struct AddGroupResponse = 0 { @@ -95,7 +95,7 @@ server cluster Groups = 4 { response struct ViewGroupResponse = 1 { enum8 status = 0; group_id groupID = 1; - char_string groupName = 2; + char_string<16> groupName = 2; } response struct GetGroupMembershipResponse = 2 { diff --git a/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter b/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter index 3ed55a9ed4b283..dc13534a56fe46 100644 --- a/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter +++ b/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter @@ -67,7 +67,7 @@ server cluster Groups = 4 { request struct AddGroupRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } request struct ViewGroupRequest { @@ -84,7 +84,7 @@ server cluster Groups = 4 { request struct AddGroupIfIdentifyingRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } response struct AddGroupResponse = 0 { @@ -95,7 +95,7 @@ server cluster Groups = 4 { response struct ViewGroupResponse = 1 { enum8 status = 0; group_id groupID = 1; - char_string groupName = 2; + char_string<16> groupName = 2; } response struct GetGroupMembershipResponse = 2 { 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 8a7c646fdf7dad..3801affe7746a8 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 @@ -115,7 +115,7 @@ server cluster Groups = 4 { request struct AddGroupRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } request struct ViewGroupRequest { @@ -132,7 +132,7 @@ server cluster Groups = 4 { request struct AddGroupIfIdentifyingRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } response struct AddGroupResponse = 0 { @@ -143,7 +143,7 @@ server cluster Groups = 4 { response struct ViewGroupResponse = 1 { enum8 status = 0; group_id groupID = 1; - char_string groupName = 2; + char_string<16> groupName = 2; } response struct GetGroupMembershipResponse = 2 { diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter index 320d90679f6c9b..f3cb09f9a32294 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter @@ -67,7 +67,7 @@ server cluster Groups = 4 { request struct AddGroupRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } request struct ViewGroupRequest { @@ -84,7 +84,7 @@ server cluster Groups = 4 { request struct AddGroupIfIdentifyingRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } response struct AddGroupResponse = 0 { @@ -95,7 +95,7 @@ server cluster Groups = 4 { response struct ViewGroupResponse = 1 { enum8 status = 0; group_id groupID = 1; - char_string groupName = 2; + char_string<16> groupName = 2; } response struct GetGroupMembershipResponse = 2 { 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 14275388158fb2..cfc4f6f0a2b746 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter @@ -67,7 +67,7 @@ server cluster Groups = 4 { request struct AddGroupRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } request struct ViewGroupRequest { @@ -84,7 +84,7 @@ server cluster Groups = 4 { request struct AddGroupIfIdentifyingRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } response struct AddGroupResponse = 0 { @@ -95,7 +95,7 @@ server cluster Groups = 4 { response struct ViewGroupResponse = 1 { enum8 status = 0; group_id groupID = 1; - char_string groupName = 2; + char_string<16> groupName = 2; } response struct GetGroupMembershipResponse = 2 { 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 532d346f6fc1fc..e97a7212137016 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter @@ -67,7 +67,7 @@ server cluster Groups = 4 { request struct AddGroupRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } request struct ViewGroupRequest { @@ -84,7 +84,7 @@ server cluster Groups = 4 { request struct AddGroupIfIdentifyingRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } response struct AddGroupResponse = 0 { @@ -95,7 +95,7 @@ server cluster Groups = 4 { response struct ViewGroupResponse = 1 { enum8 status = 0; group_id groupID = 1; - char_string groupName = 2; + char_string<16> groupName = 2; } response struct GetGroupMembershipResponse = 2 { diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter index e69c91577158ca..ff3515b837ec5e 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -67,7 +67,7 @@ server cluster Groups = 4 { request struct AddGroupRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } request struct ViewGroupRequest { @@ -84,7 +84,7 @@ server cluster Groups = 4 { request struct AddGroupIfIdentifyingRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } response struct AddGroupResponse = 0 { @@ -95,7 +95,7 @@ server cluster Groups = 4 { response struct ViewGroupResponse = 1 { enum8 status = 0; group_id groupID = 1; - char_string groupName = 2; + char_string<16> groupName = 2; } response struct GetGroupMembershipResponse = 2 { diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.matter b/examples/lighting-app/nxp/zap/lighting-on-off.matter index 8cf9aaefc7f49c..6bb1dc6d34a566 100644 --- a/examples/lighting-app/nxp/zap/lighting-on-off.matter +++ b/examples/lighting-app/nxp/zap/lighting-on-off.matter @@ -67,7 +67,7 @@ server cluster Groups = 4 { request struct AddGroupRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } request struct ViewGroupRequest { @@ -84,7 +84,7 @@ server cluster Groups = 4 { request struct AddGroupIfIdentifyingRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } response struct AddGroupResponse = 0 { @@ -95,7 +95,7 @@ server cluster Groups = 4 { response struct ViewGroupResponse = 1 { enum8 status = 0; group_id groupID = 1; - char_string groupName = 2; + char_string<16> groupName = 2; } response struct GetGroupMembershipResponse = 2 { diff --git a/examples/lighting-app/qpg/zap/light.matter b/examples/lighting-app/qpg/zap/light.matter index 0f1c6d97ce4561..71e691b790375a 100644 --- a/examples/lighting-app/qpg/zap/light.matter +++ b/examples/lighting-app/qpg/zap/light.matter @@ -67,7 +67,7 @@ server cluster Groups = 4 { request struct AddGroupRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } request struct ViewGroupRequest { @@ -84,7 +84,7 @@ server cluster Groups = 4 { request struct AddGroupIfIdentifyingRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } response struct AddGroupResponse = 0 { @@ -95,7 +95,7 @@ server cluster Groups = 4 { response struct ViewGroupResponse = 1 { enum8 status = 0; group_id groupID = 1; - char_string groupName = 2; + char_string<16> groupName = 2; } response struct GetGroupMembershipResponse = 2 { 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 7c500008381e80..25bb26b198d126 100644 --- a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter +++ b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter @@ -67,7 +67,7 @@ server cluster Groups = 4 { request struct AddGroupRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } request struct ViewGroupRequest { @@ -84,7 +84,7 @@ server cluster Groups = 4 { request struct AddGroupIfIdentifyingRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } response struct AddGroupResponse = 0 { @@ -95,7 +95,7 @@ server cluster Groups = 4 { response struct ViewGroupResponse = 1 { enum8 status = 0; group_id groupID = 1; - char_string groupName = 2; + char_string<16> groupName = 2; } response struct GetGroupMembershipResponse = 2 { 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 96787523fa0d33..2982df009b22b7 100644 --- a/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter +++ b/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter @@ -67,7 +67,7 @@ server cluster Groups = 4 { request struct AddGroupRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } request struct ViewGroupRequest { @@ -84,7 +84,7 @@ server cluster Groups = 4 { request struct AddGroupIfIdentifyingRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } response struct AddGroupResponse = 0 { @@ -95,7 +95,7 @@ server cluster Groups = 4 { response struct ViewGroupResponse = 1 { enum8 status = 0; group_id groupID = 1; - char_string groupName = 2; + char_string<16> groupName = 2; } response struct GetGroupMembershipResponse = 2 { diff --git a/examples/lock-app/qpg/zap/lock.matter b/examples/lock-app/qpg/zap/lock.matter index 3e953684c4ca5f..9c78fb9fbbe866 100644 --- a/examples/lock-app/qpg/zap/lock.matter +++ b/examples/lock-app/qpg/zap/lock.matter @@ -67,7 +67,7 @@ server cluster Groups = 4 { request struct AddGroupRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } request struct ViewGroupRequest { @@ -84,7 +84,7 @@ server cluster Groups = 4 { request struct AddGroupIfIdentifyingRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } response struct AddGroupResponse = 0 { @@ -95,7 +95,7 @@ server cluster Groups = 4 { response struct ViewGroupResponse = 1 { enum8 status = 0; group_id groupID = 1; - char_string groupName = 2; + char_string<16> groupName = 2; } response struct GetGroupMembershipResponse = 2 { 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 cadac4c45ea769..ca6913b32da943 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 @@ -67,7 +67,7 @@ server cluster Groups = 4 { request struct AddGroupRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } request struct ViewGroupRequest { @@ -84,7 +84,7 @@ server cluster Groups = 4 { request struct AddGroupIfIdentifyingRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } response struct AddGroupResponse = 0 { @@ -95,7 +95,7 @@ server cluster Groups = 4 { response struct ViewGroupResponse = 1 { enum8 status = 0; group_id groupID = 1; - char_string groupName = 2; + char_string<16> groupName = 2; } response struct GetGroupMembershipResponse = 2 { diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index 6799ca2bdacf12..5d43a5053cabe9 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -115,7 +115,7 @@ server cluster Groups = 4 { request struct AddGroupRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } request struct ViewGroupRequest { @@ -132,7 +132,7 @@ server cluster Groups = 4 { request struct AddGroupIfIdentifyingRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } response struct AddGroupResponse = 0 { @@ -143,7 +143,7 @@ server cluster Groups = 4 { response struct ViewGroupResponse = 1 { enum8 status = 0; group_id groupID = 1; - char_string groupName = 2; + char_string<16> groupName = 2; } response struct GetGroupMembershipResponse = 2 { diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index 7b1180739f8e62..2697eb2132d6db 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -115,7 +115,7 @@ server cluster Groups = 4 { request struct AddGroupRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } request struct ViewGroupRequest { @@ -132,7 +132,7 @@ server cluster Groups = 4 { request struct AddGroupIfIdentifyingRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } response struct AddGroupResponse = 0 { @@ -143,7 +143,7 @@ server cluster Groups = 4 { response struct ViewGroupResponse = 1 { enum8 status = 0; group_id groupID = 1; - char_string groupName = 2; + char_string<16> groupName = 2; } response struct GetGroupMembershipResponse = 2 { diff --git a/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter b/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter index 10a315c77baa95..6b1bb2d7ef9040 100644 --- a/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter +++ b/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter @@ -67,7 +67,7 @@ server cluster Groups = 4 { request struct AddGroupRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } request struct ViewGroupRequest { @@ -84,7 +84,7 @@ server cluster Groups = 4 { request struct AddGroupIfIdentifyingRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } response struct AddGroupResponse = 0 { @@ -95,7 +95,7 @@ server cluster Groups = 4 { response struct ViewGroupResponse = 1 { enum8 status = 0; group_id groupID = 1; - char_string groupName = 2; + char_string<16> groupName = 2; } response struct GetGroupMembershipResponse = 2 { 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 d6d288d445433c..85e5ad6bba4e98 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 @@ -67,7 +67,7 @@ server cluster Groups = 4 { request struct AddGroupRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } request struct ViewGroupRequest { @@ -84,7 +84,7 @@ server cluster Groups = 4 { request struct AddGroupIfIdentifyingRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } response struct AddGroupResponse = 0 { @@ -95,7 +95,7 @@ server cluster Groups = 4 { response struct ViewGroupResponse = 1 { enum8 status = 0; group_id groupID = 1; - char_string groupName = 2; + char_string<16> groupName = 2; } response struct GetGroupMembershipResponse = 2 { diff --git a/examples/thermostat/nxp/zap/thermostat_matter_thread.matter b/examples/thermostat/nxp/zap/thermostat_matter_thread.matter index 88b3c1b390f486..2a03d768498c38 100644 --- a/examples/thermostat/nxp/zap/thermostat_matter_thread.matter +++ b/examples/thermostat/nxp/zap/thermostat_matter_thread.matter @@ -109,7 +109,7 @@ server cluster Groups = 4 { request struct AddGroupRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } request struct ViewGroupRequest { @@ -126,7 +126,7 @@ server cluster Groups = 4 { request struct AddGroupIfIdentifyingRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } response struct AddGroupResponse = 0 { @@ -137,7 +137,7 @@ server cluster Groups = 4 { response struct ViewGroupResponse = 1 { enum8 status = 0; group_id groupID = 1; - char_string groupName = 2; + char_string<16> groupName = 2; } response struct GetGroupMembershipResponse = 2 { diff --git a/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter b/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter index 5b9518590b59c4..2e9f1fd042d551 100644 --- a/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter +++ b/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter @@ -109,7 +109,7 @@ server cluster Groups = 4 { request struct AddGroupRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } request struct ViewGroupRequest { @@ -126,7 +126,7 @@ server cluster Groups = 4 { request struct AddGroupIfIdentifyingRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } response struct AddGroupResponse = 0 { @@ -137,7 +137,7 @@ server cluster Groups = 4 { response struct ViewGroupResponse = 1 { enum8 status = 0; group_id groupID = 1; - char_string groupName = 2; + char_string<16> groupName = 2; } response struct GetGroupMembershipResponse = 2 { diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter index 1c8eb24f2e4dfe..511f0a9dee24f4 100644 --- a/examples/thermostat/thermostat-common/thermostat.matter +++ b/examples/thermostat/thermostat-common/thermostat.matter @@ -115,7 +115,7 @@ server cluster Groups = 4 { request struct AddGroupRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } request struct ViewGroupRequest { @@ -132,7 +132,7 @@ server cluster Groups = 4 { request struct AddGroupIfIdentifyingRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } response struct AddGroupResponse = 0 { @@ -143,7 +143,7 @@ server cluster Groups = 4 { response struct ViewGroupResponse = 1 { enum8 status = 0; group_id groupID = 1; - char_string groupName = 2; + char_string<16> groupName = 2; } response struct GetGroupMembershipResponse = 2 { 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 c217b7db6236b8..b7d954aefabd61 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 @@ -61,7 +61,7 @@ server cluster Groups = 4 { request struct AddGroupRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } request struct ViewGroupRequest { @@ -78,7 +78,7 @@ server cluster Groups = 4 { request struct AddGroupIfIdentifyingRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } response struct AddGroupResponse = 0 { @@ -89,7 +89,7 @@ server cluster Groups = 4 { response struct ViewGroupResponse = 1 { enum8 status = 0; group_id groupID = 1; - char_string groupName = 2; + char_string<16> groupName = 2; } response struct GetGroupMembershipResponse = 2 { diff --git a/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter b/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter index 4f934ebe6de8c8..fab44c95b63e8a 100644 --- a/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter +++ b/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter @@ -67,7 +67,7 @@ server cluster Groups = 4 { request struct AddGroupRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } request struct ViewGroupRequest { @@ -84,7 +84,7 @@ server cluster Groups = 4 { request struct AddGroupIfIdentifyingRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } response struct AddGroupResponse = 0 { @@ -95,7 +95,7 @@ server cluster Groups = 4 { response struct ViewGroupResponse = 1 { enum8 status = 0; group_id groupID = 1; - char_string groupName = 2; + char_string<16> groupName = 2; } response struct GetGroupMembershipResponse = 2 { diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter index 7108c8045a2cc2..e90f4148b363b5 100644 --- a/examples/window-app/common/window-app.matter +++ b/examples/window-app/common/window-app.matter @@ -67,7 +67,7 @@ server cluster Groups = 4 { request struct AddGroupRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } request struct ViewGroupRequest { @@ -84,7 +84,7 @@ server cluster Groups = 4 { request struct AddGroupIfIdentifyingRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } response struct AddGroupResponse = 0 { @@ -95,7 +95,7 @@ server cluster Groups = 4 { response struct ViewGroupResponse = 1 { enum8 status = 0; group_id groupID = 1; - char_string groupName = 2; + char_string<16> groupName = 2; } response struct GetGroupMembershipResponse = 2 { diff --git a/src/app/zap-templates/zcl/data-model/chip/groups-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/groups-cluster.xml index 454c6a8032897c..ce1289e71e529e 100644 --- a/src/app/zap-templates/zcl/data-model/chip/groups-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/groups-cluster.xml @@ -41,14 +41,13 @@ limitations under the License. NameSupport - Command description for AddGroup - + @@ -86,7 +85,7 @@ limitations under the License. - + @@ -103,7 +102,7 @@ limitations under the License. - + diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 585acb569d2acd..cf35cebdfcf50b 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -69,7 +69,7 @@ client cluster Groups = 4 { request struct AddGroupRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } response struct AddGroupResponse = 0 { @@ -84,7 +84,7 @@ client cluster Groups = 4 { response struct ViewGroupResponse = 1 { enum8 status = 0; group_id groupID = 1; - char_string groupName = 2; + char_string<16> groupName = 2; } request struct GetGroupMembershipRequest { @@ -107,7 +107,7 @@ client cluster Groups = 4 { request struct AddGroupIfIdentifyingRequest { group_id groupID = 0; - char_string groupName = 1; + char_string<16> groupName = 1; } /** Command description for AddGroup */ From 04f55e51c09862d0a778bfe8df728861d6cc4b54 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Fri, 27 Oct 2023 18:35:17 -0400 Subject: [PATCH 16/41] Add more lenient parsing (DM XML scraper workarounds) (#30065) * More lenient parsing: naming and types * Even better logic * Lenient parsing updates for more type logic * Another constant * Update the test * Restyle * Merge with master with better diffing --- .../data_model_xml/handlers/parsing.py | 31 ++++++++- .../matter_idl/test_data_model_xml.py | 64 +++++++++++++++++++ 2 files changed, 93 insertions(+), 2 deletions(-) diff --git a/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/parsing.py b/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/parsing.py index 948d698a5d4a6e..3adb852b846334 100644 --- a/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/parsing.py +++ b/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/parsing.py @@ -90,20 +90,36 @@ def NormalizeDataType(t: str) -> str: return _TYPE_REMAP.get(t.lower(), t.replace("-", "_")) +# Handle oddities in current data model XML schema for nicer diffs +_REF_NAME_MAPPING = { + "<>": "char_string", + "<>": "octet_string", + "<>": "vendor_id", + "<>": "endpoint_no", +} + + def ParseType(t: str) -> ParsedType: """Parse a data type entry. Specifically parses a name like "list[Foo Type]". """ + # very rough matcher ... is_list = False if t.startswith("list[") and t.endswith("]"): is_list = True t = t[5:-1] + elif t.startswith("<>[") and t.endswith("]"): + is_list = True + t = t[21:-1] if t.endswith(" Type"): t = t[:-5] + if t in _REF_NAME_MAPPING: + t = _REF_NAME_MAPPING[t] + return ParsedType(name=NormalizeDataType(t), is_list=is_list) @@ -140,9 +156,20 @@ def NormalizeName(name: str) -> str: return name -def FieldName(name: str) -> str: +def FieldName(input_name: str) -> str: """Normalized name with the first letter lowercase. """ - name = NormalizeName(name) + name = NormalizeName(input_name) + + # Some exception handling for nicer diffs + if name == "ID": + return "id" + + # If the name starts with a all-uppercase thing, keep it that + # way. This is typical for "NOC", "IPK", "CSR" and such + if len(input_name) > 1: + if input_name[0].isupper() and input_name[1].isupper(): + return name + return name[0].lower() + name[1:] diff --git a/scripts/py_matter_idl/matter_idl/test_data_model_xml.py b/scripts/py_matter_idl/matter_idl/test_data_model_xml.py index eea2308323abec..6117f35e9f1ad2 100755 --- a/scripts/py_matter_idl/matter_idl/test_data_model_xml.py +++ b/scripts/py_matter_idl/matter_idl/test_data_model_xml.py @@ -395,6 +395,70 @@ def testAttributes(self): self.assertIdlEqual(xml_idl, expected_idl) + def testXmlNameWorkarounds(self): + # Validate an attribute with a type list + # This is a manually-edited copy of an attribute test (not real data) + + xml_idl = XmlToIdl(''' + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ''') + + expected_idl = IdlTextToIdl(''' + client cluster Test = 123 { + struct OutputInfoStruct { + char_string id = 0; + int8u items[] = 1; + endpoint_no endpoints[] = 2; + } + + readonly attribute OutputInfoStruct outputList[] = 0; + readonly attribute optional enum8 testConform = 1; + + readonly attribute attrib_id attributeList[] = 65531; + readonly attribute event_id eventList[] = 65530; + readonly attribute command_id acceptedCommandList[] = 65529; + readonly attribute command_id generatedCommandList[] = 65528; + readonly attribute bitmap32 featureMap = 65532; + readonly attribute int16u clusterRevision = 65533; + } + ''') + + self.assertIdlEqual(xml_idl, expected_idl) + def testComplexInput(self): # This parses a known copy of Switch.xml which happens to be fully # spec-conformant (so assuming it as a good input) From f53f4eb709bd07c525a37469e5a731d31d0150e6 Mon Sep 17 00:00:00 2001 From: yunhanw-google Date: Fri, 27 Oct 2023 15:43:02 -0700 Subject: [PATCH 17/41] bump cirque commit (#30077) --- third_party/cirque/repo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/cirque/repo b/third_party/cirque/repo index 1b375703af5dc9..910ef2b1e6b9eb 160000 --- a/third_party/cirque/repo +++ b/third_party/cirque/repo @@ -1 +1 @@ -Subproject commit 1b375703af5dc9e00684a04c332a83b40a4c9dd8 +Subproject commit 910ef2b1e6b9eb461043f41b2446e1fb38c0ef73 From 6076317d7b28efcdb5281342fe8fb684c6d9d3f8 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Fri, 27 Oct 2023 18:53:35 -0400 Subject: [PATCH 18/41] Make the vscode devcontainer load again (#30076) * Update dockerfile to version 21 (to get java) and use env variables for paths to make them resilient to change * Version 22 is actually the latest * OpenOCD does not seem to exist in the vscode image currently --- .devcontainer/Dockerfile | 13 ++++++------- .devcontainer/devcontainer.json | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index ff773c6f51e05d..4c8a11fd42f7f1 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -55,14 +55,13 @@ RUN curl https://raw.githubusercontent.com/restyled-io/restyler/master/bin/resty RUN mkdir -p /opt/sdk/sdks/ \ && chown -R $USERNAME:$USERNAME \ /opt/sdk/sdks/ `# NXP uses a patch_sdk script to change SDK files` \ - /opt/espressif/esp-idf `# $USERNAME needs to own the esp-idf and tools for the examples to build` \ - /opt/espressif/tools \ /opt/NordicSemiconductor/nrfconnect/ `# $USERNAME needs to own west configuration to build nRF Connect examples` \ - /opt/ubuntu-21.04-aarch64-sysroot/usr/ `# allow read/write access to header and libraries` \ - /opt/android/sdk `# allow licenses to be accepted` \ - /opt/ameba/ambd_sdk_with_chip_non_NDA/ `# AmebaD requires access to change build_info.h` \ - /opt/fsl-imx-xwayland/5.15-kirkstone/ \ - /opt/openocd \ + $IDF_PATH `# $USERNAME needs to own the esp-idf and tools for the examples to build` \ + $IDF_TOOLS_PATH \ + $SYSROOT_AARCH64 `# allow read/write access to header and libraries` \ + $ANDROID_HOME `# allow licenses to be accepted` \ + $AMEBA_PATH `# AmebaD requires access to change build_info.h` \ + $IMX_SDK_ROOT \ && : # Fix Tizen SDK paths for new user diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index f33e83f87b17fa..94ad9314b9a56c 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -14,7 +14,7 @@ "mounts": [ "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind" ], - "initializeCommand": ".devcontainer/build.sh --tag matter-dev-environment:local --version 20", + "initializeCommand": ".devcontainer/build.sh --tag matter-dev-environment:local --version 22", "image": "matter-dev-environment:local", "remoteUser": "vscode", "customizations": { From 506a48974f689ee19bededb566761204ece75850 Mon Sep 17 00:00:00 2001 From: BurievSardor <80237451+BurievSardor@users.noreply.github.com> Date: Sat, 28 Oct 2023 05:15:20 +0500 Subject: [PATCH 19/41] chip::to_underlying is missing [air-quality-sensor-manager] (#30057) * chip::to_underlying is missing * Apply suggested fix to remove unnecessary cast. --------- Co-authored-by: Boris Zbarsky --- .../src/air-quality-sensor-manager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/air-quality-sensor-app/air-quality-sensor-common/src/air-quality-sensor-manager.cpp b/examples/air-quality-sensor-app/air-quality-sensor-common/src/air-quality-sensor-manager.cpp index 8bc4f4c627925d..a6e94765d86cf8 100644 --- a/examples/air-quality-sensor-app/air-quality-sensor-common/src/air-quality-sensor-manager.cpp +++ b/examples/air-quality-sensor-app/air-quality-sensor-common/src/air-quality-sensor-manager.cpp @@ -136,8 +136,8 @@ void AirQualitySensorManager::Init() void AirQualitySensorManager::OnAirQualityChangeHandler(AirQualityEnum newValue) { - mAirQualityInstance.UpdateAirQuality(static_cast(newValue)); - ChipLogDetail(NotSpecified, "Updated AirQuality value: %huu", newValue); + mAirQualityInstance.UpdateAirQuality(newValue); + ChipLogDetail(NotSpecified, "Updated AirQuality value: %huu", chip::to_underlying(newValue)); } void AirQualitySensorManager::OnCarbonDioxideMeasurementChangeHandler(float newValue) From 181b0cb14ff007ec912f2ba6627e05dfb066c008 Mon Sep 17 00:00:00 2001 From: Karsten Sperling <113487422+ksperling-apple@users.noreply.github.com> Date: Sat, 28 Oct 2023 17:22:26 +1300 Subject: [PATCH 20/41] Add a _span string literal operator for creating constexpr CharSpans (#30042) * Add a _span string literal operator to create constexpr CharSpans * Adopt _span for literals * Tweaks from review --- .../door-lock-server/door-lock-server.cpp | 2 +- src/controller/CHIPDeviceController.cpp | 2 +- src/credentials/tests/TestFabricTable.cpp | 30 +++++++-------- src/crypto/tests/CHIPCryptoPALTest.cpp | 7 +--- src/lib/core/Unchecked.h | 36 ++++++++++++++++++ src/lib/core/tests/TestOTAImageHeader.cpp | 8 ++-- src/lib/support/Span.h | 29 +++++++++++++- src/lib/support/tests/TestJsonToTlv.cpp | 4 +- src/lib/support/tests/TestSpan.cpp | 9 +++++ src/lib/support/tests/TestStringSplitter.cpp | 38 +++++++++---------- src/lib/support/tests/TestTlvToJson.cpp | 2 +- 11 files changed, 117 insertions(+), 50 deletions(-) create mode 100644 src/lib/core/Unchecked.h diff --git a/src/app/clusters/door-lock-server/door-lock-server.cpp b/src/app/clusters/door-lock-server/door-lock-server.cpp index 7552841edfb5e6..3912b022f90065 100644 --- a/src/app/clusters/door-lock-server/door-lock-server.cpp +++ b/src/app/clusters/door-lock-server/door-lock-server.cpp @@ -1827,7 +1827,7 @@ EmberAfStatus DoorLockServer::createUser(chip::EndpointId endpointId, chip::Fabr return static_cast(DlStatus::kOccupied); } - const auto & newUserName = !userName.IsNull() ? userName.Value() : chip::CharSpan::fromCharString(""); + const auto & newUserName = !userName.IsNull() ? userName.Value() : ""_span; auto newUserUniqueId = userUniqueId.IsNull() ? 0xFFFFFFFF : userUniqueId.Value(); auto newUserStatus = userStatus.IsNull() ? UserStatusEnum::kOccupiedEnabled : userStatus.Value(); auto newUserType = userType.IsNull() ? UserTypeEnum::kUnrestrictedUser : userType.Value(); diff --git a/src/controller/CHIPDeviceController.cpp b/src/controller/CHIPDeviceController.cpp index 9a59e89837329b..d4b958a5418c0f 100644 --- a/src/controller/CHIPDeviceController.cpp +++ b/src/controller/CHIPDeviceController.cpp @@ -2543,7 +2543,7 @@ void DeviceCommissioner::PerformCommissioningStep(DeviceProxy * proxy, Commissio else { // Default to "XX", for lack of anything better. - countryCode = CharSpan::fromCharString("XX"); + countryCode = "XX"_span; } GeneralCommissioning::Commands::SetRegulatoryConfig::Type request; diff --git a/src/credentials/tests/TestFabricTable.cpp b/src/credentials/tests/TestFabricTable.cpp index 3bcb5411560e7a..2226b399e75bce 100644 --- a/src/credentials/tests/TestFabricTable.cpp +++ b/src/credentials/tests/TestFabricTable.cpp @@ -2261,32 +2261,32 @@ void TestFabricLabelChange(nlTestSuite * inSuite, void * inContext) // Second scope: set FabricLabel to "acme fabric", make sure it cannot be reverted { // Fabric label starts unset from prior scope - CharSpan fabricLabel = CharSpan::fromCharString("placeholder"); + CharSpan fabricLabel = "placeholder"_span; NL_TEST_ASSERT_SUCCESS(inSuite, fabricTable.GetFabricLabel(1, fabricLabel)); NL_TEST_ASSERT(inSuite, fabricLabel.size() == 0); // Set a valid name - NL_TEST_ASSERT_SUCCESS(inSuite, fabricTable.SetFabricLabel(1, CharSpan::fromCharString("acme fabric"))); + NL_TEST_ASSERT_SUCCESS(inSuite, fabricTable.SetFabricLabel(1, "acme fabric"_span)); NL_TEST_ASSERT_SUCCESS(inSuite, fabricTable.GetFabricLabel(1, fabricLabel)); - NL_TEST_ASSERT(inSuite, fabricLabel.data_equal(CharSpan::fromCharString("acme fabric")) == true); + NL_TEST_ASSERT(inSuite, fabricLabel.data_equal("acme fabric"_span) == true); // Revert pending fabric data. Should not revert name since nothing pending. fabricTable.RevertPendingFabricData(); - fabricLabel = CharSpan::fromCharString("placeholder"); + fabricLabel = "placeholder"_span; NL_TEST_ASSERT_SUCCESS(inSuite, fabricTable.GetFabricLabel(1, fabricLabel)); - NL_TEST_ASSERT(inSuite, fabricLabel.data_equal(CharSpan::fromCharString("acme fabric")) == true); + NL_TEST_ASSERT(inSuite, fabricLabel.data_equal("acme fabric"_span) == true); // Verify we fail to set too large a label (> kFabricLabelMaxLengthInBytes) - CharSpan fabricLabelTooBig = CharSpan::fromCharString("012345678901234567890123456789123456"); + CharSpan fabricLabelTooBig = "012345678901234567890123456789123456"_span; NL_TEST_ASSERT(inSuite, fabricLabelTooBig.size() > chip::kFabricLabelMaxLengthInBytes); NL_TEST_ASSERT(inSuite, fabricTable.SetFabricLabel(1, fabricLabelTooBig) == CHIP_ERROR_INVALID_ARGUMENT); - fabricLabel = CharSpan::fromCharString("placeholder"); + fabricLabel = "placeholder"_span; NL_TEST_ASSERT_SUCCESS(inSuite, fabricTable.GetFabricLabel(1, fabricLabel)); - NL_TEST_ASSERT(inSuite, fabricLabel.data_equal(CharSpan::fromCharString("acme fabric")) == true); + NL_TEST_ASSERT(inSuite, fabricLabel.data_equal("acme fabric"_span) == true); } // Third scope: set fabric label after an update, it sticks, but then goes back after revert @@ -2320,23 +2320,23 @@ void TestFabricLabelChange(nlTestSuite * inSuite, void * inContext) NL_TEST_ASSERT(inSuite, fabricInfo->GetVendorId() == kVendorId); CharSpan fabricLabel = fabricInfo->GetFabricLabel(); - NL_TEST_ASSERT(inSuite, fabricLabel.data_equal(CharSpan::fromCharString("acme fabric")) == true); + NL_TEST_ASSERT(inSuite, fabricLabel.data_equal("acme fabric"_span) == true); } // Update fabric label - CharSpan fabricLabel = CharSpan::fromCharString("placeholder"); - NL_TEST_ASSERT_SUCCESS(inSuite, fabricTable.SetFabricLabel(1, CharSpan::fromCharString("roboto fabric"))); + CharSpan fabricLabel = "placeholder"_span; + NL_TEST_ASSERT_SUCCESS(inSuite, fabricTable.SetFabricLabel(1, "roboto fabric"_span)); - fabricLabel = CharSpan::fromCharString("placeholder"); + fabricLabel = "placeholder"_span; NL_TEST_ASSERT_SUCCESS(inSuite, fabricTable.GetFabricLabel(1, fabricLabel)); - NL_TEST_ASSERT(inSuite, fabricLabel.data_equal(CharSpan::fromCharString("roboto fabric")) == true); + NL_TEST_ASSERT(inSuite, fabricLabel.data_equal("roboto fabric"_span) == true); // Revert pending fabric data. Should revert name to "acme fabric" fabricTable.RevertPendingFabricData(); - fabricLabel = CharSpan::fromCharString("placeholder"); + fabricLabel = "placeholder"_span; NL_TEST_ASSERT_SUCCESS(inSuite, fabricTable.GetFabricLabel(1, fabricLabel)); - NL_TEST_ASSERT(inSuite, fabricLabel.data_equal(CharSpan::fromCharString("acme fabric")) == true); + NL_TEST_ASSERT(inSuite, fabricLabel.data_equal("acme fabric"_span) == true); } } diff --git a/src/crypto/tests/CHIPCryptoPALTest.cpp b/src/crypto/tests/CHIPCryptoPALTest.cpp index 39d9998fa95b80..a79961dbe07c99 100644 --- a/src/crypto/tests/CHIPCryptoPALTest.cpp +++ b/src/crypto/tests/CHIPCryptoPALTest.cpp @@ -2414,13 +2414,10 @@ static void TestSubject_x509Extraction(nlTestSuite * inSuite, void * inContext) NL_TEST_ASSERT(inSuite, CHIP_NO_ERROR == subjectDN_Node02_02.AddAttribute_MatterFabricId(0xFAB000000000001D)); NL_TEST_ASSERT(inSuite, CHIP_NO_ERROR == - subjectDN_Node02_02.AddAttribute_CommonName( - chip::CharSpan::fromCharString("TEST CERT COMMON NAME Attr for Node02_02"), false)); + subjectDN_Node02_02.AddAttribute_CommonName("TEST CERT COMMON NAME Attr for Node02_02"_span, false)); ChipDN subjectDN_Node02_04; NL_TEST_ASSERT(inSuite, CHIP_NO_ERROR == subjectDN_Node02_04.AddAttribute_MatterCASEAuthTag(0xABCE1002)); - NL_TEST_ASSERT(inSuite, - CHIP_NO_ERROR == - subjectDN_Node02_04.AddAttribute_CommonName(chip::CharSpan::fromCharString("TestCert02_04"), false)); + NL_TEST_ASSERT(inSuite, CHIP_NO_ERROR == subjectDN_Node02_04.AddAttribute_CommonName("TestCert02_04"_span, false)); NL_TEST_ASSERT(inSuite, CHIP_NO_ERROR == subjectDN_Node02_04.AddAttribute_MatterFabricId(0xFAB000000000001D)); NL_TEST_ASSERT(inSuite, CHIP_NO_ERROR == subjectDN_Node02_04.AddAttribute_MatterCASEAuthTag(0xABCD0003)); NL_TEST_ASSERT(inSuite, CHIP_NO_ERROR == subjectDN_Node02_04.AddAttribute_MatterNodeId(0xDEDEDEDE00020004)); diff --git a/src/lib/core/Unchecked.h b/src/lib/core/Unchecked.h new file mode 100644 index 00000000000000..d7fab990268168 --- /dev/null +++ b/src/lib/core/Unchecked.h @@ -0,0 +1,36 @@ +/* + * + * Copyright (c) 2023 Project CHIP Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @file + * This file defines the chip::Optional class to handle values which may + * or may not be present. + * + */ +#pragma once + +namespace chip { + +/// Unchecked is a disambiguation tag that can be used to provide and select a variant of a +/// constructor or other method that omits the runtime checks performed by the default variant. +struct UncheckedType +{ + explicit UncheckedType() = default; +}; +inline constexpr UncheckedType Unchecked{}; + +} // namespace chip diff --git a/src/lib/core/tests/TestOTAImageHeader.cpp b/src/lib/core/tests/TestOTAImageHeader.cpp index 928dc2618100b9..0a05799c74ca35 100644 --- a/src/lib/core/tests/TestOTAImageHeader.cpp +++ b/src/lib/core/tests/TestOTAImageHeader.cpp @@ -83,13 +83,13 @@ void TestHappyPath(nlTestSuite * inSuite, void * inContext) NL_TEST_ASSERT(inSuite, header.mVendorId == 0xDEAD); NL_TEST_ASSERT(inSuite, header.mProductId == 0xBEEF); NL_TEST_ASSERT(inSuite, header.mSoftwareVersion == 0xFFFFFFFF); - NL_TEST_ASSERT(inSuite, header.mSoftwareVersionString.data_equal(CharSpan::fromCharString("1.0"))); + NL_TEST_ASSERT(inSuite, header.mSoftwareVersionString.data_equal("1.0"_span)); NL_TEST_ASSERT(inSuite, header.mPayloadSize == strlen("test payload")); NL_TEST_ASSERT(inSuite, header.mMinApplicableVersion.HasValue()); NL_TEST_ASSERT(inSuite, header.mMinApplicableVersion.Value() == 1); NL_TEST_ASSERT(inSuite, header.mMaxApplicableVersion.HasValue()); NL_TEST_ASSERT(inSuite, header.mMaxApplicableVersion.Value() == 2); - NL_TEST_ASSERT(inSuite, header.mReleaseNotesURL.data_equal(CharSpan::fromCharString("https://rn"))); + NL_TEST_ASSERT(inSuite, header.mReleaseNotesURL.data_equal("https://rn"_span)); NL_TEST_ASSERT(inSuite, header.mImageDigestType == OTAImageDigestType::kSha256); NL_TEST_ASSERT(inSuite, header.mImageDigest.size() == 256 / 8); } @@ -169,13 +169,13 @@ void TestSmallBlocks(nlTestSuite * inSuite, void * inContext) NL_TEST_ASSERT(inSuite, header.mVendorId == 0xDEAD); NL_TEST_ASSERT(inSuite, header.mProductId == 0xBEEF); NL_TEST_ASSERT(inSuite, header.mSoftwareVersion == 0xFFFFFFFF); - NL_TEST_ASSERT(inSuite, header.mSoftwareVersionString.data_equal(CharSpan::fromCharString("1.0"))); + NL_TEST_ASSERT(inSuite, header.mSoftwareVersionString.data_equal("1.0"_span)); NL_TEST_ASSERT(inSuite, header.mPayloadSize == strlen("test payload")); NL_TEST_ASSERT(inSuite, header.mMinApplicableVersion.HasValue()); NL_TEST_ASSERT(inSuite, header.mMinApplicableVersion.Value() == 1); NL_TEST_ASSERT(inSuite, header.mMaxApplicableVersion.HasValue()); NL_TEST_ASSERT(inSuite, header.mMaxApplicableVersion.Value() == 2); - NL_TEST_ASSERT(inSuite, header.mReleaseNotesURL.data_equal(CharSpan::fromCharString("https://rn"))); + NL_TEST_ASSERT(inSuite, header.mReleaseNotesURL.data_equal("https://rn"_span)); NL_TEST_ASSERT(inSuite, header.mImageDigestType == OTAImageDigestType::kSha256); NL_TEST_ASSERT(inSuite, header.mImageDigest.size() == 256 / 8); } diff --git a/src/lib/support/Span.h b/src/lib/support/Span.h index cc6c082f4d69bb..aad5ffe4bfa5fe 100644 --- a/src/lib/support/Span.h +++ b/src/lib/support/Span.h @@ -18,11 +18,13 @@ #pragma once #include +#include #include #include -#include +#include #include +#include #include namespace chip { @@ -149,7 +151,10 @@ class Span return Span(reinterpret_cast(&bytes[1]), length); } - // Allow creating CharSpans from a character string. + // Creates a CharSpan from a null-terminated C character string. + // + // Note that for string literals, the user-defined `_span` string + // literal operator should be used instead, e.g. `"Hello"_span`. template ::value && std::is_same::value>> static Span fromCharString(U * chars) { @@ -162,11 +167,31 @@ class Span template bool operator==(const Span & other) const = delete; + // Creates a Span without checking whether databuf is a null pointer. + // + // Note: The normal (checked) constructor should be used for general use; + // this overload exists for special use cases where databuf is guaranteed + // to be valid (not null) and a constexpr constructor is required. + // + // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61648 prevents making + // operator""_span a friend (and this constructor private). + + constexpr Span(UncheckedType tag, pointer databuf, size_t datalen) : mDataBuf(databuf), mDataLen(datalen) {} + private: pointer mDataBuf; size_t mDataLen; }; +inline namespace literals { + +inline constexpr Span operator"" _span(const char * literal, size_t size) +{ + return Span(Unchecked, literal, size); +} + +} // namespace literals + namespace detail { // To make FixedSpan (specifically various FixedByteSpan types) default constructible diff --git a/src/lib/support/tests/TestJsonToTlv.cpp b/src/lib/support/tests/TestJsonToTlv.cpp index 87f37ab4e052b1..c6f5df36333238 100644 --- a/src/lib/support/tests/TestJsonToTlv.cpp +++ b/src/lib/support/tests/TestJsonToTlv.cpp @@ -141,7 +141,7 @@ void TestConverter(nlTestSuite * inSuite, void * inContext) jsonString = "{\n" " \"1:STRING\" : \"hello\"\n" "}\n"; - ConvertJsonToTlvAndValidate(CharSpan::fromCharString("hello"), jsonString); + ConvertJsonToTlvAndValidate("hello"_span, jsonString); // Validated using https://base64.guru/converter/encode/hex const uint8_t byteBuf[] = { 0x01, 0x02, 0x03, 0x04, 0xff, 0xfe, 0x99, 0x88, 0xdd, 0xcd }; @@ -161,7 +161,7 @@ void TestConverter(nlTestSuite * inSuite, void * inContext) structVal.a = 20; structVal.b = true; structVal.d = byteBuf; - structVal.e = CharSpan::fromCharString("hello"); + structVal.e = "hello"_span; structVal.g = static_cast(1.0); structVal.h = static_cast(1.0); diff --git a/src/lib/support/tests/TestSpan.cpp b/src/lib/support/tests/TestSpan.cpp index bf192dd8e26ea1..303eb3f596637b 100644 --- a/src/lib/support/tests/TestSpan.cpp +++ b/src/lib/support/tests/TestSpan.cpp @@ -291,6 +291,14 @@ static void TestFromCharString(nlTestSuite * inSuite, void * inContext) NL_TEST_ASSERT(inSuite, s1.data_equal(CharSpan(str, 3))); } +static void TestLiteral(nlTestSuite * inSuite, void * inContext) +{ + constexpr CharSpan literal = "HI!"_span; + NL_TEST_ASSERT(inSuite, literal.size() == 3); + NL_TEST_ASSERT(inSuite, literal.data_equal(CharSpan::fromCharString("HI!"))); + NL_TEST_ASSERT(inSuite, ""_span.size() == 0); +} + static void TestConversionConstructors(nlTestSuite * inSuite, void * inContext) { struct Foo @@ -330,6 +338,7 @@ static const nlTest sTests[] = { NL_TEST_DEF_FN(TestSubSpan), NL_TEST_DEF_FN(TestFromZclString), NL_TEST_DEF_FN(TestFromCharString), + NL_TEST_DEF_FN(TestLiteral), NL_TEST_DEF_FN(TestConversionConstructors), NL_TEST_SENTINEL(), }; diff --git a/src/lib/support/tests/TestStringSplitter.cpp b/src/lib/support/tests/TestStringSplitter.cpp index a8c41750211e1a..50b0ec094f0a0f 100644 --- a/src/lib/support/tests/TestStringSplitter.cpp +++ b/src/lib/support/tests/TestStringSplitter.cpp @@ -45,7 +45,7 @@ void TestStrdupSplitter(nlTestSuite * inSuite, void * inContext) StringSplitter splitter("single", ','); NL_TEST_ASSERT(inSuite, splitter.Next(out)); - NL_TEST_ASSERT(inSuite, out.data_equal(CharSpan::fromCharString("single"))); + NL_TEST_ASSERT(inSuite, out.data_equal("single"_span)); // next stays at nullptr also after valid data NL_TEST_ASSERT(inSuite, !splitter.Next(out)); @@ -59,11 +59,11 @@ void TestStrdupSplitter(nlTestSuite * inSuite, void * inContext) StringSplitter splitter("one,two,three", ','); NL_TEST_ASSERT(inSuite, splitter.Next(out)); - NL_TEST_ASSERT(inSuite, out.data_equal(CharSpan::fromCharString("one"))); + NL_TEST_ASSERT(inSuite, out.data_equal("one"_span)); NL_TEST_ASSERT(inSuite, splitter.Next(out)); - NL_TEST_ASSERT(inSuite, out.data_equal(CharSpan::fromCharString("two"))); + NL_TEST_ASSERT(inSuite, out.data_equal("two"_span)); NL_TEST_ASSERT(inSuite, splitter.Next(out)); - NL_TEST_ASSERT(inSuite, out.data_equal(CharSpan::fromCharString("three"))); + NL_TEST_ASSERT(inSuite, out.data_equal("three"_span)); NL_TEST_ASSERT(inSuite, !splitter.Next(out)); NL_TEST_ASSERT(inSuite, out.data() == nullptr); } @@ -73,15 +73,15 @@ void TestStrdupSplitter(nlTestSuite * inSuite, void * inContext) StringSplitter splitter("a**bc*d,e*f", '*'); NL_TEST_ASSERT(inSuite, splitter.Next(out)); - NL_TEST_ASSERT(inSuite, out.data_equal(CharSpan::fromCharString("a"))); + NL_TEST_ASSERT(inSuite, out.data_equal("a"_span)); NL_TEST_ASSERT(inSuite, splitter.Next(out)); - NL_TEST_ASSERT(inSuite, out.data_equal(CharSpan::fromCharString(""))); + NL_TEST_ASSERT(inSuite, out.data_equal(""_span)); NL_TEST_ASSERT(inSuite, splitter.Next(out)); - NL_TEST_ASSERT(inSuite, out.data_equal(CharSpan::fromCharString("bc"))); + NL_TEST_ASSERT(inSuite, out.data_equal("bc"_span)); NL_TEST_ASSERT(inSuite, splitter.Next(out)); - NL_TEST_ASSERT(inSuite, out.data_equal(CharSpan::fromCharString("d,e"))); + NL_TEST_ASSERT(inSuite, out.data_equal("d,e"_span)); NL_TEST_ASSERT(inSuite, splitter.Next(out)); - NL_TEST_ASSERT(inSuite, out.data_equal(CharSpan::fromCharString("f"))); + NL_TEST_ASSERT(inSuite, out.data_equal("f"_span)); NL_TEST_ASSERT(inSuite, !splitter.Next(out)); } @@ -90,37 +90,37 @@ void TestStrdupSplitter(nlTestSuite * inSuite, void * inContext) StringSplitter splitter(",", ','); // Note that even though "" is nullptr right away, "," becomes two empty strings NL_TEST_ASSERT(inSuite, splitter.Next(out)); - NL_TEST_ASSERT(inSuite, out.data_equal(CharSpan::fromCharString(""))); + NL_TEST_ASSERT(inSuite, out.data_equal(""_span)); NL_TEST_ASSERT(inSuite, splitter.Next(out)); - NL_TEST_ASSERT(inSuite, out.data_equal(CharSpan::fromCharString(""))); + NL_TEST_ASSERT(inSuite, out.data_equal(""_span)); NL_TEST_ASSERT(inSuite, !splitter.Next(out)); } { StringSplitter splitter("log,", ','); NL_TEST_ASSERT(inSuite, splitter.Next(out)); - NL_TEST_ASSERT(inSuite, out.data_equal(CharSpan::fromCharString("log"))); + NL_TEST_ASSERT(inSuite, out.data_equal("log"_span)); NL_TEST_ASSERT(inSuite, splitter.Next(out)); - NL_TEST_ASSERT(inSuite, out.data_equal(CharSpan::fromCharString(""))); + NL_TEST_ASSERT(inSuite, out.data_equal(""_span)); NL_TEST_ASSERT(inSuite, !splitter.Next(out)); } { StringSplitter splitter(",log", ','); NL_TEST_ASSERT(inSuite, splitter.Next(out)); - NL_TEST_ASSERT(inSuite, out.data_equal(CharSpan::fromCharString(""))); + NL_TEST_ASSERT(inSuite, out.data_equal(""_span)); NL_TEST_ASSERT(inSuite, splitter.Next(out)); - NL_TEST_ASSERT(inSuite, out.data_equal(CharSpan::fromCharString("log"))); + NL_TEST_ASSERT(inSuite, out.data_equal("log"_span)); NL_TEST_ASSERT(inSuite, !splitter.Next(out)); } { StringSplitter splitter(",,,", ','); NL_TEST_ASSERT(inSuite, splitter.Next(out)); - NL_TEST_ASSERT(inSuite, out.data_equal(CharSpan::fromCharString(""))); + NL_TEST_ASSERT(inSuite, out.data_equal(""_span)); NL_TEST_ASSERT(inSuite, splitter.Next(out)); - NL_TEST_ASSERT(inSuite, out.data_equal(CharSpan::fromCharString(""))); + NL_TEST_ASSERT(inSuite, out.data_equal(""_span)); NL_TEST_ASSERT(inSuite, splitter.Next(out)); - NL_TEST_ASSERT(inSuite, out.data_equal(CharSpan::fromCharString(""))); + NL_TEST_ASSERT(inSuite, out.data_equal(""_span)); NL_TEST_ASSERT(inSuite, splitter.Next(out)); - NL_TEST_ASSERT(inSuite, out.data_equal(CharSpan::fromCharString(""))); + NL_TEST_ASSERT(inSuite, out.data_equal(""_span)); NL_TEST_ASSERT(inSuite, !splitter.Next(out)); } } diff --git a/src/lib/support/tests/TestTlvToJson.cpp b/src/lib/support/tests/TestTlvToJson.cpp index 63dcf48c9fde16..be25ef1055d224 100644 --- a/src/lib/support/tests/TestTlvToJson.cpp +++ b/src/lib/support/tests/TestTlvToJson.cpp @@ -140,7 +140,7 @@ void TestConverter(nlTestSuite * inSuite, void * inContext) "}\n"; EncodeAndValidate(static_cast(1.0), jsonString); - CharSpan charSpan = CharSpan::fromCharString("hello"); + CharSpan charSpan = "hello"_span; jsonString = "{\n" " \"1:STRING\" : \"hello\"\n" "}\n"; From b812732ce9840e04181dd9507f5a02240e825143 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Sun, 29 Oct 2023 11:11:45 -0400 Subject: [PATCH 21/41] Bring `Smoke CO Cluster` in sync with spec (#30069) * Set smoke sensitivity level to be manage in smokeCo * zap regen --- .../all-clusters-common/all-clusters-app.matter | 2 +- .../chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter | 2 +- .../smoke-co-alarm-common/smoke-co-alarm-app.matter | 2 +- .../zcl/data-model/chip/smoke-co-alarm-cluster.xml | 5 ++++- src/controller/data_model/controller-clusters.matter | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter index bd7df6702e4446..80bf6f02a78423 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 @@ -3003,7 +3003,7 @@ server cluster SmokeCoAlarm = 92 { readonly attribute AlarmStateEnum interconnectSmokeAlarm = 8; readonly attribute AlarmStateEnum interconnectCOAlarm = 9; readonly attribute ContaminationStateEnum contaminationState = 10; - attribute SensitivityEnum smokeSensitivityLevel = 11; + attribute access(write: manage) SensitivityEnum smokeSensitivityLevel = 11; readonly attribute epoch_s expiryDate = 12; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; diff --git a/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter b/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter index e27712afd4ce61..1c026bb8c31c30 100644 --- a/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter +++ b/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter @@ -1224,7 +1224,7 @@ server cluster SmokeCoAlarm = 92 { readonly attribute AlarmStateEnum interconnectSmokeAlarm = 8; readonly attribute AlarmStateEnum interconnectCOAlarm = 9; readonly attribute ContaminationStateEnum contaminationState = 10; - attribute SensitivityEnum smokeSensitivityLevel = 11; + attribute access(write: manage) SensitivityEnum smokeSensitivityLevel = 11; readonly attribute epoch_s expiryDate = 12; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; 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 85e5ad6bba4e98..a7b346ecda11c7 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 @@ -1726,7 +1726,7 @@ server cluster SmokeCoAlarm = 92 { readonly attribute AlarmStateEnum interconnectSmokeAlarm = 8; readonly attribute AlarmStateEnum interconnectCOAlarm = 9; readonly attribute ContaminationStateEnum contaminationState = 10; - attribute SensitivityEnum smokeSensitivityLevel = 11; + attribute access(write: manage) SensitivityEnum smokeSensitivityLevel = 11; readonly attribute epoch_s expiryDate = 12; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; diff --git a/src/app/zap-templates/zcl/data-model/chip/smoke-co-alarm-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/smoke-co-alarm-cluster.xml index c9700fe14cccc4..018cab2932ea66 100644 --- a/src/app/zap-templates/zcl/data-model/chip/smoke-co-alarm-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/smoke-co-alarm-cluster.xml @@ -48,7 +48,10 @@ limitations under the License. InterconnectSmokeAlarm InterconnectCOAlarm ContaminationState - SmokeSensitivityLevel + + SmokeSensitivityLevel + + ExpiryDate diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index cf35cebdfcf50b..8f28a219f1a2b7 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -3287,7 +3287,7 @@ client cluster SmokeCoAlarm = 92 { readonly attribute optional AlarmStateEnum interconnectSmokeAlarm = 8; readonly attribute optional AlarmStateEnum interconnectCOAlarm = 9; readonly attribute optional ContaminationStateEnum contaminationState = 10; - attribute optional SensitivityEnum smokeSensitivityLevel = 11; + attribute access(write: manage) optional SensitivityEnum smokeSensitivityLevel = 11; readonly attribute optional epoch_s expiryDate = 12; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; From 89671e808b3a2a7db5096a0e8b1389101dfde692 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Sun, 29 Oct 2023 21:27:57 -0400 Subject: [PATCH 22/41] Change SoftwareDiagnostics Cluster to match the spec (#30052) * Diagnostics to spec: casing and access for resetWaterMarks * Fix typo in access logic * Zap regen, make it compile * Undo unwanted change * Minor change to kick CI * Fix Darwin availability annotations too. * Ran zap_convert_all.py --------- Co-authored-by: Boris Zbarsky --- .../air-purifier-common/air-purifier-app.zap | 12044 ++-------------- .../air-quality-sensor-app.matter | 4 +- .../air-quality-sensor-app.zap | 5 +- .../all-clusters-app.matter | 4 +- .../all-clusters-common/all-clusters-app.zap | 14 +- .../all-clusters-minimal-app.matter | 2 +- .../all-clusters-minimal-app.zap | 4 +- .../bridge-common/bridge-app.matter | 2 +- .../bridge-app/bridge-common/bridge-app.zap | 5 +- ...p_rootnode_dimmablelight_bCwGYSDpoe.matter | 4 +- ...noip_rootnode_dimmablelight_bCwGYSDpoe.zap | 5 +- ...r_humiditysensor_thermostat_56de3d5f45.zap | 5 +- ...ootnode_airqualitysensor_e63187f6c9.matter | 4 +- .../rootnode_airqualitysensor_e63187f6c9.zap | 5 +- ...ootnode_basicvideoplayer_0ff86e943b.matter | 4 +- .../rootnode_basicvideoplayer_0ff86e943b.zap | 2 +- ...de_colortemperaturelight_hbUnzYVeyn.matter | 4 +- ...tnode_colortemperaturelight_hbUnzYVeyn.zap | 5 +- .../rootnode_contactsensor_lFAGG1bfRO.matter | 4 +- .../rootnode_contactsensor_lFAGG1bfRO.zap | 5 +- .../rootnode_dimmablelight_bCwGYSDpoe.matter | 4 +- .../rootnode_dimmablelight_bCwGYSDpoe.zap | 5 +- .../rootnode_dishwasher_cc105034fe.zap | 5 +- .../rootnode_doorlock_aNKYAreMXE.matter | 4 +- .../devices/rootnode_doorlock_aNKYAreMXE.zap | 5 +- ...tnode_extendedcolorlight_8lcaaYJVAa.matter | 4 +- ...rootnode_extendedcolorlight_8lcaaYJVAa.zap | 5 +- .../devices/rootnode_fan_7N2TobIlOX.matter | 4 +- .../chef/devices/rootnode_fan_7N2TobIlOX.zap | 5 +- .../rootnode_flowsensor_1zVxHedlaV.matter | 4 +- .../rootnode_flowsensor_1zVxHedlaV.zap | 5 +- .../rootnode_genericswitch_9866e35d0b.zap | 5 +- ...tnode_heatingcoolingunit_ncdGai1E5a.matter | 4 +- ...rootnode_heatingcoolingunit_ncdGai1E5a.zap | 5 +- .../rootnode_humiditysensor_Xyj4gda6Hb.matter | 4 +- .../rootnode_humiditysensor_Xyj4gda6Hb.zap | 5 +- .../rootnode_laundrywasher_fb10d238c8.zap | 5 +- .../rootnode_lightsensor_lZQycTFcJK.matter | 4 +- .../rootnode_lightsensor_lZQycTFcJK.zap | 5 +- ...rootnode_occupancysensor_iHyVgifZuo.matter | 4 +- .../rootnode_occupancysensor_iHyVgifZuo.zap | 5 +- .../rootnode_onofflight_bbs1b7IaOV.matter | 4 +- .../rootnode_onofflight_bbs1b7IaOV.zap | 5 +- .../rootnode_onofflight_samplemei.matter | 4 +- .../devices/rootnode_onofflight_samplemei.zap | 5 +- ...ootnode_onofflightswitch_FsPlMr090Q.matter | 4 +- .../rootnode_onofflightswitch_FsPlMr090Q.zap | 5 +- ...rootnode_onoffpluginunit_Wtf8ss5EBY.matter | 4 +- .../rootnode_onoffpluginunit_Wtf8ss5EBY.zap | 5 +- .../rootnode_pressuresensor_s0qC9wLH4k.matter | 4 +- .../rootnode_pressuresensor_s0qC9wLH4k.zap | 5 +- .../chef/devices/rootnode_pump_5f904818cc.zap | 5 +- .../chef/devices/rootnode_pump_a811bb33a0.zap | 5 +- ...emperaturecontrolledcabinet_ffdb696680.zap | 5 +- ...otnode_roboticvacuumcleaner_1807ff0c49.zap | 2 +- ...rootnode_roomairconditioner_9cf3607804.zap | 5 +- .../rootnode_smokecoalarm_686fe0dcb8.zap | 5 +- .../rootnode_speaker_RpzeXdimqA.matter | 4 +- .../devices/rootnode_speaker_RpzeXdimqA.zap | 5 +- ...otnode_temperaturesensor_Qy1zkNW7c3.matter | 4 +- .../rootnode_temperaturesensor_Qy1zkNW7c3.zap | 5 +- .../rootnode_thermostat_bm3fb8dhYi.matter | 4 +- .../rootnode_thermostat_bm3fb8dhYi.zap | 5 +- .../rootnode_windowcovering_RLCxaGi9Yx.matter | 4 +- .../rootnode_windowcovering_RLCxaGi9Yx.zap | 5 +- examples/chef/devices/template.zap | 2 +- .../contact-sensor-app.matter | 4 +- .../contact-sensor-app.zap | 5 +- .../dishwasher-common/dishwasher-app.zap | 5 +- .../light-switch-app.matter | 4 +- .../light-switch-common/light-switch-app.zap | 5 +- .../data_model/lighting-app-ethernet.matter | 4 +- .../data_model/lighting-app-ethernet.zap | 5 +- .../data_model/lighting-app-thread.matter | 4 +- .../data_model/lighting-app-thread.zap | 5 +- .../data_model/lighting-app-wifi.matter | 4 +- .../data_model/lighting-app-wifi.zap | 5 +- .../lighting-common/lighting-app.matter | 4 +- .../lighting-common/lighting-app.zap | 5 +- .../nxp/zap/lighting-on-off.matter | 4 +- .../lighting-app/nxp/zap/lighting-on-off.zap | 5 +- examples/lighting-app/qpg/zap/light.matter | 4 +- examples/lighting-app/qpg/zap/light.zap | 5 +- .../data_model/lighting-thread-app.matter | 4 +- .../silabs/data_model/lighting-thread-app.zap | 5 +- .../data_model/lighting-wifi-app.matter | 4 +- .../silabs/data_model/lighting-wifi-app.zap | 5 +- examples/lock-app/lock-common/lock-app.matter | 4 +- examples/lock-app/lock-common/lock-app.zap | 2 +- examples/lock-app/nxp/zap/lock-app.matter | 4 +- examples/lock-app/nxp/zap/lock-app.zap | 5 +- examples/lock-app/qpg/zap/lock.matter | 4 +- examples/lock-app/qpg/zap/lock.zap | 5 +- .../ota-provider-common/ota-provider-app.zap | 5 +- .../ota-requestor-app.zap | 2 +- .../placeholder/linux/apps/app1/config.matter | 4 +- .../placeholder/linux/apps/app1/config.zap | 7 +- .../placeholder/linux/apps/app2/config.matter | 4 +- .../placeholder/linux/apps/app2/config.zap | 7 +- examples/pump-app/pump-common/pump-app.zap | 5 +- .../silabs/data_model/pump-thread-app.zap | 5 +- .../silabs/data_model/pump-wifi-app.zap | 5 +- .../pump-controller-app.zap | 5 +- .../refrigerator-common/refrigerator-app.zap | 5 +- .../resource-monitoring-app.matter | 4 +- .../resource-monitoring-app.zap | 5 +- examples/rvc-app/rvc-common/rvc-app.zap | 2 +- .../smoke-co-alarm-app.matter | 4 +- .../smoke-co-alarm-app.zap | 5 +- .../temperature-measurement.matter | 2 +- .../temperature-measurement.zap | 5 +- .../nxp/zap/thermostat_matter_thread.zap | 5 +- .../nxp/zap/thermostat_matter_wifi.zap | 5 +- .../thermostat-common/thermostat.matter | 2 +- .../thermostat-common/thermostat.zap | 5 +- examples/tv-app/tv-common/tv-app.matter | 2 +- examples/tv-app/tv-common/tv-app.zap | 7 +- .../tv-casting-common/tv-casting-app.matter | 2 +- .../tv-casting-common/tv-casting-app.zap | 5 +- .../virtual-device-app.matter | 2 +- .../virtual-device-app.zap | 5 +- examples/window-app/common/window-app.matter | 4 +- examples/window-app/common/window-app.zap | 5 +- .../zap/tests/inputs/all-clusters-app.zap | 16 +- .../tools/zap/tests/inputs/lighting-app.zap | 5 +- .../all-clusters-app/app-templates/access.h | 3 + .../lighting-app/app-templates/access.h | 3 + .../software-diagnostics-server.cpp | 2 +- .../chip/software-diagnostics-cluster.xml | 5 +- .../data_model/controller-clusters.matter | 4 +- .../data_model/controller-clusters.zap | 3 +- .../python/chip/clusters/Objects.py | 2 +- .../CHIP/templates/availability.yaml | 9 + .../CHIP/zap-generated/MTRBaseClusters.h | 5 +- .../app-common/zap-generated/cluster-enums.h | 2 +- 135 files changed, 1836 insertions(+), 10809 deletions(-) diff --git a/examples/air-purifier-app/air-purifier-common/air-purifier-app.zap b/examples/air-purifier-app/air-purifier-common/air-purifier-app.zap index 1cf688c5cd57f9..c1f47b4d162a51 100644 --- a/examples/air-purifier-app/air-purifier-common/air-purifier-app.zap +++ b/examples/air-purifier-app/air-purifier-common/air-purifier-app.zap @@ -1,5 +1,6 @@ { - "featureLevel": 98, + "fileFormat": 2, + "featureLevel": 99, "creator": "zap", "keyValuePairs": [ { @@ -60,8498 +61,16 @@ "deviceTypeProfileId": 259, "clusters": [ { - "name": "Identify", - "code": 3, - "mfgCode": null, - "define": "IDENTIFY_CLUSTER", - "side": "client", - "enabled": 0, - "commands": [ - { - "name": "Identify", - "code": 0, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - } - ], - "attributes": [ - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "2", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] - }, - { - "name": "Identify", - "code": 3, - "mfgCode": null, - "define": "IDENTIFY_CLUSTER", - "side": "server", - "enabled": 0, - "attributes": [ - { - "name": "IdentifyTime", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "2", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] - }, - { - "name": "Groups", - "code": 4, - "mfgCode": null, - "define": "GROUPS_CLUSTER", - "side": "client", - "enabled": 0, - "commands": [ - { - "name": "AddGroup", - "code": 0, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "ViewGroup", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "GetGroupMembership", - "code": 2, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "RemoveGroup", - "code": 3, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "RemoveAllGroups", - "code": 4, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "AddGroupIfIdentifying", - "code": 5, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - } - ], - "attributes": [ - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "3", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] - }, - { - "name": "Groups", - "code": 4, - "mfgCode": null, - "define": "GROUPS_CLUSTER", - "side": "server", - "enabled": 0, - "commands": [ - { - "name": "AddGroupResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 0, - "outgoing": 1 - }, - { - "name": "ViewGroupResponse", - "code": 1, - "mfgCode": null, - "source": "server", - "incoming": 0, - "outgoing": 1 - }, - { - "name": "GetGroupMembershipResponse", - "code": 2, - "mfgCode": null, - "source": "server", - "incoming": 0, - "outgoing": 1 - }, - { - "name": "RemoveGroupResponse", - "code": 3, - "mfgCode": null, - "source": "server", - "incoming": 0, - "outgoing": 1 - } - ], - "attributes": [ - { - "name": "NameSupport", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "NameSupportBitmap", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "server", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "3", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] - }, - { - "name": "Scenes", - "code": 5, - "mfgCode": null, - "define": "SCENES_CLUSTER", - "side": "client", - "enabled": 0, - "commands": [ - { - "name": "AddScene", - "code": 0, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "ViewScene", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "RemoveScene", - "code": 2, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "RemoveAllScenes", - "code": 3, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "StoreScene", - "code": 4, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "RecallScene", - "code": 5, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "GetSceneMembership", - "code": 6, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - } - ], - "attributes": [ - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "3", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] - }, - { - "name": "Scenes", - "code": 5, - "mfgCode": null, - "define": "SCENES_CLUSTER", - "side": "server", - "enabled": 0, - "commands": [ - { - "name": "AddSceneResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 0, - "outgoing": 1 - }, - { - "name": "ViewSceneResponse", - "code": 1, - "mfgCode": null, - "source": "server", - "incoming": 0, - "outgoing": 1 - }, - { - "name": "RemoveSceneResponse", - "code": 2, - "mfgCode": null, - "source": "server", - "incoming": 0, - "outgoing": 1 - }, - { - "name": "RemoveAllScenesResponse", - "code": 3, - "mfgCode": null, - "source": "server", - "incoming": 0, - "outgoing": 1 - }, - { - "name": "StoreSceneResponse", - "code": 4, - "mfgCode": null, - "source": "server", - "incoming": 0, - "outgoing": 1 - }, - { - "name": "GetSceneMembershipResponse", - "code": 6, - "mfgCode": null, - "source": "server", - "incoming": 0, - "outgoing": 1 - } - ], - "attributes": [ - { - "name": "SceneCount", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "int8u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "CurrentScene", - "code": 1, - "mfgCode": null, - "side": "server", - "type": "int8u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "CurrentGroup", - "code": 2, - "mfgCode": null, - "side": "server", - "type": "group_id", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "SceneValid", - "code": 3, - "mfgCode": null, - "side": "server", - "type": "boolean", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "NameSupport", - "code": 4, - "mfgCode": null, - "side": "server", - "type": "bitmap8", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "3", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] - }, - { - "name": "On/Off", - "code": 6, - "mfgCode": null, - "define": "ON_OFF_CLUSTER", - "side": "client", - "enabled": 0, - "commands": [ - { - "name": "Off", - "code": 0, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "On", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "Toggle", - "code": 2, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - } - ], - "attributes": [ - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "2", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] - }, - { - "name": "On/Off", - "code": 6, - "mfgCode": null, - "define": "ON_OFF_CLUSTER", - "side": "server", - "enabled": 0, - "attributes": [ - { - "name": "OnOff", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "boolean", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "2", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] - }, - { - "name": "On/off Switch Configuration", - "code": 7, - "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", - "side": "client", - "enabled": 0, - "attributes": [ - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] - }, - { - "name": "On/off Switch Configuration", - "code": 7, - "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", - "side": "server", - "enabled": 0, - "attributes": [ - { - "name": "switch type", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "enum8", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "switch actions", - "code": 16, - "mfgCode": null, - "side": "server", - "type": "enum8", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] - }, - { - "name": "Level Control", - "code": 8, - "mfgCode": null, - "define": "LEVEL_CONTROL_CLUSTER", - "side": "client", - "enabled": 0, - "commands": [ - { - "name": "MoveToLevel", - "code": 0, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "Move", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "Step", - "code": 2, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "Stop", - "code": 3, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "MoveToLevelWithOnOff", - "code": 4, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "MoveWithOnOff", - "code": 5, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "StepWithOnOff", - "code": 6, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "StopWithOnOff", - "code": 7, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - } - ], - "attributes": [ - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "5", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] - }, - { - "name": "Level Control", - "code": 8, - "mfgCode": null, - "define": "LEVEL_CONTROL_CLUSTER", - "side": "server", - "enabled": 0, - "attributes": [ - { - "name": "CurrentLevel", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "int8u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "5", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] - }, - { - "name": "Descriptor", - "code": 29, - "mfgCode": null, - "define": "DESCRIPTOR_CLUSTER", - "side": "client", - "enabled": 0, - "attributes": [ - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - }, - { - "name": "Descriptor", - "code": 29, - "mfgCode": null, - "define": "DESCRIPTOR_CLUSTER", - "side": "server", - "enabled": 1, - "attributes": [ - { - "name": "DeviceTypeList", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ServerList", - "code": 1, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClientList", - "code": 2, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "PartsList", - "code": 3, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "server", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - }, - { - "name": "Access Control", - "code": 31, - "mfgCode": null, - "define": "ACCESS_CONTROL_CLUSTER", - "side": "client", - "enabled": 0, - "attributes": [ - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - }, - { - "name": "Access Control", - "code": 31, - "mfgCode": null, - "define": "ACCESS_CONTROL_CLUSTER", - "side": "server", - "enabled": 1, - "attributes": [ - { - "name": "ACL", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "Extension", - "code": 1, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "SubjectsPerAccessControlEntry", - "code": 2, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "TargetsPerAccessControlEntry", - "code": 3, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "AccessControlEntriesPerFabric", - "code": 4, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "AttributeList", - "code": 65531, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "server", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ], - "events": [ - { - "name": "AccessControlEntryChanged", - "code": 0, - "mfgCode": null, - "side": "server", - "included": 1 - }, - { - "name": "AccessControlExtensionChanged", - "code": 1, - "mfgCode": null, - "side": "server", - "included": 1 - } - ] - }, - { - "name": "Basic Information", - "code": 40, - "mfgCode": null, - "define": "BASIC_INFORMATION_CLUSTER", - "side": "client", - "enabled": 0, - "attributes": [ - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 1, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] - }, - { - "name": "Basic Information", - "code": 40, - "mfgCode": null, - "define": "BASIC_INFORMATION_CLUSTER", - "side": "server", - "enabled": 1, - "attributes": [ - { - "name": "DataModelRevision", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "External", - "singleton": 1, - "bounded": 0, - "defaultValue": "10", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "VendorName", - "code": 1, - "mfgCode": null, - "side": "server", - "type": "char_string", - "included": 1, - "storageOption": "External", - "singleton": 1, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "VendorID", - "code": 2, - "mfgCode": null, - "side": "server", - "type": "vendor_id", - "included": 1, - "storageOption": "External", - "singleton": 1, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "ProductName", - "code": 3, - "mfgCode": null, - "side": "server", - "type": "char_string", - "included": 1, - "storageOption": "External", - "singleton": 1, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "ProductID", - "code": 4, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "External", - "singleton": 1, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "NodeLabel", - "code": 5, - "mfgCode": null, - "side": "server", - "type": "char_string", - "included": 1, - "storageOption": "NVM", - "singleton": 1, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "Location", - "code": 6, - "mfgCode": null, - "side": "server", - "type": "char_string", - "included": 1, - "storageOption": "External", - "singleton": 1, - "bounded": 0, - "defaultValue": "XX", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "HardwareVersion", - "code": 7, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "External", - "singleton": 1, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "HardwareVersionString", - "code": 8, - "mfgCode": null, - "side": "server", - "type": "char_string", - "included": 1, - "storageOption": "External", - "singleton": 1, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "SoftwareVersion", - "code": 9, - "mfgCode": null, - "side": "server", - "type": "int32u", - "included": 1, - "storageOption": "External", - "singleton": 1, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "SoftwareVersionString", - "code": 10, - "mfgCode": null, - "side": "server", - "type": "char_string", - "included": 1, - "storageOption": "External", - "singleton": 1, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "ManufacturingDate", - "code": 11, - "mfgCode": null, - "side": "server", - "type": "char_string", - "included": 1, - "storageOption": "External", - "singleton": 1, - "bounded": 0, - "defaultValue": "20210614123456ZZ", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "PartNumber", - "code": 12, - "mfgCode": null, - "side": "server", - "type": "char_string", - "included": 1, - "storageOption": "External", - "singleton": 1, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "ProductURL", - "code": 13, - "mfgCode": null, - "side": "server", - "type": "long_char_string", - "included": 1, - "storageOption": "External", - "singleton": 1, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "ProductLabel", - "code": 14, - "mfgCode": null, - "side": "server", - "type": "char_string", - "included": 1, - "storageOption": "External", - "singleton": 1, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "SerialNumber", - "code": 15, - "mfgCode": null, - "side": "server", - "type": "char_string", - "included": 1, - "storageOption": "External", - "singleton": 1, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "LocalConfigDisabled", - "code": 16, - "mfgCode": null, - "side": "server", - "type": "boolean", - "included": 1, - "storageOption": "NVM", - "singleton": 1, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "Reachable", - "code": 17, - "mfgCode": null, - "side": "server", - "type": "boolean", - "included": 0, - "storageOption": "RAM", - "singleton": 1, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "UniqueID", - "code": 18, - "mfgCode": null, - "side": "server", - "type": "char_string", - "included": 1, - "storageOption": "External", - "singleton": 1, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "CapabilityMinima", - "code": 19, - "mfgCode": null, - "side": "server", - "type": "CapabilityMinimaStruct", - "included": 1, - "storageOption": "External", - "singleton": 1, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "server", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 1, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ], - "events": [ - { - "name": "StartUp", - "code": 0, - "mfgCode": null, - "side": "server", - "included": 1 - }, - { - "name": "ShutDown", - "code": 1, - "mfgCode": null, - "side": "server", - "included": 1 - }, - { - "name": "Leave", - "code": 2, - "mfgCode": null, - "side": "server", - "included": 1 - } - ] - }, - { - "name": "OTA Software Update Provider", - "code": 41, - "mfgCode": null, - "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", - "side": "client", - "enabled": 1, - "commands": [ - { - "name": "QueryImage", - "code": 0, - "mfgCode": null, - "source": "client", - "incoming": 0, - "outgoing": 1 - }, - { - "name": "ApplyUpdateRequest", - "code": 2, - "mfgCode": null, - "source": "client", - "incoming": 0, - "outgoing": 1 - }, - { - "name": "NotifyUpdateApplied", - "code": 4, - "mfgCode": null, - "source": "client", - "incoming": 0, - "outgoing": 1 - } - ], - "attributes": [ - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] - }, - { - "name": "OTA Software Update Provider", - "code": 41, - "mfgCode": null, - "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", - "side": "server", - "enabled": 0, - "commands": [ - { - "name": "QueryImageResponse", - "code": 1, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "ApplyUpdateResponse", - "code": 3, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - } - ], - "attributes": [ - { - "name": "AttributeList", - "code": 65531, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 0, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "server", - "type": "bitmap32", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] - }, - { - "name": "OTA Software Update Requestor", - "code": 42, - "mfgCode": null, - "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", - "side": "client", - "enabled": 0, - "commands": [ - { - "name": "AnnounceOTAProvider", - "code": 0, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - } - ], - "attributes": [ - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] - }, - { - "name": "OTA Software Update Requestor", - "code": 42, - "mfgCode": null, - "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", - "side": "server", - "enabled": 1, - "attributes": [ - { - "name": "DefaultOTAProviders", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "UpdatePossible", - "code": 1, - "mfgCode": null, - "side": "server", - "type": "boolean", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "UpdateState", - "code": 2, - "mfgCode": null, - "side": "server", - "type": "OTAUpdateStateEnum", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "UpdateStateProgress", - "code": 3, - "mfgCode": null, - "side": "server", - "type": "int8u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "AttributeList", - "code": 65531, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 0, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "server", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ], - "events": [ - { - "name": "StateTransition", - "code": 0, - "mfgCode": null, - "side": "server", - "included": 1 - }, - { - "name": "VersionApplied", - "code": 1, - "mfgCode": null, - "side": "server", - "included": 1 - }, - { - "name": "DownloadError", - "code": 2, - "mfgCode": null, - "side": "server", - "included": 1 - } - ] - }, - { - "name": "Localization Configuration", - "code": 43, - "mfgCode": null, - "define": "LOCALIZATION_CONFIGURATION_CLUSTER", - "side": "client", - "enabled": 0 - }, - { - "name": "Localization Configuration", - "code": 43, - "mfgCode": null, - "define": "LOCALIZATION_CONFIGURATION_CLUSTER", - "side": "server", - "enabled": 0, - "attributes": [ - { - "name": "ActiveLocale", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "char_string", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "SupportedLocales", - "code": 1, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "server", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - }, - { - "name": "Time Format Localization", - "code": 44, - "mfgCode": null, - "define": "TIME_FORMAT_LOCALIZATION_CLUSTER", - "side": "client", - "enabled": 0 - }, - { - "name": "Time Format Localization", - "code": 44, - "mfgCode": null, - "define": "TIME_FORMAT_LOCALIZATION_CLUSTER", - "side": "server", - "enabled": 0, - "attributes": [ - { - "name": "HourFormat", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "HourFormatEnum", - "included": 1, - "storageOption": "NVM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ActiveCalendarType", - "code": 1, - "mfgCode": null, - "side": "server", - "type": "CalendarTypeEnum", - "included": 1, - "storageOption": "NVM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "SupportedCalendarTypes", - "code": 2, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "server", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - }, - { - "name": "Unit Localization", - "code": 45, - "mfgCode": null, - "define": "UNIT_LOCALIZATION_CLUSTER", - "side": "client", - "enabled": 0 - }, - { - "name": "Unit Localization", - "code": 45, - "mfgCode": null, - "define": "UNIT_LOCALIZATION_CLUSTER", - "side": "server", - "enabled": 0, - "attributes": [ - { - "name": "TemperatureUnit", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "TempUnitEnum", - "included": 0, - "storageOption": "NVM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "server", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - }, - { - "name": "General Commissioning", - "code": 48, - "mfgCode": null, - "define": "GENERAL_COMMISSIONING_CLUSTER", - "side": "client", - "enabled": 0, - "commands": [ - { - "name": "ArmFailSafe", - "code": 0, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "SetRegulatoryConfig", - "code": 2, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "CommissioningComplete", - "code": 4, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - } - ], - "attributes": [ - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] - }, - { - "name": "General Commissioning", - "code": 48, - "mfgCode": null, - "define": "GENERAL_COMMISSIONING_CLUSTER", - "side": "server", - "enabled": 1, - "commands": [ - { - "name": "ArmFailSafeResponse", - "code": 1, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "SetRegulatoryConfigResponse", - "code": 3, - "mfgCode": null, - "source": "server", - "incoming": 0, - "outgoing": 1 - }, - { - "name": "CommissioningCompleteResponse", - "code": 5, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - } - ], - "attributes": [ - { - "name": "Breadcrumb", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "int64u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000000000000000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "BasicCommissioningInfo", - "code": 1, - "mfgCode": null, - "side": "server", - "type": "BasicCommissioningInfo", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "RegulatoryConfig", - "code": 2, - "mfgCode": null, - "side": "server", - "type": "RegulatoryLocationTypeEnum", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "LocationCapability", - "code": 3, - "mfgCode": null, - "side": "server", - "type": "RegulatoryLocationTypeEnum", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "SupportsConcurrentConnection", - "code": 4, - "mfgCode": null, - "side": "server", - "type": "boolean", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "server", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] - }, - { - "name": "Network Commissioning", - "code": 49, - "mfgCode": null, - "define": "NETWORK_COMMISSIONING_CLUSTER", - "side": "client", - "enabled": 0, - "commands": [ - { - "name": "ScanNetworks", - "code": 0, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "AddOrUpdateWiFiNetwork", - "code": 2, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "AddOrUpdateThreadNetwork", - "code": 3, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "RemoveNetwork", - "code": 4, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "ConnectNetwork", - "code": 6, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "ReorderNetwork", - "code": 8, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - } - ], - "attributes": [ - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] - }, - { - "name": "Network Commissioning", - "code": 49, - "mfgCode": null, - "define": "NETWORK_COMMISSIONING_CLUSTER", - "side": "server", - "enabled": 1, - "commands": [ - { - "name": "ScanNetworksResponse", - "code": 1, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "NetworkConfigResponse", - "code": 5, - "mfgCode": null, - "source": "server", - "incoming": 0, - "outgoing": 1 - }, - { - "name": "ConnectNetworkResponse", - "code": 7, - "mfgCode": null, - "source": "server", - "incoming": 0, - "outgoing": 1 - } - ], - "attributes": [ - { - "name": "MaxNetworks", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "int8u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "Networks", - "code": 1, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ScanMaxTimeSeconds", - "code": 2, - "mfgCode": null, - "side": "server", - "type": "int8u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ConnectMaxTimeSeconds", - "code": 3, - "mfgCode": null, - "side": "server", - "type": "int8u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "InterfaceEnabled", - "code": 4, - "mfgCode": null, - "side": "server", - "type": "boolean", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "LastNetworkingStatus", - "code": 5, - "mfgCode": null, - "side": "server", - "type": "NetworkCommissioningStatusEnum", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "LastNetworkID", - "code": 6, - "mfgCode": null, - "side": "server", - "type": "octet_string", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "LastConnectErrorValue", - "code": 7, - "mfgCode": null, - "side": "server", - "type": "int32s", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "server", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] - }, - { - "name": "Diagnostic Logs", - "code": 50, - "mfgCode": null, - "define": "DIAGNOSTIC_LOGS_CLUSTER", - "side": "server", - "enabled": 1, - "commands": [ - { - "name": "RetrieveLogsRequest", - "code": 0, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - } - ], - "attributes": [ - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "server", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - }, - { - "name": "General Diagnostics", - "code": 51, - "mfgCode": null, - "define": "GENERAL_DIAGNOSTICS_CLUSTER", - "side": "client", - "enabled": 0, - "attributes": [ - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] - }, - { - "name": "General Diagnostics", - "code": 51, - "mfgCode": null, - "define": "GENERAL_DIAGNOSTICS_CLUSTER", - "side": "server", - "enabled": 1, - "commands": [ - { - "name": "TestEventTrigger", - "code": 0, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - } - ], - "attributes": [ - { - "name": "NetworkInterfaces", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "RebootCount", - "code": 1, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "UpTime", - "code": 2, - "mfgCode": null, - "side": "server", - "type": "int64u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000000000000000", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "TotalOperationalHours", - "code": 3, - "mfgCode": null, - "side": "server", - "type": "int32u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00000000", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "BootReason", - "code": 4, - "mfgCode": null, - "side": "server", - "type": "BootReasonEnum", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ActiveHardwareFaults", - "code": 5, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ActiveRadioFaults", - "code": 6, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ActiveNetworkFaults", - "code": 7, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "TestEventTriggersEnabled", - "code": 8, - "mfgCode": null, - "side": "server", - "type": "boolean", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "false", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "server", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ], - "events": [ - { - "name": "BootReason", - "code": 3, - "mfgCode": null, - "side": "server", - "included": 1 - } - ] - }, - { - "name": "Software Diagnostics", - "code": 52, - "mfgCode": null, - "define": "SOFTWARE_DIAGNOSTICS_CLUSTER", - "side": "client", - "enabled": 0, - "commands": [ - { - "name": "ResetWatermarks", - "code": 0, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - } - ], - "attributes": [ - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] - }, - { - "name": "Software Diagnostics", - "code": 52, - "mfgCode": null, - "define": "SOFTWARE_DIAGNOSTICS_CLUSTER", - "side": "server", - "enabled": 0, - "attributes": [ - { - "name": "ThreadMetrics", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "CurrentHeapFree", - "code": 1, - "mfgCode": null, - "side": "server", - "type": "int64u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000000000000000", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "CurrentHeapUsed", - "code": 2, - "mfgCode": null, - "side": "server", - "type": "int64u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000000000000000", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "CurrentHeapHighWatermark", - "code": 3, - "mfgCode": null, - "side": "server", - "type": "int64u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000000000000000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "server", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] - }, - { - "name": "Thread Network Diagnostics", - "code": 53, - "mfgCode": null, - "define": "THREAD_NETWORK_DIAGNOSTICS_CLUSTER", - "side": "client", - "enabled": 0, - "commands": [ - { - "name": "ResetCounts", - "code": 0, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - } - ], - "attributes": [ - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] - }, - { - "name": "Thread Network Diagnostics", - "code": 53, - "mfgCode": null, - "define": "THREAD_NETWORK_DIAGNOSTICS_CLUSTER", - "side": "server", - "enabled": 0, - "attributes": [ - { - "name": "Channel", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "RoutingRole", - "code": 1, - "mfgCode": null, - "side": "server", - "type": "RoutingRoleEnum", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "NetworkName", - "code": 2, - "mfgCode": null, - "side": "server", - "type": "char_string", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "PanId", - "code": 3, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "ExtendedPanId", - "code": 4, - "mfgCode": null, - "side": "server", - "type": "int64u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000000000000000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "MeshLocalPrefix", - "code": 5, - "mfgCode": null, - "side": "server", - "type": "octet_string", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "OverrunCount", - "code": 6, - "mfgCode": null, - "side": "server", - "type": "int64u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000000000000000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "NeighborTable", - "code": 7, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "RouteTable", - "code": 8, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "PartitionId", - "code": 9, - "mfgCode": null, - "side": "server", - "type": "int32u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "Weighting", - "code": 10, - "mfgCode": null, - "side": "server", - "type": "int8u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "DataVersion", - "code": 11, - "mfgCode": null, - "side": "server", - "type": "int8u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "StableDataVersion", - "code": 12, - "mfgCode": null, - "side": "server", - "type": "int8u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "LeaderRouterId", - "code": 13, - "mfgCode": null, - "side": "server", - "type": "int8u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "DetachedRoleCount", - "code": 14, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "ChildRoleCount", - "code": 15, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "RouterRoleCount", - "code": 16, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "LeaderRoleCount", - "code": 17, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "AttachAttemptCount", - "code": 18, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "PartitionIdChangeCount", - "code": 19, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "BetterPartitionAttachAttemptCount", - "code": 20, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "ParentChangeCount", - "code": 21, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "TxTotalCount", - "code": 22, - "mfgCode": null, - "side": "server", - "type": "int32u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "TxUnicastCount", - "code": 23, - "mfgCode": null, - "side": "server", - "type": "int32u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "TxBroadcastCount", - "code": 24, - "mfgCode": null, - "side": "server", - "type": "int32u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "TxAckRequestedCount", - "code": 25, - "mfgCode": null, - "side": "server", - "type": "int32u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "TxAckedCount", - "code": 26, - "mfgCode": null, - "side": "server", - "type": "int32u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "TxNoAckRequestedCount", - "code": 27, - "mfgCode": null, - "side": "server", - "type": "int32u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "TxDataCount", - "code": 28, - "mfgCode": null, - "side": "server", - "type": "int32u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "TxDataPollCount", - "code": 29, - "mfgCode": null, - "side": "server", - "type": "int32u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "TxBeaconCount", - "code": 30, - "mfgCode": null, - "side": "server", - "type": "int32u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "TxBeaconRequestCount", - "code": 31, - "mfgCode": null, - "side": "server", - "type": "int32u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "TxOtherCount", - "code": 32, - "mfgCode": null, - "side": "server", - "type": "int32u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "TxRetryCount", - "code": 33, - "mfgCode": null, - "side": "server", - "type": "int32u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "TxDirectMaxRetryExpiryCount", - "code": 34, - "mfgCode": null, - "side": "server", - "type": "int32u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "TxIndirectMaxRetryExpiryCount", - "code": 35, - "mfgCode": null, - "side": "server", - "type": "int32u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "TxErrCcaCount", - "code": 36, - "mfgCode": null, - "side": "server", - "type": "int32u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "TxErrAbortCount", - "code": 37, - "mfgCode": null, - "side": "server", - "type": "int32u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "TxErrBusyChannelCount", - "code": 38, - "mfgCode": null, - "side": "server", - "type": "int32u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "RxTotalCount", - "code": 39, - "mfgCode": null, - "side": "server", - "type": "int32u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "RxUnicastCount", - "code": 40, - "mfgCode": null, - "side": "server", - "type": "int32u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "RxBroadcastCount", - "code": 41, - "mfgCode": null, - "side": "server", - "type": "int32u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "RxDataCount", - "code": 42, - "mfgCode": null, - "side": "server", - "type": "int32u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "RxDataPollCount", - "code": 43, - "mfgCode": null, - "side": "server", - "type": "int32u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "RxBeaconCount", - "code": 44, - "mfgCode": null, - "side": "server", - "type": "int32u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "RxBeaconRequestCount", - "code": 45, - "mfgCode": null, - "side": "server", - "type": "int32u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "RxOtherCount", - "code": 46, - "mfgCode": null, - "side": "server", - "type": "int32u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "RxAddressFilteredCount", - "code": 47, - "mfgCode": null, - "side": "server", - "type": "int32u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "RxDestAddrFilteredCount", - "code": 48, - "mfgCode": null, - "side": "server", - "type": "int32u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "RxDuplicatedCount", - "code": 49, - "mfgCode": null, - "side": "server", - "type": "int32u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "RxErrNoFrameCount", - "code": 50, - "mfgCode": null, - "side": "server", - "type": "int32u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "RxErrUnknownNeighborCount", - "code": 51, - "mfgCode": null, - "side": "server", - "type": "int32u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "RxErrInvalidSrcAddrCount", - "code": 52, - "mfgCode": null, - "side": "server", - "type": "int32u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "RxErrSecCount", - "code": 53, - "mfgCode": null, - "side": "server", - "type": "int32u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "RxErrFcsCount", - "code": 54, - "mfgCode": null, - "side": "server", - "type": "int32u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "RxErrOtherCount", - "code": 55, - "mfgCode": null, - "side": "server", - "type": "int32u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "ActiveTimestamp", - "code": 56, - "mfgCode": null, - "side": "server", - "type": "int64u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000000000000000", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "PendingTimestamp", - "code": 57, - "mfgCode": null, - "side": "server", - "type": "int64u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000000000000000", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "Delay", - "code": 58, - "mfgCode": null, - "side": "server", - "type": "int32u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "SecurityPolicy", - "code": 59, - "mfgCode": null, - "side": "server", - "type": "SecurityPolicy", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "ChannelPage0Mask", - "code": 60, - "mfgCode": null, - "side": "server", - "type": "octet_string", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "OperationalDatasetComponents", - "code": 61, - "mfgCode": null, - "side": "server", - "type": "OperationalDatasetComponents", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "ActiveNetworkFaultsList", - "code": 62, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "server", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x000F", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] - }, - { - "name": "WiFi Network Diagnostics", - "code": 54, - "mfgCode": null, - "define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER", - "side": "client", - "enabled": 0, - "commands": [ - { - "name": "ResetCounts", - "code": 0, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - } - ], - "attributes": [ - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] - }, - { - "name": "WiFi Network Diagnostics", - "code": 54, - "mfgCode": null, - "define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER", - "side": "server", - "enabled": 0, - "attributes": [ - { - "name": "BSSID", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "octet_string", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "SecurityType", - "code": 1, - "mfgCode": null, - "side": "server", - "type": "SecurityTypeEnum", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "WiFiVersion", - "code": 2, - "mfgCode": null, - "side": "server", - "type": "WiFiVersionEnum", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "ChannelNumber", - "code": 3, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "RSSI", - "code": 4, - "mfgCode": null, - "side": "server", - "type": "int8s", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "BeaconLostCount", - "code": 5, - "mfgCode": null, - "side": "server", - "type": "int32u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00000000", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "BeaconRxCount", - "code": 6, - "mfgCode": null, - "side": "server", - "type": "int32u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00000000", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "PacketMulticastRxCount", - "code": 7, - "mfgCode": null, - "side": "server", - "type": "int32u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00000000", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "PacketMulticastTxCount", - "code": 8, - "mfgCode": null, - "side": "server", - "type": "int32u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00000000", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "PacketUnicastRxCount", - "code": 9, - "mfgCode": null, - "side": "server", - "type": "int32u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00000000", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "PacketUnicastTxCount", - "code": 10, - "mfgCode": null, - "side": "server", - "type": "int32u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00000000", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "CurrentMaxRate", - "code": 11, - "mfgCode": null, - "side": "server", - "type": "int64u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000000000000000", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "OverrunCount", - "code": 12, - "mfgCode": null, - "side": "server", - "type": "int64u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000000000000000", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "server", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "3", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] - }, - { - "name": "Ethernet Network Diagnostics", - "code": 55, - "mfgCode": null, - "define": "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER", - "side": "client", - "enabled": 0, - "commands": [ - { - "name": "ResetCounts", - "code": 0, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - } - ], - "attributes": [ - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] - }, - { - "name": "Ethernet Network Diagnostics", - "code": 55, - "mfgCode": null, - "define": "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER", - "side": "server", - "enabled": 0, - "attributes": [ - { - "name": "PHYRate", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "PHYRateEnum", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "FullDuplex", - "code": 1, - "mfgCode": null, - "side": "server", - "type": "boolean", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "PacketRxCount", - "code": 2, - "mfgCode": null, - "side": "server", - "type": "int64u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000000000000000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "PacketTxCount", - "code": 3, - "mfgCode": null, - "side": "server", - "type": "int64u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000000000000000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "TxErrCount", - "code": 4, - "mfgCode": null, - "side": "server", - "type": "int64u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000000000000000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "CollisionCount", - "code": 5, - "mfgCode": null, - "side": "server", - "type": "int64u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000000000000000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "OverrunCount", - "code": 6, - "mfgCode": null, - "side": "server", - "type": "int64u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000000000000000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "CarrierDetect", - "code": 7, - "mfgCode": null, - "side": "server", - "type": "boolean", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "TimeSinceReset", - "code": 8, - "mfgCode": null, - "side": "server", - "type": "int64u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000000000000000", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "server", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "3", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] - }, - { - "name": "Switch", - "code": 59, - "mfgCode": null, - "define": "SWITCH_CLUSTER", - "side": "client", - "enabled": 0 - }, - { - "name": "Switch", - "code": 59, - "mfgCode": null, - "define": "SWITCH_CLUSTER", - "side": "server", - "enabled": 0, - "attributes": [ - { - "name": "NumberOfPositions", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "int8u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "2", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "CurrentPosition", - "code": 1, - "mfgCode": null, - "side": "server", - "type": "int8u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "server", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - }, - { - "name": "Administrator Commissioning", - "code": 60, - "mfgCode": null, - "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", - "side": "client", - "enabled": 0, - "commands": [ - { - "name": "OpenCommissioningWindow", - "code": 0, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "OpenBasicCommissioningWindow", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "RevokeCommissioning", - "code": 2, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - } - ], - "attributes": [ - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] - }, - { - "name": "Administrator Commissioning", - "code": 60, - "mfgCode": null, - "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", - "side": "server", - "enabled": 1, - "attributes": [ - { - "name": "WindowStatus", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "CommissioningWindowStatusEnum", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "AdminFabricIndex", - "code": 1, - "mfgCode": null, - "side": "server", - "type": "fabric_idx", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "AdminVendorId", - "code": 2, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "server", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] - }, - { - "name": "Operational Credentials", - "code": 62, - "mfgCode": null, - "define": "OPERATIONAL_CREDENTIALS_CLUSTER", - "side": "client", - "enabled": 0, - "commands": [ - { - "name": "AttestationRequest", - "code": 0, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "CertificateChainRequest", - "code": 2, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "CSRRequest", - "code": 4, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "AddNOC", - "code": 6, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "UpdateNOC", - "code": 7, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "UpdateFabricLabel", - "code": 9, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "RemoveFabric", - "code": 10, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "AddTrustedRootCertificate", - "code": 11, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - } - ], - "attributes": [ - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] - }, - { - "name": "Operational Credentials", - "code": 62, - "mfgCode": null, - "define": "OPERATIONAL_CREDENTIALS_CLUSTER", - "side": "server", - "enabled": 1, - "commands": [ - { - "name": "AttestationResponse", - "code": 1, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "CertificateChainResponse", - "code": 3, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "CSRResponse", - "code": 5, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "NOCResponse", - "code": 8, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - } - ], - "attributes": [ - { - "name": "NOCs", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "Fabrics", - "code": 1, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "SupportedFabrics", - "code": 2, - "mfgCode": null, - "side": "server", - "type": "int8u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "CommissionedFabrics", - "code": 3, - "mfgCode": null, - "side": "server", - "type": "int8u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "TrustedRootCertificates", - "code": 4, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "CurrentFabricIndex", - "code": 5, - "mfgCode": null, - "side": "server", - "type": "int8u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "server", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] - }, - { - "name": "Group Key Management", - "code": 63, - "mfgCode": null, - "define": "GROUP_KEY_MANAGEMENT_CLUSTER", - "side": "client", - "enabled": 0, - "commands": [ - { - "name": "KeySetWrite", - "code": 0, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "KeySetRead", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "KeySetRemove", - "code": 3, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "KeySetReadAllIndices", - "code": 4, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - } - ] - }, - { - "name": "Group Key Management", - "code": 63, - "mfgCode": null, - "define": "GROUP_KEY_MANAGEMENT_CLUSTER", - "side": "server", - "enabled": 1, - "commands": [ - { - "name": "KeySetReadResponse", - "code": 2, - "mfgCode": null, - "source": "server", - "incoming": 0, - "outgoing": 1 - }, - { - "name": "KeySetReadAllIndicesResponse", - "code": 5, - "mfgCode": null, - "source": "server", - "incoming": 0, - "outgoing": 1 - } - ], - "attributes": [ - { - "name": "GroupKeyMap", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "GroupTable", - "code": 1, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "MaxGroupsPerFabric", - "code": 2, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "MaxGroupKeysPerFabric", - "code": 3, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "server", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - }, - { - "name": "Fixed Label", - "code": 64, - "mfgCode": null, - "define": "FIXED_LABEL_CLUSTER", - "side": "client", - "enabled": 0 - }, - { - "name": "Fixed Label", - "code": 64, - "mfgCode": null, - "define": "FIXED_LABEL_CLUSTER", - "side": "server", - "enabled": 0, - "attributes": [ - { - "name": "LabelList", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "server", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - }, - { - "name": "User Label", - "code": 65, - "mfgCode": null, - "define": "USER_LABEL_CLUSTER", - "side": "client", - "enabled": 0 - }, - { - "name": "User Label", - "code": 65, - "mfgCode": null, - "define": "USER_LABEL_CLUSTER", - "side": "server", - "enabled": 0, - "attributes": [ - { - "name": "LabelList", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "server", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - } - ] - }, - { - "id": 2, - "name": "Anonymous Endpoint Type", - "deviceTypeRef": { - "code": 45, - "profileId": 259, - "label": "MA-air-purifier", - "name": "MA-air-purifier" - }, - "deviceTypes": [ - { - "code": 45, - "profileId": 259, - "label": "MA-air-purifier", - "name": "MA-air-purifier" - } - ], - "deviceVersions": [ - 1 - ], - "deviceIdentifiers": [ - 45 - ], - "deviceTypeName": "MA-air-purifier", - "deviceTypeCode": 45, - "deviceTypeProfileId": 259, - "clusters": [ - { - "name": "Identify", - "code": 3, - "mfgCode": null, - "define": "IDENTIFY_CLUSTER", - "side": "client", - "enabled": 0, - "commands": [ - { - "name": "Identify", - "code": 0, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "TriggerEffect", - "code": 64, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - } - ], - "attributes": [ - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "client", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "2", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - }, - { - "name": "Identify", - "code": 3, - "mfgCode": null, - "define": "IDENTIFY_CLUSTER", - "side": "server", - "enabled": 1, - "attributes": [ - { - "name": "IdentifyTime", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "IdentifyType", - "code": 1, - "mfgCode": null, - "side": "server", - "type": "IdentifyTypeEnum", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "GeneratedCommandList", - "code": 65528, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "AcceptedCommandList", - "code": 65529, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "EventList", - "code": 65530, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "AttributeList", - "code": 65531, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "server", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "2", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - }, - { - "name": "Groups", - "code": 4, - "mfgCode": null, - "define": "GROUPS_CLUSTER", - "side": "client", - "enabled": 0, - "commands": [ - { - "name": "AddGroup", - "code": 0, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "ViewGroup", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "GetGroupMembership", - "code": 2, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "RemoveGroup", - "code": 3, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "RemoveAllGroups", - "code": 4, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "AddGroupIfIdentifying", - "code": 5, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - } - ], - "attributes": [ - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "client", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "3", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - }, - { - "name": "Groups", - "code": 4, - "mfgCode": null, - "define": "GROUPS_CLUSTER", - "side": "server", - "enabled": 0, - "commands": [ - { - "name": "AddGroupResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 0, - "outgoing": 1 - }, - { - "name": "ViewGroupResponse", - "code": 1, - "mfgCode": null, - "source": "server", - "incoming": 0, - "outgoing": 1 - }, - { - "name": "GetGroupMembershipResponse", - "code": 2, - "mfgCode": null, - "source": "server", - "incoming": 0, - "outgoing": 1 - }, - { - "name": "RemoveGroupResponse", - "code": 3, - "mfgCode": null, - "source": "server", - "incoming": 0, - "outgoing": 1 - } - ], - "attributes": [ - { - "name": "NameSupport", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "NameSupportBitmap", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "GeneratedCommandList", - "code": 65528, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "AcceptedCommandList", - "code": 65529, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "EventList", - "code": 65530, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "AttributeList", - "code": 65531, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "server", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "3", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - }, - { - "name": "Scenes", - "code": 5, - "mfgCode": null, - "define": "SCENES_CLUSTER", - "side": "client", - "enabled": 0, - "commands": [ - { - "name": "AddScene", - "code": 0, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "ViewScene", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "RemoveScene", - "code": 2, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "RemoveAllScenes", - "code": 3, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "StoreScene", - "code": 4, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "RecallScene", - "code": 5, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "GetSceneMembership", - "code": 6, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - } - ], - "attributes": [ - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "client", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "5", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - }, - { - "name": "Scenes", - "code": 5, - "mfgCode": null, - "define": "SCENES_CLUSTER", - "side": "server", - "enabled": 0, - "commands": [ - { - "name": "AddSceneResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "ViewSceneResponse", - "code": 1, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "RemoveSceneResponse", - "code": 2, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "RemoveAllScenesResponse", - "code": 3, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "StoreSceneResponse", - "code": 4, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "GetSceneMembershipResponse", - "code": 6, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - } - ], - "attributes": [ - { - "name": "SceneCount", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "int8u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "CurrentScene", - "code": 1, - "mfgCode": null, - "side": "server", - "type": "int8u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "CurrentGroup", - "code": 2, - "mfgCode": null, - "side": "server", - "type": "group_id", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "SceneValid", - "code": 3, - "mfgCode": null, - "side": "server", - "type": "boolean", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "NameSupport", - "code": 4, - "mfgCode": null, - "side": "server", - "type": "bitmap8", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "LastConfiguredBy", - "code": 5, - "mfgCode": null, - "side": "server", - "type": "node_id", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "SceneTableSize", - "code": 6, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "RemainingCapacity", - "code": 7, - "mfgCode": null, - "side": "server", - "type": "int8u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "GeneratedCommandList", - "code": 65528, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "AcceptedCommandList", - "code": 65529, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "EventList", - "code": 65530, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "AttributeList", - "code": 65531, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "server", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "5", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - }, - { - "name": "On/Off", - "code": 6, - "mfgCode": null, - "define": "ON_OFF_CLUSTER", - "side": "client", - "enabled": 0, - "commands": [ - { - "name": "Off", - "code": 0, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "On", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "Toggle", - "code": 2, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - } - ], - "attributes": [ - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "client", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "4", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - }, - { - "name": "On/Off", - "code": 6, - "mfgCode": null, - "define": "ON_OFF_CLUSTER", - "side": "server", - "enabled": 0, - "attributes": [ - { - "name": "OnOff", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "boolean", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 0, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "GlobalSceneControl", - "code": 16384, - "mfgCode": null, - "side": "server", - "type": "boolean", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "OnTime", - "code": 16385, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "OffWaitTime", - "code": 16386, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "StartUpOnOff", - "code": 16387, - "mfgCode": null, - "side": "server", - "type": "OnOffStartUpOnOff", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "GeneratedCommandList", - "code": 65528, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "AcceptedCommandList", - "code": 65529, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "EventList", - "code": 65530, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "AttributeList", - "code": 65531, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "server", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "4", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - }, - { - "name": "Level Control", - "code": 8, - "mfgCode": null, - "define": "LEVEL_CONTROL_CLUSTER", - "side": "client", - "enabled": 0, - "commands": [ - { - "name": "MoveToLevel", - "code": 0, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "Move", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "Step", - "code": 2, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "Stop", - "code": 3, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "MoveToLevelWithOnOff", - "code": 4, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "MoveWithOnOff", - "code": 5, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "StepWithOnOff", - "code": 6, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "StopWithOnOff", - "code": 7, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - } - ], - "attributes": [ - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "client", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "5", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - }, - { - "name": "Level Control", - "code": 8, - "mfgCode": null, - "define": "LEVEL_CONTROL_CLUSTER", - "side": "server", - "enabled": 0, - "attributes": [ - { - "name": "CurrentLevel", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "int8u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "RemainingTime", - "code": 1, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "MinLevel", - "code": 2, - "mfgCode": null, - "side": "server", - "type": "int8u", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "MaxLevel", - "code": 3, - "mfgCode": null, - "side": "server", - "type": "int8u", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0xFE", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "CurrentFrequency", - "code": 4, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "MinFrequency", - "code": 5, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "MaxFrequency", - "code": 6, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "Options", - "code": 15, - "mfgCode": null, - "side": "server", - "type": "LevelControlOptions", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "OnOffTransitionTime", - "code": 16, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "OnLevel", - "code": 17, - "mfgCode": null, - "side": "server", - "type": "int8u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "OnTransitionTime", - "code": 18, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "OffTransitionTime", - "code": 19, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "DefaultMoveRate", - "code": 20, - "mfgCode": null, - "side": "server", - "type": "int8u", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "StartUpCurrentLevel", - "code": 16384, - "mfgCode": null, - "side": "server", - "type": "int8u", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "GeneratedCommandList", - "code": 65528, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "AcceptedCommandList", - "code": 65529, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "EventList", - "code": 65530, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "AttributeList", - "code": 65531, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "server", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "5", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - }, - { - "name": "Descriptor", - "code": 29, - "mfgCode": null, - "define": "DESCRIPTOR_CLUSTER", - "side": "client", - "enabled": 0, - "attributes": [ - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "client", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - }, - { - "name": "Descriptor", - "code": 29, - "mfgCode": null, - "define": "DESCRIPTOR_CLUSTER", - "side": "server", - "enabled": 1, - "attributes": [ - { - "name": "DeviceTypeList", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ServerList", - "code": 1, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClientList", - "code": 2, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "PartsList", - "code": 3, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "GeneratedCommandList", - "code": 65528, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "AcceptedCommandList", - "code": 65529, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "EventList", - "code": 65530, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "AttributeList", - "code": 65531, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "server", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - }, - { - "name": "Binding", - "code": 30, - "mfgCode": null, - "define": "BINDING_CLUSTER", - "side": "client", - "enabled": 0, - "attributes": [ - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "client", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - }, - { - "name": "Binding", - "code": 30, - "mfgCode": null, - "define": "BINDING_CLUSTER", - "side": "server", - "enabled": 0, - "attributes": [ - { - "name": "Binding", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "GeneratedCommandList", - "code": 65528, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "AcceptedCommandList", - "code": 65529, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "EventList", - "code": 65530, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "AttributeList", - "code": 65531, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "server", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - }, - { - "name": "HEPA Filter Monitoring", - "code": 113, - "mfgCode": null, - "define": "HEPA_FILTER_MONITORING_CLUSTER", - "side": "client", - "enabled": 0, - "commands": [ - { - "name": "ResetCondition", - "code": 0, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - } - ], - "attributes": [ - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "client", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - }, - { - "name": "HEPA Filter Monitoring", - "code": 113, - "mfgCode": null, - "define": "HEPA_FILTER_MONITORING_CLUSTER", - "side": "server", - "enabled": 1, - "attributes": [ - { - "name": "Condition", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "percent", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "100", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "DegradationDirection", - "code": 1, - "mfgCode": null, - "side": "server", - "type": "DegradationDirectionEnum", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ChangeIndication", - "code": 2, - "mfgCode": null, - "side": "server", - "type": "ChangeIndicationEnum", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "InPlaceIndicator", - "code": 3, - "mfgCode": null, - "side": "server", - "type": "boolean", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "LastChangedTime", - "code": 4, - "mfgCode": null, - "side": "server", - "type": "epoch_s", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ReplacementProductList", - "code": 5, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "GeneratedCommandList", - "code": 65528, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "AcceptedCommandList", - "code": 65529, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "EventList", - "code": 65530, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "AttributeList", - "code": 65531, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "server", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - }, - { - "name": "Activated Carbon Filter Monitoring", - "code": 114, - "mfgCode": null, - "define": "ACTIVATED_CARBON_FILTER_MONITORING_CLUSTER", - "side": "client", - "enabled": 0, - "commands": [ - { - "name": "ResetCondition", - "code": 0, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - } - ], - "attributes": [ - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "client", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - }, - { - "name": "Activated Carbon Filter Monitoring", - "code": 114, - "mfgCode": null, - "define": "ACTIVATED_CARBON_FILTER_MONITORING_CLUSTER", - "side": "server", - "enabled": 1, - "attributes": [ - { - "name": "Condition", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "percent", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "100", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "DegradationDirection", - "code": 1, - "mfgCode": null, - "side": "server", - "type": "DegradationDirectionEnum", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ChangeIndication", - "code": 2, - "mfgCode": null, - "side": "server", - "type": "ChangeIndicationEnum", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "InPlaceIndicator", - "code": 3, - "mfgCode": null, - "side": "server", - "type": "boolean", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "LastChangedTime", - "code": 4, - "mfgCode": null, - "side": "server", - "type": "epoch_s", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ReplacementProductList", - "code": 5, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "GeneratedCommandList", - "code": 65528, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "AcceptedCommandList", - "code": 65529, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "EventList", - "code": 65530, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "AttributeList", - "code": 65531, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "server", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - }, - { - "name": "Door Lock", - "code": 257, - "mfgCode": null, - "define": "DOOR_LOCK_CLUSTER", - "side": "client", - "enabled": 0, - "commands": [ - { - "name": "LockDoor", - "code": 0, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "UnlockDoor", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "SetUser", - "code": 26, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "GetUser", - "code": 27, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "ClearUser", - "code": 29, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "SetCredential", - "code": 34, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "ClearCredential", - "code": 38, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - } - ], - "attributes": [ - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "client", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "7", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - }, - { - "name": "Door Lock", - "code": 257, - "mfgCode": null, - "define": "DOOR_LOCK_CLUSTER", - "side": "server", - "enabled": 0, - "commands": [ - { - "name": "GetUserResponse", - "code": 28, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "SetCredentialResponse", - "code": 35, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - } - ], - "attributes": [ - { - "name": "LockState", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "DlLockState", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "LockType", - "code": 1, - "mfgCode": null, - "side": "server", - "type": "DlLockType", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ActuatorEnabled", - "code": 2, - "mfgCode": null, - "side": "server", - "type": "boolean", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "DoorState", - "code": 3, - "mfgCode": null, - "side": "server", - "type": "DoorStateEnum", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "DoorOpenEvents", - "code": 4, - "mfgCode": null, - "side": "server", - "type": "int32u", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "DoorClosedEvents", - "code": 5, - "mfgCode": null, - "side": "server", - "type": "int32u", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "OpenPeriod", - "code": 6, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "NumberOfTotalUsersSupported", - "code": 17, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "NumberOfPINUsersSupported", - "code": 18, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "NumberOfRFIDUsersSupported", - "code": 19, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "NumberOfWeekDaySchedulesSupportedPerUser", - "code": 20, - "mfgCode": null, - "side": "server", - "type": "int8u", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "NumberOfYearDaySchedulesSupportedPerUser", - "code": 21, - "mfgCode": null, - "side": "server", - "type": "int8u", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "NumberOfHolidaySchedulesSupported", - "code": 22, - "mfgCode": null, - "side": "server", - "type": "int8u", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "MaxPINCodeLength", - "code": 23, - "mfgCode": null, - "side": "server", - "type": "int8u", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "MinPINCodeLength", - "code": 24, - "mfgCode": null, - "side": "server", - "type": "int8u", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "MaxRFIDCodeLength", - "code": 25, - "mfgCode": null, - "side": "server", - "type": "int8u", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "MinRFIDCodeLength", - "code": 26, - "mfgCode": null, - "side": "server", - "type": "int8u", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "CredentialRulesSupport", - "code": 27, - "mfgCode": null, - "side": "server", - "type": "DlCredentialRuleMask", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "NumberOfCredentialsSupportedPerUser", - "code": 28, - "mfgCode": null, - "side": "server", - "type": "int8u", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "Language", - "code": 33, - "mfgCode": null, - "side": "server", - "type": "char_string", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "LEDSettings", - "code": 34, - "mfgCode": null, - "side": "server", - "type": "int8u", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "AutoRelockTime", - "code": 35, - "mfgCode": null, - "side": "server", - "type": "int32u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "SoundVolume", - "code": 36, - "mfgCode": null, - "side": "server", - "type": "int8u", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "OperatingMode", - "code": 37, - "mfgCode": null, - "side": "server", - "type": "OperatingModeEnum", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "SupportedOperatingModes", - "code": 38, - "mfgCode": null, - "side": "server", - "type": "DlSupportedOperatingModes", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0xFFF6", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "DefaultConfigurationRegister", - "code": 39, - "mfgCode": null, - "side": "server", - "type": "DlDefaultConfigurationRegister", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "EnableLocalProgramming", - "code": 40, - "mfgCode": null, - "side": "server", - "type": "boolean", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "EnableOneTouchLocking", - "code": 41, - "mfgCode": null, - "side": "server", - "type": "boolean", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "EnableInsideStatusLED", - "code": 42, - "mfgCode": null, - "side": "server", - "type": "boolean", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "EnablePrivacyModeButton", - "code": 43, - "mfgCode": null, - "side": "server", - "type": "boolean", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "LocalProgrammingFeatures", - "code": 44, - "mfgCode": null, - "side": "server", - "type": "DlLocalProgrammingFeatures", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "WrongCodeEntryLimit", - "code": 48, - "mfgCode": null, - "side": "server", - "type": "int8u", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "UserCodeTemporaryDisableTime", - "code": 49, - "mfgCode": null, - "side": "server", - "type": "int8u", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "SendPINOverTheAir", - "code": 50, - "mfgCode": null, - "side": "server", - "type": "boolean", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "RequirePINforRemoteOperation", - "code": 51, - "mfgCode": null, - "side": "server", - "type": "boolean", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ExpiringUserTimeout", - "code": 53, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, + "name": "Descriptor", + "code": 29, + "mfgCode": null, + "define": "DESCRIPTOR_CLUSTER", + "side": "server", + "enabled": 1, + "attributes": [ { - "name": "GeneratedCommandList", - "code": 65528, + "name": "DeviceTypeList", + "code": 0, "mfgCode": null, "side": "server", "type": "array", @@ -8566,8 +85,8 @@ "reportableChange": 0 }, { - "name": "AcceptedCommandList", - "code": 65529, + "name": "ServerList", + "code": 1, "mfgCode": null, "side": "server", "type": "array", @@ -8582,8 +101,8 @@ "reportableChange": 0 }, { - "name": "EventList", - "code": 65530, + "name": "ClientList", + "code": 2, "mfgCode": null, "side": "server", "type": "array", @@ -8598,8 +117,8 @@ "reportableChange": 0 }, { - "name": "AttributeList", - "code": 65531, + "name": "PartsList", + "code": 3, "mfgCode": null, "side": "server", "type": "array", @@ -8623,7 +142,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x0001", + "defaultValue": "0", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -8636,10 +155,10 @@ "side": "server", "type": "int16u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "7", + "defaultValue": "1", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -8648,81 +167,37 @@ ] }, { - "name": "Barrier Control", - "code": 259, + "name": "Access Control", + "code": 31, "mfgCode": null, - "define": "BARRIER_CONTROL_CLUSTER", - "side": "client", - "enabled": 0, - "commands": [ - { - "name": "BarrierControlGoToPercent", - "code": 0, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "BarrierControlStop", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - } - ], + "define": "ACCESS_CONTROL_CLUSTER", + "side": "server", + "enabled": 1, "attributes": [ { - "name": "FeatureMap", - "code": 65532, + "name": "ACL", + "code": 0, "mfgCode": null, - "side": "client", - "type": "bitmap32", + "side": "server", + "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0", + "defaultValue": "", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - }, - { - "name": "Barrier Control", - "code": 259, - "mfgCode": null, - "define": "BARRIER_CONTROL_CLUSTER", - "side": "server", - "enabled": 0, - "attributes": [ - { - "name": "barrier moving state", + "name": "Extension", "code": 1, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -8732,13 +207,13 @@ "reportableChange": 0 }, { - "name": "barrier safety status", + "name": "SubjectsPerAccessControlEntry", "code": 2, "mfgCode": null, "side": "server", - "type": "bitmap16", + "type": "int16u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -8748,13 +223,13 @@ "reportableChange": 0 }, { - "name": "barrier capabilities", + "name": "TargetsPerAccessControlEntry", "code": 3, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "int16u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -8764,470 +239,545 @@ "reportableChange": 0 }, { - "name": "barrier open events", + "name": "AccessControlEntriesPerFabric", "code": 4, "mfgCode": null, "side": "server", "type": "int16u", - "included": 0, - "storageOption": "RAM", + "included": 1, + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0x0000", + "defaultValue": "", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "barrier close events", - "code": 5, + "name": "AttributeList", + "code": 65531, "mfgCode": null, "side": "server", - "type": "int16u", - "included": 0, - "storageOption": "RAM", + "type": "array", + "included": 1, + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0x0000", + "defaultValue": "", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "barrier command open events", - "code": 6, + "name": "FeatureMap", + "code": 65532, "mfgCode": null, "side": "server", - "type": "int16u", - "included": 0, + "type": "bitmap32", + "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x0000", + "defaultValue": "0", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "barrier command close events", - "code": 7, + "name": "ClusterRevision", + "code": 65533, "mfgCode": null, "side": "server", "type": "int16u", - "included": 0, - "storageOption": "RAM", + "included": 1, + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0x0000", + "defaultValue": "1", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 - }, + } + ], + "events": [ { - "name": "barrier open period", - "code": 8, + "name": "AccessControlEntryChanged", + "code": 0, "mfgCode": null, "side": "server", - "type": "int16u", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 + "included": 1 }, { - "name": "barrier close period", - "code": 9, + "name": "AccessControlExtensionChanged", + "code": 1, + "mfgCode": null, + "side": "server", + "included": 1 + } + ] + }, + { + "name": "Basic Information", + "code": 40, + "mfgCode": null, + "define": "BASIC_INFORMATION_CLUSTER", + "side": "server", + "enabled": 1, + "attributes": [ + { + "name": "DataModelRevision", + "code": 0, "mfgCode": null, "side": "server", "type": "int16u", - "included": 0, - "storageOption": "RAM", - "singleton": 0, + "included": 1, + "storageOption": "External", + "singleton": 1, "bounded": 0, - "defaultValue": "", + "defaultValue": "10", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 }, { - "name": "barrier position", - "code": 10, + "name": "VendorName", + "code": 1, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "char_string", "included": 1, - "storageOption": "RAM", - "singleton": 0, + "storageOption": "External", + "singleton": 1, "bounded": 0, "defaultValue": "", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 }, { - "name": "GeneratedCommandList", - "code": 65528, + "name": "VendorID", + "code": 2, "mfgCode": null, "side": "server", - "type": "array", + "type": "vendor_id", "included": 1, "storageOption": "External", - "singleton": 0, + "singleton": 1, "bounded": 0, "defaultValue": "", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 }, { - "name": "AcceptedCommandList", - "code": 65529, + "name": "ProductName", + "code": 3, "mfgCode": null, "side": "server", - "type": "array", + "type": "char_string", "included": 1, "storageOption": "External", - "singleton": 0, + "singleton": 1, "bounded": 0, "defaultValue": "", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 }, { - "name": "EventList", - "code": 65530, + "name": "ProductID", + "code": 4, "mfgCode": null, "side": "server", - "type": "array", + "type": "int16u", "included": 1, "storageOption": "External", - "singleton": 0, + "singleton": 1, "bounded": 0, "defaultValue": "", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 }, { - "name": "AttributeList", - "code": 65531, + "name": "NodeLabel", + "code": 5, "mfgCode": null, "side": "server", - "type": "array", + "type": "char_string", "included": 1, - "storageOption": "External", - "singleton": 0, + "storageOption": "NVM", + "singleton": 1, "bounded": 0, "defaultValue": "", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 }, { - "name": "FeatureMap", - "code": 65532, + "name": "Location", + "code": 6, "mfgCode": null, "side": "server", - "type": "bitmap32", + "type": "char_string", "included": 1, - "storageOption": "RAM", - "singleton": 0, + "storageOption": "External", + "singleton": 1, "bounded": 0, - "defaultValue": "0", + "defaultValue": "XX", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 }, { - "name": "ClusterRevision", - "code": 65533, + "name": "HardwareVersion", + "code": 7, "mfgCode": null, "side": "server", "type": "int16u", "included": 1, - "storageOption": "RAM", - "singleton": 0, + "storageOption": "External", + "singleton": 1, "bounded": 0, - "defaultValue": "1", + "defaultValue": "0", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 - } - ] - }, - { - "name": "Fan Control", - "code": 514, - "mfgCode": null, - "define": "FAN_CONTROL_CLUSTER", - "side": "client", - "enabled": 0, - "commands": [ - { - "name": "Step", - "code": 0, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - } - ], - "attributes": [ + }, { - "name": "FeatureMap", - "code": 65532, + "name": "HardwareVersionString", + "code": 8, "mfgCode": null, - "side": "client", - "type": "bitmap32", + "side": "server", + "type": "char_string", "included": 1, - "storageOption": "RAM", - "singleton": 0, + "storageOption": "External", + "singleton": 1, "bounded": 0, - "defaultValue": "0", + "defaultValue": "", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 }, { - "name": "ClusterRevision", - "code": 65533, + "name": "SoftwareVersion", + "code": 9, "mfgCode": null, - "side": "client", - "type": "int16u", + "side": "server", + "type": "int32u", "included": 1, - "storageOption": "RAM", - "singleton": 0, + "storageOption": "External", + "singleton": 1, "bounded": 0, - "defaultValue": "1", + "defaultValue": "0", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 - } - ] - }, - { - "name": "Fan Control", - "code": 514, - "mfgCode": null, - "define": "FAN_CONTROL_CLUSTER", - "side": "server", - "enabled": 1, - "attributes": [ + }, { - "name": "FanMode", - "code": 0, + "name": "SoftwareVersionString", + "code": 10, "mfgCode": null, "side": "server", - "type": "FanModeEnum", + "type": "char_string", "included": 1, - "storageOption": "RAM", - "singleton": 0, + "storageOption": "External", + "singleton": 1, "bounded": 0, - "defaultValue": "0", + "defaultValue": "", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 }, { - "name": "FanModeSequence", - "code": 1, + "name": "ManufacturingDate", + "code": 11, "mfgCode": null, "side": "server", - "type": "FanModeSequenceEnum", + "type": "char_string", "included": 1, - "storageOption": "RAM", - "singleton": 0, + "storageOption": "External", + "singleton": 1, "bounded": 0, - "defaultValue": "2", + "defaultValue": "20210614123456ZZ", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 }, { - "name": "PercentSetting", - "code": 2, + "name": "PartNumber", + "code": 12, "mfgCode": null, "side": "server", - "type": "Percent", + "type": "char_string", "included": 1, - "storageOption": "RAM", - "singleton": 0, + "storageOption": "External", + "singleton": 1, "bounded": 0, - "defaultValue": "0", + "defaultValue": "", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 }, { - "name": "PercentCurrent", - "code": 3, + "name": "ProductURL", + "code": 13, "mfgCode": null, "side": "server", - "type": "Percent", + "type": "long_char_string", "included": 1, - "storageOption": "RAM", - "singleton": 0, + "storageOption": "External", + "singleton": 1, "bounded": 0, - "defaultValue": "0", + "defaultValue": "", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 }, { - "name": "SpeedMax", - "code": 4, + "name": "ProductLabel", + "code": 14, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "char_string", "included": 1, - "storageOption": "RAM", - "singleton": 0, + "storageOption": "External", + "singleton": 1, "bounded": 0, - "defaultValue": "10", + "defaultValue": "", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 }, { - "name": "SpeedSetting", - "code": 5, + "name": "SerialNumber", + "code": 15, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "char_string", "included": 1, - "storageOption": "RAM", - "singleton": 0, + "storageOption": "External", + "singleton": 1, "bounded": 0, - "defaultValue": "0", + "defaultValue": "", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 }, { - "name": "SpeedCurrent", - "code": 6, + "name": "LocalConfigDisabled", + "code": 16, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "boolean", "included": 1, - "storageOption": "RAM", - "singleton": 0, + "storageOption": "NVM", + "singleton": 1, "bounded": 0, "defaultValue": "0", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 }, { - "name": "RockSupport", - "code": 7, + "name": "UniqueID", + "code": 18, "mfgCode": null, "side": "server", - "type": "RockBitmap", + "type": "char_string", "included": 1, - "storageOption": "RAM", - "singleton": 0, + "storageOption": "External", + "singleton": 1, "bounded": 0, - "defaultValue": "0x01", + "defaultValue": "", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 }, { - "name": "RockSetting", - "code": 8, + "name": "CapabilityMinima", + "code": 19, "mfgCode": null, "side": "server", - "type": "RockBitmap", + "type": "CapabilityMinimaStruct", "included": 1, - "storageOption": "RAM", - "singleton": 0, + "storageOption": "External", + "singleton": 1, "bounded": 0, - "defaultValue": "0x00", + "defaultValue": "", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "WindSupport", - "code": 9, + "name": "FeatureMap", + "code": 65532, "mfgCode": null, "side": "server", - "type": "WindBitmap", + "type": "bitmap32", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x03", + "defaultValue": "0", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "WindSetting", - "code": 10, + "name": "ClusterRevision", + "code": 65533, "mfgCode": null, "side": "server", - "type": "WindBitmap", + "type": "int16u", "included": 1, "storageOption": "RAM", - "singleton": 0, + "singleton": 1, "bounded": 0, - "defaultValue": "0x00", + "defaultValue": "1", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 + } + ], + "events": [ + { + "name": "StartUp", + "code": 0, + "mfgCode": null, + "side": "server", + "included": 1 }, { - "name": "AirflowDirection", - "code": 11, + "name": "ShutDown", + "code": 1, "mfgCode": null, "side": "server", - "type": "AirflowDirectionEnum", + "included": 1 + }, + { + "name": "Leave", + "code": 2, + "mfgCode": null, + "side": "server", + "included": 1 + } + ] + }, + { + "name": "OTA Software Update Provider", + "code": 41, + "mfgCode": null, + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", + "side": "client", + "enabled": 1, + "commands": [ + { + "name": "QueryImage", + "code": 0, + "mfgCode": null, + "source": "client", + "isIncoming": 0, + "isEnabled": 1 + }, + { + "name": "QueryImageResponse", + "code": 1, + "mfgCode": null, + "source": "server", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "ApplyUpdateRequest", + "code": 2, + "mfgCode": null, + "source": "client", + "isIncoming": 0, + "isEnabled": 1 + }, + { + "name": "ApplyUpdateResponse", + "code": 3, + "mfgCode": null, + "source": "server", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "NotifyUpdateApplied", + "code": 4, + "mfgCode": null, + "source": "client", + "isIncoming": 0, + "isEnabled": 1 + } + ], + "attributes": [ + { + "name": "ClusterRevision", + "code": 65533, + "mfgCode": null, + "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0", + "defaultValue": "0x0001", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 - }, + } + ] + }, + { + "name": "OTA Software Update Requestor", + "code": 42, + "mfgCode": null, + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", + "side": "server", + "enabled": 1, + "commands": [ { - "name": "GeneratedCommandList", - "code": 65528, + "name": "AnnounceOTAProvider", + "code": 0, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + } + ], + "attributes": [ + { + "name": "DefaultOTAProviders", + "code": 0, "mfgCode": null, "side": "server", "type": "array", @@ -9241,49 +791,49 @@ "maxInterval": 65534, "reportableChange": 0 }, - { - "name": "AcceptedCommandList", - "code": 65529, + { + "name": "UpdatePossible", + "code": 1, "mfgCode": null, "side": "server", - "type": "array", + "type": "boolean", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "1", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 }, { - "name": "EventList", - "code": 65530, + "name": "UpdateState", + "code": 2, "mfgCode": null, "side": "server", - "type": "array", + "type": "UpdateStateEnum", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "0", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 }, { - "name": "AttributeList", - "code": 65531, + "name": "UpdateStateProgress", + "code": 3, "mfgCode": null, "side": "server", - "type": "array", + "type": "int8u", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "0", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -9299,7 +849,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "63", + "defaultValue": "0", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -9315,245 +865,194 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "4", + "defaultValue": "1", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 } - ] - }, - { - "name": "Color Control", - "code": 768, - "mfgCode": null, - "define": "COLOR_CONTROL_CLUSTER", - "side": "client", - "enabled": 0, - "commands": [ + ], + "events": [ { - "name": "MoveToHue", + "name": "StateTransition", "code": 0, "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 + "side": "server", + "included": 1 }, { - "name": "MoveHue", + "name": "VersionApplied", "code": 1, "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 + "side": "server", + "included": 1 }, { - "name": "StepHue", + "name": "DownloadError", "code": 2, "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "MoveToSaturation", - "code": 3, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "MoveSaturation", - "code": 4, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "StepSaturation", - "code": 5, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "MoveToHueAndSaturation", - "code": 6, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "MoveToColor", - "code": 7, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, + "side": "server", + "included": 1 + } + ] + }, + { + "name": "General Commissioning", + "code": 48, + "mfgCode": null, + "define": "GENERAL_COMMISSIONING_CLUSTER", + "side": "server", + "enabled": 1, + "commands": [ { - "name": "MoveColor", - "code": 8, + "name": "ArmFailSafe", + "code": 0, "mfgCode": null, "source": "client", - "incoming": 1, - "outgoing": 1 + "isIncoming": 1, + "isEnabled": 1 }, { - "name": "StepColor", - "code": 9, + "name": "ArmFailSafeResponse", + "code": 1, "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 + "source": "server", + "isIncoming": 0, + "isEnabled": 1 }, { - "name": "MoveToColorTemperature", - "code": 10, + "name": "SetRegulatoryConfig", + "code": 2, "mfgCode": null, "source": "client", - "incoming": 1, - "outgoing": 1 + "isIncoming": 1, + "isEnabled": 1 }, { - "name": "StopMoveStep", - "code": 71, + "name": "SetRegulatoryConfigResponse", + "code": 3, "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 + "source": "server", + "isIncoming": 0, + "isEnabled": 1 }, { - "name": "MoveColorTemperature", - "code": 75, + "name": "CommissioningComplete", + "code": 4, "mfgCode": null, "source": "client", - "incoming": 1, - "outgoing": 1 + "isIncoming": 1, + "isEnabled": 1 }, { - "name": "StepColorTemperature", - "code": 76, + "name": "CommissioningCompleteResponse", + "code": 5, "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ { - "name": "FeatureMap", - "code": 65532, + "name": "Breadcrumb", + "code": 0, "mfgCode": null, - "side": "client", - "type": "bitmap32", + "side": "server", + "type": "int64u", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0", + "defaultValue": "0x0000000000000000", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 }, { - "name": "ClusterRevision", - "code": 65533, + "name": "BasicCommissioningInfo", + "code": 1, "mfgCode": null, - "side": "client", - "type": "int16u", + "side": "server", + "type": "BasicCommissioningInfo", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "6", + "defaultValue": "", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 - } - ] - }, - { - "name": "Color Control", - "code": 768, - "mfgCode": null, - "define": "COLOR_CONTROL_CLUSTER", - "side": "server", - "enabled": 0, - "attributes": [ + }, { - "name": "CurrentHue", - "code": 0, + "name": "RegulatoryConfig", + "code": 2, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "RegulatoryLocationTypeEnum", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0x00", - "reportable": 0, + "defaultValue": "0", + "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "CurrentSaturation", - "code": 1, + "name": "LocationCapability", + "code": 3, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "RegulatoryLocationTypeEnum", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0x00", - "reportable": 0, + "defaultValue": "0", + "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "RemainingTime", - "code": 2, + "name": "SupportsConcurrentConnection", + "code": 4, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "boolean", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0x0000", + "defaultValue": "1", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "CurrentX", - "code": 3, + "name": "FeatureMap", + "code": 65532, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "bitmap32", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x616B", - "reportable": 0, + "defaultValue": "0", + "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "CurrentY", - "code": 4, + "name": "ClusterRevision", + "code": 65533, "mfgCode": null, "side": "server", "type": "int16u", @@ -9561,95 +1060,131 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x607D", - "reportable": 0, - "minInterval": 1, - "maxInterval": 65534, + "defaultValue": "0x0001", + "reportable": 1, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 + } + ] + }, + { + "name": "Network Commissioning", + "code": 49, + "mfgCode": null, + "define": "NETWORK_COMMISSIONING_CLUSTER", + "side": "server", + "enabled": 1, + "commands": [ + { + "name": "ScanNetworks", + "code": 0, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "ScanNetworksResponse", + "code": 1, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 + }, + { + "name": "AddOrUpdateWiFiNetwork", + "code": 2, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "AddOrUpdateThreadNetwork", + "code": 3, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "RemoveNetwork", + "code": 4, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 }, { - "name": "DriftCompensation", + "name": "NetworkConfigResponse", "code": 5, "mfgCode": null, - "side": "server", - "type": "enum8", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 + "source": "server", + "isIncoming": 0, + "isEnabled": 1 }, { - "name": "CompensationText", + "name": "ConnectNetwork", "code": 6, "mfgCode": null, - "side": "server", - "type": "char_string", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 + "source": "client", + "isIncoming": 1, + "isEnabled": 1 }, { - "name": "ColorTemperatureMireds", + "name": "ConnectNetworkResponse", "code": 7, "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00FA", - "reportable": 0, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 + "source": "server", + "isIncoming": 0, + "isEnabled": 1 }, { - "name": "ColorMode", + "name": "ReorderNetwork", "code": 8, "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + } + ], + "attributes": [ + { + "name": "MaxNetworks", + "code": 0, + "mfgCode": null, "side": "server", - "type": "enum8", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x01", + "defaultValue": "", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "Options", - "code": 15, + "name": "Networks", + "code": 1, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0x00", + "defaultValue": "", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "NumberOfPrimaries", - "code": 16, + "name": "ScanMaxTimeSeconds", + "code": 2, "mfgCode": null, "side": "server", "type": "int8u", @@ -9664,11 +1199,11 @@ "reportableChange": 0 }, { - "name": "Primary1X", - "code": 17, + "name": "ConnectMaxTimeSeconds", + "code": 3, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -9680,11 +1215,11 @@ "reportableChange": 0 }, { - "name": "Primary1Y", - "code": 18, + "name": "InterfaceEnabled", + "code": 4, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "boolean", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -9696,11 +1231,11 @@ "reportableChange": 0 }, { - "name": "Primary1Intensity", - "code": 19, + "name": "LastNetworkingStatus", + "code": 5, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "NetworkCommissioningStatusEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -9712,11 +1247,11 @@ "reportableChange": 0 }, { - "name": "Primary2X", - "code": 21, + "name": "LastNetworkID", + "code": 6, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "octet_string", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -9728,11 +1263,11 @@ "reportableChange": 0 }, { - "name": "Primary2Y", - "code": 22, + "name": "LastConnectErrorValue", + "code": 7, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "int32s", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -9744,24 +1279,24 @@ "reportableChange": 0 }, { - "name": "Primary2Intensity", - "code": 23, + "name": "FeatureMap", + "code": 65532, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "bitmap32", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "1", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "Primary3X", - "code": 25, + "name": "ClusterRevision", + "code": 65533, "mfgCode": null, "side": "server", "type": "int16u", @@ -9769,116 +1304,156 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "0x0001", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 - }, + } + ] + }, + { + "name": "Diagnostic Logs", + "code": 50, + "mfgCode": null, + "define": "DIAGNOSTIC_LOGS_CLUSTER", + "side": "server", + "enabled": 1, + "commands": [ + { + "name": "RetrieveLogsRequest", + "code": 0, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + } + ], + "attributes": [ { - "name": "Primary3Y", - "code": 26, + "name": "FeatureMap", + "code": 65532, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "bitmap32", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "0", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "Primary3Intensity", - "code": 27, + "name": "ClusterRevision", + "code": 65533, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "1", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 - }, + } + ] + }, + { + "name": "General Diagnostics", + "code": 51, + "mfgCode": null, + "define": "GENERAL_DIAGNOSTICS_CLUSTER", + "side": "server", + "enabled": 1, + "commands": [ + { + "name": "TestEventTrigger", + "code": 0, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + } + ], + "attributes": [ { - "name": "Primary4X", - "code": 32, + "name": "NetworkInterfaces", + "code": 0, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 }, { - "name": "Primary4Y", - "code": 33, + "name": "RebootCount", + "code": 1, "mfgCode": null, "side": "server", "type": "int16u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "0x0000", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 }, { - "name": "Primary4Intensity", - "code": 34, + "name": "UpTime", + "code": 2, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int64u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "0x0000000000000000", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "Primary5X", - "code": 36, + "name": "TotalOperationalHours", + "code": 3, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "0x00000000", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "Primary5Y", - "code": 37, + "name": "BootReason", + "code": 4, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "BootReasonEnum", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -9888,13 +1463,13 @@ "reportableChange": 0 }, { - "name": "Primary5Intensity", - "code": 38, + "name": "ActiveHardwareFaults", + "code": 5, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -9904,13 +1479,13 @@ "reportableChange": 0 }, { - "name": "Primary6X", - "code": 40, + "name": "ActiveRadioFaults", + "code": 6, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -9920,13 +1495,13 @@ "reportableChange": 0 }, { - "name": "Primary6Y", - "code": 41, + "name": "ActiveNetworkFaults", + "code": 7, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -9936,40 +1511,40 @@ "reportableChange": 0 }, { - "name": "Primary6Intensity", - "code": 42, + "name": "TestEventTriggersEnabled", + "code": 8, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "boolean", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "false", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "WhitePointX", - "code": 48, + "name": "FeatureMap", + "code": 65532, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "bitmap32", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "0", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "WhitePointY", - "code": 49, + "name": "ClusterRevision", + "code": 65533, "mfgCode": null, "side": "server", "type": "int16u", @@ -9977,79 +1552,124 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "0x0001", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 + } + ], + "events": [ + { + "name": "BootReason", + "code": 3, + "mfgCode": null, + "side": "server", + "included": 1 + } + ] + }, + { + "name": "Administrator Commissioning", + "code": 60, + "mfgCode": null, + "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", + "side": "server", + "enabled": 1, + "commands": [ + { + "name": "OpenCommissioningWindow", + "code": 0, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "OpenBasicCommissioningWindow", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 }, { - "name": "ColorPointRX", - "code": 50, + "name": "RevokeCommissioning", + "code": 2, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + } + ], + "attributes": [ + { + "name": "WindowStatus", + "code": 0, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "CommissioningWindowStatusEnum", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "0", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "ColorPointRY", - "code": 51, + "name": "AdminFabricIndex", + "code": 1, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "fabric_idx", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "1", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "ColorPointRIntensity", - "code": 52, + "name": "AdminVendorId", + "code": 2, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "vendor_id", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "0", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "ColorPointGX", - "code": 54, + "name": "FeatureMap", + "code": 65532, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "bitmap32", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "0", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "ColorPointGY", - "code": 55, + "name": "ClusterRevision", + "code": 65533, "mfgCode": null, "side": "server", "type": "int16u", @@ -10057,207 +1677,235 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "0x0001", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 + } + ] + }, + { + "name": "Operational Credentials", + "code": 62, + "mfgCode": null, + "define": "OPERATIONAL_CREDENTIALS_CLUSTER", + "side": "server", + "enabled": 1, + "commands": [ + { + "name": "AttestationRequest", + "code": 0, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 }, { - "name": "ColorPointGIntensity", - "code": 56, + "name": "AttestationResponse", + "code": 1, "mfgCode": null, - "side": "server", - "type": "int8u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 + "source": "server", + "isIncoming": 0, + "isEnabled": 1 }, { - "name": "ColorPointBX", - "code": 58, + "name": "CertificateChainRequest", + "code": 2, "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 + "source": "client", + "isIncoming": 1, + "isEnabled": 1 }, { - "name": "ColorPointBY", - "code": 59, + "name": "CertificateChainResponse", + "code": 3, "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 + "source": "server", + "isIncoming": 0, + "isEnabled": 1 }, { - "name": "ColorPointBIntensity", - "code": 60, + "name": "CSRRequest", + "code": 4, "mfgCode": null, - "side": "server", - "type": "int8u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 + "source": "client", + "isIncoming": 1, + "isEnabled": 1 }, { - "name": "EnhancedCurrentHue", - "code": 16384, + "name": "CSRResponse", + "code": 5, "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 + "source": "server", + "isIncoming": 0, + "isEnabled": 1 + }, + { + "name": "AddNOC", + "code": 6, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "UpdateNOC", + "code": 7, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "NOCResponse", + "code": 8, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 + }, + { + "name": "UpdateFabricLabel", + "code": 9, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "RemoveFabric", + "code": 10, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 }, { - "name": "EnhancedColorMode", - "code": 16385, + "name": "AddTrustedRootCertificate", + "code": 11, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + } + ], + "attributes": [ + { + "name": "NOCs", + "code": 0, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0x01", + "defaultValue": "", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "ColorLoopActive", - "code": 16386, + "name": "Fabrics", + "code": 1, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0x00", + "defaultValue": "", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 }, { - "name": "ColorLoopDirection", - "code": 16387, + "name": "SupportedFabrics", + "code": 2, "mfgCode": null, "side": "server", "type": "int8u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0x00", + "defaultValue": "", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 }, { - "name": "ColorLoopTime", - "code": 16388, + "name": "CommissionedFabrics", + "code": 3, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "int8u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0x0019", + "defaultValue": "", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 }, { - "name": "ColorLoopStartEnhancedHue", - "code": 16389, + "name": "TrustedRootCertificates", + "code": 4, "mfgCode": null, "side": "server", - "type": "int16u", - "included": 0, - "storageOption": "RAM", + "type": "array", + "included": 1, + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0x2300", + "defaultValue": "", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 }, { - "name": "ColorLoopStoredEnhancedHue", - "code": 16390, + "name": "CurrentFabricIndex", + "code": 5, "mfgCode": null, "side": "server", - "type": "int16u", - "included": 0, - "storageOption": "RAM", + "type": "int8u", + "included": 1, + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0x0000", + "defaultValue": "", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "ColorCapabilities", - "code": 16394, + "name": "FeatureMap", + "code": 65532, "mfgCode": null, "side": "server", - "type": "bitmap16", + "type": "bitmap32", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x0000", + "defaultValue": "0", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "ColorTempPhysicalMinMireds", - "code": 16395, + "name": "ClusterRevision", + "code": 65533, "mfgCode": null, "side": "server", "type": "int16u", @@ -10265,63 +1913,75 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x0000", + "defaultValue": "0x0001", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 + } + ] + }, + { + "name": "Group Key Management", + "code": 63, + "mfgCode": null, + "define": "GROUP_KEY_MANAGEMENT_CLUSTER", + "side": "server", + "enabled": 1, + "commands": [ + { + "name": "KeySetWrite", + "code": 0, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "KeySetRead", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 }, { - "name": "ColorTempPhysicalMaxMireds", - "code": 16396, + "name": "KeySetReadResponse", + "code": 2, "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0xFEFF", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 + "source": "server", + "isIncoming": 0, + "isEnabled": 1 }, { - "name": "CoupleColorTempToLevelMinMireds", - "code": 16397, + "name": "KeySetRemove", + "code": 3, "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 + "source": "client", + "isIncoming": 1, + "isEnabled": 1 }, { - "name": "StartUpColorTemperatureMireds", - "code": 16400, + "name": "KeySetReadAllIndices", + "code": 4, "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 + "source": "client", + "isIncoming": 1, + "isEnabled": 1 }, { - "name": "GeneratedCommandList", - "code": 65528, + "name": "KeySetReadAllIndicesResponse", + "code": 5, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 + } + ], + "attributes": [ + { + "name": "GroupKeyMap", + "code": 0, "mfgCode": null, "side": "server", "type": "array", @@ -10336,8 +1996,8 @@ "reportableChange": 0 }, { - "name": "AcceptedCommandList", - "code": 65529, + "name": "GroupTable", + "code": 1, "mfgCode": null, "side": "server", "type": "array", @@ -10352,11 +2012,11 @@ "reportableChange": 0 }, { - "name": "EventList", - "code": 65530, + "name": "MaxGroupsPerFabric", + "code": 2, "mfgCode": null, "side": "server", - "type": "array", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -10368,11 +2028,11 @@ "reportableChange": 0 }, { - "name": "AttributeList", - "code": 65531, + "name": "MaxGroupKeysPerFabric", + "code": 3, "mfgCode": null, "side": "server", - "type": "array", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -10390,7 +2050,7 @@ "side": "server", "type": "bitmap32", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0", @@ -10406,126 +2066,99 @@ "side": "server", "type": "int16u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "6", + "defaultValue": "1", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 } ] - }, + } + ] + }, + { + "id": 2, + "name": "Anonymous Endpoint Type", + "deviceTypeRef": { + "code": 45, + "profileId": 259, + "label": "MA-air-purifier", + "name": "MA-air-purifier" + }, + "deviceTypes": [ { - "name": "Temperature Measurement", - "code": 1026, + "code": 45, + "profileId": 259, + "label": "MA-air-purifier", + "name": "MA-air-purifier" + } + ], + "deviceVersions": [ + 1 + ], + "deviceIdentifiers": [ + 45 + ], + "deviceTypeName": "MA-air-purifier", + "deviceTypeCode": 45, + "deviceTypeProfileId": 259, + "clusters": [ + { + "name": "Identify", + "code": 3, "mfgCode": null, - "define": "TEMPERATURE_MEASUREMENT_CLUSTER", - "side": "client", - "enabled": 0, - "attributes": [ + "define": "IDENTIFY_CLUSTER", + "side": "server", + "enabled": 1, + "commands": [ { - "name": "FeatureMap", - "code": 65532, + "name": "Identify", + "code": 0, "mfgCode": null, - "side": "client", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 + "source": "client", + "isIncoming": 1, + "isEnabled": 1 }, { - "name": "ClusterRevision", - "code": 65533, + "name": "TriggerEffect", + "code": 64, "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 + "source": "client", + "isIncoming": 1, + "isEnabled": 1 } - ] - }, - { - "name": "Temperature Measurement", - "code": 1026, - "mfgCode": null, - "define": "TEMPERATURE_MEASUREMENT_CLUSTER", - "side": "server", - "enabled": 0, + ], "attributes": [ { - "name": "MeasuredValue", + "name": "IdentifyTime", "code": 0, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "0x0", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "MinMeasuredValue", + "name": "IdentifyType", "code": 1, "mfgCode": null, "side": "server", - "type": "int16s", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x8000", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "MaxMeasuredValue", - "code": 2, - "mfgCode": null, - "side": "server", - "type": "int16s", + "type": "IdentifyTypeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x8000", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "Tolerance", - "code": 3, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", + "defaultValue": "0x0", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -10541,7 +2174,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "0", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -10557,7 +2190,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "0", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -10589,7 +2222,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "0", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -10621,7 +2254,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "2", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -10630,21 +2263,53 @@ ] }, { - "name": "Occupancy Sensing", - "code": 1030, + "name": "Descriptor", + "code": 29, "mfgCode": null, - "define": "OCCUPANCY_SENSING_CLUSTER", - "side": "client", - "enabled": 0, + "define": "DESCRIPTOR_CLUSTER", + "side": "server", + "enabled": 1, "attributes": [ { - "name": "FeatureMap", - "code": 65532, + "name": "DeviceTypeList", + "code": 0, "mfgCode": null, - "side": "client", - "type": "bitmap32", - "included": 0, - "storageOption": "RAM", + "side": "server", + "type": "array", + "included": 1, + "storageOption": "External", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "ServerList", + "code": 1, + "mfgCode": null, + "side": "server", + "type": "array", + "included": 1, + "storageOption": "External", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "ClientList", + "code": 2, + "mfgCode": null, + "side": "server", + "type": "array", + "included": 1, + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0", @@ -10654,39 +2319,29 @@ "reportableChange": 0 }, { - "name": "ClusterRevision", - "code": 65533, + "name": "PartsList", + "code": 3, "mfgCode": null, - "side": "client", - "type": "int16u", + "side": "server", + "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "2", + "defaultValue": "0", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 - } - ] - }, - { - "name": "Occupancy Sensing", - "code": 1030, - "mfgCode": null, - "define": "OCCUPANCY_SENSING_CLUSTER", - "side": "server", - "enabled": 0, - "attributes": [ + }, { - "name": "Occupancy", - "code": 0, + "name": "GeneratedCommandList", + "code": 65528, "mfgCode": null, "side": "server", - "type": "OccupancyBitmap", + "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0", @@ -10696,13 +2351,13 @@ "reportableChange": 0 }, { - "name": "OccupancySensorType", - "code": 1, + "name": "AcceptedCommandList", + "code": 65529, "mfgCode": null, "side": "server", - "type": "OccupancySensorTypeEnum", + "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0", @@ -10712,160 +2367,180 @@ "reportableChange": 0 }, { - "name": "OccupancySensorTypeBitmap", - "code": 2, + "name": "EventList", + "code": 65530, "mfgCode": null, "side": "server", - "type": "OccupancySensorTypeBitmap", + "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0x1", + "defaultValue": "", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "PIROccupiedToUnoccupiedDelay", - "code": 16, + "name": "AttributeList", + "code": 65531, "mfgCode": null, "side": "server", - "type": "int16u", - "included": 0, - "storageOption": "RAM", + "type": "array", + "included": 1, + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0x0000", + "defaultValue": "0", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "PIRUnoccupiedToOccupiedDelay", - "code": 17, + "name": "FeatureMap", + "code": 65532, "mfgCode": null, "side": "server", - "type": "int16u", - "included": 0, + "type": "bitmap32", + "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x0000", + "defaultValue": "0", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "PIRUnoccupiedToOccupiedThreshold", - "code": 18, + "name": "ClusterRevision", + "code": 65533, "mfgCode": null, "side": "server", - "type": "int8u", - "included": 0, - "storageOption": "RAM", + "type": "int16u", + "included": 1, + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0x01", + "defaultValue": "1", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 - }, + } + ] + }, + { + "name": "HEPA Filter Monitoring", + "code": 113, + "mfgCode": null, + "define": "HEPA_FILTER_MONITORING_CLUSTER", + "side": "server", + "enabled": 1, + "commands": [ + { + "name": "ResetCondition", + "code": 0, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + } + ], + "attributes": [ { - "name": "UltrasonicOccupiedToUnoccupiedDelay", - "code": 32, + "name": "Condition", + "code": 0, "mfgCode": null, "side": "server", - "type": "int16u", - "included": 0, - "storageOption": "RAM", + "type": "percent", + "included": 1, + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0x0000", + "defaultValue": "100", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "UltrasonicUnoccupiedToOccupiedDelay", - "code": 33, + "name": "DegradationDirection", + "code": 1, "mfgCode": null, "side": "server", - "type": "int16u", - "included": 0, - "storageOption": "RAM", + "type": "DegradationDirectionEnum", + "included": 1, + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0x0000", + "defaultValue": "1", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "UltrasonicUnoccupiedToOccupiedThreshold", - "code": 34, + "name": "ChangeIndication", + "code": 2, "mfgCode": null, "side": "server", - "type": "int8u", - "included": 0, - "storageOption": "RAM", + "type": "ChangeIndicationEnum", + "included": 1, + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0x01", + "defaultValue": "0", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "PhysicalContactOccupiedToUnoccupiedDelay", - "code": 48, + "name": "InPlaceIndicator", + "code": 3, "mfgCode": null, "side": "server", - "type": "int16u", - "included": 0, - "storageOption": "RAM", + "type": "boolean", + "included": 1, + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0x0000", + "defaultValue": "1", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "PhysicalContactUnoccupiedToOccupiedDelay", - "code": 49, + "name": "LastChangedTime", + "code": 4, "mfgCode": null, "side": "server", - "type": "int16u", - "included": 0, - "storageOption": "RAM", + "type": "epoch_s", + "included": 1, + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0x0000", + "defaultValue": "", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "PhysicalContactUnoccupiedToOccupiedThreshold", - "code": 50, + "name": "ReplacementProductList", + "code": 5, "mfgCode": null, "side": "server", - "type": "int8u", - "included": 0, - "storageOption": "RAM", + "type": "array", + "included": 1, + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0x01", + "defaultValue": "", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -10881,7 +2556,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0", + "defaultValue": "", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -10897,7 +2572,23 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0", + "defaultValue": "", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "EventList", + "code": 65530, + "mfgCode": null, + "side": "server", + "type": "array", + "included": 1, + "storageOption": "External", + "singleton": 0, + "bounded": 0, + "defaultValue": "", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -10913,7 +2604,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0", + "defaultValue": "", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -10926,7 +2617,7 @@ "side": "server", "type": "bitmap32", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0", @@ -10945,130 +2636,123 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "2", + "defaultValue": "1", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 } ] - } - ] - }, - { - "id": 3, - "name": "Anonymous Endpoint Type", - "deviceTypeRef": { - "code": 44, - "profileId": 259, - "label": "MA-air-quality-sensor", - "name": "MA-air-quality-sensor" - }, - "deviceTypes": [ - { - "code": 44, - "profileId": 259, - "label": "MA-air-quality-sensor", - "name": "MA-air-quality-sensor" - } - ], - "deviceVersions": [ - 1 - ], - "deviceIdentifiers": [ - 44 - ], - "deviceTypeName": "MA-air-quality-sensor", - "deviceTypeCode": 44, - "deviceTypeProfileId": 259, - "clusters": [ + }, { - "name": "Identify", - "code": 3, + "name": "Activated Carbon Filter Monitoring", + "code": 114, "mfgCode": null, - "define": "IDENTIFY_CLUSTER", - "side": "client", - "enabled": 0, + "define": "ACTIVATED_CARBON_FILTER_MONITORING_CLUSTER", + "side": "server", + "enabled": 1, "commands": [ { - "name": "Identify", + "name": "ResetCondition", "code": 0, "mfgCode": null, "source": "client", - "incoming": 1, - "outgoing": 0 + "isIncoming": 1, + "isEnabled": 1 } ], "attributes": [ { - "name": "FeatureMap", - "code": 65532, + "name": "Condition", + "code": 0, "mfgCode": null, - "side": "client", - "type": "bitmap32", + "side": "server", + "type": "percent", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0", + "defaultValue": "100", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "ClusterRevision", - "code": 65533, + "name": "DegradationDirection", + "code": 1, + "mfgCode": null, + "side": "server", + "type": "DegradationDirectionEnum", + "included": 1, + "storageOption": "External", + "singleton": 0, + "bounded": 0, + "defaultValue": "1", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "ChangeIndication", + "code": 2, + "mfgCode": null, + "side": "server", + "type": "ChangeIndicationEnum", + "included": 1, + "storageOption": "External", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "InPlaceIndicator", + "code": 3, "mfgCode": null, - "side": "client", - "type": "int16u", + "side": "server", + "type": "boolean", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "4", + "defaultValue": "1", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 - } - ] - }, - { - "name": "Identify", - "code": 3, - "mfgCode": null, - "define": "IDENTIFY_CLUSTER", - "side": "server", - "enabled": 1, - "attributes": [ + }, { - "name": "IdentifyTime", - "code": 0, + "name": "LastChangedTime", + "code": 4, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "epoch_s", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0x0", + "defaultValue": "", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "IdentifyType", - "code": 1, + "name": "ReplacementProductList", + "code": 5, "mfgCode": null, "side": "server", - "type": "IdentifyTypeEnum", + "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0x00", + "defaultValue": "", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -11145,7 +2829,7 @@ "side": "server", "type": "bitmap32", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0", @@ -11164,7 +2848,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "4", + "defaultValue": "1", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -11173,19 +2857,30 @@ ] }, { - "name": "Descriptor", - "code": 29, + "name": "Fan Control", + "code": 514, "mfgCode": null, - "define": "DESCRIPTOR_CLUSTER", - "side": "client", - "enabled": 0, + "define": "FAN_CONTROL_CLUSTER", + "side": "server", + "enabled": 1, + "apiMaturity": "provisional", + "commands": [ + { + "name": "Step", + "code": 0, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + } + ], "attributes": [ { - "name": "FeatureMap", - "code": 65532, + "name": "FanMode", + "code": 0, "mfgCode": null, - "side": "client", - "type": "bitmap32", + "side": "server", + "type": "FanModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -11197,146 +2892,184 @@ "reportableChange": 0 }, { - "name": "ClusterRevision", - "code": 65533, + "name": "FanModeSequence", + "code": 1, "mfgCode": null, - "side": "client", - "type": "int16u", + "side": "server", + "type": "FanModeSequenceEnum", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "2", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 - } - ] - }, - { - "name": "Descriptor", - "code": 29, - "mfgCode": null, - "define": "DESCRIPTOR_CLUSTER", - "side": "server", - "enabled": 1, - "attributes": [ + }, { - "name": "DeviceTypeList", - "code": 0, + "name": "PercentSetting", + "code": 2, "mfgCode": null, "side": "server", - "type": "array", + "type": "percent", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "0", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "ServerList", - "code": 1, + "name": "PercentCurrent", + "code": 3, "mfgCode": null, "side": "server", - "type": "array", + "type": "percent", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "0", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "ClientList", - "code": 2, + "name": "SpeedMax", + "code": 4, "mfgCode": null, "side": "server", - "type": "array", + "type": "int8u", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "10", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "PartsList", - "code": 3, + "name": "SpeedSetting", + "code": 5, "mfgCode": null, "side": "server", - "type": "array", + "type": "int8u", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "0", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "TagList", - "code": 4, + "name": "SpeedCurrent", + "code": 6, "mfgCode": null, "side": "server", - "type": "array", - "included": 0, - "storageOption": "External", + "type": "int8u", + "included": 1, + "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "0", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "GeneratedCommandList", - "code": 65528, + "name": "RockSupport", + "code": 7, "mfgCode": null, "side": "server", - "type": "array", + "type": "RockBitmap", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "0x01", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "AcceptedCommandList", - "code": 65529, + "name": "RockSetting", + "code": 8, "mfgCode": null, "side": "server", - "type": "array", + "type": "RockBitmap", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "0x00", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "EventList", - "code": 65530, + "name": "WindSupport", + "code": 9, + "mfgCode": null, + "side": "server", + "type": "WindBitmap", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x03", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "WindSetting", + "code": 10, + "mfgCode": null, + "side": "server", + "type": "WindBitmap", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x00", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "AirflowDirection", + "code": 11, + "mfgCode": null, + "side": "server", + "type": "AirflowDirectionEnum", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "GeneratedCommandList", + "code": 65528, "mfgCode": null, "side": "server", "type": "array", @@ -11351,8 +3084,8 @@ "reportableChange": 0 }, { - "name": "AttributeList", - "code": 65531, + "name": "AcceptedCommandList", + "code": 65529, "mfgCode": null, "side": "server", "type": "array", @@ -11367,58 +3100,48 @@ "reportableChange": 0 }, { - "name": "FeatureMap", - "code": 65532, + "name": "EventList", + "code": 65530, "mfgCode": null, "side": "server", - "type": "bitmap32", + "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0", + "defaultValue": "", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "ClusterRevision", - "code": 65533, + "name": "AttributeList", + "code": 65531, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 - } - ] - }, - { - "name": "Air Quality", - "code": 91, - "mfgCode": null, - "define": "AIR_QUALITY_CLUSTER", - "side": "client", - "enabled": 0, - "attributes": [ + }, { "name": "FeatureMap", "code": 65532, "mfgCode": null, - "side": "client", + "side": "server", "type": "bitmap32", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0", + "defaultValue": "63", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -11428,39 +3151,94 @@ "name": "ClusterRevision", "code": 65533, "mfgCode": null, - "side": "client", + "side": "server", "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "4", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 } ] - }, + } + ] + }, + { + "id": 3, + "name": "Anonymous Endpoint Type", + "deviceTypeRef": { + "code": 44, + "profileId": 259, + "label": "MA-air-quality-sensor", + "name": "MA-air-quality-sensor" + }, + "deviceTypes": [ { - "name": "Air Quality", - "code": 91, + "code": 44, + "profileId": 259, + "label": "MA-air-quality-sensor", + "name": "MA-air-quality-sensor" + } + ], + "deviceVersions": [ + 1 + ], + "deviceIdentifiers": [ + 44 + ], + "deviceTypeName": "MA-air-quality-sensor", + "deviceTypeCode": 44, + "deviceTypeProfileId": 259, + "clusters": [ + { + "name": "Identify", + "code": 3, "mfgCode": null, - "define": "AIR_QUALITY_CLUSTER", + "define": "IDENTIFY_CLUSTER", "side": "server", "enabled": 1, + "commands": [ + { + "name": "Identify", + "code": 0, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + } + ], "attributes": [ { - "name": "AirQuality", + "name": "IdentifyTime", "code": 0, "mfgCode": null, "side": "server", - "type": "AirQualityEnum", + "type": "int16u", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0", + "defaultValue": "0x0", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "IdentifyType", + "code": 1, + "mfgCode": null, + "side": "server", + "type": "IdentifyTypeEnum", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x00", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -11556,49 +3334,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - }, - { - "name": "Temperature Measurement", - "code": 1026, - "mfgCode": null, - "define": "TEMPERATURE_MEASUREMENT_CLUSTER", - "side": "client", - "enabled": 0, - "attributes": [ - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "client", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", + "defaultValue": "4", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -11607,21 +3343,21 @@ ] }, { - "name": "Temperature Measurement", - "code": 1026, + "name": "Descriptor", + "code": 29, "mfgCode": null, - "define": "TEMPERATURE_MEASUREMENT_CLUSTER", + "define": "DESCRIPTOR_CLUSTER", "side": "server", - "enabled": 0, + "enabled": 1, "attributes": [ { - "name": "MeasuredValue", + "name": "DeviceTypeList", "code": 0, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -11631,48 +3367,48 @@ "reportableChange": 0 }, { - "name": "MinMeasuredValue", + "name": "ServerList", "code": 1, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0x8000", + "defaultValue": "", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "MaxMeasuredValue", + "name": "ClientList", "code": 2, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0x8000", + "defaultValue": "", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "Tolerance", + "name": "PartsList", "code": 3, "mfgCode": null, "side": "server", - "type": "int16u", - "included": 0, - "storageOption": "RAM", + "type": "array", + "included": 1, + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0", + "defaultValue": "", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -11765,7 +3501,7 @@ "side": "server", "type": "int16u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "1", @@ -11777,114 +3513,24 @@ ] }, { - "name": "Relative Humidity Measurement", - "code": 1029, - "mfgCode": null, - "define": "RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER", - "side": "client", - "enabled": 0, - "attributes": [ - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "client", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "3", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - }, - { - "name": "Relative Humidity Measurement", - "code": 1029, + "name": "Air Quality", + "code": 91, "mfgCode": null, - "define": "RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER", + "define": "AIR_QUALITY_CLUSTER", "side": "server", - "enabled": 0, + "enabled": 1, "attributes": [ { - "name": "MeasuredValue", + "name": "AirQuality", "code": 0, "mfgCode": null, "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "MinMeasuredValue", - "code": 1, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "MaxMeasuredValue", - "code": 2, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "Tolerance", - "code": 3, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 0, - "storageOption": "RAM", + "type": "AirQualityEnum", + "included": 1, + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "0", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -11961,7 +3607,7 @@ "side": "server", "type": "bitmap32", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0", @@ -11980,49 +3626,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "3", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - }, - { - "name": "Carbon Monoxide Concentration Measurement", - "code": 1036, - "mfgCode": null, - "define": "CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER", - "side": "client", - "enabled": 0, - "attributes": [ - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "client", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "3", + "defaultValue": "1", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -12285,7 +3889,7 @@ "side": "server", "type": "bitmap32", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0", @@ -12312,48 +3916,6 @@ } ] }, - { - "name": "Carbon Dioxide Concentration Measurement", - "code": 1037, - "mfgCode": null, - "define": "CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER", - "side": "client", - "enabled": 0, - "attributes": [ - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "client", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - }, { "name": "Carbon Dioxide Concentration Measurement", "code": 1037, @@ -12609,7 +4171,7 @@ "side": "server", "type": "bitmap32", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0", @@ -12636,48 +4198,6 @@ } ] }, - { - "name": "Nitrogen Dioxide Concentration Measurement", - "code": 1043, - "mfgCode": null, - "define": "NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER", - "side": "client", - "enabled": 0, - "attributes": [ - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "client", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "3", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - }, { "name": "Nitrogen Dioxide Concentration Measurement", "code": 1043, @@ -12933,7 +4453,7 @@ "side": "server", "type": "bitmap32", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0", @@ -12960,48 +4480,6 @@ } ] }, - { - "name": "Ozone Concentration Measurement", - "code": 1045, - "mfgCode": null, - "define": "OZONE_CONCENTRATION_MEASUREMENT_CLUSTER", - "side": "client", - "enabled": 0, - "attributes": [ - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "client", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "3", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - }, { "name": "Ozone Concentration Measurement", "code": 1045, @@ -13257,7 +4735,7 @@ "side": "server", "type": "bitmap32", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0", @@ -13284,48 +4762,6 @@ } ] }, - { - "name": "PM2.5 Concentration Measurement", - "code": 1066, - "mfgCode": null, - "define": "PM2_5_CONCENTRATION_MEASUREMENT_CLUSTER", - "side": "client", - "enabled": 0, - "attributes": [ - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "client", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "3", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - }, { "name": "PM2.5 Concentration Measurement", "code": 1066, @@ -13558,72 +4994,30 @@ "maxInterval": 65534, "reportableChange": 0 }, - { - "name": "AttributeList", - "code": 65531, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "server", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, + { + "name": "AttributeList", + "code": 65531, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "3", + "defaultValue": "", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 - } - ] - }, - { - "name": "Formaldehyde Concentration Measurement", - "code": 1067, - "mfgCode": null, - "define": "FORMALDEHYDE_CONCENTRATION_MEASUREMENT_CLUSTER", - "side": "client", - "enabled": 0, - "attributes": [ + }, { "name": "FeatureMap", "code": 65532, "mfgCode": null, - "side": "client", + "side": "server", "type": "bitmap32", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0", @@ -13636,7 +5030,7 @@ "name": "ClusterRevision", "code": 65533, "mfgCode": null, - "side": "client", + "side": "server", "type": "int16u", "included": 1, "storageOption": "RAM", @@ -13905,7 +5299,7 @@ "side": "server", "type": "bitmap32", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0", @@ -13932,48 +5326,6 @@ } ] }, - { - "name": "PM1 Concentration Measurement", - "code": 1068, - "mfgCode": null, - "define": "PM1_CONCENTRATION_MEASUREMENT_CLUSTER", - "side": "client", - "enabled": 0, - "attributes": [ - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "client", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "3", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - }, { "name": "PM1 Concentration Measurement", "code": 1068, @@ -14229,7 +5581,7 @@ "side": "server", "type": "bitmap32", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0", @@ -14256,48 +5608,6 @@ } ] }, - { - "name": "PM10 Concentration Measurement", - "code": 1069, - "mfgCode": null, - "define": "PM10_CONCENTRATION_MEASUREMENT_CLUSTER", - "side": "client", - "enabled": 0, - "attributes": [ - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "client", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "3", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - }, { "name": "PM10 Concentration Measurement", "code": 1069, @@ -14553,7 +5863,7 @@ "side": "server", "type": "bitmap32", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0", @@ -14580,48 +5890,6 @@ } ] }, - { - "name": "Total Volatile Organic Compounds Concentration Measurement", - "code": 1070, - "mfgCode": null, - "define": "TVOC_CONCENTRATION_MEASUREMENT_CLUSTER", - "side": "client", - "enabled": 0, - "attributes": [ - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "client", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "3", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - }, { "name": "Total Volatile Organic Compounds Concentration Measurement", "code": 1070, @@ -14877,7 +6145,7 @@ "side": "server", "type": "bitmap32", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0", @@ -14904,48 +6172,6 @@ } ] }, - { - "name": "Radon Concentration Measurement", - "code": 1071, - "mfgCode": null, - "define": "RADON_CONCENTRATION_MEASUREMENT_CLUSTER", - "side": "client", - "enabled": 0, - "attributes": [ - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "client", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "3", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - }, { "name": "Radon Concentration Measurement", "code": 1071, @@ -15201,7 +6427,7 @@ "side": "server", "type": "bitmap32", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0", @@ -15256,67 +6482,7 @@ "deviceTypeName": "MA-tempsensor", "deviceTypeCode": 770, "deviceTypeProfileId": 259, - "clusters": [ - { - "name": "Identify", - "code": 3, - "mfgCode": null, - "define": "IDENTIFY_CLUSTER", - "side": "client", - "enabled": 0, - "commands": [ - { - "name": "Identify", - "code": 0, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "TriggerEffect", - "code": 64, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - } - ], - "attributes": [ - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "client", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "4", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - }, + "clusters": [ { "name": "Identify", "code": 3, @@ -15324,6 +6490,24 @@ "define": "IDENTIFY_CLUSTER", "side": "server", "enabled": 1, + "commands": [ + { + "name": "Identify", + "code": 0, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TriggerEffect", + "code": 64, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + } + ], "attributes": [ { "name": "IdentifyTime", @@ -15455,48 +6639,6 @@ } ] }, - { - "name": "Descriptor", - "code": 29, - "mfgCode": null, - "define": "DESCRIPTOR_CLUSTER", - "side": "client", - "enabled": 0, - "attributes": [ - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "client", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - }, { "name": "Descriptor", "code": 29, @@ -15569,22 +6711,6 @@ "maxInterval": 65534, "reportableChange": 0 }, - { - "name": "TagList", - "code": 4, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 0, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, { "name": "GeneratedCommandList", "code": 65528, @@ -15672,49 +6798,7 @@ "side": "server", "type": "int16u", "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - }, - { - "name": "Temperature Measurement", - "code": 1026, - "mfgCode": null, - "define": "TEMPERATURE_MEASUREMENT_CLUSTER", - "side": "client", - "enabled": 0, - "attributes": [ - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "client", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "1", @@ -15929,68 +7013,26 @@ "code": 3, "mfgCode": null, "define": "IDENTIFY_CLUSTER", - "side": "client", - "enabled": 0, + "side": "server", + "enabled": 1, "commands": [ { "name": "Identify", "code": 0, "mfgCode": null, "source": "client", - "incoming": 1, - "outgoing": 0 + "isIncoming": 1, + "isEnabled": 1 }, { "name": "TriggerEffect", "code": 64, "mfgCode": null, "source": "client", - "incoming": 1, - "outgoing": 0 + "isIncoming": 1, + "isEnabled": 1 } ], - "attributes": [ - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "client", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "4", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - }, - { - "name": "Identify", - "code": 3, - "mfgCode": null, - "define": "IDENTIFY_CLUSTER", - "side": "server", - "enabled": 1, "attributes": [ { "name": "IdentifyTime", @@ -16122,48 +7164,6 @@ } ] }, - { - "name": "Descriptor", - "code": 29, - "mfgCode": null, - "define": "DESCRIPTOR_CLUSTER", - "side": "client", - "enabled": 0, - "attributes": [ - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "client", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - }, { "name": "Descriptor", "code": 29, @@ -16236,22 +7236,6 @@ "maxInterval": 65534, "reportableChange": 0 }, - { - "name": "TagList", - "code": 4, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 0, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, { "name": "GeneratedCommandList", "code": 65528, @@ -16339,7 +7323,7 @@ "side": "server", "type": "int16u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "1", @@ -16350,48 +7334,6 @@ } ] }, - { - "name": "Relative Humidity Measurement", - "code": 1029, - "mfgCode": null, - "define": "RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER", - "side": "client", - "enabled": 0, - "attributes": [ - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "client", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "3", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - }, { "name": "Relative Humidity Measurement", "code": 1029, diff --git a/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter b/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter index 757daa911b73e7..fd0ebb160daf13 100644 --- a/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter +++ b/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter @@ -702,7 +702,7 @@ server cluster GeneralDiagnostics = 51 { /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ server cluster SoftwareDiagnostics = 52 { bitmap Feature : bitmap32 { - kWaterMarks = 0x1; + kWatermarks = 0x1; } struct ThreadMetricsStruct { @@ -730,7 +730,7 @@ server cluster SoftwareDiagnostics = 52 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetWatermarks(): DefaultSuccess = 0; + command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0; } /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */ diff --git a/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.zap b/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.zap index 7c7cffd2dc133c..13bfc7a3777a90 100644 --- a/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.zap +++ b/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.zap @@ -3243,7 +3243,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -5845,5 +5845,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file 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 80bf6f02a78423..817358feb53ac2 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 @@ -1675,7 +1675,7 @@ server cluster GeneralDiagnostics = 51 { /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ server cluster SoftwareDiagnostics = 52 { bitmap Feature : bitmap32 { - kWaterMarks = 0x1; + kWatermarks = 0x1; } struct ThreadMetricsStruct { @@ -1703,7 +1703,7 @@ server cluster SoftwareDiagnostics = 52 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetWatermarks(): DefaultSuccess = 0; + command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0; } /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */ diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap index cd217d22fa0e14..24e0df516f1b12 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap @@ -17,12 +17,6 @@ } ], "package": [ - { - "pathRelativity": "relativeToZap", - "path": "../../../src/app/zap-templates/app-templates.json", - "type": "gen-templates-json", - "version": "chip-v1" - }, { "pathRelativity": "relativeToZap", "path": "../../../src/app/zap-templates/zcl/zcl-with-test-extensions.json", @@ -30,6 +24,12 @@ "category": "matter", "version": 1, "description": "Matter SDK ZCL data with some extensions" + }, + { + "pathRelativity": "relativeToZap", + "path": "../../../src/app/zap-templates/app-templates.json", + "type": "gen-templates-json", + "version": "chip-v1" } ], "endpointTypes": [ @@ -5074,7 +5074,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter index 29030db6eee1e0..e03e2821ee0223 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 @@ -1494,7 +1494,7 @@ server cluster GeneralDiagnostics = 51 { /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ server cluster SoftwareDiagnostics = 52 { bitmap Feature : bitmap32 { - kWaterMarks = 0x1; + kWatermarks = 0x1; } struct ThreadMetricsStruct { diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap index 0a8b5882f67122..b5931df6f9ca27 100644 --- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap +++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap @@ -3254,7 +3254,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -8655,7 +8655,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "char_string", + "type": "long_char_string", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter index 2e5edabc01249d..f0d2924b7cae14 100644 --- a/examples/bridge-app/bridge-common/bridge-app.matter +++ b/examples/bridge-app/bridge-common/bridge-app.matter @@ -1012,7 +1012,7 @@ server cluster GeneralDiagnostics = 51 { /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ server cluster SoftwareDiagnostics = 52 { bitmap Feature : bitmap32 { - kWaterMarks = 0x1; + kWatermarks = 0x1; } struct ThreadMetricsStruct { diff --git a/examples/bridge-app/bridge-common/bridge-app.zap b/examples/bridge-app/bridge-common/bridge-app.zap index d8b6aeaca7e77d..a317c4f078917e 100644 --- a/examples/bridge-app/bridge-common/bridge-app.zap +++ b/examples/bridge-app/bridge-common/bridge-app.zap @@ -3740,7 +3740,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -5705,5 +5705,6 @@ "endpointId": 2, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter index 08cf480a0dc8a8..b33eb9192a593d 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter @@ -884,7 +884,7 @@ server cluster GeneralDiagnostics = 51 { /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ server cluster SoftwareDiagnostics = 52 { bitmap Feature : bitmap32 { - kWaterMarks = 0x1; + kWatermarks = 0x1; } struct ThreadMetricsStruct { @@ -912,7 +912,7 @@ server cluster SoftwareDiagnostics = 52 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetWatermarks(): DefaultSuccess = 0; + command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0; } /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */ diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap index caf961082c8e9d..25ac5369207196 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap @@ -3215,7 +3215,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -4779,5 +4779,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.zap b/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.zap index c3e4c0d11135c4..972a203fbb2822 100644 --- a/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.zap +++ b/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.zap @@ -1433,7 +1433,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -7828,5 +7828,6 @@ "endpointId": 5, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter b/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter index f0586b4412dc61..0ad1f526250985 100644 --- a/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter +++ b/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter @@ -794,7 +794,7 @@ server cluster GeneralDiagnostics = 51 { /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ server cluster SoftwareDiagnostics = 52 { bitmap Feature : bitmap32 { - kWaterMarks = 0x1; + kWatermarks = 0x1; } struct ThreadMetricsStruct { @@ -822,7 +822,7 @@ server cluster SoftwareDiagnostics = 52 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetWatermarks(): DefaultSuccess = 0; + command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0; } /** Commands to trigger a Node to allow a new Administrator to commission it. */ diff --git a/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.zap b/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.zap index 4c056edb8a36bc..9bcbe3d733ef4d 100644 --- a/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.zap +++ b/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.zap @@ -1920,7 +1920,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -6062,5 +6062,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter index c948b0ebad4741..145397f3d450bc 100644 --- a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter +++ b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter @@ -799,7 +799,7 @@ server cluster GeneralDiagnostics = 51 { /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ server cluster SoftwareDiagnostics = 52 { bitmap Feature : bitmap32 { - kWaterMarks = 0x1; + kWatermarks = 0x1; } struct ThreadMetricsStruct { @@ -827,7 +827,7 @@ server cluster SoftwareDiagnostics = 52 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetWatermarks(): DefaultSuccess = 0; + command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0; } /** Commands to trigger a Node to allow a new Administrator to commission it. */ diff --git a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap index 2bf771f7b338d7..5f7070767c1420 100644 --- a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap +++ b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap @@ -1920,7 +1920,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter index 201d637db8d550..f34d41305c3231 100644 --- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter +++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter @@ -976,7 +976,7 @@ server cluster GeneralDiagnostics = 51 { /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ server cluster SoftwareDiagnostics = 52 { bitmap Feature : bitmap32 { - kWaterMarks = 0x1; + kWatermarks = 0x1; } struct ThreadMetricsStruct { @@ -1004,7 +1004,7 @@ server cluster SoftwareDiagnostics = 52 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetWatermarks(): DefaultSuccess = 0; + command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0; } /** Commands to trigger a Node to allow a new Administrator to commission it. */ diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap index c5f588ab7e04e2..54a5668ca54ea3 100644 --- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap +++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap @@ -1756,7 +1756,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -3902,5 +3902,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter index 1294ec299c7bef..156d51e9f4b2b3 100644 --- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter +++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter @@ -882,7 +882,7 @@ server cluster GeneralDiagnostics = 51 { /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ server cluster SoftwareDiagnostics = 52 { bitmap Feature : bitmap32 { - kWaterMarks = 0x1; + kWatermarks = 0x1; } struct ThreadMetricsStruct { @@ -910,7 +910,7 @@ server cluster SoftwareDiagnostics = 52 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetWatermarks(): DefaultSuccess = 0; + command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0; } /** Commands to trigger a Node to allow a new Administrator to commission it. */ diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap index 876fc1f78b4813..57d85478f48039 100644 --- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap +++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap @@ -1920,7 +1920,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -3084,5 +3084,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter index 89b71e5d0e3dc9..ad17ae87333b23 100644 --- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter @@ -1032,7 +1032,7 @@ server cluster GeneralDiagnostics = 51 { /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ server cluster SoftwareDiagnostics = 52 { bitmap Feature : bitmap32 { - kWaterMarks = 0x1; + kWatermarks = 0x1; } struct ThreadMetricsStruct { @@ -1060,7 +1060,7 @@ server cluster SoftwareDiagnostics = 52 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetWatermarks(): DefaultSuccess = 0; + command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0; } /** Commands to trigger a Node to allow a new Administrator to commission it. */ diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap index 84f05af85b53d1..b5d2ed8cfb1508 100644 --- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap +++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap @@ -1952,7 +1952,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -3516,5 +3516,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_dishwasher_cc105034fe.zap b/examples/chef/devices/rootnode_dishwasher_cc105034fe.zap index 7c0c25378d92b7..e50c640463cb6d 100644 --- a/examples/chef/devices/rootnode_dishwasher_cc105034fe.zap +++ b/examples/chef/devices/rootnode_dishwasher_cc105034fe.zap @@ -2399,7 +2399,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -3517,5 +3517,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter index 8fb1a6298bfeb9..da9ab180420a87 100644 --- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter +++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter @@ -882,7 +882,7 @@ server cluster GeneralDiagnostics = 51 { /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ server cluster SoftwareDiagnostics = 52 { bitmap Feature : bitmap32 { - kWaterMarks = 0x1; + kWatermarks = 0x1; } struct ThreadMetricsStruct { @@ -910,7 +910,7 @@ server cluster SoftwareDiagnostics = 52 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetWatermarks(): DefaultSuccess = 0; + command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0; } /** Commands to trigger a Node to allow a new Administrator to commission it. */ diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap index b7674880696e4f..6e55ee26b2f95c 100644 --- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap +++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap @@ -1920,7 +1920,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -3413,5 +3413,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter index 632c70a5f1bf48..c14fdc8d6a6865 100644 --- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter +++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter @@ -1032,7 +1032,7 @@ server cluster GeneralDiagnostics = 51 { /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ server cluster SoftwareDiagnostics = 52 { bitmap Feature : bitmap32 { - kWaterMarks = 0x1; + kWatermarks = 0x1; } struct ThreadMetricsStruct { @@ -1060,7 +1060,7 @@ server cluster SoftwareDiagnostics = 52 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetWatermarks(): DefaultSuccess = 0; + command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0; } /** Commands to trigger a Node to allow a new Administrator to commission it. */ diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap index 1b4f150a6ee06b..5d3000d8b3ab71 100644 --- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap +++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap @@ -1920,7 +1920,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -4006,5 +4006,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter index 4555a630035672..1d34f61700edde 100644 --- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter +++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter @@ -869,7 +869,7 @@ server cluster GeneralDiagnostics = 51 { /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ server cluster SoftwareDiagnostics = 52 { bitmap Feature : bitmap32 { - kWaterMarks = 0x1; + kWatermarks = 0x1; } struct ThreadMetricsStruct { @@ -897,7 +897,7 @@ server cluster SoftwareDiagnostics = 52 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetWatermarks(): DefaultSuccess = 0; + command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0; } /** Commands to trigger a Node to allow a new Administrator to commission it. */ diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap b/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap index cb6dbbfa55b795..6d93d50076731c 100644 --- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap +++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap @@ -1936,7 +1936,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -3227,5 +3227,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter index db39ae1ec96e05..c2d2c0e8ae5753 100644 --- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter +++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter @@ -888,7 +888,7 @@ server cluster GeneralDiagnostics = 51 { /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ server cluster SoftwareDiagnostics = 52 { bitmap Feature : bitmap32 { - kWaterMarks = 0x1; + kWatermarks = 0x1; } struct ThreadMetricsStruct { @@ -916,7 +916,7 @@ server cluster SoftwareDiagnostics = 52 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetWatermarks(): DefaultSuccess = 0; + command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0; } /** Commands to trigger a Node to allow a new Administrator to commission it. */ diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap index 693dc2f4ddad58..3ad57c090834ff 100644 --- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap +++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap @@ -1920,7 +1920,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -2986,5 +2986,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_genericswitch_9866e35d0b.zap b/examples/chef/devices/rootnode_genericswitch_9866e35d0b.zap index 37347c96ac56ab..1f3613a429ed18 100644 --- a/examples/chef/devices/rootnode_genericswitch_9866e35d0b.zap +++ b/examples/chef/devices/rootnode_genericswitch_9866e35d0b.zap @@ -1433,7 +1433,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -2390,5 +2390,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter index 03646575903076..7748c6c654d6d3 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter @@ -1026,7 +1026,7 @@ server cluster GeneralDiagnostics = 51 { /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ server cluster SoftwareDiagnostics = 52 { bitmap Feature : bitmap32 { - kWaterMarks = 0x1; + kWatermarks = 0x1; } struct ThreadMetricsStruct { @@ -1054,7 +1054,7 @@ server cluster SoftwareDiagnostics = 52 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetWatermarks(): DefaultSuccess = 0; + command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0; } /** Commands to trigger a Node to allow a new Administrator to commission it. */ diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap index 9be273434c3272..3995dfe9782e6a 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap @@ -1920,7 +1920,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -3591,5 +3591,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter index b010a3597bb3df..474e8afbe793f0 100644 --- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter +++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter @@ -888,7 +888,7 @@ server cluster GeneralDiagnostics = 51 { /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ server cluster SoftwareDiagnostics = 52 { bitmap Feature : bitmap32 { - kWaterMarks = 0x1; + kWatermarks = 0x1; } struct ThreadMetricsStruct { @@ -916,7 +916,7 @@ server cluster SoftwareDiagnostics = 52 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetWatermarks(): DefaultSuccess = 0; + command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0; } /** Commands to trigger a Node to allow a new Administrator to commission it. */ diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap index a46961552d7004..0e56fbaa2449b8 100644 --- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap +++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap @@ -1920,7 +1920,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -2986,5 +2986,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.zap b/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.zap index 066606dffe2ca4..798ae3307bd2e0 100644 --- a/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.zap +++ b/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.zap @@ -2399,7 +2399,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -3353,5 +3353,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter index e59638afec116e..f6102b019cb6b1 100644 --- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter +++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter @@ -888,7 +888,7 @@ server cluster GeneralDiagnostics = 51 { /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ server cluster SoftwareDiagnostics = 52 { bitmap Feature : bitmap32 { - kWaterMarks = 0x1; + kWatermarks = 0x1; } struct ThreadMetricsStruct { @@ -916,7 +916,7 @@ server cluster SoftwareDiagnostics = 52 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetWatermarks(): DefaultSuccess = 0; + command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0; } /** Commands to trigger a Node to allow a new Administrator to commission it. */ diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap index 5331bdb29a7091..a33119d44de291 100644 --- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap +++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap @@ -1920,7 +1920,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -2954,5 +2954,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter index 77f148218ccb0b..55b92e1d99a5ad 100644 --- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter +++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter @@ -888,7 +888,7 @@ server cluster GeneralDiagnostics = 51 { /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ server cluster SoftwareDiagnostics = 52 { bitmap Feature : bitmap32 { - kWaterMarks = 0x1; + kWatermarks = 0x1; } struct ThreadMetricsStruct { @@ -916,7 +916,7 @@ server cluster SoftwareDiagnostics = 52 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetWatermarks(): DefaultSuccess = 0; + command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0; } /** Commands to trigger a Node to allow a new Administrator to commission it. */ diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap index 27e62b5b70232a..6646443a09e65b 100644 --- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap +++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap @@ -1920,7 +1920,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -2970,5 +2970,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter index ce4f41eb65ef0a..c892a695de1f81 100644 --- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter +++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter @@ -1032,7 +1032,7 @@ server cluster GeneralDiagnostics = 51 { /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ server cluster SoftwareDiagnostics = 52 { bitmap Feature : bitmap32 { - kWaterMarks = 0x1; + kWatermarks = 0x1; } struct ThreadMetricsStruct { @@ -1060,7 +1060,7 @@ server cluster SoftwareDiagnostics = 52 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetWatermarks(): DefaultSuccess = 0; + command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0; } /** Commands to trigger a Node to allow a new Administrator to commission it. */ diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap index b59b25debe1562..e89d7311babe0a 100644 --- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap +++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap @@ -1920,7 +1920,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -3426,5 +3426,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_onofflight_samplemei.matter b/examples/chef/devices/rootnode_onofflight_samplemei.matter index a851b44be091c2..89331830a07684 100644 --- a/examples/chef/devices/rootnode_onofflight_samplemei.matter +++ b/examples/chef/devices/rootnode_onofflight_samplemei.matter @@ -1032,7 +1032,7 @@ server cluster GeneralDiagnostics = 51 { /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ server cluster SoftwareDiagnostics = 52 { bitmap Feature : bitmap32 { - kWaterMarks = 0x1; + kWatermarks = 0x1; } struct ThreadMetricsStruct { @@ -1060,7 +1060,7 @@ server cluster SoftwareDiagnostics = 52 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetWatermarks(): DefaultSuccess = 0; + command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0; } /** Commands to trigger a Node to allow a new Administrator to commission it. */ diff --git a/examples/chef/devices/rootnode_onofflight_samplemei.zap b/examples/chef/devices/rootnode_onofflight_samplemei.zap index 316cfd673f37eb..5b983849ca4f2f 100644 --- a/examples/chef/devices/rootnode_onofflight_samplemei.zap +++ b/examples/chef/devices/rootnode_onofflight_samplemei.zap @@ -1920,7 +1920,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -3558,5 +3558,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter index f87b8039cdff89..f3f11320edc850 100644 --- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter +++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter @@ -996,7 +996,7 @@ server cluster GeneralDiagnostics = 51 { /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ server cluster SoftwareDiagnostics = 52 { bitmap Feature : bitmap32 { - kWaterMarks = 0x1; + kWatermarks = 0x1; } struct ThreadMetricsStruct { @@ -1024,7 +1024,7 @@ server cluster SoftwareDiagnostics = 52 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetWatermarks(): DefaultSuccess = 0; + command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0; } /** Commands to trigger a Node to allow a new Administrator to commission it. */ diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap index 05116b69ffb317..e2e1d77b241f90 100644 --- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap +++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap @@ -1920,7 +1920,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -3146,5 +3146,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter index 13a79bc0cee434..1b1dab03262596 100644 --- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter +++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter @@ -931,7 +931,7 @@ server cluster GeneralDiagnostics = 51 { /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ server cluster SoftwareDiagnostics = 52 { bitmap Feature : bitmap32 { - kWaterMarks = 0x1; + kWatermarks = 0x1; } struct ThreadMetricsStruct { @@ -959,7 +959,7 @@ server cluster SoftwareDiagnostics = 52 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetWatermarks(): DefaultSuccess = 0; + command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0; } /** Commands to trigger a Node to allow a new Administrator to commission it. */ diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap index 37312157bc9ad5..24052570e77c22 100644 --- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap +++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap @@ -1920,7 +1920,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -3174,5 +3174,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter index fafd5a73ac5880..d76724d03359fe 100644 --- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter +++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter @@ -888,7 +888,7 @@ server cluster GeneralDiagnostics = 51 { /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ server cluster SoftwareDiagnostics = 52 { bitmap Feature : bitmap32 { - kWaterMarks = 0x1; + kWatermarks = 0x1; } struct ThreadMetricsStruct { @@ -916,7 +916,7 @@ server cluster SoftwareDiagnostics = 52 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetWatermarks(): DefaultSuccess = 0; + command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0; } /** Commands to trigger a Node to allow a new Administrator to commission it. */ diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap index af5ec16b4b5046..1b0028275e2b40 100644 --- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap +++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap @@ -1920,7 +1920,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -2996,5 +2996,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_pump_5f904818cc.zap b/examples/chef/devices/rootnode_pump_5f904818cc.zap index 6c364341345a4b..131da70f467974 100644 --- a/examples/chef/devices/rootnode_pump_5f904818cc.zap +++ b/examples/chef/devices/rootnode_pump_5f904818cc.zap @@ -1715,7 +1715,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -3513,5 +3513,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_pump_a811bb33a0.zap b/examples/chef/devices/rootnode_pump_a811bb33a0.zap index 1da6872a5c4c06..49a4e51fd9a20e 100644 --- a/examples/chef/devices/rootnode_pump_a811bb33a0.zap +++ b/examples/chef/devices/rootnode_pump_a811bb33a0.zap @@ -1715,7 +1715,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -2971,5 +2971,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.zap b/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.zap index e023f4be9a5cb3..6d0189f25a769a 100644 --- a/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.zap +++ b/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.zap @@ -2399,7 +2399,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -3777,5 +3777,6 @@ "endpointId": 3, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap index 8b70d3da6ebd45..dad96cd186033a 100644 --- a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap +++ b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap @@ -1433,7 +1433,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.zap b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.zap index 5f84a3f9f18457..81b7dd94bb90f1 100644 --- a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.zap +++ b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.zap @@ -1433,7 +1433,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -3132,5 +3132,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.zap b/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.zap index fcf0eee0d0899e..ac52e9a00e295e 100644 --- a/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.zap +++ b/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.zap @@ -1433,7 +1433,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -3069,5 +3069,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter index a9543c16f40ff4..fec8584e71a8ed 100644 --- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter +++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter @@ -957,7 +957,7 @@ server cluster GeneralDiagnostics = 51 { /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ server cluster SoftwareDiagnostics = 52 { bitmap Feature : bitmap32 { - kWaterMarks = 0x1; + kWatermarks = 0x1; } struct ThreadMetricsStruct { @@ -985,7 +985,7 @@ server cluster SoftwareDiagnostics = 52 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetWatermarks(): DefaultSuccess = 0; + command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0; } /** Commands to trigger a Node to allow a new Administrator to commission it. */ diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap index db7ccef40802e4..dd5e63a06d5bfd 100644 --- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap +++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap @@ -1920,7 +1920,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -3158,5 +3158,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter index 5ccbaacefebb96..96c5c036789208 100644 --- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter +++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter @@ -888,7 +888,7 @@ server cluster GeneralDiagnostics = 51 { /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ server cluster SoftwareDiagnostics = 52 { bitmap Feature : bitmap32 { - kWaterMarks = 0x1; + kWatermarks = 0x1; } struct ThreadMetricsStruct { @@ -916,7 +916,7 @@ server cluster SoftwareDiagnostics = 52 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetWatermarks(): DefaultSuccess = 0; + command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0; } /** Commands to trigger a Node to allow a new Administrator to commission it. */ diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap index b4eb2d40ed3c26..28e1691e0d9387 100644 --- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap +++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap @@ -1920,7 +1920,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -2970,5 +2970,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter index 9df995db024cb4..f40c788dcde83b 100644 --- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter +++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter @@ -882,7 +882,7 @@ server cluster GeneralDiagnostics = 51 { /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ server cluster SoftwareDiagnostics = 52 { bitmap Feature : bitmap32 { - kWaterMarks = 0x1; + kWatermarks = 0x1; } struct ThreadMetricsStruct { @@ -910,7 +910,7 @@ server cluster SoftwareDiagnostics = 52 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetWatermarks(): DefaultSuccess = 0; + command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0; } /** Commands to trigger a Node to allow a new Administrator to commission it. */ diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap index ee23f8b5524f29..fc6192274b30ac 100644 --- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap +++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap @@ -1920,7 +1920,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -3801,5 +3801,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter index f2d39b10b0a3ef..c5eee65da644ee 100644 --- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter +++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter @@ -882,7 +882,7 @@ server cluster GeneralDiagnostics = 51 { /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ server cluster SoftwareDiagnostics = 52 { bitmap Feature : bitmap32 { - kWaterMarks = 0x1; + kWatermarks = 0x1; } struct ThreadMetricsStruct { @@ -910,7 +910,7 @@ server cluster SoftwareDiagnostics = 52 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetWatermarks(): DefaultSuccess = 0; + command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0; } /** Commands to trigger a Node to allow a new Administrator to commission it. */ diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap index ddc252e56b669c..981a417a84f735 100644 --- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap +++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap @@ -1920,7 +1920,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -3462,5 +3462,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/chef/devices/template.zap b/examples/chef/devices/template.zap index 64ba6a87e47ef5..0f7cf1a1d63a13 100644 --- a/examples/chef/devices/template.zap +++ b/examples/chef/devices/template.zap @@ -1433,7 +1433,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, 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 87f2caaf581a7f..30445c5445257d 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 @@ -869,7 +869,7 @@ server cluster GeneralDiagnostics = 51 { /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ server cluster SoftwareDiagnostics = 52 { bitmap Feature : bitmap32 { - kWaterMarks = 0x1; + kWatermarks = 0x1; } struct ThreadMetricsStruct { @@ -897,7 +897,7 @@ server cluster SoftwareDiagnostics = 52 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetWatermarks(): DefaultSuccess = 0; + command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0; } /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */ diff --git a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap index 64a677860d5b0c..0fa6b11ed229eb 100644 --- a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap +++ b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap @@ -3599,7 +3599,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -4698,5 +4698,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/dishwasher-app/dishwasher-common/dishwasher-app.zap b/examples/dishwasher-app/dishwasher-common/dishwasher-app.zap index 12ec8977ca97de..35e670751458f5 100644 --- a/examples/dishwasher-app/dishwasher-common/dishwasher-app.zap +++ b/examples/dishwasher-app/dishwasher-common/dishwasher-app.zap @@ -2539,7 +2539,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -3903,5 +3903,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file 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 3801affe7746a8..7439fedadea592 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 @@ -1183,7 +1183,7 @@ server cluster GeneralDiagnostics = 51 { /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ server cluster SoftwareDiagnostics = 52 { bitmap Feature : bitmap32 { - kWaterMarks = 0x1; + kWatermarks = 0x1; } struct ThreadMetricsStruct { @@ -1211,7 +1211,7 @@ server cluster SoftwareDiagnostics = 52 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetWatermarks(): DefaultSuccess = 0; + command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0; } /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */ diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.zap b/examples/light-switch-app/light-switch-common/light-switch-app.zap index d3f709dc000bbb..a92321ae63ca0c 100644 --- a/examples/light-switch-app/light-switch-common/light-switch-app.zap +++ b/examples/light-switch-app/light-switch-common/light-switch-app.zap @@ -3886,7 +3886,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -5832,5 +5832,6 @@ "endpointId": 2, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter index f3cb09f9a32294..229cb561e3d286 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter @@ -1040,7 +1040,7 @@ server cluster GeneralDiagnostics = 51 { /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ server cluster SoftwareDiagnostics = 52 { bitmap Feature : bitmap32 { - kWaterMarks = 0x1; + kWatermarks = 0x1; } struct ThreadMetricsStruct { @@ -1067,7 +1067,7 @@ server cluster SoftwareDiagnostics = 52 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetWatermarks(): DefaultSuccess = 0; + command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0; } /** The Ethernet Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.zap b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.zap index 218ddb42e801af..3fbf144422e576 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.zap +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.zap @@ -2015,7 +2015,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -4277,5 +4277,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file 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 cfc4f6f0a2b746..13abdef3120844 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter @@ -1040,7 +1040,7 @@ server cluster GeneralDiagnostics = 51 { /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ server cluster SoftwareDiagnostics = 52 { bitmap Feature : bitmap32 { - kWaterMarks = 0x1; + kWatermarks = 0x1; } struct ThreadMetricsStruct { @@ -1068,7 +1068,7 @@ server cluster SoftwareDiagnostics = 52 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetWatermarks(): DefaultSuccess = 0; + command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0; } /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */ diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap index 3f540ed9f04d31..cb06c41a042700 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap @@ -2991,7 +2991,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -5253,5 +5253,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file 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 e97a7212137016..c53008d8112361 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter @@ -1040,7 +1040,7 @@ server cluster GeneralDiagnostics = 51 { /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ server cluster SoftwareDiagnostics = 52 { bitmap Feature : bitmap32 { - kWaterMarks = 0x1; + kWatermarks = 0x1; } struct ThreadMetricsStruct { @@ -1067,7 +1067,7 @@ server cluster SoftwareDiagnostics = 52 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetWatermarks(): DefaultSuccess = 0; + command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0; } /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap index 52cc3d661efaa8..c24ec8d3bc8eaf 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap @@ -2198,7 +2198,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -4460,5 +4460,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter index ff3515b837ec5e..216ad683e6b030 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -1187,7 +1187,7 @@ server cluster GeneralDiagnostics = 51 { /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ server cluster SoftwareDiagnostics = 52 { bitmap Feature : bitmap32 { - kWaterMarks = 0x1; + kWatermarks = 0x1; } struct ThreadMetricsStruct { @@ -1215,7 +1215,7 @@ server cluster SoftwareDiagnostics = 52 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetWatermarks(): DefaultSuccess = 0; + command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0; } /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */ diff --git a/examples/lighting-app/lighting-common/lighting-app.zap b/examples/lighting-app/lighting-common/lighting-app.zap index 93f5cd2eb9cc08..c4f3572ec96857 100644 --- a/examples/lighting-app/lighting-common/lighting-app.zap +++ b/examples/lighting-app/lighting-common/lighting-app.zap @@ -3563,7 +3563,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -5976,5 +5976,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.matter b/examples/lighting-app/nxp/zap/lighting-on-off.matter index 6bb1dc6d34a566..879cdadd19a22f 100644 --- a/examples/lighting-app/nxp/zap/lighting-on-off.matter +++ b/examples/lighting-app/nxp/zap/lighting-on-off.matter @@ -920,7 +920,7 @@ server cluster GeneralDiagnostics = 51 { /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ server cluster SoftwareDiagnostics = 52 { bitmap Feature : bitmap32 { - kWaterMarks = 0x1; + kWatermarks = 0x1; } struct ThreadMetricsStruct { @@ -948,7 +948,7 @@ server cluster SoftwareDiagnostics = 52 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetWatermarks(): DefaultSuccess = 0; + command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0; } /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */ diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.zap b/examples/lighting-app/nxp/zap/lighting-on-off.zap index 12a02d45e7a282..4da6db3bf6d93b 100644 --- a/examples/lighting-app/nxp/zap/lighting-on-off.zap +++ b/examples/lighting-app/nxp/zap/lighting-on-off.zap @@ -2476,7 +2476,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -3930,5 +3930,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/lighting-app/qpg/zap/light.matter b/examples/lighting-app/qpg/zap/light.matter index 71e691b790375a..7c055058372faf 100644 --- a/examples/lighting-app/qpg/zap/light.matter +++ b/examples/lighting-app/qpg/zap/light.matter @@ -981,7 +981,7 @@ server cluster GeneralDiagnostics = 51 { /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ server cluster SoftwareDiagnostics = 52 { bitmap Feature : bitmap32 { - kWaterMarks = 0x1; + kWatermarks = 0x1; } struct ThreadMetricsStruct { @@ -1009,7 +1009,7 @@ server cluster SoftwareDiagnostics = 52 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetWatermarks(): DefaultSuccess = 0; + command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0; } /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */ diff --git a/examples/lighting-app/qpg/zap/light.zap b/examples/lighting-app/qpg/zap/light.zap index a9e809e15b0498..ffd306791f7f40 100644 --- a/examples/lighting-app/qpg/zap/light.zap +++ b/examples/lighting-app/qpg/zap/light.zap @@ -3269,7 +3269,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -6207,5 +6207,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file 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 25bb26b198d126..33303e645737ce 100644 --- a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter +++ b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter @@ -1444,7 +1444,7 @@ server cluster GeneralDiagnostics = 51 { /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ server cluster SoftwareDiagnostics = 52 { bitmap Feature : bitmap32 { - kWaterMarks = 0x1; + kWatermarks = 0x1; } struct ThreadMetricsStruct { @@ -1472,7 +1472,7 @@ server cluster SoftwareDiagnostics = 52 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetWatermarks(): DefaultSuccess = 0; + command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0; } /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */ diff --git a/examples/lighting-app/silabs/data_model/lighting-thread-app.zap b/examples/lighting-app/silabs/data_model/lighting-thread-app.zap index 1425494ce80b80..00e4fc3dc68664 100644 --- a/examples/lighting-app/silabs/data_model/lighting-thread-app.zap +++ b/examples/lighting-app/silabs/data_model/lighting-thread-app.zap @@ -2943,7 +2943,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -5916,5 +5916,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file 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 2982df009b22b7..28c4570b90f7e2 100644 --- a/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter +++ b/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter @@ -1423,7 +1423,7 @@ server cluster GeneralDiagnostics = 51 { /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ server cluster SoftwareDiagnostics = 52 { bitmap Feature : bitmap32 { - kWaterMarks = 0x1; + kWatermarks = 0x1; } struct ThreadMetricsStruct { @@ -1451,7 +1451,7 @@ server cluster SoftwareDiagnostics = 52 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetWatermarks(): DefaultSuccess = 0; + command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0; } /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ diff --git a/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap b/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap index e4f32d952c9286..76f4fde26b1b09 100644 --- a/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap +++ b/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap @@ -2143,7 +2143,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -5092,5 +5092,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter index 7f8b6d004493db..540c85ee5f71ba 100644 --- a/examples/lock-app/lock-common/lock-app.matter +++ b/examples/lock-app/lock-common/lock-app.matter @@ -1106,7 +1106,7 @@ server cluster GeneralDiagnostics = 51 { /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ server cluster SoftwareDiagnostics = 52 { bitmap Feature : bitmap32 { - kWaterMarks = 0x1; + kWatermarks = 0x1; } struct ThreadMetricsStruct { @@ -1134,7 +1134,7 @@ server cluster SoftwareDiagnostics = 52 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetWatermarks(): DefaultSuccess = 0; + command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0; } /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */ diff --git a/examples/lock-app/lock-common/lock-app.zap b/examples/lock-app/lock-common/lock-app.zap index 9f32ac3eef58dd..e079f41ed81adf 100644 --- a/examples/lock-app/lock-common/lock-app.zap +++ b/examples/lock-app/lock-common/lock-app.zap @@ -4285,7 +4285,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/lock-app/nxp/zap/lock-app.matter b/examples/lock-app/nxp/zap/lock-app.matter index 1020b464b61a4d..9b030c237fb074 100644 --- a/examples/lock-app/nxp/zap/lock-app.matter +++ b/examples/lock-app/nxp/zap/lock-app.matter @@ -538,7 +538,7 @@ server cluster GeneralDiagnostics = 51 { /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ server cluster SoftwareDiagnostics = 52 { bitmap Feature : bitmap32 { - kWaterMarks = 0x1; + kWatermarks = 0x1; } struct ThreadMetricsStruct { @@ -566,7 +566,7 @@ server cluster SoftwareDiagnostics = 52 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetWatermarks(): DefaultSuccess = 0; + command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0; } /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */ diff --git a/examples/lock-app/nxp/zap/lock-app.zap b/examples/lock-app/nxp/zap/lock-app.zap index 39ab65db171c8f..103c17087eccfd 100644 --- a/examples/lock-app/nxp/zap/lock-app.zap +++ b/examples/lock-app/nxp/zap/lock-app.zap @@ -2269,7 +2269,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -3393,5 +3393,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/lock-app/qpg/zap/lock.matter b/examples/lock-app/qpg/zap/lock.matter index 9c78fb9fbbe866..5b67875cce9279 100644 --- a/examples/lock-app/qpg/zap/lock.matter +++ b/examples/lock-app/qpg/zap/lock.matter @@ -814,7 +814,7 @@ server cluster GeneralDiagnostics = 51 { /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ server cluster SoftwareDiagnostics = 52 { bitmap Feature : bitmap32 { - kWaterMarks = 0x1; + kWatermarks = 0x1; } struct ThreadMetricsStruct { @@ -842,7 +842,7 @@ server cluster SoftwareDiagnostics = 52 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetWatermarks(): DefaultSuccess = 0; + command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0; } /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */ diff --git a/examples/lock-app/qpg/zap/lock.zap b/examples/lock-app/qpg/zap/lock.zap index ff7f8aa51c565e..e66ddc5a32eac5 100644 --- a/examples/lock-app/qpg/zap/lock.zap +++ b/examples/lock-app/qpg/zap/lock.zap @@ -3269,7 +3269,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -5268,5 +5268,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap b/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap index da75a6de71daaf..3776092d0b62dd 100644 --- a/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap +++ b/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap @@ -1703,7 +1703,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -2267,5 +2267,6 @@ "endpointId": 0, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap index a4ef51e3817653..e36f3b95848231 100644 --- a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap +++ b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap @@ -1752,7 +1752,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index 5d43a5053cabe9..056976a11f7684 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -1689,7 +1689,7 @@ server cluster GeneralDiagnostics = 51 { /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ server cluster SoftwareDiagnostics = 52 { bitmap Feature : bitmap32 { - kWaterMarks = 0x1; + kWatermarks = 0x1; } struct ThreadMetricsStruct { @@ -1717,7 +1717,7 @@ server cluster SoftwareDiagnostics = 52 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetWatermarks(): DefaultSuccess = 0; + command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0; } /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */ diff --git a/examples/placeholder/linux/apps/app1/config.zap b/examples/placeholder/linux/apps/app1/config.zap index 79277d9a1f7720..c1166d993338fd 100644 --- a/examples/placeholder/linux/apps/app1/config.zap +++ b/examples/placeholder/linux/apps/app1/config.zap @@ -5090,7 +5090,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -11120,7 +11120,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "char_string", + "type": "long_char_string", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -15189,5 +15189,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index 2697eb2132d6db..76bf39117b7fb4 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -1648,7 +1648,7 @@ server cluster GeneralDiagnostics = 51 { /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ server cluster SoftwareDiagnostics = 52 { bitmap Feature : bitmap32 { - kWaterMarks = 0x1; + kWatermarks = 0x1; } struct ThreadMetricsStruct { @@ -1676,7 +1676,7 @@ server cluster SoftwareDiagnostics = 52 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetWatermarks(): DefaultSuccess = 0; + command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0; } /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */ diff --git a/examples/placeholder/linux/apps/app2/config.zap b/examples/placeholder/linux/apps/app2/config.zap index bd7cd1500906e9..88191b28ef9110 100644 --- a/examples/placeholder/linux/apps/app2/config.zap +++ b/examples/placeholder/linux/apps/app2/config.zap @@ -5106,7 +5106,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -11202,7 +11202,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "char_string", + "type": "long_char_string", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -14981,5 +14981,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/pump-app/pump-common/pump-app.zap b/examples/pump-app/pump-common/pump-app.zap index 3c85e060c2a95b..6e21cc9d3de2cf 100644 --- a/examples/pump-app/pump-common/pump-app.zap +++ b/examples/pump-app/pump-common/pump-app.zap @@ -2160,7 +2160,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -4590,5 +4590,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/pump-app/silabs/data_model/pump-thread-app.zap b/examples/pump-app/silabs/data_model/pump-thread-app.zap index c41037144521db..30e326a3bf068c 100644 --- a/examples/pump-app/silabs/data_model/pump-thread-app.zap +++ b/examples/pump-app/silabs/data_model/pump-thread-app.zap @@ -2160,7 +2160,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -4590,5 +4590,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/pump-app/silabs/data_model/pump-wifi-app.zap b/examples/pump-app/silabs/data_model/pump-wifi-app.zap index c41037144521db..30e326a3bf068c 100644 --- a/examples/pump-app/silabs/data_model/pump-wifi-app.zap +++ b/examples/pump-app/silabs/data_model/pump-wifi-app.zap @@ -2160,7 +2160,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -4590,5 +4590,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap b/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap index 40a48ff65a05f1..cb7f4b298c5fbb 100644 --- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap +++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap @@ -2160,7 +2160,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -3416,5 +3416,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/refrigerator-app/refrigerator-common/refrigerator-app.zap b/examples/refrigerator-app/refrigerator-common/refrigerator-app.zap index ee25bbda679588..b772acad198770 100644 --- a/examples/refrigerator-app/refrigerator-common/refrigerator-app.zap +++ b/examples/refrigerator-app/refrigerator-common/refrigerator-app.zap @@ -2307,7 +2307,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -3717,5 +3717,6 @@ "endpointId": 3, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter b/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter index 6b1bb2d7ef9040..262f2a2d2dc120 100644 --- a/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter +++ b/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter @@ -869,7 +869,7 @@ server cluster GeneralDiagnostics = 51 { /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ server cluster SoftwareDiagnostics = 52 { bitmap Feature : bitmap32 { - kWaterMarks = 0x1; + kWatermarks = 0x1; } struct ThreadMetricsStruct { @@ -897,7 +897,7 @@ server cluster SoftwareDiagnostics = 52 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetWatermarks(): DefaultSuccess = 0; + command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0; } /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */ diff --git a/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.zap b/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.zap index 0cbb34e9a15882..f9ec6ae993d322 100644 --- a/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.zap +++ b/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.zap @@ -3694,7 +3694,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -5323,5 +5323,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/rvc-app/rvc-common/rvc-app.zap b/examples/rvc-app/rvc-common/rvc-app.zap index d6d93ff4a7cc6b..a9f67c56bd7bc8 100644 --- a/examples/rvc-app/rvc-common/rvc-app.zap +++ b/examples/rvc-app/rvc-common/rvc-app.zap @@ -1433,7 +1433,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, 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 a7b346ecda11c7..3b8db712aa8871 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 @@ -1101,7 +1101,7 @@ server cluster GeneralDiagnostics = 51 { /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ server cluster SoftwareDiagnostics = 52 { bitmap Feature : bitmap32 { - kWaterMarks = 0x1; + kWatermarks = 0x1; } struct ThreadMetricsStruct { @@ -1129,7 +1129,7 @@ server cluster SoftwareDiagnostics = 52 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetWatermarks(): DefaultSuccess = 0; + command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0; } /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */ diff --git a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.zap b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.zap index 4ecc3ccf0b6b45..b5fe6c12387788 100644 --- a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.zap +++ b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.zap @@ -2909,7 +2909,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -4833,5 +4833,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file 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 ad188caf841c77..8e7aabd8121a09 100644 --- a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter +++ b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter @@ -623,7 +623,7 @@ server cluster GeneralDiagnostics = 51 { /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ server cluster SoftwareDiagnostics = 52 { bitmap Feature : bitmap32 { - kWaterMarks = 0x1; + kWatermarks = 0x1; } struct ThreadMetricsStruct { diff --git a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.zap b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.zap index 63fe575d9d2914..7845ed393315aa 100644 --- a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.zap +++ b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.zap @@ -2174,7 +2174,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -2970,5 +2970,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/thermostat/nxp/zap/thermostat_matter_thread.zap b/examples/thermostat/nxp/zap/thermostat_matter_thread.zap index 5a182daade2b19..ec8baf4d992228 100644 --- a/examples/thermostat/nxp/zap/thermostat_matter_thread.zap +++ b/examples/thermostat/nxp/zap/thermostat_matter_thread.zap @@ -2995,7 +2995,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -4934,5 +4934,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/thermostat/nxp/zap/thermostat_matter_wifi.zap b/examples/thermostat/nxp/zap/thermostat_matter_wifi.zap index 2bbedb4a04e8c9..fcc14df85255d3 100644 --- a/examples/thermostat/nxp/zap/thermostat_matter_wifi.zap +++ b/examples/thermostat/nxp/zap/thermostat_matter_wifi.zap @@ -2137,7 +2137,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -4076,5 +4076,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter index 511f0a9dee24f4..170c970d2b0e7d 100644 --- a/examples/thermostat/thermostat-common/thermostat.matter +++ b/examples/thermostat/thermostat-common/thermostat.matter @@ -960,7 +960,7 @@ server cluster GeneralDiagnostics = 51 { /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ server cluster SoftwareDiagnostics = 52 { bitmap Feature : bitmap32 { - kWaterMarks = 0x1; + kWatermarks = 0x1; } struct ThreadMetricsStruct { diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap index 75048d179582cd..74262e2093f6b1 100644 --- a/examples/thermostat/thermostat-common/thermostat.zap +++ b/examples/thermostat/thermostat-common/thermostat.zap @@ -3623,7 +3623,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -5043,5 +5043,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter index d8031ff7e42f5f..61b84eadc08409 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -1115,7 +1115,7 @@ server cluster GeneralDiagnostics = 51 { /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ server cluster SoftwareDiagnostics = 52 { bitmap Feature : bitmap32 { - kWaterMarks = 0x1; + kWatermarks = 0x1; } struct ThreadMetricsStruct { diff --git a/examples/tv-app/tv-common/tv-app.zap b/examples/tv-app/tv-common/tv-app.zap index 82f970a56d21d2..58a0b469101460 100644 --- a/examples/tv-app/tv-common/tv-app.zap +++ b/examples/tv-app/tv-common/tv-app.zap @@ -3665,7 +3665,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -7340,7 +7340,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "char_string", + "type": "long_char_string", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7621,5 +7621,6 @@ "endpointId": 3, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter index b7d954aefabd61..b3e17599c19657 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 @@ -956,7 +956,7 @@ server cluster GeneralDiagnostics = 51 { /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ server cluster SoftwareDiagnostics = 52 { bitmap Feature : bitmap32 { - kWaterMarks = 0x1; + kWatermarks = 0x1; } struct ThreadMetricsStruct { diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap index ffc7f1d33be2c8..b231ccb0ec904f 100644 --- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap +++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap @@ -2236,7 +2236,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -4366,5 +4366,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter b/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter index fab44c95b63e8a..9e8e1e6774acee 100644 --- a/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter +++ b/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter @@ -1250,7 +1250,7 @@ server cluster GeneralDiagnostics = 51 { /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ server cluster SoftwareDiagnostics = 52 { bitmap Feature : bitmap32 { - kWaterMarks = 0x1; + kWatermarks = 0x1; } struct ThreadMetricsStruct { diff --git a/examples/virtual-device-app/virtual-device-common/virtual-device-app.zap b/examples/virtual-device-app/virtual-device-common/virtual-device-app.zap index d0b59539b15b04..ea5776de0b3587 100644 --- a/examples/virtual-device-app/virtual-device-common/virtual-device-app.zap +++ b/examples/virtual-device-app/virtual-device-common/virtual-device-app.zap @@ -3463,7 +3463,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -6122,5 +6122,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter index e90f4148b363b5..6f3d6f8e2112c4 100644 --- a/examples/window-app/common/window-app.matter +++ b/examples/window-app/common/window-app.matter @@ -1090,7 +1090,7 @@ server cluster GeneralDiagnostics = 51 { /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ server cluster SoftwareDiagnostics = 52 { bitmap Feature : bitmap32 { - kWaterMarks = 0x1; + kWatermarks = 0x1; } struct ThreadMetricsStruct { @@ -1118,7 +1118,7 @@ server cluster SoftwareDiagnostics = 52 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - command ResetWatermarks(): DefaultSuccess = 0; + command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0; } /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */ diff --git a/examples/window-app/common/window-app.zap b/examples/window-app/common/window-app.zap index 024b9247c290ac..a5dcb3b1a3bc2e 100644 --- a/examples/window-app/common/window-app.zap +++ b/examples/window-app/common/window-app.zap @@ -4273,7 +4273,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -7057,5 +7057,6 @@ "endpointId": 2, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/scripts/tools/zap/tests/inputs/all-clusters-app.zap b/scripts/tools/zap/tests/inputs/all-clusters-app.zap index 549973ecaf05b9..12d89a5da8d510 100644 --- a/scripts/tools/zap/tests/inputs/all-clusters-app.zap +++ b/scripts/tools/zap/tests/inputs/all-clusters-app.zap @@ -17,12 +17,6 @@ } ], "package": [ - { - "pathRelativity": "relativeToZap", - "path": "../../../../../src/app/zap-templates/app-templates.json", - "type": "gen-templates-json", - "version": "chip-v1" - }, { "pathRelativity": "relativeToZap", "path": "../../../../../src/app/zap-templates/zcl/zcl-with-test-extensions.json", @@ -30,6 +24,12 @@ "category": "matter", "version": 1, "description": "Matter SDK ZCL data with some extensions" + }, + { + "pathRelativity": "relativeToZap", + "path": "../../../../../src/app/zap-templates/app-templates.json", + "type": "gen-templates-json", + "version": "chip-v1" } ], "endpointTypes": [ @@ -4631,7 +4631,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -12888,7 +12888,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "char_string", + "type": "long_char_string", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/scripts/tools/zap/tests/inputs/lighting-app.zap b/scripts/tools/zap/tests/inputs/lighting-app.zap index e4f4e057b87896..7fbcb784bfd527 100644 --- a/scripts/tools/zap/tests/inputs/lighting-app.zap +++ b/scripts/tools/zap/tests/inputs/lighting-app.zap @@ -3678,7 +3678,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 0, @@ -5742,5 +5742,6 @@ "endpointId": 1, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/access.h b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/access.h index e0369d57a9f387..4a484b3f33fc9f 100644 --- a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/access.h +++ b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/access.h @@ -410,6 +410,7 @@ 0x00000031, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \ 0x00000031, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \ 0x00000033, /* Cluster: General Diagnostics, Command: TestEventTrigger, Privilege: manage */ \ + 0x00000034, /* Cluster: Software Diagnostics, Command: ResetWatermarks, Privilege: manage */ \ 0x00000037, /* Cluster: Ethernet Network Diagnostics, Command: ResetCounts, Privilege: manage */ \ 0x0000003C, /* Cluster: Administrator Commissioning, Command: OpenCommissioningWindow, Privilege: administer */ \ 0x0000003C, /* Cluster: Administrator Commissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \ @@ -464,6 +465,7 @@ 0x00000006, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \ 0x00000008, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \ 0x00000000, /* Cluster: General Diagnostics, Command: TestEventTrigger, Privilege: manage */ \ + 0x00000000, /* Cluster: Software Diagnostics, Command: ResetWatermarks, Privilege: manage */ \ 0x00000000, /* Cluster: Ethernet Network Diagnostics, Command: ResetCounts, Privilege: manage */ \ 0x00000000, /* Cluster: Administrator Commissioning, Command: OpenCommissioningWindow, Privilege: administer */ \ 0x00000001, /* Cluster: Administrator Commissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \ @@ -518,6 +520,7 @@ kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \ kMatterAccessPrivilegeManage, /* Cluster: General Diagnostics, Command: TestEventTrigger, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Software Diagnostics, Command: ResetWatermarks, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Ethernet Network Diagnostics, Command: ResetCounts, Privilege: manage */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Administrator Commissioning, Command: OpenCommissioningWindow, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Administrator Commissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \ diff --git a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/access.h b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/access.h index fce25f61ac1f50..a9a3acfe70e870 100644 --- a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/access.h +++ b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/access.h @@ -172,6 +172,7 @@ 0x00000031, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \ 0x00000031, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \ 0x00000033, /* Cluster: General Diagnostics, Command: TestEventTrigger, Privilege: manage */ \ + 0x00000034, /* Cluster: Software Diagnostics, Command: ResetWatermarks, Privilege: manage */ \ 0x00000037, /* Cluster: Ethernet Network Diagnostics, Command: ResetCounts, Privilege: manage */ \ 0x0000003C, /* Cluster: Administrator Commissioning, Command: OpenCommissioningWindow, Privilege: administer */ \ 0x0000003C, /* Cluster: Administrator Commissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \ @@ -208,6 +209,7 @@ 0x00000006, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \ 0x00000008, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \ 0x00000000, /* Cluster: General Diagnostics, Command: TestEventTrigger, Privilege: manage */ \ + 0x00000000, /* Cluster: Software Diagnostics, Command: ResetWatermarks, Privilege: manage */ \ 0x00000000, /* Cluster: Ethernet Network Diagnostics, Command: ResetCounts, Privilege: manage */ \ 0x00000000, /* Cluster: Administrator Commissioning, Command: OpenCommissioningWindow, Privilege: administer */ \ 0x00000001, /* Cluster: Administrator Commissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \ @@ -244,6 +246,7 @@ kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \ kMatterAccessPrivilegeManage, /* Cluster: General Diagnostics, Command: TestEventTrigger, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Software Diagnostics, Command: ResetWatermarks, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Ethernet Network Diagnostics, Command: ResetCounts, Privilege: manage */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Administrator Commissioning, Command: OpenCommissioningWindow, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Administrator Commissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \ diff --git a/src/app/clusters/software-diagnostics-server/software-diagnostics-server.cpp b/src/app/clusters/software-diagnostics-server/software-diagnostics-server.cpp index 3ddbe55b157f16..e024d74d61b4b8 100644 --- a/src/app/clusters/software-diagnostics-server/software-diagnostics-server.cpp +++ b/src/app/clusters/software-diagnostics-server/software-diagnostics-server.cpp @@ -92,7 +92,7 @@ CHIP_ERROR SoftwareDiagosticsAttrAccess::Read(const ConcreteReadAttributePath & if (DeviceLayer::GetDiagnosticDataProvider().SupportsWatermarks()) { - features.Set(Feature::kWaterMarks); + features.Set(Feature::kWatermarks); } return aEncoder.Encode(features); diff --git a/src/app/zap-templates/zcl/data-model/chip/software-diagnostics-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/software-diagnostics-cluster.xml index fe558cb0ea0acc..2745b367d24f58 100644 --- a/src/app/zap-templates/zcl/data-model/chip/software-diagnostics-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/software-diagnostics-cluster.xml @@ -1,6 +1,6 @@ - ActiveLocale + + ActiveLocale + + SupportedLocales diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index fc1d1b2a9658ba..6e5b4327b8c240 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -1081,7 +1081,7 @@ client cluster OtaSoftwareUpdateRequestor = 42 { standards. As such, Nodes that visually or audibly convey information need a mechanism by which they can be configured to use a user’s preferred language, units, etc */ client cluster LocalizationConfiguration = 43 { - attribute char_string<35> activeLocale = 0; + attribute access(write: manage) char_string<35> activeLocale = 0; readonly attribute char_string supportedLocales[] = 1; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; From 268951cc191783b08705c9b3fd2b97d34a257355 Mon Sep 17 00:00:00 2001 From: adabreuti <76965454+adabreuti@users.noreply.github.com> Date: Mon, 30 Oct 2023 09:47:19 -0500 Subject: [PATCH 29/41] [TI] Feature ti sysconfig 1 16 2 update (#30073) * Update README Files to reference latest SYSCONFIG Version * Update Sysconfig version for CI * Update docker version --- examples/all-clusters-app/cc13x2x7_26x2x7/README.md | 10 +++++----- examples/all-clusters-app/cc13x4_26x4/README.md | 12 ++++++------ examples/lighting-app/cc13x2x7_26x2x7/README.md | 12 ++++++------ examples/lighting-app/cc13x4_26x4/README.md | 12 ++++++------ examples/lock-app/cc13x2x7_26x2x7/README.md | 12 ++++++------ examples/lock-app/cc13x4_26x4/README.md | 12 ++++++------ .../persistent-storage/cc13x2x7_26x2x7/README.md | 4 ++-- examples/pump-app/cc13x2x7_26x2x7/README.md | 12 ++++++------ examples/pump-app/cc13x4_26x4/README.md | 12 ++++++------ .../pump-controller-app/cc13x2x7_26x2x7/README.md | 12 ++++++------ examples/pump-controller-app/cc13x4_26x4/README.md | 12 ++++++------ examples/shell/cc13x2x7_26x2x7/README.md | 12 ++++++------ examples/shell/cc13x4_26x4/README.md | 12 ++++++------ integrations/docker/images/base/chip-build/version | 2 +- .../docker/images/stage-2/chip-build-ti/Dockerfile | 8 ++++---- .../images/vscode/chip-build-vscode/Dockerfile | 4 ++-- 16 files changed, 80 insertions(+), 80 deletions(-) diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/README.md b/examples/all-clusters-app/cc13x2x7_26x2x7/README.md index f965d3dd9abbcf..68d6f927224585 100644 --- a/examples/all-clusters-app/cc13x2x7_26x2x7/README.md +++ b/examples/all-clusters-app/cc13x2x7_26x2x7/README.md @@ -68,9 +68,9 @@ guide assumes that the environment is linux based, and recommends Ubuntu 20.04. ``` $ cd ~ - $ wget https://software-dl.ti.com/ccs/esd/sysconfig/sysconfig-1.11.0_2225-setup.run - $ chmod +x sysconfig-1.11.0_2225-setup.run - $ ./sysconfig-1.11.0_2225-setup.run + $ wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run + $ chmod +x sysconfig-1.16.2_3028-setup.run + $ ./sysconfig-1.16.2_3028-setup.run ``` - Run the bootstrap script to setup the build environment. @@ -97,13 +97,13 @@ Ninja to build the executable. - Run the build to produce a default executable. By default on Linux both the TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's home directory, and you must provide the absolute path to them. For example - `/home/username/ti/sysconfig_1.11.0`. On Windows the default directory is + `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is `C:\ti`. Take note of this install path, as it will be used in the next step. ``` $ cd ~/connectedhomeip/examples/all-clusters-app/cc13x2x7_26x2x7 - $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.11.0\"" + $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\"" $ ninja -C out/debug ``` diff --git a/examples/all-clusters-app/cc13x4_26x4/README.md b/examples/all-clusters-app/cc13x4_26x4/README.md index 3415f19f1a4c21..ad8581b52cf26c 100644 --- a/examples/all-clusters-app/cc13x4_26x4/README.md +++ b/examples/all-clusters-app/cc13x4_26x4/README.md @@ -59,9 +59,9 @@ guide assumes that the environment is linux based, and recommends Ubuntu 20.04. ``` $ cd ~ - $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.15.0.2826/sysconfig-1.15.0_2826-setup.run` - $ chmod +x sysconfig-1.15.0_2826-setup.run - $ ./sysconfig-1.15.0_2826-setup.run + $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run` + $ chmod +x sysconfig-1.16.2_3028-setup.run + $ ./sysconfig-1.16.2_3028-setup.run ``` - Run the bootstrap script to setup the build environment. @@ -88,7 +88,7 @@ Ninja to build the executable. - Run the build to produce a default executable. By default on Linux both the TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's home directory, and you must provide the absolute path to them. For example - `/home/username/ti/sysconfig_1.15.0`. On Windows the default directory is + `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is `C:\ti`. Take note of this install path, as it will be used in the next step. @@ -96,7 +96,7 @@ Ninja to build the executable. $ cd ~/connectedhomeip/examples/all-clusters-app/cc13x2x7_26x2x7 OR $ cd ~/connectedhomeip/examples/all-clusters-minimal-app/cc13x4_26x4 - $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\"" + $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\"" $ ninja -C out/debug ``` @@ -105,7 +105,7 @@ Ninja to build the executable. to the GN call. ``` - gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]" + gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]" ``` ## Programming diff --git a/examples/lighting-app/cc13x2x7_26x2x7/README.md b/examples/lighting-app/cc13x2x7_26x2x7/README.md index a9eacd879f5070..f6d77a423ac37a 100644 --- a/examples/lighting-app/cc13x2x7_26x2x7/README.md +++ b/examples/lighting-app/cc13x2x7_26x2x7/README.md @@ -58,9 +58,9 @@ guide assumes that the environment is linux based, and recommends Ubuntu 20.04. ``` $ cd ~ - $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.15.0.2826/sysconfig-1.15.0_2826-setup.run` - $ chmod +x sysconfig-1.15.0_2826-setup.run - $ ./sysconfig-1.15.0_2826-setup.run + $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run` + $ chmod +x sysconfig-1.16.2_3028-setup.run + $ ./sysconfig-1.16.2_3028-setup.run ``` - Run the bootstrap script to setup the build environment. @@ -87,13 +87,13 @@ Ninja to build the executable. - Run the build to produce a default executable. By default on Linux both the TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's home directory, and you must provide the absolute path to them. For example - `/home/username/ti/sysconfig_1.15.0`. On Windows the default directory is + `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is `C:\ti`. Take note of this install path, as it will be used in the next step. ``` $ cd ~/connectedhomeip/examples/lock-app/cc13x2x7_26x2x7 - $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\"" + $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\"" $ ninja -C out/debug ``` @@ -103,7 +103,7 @@ Ninja to build the executable. ``` - gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\"" + gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\"" ``` ## Programming diff --git a/examples/lighting-app/cc13x4_26x4/README.md b/examples/lighting-app/cc13x4_26x4/README.md index beb1bfc42507be..2559c732dca70a 100644 --- a/examples/lighting-app/cc13x4_26x4/README.md +++ b/examples/lighting-app/cc13x4_26x4/README.md @@ -58,9 +58,9 @@ guide assumes that the environment is linux based, and recommends Ubuntu 20.04. ``` $ cd ~ - $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.15.0.2826/sysconfig-1.15.0_2826-setup.run` - $ chmod +x sysconfig-1.15.0_2826-setup.run - $ ./sysconfig-1.15.0_2826-setup.run + $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run` + $ chmod +x sysconfig-1.16.2_3028-setup.run + $ ./sysconfig-1.16.2_3028-setup.run ``` - Run the bootstrap script to setup the build environment. @@ -87,13 +87,13 @@ Ninja to build the executable. - Run the build to produce a default executable. By default on Linux both the TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's home directory, and you must provide the absolute path to them. For example - `/home/username/ti/sysconfig_1.15.0`. On Windows the default directory is + `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is `C:\ti`. Take note of this install path, as it will be used in the next step. ``` $ cd ~/connectedhomeip/examples/lock-app/cc13x4_26x4 - $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\"" + $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\"" $ ninja -C out/debug ``` @@ -103,7 +103,7 @@ Ninja to build the executable. ``` - gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\"" + gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\"" ``` ## Programming diff --git a/examples/lock-app/cc13x2x7_26x2x7/README.md b/examples/lock-app/cc13x2x7_26x2x7/README.md index 01e2f1a189d839..7b056d2cab29b5 100644 --- a/examples/lock-app/cc13x2x7_26x2x7/README.md +++ b/examples/lock-app/cc13x2x7_26x2x7/README.md @@ -59,9 +59,9 @@ guide assumes that the environment is linux based, and recommends Ubuntu 20.04. ``` $ cd ~ - $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.15.0.2826/sysconfig-1.15.0_2826-setup.run` - $ chmod +x sysconfig-1.15.0_2826-setup.run - $ ./sysconfig-1.15.0_2826-setup.run + $ `https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run` + $ chmod +x sysconfig-1.16.2_3028-setup.run + $ ./sysconfig-1.16.2_3028-setup.run ``` - Run the bootstrap script to setup the build environment. @@ -88,7 +88,7 @@ Ninja to build the executable. - Run the build to produce a default executable. By default on Linux both the TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's home directory, and you must provide the absolute path to them. For example - `/home/username/ti/sysconfig_1.15.0`. On Windows the default directory is + `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is `C:\ti`. Take note of this install path, as it will be used in the next step. @@ -96,7 +96,7 @@ Ninja to build the executable. $ cd ~/connectedhomeip/examples/lock-app/cc13x2x7_26x2x7 OR $ cd ~/connectedhomeip/examples/lock-app/cc13x4_26x4 - $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\"" + $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\"" $ ninja -C out/debug ``` @@ -106,7 +106,7 @@ Ninja to build the executable. ``` - gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\" target_defines=[\"CC13X2_26X2_ATTESTATION_CREDENTIALS=1\"]" + gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\" target_defines=[\"CC13X2_26X2_ATTESTATION_CREDENTIALS=1\"]" ``` ## Programming diff --git a/examples/lock-app/cc13x4_26x4/README.md b/examples/lock-app/cc13x4_26x4/README.md index 45c3a1c67309cd..a230fbb8bd5fdd 100644 --- a/examples/lock-app/cc13x4_26x4/README.md +++ b/examples/lock-app/cc13x4_26x4/README.md @@ -59,9 +59,9 @@ guide assumes that the environment is linux based, and recommends Ubuntu 20.04. ``` $ cd ~ - $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.15.0.2826/sysconfig-1.15.0_2826-setup.run` - $ chmod +x sysconfig-1.15.0_2826-setup.run - $ ./sysconfig-1.15.0_2826-setup.run + $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run` + $ chmod +x sysconfig-1.16.2_3028-setup.run + $ ./sysconfig-1.16.2_3028-setup.run ``` - Run the bootstrap script to setup the build environment. @@ -88,7 +88,7 @@ Ninja to build the executable. - Run the build to produce a default executable. By default on Linux both the TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's home directory, and you must provide the absolute path to them. For example - `/home/username/ti/sysconfig_1.15.0`. On Windows the default directory is + `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is `C:\ti`. Take note of this install path, as it will be used in the next step. @@ -96,7 +96,7 @@ Ninja to build the executable. $ cd ~/connectedhomeip/examples/lock-app/cc13x2x7_26x2x7 OR $ cd ~/connectedhomeip/examples/lock-app/cc13x4_26x4 - $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\"" + $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\"" $ ninja -C out/debug ``` @@ -106,7 +106,7 @@ Ninja to build the executable. ``` - gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]" + gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]" ``` ## Programming diff --git a/examples/persistent-storage/cc13x2x7_26x2x7/README.md b/examples/persistent-storage/cc13x2x7_26x2x7/README.md index fc06023b7edb83..87e4add6701eca 100644 --- a/examples/persistent-storage/cc13x2x7_26x2x7/README.md +++ b/examples/persistent-storage/cc13x2x7_26x2x7/README.md @@ -140,13 +140,13 @@ Ninja to build the executable. - Run the build to produce a default executable. By default on Linux both the TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's home directory, and you must provide the absolute path to them. For example - `/home/username/ti/sysconfig_1.11.0`. On Windows the default directory is + `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is `C:\ti`. Take note of this install path, as it will be used in the next step. ``` $ cd ~/connectedhomeip/examples/lock-app/cc13x2x7_26x2x7 - $ export TI_SYSCONFIG_ROOT=$HOME/ti/sysconfig_1.10.0 + $ export TI_SYSCONFIG_ROOT=$HOME/ti/sysconfig_1.16.2 $ gn gen out/debug --args="ti_sysconfig_root=\"${TI_SYSCONFIG_ROOT}\"" $ ninja -C out/debug diff --git a/examples/pump-app/cc13x2x7_26x2x7/README.md b/examples/pump-app/cc13x2x7_26x2x7/README.md index d3d53d87e7634b..6bfb8feee4665f 100644 --- a/examples/pump-app/cc13x2x7_26x2x7/README.md +++ b/examples/pump-app/cc13x2x7_26x2x7/README.md @@ -58,9 +58,9 @@ guide assumes that the environment is linux based, and recommends Ubuntu 20.04. ``` $ cd ~ - $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.15.0.2826/sysconfig-1.15.0_2826-setup.run` - $ chmod +x sysconfig-1.15.0_2826-setup.run - $ ./sysconfig-1.15.0_2826-setup.run + $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run` + $ chmod +x sysconfig-1.16.2_3028-setup.run + $ ./sysconfig-1.16.2_3028-setup.run ``` - Run the bootstrap script to setup the build environment. @@ -87,7 +87,7 @@ Ninja to build the executable. - Run the build to produce a default executable. By default on Linux both the TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's home directory, and you must provide the absolute path to them. For example - `/home/username/ti/sysconfig_1.15.0`. On Windows the default directory is + `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is `C:\ti`. Take note of this install path, as it will be used in the next step. @@ -95,7 +95,7 @@ Ninja to build the executable. $ cd ~/connectedhomeip/examples/pump-app/cc13x2x7_26x2x7 OR $ cd ~/connectedhomeip/examples/pump-app/cc13x4_26x4 - $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\"" + $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\"" $ ninja -C out/debug ``` @@ -104,7 +104,7 @@ Ninja to build the executable. to the GN call. ``` - gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\" target_defines=[\"CC13X2_26X2_ATTESTATION_CREDENTIALS=1\"]" + gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\" target_defines=[\"CC13X2_26X2_ATTESTATION_CREDENTIALS=1\"]" ``` ## Programming diff --git a/examples/pump-app/cc13x4_26x4/README.md b/examples/pump-app/cc13x4_26x4/README.md index 08385526ae14d9..7ad0521fef77de 100644 --- a/examples/pump-app/cc13x4_26x4/README.md +++ b/examples/pump-app/cc13x4_26x4/README.md @@ -58,9 +58,9 @@ guide assumes that the environment is linux based, and recommends Ubuntu 20.04. ``` $ cd ~ - $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.15.0.2826/sysconfig-1.15.0_2826-setup.run` - $ chmod +x sysconfig-1.15.0_2826-setup.run - $ ./sysconfig-1.15.0_2826-setup.run + $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run` + $ chmod +x sysconfig-1.16.2_3028-setup.run + $ ./sysconfig-1.16.2_3028-setup.run ``` - Run the bootstrap script to setup the build environment. @@ -87,7 +87,7 @@ Ninja to build the executable. - Run the build to produce a default executable. By default on Linux both the TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's home directory, and you must provide the absolute path to them. For example - `/home/username/ti/sysconfig_1.15.0`. On Windows the default directory is + `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is `C:\ti`. Take note of this install path, as it will be used in the next step. @@ -95,7 +95,7 @@ Ninja to build the executable. $ cd ~/connectedhomeip/examples/pump-app/cc13x2x7_26x2x7 OR $ cd ~/connectedhomeip/examples/pump-app/cc13x4_26x4 - $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\"" + $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\"" $ ninja -C out/debug ``` @@ -104,7 +104,7 @@ Ninja to build the executable. to the GN call. ``` - gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]" + gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]" ``` ## Programming diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/README.md b/examples/pump-controller-app/cc13x2x7_26x2x7/README.md index 90df4c9c7bd521..f20a3151e912a2 100644 --- a/examples/pump-controller-app/cc13x2x7_26x2x7/README.md +++ b/examples/pump-controller-app/cc13x2x7_26x2x7/README.md @@ -59,9 +59,9 @@ guide assumes that the environment is linux based, and recommends Ubuntu 20.04. ``` $ cd ~ - $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.15.0.2826/sysconfig-1.15.0_2826-setup.run` - $ chmod +x sysconfig-1.15.0_2826-setup.run - $ ./sysconfig-1.15.0_2826-setup.run + $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run` + $ chmod +x sysconfig-1.16.2_3028-setup.run + $ ./sysconfig-1.16.2_3028-setup.run ``` - Run the bootstrap script to setup the build environment. @@ -88,7 +88,7 @@ Ninja to build the executable. - Run the build to produce a default executable. By default on Linux both the TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's home directory, and you must provide the absolute path to them. For example - `/home/username/ti/sysconfig_1.15.0`. On Windows the default directory is + `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is `C:\ti`. Take note of this install path, as it will be used in the next step. @@ -96,7 +96,7 @@ Ninja to build the executable. $ cd ~/connectedhomeip/examples/pump-controller-app/cc13x2x7_26x2x7 OR $ cd ~/connectedhomeip/examples/pump-controller-app/cc13x4_26x4 - $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\"" + $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\"" $ ninja -C out/debug ``` @@ -105,7 +105,7 @@ Ninja to build the executable. to the GN call. ``` - gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\" target_defines=[\"CC13X2_26X2_ATTESTATION_CREDENTIALS=1\"]" + gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\" target_defines=[\"CC13X2_26X2_ATTESTATION_CREDENTIALS=1\"]" ``` ## Programming diff --git a/examples/pump-controller-app/cc13x4_26x4/README.md b/examples/pump-controller-app/cc13x4_26x4/README.md index dc917f93c5544e..15894f7d596323 100644 --- a/examples/pump-controller-app/cc13x4_26x4/README.md +++ b/examples/pump-controller-app/cc13x4_26x4/README.md @@ -59,9 +59,9 @@ guide assumes that the environment is linux based, and recommends Ubuntu 20.04. ``` $ cd ~ - $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.15.0.2826/sysconfig-1.15.0_2826-setup.run` - $ chmod +x sysconfig-1.15.0_2826-setup.run - $ ./sysconfig-1.15.0_2826-setup.run + $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run` + $ chmod +x sysconfig-1.16.2_3028-setup.run + $ ./sysconfig-1.16.2_3028-setup.run ``` - Run the bootstrap script to setup the build environment. @@ -88,7 +88,7 @@ Ninja to build the executable. - Run the build to produce a default executable. By default on Linux both the TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's home directory, and you must provide the absolute path to them. For example - `/home/username/ti/sysconfig_1.15.0`. On Windows the default directory is + `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is `C:\ti`. Take note of this install path, as it will be used in the next step. @@ -96,7 +96,7 @@ Ninja to build the executable. $ cd ~/connectedhomeip/examples/pump-controller-app/cc13x2x7_26x2x7 OR $ cd ~/connectedhomeip/examples/pump-controller-app/cc13x4_26x4 - $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\"" + $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\"" $ ninja -C out/debug ``` @@ -105,7 +105,7 @@ Ninja to build the executable. to the GN call. ``` - gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]" + gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]" ``` ## Programming diff --git a/examples/shell/cc13x2x7_26x2x7/README.md b/examples/shell/cc13x2x7_26x2x7/README.md index 478e3dc8821bd7..69fdf781446afd 100644 --- a/examples/shell/cc13x2x7_26x2x7/README.md +++ b/examples/shell/cc13x2x7_26x2x7/README.md @@ -16,9 +16,9 @@ guide assumes that the environment is linux based, and recommends Ubuntu 20.04. ``` $ cd ~ - $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.15.0.2826/sysconfig-1.15.0_2826-setup.run` - $ chmod +x sysconfig-1.15.0_2826-setup.run - $ ./sysconfig-1.15.0_2826-setup.run + $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run` + $ chmod +x sysconfig-1.16.2_3028-setup.run + $ ./sysconfig-1.16.2_3028-setup.run ``` - Run the bootstrap script to setup the build environment. @@ -45,7 +45,7 @@ Ninja to build the executable. - Run the build to produce a default executable. By default on Linux both the TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's home directory, and you must provide the absolute path to them. For example - `/home/username/ti/sysconfig_1.15.0`. On Windows the default directory is + `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is `C:\ti`. Take note of this install path, as it will be used in the next step. @@ -54,7 +54,7 @@ Ninja to build the executable. OR $ cd ~/connectedhomeip/examples/shell/cc13x4_26x4 - $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\"" + $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\"" $ ninja -C out/debug ``` @@ -63,7 +63,7 @@ Ninja to build the executable. to the GN call. ``` - gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]" + gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]" ``` ## Programming diff --git a/examples/shell/cc13x4_26x4/README.md b/examples/shell/cc13x4_26x4/README.md index 9145e19f58ad07..08be886e6fb86e 100644 --- a/examples/shell/cc13x4_26x4/README.md +++ b/examples/shell/cc13x4_26x4/README.md @@ -16,9 +16,9 @@ guide assumes that the environment is linux based, and recommends Ubuntu 20.04. ``` $ cd ~ - $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.15.0.2826/sysconfig-1.15.0_2826-setup.run` - $ chmod +x sysconfig-1.15.0_2826-setup.run - $ ./sysconfig-1.15.0_2826-setup.run + $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run` + $ chmod +x sysconfig-1.16.2_3028-setup.run + $ ./sysconfig-1.16.2_3028-setup.run ``` - Run the bootstrap script to setup the build environment. @@ -45,7 +45,7 @@ Ninja to build the executable. - Run the build to produce a default executable. By default on Linux both the TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's home directory, and you must provide the absolute path to them. For example - `/home/username/ti/sysconfig_1.15.0`. On Windows the default directory is + `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is `C:\ti`. Take note of this install path, as it will be used in the next step. @@ -53,7 +53,7 @@ Ninja to build the executable. $ cd ~/connectedhomeip/examples/shell/cc13x2x7_26x2x7 OR $ cd ~/connectedhomeip/examples/shell/cc13x4_26x4 - $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15" + $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2" $ ninja -C out/debug ``` @@ -62,7 +62,7 @@ Ninja to build the executable. to the GN call. ``` - gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]" + gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]" ``` ## Programming diff --git a/integrations/docker/images/base/chip-build/version b/integrations/docker/images/base/chip-build/version index 70c0f8738d6b29..d9efef43fe6d6d 100644 --- a/integrations/docker/images/base/chip-build/version +++ b/integrations/docker/images/base/chip-build/version @@ -1 +1 @@ -22 : [Telink] Cleanup Docker image +23 : [TI] Update Sysconfig version diff --git a/integrations/docker/images/stage-2/chip-build-ti/Dockerfile b/integrations/docker/images/stage-2/chip-build-ti/Dockerfile index 0cc77621bde754..4bc15b67f77164 100644 --- a/integrations/docker/images/stage-2/chip-build-ti/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-ti/Dockerfile @@ -12,9 +12,9 @@ RUN set -x \ # Install Sysconfig RUN set -x \ - && wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.15.0.2826/sysconfig-1.15.0_2826-setup.run \ - && chmod +x sysconfig-1.15.0_2826-setup.run \ - && ./sysconfig-1.15.0_2826-setup.run --mode unattended \ + && wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run \ + && chmod +x sysconfig-1.16.2_3028-setup.run \ + && ./sysconfig-1.16.2_3028-setup.run --mode unattended \ && : # last line -ENV TI_SYSCONFIG_ROOT=/opt/ti/sysconfig_1.15.0 +ENV TI_SYSCONFIG_ROOT=/opt/ti/sysconfig_1.16.2 diff --git a/integrations/docker/images/vscode/chip-build-vscode/Dockerfile b/integrations/docker/images/vscode/chip-build-vscode/Dockerfile index d824716800004e..fbe5986187ca6d 100644 --- a/integrations/docker/images/vscode/chip-build-vscode/Dockerfile +++ b/integrations/docker/images/vscode/chip-build-vscode/Dockerfile @@ -52,7 +52,7 @@ COPY --from=k32w /opt/sdk /opt/k32w COPY --from=imx /opt/fsl-imx-xwayland /opt/fsl-imx-xwayland -COPY --from=ti /opt/ti/sysconfig_1.15.0 /opt/ti/sysconfig_1.15.0 +COPY --from=ti /opt/ti/sysconfig_1.16.2 /opt/ti/sysconfig_1.16.2 COPY --from=openiotsdk /opt/FVP_Corstone_SSE-300/ /opt/FVP_Corstone_SSE-300/ @@ -120,7 +120,7 @@ ENV QEMU_ESP32_DIR=/opt/espressif/qemu ENV SYSROOT_AARCH64=/opt/ubuntu-22.04.1-aarch64-sysroot ENV TELINK_ZEPHYR_BASE=/opt/telink/zephyrproject/zephyr ENV TELINK_ZEPHYR_SDK_DIR=/opt/telink/zephyr-sdk-0.16.1 -ENV TI_SYSCONFIG_ROOT=/opt/ti/sysconfig_1.15.0 +ENV TI_SYSCONFIG_ROOT=/opt/ti/sysconfig_1.16.2 ENV ZEPHYR_BASE=/opt/NordicSemiconductor/nrfconnect/zephyr ENV ZEPHYR_SDK_INSTALL_DIR=/opt/NordicSemiconductor/nRF5_tools/zephyr-sdk-0.16.0 ENV ZEPHYR_TOOLCHAIN_VARIANT=gnuarmemb From 1d28109748c82c350ad2a000f121a329930979f9 Mon Sep 17 00:00:00 2001 From: Yufeng Wang Date: Mon, 30 Oct 2023 10:04:29 -0700 Subject: [PATCH 30/41] [Kotlin] Uses Kotlin's coroutines to handle the asynchronous operation and returns the result directly (#30082) * Update the kotlin type mapping * Remove callback from fun --- .../generators/kotlin/MatterClusters.jinja | 119 +- .../matter_idl/generators/kotlin/__init__.py | 68 +- .../cluster/clusters/AccessControlCluster.kt | 157 +- .../cluster/clusters/AccountLoginCluster.kt | 113 +- .../cluster/clusters/ActionsCluster.kt | 278 +-- .../ActivatedCarbonFilterMonitoringCluster.kt | 168 +- .../AdministratorCommissioningCluster.kt | 149 +- .../cluster/clusters/AirQualityCluster.kt | 93 +- .../clusters/ApplicationBasicCluster.kt | 163 +- .../clusters/ApplicationLauncherCluster.kt | 169 +- .../cluster/clusters/AudioOutputCluster.kt | 129 +- .../clusters/BallastConfigurationCluster.kt | 312 +-- .../cluster/clusters/BarrierControlCluster.kt | 229 +- .../clusters/BasicInformationCluster.kt | 301 +-- .../clusters/BinaryInputBasicCluster.kt | 205 +- .../cluster/clusters/BindingCluster.kt | 114 +- .../cluster/clusters/BooleanStateCluster.kt | 93 +- .../BridgedDeviceBasicInformationCluster.kt | 228 +- ...nDioxideConcentrationMeasurementCluster.kt | 207 +- ...MonoxideConcentrationMeasurementCluster.kt | 207 +- .../cluster/clusters/ChannelCluster.kt | 176 +- .../cluster/clusters/ColorControlCluster.kt | 1180 +++------ .../clusters/ContentLauncherCluster.kt | 151 +- .../cluster/clusters/DescriptorCluster.kt | 164 +- .../cluster/clusters/DiagnosticLogsCluster.kt | 122 +- .../clusters/DishwasherAlarmCluster.kt | 119 +- .../cluster/clusters/DishwasherModeCluster.kt | 175 +- .../cluster/clusters/DoorLockCluster.kt | 873 +++---- .../clusters/ElectricalMeasurementCluster.kt | 1168 +++------ .../EthernetNetworkDiagnosticsCluster.kt | 187 +- .../cluster/clusters/FanControlCluster.kt | 273 +- .../cluster/clusters/FaultInjectionCluster.kt | 129 +- .../cluster/clusters/FixedLabelCluster.kt | 101 +- .../clusters/FlowMeasurementCluster.kt | 138 +- ...aldehydeConcentrationMeasurementCluster.kt | 207 +- .../clusters/GeneralCommissioningCluster.kt | 213 +- .../clusters/GeneralDiagnosticsCluster.kt | 211 +- .../clusters/GroupKeyManagementCluster.kt | 208 +- .../cluster/clusters/GroupsCluster.kt | 177 +- .../clusters/HepaFilterMonitoringCluster.kt | 167 +- .../cluster/clusters/IcdManagementCluster.kt | 197 +- .../cluster/clusters/IdentifyCluster.kt | 132 +- .../clusters/IlluminanceMeasurementCluster.kt | 153 +- .../cluster/clusters/KeypadInputCluster.kt | 99 +- .../clusters/LaundryWasherControlsCluster.kt | 154 +- .../clusters/LaundryWasherModeCluster.kt | 175 +- .../cluster/clusters/LevelControlCluster.kt | 481 ++-- .../LocalizationConfigurationCluster.kt | 116 +- .../cluster/clusters/LowPowerCluster.kt | 93 +- .../cluster/clusters/MediaInputCluster.kt | 138 +- .../cluster/clusters/MediaPlaybackCluster.kt | 258 +- .../cluster/clusters/ModeSelectCluster.kt | 188 +- .../clusters/NetworkCommissioningCluster.kt | 361 +-- ...nDioxideConcentrationMeasurementCluster.kt | 207 +- .../clusters/OccupancySensingCluster.kt | 259 +- .../cluster/clusters/OnOffCluster.kt | 209 +- .../OnOffSwitchConfigurationCluster.kt | 109 +- .../clusters/OperationalCredentialsCluster.kt | 278 +-- .../clusters/OperationalStateCluster.kt | 211 +- .../OtaSoftwareUpdateProviderCluster.kt | 179 +- .../OtaSoftwareUpdateRequestorCluster.kt | 176 +- .../OzoneConcentrationMeasurementCluster.kt | 207 +- .../Pm10ConcentrationMeasurementCluster.kt | 207 +- .../Pm1ConcentrationMeasurementCluster.kt | 207 +- .../Pm25ConcentrationMeasurementCluster.kt | 207 +- .../cluster/clusters/PowerSourceCluster.kt | 425 +--- .../PowerSourceConfigurationCluster.kt | 101 +- .../clusters/PressureMeasurementCluster.kt | 199 +- .../clusters/ProxyConfigurationCluster.kt | 85 +- .../cluster/clusters/ProxyDiscoveryCluster.kt | 85 +- .../cluster/clusters/ProxyValidCluster.kt | 85 +- .../clusters/PulseWidthModulationCluster.kt | 85 +- .../PumpConfigurationAndControlCluster.kt | 431 +--- .../RadonConcentrationMeasurementCluster.kt | 207 +- .../clusters/RefrigeratorAlarmCluster.kt | 101 +- ...TemperatureControlledCabinetModeCluster.kt | 181 +- .../RelativeHumidityMeasurementCluster.kt | 138 +- .../cluster/clusters/RvcCleanModeCluster.kt | 152 +- .../clusters/RvcOperationalStateCluster.kt | 213 +- .../cluster/clusters/RvcRunModeCluster.kt | 152 +- .../cluster/clusters/SampleMeiCluster.kt | 130 +- .../cluster/clusters/ScenesCluster.kt | 433 ++-- .../cluster/clusters/SmokeCoAlarmCluster.kt | 204 +- .../clusters/SoftwareDiagnosticsCluster.kt | 134 +- .../cluster/clusters/SwitchCluster.kt | 109 +- .../clusters/TargetNavigatorCluster.kt | 133 +- .../clusters/TemperatureControlCluster.kt | 162 +- .../clusters/TemperatureMeasurementCluster.kt | 138 +- .../cluster/clusters/ThermostatCluster.kt | 850 ++----- ...mostatUserInterfaceConfigurationCluster.kt | 134 +- .../ThreadNetworkDiagnosticsCluster.kt | 746 ++---- .../clusters/TimeFormatLocalizationCluster.kt | 132 +- .../clusters/TimeSynchronizationCluster.kt | 313 +-- ...ompoundsConcentrationMeasurementCluster.kt | 207 +- .../clusters/UnitLocalizationCluster.kt | 101 +- .../cluster/clusters/UnitTestingCluster.kt | 2186 +++++------------ .../cluster/clusters/UserLabelCluster.kt | 109 +- .../cluster/clusters/WakeOnLanCluster.kt | 93 +- .../clusters/WiFiNetworkDiagnosticsCluster.kt | 286 +-- .../cluster/clusters/WindowCoveringCluster.kt | 399 +-- 100 files changed, 7129 insertions(+), 17152 deletions(-) diff --git a/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterClusters.jinja b/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterClusters.jinja index 52dc2021b42189..2562d5faf2245b 100644 --- a/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterClusters.jinja +++ b/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterClusters.jinja @@ -11,7 +11,7 @@ {%- set struct = encodable.get_underlying_struct() -%} ChipStructs.{{source.name}}Cluster{{struct.name}} {%- else -%} - {{encodable.boxed_java_type}} + {{encodable.kotlin_type}} {%- endif -%} {%- endmacro -%} @@ -24,7 +24,7 @@ {%- set struct = encodable.get_underlying_struct() -%} ChipStructs.{{source.name}}Cluster{{struct.name}} {%- else -%} - {{encodable.boxed_java_type}} + {{encodable.kotlin_type}} {%- endif -%} {%- endmacro -%} @@ -35,7 +35,7 @@ {%- set struct = encodable.get_underlying_struct() -%} ChipStructs.{{source.name}}Cluster{{struct.name}} {%- else -%} - {{encodable.boxed_java_type}} + {{encodable.kotlin_type}} {%- endif -%} {%- endmacro -%} @@ -61,77 +61,84 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList {% set typeLookup = idl | createLookupContext(cluster) %} class {{cluster.name}}Cluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = {{cluster.code}}u - } -{% for command in cluster.commands | sort(attribute='code') -%} -{%- set callbackName = command | javaCommandCallbackName() -%} -{%- if not command.is_timed_invoke %} - fun {{command.name | lowfirst_except_acronym}}(callback: {{callbackName}}Callback -{%- if command.input_param -%} -{%- for field in (cluster.structs | named(command.input_param)).fields -%} - , {{field.name | lowfirst_except_acronym}}: {{encode_value(cluster, field | asEncodable(typeLookup), 0)}} -{%- endfor -%} -{%- endif -%} - ) { - // Implementation needs to be added here - } -{%- endif %} - fun {{command.name | lowfirst_except_acronym}}(callback: {{callbackName}}Callback -{%- if command.input_param -%} -{%- for field in (cluster.structs | named(command.input_param)).fields -%} - , {{field.name | lowfirst_except_acronym}}: {{encode_value(cluster, field | asEncodable(typeLookup), 0)}} -{%- endfor -%} -{%- endif -%} - , timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } -{% endfor %} {%- set already_handled_command = [] -%} {%- for command in cluster.commands | sort(attribute='code') -%} {%- if command | isCommandNotDefaultCallback() -%} {%- set callbackName = command | javaCommandCallbackName() -%} {%- if callbackName not in already_handled_command %} - interface {{callbackName}}Callback { - fun onSuccess( -{%- for field in (cluster.structs | named(command.output_param)).fields -%} - {{field.name | lowfirst_except_acronym}}: {{encode_value(cluster, field | asEncodable(typeLookup), 0)}}{% if not loop.last %}, {% endif %} -{%- endfor -%} - ) - fun onError(error: Exception) - } + class {{callbackName}}( +{%- for field in (cluster.structs | named(command.output_param)).fields %} + val {{field.name | lowfirst_except_acronym}}: {{encode_value(cluster, field | asEncodable(typeLookup), 0)}} +{%- if not loop.last %}, {% endif %} +{%- endfor %} + ) {% if already_handled_command.append(callbackName) -%} {%- endif -%} {%- endif -%} {%- endif -%} {%- endfor %} + {%- set already_handled_attribute = [] -%} {% for attribute in cluster.attributes | rejectattr('definition', 'is_field_global_name', typeLookup) %} {%- set encodable = attribute.definition | asEncodable(typeLookup) -%} {%- set interfaceName = attribute | javaAttributeCallbackName(typeLookup) -%} {%- if interfaceName not in already_handled_attribute %} - interface {{interfaceName}} { - fun onSuccess(value: {{encode_value(cluster, encodable, 0)}}) - fun onError(ex: Exception) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class {{interfaceName}}( + val value: {{encode_value(cluster, encodable, 0)}} + ) {% if already_handled_attribute.append(interfaceName) -%} {#- This block does nothing, it only exists to append to already_handled_attribute. -#} {%- endif -%} {%- endif -%} {% endfor -%} + +{%- for command in cluster.commands | sort(attribute='code') -%} +{%- set callbackName = command | javaCommandCallbackName() -%} +{%- if not command.is_timed_invoke %} + suspend fun {{command.name | lowfirst_except_acronym}}( +{%- if command.input_param -%} +{%- for field in (cluster.structs | named(command.input_param)).fields -%} + {{field.name | lowfirst_except_acronym}}: {{encode_value(cluster, field | asEncodable(typeLookup), 0)}} +{%- if not loop.last -%}, {% endif %} +{%- endfor -%} +{%- endif -%} + ) +{%- if command | hasResponse -%} + : {{callbackName}} { +{%- else %} { +{%- endif %} + // Implementation needs to be added here + } +{%- endif %} + + suspend fun {{command.name | lowfirst_except_acronym}}( +{%- if command.input_param -%} +{%- for field in (cluster.structs | named(command.input_param)).fields -%} + {{field.name | lowfirst_except_acronym}}: {{encode_value(cluster, field | asEncodable(typeLookup), 0)}} +{%- if not loop.last -%}, {% endif %} +{%- endfor -%} + , timedInvokeTimeoutMs: Int) +{%- else -%} + timedInvokeTimeoutMs: Int) +{%- endif -%} +{%- if command | hasResponse -%} + : {{callbackName}} { +{%- else %} { +{%- endif %} + // Implementation needs to be added here + } +{% endfor -%} + {% for attribute in cluster.attributes | sort(attribute='code') %} - fun read{{ attribute.definition.name | upfirst }}Attribute( - callback: {{ attribute | javaAttributeCallbackName(typeLookup) }} - ) { +{%- set interfaceName = attribute | javaAttributeCallbackName(typeLookup) %} + suspend fun read{{ attribute.definition.name | upfirst }}Attribute(): {{interfaceName}} { // Implementation needs to be added here } {% if attribute | isFabricScopedList(typeLookup) %} - fun read{{ attribute.definition.name | upfirst }}AttributeWithFabricFilter( - callback: {{ attribute | javaAttributeCallbackName(typeLookup) }}, + suspend fun read{{ attribute.definition.name | upfirst }}AttributeWithFabricFilter( isFabricFiltered: Boolean - ) { + ): {{interfaceName}} { // Implementation needs to be added here } @@ -140,15 +147,13 @@ class {{cluster.name}}Cluster(private val endpointId: UShort) { {%- set encodable = attribute.definition | asEncodable(typeLookup) -%} {%- set encodable2 = attribute.definition | asEncodable(typeLookup) -%} {%- if not attribute.requires_timed_write %} - fun write{{ attribute.definition.name | upfirst }}Attribute( - callback: DefaultClusterCallback, + suspend fun write{{ attribute.definition.name | upfirst }}Attribute( value: {{ encode_value_without_optional_nullable(cluster, encodable, 0) }} ) { // Implementation needs to be added here } {% endif %} - fun write{{ attribute.definition.name | upfirst }}Attribute( - callback: DefaultClusterCallback, + suspend fun write{{ attribute.definition.name | upfirst }}Attribute( value: {{ encode_value_without_optional_nullable(cluster, encodable2, 0) }}, timedWriteTimeoutMs: Int ) { @@ -156,13 +161,15 @@ class {{cluster.name}}Cluster(private val endpointId: UShort) { } {% endif %} {%- if attribute.is_subscribable %} - fun subscribe{{ attribute.definition.name | upfirst }}Attribute( - callback: {{ attribute | javaAttributeCallbackName(typeLookup) }}, + suspend fun subscribe{{ attribute.definition.name | upfirst }}Attribute( minInterval: Int, maxInterval: Int - ) { + ): {{interfaceName}} { // Implementation needs to be added here } {% endif -%} -{%- endfor -%} +{%- endfor %} + companion object { + const val CLUSTER_ID: UInt = {{cluster.code}}u + } } diff --git a/scripts/py_matter_idl/matter_idl/generators/kotlin/__init__.py b/scripts/py_matter_idl/matter_idl/generators/kotlin/__init__.py index 15e2f7c83a9b4b..0650d8c1b5e080 100644 --- a/scripts/py_matter_idl/matter_idl/generators/kotlin/__init__.py +++ b/scripts/py_matter_idl/matter_idl/generators/kotlin/__init__.py @@ -212,9 +212,9 @@ def JavaAttributeCallbackName(attr: Attribute, context: TypeLookupContext) -> st global_name = FieldToGlobalName(attr.definition, context) if global_name: - return '{}AttributeCallback'.format(GlobalNameToJavaName(global_name)) + return '{}'.format(GlobalNameToJavaName(global_name)) - return '{}AttributeCallback'.format(capitalcase(attr.definition.name)) + return '{}Attribute'.format(capitalcase(attr.definition.name)) def IsFieldGlobalName(field: Field, context: TypeLookupContext) -> bool: @@ -404,43 +404,6 @@ def get_underlying_enum(self): raise Exception("Enum %s not found" % self.data_type.name) return e - @property - def boxed_java_type(self): - t = ParseDataType(self.data_type, self.context) - - if isinstance(t, FundamentalType): - if t == FundamentalType.BOOL: - return "Boolean" - elif t == FundamentalType.FLOAT: - return "Float" - elif t == FundamentalType.DOUBLE: - return "Double" - else: - raise Exception("Unknown fundamental type") - elif isinstance(t, BasicInteger): - # the >= 3 will include int24_t to be considered "long" - if t.byte_count >= 3: - return "Long" - else: - return "Integer" - elif isinstance(t, BasicString): - if t.is_binary: - return "ByteArray" - else: - return "String" - elif isinstance(t, IdlEnumType): - if t.base_type.byte_count >= 3: - return "Long" - else: - return "Integer" - elif isinstance(t, IdlBitmapType): - if t.base_type.byte_count >= 3: - return "Long" - else: - return "Integer" - else: - return "Object" - @property def kotlin_type(self): t = ParseDataType(self.data_type, self.context) @@ -455,17 +418,22 @@ def kotlin_type(self): else: raise Exception("Unknown fundamental type") elif isinstance(t, BasicInteger): - # the >= 3 will include int24_t to be considered "long" if t.is_signed: - if t.byte_count >= 3: - return "Long" - else: + if t.byte_count <= 1: + return "Byte" + if t.byte_count <= 2: + return "Short" + if t.byte_count <= 4: return "Int" - else: - if t.byte_count >= 3: - return "ULong" - else: + return "Long" + else: # unsigned + if t.byte_count <= 1: + return "UByte" + if t.byte_count <= 2: + return "UShort" + if t.byte_count <= 4: return "UInt" + return "ULong" elif isinstance(t, BasicString): if t.is_binary: return "ByteArray" @@ -615,6 +583,11 @@ def IsFabricScopedList(attr: Attribute, lookup: TypeLookupContext) -> bool: return struct and struct.qualities == StructQuality.FABRIC_SCOPED +def CommandHasResponse(command: Command) -> bool: + """Returns true if a command has a specific response.""" + return command.output_param != "DefaultSuccess" + + def IsResponseStruct(s: Struct) -> bool: return s.tag == StructTag.RESPONSE @@ -649,6 +622,7 @@ def __init__(self, storage: GeneratorStorage, idl: Idl, **kargs): self.jinja_env.filters['createLookupContext'] = CreateLookupContext self.jinja_env.filters['canGenerateSubscribe'] = CanGenerateSubscribe self.jinja_env.filters['isFabricScopedList'] = IsFabricScopedList + self.jinja_env.filters['hasResponse'] = CommandHasResponse self.jinja_env.tests['is_response_struct'] = IsResponseStruct self.jinja_env.tests['is_using_global_callback'] = _IsUsingGlobalCallback diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AccessControlCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AccessControlCluster.kt index a16aec610367ed..bb31661959c92c 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AccessControlCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AccessControlCluster.kt @@ -20,224 +20,165 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class AccessControlCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 31u - } - - interface AclAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface ExtensionAttributeCallback { - fun onSuccess(value: ArrayList?) - - fun onError(ex: Exception) + class AclAttribute( + val value: ArrayList + ) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) + class ExtensionAttribute( + val value: ArrayList? + ) - fun onError(ex: Exception) + class GeneratedCommandListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AcceptedCommandListAttribute(val value: ArrayList) - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) + class EventListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class AttributeListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readAclAttribute(callback: AclAttributeCallback) { + suspend fun readAclAttribute(): AclAttribute { // Implementation needs to be added here } - fun readAclAttributeWithFabricFilter(callback: AclAttributeCallback, isFabricFiltered: Boolean) { + suspend fun readAclAttributeWithFabricFilter(isFabricFiltered: Boolean): AclAttribute { // Implementation needs to be added here } - fun writeAclAttribute( - callback: DefaultClusterCallback, + suspend fun writeAclAttribute( value: ArrayList ) { // Implementation needs to be added here } - fun writeAclAttribute( - callback: DefaultClusterCallback, + suspend fun writeAclAttribute( value: ArrayList, timedWriteTimeoutMs: Int ) { // Implementation needs to be added here } - fun subscribeAclAttribute(callback: AclAttributeCallback, minInterval: Int, maxInterval: Int) { + suspend fun subscribeAclAttribute(minInterval: Int, maxInterval: Int): AclAttribute { // Implementation needs to be added here } - fun readExtensionAttribute(callback: ExtensionAttributeCallback) { + suspend fun readExtensionAttribute(): ExtensionAttribute { // Implementation needs to be added here } - fun readExtensionAttributeWithFabricFilter( - callback: ExtensionAttributeCallback, + suspend fun readExtensionAttributeWithFabricFilter( isFabricFiltered: Boolean - ) { + ): ExtensionAttribute { // Implementation needs to be added here } - fun writeExtensionAttribute( - callback: DefaultClusterCallback, + suspend fun writeExtensionAttribute( value: ArrayList ) { // Implementation needs to be added here } - fun writeExtensionAttribute( - callback: DefaultClusterCallback, + suspend fun writeExtensionAttribute( value: ArrayList, timedWriteTimeoutMs: Int ) { // Implementation needs to be added here } - fun subscribeExtensionAttribute( - callback: ExtensionAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeExtensionAttribute(minInterval: Int, maxInterval: Int): ExtensionAttribute { // Implementation needs to be added here } - fun readSubjectsPerAccessControlEntryAttribute(callback: IntegerAttributeCallback) { + suspend fun readSubjectsPerAccessControlEntryAttribute(): Integer { // Implementation needs to be added here } - fun subscribeSubjectsPerAccessControlEntryAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeSubjectsPerAccessControlEntryAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readTargetsPerAccessControlEntryAttribute(callback: IntegerAttributeCallback) { + suspend fun readTargetsPerAccessControlEntryAttribute(): Integer { // Implementation needs to be added here } - fun subscribeTargetsPerAccessControlEntryAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeTargetsPerAccessControlEntryAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readAccessControlEntriesPerFabricAttribute(callback: IntegerAttributeCallback) { + suspend fun readAccessControlEntriesPerFabricAttribute(): Integer { // Implementation needs to be added here } - fun subscribeAccessControlEntriesPerFabricAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeAccessControlEntriesPerFabricAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 31u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AccountLoginCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AccountLoginCluster.kt index 511713c5df05b5..5c7ee571556c36 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AccountLoginCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AccountLoginCluster.kt @@ -20,138 +20,89 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class AccountLoginCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 1294u - } + class GetSetupPINResponse(val setupPIN: String) - fun getSetupPIN( - callback: GetSetupPINResponseCallback, - tempAccountIdentifier: String, - timedInvokeTimeoutMs: Int - ) { - // Implementation needs to be added here - } + class GeneratedCommandListAttribute(val value: ArrayList) + + class AcceptedCommandListAttribute(val value: ArrayList) + + class EventListAttribute(val value: ArrayList) + + class AttributeListAttribute(val value: ArrayList) - fun login( - callback: DefaultClusterCallback, + suspend fun getSetupPIN( tempAccountIdentifier: String, - setupPIN: String, timedInvokeTimeoutMs: Int - ) { + ): GetSetupPINResponse { // Implementation needs to be added here } - fun logout(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) { + suspend fun login(tempAccountIdentifier: String, setupPIN: String, timedInvokeTimeoutMs: Int) { // Implementation needs to be added here } - interface GetSetupPINResponseCallback { - fun onSuccess(setupPIN: String) - - fun onError(error: Exception) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun logout(timedInvokeTimeoutMs: Int) { + // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 1294u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ActionsCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ActionsCluster.kt index 584c8d537cc9df..112a217dfa2bba 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ActionsCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ActionsCluster.kt @@ -20,349 +20,231 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class ActionsCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 37u - } + class ActionListAttribute(val value: ArrayList) + + class EndpointListsAttribute(val value: ArrayList) + + class GeneratedCommandListAttribute(val value: ArrayList) - fun instantAction(callback: DefaultClusterCallback, actionID: Integer, invokeID: Long?) { + class AcceptedCommandListAttribute(val value: ArrayList) + + class EventListAttribute(val value: ArrayList) + + class AttributeListAttribute(val value: ArrayList) + + suspend fun instantAction(actionID: UShort, invokeID: UInt?) { // Implementation needs to be added here } - fun instantAction( - callback: DefaultClusterCallback, - actionID: Integer, - invokeID: Long?, - timedInvokeTimeoutMs: Int - ) { + suspend fun instantAction(actionID: UShort, invokeID: UInt?, timedInvokeTimeoutMs: Int) { // Implementation needs to be added here } - fun instantActionWithTransition( - callback: DefaultClusterCallback, - actionID: Integer, - invokeID: Long?, - transitionTime: Integer + suspend fun instantActionWithTransition( + actionID: UShort, + invokeID: UInt?, + transitionTime: UShort ) { // Implementation needs to be added here } - fun instantActionWithTransition( - callback: DefaultClusterCallback, - actionID: Integer, - invokeID: Long?, - transitionTime: Integer, + suspend fun instantActionWithTransition( + actionID: UShort, + invokeID: UInt?, + transitionTime: UShort, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - fun startAction(callback: DefaultClusterCallback, actionID: Integer, invokeID: Long?) { + suspend fun startAction(actionID: UShort, invokeID: UInt?) { // Implementation needs to be added here } - fun startAction( - callback: DefaultClusterCallback, - actionID: Integer, - invokeID: Long?, - timedInvokeTimeoutMs: Int - ) { + suspend fun startAction(actionID: UShort, invokeID: UInt?, timedInvokeTimeoutMs: Int) { // Implementation needs to be added here } - fun startActionWithDuration( - callback: DefaultClusterCallback, - actionID: Integer, - invokeID: Long?, - duration: Long - ) { + suspend fun startActionWithDuration(actionID: UShort, invokeID: UInt?, duration: UInt) { // Implementation needs to be added here } - fun startActionWithDuration( - callback: DefaultClusterCallback, - actionID: Integer, - invokeID: Long?, - duration: Long, + suspend fun startActionWithDuration( + actionID: UShort, + invokeID: UInt?, + duration: UInt, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - fun stopAction(callback: DefaultClusterCallback, actionID: Integer, invokeID: Long?) { + suspend fun stopAction(actionID: UShort, invokeID: UInt?) { // Implementation needs to be added here } - fun stopAction( - callback: DefaultClusterCallback, - actionID: Integer, - invokeID: Long?, - timedInvokeTimeoutMs: Int - ) { + suspend fun stopAction(actionID: UShort, invokeID: UInt?, timedInvokeTimeoutMs: Int) { // Implementation needs to be added here } - fun pauseAction(callback: DefaultClusterCallback, actionID: Integer, invokeID: Long?) { + suspend fun pauseAction(actionID: UShort, invokeID: UInt?) { // Implementation needs to be added here } - fun pauseAction( - callback: DefaultClusterCallback, - actionID: Integer, - invokeID: Long?, - timedInvokeTimeoutMs: Int - ) { + suspend fun pauseAction(actionID: UShort, invokeID: UInt?, timedInvokeTimeoutMs: Int) { // Implementation needs to be added here } - fun pauseActionWithDuration( - callback: DefaultClusterCallback, - actionID: Integer, - invokeID: Long?, - duration: Long - ) { + suspend fun pauseActionWithDuration(actionID: UShort, invokeID: UInt?, duration: UInt) { // Implementation needs to be added here } - fun pauseActionWithDuration( - callback: DefaultClusterCallback, - actionID: Integer, - invokeID: Long?, - duration: Long, + suspend fun pauseActionWithDuration( + actionID: UShort, + invokeID: UInt?, + duration: UInt, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - fun resumeAction(callback: DefaultClusterCallback, actionID: Integer, invokeID: Long?) { + suspend fun resumeAction(actionID: UShort, invokeID: UInt?) { // Implementation needs to be added here } - fun resumeAction( - callback: DefaultClusterCallback, - actionID: Integer, - invokeID: Long?, - timedInvokeTimeoutMs: Int - ) { + suspend fun resumeAction(actionID: UShort, invokeID: UInt?, timedInvokeTimeoutMs: Int) { // Implementation needs to be added here } - fun enableAction(callback: DefaultClusterCallback, actionID: Integer, invokeID: Long?) { + suspend fun enableAction(actionID: UShort, invokeID: UInt?) { // Implementation needs to be added here } - fun enableAction( - callback: DefaultClusterCallback, - actionID: Integer, - invokeID: Long?, - timedInvokeTimeoutMs: Int - ) { + suspend fun enableAction(actionID: UShort, invokeID: UInt?, timedInvokeTimeoutMs: Int) { // Implementation needs to be added here } - fun enableActionWithDuration( - callback: DefaultClusterCallback, - actionID: Integer, - invokeID: Long?, - duration: Long - ) { + suspend fun enableActionWithDuration(actionID: UShort, invokeID: UInt?, duration: UInt) { // Implementation needs to be added here } - fun enableActionWithDuration( - callback: DefaultClusterCallback, - actionID: Integer, - invokeID: Long?, - duration: Long, + suspend fun enableActionWithDuration( + actionID: UShort, + invokeID: UInt?, + duration: UInt, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - fun disableAction(callback: DefaultClusterCallback, actionID: Integer, invokeID: Long?) { + suspend fun disableAction(actionID: UShort, invokeID: UInt?) { // Implementation needs to be added here } - fun disableAction( - callback: DefaultClusterCallback, - actionID: Integer, - invokeID: Long?, - timedInvokeTimeoutMs: Int - ) { + suspend fun disableAction(actionID: UShort, invokeID: UInt?, timedInvokeTimeoutMs: Int) { // Implementation needs to be added here } - fun disableActionWithDuration( - callback: DefaultClusterCallback, - actionID: Integer, - invokeID: Long?, - duration: Long - ) { + suspend fun disableActionWithDuration(actionID: UShort, invokeID: UInt?, duration: UInt) { // Implementation needs to be added here } - fun disableActionWithDuration( - callback: DefaultClusterCallback, - actionID: Integer, - invokeID: Long?, - duration: Long, + suspend fun disableActionWithDuration( + actionID: UShort, + invokeID: UInt?, + duration: UInt, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - interface ActionListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EndpointListsAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readActionListAttribute(callback: ActionListAttributeCallback) { + suspend fun readActionListAttribute(): ActionListAttribute { // Implementation needs to be added here } - fun subscribeActionListAttribute( - callback: ActionListAttributeCallback, + suspend fun subscribeActionListAttribute( minInterval: Int, maxInterval: Int - ) { + ): ActionListAttribute { // Implementation needs to be added here } - fun readEndpointListsAttribute(callback: EndpointListsAttributeCallback) { + suspend fun readEndpointListsAttribute(): EndpointListsAttribute { // Implementation needs to be added here } - fun subscribeEndpointListsAttribute( - callback: EndpointListsAttributeCallback, + suspend fun subscribeEndpointListsAttribute( minInterval: Int, maxInterval: Int - ) { + ): EndpointListsAttribute { // Implementation needs to be added here } - fun readSetupURLAttribute(callback: CharStringAttributeCallback) { + suspend fun readSetupURLAttribute(): CharString { // Implementation needs to be added here } - fun subscribeSetupURLAttribute( - callback: CharStringAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeSetupURLAttribute(minInterval: Int, maxInterval: Int): CharString { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 37u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ActivatedCarbonFilterMonitoringCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ActivatedCarbonFilterMonitoringCluster.kt index c109709f14cede..9f093fa13923f5 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ActivatedCarbonFilterMonitoringCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ActivatedCarbonFilterMonitoringCluster.kt @@ -20,221 +20,149 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class ActivatedCarbonFilterMonitoringCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 114u - } - - fun resetCondition(callback: DefaultClusterCallback) { - // Implementation needs to be added here - } - - fun resetCondition(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } - - interface LastChangedTimeAttributeCallback { - fun onSuccess(value: Long?) - - fun onError(ex: Exception) + class LastChangedTimeAttribute(val value: UInt?) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface ReplacementProductListAttributeCallback { - fun onSuccess( - value: ArrayList? - ) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) + class ReplacementProductListAttribute( + val value: + ArrayList? + ) - fun onError(ex: Exception) + class GeneratedCommandListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AcceptedCommandListAttribute(val value: ArrayList) - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) + class EventListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class AttributeListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun resetCondition() { + // Implementation needs to be added here } - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun resetCondition(timedInvokeTimeoutMs: Int) { + // Implementation needs to be added here } - fun readConditionAttribute(callback: IntegerAttributeCallback) { + suspend fun readConditionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeConditionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeConditionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readDegradationDirectionAttribute(callback: IntegerAttributeCallback) { + suspend fun readDegradationDirectionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeDegradationDirectionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeDegradationDirectionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readChangeIndicationAttribute(callback: IntegerAttributeCallback) { + suspend fun readChangeIndicationAttribute(): Integer { // Implementation needs to be added here } - fun subscribeChangeIndicationAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeChangeIndicationAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readInPlaceIndicatorAttribute(callback: BooleanAttributeCallback) { + suspend fun readInPlaceIndicatorAttribute(): Boolean { // Implementation needs to be added here } - fun subscribeInPlaceIndicatorAttribute( - callback: BooleanAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeInPlaceIndicatorAttribute(minInterval: Int, maxInterval: Int): Boolean { // Implementation needs to be added here } - fun readLastChangedTimeAttribute(callback: LastChangedTimeAttributeCallback) { + suspend fun readLastChangedTimeAttribute(): LastChangedTimeAttribute { // Implementation needs to be added here } - fun writeLastChangedTimeAttribute(callback: DefaultClusterCallback, value: Long) { + suspend fun writeLastChangedTimeAttribute(value: UInt) { // Implementation needs to be added here } - fun writeLastChangedTimeAttribute( - callback: DefaultClusterCallback, - value: Long, - timedWriteTimeoutMs: Int - ) { + suspend fun writeLastChangedTimeAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeLastChangedTimeAttribute( - callback: LastChangedTimeAttributeCallback, + suspend fun subscribeLastChangedTimeAttribute( minInterval: Int, maxInterval: Int - ) { + ): LastChangedTimeAttribute { // Implementation needs to be added here } - fun readReplacementProductListAttribute(callback: ReplacementProductListAttributeCallback) { + suspend fun readReplacementProductListAttribute(): ReplacementProductListAttribute { // Implementation needs to be added here } - fun subscribeReplacementProductListAttribute( - callback: ReplacementProductListAttributeCallback, + suspend fun subscribeReplacementProductListAttribute( minInterval: Int, maxInterval: Int - ) { + ): ReplacementProductListAttribute { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 114u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AdministratorCommissioningCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AdministratorCommissioningCluster.kt index 5d2ec55d786c40..bd60ac30b9f4e1 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AdministratorCommissioningCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AdministratorCommissioningCluster.kt @@ -20,187 +20,128 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class AdministratorCommissioningCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 60u - } + class AdminFabricIndexAttribute(val value: UByte?) + + class AdminVendorIdAttribute(val value: UShort?) + + class GeneratedCommandListAttribute(val value: ArrayList) + + class AcceptedCommandListAttribute(val value: ArrayList) + + class EventListAttribute(val value: ArrayList) - fun openCommissioningWindow( - callback: DefaultClusterCallback, - commissioningTimeout: Integer, + class AttributeListAttribute(val value: ArrayList) + + suspend fun openCommissioningWindow( + commissioningTimeout: UShort, PAKEPasscodeVerifier: ByteArray, - discriminator: Integer, - iterations: Long, + discriminator: UShort, + iterations: UInt, salt: ByteArray, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - fun openBasicCommissioningWindow( - callback: DefaultClusterCallback, - commissioningTimeout: Integer, + suspend fun openBasicCommissioningWindow( + commissioningTimeout: UShort, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - fun revokeCommissioning(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) { + suspend fun revokeCommissioning(timedInvokeTimeoutMs: Int) { // Implementation needs to be added here } - interface AdminFabricIndexAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AdminVendorIdAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readWindowStatusAttribute(callback: IntegerAttributeCallback) { + suspend fun readWindowStatusAttribute(): Integer { // Implementation needs to be added here } - fun subscribeWindowStatusAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeWindowStatusAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readAdminFabricIndexAttribute(callback: AdminFabricIndexAttributeCallback) { + suspend fun readAdminFabricIndexAttribute(): AdminFabricIndexAttribute { // Implementation needs to be added here } - fun subscribeAdminFabricIndexAttribute( - callback: AdminFabricIndexAttributeCallback, + suspend fun subscribeAdminFabricIndexAttribute( minInterval: Int, maxInterval: Int - ) { + ): AdminFabricIndexAttribute { // Implementation needs to be added here } - fun readAdminVendorIdAttribute(callback: AdminVendorIdAttributeCallback) { + suspend fun readAdminVendorIdAttribute(): AdminVendorIdAttribute { // Implementation needs to be added here } - fun subscribeAdminVendorIdAttribute( - callback: AdminVendorIdAttributeCallback, + suspend fun subscribeAdminVendorIdAttribute( minInterval: Int, maxInterval: Int - ) { + ): AdminVendorIdAttribute { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 60u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AirQualityCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AirQualityCluster.kt index c81674a306021c..4a88ec4d147938 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AirQualityCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AirQualityCluster.kt @@ -20,123 +20,80 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class AirQualityCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 91u - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class GeneratedCommandListAttribute(val value: ArrayList) - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) + class AcceptedCommandListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class EventListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AttributeListAttribute(val value: ArrayList) - fun readAirQualityAttribute(callback: IntegerAttributeCallback) { + suspend fun readAirQualityAttribute(): Integer { // Implementation needs to be added here } - fun subscribeAirQualityAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeAirQualityAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 91u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ApplicationBasicCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ApplicationBasicCluster.kt index 6c315058fa2e9f..d02e2dacd7dd53 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ApplicationBasicCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ApplicationBasicCluster.kt @@ -20,223 +20,146 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class ApplicationBasicCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 1293u - } - - interface ApplicationAttributeCallback { - fun onSuccess(value: ChipStructs.ApplicationBasicClusterApplicationStruct) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AllowedVendorListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class ApplicationAttribute(val value: ChipStructs.ApplicationBasicClusterApplicationStruct) - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) + class AllowedVendorListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class GeneratedCommandListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) + class AcceptedCommandListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class EventListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AttributeListAttribute(val value: ArrayList) - fun readVendorNameAttribute(callback: CharStringAttributeCallback) { + suspend fun readVendorNameAttribute(): CharString { // Implementation needs to be added here } - fun subscribeVendorNameAttribute( - callback: CharStringAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeVendorNameAttribute(minInterval: Int, maxInterval: Int): CharString { // Implementation needs to be added here } - fun readVendorIDAttribute(callback: IntegerAttributeCallback) { + suspend fun readVendorIDAttribute(): Integer { // Implementation needs to be added here } - fun subscribeVendorIDAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeVendorIDAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readApplicationNameAttribute(callback: CharStringAttributeCallback) { + suspend fun readApplicationNameAttribute(): CharString { // Implementation needs to be added here } - fun subscribeApplicationNameAttribute( - callback: CharStringAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeApplicationNameAttribute(minInterval: Int, maxInterval: Int): CharString { // Implementation needs to be added here } - fun readProductIDAttribute(callback: IntegerAttributeCallback) { + suspend fun readProductIDAttribute(): Integer { // Implementation needs to be added here } - fun subscribeProductIDAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeProductIDAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readApplicationAttribute(callback: ApplicationAttributeCallback) { + suspend fun readApplicationAttribute(): ApplicationAttribute { // Implementation needs to be added here } - fun subscribeApplicationAttribute( - callback: ApplicationAttributeCallback, + suspend fun subscribeApplicationAttribute( minInterval: Int, maxInterval: Int - ) { + ): ApplicationAttribute { // Implementation needs to be added here } - fun readStatusAttribute(callback: IntegerAttributeCallback) { + suspend fun readStatusAttribute(): Integer { // Implementation needs to be added here } - fun subscribeStatusAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeStatusAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readApplicationVersionAttribute(callback: CharStringAttributeCallback) { + suspend fun readApplicationVersionAttribute(): CharString { // Implementation needs to be added here } - fun subscribeApplicationVersionAttribute( - callback: CharStringAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeApplicationVersionAttribute(minInterval: Int, maxInterval: Int): CharString { // Implementation needs to be added here } - fun readAllowedVendorListAttribute(callback: AllowedVendorListAttributeCallback) { + suspend fun readAllowedVendorListAttribute(): AllowedVendorListAttribute { // Implementation needs to be added here } - fun subscribeAllowedVendorListAttribute( - callback: AllowedVendorListAttributeCallback, + suspend fun subscribeAllowedVendorListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AllowedVendorListAttribute { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 1293u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ApplicationLauncherCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ApplicationLauncherCluster.kt index 21bfb4f5e37d19..8da3f1866530fc 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ApplicationLauncherCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ApplicationLauncherCluster.kt @@ -20,219 +20,154 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class ApplicationLauncherCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 1292u - } + class LauncherResponse(val status: UInt, val data: ByteArray?) + + class CatalogListAttribute(val value: ArrayList?) + + class CurrentAppAttribute(val value: ChipStructs.ApplicationLauncherClusterApplicationEPStruct?) + + class GeneratedCommandListAttribute(val value: ArrayList) + + class AcceptedCommandListAttribute(val value: ArrayList) + + class EventListAttribute(val value: ArrayList) - fun launchApp( - callback: LauncherResponseCallback, + class AttributeListAttribute(val value: ArrayList) + + suspend fun launchApp( application: ChipStructs.ApplicationLauncherClusterApplicationStruct?, data: ByteArray? - ) { + ): LauncherResponse { // Implementation needs to be added here } - fun launchApp( - callback: LauncherResponseCallback, + suspend fun launchApp( application: ChipStructs.ApplicationLauncherClusterApplicationStruct?, data: ByteArray?, timedInvokeTimeoutMs: Int - ) { + ): LauncherResponse { // Implementation needs to be added here } - fun stopApp( - callback: LauncherResponseCallback, + suspend fun stopApp( application: ChipStructs.ApplicationLauncherClusterApplicationStruct? - ) { + ): LauncherResponse { // Implementation needs to be added here } - fun stopApp( - callback: LauncherResponseCallback, + suspend fun stopApp( application: ChipStructs.ApplicationLauncherClusterApplicationStruct?, timedInvokeTimeoutMs: Int - ) { + ): LauncherResponse { // Implementation needs to be added here } - fun hideApp( - callback: LauncherResponseCallback, + suspend fun hideApp( application: ChipStructs.ApplicationLauncherClusterApplicationStruct? - ) { + ): LauncherResponse { // Implementation needs to be added here } - fun hideApp( - callback: LauncherResponseCallback, + suspend fun hideApp( application: ChipStructs.ApplicationLauncherClusterApplicationStruct?, timedInvokeTimeoutMs: Int - ) { + ): LauncherResponse { // Implementation needs to be added here } - interface LauncherResponseCallback { - fun onSuccess(status: Integer, data: ByteArray?) - - fun onError(error: Exception) - } - - interface CatalogListAttributeCallback { - fun onSuccess(value: ArrayList?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface CurrentAppAttributeCallback { - fun onSuccess(value: ChipStructs.ApplicationLauncherClusterApplicationEPStruct?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readCatalogListAttribute(callback: CatalogListAttributeCallback) { + suspend fun readCatalogListAttribute(): CatalogListAttribute { // Implementation needs to be added here } - fun subscribeCatalogListAttribute( - callback: CatalogListAttributeCallback, + suspend fun subscribeCatalogListAttribute( minInterval: Int, maxInterval: Int - ) { + ): CatalogListAttribute { // Implementation needs to be added here } - fun readCurrentAppAttribute(callback: CurrentAppAttributeCallback) { + suspend fun readCurrentAppAttribute(): CurrentAppAttribute { // Implementation needs to be added here } - fun writeCurrentAppAttribute( - callback: DefaultClusterCallback, + suspend fun writeCurrentAppAttribute( value: ChipStructs.ApplicationLauncherClusterApplicationEPStruct ) { // Implementation needs to be added here } - fun writeCurrentAppAttribute( - callback: DefaultClusterCallback, + suspend fun writeCurrentAppAttribute( value: ChipStructs.ApplicationLauncherClusterApplicationEPStruct, timedWriteTimeoutMs: Int ) { // Implementation needs to be added here } - fun subscribeCurrentAppAttribute( - callback: CurrentAppAttributeCallback, + suspend fun subscribeCurrentAppAttribute( minInterval: Int, maxInterval: Int - ) { + ): CurrentAppAttribute { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 1292u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AudioOutputCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AudioOutputCluster.kt index 3eaae5e7ab157d..901b65d253a1e2 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AudioOutputCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AudioOutputCluster.kt @@ -20,164 +20,109 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class AudioOutputCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 1291u - } - - fun selectOutput(callback: DefaultClusterCallback, index: Integer) { - // Implementation needs to be added here - } - - fun selectOutput(callback: DefaultClusterCallback, index: Integer, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } - - fun renameOutput(callback: DefaultClusterCallback, index: Integer, name: String) { - // Implementation needs to be added here - } - - fun renameOutput( - callback: DefaultClusterCallback, - index: Integer, - name: String, - timedInvokeTimeoutMs: Int - ) { - // Implementation needs to be added here - } + class OutputListAttribute(val value: ArrayList) - interface OutputListAttributeCallback { - fun onSuccess(value: ArrayList) + class GeneratedCommandListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class AcceptedCommandListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) + class EventListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class AttributeListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun selectOutput(index: UByte) { + // Implementation needs to be added here } - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun selectOutput(index: UByte, timedInvokeTimeoutMs: Int) { + // Implementation needs to be added here } - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun renameOutput(index: UByte, name: String) { + // Implementation needs to be added here } - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun renameOutput(index: UByte, name: String, timedInvokeTimeoutMs: Int) { + // Implementation needs to be added here } - fun readOutputListAttribute(callback: OutputListAttributeCallback) { + suspend fun readOutputListAttribute(): OutputListAttribute { // Implementation needs to be added here } - fun subscribeOutputListAttribute( - callback: OutputListAttributeCallback, + suspend fun subscribeOutputListAttribute( minInterval: Int, maxInterval: Int - ) { + ): OutputListAttribute { // Implementation needs to be added here } - fun readCurrentOutputAttribute(callback: IntegerAttributeCallback) { + suspend fun readCurrentOutputAttribute(): Integer { // Implementation needs to be added here } - fun subscribeCurrentOutputAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeCurrentOutputAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 1291u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BallastConfigurationCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BallastConfigurationCluster.kt index b0efd271d427f3..f931c4c1be0ead 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BallastConfigurationCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BallastConfigurationCluster.kt @@ -20,439 +20,289 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class BallastConfigurationCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 769u - } - - interface IntrinsicBallastFactorAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface BallastFactorAdjustmentAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface LampRatedHoursAttributeCallback { - fun onSuccess(value: Long?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class IntrinsicBallastFactorAttribute(val value: UByte?) - interface LampBurnHoursAttributeCallback { - fun onSuccess(value: Long?) + class BallastFactorAdjustmentAttribute(val value: UByte?) - fun onError(ex: Exception) + class LampRatedHoursAttribute(val value: UInt?) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface LampBurnHoursTripPointAttributeCallback { - fun onSuccess(value: Long?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) + class LampBurnHoursAttribute(val value: UInt?) - fun onError(ex: Exception) + class LampBurnHoursTripPointAttribute(val value: UInt?) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class GeneratedCommandListAttribute(val value: ArrayList) - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) + class AcceptedCommandListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class EventListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AttributeListAttribute(val value: ArrayList) - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readPhysicalMinLevelAttribute(callback: IntegerAttributeCallback) { + suspend fun readPhysicalMinLevelAttribute(): Integer { // Implementation needs to be added here } - fun subscribePhysicalMinLevelAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribePhysicalMinLevelAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readPhysicalMaxLevelAttribute(callback: IntegerAttributeCallback) { + suspend fun readPhysicalMaxLevelAttribute(): Integer { // Implementation needs to be added here } - fun subscribePhysicalMaxLevelAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribePhysicalMaxLevelAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readBallastStatusAttribute(callback: IntegerAttributeCallback) { + suspend fun readBallastStatusAttribute(): Integer { // Implementation needs to be added here } - fun subscribeBallastStatusAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeBallastStatusAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readMinLevelAttribute(callback: IntegerAttributeCallback) { + suspend fun readMinLevelAttribute(): Integer { // Implementation needs to be added here } - fun writeMinLevelAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeMinLevelAttribute(value: UByte) { // Implementation needs to be added here } - fun writeMinLevelAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeMinLevelAttribute(value: UByte, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeMinLevelAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeMinLevelAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readMaxLevelAttribute(callback: IntegerAttributeCallback) { + suspend fun readMaxLevelAttribute(): Integer { // Implementation needs to be added here } - fun writeMaxLevelAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeMaxLevelAttribute(value: UByte) { // Implementation needs to be added here } - fun writeMaxLevelAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeMaxLevelAttribute(value: UByte, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeMaxLevelAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeMaxLevelAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readIntrinsicBallastFactorAttribute(callback: IntrinsicBallastFactorAttributeCallback) { + suspend fun readIntrinsicBallastFactorAttribute(): IntrinsicBallastFactorAttribute { // Implementation needs to be added here } - fun writeIntrinsicBallastFactorAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeIntrinsicBallastFactorAttribute(value: UByte) { // Implementation needs to be added here } - fun writeIntrinsicBallastFactorAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeIntrinsicBallastFactorAttribute(value: UByte, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeIntrinsicBallastFactorAttribute( - callback: IntrinsicBallastFactorAttributeCallback, + suspend fun subscribeIntrinsicBallastFactorAttribute( minInterval: Int, maxInterval: Int - ) { + ): IntrinsicBallastFactorAttribute { // Implementation needs to be added here } - fun readBallastFactorAdjustmentAttribute(callback: BallastFactorAdjustmentAttributeCallback) { + suspend fun readBallastFactorAdjustmentAttribute(): BallastFactorAdjustmentAttribute { // Implementation needs to be added here } - fun writeBallastFactorAdjustmentAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeBallastFactorAdjustmentAttribute(value: UByte) { // Implementation needs to be added here } - fun writeBallastFactorAdjustmentAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeBallastFactorAdjustmentAttribute(value: UByte, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeBallastFactorAdjustmentAttribute( - callback: BallastFactorAdjustmentAttributeCallback, + suspend fun subscribeBallastFactorAdjustmentAttribute( minInterval: Int, maxInterval: Int - ) { + ): BallastFactorAdjustmentAttribute { // Implementation needs to be added here } - fun readLampQuantityAttribute(callback: IntegerAttributeCallback) { + suspend fun readLampQuantityAttribute(): Integer { // Implementation needs to be added here } - fun subscribeLampQuantityAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeLampQuantityAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readLampTypeAttribute(callback: CharStringAttributeCallback) { + suspend fun readLampTypeAttribute(): CharString { // Implementation needs to be added here } - fun writeLampTypeAttribute(callback: DefaultClusterCallback, value: String) { + suspend fun writeLampTypeAttribute(value: String) { // Implementation needs to be added here } - fun writeLampTypeAttribute( - callback: DefaultClusterCallback, - value: String, - timedWriteTimeoutMs: Int - ) { + suspend fun writeLampTypeAttribute(value: String, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeLampTypeAttribute( - callback: CharStringAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeLampTypeAttribute(minInterval: Int, maxInterval: Int): CharString { // Implementation needs to be added here } - fun readLampManufacturerAttribute(callback: CharStringAttributeCallback) { + suspend fun readLampManufacturerAttribute(): CharString { // Implementation needs to be added here } - fun writeLampManufacturerAttribute(callback: DefaultClusterCallback, value: String) { + suspend fun writeLampManufacturerAttribute(value: String) { // Implementation needs to be added here } - fun writeLampManufacturerAttribute( - callback: DefaultClusterCallback, - value: String, - timedWriteTimeoutMs: Int - ) { + suspend fun writeLampManufacturerAttribute(value: String, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeLampManufacturerAttribute( - callback: CharStringAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeLampManufacturerAttribute(minInterval: Int, maxInterval: Int): CharString { // Implementation needs to be added here } - fun readLampRatedHoursAttribute(callback: LampRatedHoursAttributeCallback) { + suspend fun readLampRatedHoursAttribute(): LampRatedHoursAttribute { // Implementation needs to be added here } - fun writeLampRatedHoursAttribute(callback: DefaultClusterCallback, value: Long) { + suspend fun writeLampRatedHoursAttribute(value: UInt) { // Implementation needs to be added here } - fun writeLampRatedHoursAttribute( - callback: DefaultClusterCallback, - value: Long, - timedWriteTimeoutMs: Int - ) { + suspend fun writeLampRatedHoursAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeLampRatedHoursAttribute( - callback: LampRatedHoursAttributeCallback, + suspend fun subscribeLampRatedHoursAttribute( minInterval: Int, maxInterval: Int - ) { + ): LampRatedHoursAttribute { // Implementation needs to be added here } - fun readLampBurnHoursAttribute(callback: LampBurnHoursAttributeCallback) { + suspend fun readLampBurnHoursAttribute(): LampBurnHoursAttribute { // Implementation needs to be added here } - fun writeLampBurnHoursAttribute(callback: DefaultClusterCallback, value: Long) { + suspend fun writeLampBurnHoursAttribute(value: UInt) { // Implementation needs to be added here } - fun writeLampBurnHoursAttribute( - callback: DefaultClusterCallback, - value: Long, - timedWriteTimeoutMs: Int - ) { + suspend fun writeLampBurnHoursAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeLampBurnHoursAttribute( - callback: LampBurnHoursAttributeCallback, + suspend fun subscribeLampBurnHoursAttribute( minInterval: Int, maxInterval: Int - ) { + ): LampBurnHoursAttribute { // Implementation needs to be added here } - fun readLampAlarmModeAttribute(callback: IntegerAttributeCallback) { + suspend fun readLampAlarmModeAttribute(): Integer { // Implementation needs to be added here } - fun writeLampAlarmModeAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeLampAlarmModeAttribute(value: UInt) { // Implementation needs to be added here } - fun writeLampAlarmModeAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeLampAlarmModeAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeLampAlarmModeAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeLampAlarmModeAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readLampBurnHoursTripPointAttribute(callback: LampBurnHoursTripPointAttributeCallback) { + suspend fun readLampBurnHoursTripPointAttribute(): LampBurnHoursTripPointAttribute { // Implementation needs to be added here } - fun writeLampBurnHoursTripPointAttribute(callback: DefaultClusterCallback, value: Long) { + suspend fun writeLampBurnHoursTripPointAttribute(value: UInt) { // Implementation needs to be added here } - fun writeLampBurnHoursTripPointAttribute( - callback: DefaultClusterCallback, - value: Long, - timedWriteTimeoutMs: Int - ) { + suspend fun writeLampBurnHoursTripPointAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeLampBurnHoursTripPointAttribute( - callback: LampBurnHoursTripPointAttributeCallback, + suspend fun subscribeLampBurnHoursTripPointAttribute( minInterval: Int, maxInterval: Int - ) { + ): LampBurnHoursTripPointAttribute { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 769u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BarrierControlCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BarrierControlCluster.kt index 946845dcc57905..505fd47478f65a 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BarrierControlCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BarrierControlCluster.kt @@ -20,323 +20,222 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class BarrierControlCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 259u - } + class GeneratedCommandListAttribute(val value: ArrayList) - fun barrierControlGoToPercent(callback: DefaultClusterCallback, percentOpen: Integer) { - // Implementation needs to be added here - } + class AcceptedCommandListAttribute(val value: ArrayList) - fun barrierControlGoToPercent( - callback: DefaultClusterCallback, - percentOpen: Integer, - timedInvokeTimeoutMs: Int - ) { - // Implementation needs to be added here - } + class EventListAttribute(val value: ArrayList) - fun barrierControlStop(callback: DefaultClusterCallback) { - // Implementation needs to be added here - } + class AttributeListAttribute(val value: ArrayList) - fun barrierControlStop(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) { + suspend fun barrierControlGoToPercent(percentOpen: UByte) { // Implementation needs to be added here } - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun barrierControlGoToPercent(percentOpen: UByte, timedInvokeTimeoutMs: Int) { + // Implementation needs to be added here } - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun barrierControlStop() { + // Implementation needs to be added here } - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun barrierControlStop(timedInvokeTimeoutMs: Int) { + // Implementation needs to be added here } - fun readBarrierMovingStateAttribute(callback: IntegerAttributeCallback) { + suspend fun readBarrierMovingStateAttribute(): Integer { // Implementation needs to be added here } - fun subscribeBarrierMovingStateAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeBarrierMovingStateAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readBarrierSafetyStatusAttribute(callback: IntegerAttributeCallback) { + suspend fun readBarrierSafetyStatusAttribute(): Integer { // Implementation needs to be added here } - fun subscribeBarrierSafetyStatusAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeBarrierSafetyStatusAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readBarrierCapabilitiesAttribute(callback: IntegerAttributeCallback) { + suspend fun readBarrierCapabilitiesAttribute(): Integer { // Implementation needs to be added here } - fun subscribeBarrierCapabilitiesAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeBarrierCapabilitiesAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readBarrierOpenEventsAttribute(callback: IntegerAttributeCallback) { + suspend fun readBarrierOpenEventsAttribute(): Integer { // Implementation needs to be added here } - fun writeBarrierOpenEventsAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeBarrierOpenEventsAttribute(value: UShort) { // Implementation needs to be added here } - fun writeBarrierOpenEventsAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeBarrierOpenEventsAttribute(value: UShort, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeBarrierOpenEventsAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeBarrierOpenEventsAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readBarrierCloseEventsAttribute(callback: IntegerAttributeCallback) { + suspend fun readBarrierCloseEventsAttribute(): Integer { // Implementation needs to be added here } - fun writeBarrierCloseEventsAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeBarrierCloseEventsAttribute(value: UShort) { // Implementation needs to be added here } - fun writeBarrierCloseEventsAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeBarrierCloseEventsAttribute(value: UShort, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeBarrierCloseEventsAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeBarrierCloseEventsAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readBarrierCommandOpenEventsAttribute(callback: IntegerAttributeCallback) { + suspend fun readBarrierCommandOpenEventsAttribute(): Integer { // Implementation needs to be added here } - fun writeBarrierCommandOpenEventsAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeBarrierCommandOpenEventsAttribute(value: UShort) { // Implementation needs to be added here } - fun writeBarrierCommandOpenEventsAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeBarrierCommandOpenEventsAttribute(value: UShort, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeBarrierCommandOpenEventsAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeBarrierCommandOpenEventsAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readBarrierCommandCloseEventsAttribute(callback: IntegerAttributeCallback) { + suspend fun readBarrierCommandCloseEventsAttribute(): Integer { // Implementation needs to be added here } - fun writeBarrierCommandCloseEventsAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeBarrierCommandCloseEventsAttribute(value: UShort) { // Implementation needs to be added here } - fun writeBarrierCommandCloseEventsAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeBarrierCommandCloseEventsAttribute(value: UShort, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeBarrierCommandCloseEventsAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeBarrierCommandCloseEventsAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readBarrierOpenPeriodAttribute(callback: IntegerAttributeCallback) { + suspend fun readBarrierOpenPeriodAttribute(): Integer { // Implementation needs to be added here } - fun writeBarrierOpenPeriodAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeBarrierOpenPeriodAttribute(value: UShort) { // Implementation needs to be added here } - fun writeBarrierOpenPeriodAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeBarrierOpenPeriodAttribute(value: UShort, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeBarrierOpenPeriodAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeBarrierOpenPeriodAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readBarrierClosePeriodAttribute(callback: IntegerAttributeCallback) { + suspend fun readBarrierClosePeriodAttribute(): Integer { // Implementation needs to be added here } - fun writeBarrierClosePeriodAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeBarrierClosePeriodAttribute(value: UShort) { // Implementation needs to be added here } - fun writeBarrierClosePeriodAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeBarrierClosePeriodAttribute(value: UShort, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeBarrierClosePeriodAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeBarrierClosePeriodAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readBarrierPositionAttribute(callback: IntegerAttributeCallback) { + suspend fun readBarrierPositionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeBarrierPositionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeBarrierPositionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 259u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BasicInformationCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BasicInformationCluster.kt index 7c9043360ea567..69dbbdbe4fa6eb 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BasicInformationCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BasicInformationCluster.kt @@ -20,423 +20,292 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class BasicInformationCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 40u - } - - fun mfgSpecificPing(callback: DefaultClusterCallback) { - // Implementation needs to be added here - } - - fun mfgSpecificPing(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } + class CapabilityMinimaAttribute( + val value: ChipStructs.BasicInformationClusterCapabilityMinimaStruct + ) - interface CapabilityMinimaAttributeCallback { - fun onSuccess(value: ChipStructs.BasicInformationClusterCapabilityMinimaStruct) + class ProductAppearanceAttribute( + val value: ChipStructs.BasicInformationClusterProductAppearanceStruct? + ) - fun onError(ex: Exception) + class GeneratedCommandListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface ProductAppearanceAttributeCallback { - fun onSuccess(value: ChipStructs.BasicInformationClusterProductAppearanceStruct?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AcceptedCommandListAttribute(val value: ArrayList) - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) + class EventListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class AttributeListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun mfgSpecificPing() { + // Implementation needs to be added here } - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun mfgSpecificPing(timedInvokeTimeoutMs: Int) { + // Implementation needs to be added here } - fun readDataModelRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readDataModelRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeDataModelRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeDataModelRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readVendorNameAttribute(callback: CharStringAttributeCallback) { + suspend fun readVendorNameAttribute(): CharString { // Implementation needs to be added here } - fun subscribeVendorNameAttribute( - callback: CharStringAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeVendorNameAttribute(minInterval: Int, maxInterval: Int): CharString { // Implementation needs to be added here } - fun readVendorIDAttribute(callback: IntegerAttributeCallback) { + suspend fun readVendorIDAttribute(): Integer { // Implementation needs to be added here } - fun subscribeVendorIDAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeVendorIDAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readProductNameAttribute(callback: CharStringAttributeCallback) { + suspend fun readProductNameAttribute(): CharString { // Implementation needs to be added here } - fun subscribeProductNameAttribute( - callback: CharStringAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeProductNameAttribute(minInterval: Int, maxInterval: Int): CharString { // Implementation needs to be added here } - fun readProductIDAttribute(callback: IntegerAttributeCallback) { + suspend fun readProductIDAttribute(): Integer { // Implementation needs to be added here } - fun subscribeProductIDAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeProductIDAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readNodeLabelAttribute(callback: CharStringAttributeCallback) { + suspend fun readNodeLabelAttribute(): CharString { // Implementation needs to be added here } - fun writeNodeLabelAttribute(callback: DefaultClusterCallback, value: String) { + suspend fun writeNodeLabelAttribute(value: String) { // Implementation needs to be added here } - fun writeNodeLabelAttribute( - callback: DefaultClusterCallback, - value: String, - timedWriteTimeoutMs: Int - ) { + suspend fun writeNodeLabelAttribute(value: String, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeNodeLabelAttribute( - callback: CharStringAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeNodeLabelAttribute(minInterval: Int, maxInterval: Int): CharString { // Implementation needs to be added here } - fun readLocationAttribute(callback: CharStringAttributeCallback) { + suspend fun readLocationAttribute(): CharString { // Implementation needs to be added here } - fun writeLocationAttribute(callback: DefaultClusterCallback, value: String) { + suspend fun writeLocationAttribute(value: String) { // Implementation needs to be added here } - fun writeLocationAttribute( - callback: DefaultClusterCallback, - value: String, - timedWriteTimeoutMs: Int - ) { + suspend fun writeLocationAttribute(value: String, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeLocationAttribute( - callback: CharStringAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeLocationAttribute(minInterval: Int, maxInterval: Int): CharString { // Implementation needs to be added here } - fun readHardwareVersionAttribute(callback: IntegerAttributeCallback) { + suspend fun readHardwareVersionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeHardwareVersionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeHardwareVersionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readHardwareVersionStringAttribute(callback: CharStringAttributeCallback) { + suspend fun readHardwareVersionStringAttribute(): CharString { // Implementation needs to be added here } - fun subscribeHardwareVersionStringAttribute( - callback: CharStringAttributeCallback, + suspend fun subscribeHardwareVersionStringAttribute( minInterval: Int, maxInterval: Int - ) { + ): CharString { // Implementation needs to be added here } - fun readSoftwareVersionAttribute(callback: LongAttributeCallback) { + suspend fun readSoftwareVersionAttribute(): Long { // Implementation needs to be added here } - fun subscribeSoftwareVersionAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeSoftwareVersionAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readSoftwareVersionStringAttribute(callback: CharStringAttributeCallback) { + suspend fun readSoftwareVersionStringAttribute(): CharString { // Implementation needs to be added here } - fun subscribeSoftwareVersionStringAttribute( - callback: CharStringAttributeCallback, + suspend fun subscribeSoftwareVersionStringAttribute( minInterval: Int, maxInterval: Int - ) { + ): CharString { // Implementation needs to be added here } - fun readManufacturingDateAttribute(callback: CharStringAttributeCallback) { + suspend fun readManufacturingDateAttribute(): CharString { // Implementation needs to be added here } - fun subscribeManufacturingDateAttribute( - callback: CharStringAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeManufacturingDateAttribute(minInterval: Int, maxInterval: Int): CharString { // Implementation needs to be added here } - fun readPartNumberAttribute(callback: CharStringAttributeCallback) { + suspend fun readPartNumberAttribute(): CharString { // Implementation needs to be added here } - fun subscribePartNumberAttribute( - callback: CharStringAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribePartNumberAttribute(minInterval: Int, maxInterval: Int): CharString { // Implementation needs to be added here } - fun readProductURLAttribute(callback: CharStringAttributeCallback) { + suspend fun readProductURLAttribute(): CharString { // Implementation needs to be added here } - fun subscribeProductURLAttribute( - callback: CharStringAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeProductURLAttribute(minInterval: Int, maxInterval: Int): CharString { // Implementation needs to be added here } - fun readProductLabelAttribute(callback: CharStringAttributeCallback) { + suspend fun readProductLabelAttribute(): CharString { // Implementation needs to be added here } - fun subscribeProductLabelAttribute( - callback: CharStringAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeProductLabelAttribute(minInterval: Int, maxInterval: Int): CharString { // Implementation needs to be added here } - fun readSerialNumberAttribute(callback: CharStringAttributeCallback) { + suspend fun readSerialNumberAttribute(): CharString { // Implementation needs to be added here } - fun subscribeSerialNumberAttribute( - callback: CharStringAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeSerialNumberAttribute(minInterval: Int, maxInterval: Int): CharString { // Implementation needs to be added here } - fun readLocalConfigDisabledAttribute(callback: BooleanAttributeCallback) { + suspend fun readLocalConfigDisabledAttribute(): Boolean { // Implementation needs to be added here } - fun writeLocalConfigDisabledAttribute(callback: DefaultClusterCallback, value: Boolean) { + suspend fun writeLocalConfigDisabledAttribute(value: Boolean) { // Implementation needs to be added here } - fun writeLocalConfigDisabledAttribute( - callback: DefaultClusterCallback, - value: Boolean, - timedWriteTimeoutMs: Int - ) { + suspend fun writeLocalConfigDisabledAttribute(value: Boolean, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeLocalConfigDisabledAttribute( - callback: BooleanAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeLocalConfigDisabledAttribute(minInterval: Int, maxInterval: Int): Boolean { // Implementation needs to be added here } - fun readReachableAttribute(callback: BooleanAttributeCallback) { + suspend fun readReachableAttribute(): Boolean { // Implementation needs to be added here } - fun subscribeReachableAttribute( - callback: BooleanAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeReachableAttribute(minInterval: Int, maxInterval: Int): Boolean { // Implementation needs to be added here } - fun readUniqueIDAttribute(callback: CharStringAttributeCallback) { + suspend fun readUniqueIDAttribute(): CharString { // Implementation needs to be added here } - fun subscribeUniqueIDAttribute( - callback: CharStringAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeUniqueIDAttribute(minInterval: Int, maxInterval: Int): CharString { // Implementation needs to be added here } - fun readCapabilityMinimaAttribute(callback: CapabilityMinimaAttributeCallback) { + suspend fun readCapabilityMinimaAttribute(): CapabilityMinimaAttribute { // Implementation needs to be added here } - fun subscribeCapabilityMinimaAttribute( - callback: CapabilityMinimaAttributeCallback, + suspend fun subscribeCapabilityMinimaAttribute( minInterval: Int, maxInterval: Int - ) { + ): CapabilityMinimaAttribute { // Implementation needs to be added here } - fun readProductAppearanceAttribute(callback: ProductAppearanceAttributeCallback) { + suspend fun readProductAppearanceAttribute(): ProductAppearanceAttribute { // Implementation needs to be added here } - fun subscribeProductAppearanceAttribute( - callback: ProductAppearanceAttributeCallback, + suspend fun subscribeProductAppearanceAttribute( minInterval: Int, maxInterval: Int - ) { + ): ProductAppearanceAttribute { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 40u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BinaryInputBasicCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BinaryInputBasicCluster.kt index 13102a5d6e7289..7fee672d5abae9 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BinaryInputBasicCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BinaryInputBasicCluster.kt @@ -20,291 +20,192 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class BinaryInputBasicCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 15u - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class GeneratedCommandListAttribute(val value: ArrayList) - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) + class AcceptedCommandListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class EventListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) + class AttributeListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readActiveTextAttribute(callback: CharStringAttributeCallback) { + suspend fun readActiveTextAttribute(): CharString { // Implementation needs to be added here } - fun writeActiveTextAttribute(callback: DefaultClusterCallback, value: String) { + suspend fun writeActiveTextAttribute(value: String) { // Implementation needs to be added here } - fun writeActiveTextAttribute( - callback: DefaultClusterCallback, - value: String, - timedWriteTimeoutMs: Int - ) { + suspend fun writeActiveTextAttribute(value: String, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeActiveTextAttribute( - callback: CharStringAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeActiveTextAttribute(minInterval: Int, maxInterval: Int): CharString { // Implementation needs to be added here } - fun readDescriptionAttribute(callback: CharStringAttributeCallback) { + suspend fun readDescriptionAttribute(): CharString { // Implementation needs to be added here } - fun writeDescriptionAttribute(callback: DefaultClusterCallback, value: String) { + suspend fun writeDescriptionAttribute(value: String) { // Implementation needs to be added here } - fun writeDescriptionAttribute( - callback: DefaultClusterCallback, - value: String, - timedWriteTimeoutMs: Int - ) { + suspend fun writeDescriptionAttribute(value: String, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeDescriptionAttribute( - callback: CharStringAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeDescriptionAttribute(minInterval: Int, maxInterval: Int): CharString { // Implementation needs to be added here } - fun readInactiveTextAttribute(callback: CharStringAttributeCallback) { + suspend fun readInactiveTextAttribute(): CharString { // Implementation needs to be added here } - fun writeInactiveTextAttribute(callback: DefaultClusterCallback, value: String) { + suspend fun writeInactiveTextAttribute(value: String) { // Implementation needs to be added here } - fun writeInactiveTextAttribute( - callback: DefaultClusterCallback, - value: String, - timedWriteTimeoutMs: Int - ) { + suspend fun writeInactiveTextAttribute(value: String, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeInactiveTextAttribute( - callback: CharStringAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeInactiveTextAttribute(minInterval: Int, maxInterval: Int): CharString { // Implementation needs to be added here } - fun readOutOfServiceAttribute(callback: BooleanAttributeCallback) { + suspend fun readOutOfServiceAttribute(): Boolean { // Implementation needs to be added here } - fun writeOutOfServiceAttribute(callback: DefaultClusterCallback, value: Boolean) { + suspend fun writeOutOfServiceAttribute(value: Boolean) { // Implementation needs to be added here } - fun writeOutOfServiceAttribute( - callback: DefaultClusterCallback, - value: Boolean, - timedWriteTimeoutMs: Int - ) { + suspend fun writeOutOfServiceAttribute(value: Boolean, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeOutOfServiceAttribute( - callback: BooleanAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeOutOfServiceAttribute(minInterval: Int, maxInterval: Int): Boolean { // Implementation needs to be added here } - fun readPolarityAttribute(callback: IntegerAttributeCallback) { + suspend fun readPolarityAttribute(): Integer { // Implementation needs to be added here } - fun subscribePolarityAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribePolarityAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readPresentValueAttribute(callback: BooleanAttributeCallback) { + suspend fun readPresentValueAttribute(): Boolean { // Implementation needs to be added here } - fun writePresentValueAttribute(callback: DefaultClusterCallback, value: Boolean) { + suspend fun writePresentValueAttribute(value: Boolean) { // Implementation needs to be added here } - fun writePresentValueAttribute( - callback: DefaultClusterCallback, - value: Boolean, - timedWriteTimeoutMs: Int - ) { + suspend fun writePresentValueAttribute(value: Boolean, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribePresentValueAttribute( - callback: BooleanAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribePresentValueAttribute(minInterval: Int, maxInterval: Int): Boolean { // Implementation needs to be added here } - fun readReliabilityAttribute(callback: IntegerAttributeCallback) { + suspend fun readReliabilityAttribute(): Integer { // Implementation needs to be added here } - fun writeReliabilityAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeReliabilityAttribute(value: UInt) { // Implementation needs to be added here } - fun writeReliabilityAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeReliabilityAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeReliabilityAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeReliabilityAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readStatusFlagsAttribute(callback: IntegerAttributeCallback) { + suspend fun readStatusFlagsAttribute(): Integer { // Implementation needs to be added here } - fun subscribeStatusFlagsAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeStatusFlagsAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readApplicationTypeAttribute(callback: LongAttributeCallback) { + suspend fun readApplicationTypeAttribute(): Long { // Implementation needs to be added here } - fun subscribeApplicationTypeAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeApplicationTypeAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 15u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BindingCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BindingCluster.kt index 4ed086c2a795c7..edc98cfe3ecb9b 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BindingCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BindingCluster.kt @@ -20,153 +20,97 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class BindingCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 30u - } - - interface BindingAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class BindingAttribute(val value: ArrayList) - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) + class GeneratedCommandListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class AcceptedCommandListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) + class EventListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class AttributeListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readBindingAttribute(callback: BindingAttributeCallback) { + suspend fun readBindingAttribute(): BindingAttribute { // Implementation needs to be added here } - fun readBindingAttributeWithFabricFilter( - callback: BindingAttributeCallback, - isFabricFiltered: Boolean - ) { + suspend fun readBindingAttributeWithFabricFilter(isFabricFiltered: Boolean): BindingAttribute { // Implementation needs to be added here } - fun writeBindingAttribute( - callback: DefaultClusterCallback, - value: ArrayList - ) { + suspend fun writeBindingAttribute(value: ArrayList) { // Implementation needs to be added here } - fun writeBindingAttribute( - callback: DefaultClusterCallback, + suspend fun writeBindingAttribute( value: ArrayList, timedWriteTimeoutMs: Int ) { // Implementation needs to be added here } - fun subscribeBindingAttribute( - callback: BindingAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeBindingAttribute(minInterval: Int, maxInterval: Int): BindingAttribute { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 30u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BooleanStateCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BooleanStateCluster.kt index 8d3a717e618c5f..2ba45f0b6a5dca 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BooleanStateCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BooleanStateCluster.kt @@ -20,123 +20,80 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class BooleanStateCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 69u - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class GeneratedCommandListAttribute(val value: ArrayList) - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) + class AcceptedCommandListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class EventListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AttributeListAttribute(val value: ArrayList) - fun readStateValueAttribute(callback: BooleanAttributeCallback) { + suspend fun readStateValueAttribute(): Boolean { // Implementation needs to be added here } - fun subscribeStateValueAttribute( - callback: BooleanAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeStateValueAttribute(minInterval: Int, maxInterval: Int): Boolean { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 69u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BridgedDeviceBasicInformationCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BridgedDeviceBasicInformationCluster.kt index e7171b39cead18..3c825cc8387b62 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BridgedDeviceBasicInformationCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BridgedDeviceBasicInformationCluster.kt @@ -20,323 +20,221 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class BridgedDeviceBasicInformationCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 57u - } - - interface ProductAppearanceAttributeCallback { - fun onSuccess(value: ChipStructs.BridgedDeviceBasicInformationClusterProductAppearanceStruct?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) + class ProductAppearanceAttribute( + val value: ChipStructs.BridgedDeviceBasicInformationClusterProductAppearanceStruct? + ) - fun onError(ex: Exception) + class GeneratedCommandListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AcceptedCommandListAttribute(val value: ArrayList) - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) + class EventListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class AttributeListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readVendorNameAttribute(callback: CharStringAttributeCallback) { + suspend fun readVendorNameAttribute(): CharString { // Implementation needs to be added here } - fun subscribeVendorNameAttribute( - callback: CharStringAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeVendorNameAttribute(minInterval: Int, maxInterval: Int): CharString { // Implementation needs to be added here } - fun readVendorIDAttribute(callback: IntegerAttributeCallback) { + suspend fun readVendorIDAttribute(): Integer { // Implementation needs to be added here } - fun subscribeVendorIDAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeVendorIDAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readProductNameAttribute(callback: CharStringAttributeCallback) { + suspend fun readProductNameAttribute(): CharString { // Implementation needs to be added here } - fun subscribeProductNameAttribute( - callback: CharStringAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeProductNameAttribute(minInterval: Int, maxInterval: Int): CharString { // Implementation needs to be added here } - fun readNodeLabelAttribute(callback: CharStringAttributeCallback) { + suspend fun readNodeLabelAttribute(): CharString { // Implementation needs to be added here } - fun writeNodeLabelAttribute(callback: DefaultClusterCallback, value: String) { + suspend fun writeNodeLabelAttribute(value: String) { // Implementation needs to be added here } - fun writeNodeLabelAttribute( - callback: DefaultClusterCallback, - value: String, - timedWriteTimeoutMs: Int - ) { + suspend fun writeNodeLabelAttribute(value: String, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeNodeLabelAttribute( - callback: CharStringAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeNodeLabelAttribute(minInterval: Int, maxInterval: Int): CharString { // Implementation needs to be added here } - fun readHardwareVersionAttribute(callback: IntegerAttributeCallback) { + suspend fun readHardwareVersionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeHardwareVersionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeHardwareVersionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readHardwareVersionStringAttribute(callback: CharStringAttributeCallback) { + suspend fun readHardwareVersionStringAttribute(): CharString { // Implementation needs to be added here } - fun subscribeHardwareVersionStringAttribute( - callback: CharStringAttributeCallback, + suspend fun subscribeHardwareVersionStringAttribute( minInterval: Int, maxInterval: Int - ) { + ): CharString { // Implementation needs to be added here } - fun readSoftwareVersionAttribute(callback: LongAttributeCallback) { + suspend fun readSoftwareVersionAttribute(): Long { // Implementation needs to be added here } - fun subscribeSoftwareVersionAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeSoftwareVersionAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readSoftwareVersionStringAttribute(callback: CharStringAttributeCallback) { + suspend fun readSoftwareVersionStringAttribute(): CharString { // Implementation needs to be added here } - fun subscribeSoftwareVersionStringAttribute( - callback: CharStringAttributeCallback, + suspend fun subscribeSoftwareVersionStringAttribute( minInterval: Int, maxInterval: Int - ) { + ): CharString { // Implementation needs to be added here } - fun readManufacturingDateAttribute(callback: CharStringAttributeCallback) { + suspend fun readManufacturingDateAttribute(): CharString { // Implementation needs to be added here } - fun subscribeManufacturingDateAttribute( - callback: CharStringAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeManufacturingDateAttribute(minInterval: Int, maxInterval: Int): CharString { // Implementation needs to be added here } - fun readPartNumberAttribute(callback: CharStringAttributeCallback) { + suspend fun readPartNumberAttribute(): CharString { // Implementation needs to be added here } - fun subscribePartNumberAttribute( - callback: CharStringAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribePartNumberAttribute(minInterval: Int, maxInterval: Int): CharString { // Implementation needs to be added here } - fun readProductURLAttribute(callback: CharStringAttributeCallback) { + suspend fun readProductURLAttribute(): CharString { // Implementation needs to be added here } - fun subscribeProductURLAttribute( - callback: CharStringAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeProductURLAttribute(minInterval: Int, maxInterval: Int): CharString { // Implementation needs to be added here } - fun readProductLabelAttribute(callback: CharStringAttributeCallback) { + suspend fun readProductLabelAttribute(): CharString { // Implementation needs to be added here } - fun subscribeProductLabelAttribute( - callback: CharStringAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeProductLabelAttribute(minInterval: Int, maxInterval: Int): CharString { // Implementation needs to be added here } - fun readSerialNumberAttribute(callback: CharStringAttributeCallback) { + suspend fun readSerialNumberAttribute(): CharString { // Implementation needs to be added here } - fun subscribeSerialNumberAttribute( - callback: CharStringAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeSerialNumberAttribute(minInterval: Int, maxInterval: Int): CharString { // Implementation needs to be added here } - fun readReachableAttribute(callback: BooleanAttributeCallback) { + suspend fun readReachableAttribute(): Boolean { // Implementation needs to be added here } - fun subscribeReachableAttribute( - callback: BooleanAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeReachableAttribute(minInterval: Int, maxInterval: Int): Boolean { // Implementation needs to be added here } - fun readUniqueIDAttribute(callback: CharStringAttributeCallback) { + suspend fun readUniqueIDAttribute(): CharString { // Implementation needs to be added here } - fun subscribeUniqueIDAttribute( - callback: CharStringAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeUniqueIDAttribute(minInterval: Int, maxInterval: Int): CharString { // Implementation needs to be added here } - fun readProductAppearanceAttribute(callback: ProductAppearanceAttributeCallback) { + suspend fun readProductAppearanceAttribute(): ProductAppearanceAttribute { // Implementation needs to be added here } - fun subscribeProductAppearanceAttribute( - callback: ProductAppearanceAttributeCallback, + suspend fun subscribeProductAppearanceAttribute( minInterval: Int, maxInterval: Int - ) { + ): ProductAppearanceAttribute { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 57u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/CarbonDioxideConcentrationMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/CarbonDioxideConcentrationMeasurementCluster.kt index 6562abd82bb5c1..4ec67d9b9cb9fe 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/CarbonDioxideConcentrationMeasurementCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/CarbonDioxideConcentrationMeasurementCluster.kt @@ -20,283 +20,188 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class CarbonDioxideConcentrationMeasurementCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 1037u - } - - interface MeasuredValueAttributeCallback { - fun onSuccess(value: Float?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface MinMeasuredValueAttributeCallback { - fun onSuccess(value: Float?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface MaxMeasuredValueAttributeCallback { - fun onSuccess(value: Float?) - - fun onError(ex: Exception) + class MeasuredValueAttribute(val value: Float?) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface PeakMeasuredValueAttributeCallback { - fun onSuccess(value: Float?) + class MinMeasuredValueAttribute(val value: Float?) - fun onError(ex: Exception) + class MaxMeasuredValueAttribute(val value: Float?) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class PeakMeasuredValueAttribute(val value: Float?) - interface AverageMeasuredValueAttributeCallback { - fun onSuccess(value: Float?) + class AverageMeasuredValueAttribute(val value: Float?) - fun onError(ex: Exception) + class GeneratedCommandListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AcceptedCommandListAttribute(val value: ArrayList) - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class EventListAttribute(val value: ArrayList) - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) + class AttributeListAttribute(val value: ArrayList) - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readMeasuredValueAttribute(callback: MeasuredValueAttributeCallback) { + suspend fun readMeasuredValueAttribute(): MeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeMeasuredValueAttribute( - callback: MeasuredValueAttributeCallback, + suspend fun subscribeMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): MeasuredValueAttribute { // Implementation needs to be added here } - fun readMinMeasuredValueAttribute(callback: MinMeasuredValueAttributeCallback) { + suspend fun readMinMeasuredValueAttribute(): MinMeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeMinMeasuredValueAttribute( - callback: MinMeasuredValueAttributeCallback, + suspend fun subscribeMinMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): MinMeasuredValueAttribute { // Implementation needs to be added here } - fun readMaxMeasuredValueAttribute(callback: MaxMeasuredValueAttributeCallback) { + suspend fun readMaxMeasuredValueAttribute(): MaxMeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeMaxMeasuredValueAttribute( - callback: MaxMeasuredValueAttributeCallback, + suspend fun subscribeMaxMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): MaxMeasuredValueAttribute { // Implementation needs to be added here } - fun readPeakMeasuredValueAttribute(callback: PeakMeasuredValueAttributeCallback) { + suspend fun readPeakMeasuredValueAttribute(): PeakMeasuredValueAttribute { // Implementation needs to be added here } - fun subscribePeakMeasuredValueAttribute( - callback: PeakMeasuredValueAttributeCallback, + suspend fun subscribePeakMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): PeakMeasuredValueAttribute { // Implementation needs to be added here } - fun readPeakMeasuredValueWindowAttribute(callback: LongAttributeCallback) { + suspend fun readPeakMeasuredValueWindowAttribute(): Long { // Implementation needs to be added here } - fun subscribePeakMeasuredValueWindowAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribePeakMeasuredValueWindowAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readAverageMeasuredValueAttribute(callback: AverageMeasuredValueAttributeCallback) { + suspend fun readAverageMeasuredValueAttribute(): AverageMeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeAverageMeasuredValueAttribute( - callback: AverageMeasuredValueAttributeCallback, + suspend fun subscribeAverageMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): AverageMeasuredValueAttribute { // Implementation needs to be added here } - fun readAverageMeasuredValueWindowAttribute(callback: LongAttributeCallback) { + suspend fun readAverageMeasuredValueWindowAttribute(): Long { // Implementation needs to be added here } - fun subscribeAverageMeasuredValueWindowAttribute( - callback: LongAttributeCallback, + suspend fun subscribeAverageMeasuredValueWindowAttribute( minInterval: Int, maxInterval: Int - ) { + ): Long { // Implementation needs to be added here } - fun readUncertaintyAttribute(callback: FloatAttributeCallback) { + suspend fun readUncertaintyAttribute(): Float { // Implementation needs to be added here } - fun subscribeUncertaintyAttribute( - callback: FloatAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeUncertaintyAttribute(minInterval: Int, maxInterval: Int): Float { // Implementation needs to be added here } - fun readMeasurementUnitAttribute(callback: IntegerAttributeCallback) { + suspend fun readMeasurementUnitAttribute(): Integer { // Implementation needs to be added here } - fun subscribeMeasurementUnitAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeMeasurementUnitAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readMeasurementMediumAttribute(callback: IntegerAttributeCallback) { + suspend fun readMeasurementMediumAttribute(): Integer { // Implementation needs to be added here } - fun subscribeMeasurementMediumAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeMeasurementMediumAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readLevelValueAttribute(callback: IntegerAttributeCallback) { + suspend fun readLevelValueAttribute(): Integer { // Implementation needs to be added here } - fun subscribeLevelValueAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeLevelValueAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 1037u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/CarbonMonoxideConcentrationMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/CarbonMonoxideConcentrationMeasurementCluster.kt index 451b4a986c2cf6..30c75be5175ecb 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/CarbonMonoxideConcentrationMeasurementCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/CarbonMonoxideConcentrationMeasurementCluster.kt @@ -20,283 +20,188 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class CarbonMonoxideConcentrationMeasurementCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 1036u - } - - interface MeasuredValueAttributeCallback { - fun onSuccess(value: Float?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface MinMeasuredValueAttributeCallback { - fun onSuccess(value: Float?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface MaxMeasuredValueAttributeCallback { - fun onSuccess(value: Float?) - - fun onError(ex: Exception) + class MeasuredValueAttribute(val value: Float?) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface PeakMeasuredValueAttributeCallback { - fun onSuccess(value: Float?) + class MinMeasuredValueAttribute(val value: Float?) - fun onError(ex: Exception) + class MaxMeasuredValueAttribute(val value: Float?) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class PeakMeasuredValueAttribute(val value: Float?) - interface AverageMeasuredValueAttributeCallback { - fun onSuccess(value: Float?) + class AverageMeasuredValueAttribute(val value: Float?) - fun onError(ex: Exception) + class GeneratedCommandListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AcceptedCommandListAttribute(val value: ArrayList) - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class EventListAttribute(val value: ArrayList) - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) + class AttributeListAttribute(val value: ArrayList) - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readMeasuredValueAttribute(callback: MeasuredValueAttributeCallback) { + suspend fun readMeasuredValueAttribute(): MeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeMeasuredValueAttribute( - callback: MeasuredValueAttributeCallback, + suspend fun subscribeMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): MeasuredValueAttribute { // Implementation needs to be added here } - fun readMinMeasuredValueAttribute(callback: MinMeasuredValueAttributeCallback) { + suspend fun readMinMeasuredValueAttribute(): MinMeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeMinMeasuredValueAttribute( - callback: MinMeasuredValueAttributeCallback, + suspend fun subscribeMinMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): MinMeasuredValueAttribute { // Implementation needs to be added here } - fun readMaxMeasuredValueAttribute(callback: MaxMeasuredValueAttributeCallback) { + suspend fun readMaxMeasuredValueAttribute(): MaxMeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeMaxMeasuredValueAttribute( - callback: MaxMeasuredValueAttributeCallback, + suspend fun subscribeMaxMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): MaxMeasuredValueAttribute { // Implementation needs to be added here } - fun readPeakMeasuredValueAttribute(callback: PeakMeasuredValueAttributeCallback) { + suspend fun readPeakMeasuredValueAttribute(): PeakMeasuredValueAttribute { // Implementation needs to be added here } - fun subscribePeakMeasuredValueAttribute( - callback: PeakMeasuredValueAttributeCallback, + suspend fun subscribePeakMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): PeakMeasuredValueAttribute { // Implementation needs to be added here } - fun readPeakMeasuredValueWindowAttribute(callback: LongAttributeCallback) { + suspend fun readPeakMeasuredValueWindowAttribute(): Long { // Implementation needs to be added here } - fun subscribePeakMeasuredValueWindowAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribePeakMeasuredValueWindowAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readAverageMeasuredValueAttribute(callback: AverageMeasuredValueAttributeCallback) { + suspend fun readAverageMeasuredValueAttribute(): AverageMeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeAverageMeasuredValueAttribute( - callback: AverageMeasuredValueAttributeCallback, + suspend fun subscribeAverageMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): AverageMeasuredValueAttribute { // Implementation needs to be added here } - fun readAverageMeasuredValueWindowAttribute(callback: LongAttributeCallback) { + suspend fun readAverageMeasuredValueWindowAttribute(): Long { // Implementation needs to be added here } - fun subscribeAverageMeasuredValueWindowAttribute( - callback: LongAttributeCallback, + suspend fun subscribeAverageMeasuredValueWindowAttribute( minInterval: Int, maxInterval: Int - ) { + ): Long { // Implementation needs to be added here } - fun readUncertaintyAttribute(callback: FloatAttributeCallback) { + suspend fun readUncertaintyAttribute(): Float { // Implementation needs to be added here } - fun subscribeUncertaintyAttribute( - callback: FloatAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeUncertaintyAttribute(minInterval: Int, maxInterval: Int): Float { // Implementation needs to be added here } - fun readMeasurementUnitAttribute(callback: IntegerAttributeCallback) { + suspend fun readMeasurementUnitAttribute(): Integer { // Implementation needs to be added here } - fun subscribeMeasurementUnitAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeMeasurementUnitAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readMeasurementMediumAttribute(callback: IntegerAttributeCallback) { + suspend fun readMeasurementMediumAttribute(): Integer { // Implementation needs to be added here } - fun subscribeMeasurementMediumAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeMeasurementMediumAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readLevelValueAttribute(callback: IntegerAttributeCallback) { + suspend fun readLevelValueAttribute(): Integer { // Implementation needs to be added here } - fun subscribeLevelValueAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeLevelValueAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 1036u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ChannelCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ChannelCluster.kt index 125a7045445cf1..dc9db0efb936a4 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ChannelCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ChannelCluster.kt @@ -20,214 +20,138 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class ChannelCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 1284u - } + class ChangeChannelResponse(val status: UInt, val data: String?) + + class ChannelListAttribute(val value: ArrayList?) + + class LineupAttribute(val value: ChipStructs.ChannelClusterLineupInfoStruct?) + + class CurrentChannelAttribute(val value: ChipStructs.ChannelClusterChannelInfoStruct?) + + class GeneratedCommandListAttribute(val value: ArrayList) + + class AcceptedCommandListAttribute(val value: ArrayList) + + class EventListAttribute(val value: ArrayList) - fun changeChannel(callback: ChangeChannelResponseCallback, match: String) { + class AttributeListAttribute(val value: ArrayList) + + suspend fun changeChannel(match: String): ChangeChannelResponse { // Implementation needs to be added here } - fun changeChannel( - callback: ChangeChannelResponseCallback, - match: String, - timedInvokeTimeoutMs: Int - ) { + suspend fun changeChannel(match: String, timedInvokeTimeoutMs: Int): ChangeChannelResponse { // Implementation needs to be added here } - fun changeChannelByNumber( - callback: DefaultClusterCallback, - majorNumber: Integer, - minorNumber: Integer - ) { + suspend fun changeChannelByNumber(majorNumber: UShort, minorNumber: UShort) { // Implementation needs to be added here } - fun changeChannelByNumber( - callback: DefaultClusterCallback, - majorNumber: Integer, - minorNumber: Integer, + suspend fun changeChannelByNumber( + majorNumber: UShort, + minorNumber: UShort, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - fun skipChannel(callback: DefaultClusterCallback, count: Integer) { + suspend fun skipChannel(count: Short) { // Implementation needs to be added here } - fun skipChannel(callback: DefaultClusterCallback, count: Integer, timedInvokeTimeoutMs: Int) { + suspend fun skipChannel(count: Short, timedInvokeTimeoutMs: Int) { // Implementation needs to be added here } - interface ChangeChannelResponseCallback { - fun onSuccess(status: Integer, data: String?) - - fun onError(error: Exception) - } - - interface ChannelListAttributeCallback { - fun onSuccess(value: ArrayList?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface LineupAttributeCallback { - fun onSuccess(value: ChipStructs.ChannelClusterLineupInfoStruct?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface CurrentChannelAttributeCallback { - fun onSuccess(value: ChipStructs.ChannelClusterChannelInfoStruct?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readChannelListAttribute(callback: ChannelListAttributeCallback) { + suspend fun readChannelListAttribute(): ChannelListAttribute { // Implementation needs to be added here } - fun subscribeChannelListAttribute( - callback: ChannelListAttributeCallback, + suspend fun subscribeChannelListAttribute( minInterval: Int, maxInterval: Int - ) { + ): ChannelListAttribute { // Implementation needs to be added here } - fun readLineupAttribute(callback: LineupAttributeCallback) { + suspend fun readLineupAttribute(): LineupAttribute { // Implementation needs to be added here } - fun subscribeLineupAttribute( - callback: LineupAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeLineupAttribute(minInterval: Int, maxInterval: Int): LineupAttribute { // Implementation needs to be added here } - fun readCurrentChannelAttribute(callback: CurrentChannelAttributeCallback) { + suspend fun readCurrentChannelAttribute(): CurrentChannelAttribute { // Implementation needs to be added here } - fun subscribeCurrentChannelAttribute( - callback: CurrentChannelAttributeCallback, + suspend fun subscribeCurrentChannelAttribute( minInterval: Int, maxInterval: Int - ) { + ): CurrentChannelAttribute { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 1284u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ColorControlCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ColorControlCluster.kt index 0faf5c751ba20b..4312bfe45a4f5c 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ColorControlCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ColorControlCluster.kt @@ -20,1413 +20,1039 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class ColorControlCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 768u - } + class NumberOfPrimariesAttribute(val value: UByte?) + + class Primary1IntensityAttribute(val value: UByte?) + + class Primary2IntensityAttribute(val value: UByte?) + + class Primary3IntensityAttribute(val value: UByte?) + + class Primary4IntensityAttribute(val value: UByte?) + + class Primary5IntensityAttribute(val value: UByte?) + + class Primary6IntensityAttribute(val value: UByte?) + + class ColorPointRIntensityAttribute(val value: UByte?) + + class ColorPointGIntensityAttribute(val value: UByte?) + + class ColorPointBIntensityAttribute(val value: UByte?) + + class StartUpColorTemperatureMiredsAttribute(val value: UShort?) + + class GeneratedCommandListAttribute(val value: ArrayList) + + class AcceptedCommandListAttribute(val value: ArrayList) - fun moveToHue( - callback: DefaultClusterCallback, - hue: Integer, - direction: Integer, - transitionTime: Integer, - optionsMask: Integer, - optionsOverride: Integer + class EventListAttribute(val value: ArrayList) + + class AttributeListAttribute(val value: ArrayList) + + suspend fun moveToHue( + hue: UByte, + direction: UInt, + transitionTime: UShort, + optionsMask: UInt, + optionsOverride: UInt ) { // Implementation needs to be added here } - fun moveToHue( - callback: DefaultClusterCallback, - hue: Integer, - direction: Integer, - transitionTime: Integer, - optionsMask: Integer, - optionsOverride: Integer, + suspend fun moveToHue( + hue: UByte, + direction: UInt, + transitionTime: UShort, + optionsMask: UInt, + optionsOverride: UInt, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - fun moveHue( - callback: DefaultClusterCallback, - moveMode: Integer, - rate: Integer, - optionsMask: Integer, - optionsOverride: Integer - ) { + suspend fun moveHue(moveMode: UInt, rate: UByte, optionsMask: UInt, optionsOverride: UInt) { // Implementation needs to be added here } - fun moveHue( - callback: DefaultClusterCallback, - moveMode: Integer, - rate: Integer, - optionsMask: Integer, - optionsOverride: Integer, + suspend fun moveHue( + moveMode: UInt, + rate: UByte, + optionsMask: UInt, + optionsOverride: UInt, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - fun stepHue( - callback: DefaultClusterCallback, - stepMode: Integer, - stepSize: Integer, - transitionTime: Integer, - optionsMask: Integer, - optionsOverride: Integer + suspend fun stepHue( + stepMode: UInt, + stepSize: UByte, + transitionTime: UByte, + optionsMask: UInt, + optionsOverride: UInt ) { // Implementation needs to be added here } - fun stepHue( - callback: DefaultClusterCallback, - stepMode: Integer, - stepSize: Integer, - transitionTime: Integer, - optionsMask: Integer, - optionsOverride: Integer, + suspend fun stepHue( + stepMode: UInt, + stepSize: UByte, + transitionTime: UByte, + optionsMask: UInt, + optionsOverride: UInt, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - fun moveToSaturation( - callback: DefaultClusterCallback, - saturation: Integer, - transitionTime: Integer, - optionsMask: Integer, - optionsOverride: Integer + suspend fun moveToSaturation( + saturation: UByte, + transitionTime: UShort, + optionsMask: UInt, + optionsOverride: UInt ) { // Implementation needs to be added here } - fun moveToSaturation( - callback: DefaultClusterCallback, - saturation: Integer, - transitionTime: Integer, - optionsMask: Integer, - optionsOverride: Integer, + suspend fun moveToSaturation( + saturation: UByte, + transitionTime: UShort, + optionsMask: UInt, + optionsOverride: UInt, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - fun moveSaturation( - callback: DefaultClusterCallback, - moveMode: Integer, - rate: Integer, - optionsMask: Integer, - optionsOverride: Integer + suspend fun moveSaturation( + moveMode: UInt, + rate: UByte, + optionsMask: UInt, + optionsOverride: UInt ) { // Implementation needs to be added here } - fun moveSaturation( - callback: DefaultClusterCallback, - moveMode: Integer, - rate: Integer, - optionsMask: Integer, - optionsOverride: Integer, + suspend fun moveSaturation( + moveMode: UInt, + rate: UByte, + optionsMask: UInt, + optionsOverride: UInt, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - fun stepSaturation( - callback: DefaultClusterCallback, - stepMode: Integer, - stepSize: Integer, - transitionTime: Integer, - optionsMask: Integer, - optionsOverride: Integer + suspend fun stepSaturation( + stepMode: UInt, + stepSize: UByte, + transitionTime: UByte, + optionsMask: UInt, + optionsOverride: UInt ) { // Implementation needs to be added here } - fun stepSaturation( - callback: DefaultClusterCallback, - stepMode: Integer, - stepSize: Integer, - transitionTime: Integer, - optionsMask: Integer, - optionsOverride: Integer, + suspend fun stepSaturation( + stepMode: UInt, + stepSize: UByte, + transitionTime: UByte, + optionsMask: UInt, + optionsOverride: UInt, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - fun moveToHueAndSaturation( - callback: DefaultClusterCallback, - hue: Integer, - saturation: Integer, - transitionTime: Integer, - optionsMask: Integer, - optionsOverride: Integer + suspend fun moveToHueAndSaturation( + hue: UByte, + saturation: UByte, + transitionTime: UShort, + optionsMask: UInt, + optionsOverride: UInt ) { // Implementation needs to be added here } - fun moveToHueAndSaturation( - callback: DefaultClusterCallback, - hue: Integer, - saturation: Integer, - transitionTime: Integer, - optionsMask: Integer, - optionsOverride: Integer, + suspend fun moveToHueAndSaturation( + hue: UByte, + saturation: UByte, + transitionTime: UShort, + optionsMask: UInt, + optionsOverride: UInt, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - fun moveToColor( - callback: DefaultClusterCallback, - colorX: Integer, - colorY: Integer, - transitionTime: Integer, - optionsMask: Integer, - optionsOverride: Integer + suspend fun moveToColor( + colorX: UShort, + colorY: UShort, + transitionTime: UShort, + optionsMask: UInt, + optionsOverride: UInt ) { // Implementation needs to be added here } - fun moveToColor( - callback: DefaultClusterCallback, - colorX: Integer, - colorY: Integer, - transitionTime: Integer, - optionsMask: Integer, - optionsOverride: Integer, + suspend fun moveToColor( + colorX: UShort, + colorY: UShort, + transitionTime: UShort, + optionsMask: UInt, + optionsOverride: UInt, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - fun moveColor( - callback: DefaultClusterCallback, - rateX: Integer, - rateY: Integer, - optionsMask: Integer, - optionsOverride: Integer - ) { + suspend fun moveColor(rateX: Short, rateY: Short, optionsMask: UInt, optionsOverride: UInt) { // Implementation needs to be added here } - fun moveColor( - callback: DefaultClusterCallback, - rateX: Integer, - rateY: Integer, - optionsMask: Integer, - optionsOverride: Integer, + suspend fun moveColor( + rateX: Short, + rateY: Short, + optionsMask: UInt, + optionsOverride: UInt, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - fun stepColor( - callback: DefaultClusterCallback, - stepX: Integer, - stepY: Integer, - transitionTime: Integer, - optionsMask: Integer, - optionsOverride: Integer + suspend fun stepColor( + stepX: Short, + stepY: Short, + transitionTime: UShort, + optionsMask: UInt, + optionsOverride: UInt ) { // Implementation needs to be added here } - fun stepColor( - callback: DefaultClusterCallback, - stepX: Integer, - stepY: Integer, - transitionTime: Integer, - optionsMask: Integer, - optionsOverride: Integer, + suspend fun stepColor( + stepX: Short, + stepY: Short, + transitionTime: UShort, + optionsMask: UInt, + optionsOverride: UInt, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - fun moveToColorTemperature( - callback: DefaultClusterCallback, - colorTemperatureMireds: Integer, - transitionTime: Integer, - optionsMask: Integer, - optionsOverride: Integer + suspend fun moveToColorTemperature( + colorTemperatureMireds: UShort, + transitionTime: UShort, + optionsMask: UInt, + optionsOverride: UInt ) { // Implementation needs to be added here } - fun moveToColorTemperature( - callback: DefaultClusterCallback, - colorTemperatureMireds: Integer, - transitionTime: Integer, - optionsMask: Integer, - optionsOverride: Integer, + suspend fun moveToColorTemperature( + colorTemperatureMireds: UShort, + transitionTime: UShort, + optionsMask: UInt, + optionsOverride: UInt, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - fun enhancedMoveToHue( - callback: DefaultClusterCallback, - enhancedHue: Integer, - direction: Integer, - transitionTime: Integer, - optionsMask: Integer, - optionsOverride: Integer + suspend fun enhancedMoveToHue( + enhancedHue: UShort, + direction: UInt, + transitionTime: UShort, + optionsMask: UInt, + optionsOverride: UInt ) { // Implementation needs to be added here } - fun enhancedMoveToHue( - callback: DefaultClusterCallback, - enhancedHue: Integer, - direction: Integer, - transitionTime: Integer, - optionsMask: Integer, - optionsOverride: Integer, + suspend fun enhancedMoveToHue( + enhancedHue: UShort, + direction: UInt, + transitionTime: UShort, + optionsMask: UInt, + optionsOverride: UInt, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - fun enhancedMoveHue( - callback: DefaultClusterCallback, - moveMode: Integer, - rate: Integer, - optionsMask: Integer, - optionsOverride: Integer + suspend fun enhancedMoveHue( + moveMode: UInt, + rate: UShort, + optionsMask: UInt, + optionsOverride: UInt ) { // Implementation needs to be added here } - fun enhancedMoveHue( - callback: DefaultClusterCallback, - moveMode: Integer, - rate: Integer, - optionsMask: Integer, - optionsOverride: Integer, + suspend fun enhancedMoveHue( + moveMode: UInt, + rate: UShort, + optionsMask: UInt, + optionsOverride: UInt, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - fun enhancedStepHue( - callback: DefaultClusterCallback, - stepMode: Integer, - stepSize: Integer, - transitionTime: Integer, - optionsMask: Integer, - optionsOverride: Integer + suspend fun enhancedStepHue( + stepMode: UInt, + stepSize: UShort, + transitionTime: UShort, + optionsMask: UInt, + optionsOverride: UInt ) { // Implementation needs to be added here } - fun enhancedStepHue( - callback: DefaultClusterCallback, - stepMode: Integer, - stepSize: Integer, - transitionTime: Integer, - optionsMask: Integer, - optionsOverride: Integer, + suspend fun enhancedStepHue( + stepMode: UInt, + stepSize: UShort, + transitionTime: UShort, + optionsMask: UInt, + optionsOverride: UInt, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - fun enhancedMoveToHueAndSaturation( - callback: DefaultClusterCallback, - enhancedHue: Integer, - saturation: Integer, - transitionTime: Integer, - optionsMask: Integer, - optionsOverride: Integer + suspend fun enhancedMoveToHueAndSaturation( + enhancedHue: UShort, + saturation: UByte, + transitionTime: UShort, + optionsMask: UInt, + optionsOverride: UInt ) { // Implementation needs to be added here } - fun enhancedMoveToHueAndSaturation( - callback: DefaultClusterCallback, - enhancedHue: Integer, - saturation: Integer, - transitionTime: Integer, - optionsMask: Integer, - optionsOverride: Integer, + suspend fun enhancedMoveToHueAndSaturation( + enhancedHue: UShort, + saturation: UByte, + transitionTime: UShort, + optionsMask: UInt, + optionsOverride: UInt, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - fun colorLoopSet( - callback: DefaultClusterCallback, - updateFlags: Integer, - action: Integer, - direction: Integer, - time: Integer, - startHue: Integer, - optionsMask: Integer, - optionsOverride: Integer + suspend fun colorLoopSet( + updateFlags: UInt, + action: UInt, + direction: UInt, + time: UShort, + startHue: UShort, + optionsMask: UInt, + optionsOverride: UInt ) { // Implementation needs to be added here } - fun colorLoopSet( - callback: DefaultClusterCallback, - updateFlags: Integer, - action: Integer, - direction: Integer, - time: Integer, - startHue: Integer, - optionsMask: Integer, - optionsOverride: Integer, + suspend fun colorLoopSet( + updateFlags: UInt, + action: UInt, + direction: UInt, + time: UShort, + startHue: UShort, + optionsMask: UInt, + optionsOverride: UInt, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - fun stopMoveStep( - callback: DefaultClusterCallback, - optionsMask: Integer, - optionsOverride: Integer - ) { + suspend fun stopMoveStep(optionsMask: UInt, optionsOverride: UInt) { // Implementation needs to be added here } - fun stopMoveStep( - callback: DefaultClusterCallback, - optionsMask: Integer, - optionsOverride: Integer, - timedInvokeTimeoutMs: Int - ) { + suspend fun stopMoveStep(optionsMask: UInt, optionsOverride: UInt, timedInvokeTimeoutMs: Int) { // Implementation needs to be added here } - fun moveColorTemperature( - callback: DefaultClusterCallback, - moveMode: Integer, - rate: Integer, - colorTemperatureMinimumMireds: Integer, - colorTemperatureMaximumMireds: Integer, - optionsMask: Integer, - optionsOverride: Integer + suspend fun moveColorTemperature( + moveMode: UInt, + rate: UShort, + colorTemperatureMinimumMireds: UShort, + colorTemperatureMaximumMireds: UShort, + optionsMask: UInt, + optionsOverride: UInt ) { // Implementation needs to be added here } - fun moveColorTemperature( - callback: DefaultClusterCallback, - moveMode: Integer, - rate: Integer, - colorTemperatureMinimumMireds: Integer, - colorTemperatureMaximumMireds: Integer, - optionsMask: Integer, - optionsOverride: Integer, + suspend fun moveColorTemperature( + moveMode: UInt, + rate: UShort, + colorTemperatureMinimumMireds: UShort, + colorTemperatureMaximumMireds: UShort, + optionsMask: UInt, + optionsOverride: UInt, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - fun stepColorTemperature( - callback: DefaultClusterCallback, - stepMode: Integer, - stepSize: Integer, - transitionTime: Integer, - colorTemperatureMinimumMireds: Integer, - colorTemperatureMaximumMireds: Integer, - optionsMask: Integer, - optionsOverride: Integer + suspend fun stepColorTemperature( + stepMode: UInt, + stepSize: UShort, + transitionTime: UShort, + colorTemperatureMinimumMireds: UShort, + colorTemperatureMaximumMireds: UShort, + optionsMask: UInt, + optionsOverride: UInt ) { // Implementation needs to be added here } - fun stepColorTemperature( - callback: DefaultClusterCallback, - stepMode: Integer, - stepSize: Integer, - transitionTime: Integer, - colorTemperatureMinimumMireds: Integer, - colorTemperatureMaximumMireds: Integer, - optionsMask: Integer, - optionsOverride: Integer, + suspend fun stepColorTemperature( + stepMode: UInt, + stepSize: UShort, + transitionTime: UShort, + colorTemperatureMinimumMireds: UShort, + colorTemperatureMaximumMireds: UShort, + optionsMask: UInt, + optionsOverride: UInt, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - interface NumberOfPrimariesAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface Primary1IntensityAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface Primary2IntensityAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface Primary3IntensityAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface Primary4IntensityAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface Primary5IntensityAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface Primary6IntensityAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface ColorPointRIntensityAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface ColorPointGIntensityAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface ColorPointBIntensityAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface StartUpColorTemperatureMiredsAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readCurrentHueAttribute(callback: IntegerAttributeCallback) { + suspend fun readCurrentHueAttribute(): Integer { // Implementation needs to be added here } - fun subscribeCurrentHueAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeCurrentHueAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readCurrentSaturationAttribute(callback: IntegerAttributeCallback) { + suspend fun readCurrentSaturationAttribute(): Integer { // Implementation needs to be added here } - fun subscribeCurrentSaturationAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeCurrentSaturationAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readRemainingTimeAttribute(callback: IntegerAttributeCallback) { + suspend fun readRemainingTimeAttribute(): Integer { // Implementation needs to be added here } - fun subscribeRemainingTimeAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeRemainingTimeAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readCurrentXAttribute(callback: IntegerAttributeCallback) { + suspend fun readCurrentXAttribute(): Integer { // Implementation needs to be added here } - fun subscribeCurrentXAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeCurrentXAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readCurrentYAttribute(callback: IntegerAttributeCallback) { + suspend fun readCurrentYAttribute(): Integer { // Implementation needs to be added here } - fun subscribeCurrentYAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeCurrentYAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readDriftCompensationAttribute(callback: IntegerAttributeCallback) { + suspend fun readDriftCompensationAttribute(): Integer { // Implementation needs to be added here } - fun subscribeDriftCompensationAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeDriftCompensationAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readCompensationTextAttribute(callback: CharStringAttributeCallback) { + suspend fun readCompensationTextAttribute(): CharString { // Implementation needs to be added here } - fun subscribeCompensationTextAttribute( - callback: CharStringAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeCompensationTextAttribute(minInterval: Int, maxInterval: Int): CharString { // Implementation needs to be added here } - fun readColorTemperatureMiredsAttribute(callback: IntegerAttributeCallback) { + suspend fun readColorTemperatureMiredsAttribute(): Integer { // Implementation needs to be added here } - fun subscribeColorTemperatureMiredsAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeColorTemperatureMiredsAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readColorModeAttribute(callback: IntegerAttributeCallback) { + suspend fun readColorModeAttribute(): Integer { // Implementation needs to be added here } - fun subscribeColorModeAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeColorModeAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readOptionsAttribute(callback: IntegerAttributeCallback) { + suspend fun readOptionsAttribute(): Integer { // Implementation needs to be added here } - fun writeOptionsAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeOptionsAttribute(value: UInt) { // Implementation needs to be added here } - fun writeOptionsAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeOptionsAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeOptionsAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeOptionsAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readNumberOfPrimariesAttribute(callback: NumberOfPrimariesAttributeCallback) { + suspend fun readNumberOfPrimariesAttribute(): NumberOfPrimariesAttribute { // Implementation needs to be added here } - fun subscribeNumberOfPrimariesAttribute( - callback: NumberOfPrimariesAttributeCallback, + suspend fun subscribeNumberOfPrimariesAttribute( minInterval: Int, maxInterval: Int - ) { + ): NumberOfPrimariesAttribute { // Implementation needs to be added here } - fun readPrimary1XAttribute(callback: IntegerAttributeCallback) { + suspend fun readPrimary1XAttribute(): Integer { // Implementation needs to be added here } - fun subscribePrimary1XAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribePrimary1XAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readPrimary1YAttribute(callback: IntegerAttributeCallback) { + suspend fun readPrimary1YAttribute(): Integer { // Implementation needs to be added here } - fun subscribePrimary1YAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribePrimary1YAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readPrimary1IntensityAttribute(callback: Primary1IntensityAttributeCallback) { + suspend fun readPrimary1IntensityAttribute(): Primary1IntensityAttribute { // Implementation needs to be added here } - fun subscribePrimary1IntensityAttribute( - callback: Primary1IntensityAttributeCallback, + suspend fun subscribePrimary1IntensityAttribute( minInterval: Int, maxInterval: Int - ) { + ): Primary1IntensityAttribute { // Implementation needs to be added here } - fun readPrimary2XAttribute(callback: IntegerAttributeCallback) { + suspend fun readPrimary2XAttribute(): Integer { // Implementation needs to be added here } - fun subscribePrimary2XAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribePrimary2XAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readPrimary2YAttribute(callback: IntegerAttributeCallback) { + suspend fun readPrimary2YAttribute(): Integer { // Implementation needs to be added here } - fun subscribePrimary2YAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribePrimary2YAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readPrimary2IntensityAttribute(callback: Primary2IntensityAttributeCallback) { + suspend fun readPrimary2IntensityAttribute(): Primary2IntensityAttribute { // Implementation needs to be added here } - fun subscribePrimary2IntensityAttribute( - callback: Primary2IntensityAttributeCallback, + suspend fun subscribePrimary2IntensityAttribute( minInterval: Int, maxInterval: Int - ) { + ): Primary2IntensityAttribute { // Implementation needs to be added here } - fun readPrimary3XAttribute(callback: IntegerAttributeCallback) { + suspend fun readPrimary3XAttribute(): Integer { // Implementation needs to be added here } - fun subscribePrimary3XAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribePrimary3XAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readPrimary3YAttribute(callback: IntegerAttributeCallback) { + suspend fun readPrimary3YAttribute(): Integer { // Implementation needs to be added here } - fun subscribePrimary3YAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribePrimary3YAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readPrimary3IntensityAttribute(callback: Primary3IntensityAttributeCallback) { + suspend fun readPrimary3IntensityAttribute(): Primary3IntensityAttribute { // Implementation needs to be added here } - fun subscribePrimary3IntensityAttribute( - callback: Primary3IntensityAttributeCallback, + suspend fun subscribePrimary3IntensityAttribute( minInterval: Int, maxInterval: Int - ) { + ): Primary3IntensityAttribute { // Implementation needs to be added here } - fun readPrimary4XAttribute(callback: IntegerAttributeCallback) { + suspend fun readPrimary4XAttribute(): Integer { // Implementation needs to be added here } - fun subscribePrimary4XAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribePrimary4XAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readPrimary4YAttribute(callback: IntegerAttributeCallback) { + suspend fun readPrimary4YAttribute(): Integer { // Implementation needs to be added here } - fun subscribePrimary4YAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribePrimary4YAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readPrimary4IntensityAttribute(callback: Primary4IntensityAttributeCallback) { + suspend fun readPrimary4IntensityAttribute(): Primary4IntensityAttribute { // Implementation needs to be added here } - fun subscribePrimary4IntensityAttribute( - callback: Primary4IntensityAttributeCallback, + suspend fun subscribePrimary4IntensityAttribute( minInterval: Int, maxInterval: Int - ) { + ): Primary4IntensityAttribute { // Implementation needs to be added here } - fun readPrimary5XAttribute(callback: IntegerAttributeCallback) { + suspend fun readPrimary5XAttribute(): Integer { // Implementation needs to be added here } - fun subscribePrimary5XAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribePrimary5XAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readPrimary5YAttribute(callback: IntegerAttributeCallback) { + suspend fun readPrimary5YAttribute(): Integer { // Implementation needs to be added here } - fun subscribePrimary5YAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribePrimary5YAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readPrimary5IntensityAttribute(callback: Primary5IntensityAttributeCallback) { + suspend fun readPrimary5IntensityAttribute(): Primary5IntensityAttribute { // Implementation needs to be added here } - fun subscribePrimary5IntensityAttribute( - callback: Primary5IntensityAttributeCallback, + suspend fun subscribePrimary5IntensityAttribute( minInterval: Int, maxInterval: Int - ) { + ): Primary5IntensityAttribute { // Implementation needs to be added here } - fun readPrimary6XAttribute(callback: IntegerAttributeCallback) { + suspend fun readPrimary6XAttribute(): Integer { // Implementation needs to be added here } - fun subscribePrimary6XAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribePrimary6XAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readPrimary6YAttribute(callback: IntegerAttributeCallback) { + suspend fun readPrimary6YAttribute(): Integer { // Implementation needs to be added here } - fun subscribePrimary6YAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribePrimary6YAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readPrimary6IntensityAttribute(callback: Primary6IntensityAttributeCallback) { + suspend fun readPrimary6IntensityAttribute(): Primary6IntensityAttribute { // Implementation needs to be added here } - fun subscribePrimary6IntensityAttribute( - callback: Primary6IntensityAttributeCallback, + suspend fun subscribePrimary6IntensityAttribute( minInterval: Int, maxInterval: Int - ) { + ): Primary6IntensityAttribute { // Implementation needs to be added here } - fun readWhitePointXAttribute(callback: IntegerAttributeCallback) { + suspend fun readWhitePointXAttribute(): Integer { // Implementation needs to be added here } - fun writeWhitePointXAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeWhitePointXAttribute(value: UShort) { // Implementation needs to be added here } - fun writeWhitePointXAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeWhitePointXAttribute(value: UShort, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeWhitePointXAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeWhitePointXAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readWhitePointYAttribute(callback: IntegerAttributeCallback) { + suspend fun readWhitePointYAttribute(): Integer { // Implementation needs to be added here } - fun writeWhitePointYAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeWhitePointYAttribute(value: UShort) { // Implementation needs to be added here } - fun writeWhitePointYAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeWhitePointYAttribute(value: UShort, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeWhitePointYAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeWhitePointYAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readColorPointRXAttribute(callback: IntegerAttributeCallback) { + suspend fun readColorPointRXAttribute(): Integer { // Implementation needs to be added here } - fun writeColorPointRXAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeColorPointRXAttribute(value: UShort) { // Implementation needs to be added here } - fun writeColorPointRXAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeColorPointRXAttribute(value: UShort, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeColorPointRXAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeColorPointRXAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readColorPointRYAttribute(callback: IntegerAttributeCallback) { + suspend fun readColorPointRYAttribute(): Integer { // Implementation needs to be added here } - fun writeColorPointRYAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeColorPointRYAttribute(value: UShort) { // Implementation needs to be added here } - fun writeColorPointRYAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeColorPointRYAttribute(value: UShort, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeColorPointRYAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeColorPointRYAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readColorPointRIntensityAttribute(callback: ColorPointRIntensityAttributeCallback) { + suspend fun readColorPointRIntensityAttribute(): ColorPointRIntensityAttribute { // Implementation needs to be added here } - fun writeColorPointRIntensityAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeColorPointRIntensityAttribute(value: UByte) { // Implementation needs to be added here } - fun writeColorPointRIntensityAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeColorPointRIntensityAttribute(value: UByte, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeColorPointRIntensityAttribute( - callback: ColorPointRIntensityAttributeCallback, + suspend fun subscribeColorPointRIntensityAttribute( minInterval: Int, maxInterval: Int - ) { + ): ColorPointRIntensityAttribute { // Implementation needs to be added here } - fun readColorPointGXAttribute(callback: IntegerAttributeCallback) { + suspend fun readColorPointGXAttribute(): Integer { // Implementation needs to be added here } - fun writeColorPointGXAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeColorPointGXAttribute(value: UShort) { // Implementation needs to be added here } - fun writeColorPointGXAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeColorPointGXAttribute(value: UShort, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeColorPointGXAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeColorPointGXAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readColorPointGYAttribute(callback: IntegerAttributeCallback) { + suspend fun readColorPointGYAttribute(): Integer { // Implementation needs to be added here } - fun writeColorPointGYAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeColorPointGYAttribute(value: UShort) { // Implementation needs to be added here } - fun writeColorPointGYAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeColorPointGYAttribute(value: UShort, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeColorPointGYAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeColorPointGYAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readColorPointGIntensityAttribute(callback: ColorPointGIntensityAttributeCallback) { + suspend fun readColorPointGIntensityAttribute(): ColorPointGIntensityAttribute { // Implementation needs to be added here } - fun writeColorPointGIntensityAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeColorPointGIntensityAttribute(value: UByte) { // Implementation needs to be added here } - fun writeColorPointGIntensityAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeColorPointGIntensityAttribute(value: UByte, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeColorPointGIntensityAttribute( - callback: ColorPointGIntensityAttributeCallback, + suspend fun subscribeColorPointGIntensityAttribute( minInterval: Int, maxInterval: Int - ) { + ): ColorPointGIntensityAttribute { // Implementation needs to be added here } - fun readColorPointBXAttribute(callback: IntegerAttributeCallback) { + suspend fun readColorPointBXAttribute(): Integer { // Implementation needs to be added here } - fun writeColorPointBXAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeColorPointBXAttribute(value: UShort) { // Implementation needs to be added here } - fun writeColorPointBXAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeColorPointBXAttribute(value: UShort, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeColorPointBXAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeColorPointBXAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readColorPointBYAttribute(callback: IntegerAttributeCallback) { + suspend fun readColorPointBYAttribute(): Integer { // Implementation needs to be added here } - fun writeColorPointBYAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeColorPointBYAttribute(value: UShort) { // Implementation needs to be added here } - fun writeColorPointBYAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeColorPointBYAttribute(value: UShort, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeColorPointBYAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeColorPointBYAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readColorPointBIntensityAttribute(callback: ColorPointBIntensityAttributeCallback) { + suspend fun readColorPointBIntensityAttribute(): ColorPointBIntensityAttribute { // Implementation needs to be added here } - fun writeColorPointBIntensityAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeColorPointBIntensityAttribute(value: UByte) { // Implementation needs to be added here } - fun writeColorPointBIntensityAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeColorPointBIntensityAttribute(value: UByte, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeColorPointBIntensityAttribute( - callback: ColorPointBIntensityAttributeCallback, + suspend fun subscribeColorPointBIntensityAttribute( minInterval: Int, maxInterval: Int - ) { + ): ColorPointBIntensityAttribute { // Implementation needs to be added here } - fun readEnhancedCurrentHueAttribute(callback: IntegerAttributeCallback) { + suspend fun readEnhancedCurrentHueAttribute(): Integer { // Implementation needs to be added here } - fun subscribeEnhancedCurrentHueAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEnhancedCurrentHueAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readEnhancedColorModeAttribute(callback: IntegerAttributeCallback) { + suspend fun readEnhancedColorModeAttribute(): Integer { // Implementation needs to be added here } - fun subscribeEnhancedColorModeAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEnhancedColorModeAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readColorLoopActiveAttribute(callback: IntegerAttributeCallback) { + suspend fun readColorLoopActiveAttribute(): Integer { // Implementation needs to be added here } - fun subscribeColorLoopActiveAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeColorLoopActiveAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readColorLoopDirectionAttribute(callback: IntegerAttributeCallback) { + suspend fun readColorLoopDirectionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeColorLoopDirectionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeColorLoopDirectionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readColorLoopTimeAttribute(callback: IntegerAttributeCallback) { + suspend fun readColorLoopTimeAttribute(): Integer { // Implementation needs to be added here } - fun subscribeColorLoopTimeAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeColorLoopTimeAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readColorLoopStartEnhancedHueAttribute(callback: IntegerAttributeCallback) { + suspend fun readColorLoopStartEnhancedHueAttribute(): Integer { // Implementation needs to be added here } - fun subscribeColorLoopStartEnhancedHueAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeColorLoopStartEnhancedHueAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readColorLoopStoredEnhancedHueAttribute(callback: IntegerAttributeCallback) { + suspend fun readColorLoopStoredEnhancedHueAttribute(): Integer { // Implementation needs to be added here } - fun subscribeColorLoopStoredEnhancedHueAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeColorLoopStoredEnhancedHueAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readColorCapabilitiesAttribute(callback: IntegerAttributeCallback) { + suspend fun readColorCapabilitiesAttribute(): Integer { // Implementation needs to be added here } - fun subscribeColorCapabilitiesAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeColorCapabilitiesAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readColorTempPhysicalMinMiredsAttribute(callback: IntegerAttributeCallback) { + suspend fun readColorTempPhysicalMinMiredsAttribute(): Integer { // Implementation needs to be added here } - fun subscribeColorTempPhysicalMinMiredsAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeColorTempPhysicalMinMiredsAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readColorTempPhysicalMaxMiredsAttribute(callback: IntegerAttributeCallback) { + suspend fun readColorTempPhysicalMaxMiredsAttribute(): Integer { // Implementation needs to be added here } - fun subscribeColorTempPhysicalMaxMiredsAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeColorTempPhysicalMaxMiredsAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readCoupleColorTempToLevelMinMiredsAttribute(callback: IntegerAttributeCallback) { + suspend fun readCoupleColorTempToLevelMinMiredsAttribute(): Integer { // Implementation needs to be added here } - fun subscribeCoupleColorTempToLevelMinMiredsAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeCoupleColorTempToLevelMinMiredsAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readStartUpColorTemperatureMiredsAttribute( - callback: StartUpColorTemperatureMiredsAttributeCallback - ) { + suspend fun readStartUpColorTemperatureMiredsAttribute(): StartUpColorTemperatureMiredsAttribute { // Implementation needs to be added here } - fun writeStartUpColorTemperatureMiredsAttribute( - callback: DefaultClusterCallback, - value: Integer - ) { + suspend fun writeStartUpColorTemperatureMiredsAttribute(value: UShort) { // Implementation needs to be added here } - fun writeStartUpColorTemperatureMiredsAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeStartUpColorTemperatureMiredsAttribute(value: UShort, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeStartUpColorTemperatureMiredsAttribute( - callback: StartUpColorTemperatureMiredsAttributeCallback, + suspend fun subscribeStartUpColorTemperatureMiredsAttribute( minInterval: Int, maxInterval: Int - ) { + ): StartUpColorTemperatureMiredsAttribute { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 768u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ContentLauncherCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ContentLauncherCluster.kt index 31c53d05ec49b6..ee6dcff8f5fd6b 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ContentLauncherCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ContentLauncherCluster.kt @@ -20,199 +20,140 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class ContentLauncherCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 1290u - } + class LauncherResponse(val status: UInt, val data: String?) + + class AcceptHeaderAttribute(val value: ArrayList?) + + class GeneratedCommandListAttribute(val value: ArrayList) + + class AcceptedCommandListAttribute(val value: ArrayList) - fun launchContent( - callback: LauncherResponseCallback, + class EventListAttribute(val value: ArrayList) + + class AttributeListAttribute(val value: ArrayList) + + suspend fun launchContent( search: ChipStructs.ContentLauncherClusterContentSearchStruct, autoPlay: Boolean, data: String? - ) { + ): LauncherResponse { // Implementation needs to be added here } - fun launchContent( - callback: LauncherResponseCallback, + suspend fun launchContent( search: ChipStructs.ContentLauncherClusterContentSearchStruct, autoPlay: Boolean, data: String?, timedInvokeTimeoutMs: Int - ) { + ): LauncherResponse { // Implementation needs to be added here } - fun launchURL( - callback: LauncherResponseCallback, + suspend fun launchURL( contentURL: String, displayString: String?, brandingInformation: ChipStructs.ContentLauncherClusterBrandingInformationStruct? - ) { + ): LauncherResponse { // Implementation needs to be added here } - fun launchURL( - callback: LauncherResponseCallback, + suspend fun launchURL( contentURL: String, displayString: String?, brandingInformation: ChipStructs.ContentLauncherClusterBrandingInformationStruct?, timedInvokeTimeoutMs: Int - ) { + ): LauncherResponse { // Implementation needs to be added here } - interface LauncherResponseCallback { - fun onSuccess(status: Integer, data: String?) - - fun onError(error: Exception) - } - - interface AcceptHeaderAttributeCallback { - fun onSuccess(value: ArrayList?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readAcceptHeaderAttribute(callback: AcceptHeaderAttributeCallback) { + suspend fun readAcceptHeaderAttribute(): AcceptHeaderAttribute { // Implementation needs to be added here } - fun subscribeAcceptHeaderAttribute( - callback: AcceptHeaderAttributeCallback, + suspend fun subscribeAcceptHeaderAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptHeaderAttribute { // Implementation needs to be added here } - fun readSupportedStreamingProtocolsAttribute(callback: LongAttributeCallback) { + suspend fun readSupportedStreamingProtocolsAttribute(): Long { // Implementation needs to be added here } - fun writeSupportedStreamingProtocolsAttribute(callback: DefaultClusterCallback, value: Long) { + suspend fun writeSupportedStreamingProtocolsAttribute(value: ULong) { // Implementation needs to be added here } - fun writeSupportedStreamingProtocolsAttribute( - callback: DefaultClusterCallback, - value: Long, - timedWriteTimeoutMs: Int - ) { + suspend fun writeSupportedStreamingProtocolsAttribute(value: ULong, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeSupportedStreamingProtocolsAttribute( - callback: LongAttributeCallback, + suspend fun subscribeSupportedStreamingProtocolsAttribute( minInterval: Int, maxInterval: Int - ) { + ): Long { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 1290u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DescriptorCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DescriptorCluster.kt index fc0bc78ddddbfd..813c7b9d1c51d1 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DescriptorCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DescriptorCluster.kt @@ -20,211 +20,133 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class DescriptorCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 29u - } - - interface DeviceTypeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface ServerListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) + class DeviceTypeListAttribute( + val value: ArrayList + ) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class ServerListAttribute(val value: ArrayList) - interface ClientListAttributeCallback { - fun onSuccess(value: ArrayList) + class ClientListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class PartsListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class TagListAttribute(val value: ArrayList?) - interface PartsListAttributeCallback { - fun onSuccess(value: ArrayList) + class GeneratedCommandListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class AcceptedCommandListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class EventListAttribute(val value: ArrayList) - interface TagListAttributeCallback { - fun onSuccess(value: ArrayList?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AttributeListAttribute(val value: ArrayList) - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readDeviceTypeListAttribute(callback: DeviceTypeListAttributeCallback) { + suspend fun readDeviceTypeListAttribute(): DeviceTypeListAttribute { // Implementation needs to be added here } - fun subscribeDeviceTypeListAttribute( - callback: DeviceTypeListAttributeCallback, + suspend fun subscribeDeviceTypeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): DeviceTypeListAttribute { // Implementation needs to be added here } - fun readServerListAttribute(callback: ServerListAttributeCallback) { + suspend fun readServerListAttribute(): ServerListAttribute { // Implementation needs to be added here } - fun subscribeServerListAttribute( - callback: ServerListAttributeCallback, + suspend fun subscribeServerListAttribute( minInterval: Int, maxInterval: Int - ) { + ): ServerListAttribute { // Implementation needs to be added here } - fun readClientListAttribute(callback: ClientListAttributeCallback) { + suspend fun readClientListAttribute(): ClientListAttribute { // Implementation needs to be added here } - fun subscribeClientListAttribute( - callback: ClientListAttributeCallback, + suspend fun subscribeClientListAttribute( minInterval: Int, maxInterval: Int - ) { + ): ClientListAttribute { // Implementation needs to be added here } - fun readPartsListAttribute(callback: PartsListAttributeCallback) { + suspend fun readPartsListAttribute(): PartsListAttribute { // Implementation needs to be added here } - fun subscribePartsListAttribute( - callback: PartsListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribePartsListAttribute(minInterval: Int, maxInterval: Int): PartsListAttribute { // Implementation needs to be added here } - fun readTagListAttribute(callback: TagListAttributeCallback) { + suspend fun readTagListAttribute(): TagListAttribute { // Implementation needs to be added here } - fun subscribeTagListAttribute( - callback: TagListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeTagListAttribute(minInterval: Int, maxInterval: Int): TagListAttribute { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 29u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DiagnosticLogsCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DiagnosticLogsCluster.kt index 1eaf5b35f573f4..af66e72cdc3fe9 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DiagnosticLogsCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DiagnosticLogsCluster.kt @@ -20,136 +20,96 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class DiagnosticLogsCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 50u - } + class RetrieveLogsResponse( + val status: UInt, + val logContent: ByteArray, + val UTCTimeStamp: ULong?, + val timeSinceBoot: ULong? + ) + + class GeneratedCommandListAttribute(val value: ArrayList) + + class AcceptedCommandListAttribute(val value: ArrayList) - fun retrieveLogsRequest( - callback: RetrieveLogsResponseCallback, - intent: Integer, - requestedProtocol: Integer, + class EventListAttribute(val value: ArrayList) + + class AttributeListAttribute(val value: ArrayList) + + suspend fun retrieveLogsRequest( + intent: UInt, + requestedProtocol: UInt, transferFileDesignator: String? - ) { + ): RetrieveLogsResponse { // Implementation needs to be added here } - fun retrieveLogsRequest( - callback: RetrieveLogsResponseCallback, - intent: Integer, - requestedProtocol: Integer, + suspend fun retrieveLogsRequest( + intent: UInt, + requestedProtocol: UInt, transferFileDesignator: String?, timedInvokeTimeoutMs: Int - ) { + ): RetrieveLogsResponse { // Implementation needs to be added here } - interface RetrieveLogsResponseCallback { - fun onSuccess(status: Integer, logContent: ByteArray, UTCTimeStamp: Long?, timeSinceBoot: Long?) - - fun onError(error: Exception) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 50u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DishwasherAlarmCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DishwasherAlarmCluster.kt index fca1a80c6793eb..bdfa74c5dd49b2 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DishwasherAlarmCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DishwasherAlarmCluster.kt @@ -20,163 +20,120 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class DishwasherAlarmCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 93u - } + class GeneratedCommandListAttribute(val value: ArrayList) - fun reset(callback: DefaultClusterCallback, alarms: Long) { - // Implementation needs to be added here - } + class AcceptedCommandListAttribute(val value: ArrayList) - fun reset(callback: DefaultClusterCallback, alarms: Long, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } + class EventListAttribute(val value: ArrayList) - fun modifyEnabledAlarms(callback: DefaultClusterCallback, mask: Long) { - // Implementation needs to be added here - } + class AttributeListAttribute(val value: ArrayList) - fun modifyEnabledAlarms(callback: DefaultClusterCallback, mask: Long, timedInvokeTimeoutMs: Int) { + suspend fun reset(alarms: ULong) { // Implementation needs to be added here } - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun reset(alarms: ULong, timedInvokeTimeoutMs: Int) { + // Implementation needs to be added here } - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun modifyEnabledAlarms(mask: ULong) { + // Implementation needs to be added here } - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun modifyEnabledAlarms(mask: ULong, timedInvokeTimeoutMs: Int) { + // Implementation needs to be added here } - fun readMaskAttribute(callback: LongAttributeCallback) { + suspend fun readMaskAttribute(): Long { // Implementation needs to be added here } - fun subscribeMaskAttribute(callback: LongAttributeCallback, minInterval: Int, maxInterval: Int) { + suspend fun subscribeMaskAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readLatchAttribute(callback: LongAttributeCallback) { + suspend fun readLatchAttribute(): Long { // Implementation needs to be added here } - fun subscribeLatchAttribute(callback: LongAttributeCallback, minInterval: Int, maxInterval: Int) { + suspend fun subscribeLatchAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readStateAttribute(callback: LongAttributeCallback) { + suspend fun readStateAttribute(): Long { // Implementation needs to be added here } - fun subscribeStateAttribute(callback: LongAttributeCallback, minInterval: Int, maxInterval: Int) { + suspend fun subscribeStateAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readSupportedAttribute(callback: LongAttributeCallback) { + suspend fun readSupportedAttribute(): Long { // Implementation needs to be added here } - fun subscribeSupportedAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeSupportedAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 93u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DishwasherModeCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DishwasherModeCluster.kt index 22ea8827c31e0c..57db5faffaaed2 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DishwasherModeCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DishwasherModeCluster.kt @@ -20,225 +20,144 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class DishwasherModeCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 89u - } - - fun changeToMode(callback: ChangeToModeResponseCallback, newMode: Integer) { - // Implementation needs to be added here - } + class ChangeToModeResponse(val status: UInt, val statusText: String?) - fun changeToMode( - callback: ChangeToModeResponseCallback, - newMode: Integer, - timedInvokeTimeoutMs: Int - ) { - // Implementation needs to be added here - } - - interface ChangeToModeResponseCallback { - fun onSuccess(status: Integer, statusText: String?) + class SupportedModesAttribute( + val value: ArrayList + ) - fun onError(error: Exception) - } - - interface SupportedModesAttributeCallback { - fun onSuccess(value: ArrayList) + class StartUpModeAttribute(val value: UByte?) - fun onError(ex: Exception) + class OnModeAttribute(val value: UByte?) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class GeneratedCommandListAttribute(val value: ArrayList) - interface StartUpModeAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface OnModeAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AcceptedCommandListAttribute(val value: ArrayList) - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) + class EventListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class AttributeListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun changeToMode(newMode: UByte): ChangeToModeResponse { + // Implementation needs to be added here } - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun changeToMode(newMode: UByte, timedInvokeTimeoutMs: Int): ChangeToModeResponse { + // Implementation needs to be added here } - fun readSupportedModesAttribute(callback: SupportedModesAttributeCallback) { + suspend fun readSupportedModesAttribute(): SupportedModesAttribute { // Implementation needs to be added here } - fun subscribeSupportedModesAttribute( - callback: SupportedModesAttributeCallback, + suspend fun subscribeSupportedModesAttribute( minInterval: Int, maxInterval: Int - ) { + ): SupportedModesAttribute { // Implementation needs to be added here } - fun readCurrentModeAttribute(callback: IntegerAttributeCallback) { + suspend fun readCurrentModeAttribute(): Integer { // Implementation needs to be added here } - fun subscribeCurrentModeAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeCurrentModeAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readStartUpModeAttribute(callback: StartUpModeAttributeCallback) { + suspend fun readStartUpModeAttribute(): StartUpModeAttribute { // Implementation needs to be added here } - fun writeStartUpModeAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeStartUpModeAttribute(value: UByte) { // Implementation needs to be added here } - fun writeStartUpModeAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeStartUpModeAttribute(value: UByte, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeStartUpModeAttribute( - callback: StartUpModeAttributeCallback, + suspend fun subscribeStartUpModeAttribute( minInterval: Int, maxInterval: Int - ) { + ): StartUpModeAttribute { // Implementation needs to be added here } - fun readOnModeAttribute(callback: OnModeAttributeCallback) { + suspend fun readOnModeAttribute(): OnModeAttribute { // Implementation needs to be added here } - fun writeOnModeAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeOnModeAttribute(value: UByte) { // Implementation needs to be added here } - fun writeOnModeAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeOnModeAttribute(value: UByte, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeOnModeAttribute( - callback: OnModeAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeOnModeAttribute(minInterval: Int, maxInterval: Int): OnModeAttribute { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 89u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DoorLockCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DoorLockCluster.kt index 38253f104f8acb..851df952f4289a 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DoorLockCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DoorLockCluster.kt @@ -20,1093 +20,816 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class DoorLockCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 257u - } + class GetWeekDayScheduleResponse( + val weekDayIndex: UByte, + val userIndex: UShort, + val status: UInt, + val daysMask: UInt?, + val startHour: UByte?, + val startMinute: UByte?, + val endHour: UByte?, + val endMinute: UByte? + ) + + class GetYearDayScheduleResponse( + val yearDayIndex: UByte, + val userIndex: UShort, + val status: UInt, + val localStartTime: UInt?, + val localEndTime: UInt? + ) + + class GetHolidayScheduleResponse( + val holidayIndex: UByte, + val status: UInt, + val localStartTime: UInt?, + val localEndTime: UInt?, + val operatingMode: UInt? + ) + + class GetUserResponse( + val userIndex: UShort, + val userName: String?, + val userUniqueID: UInt?, + val userStatus: UInt?, + val userType: UInt?, + val credentialRule: UInt?, + val credentials: ArrayList?, + val creatorFabricIndex: UByte?, + val lastModifiedFabricIndex: UByte?, + val nextUserIndex: UShort? + ) + + class SetCredentialResponse( + val status: UInt, + val userIndex: UShort?, + val nextCredentialIndex: UShort? + ) + + class GetCredentialStatusResponse( + val credentialExists: Boolean, + val userIndex: UShort?, + val creatorFabricIndex: UByte?, + val lastModifiedFabricIndex: UByte?, + val nextCredentialIndex: UShort? + ) + + class LockStateAttribute(val value: UInt?) + + class DoorStateAttribute(val value: UInt?) + + class GeneratedCommandListAttribute(val value: ArrayList) + + class AcceptedCommandListAttribute(val value: ArrayList) - fun lockDoor(callback: DefaultClusterCallback, PINCode: ByteArray?, timedInvokeTimeoutMs: Int) { + class EventListAttribute(val value: ArrayList) + + class AttributeListAttribute(val value: ArrayList) + + suspend fun lockDoor(PINCode: ByteArray?, timedInvokeTimeoutMs: Int) { // Implementation needs to be added here } - fun unlockDoor(callback: DefaultClusterCallback, PINCode: ByteArray?, timedInvokeTimeoutMs: Int) { + suspend fun unlockDoor(PINCode: ByteArray?, timedInvokeTimeoutMs: Int) { // Implementation needs to be added here } - fun unlockWithTimeout( - callback: DefaultClusterCallback, - timeout: Integer, - PINCode: ByteArray?, - timedInvokeTimeoutMs: Int - ) { + suspend fun unlockWithTimeout(timeout: UShort, PINCode: ByteArray?, timedInvokeTimeoutMs: Int) { // Implementation needs to be added here } - fun setWeekDaySchedule( - callback: DefaultClusterCallback, - weekDayIndex: Integer, - userIndex: Integer, - daysMask: Integer, - startHour: Integer, - startMinute: Integer, - endHour: Integer, - endMinute: Integer + suspend fun setWeekDaySchedule( + weekDayIndex: UByte, + userIndex: UShort, + daysMask: UInt, + startHour: UByte, + startMinute: UByte, + endHour: UByte, + endMinute: UByte ) { // Implementation needs to be added here } - fun setWeekDaySchedule( - callback: DefaultClusterCallback, - weekDayIndex: Integer, - userIndex: Integer, - daysMask: Integer, - startHour: Integer, - startMinute: Integer, - endHour: Integer, - endMinute: Integer, + suspend fun setWeekDaySchedule( + weekDayIndex: UByte, + userIndex: UShort, + daysMask: UInt, + startHour: UByte, + startMinute: UByte, + endHour: UByte, + endMinute: UByte, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - fun getWeekDaySchedule( - callback: GetWeekDayScheduleResponseCallback, - weekDayIndex: Integer, - userIndex: Integer - ) { + suspend fun getWeekDaySchedule( + weekDayIndex: UByte, + userIndex: UShort + ): GetWeekDayScheduleResponse { // Implementation needs to be added here } - fun getWeekDaySchedule( - callback: GetWeekDayScheduleResponseCallback, - weekDayIndex: Integer, - userIndex: Integer, + suspend fun getWeekDaySchedule( + weekDayIndex: UByte, + userIndex: UShort, timedInvokeTimeoutMs: Int - ) { + ): GetWeekDayScheduleResponse { // Implementation needs to be added here } - fun clearWeekDaySchedule( - callback: DefaultClusterCallback, - weekDayIndex: Integer, - userIndex: Integer - ) { + suspend fun clearWeekDaySchedule(weekDayIndex: UByte, userIndex: UShort) { // Implementation needs to be added here } - fun clearWeekDaySchedule( - callback: DefaultClusterCallback, - weekDayIndex: Integer, - userIndex: Integer, + suspend fun clearWeekDaySchedule( + weekDayIndex: UByte, + userIndex: UShort, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - fun setYearDaySchedule( - callback: DefaultClusterCallback, - yearDayIndex: Integer, - userIndex: Integer, - localStartTime: Long, - localEndTime: Long + suspend fun setYearDaySchedule( + yearDayIndex: UByte, + userIndex: UShort, + localStartTime: UInt, + localEndTime: UInt ) { // Implementation needs to be added here } - fun setYearDaySchedule( - callback: DefaultClusterCallback, - yearDayIndex: Integer, - userIndex: Integer, - localStartTime: Long, - localEndTime: Long, + suspend fun setYearDaySchedule( + yearDayIndex: UByte, + userIndex: UShort, + localStartTime: UInt, + localEndTime: UInt, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - fun getYearDaySchedule( - callback: GetYearDayScheduleResponseCallback, - yearDayIndex: Integer, - userIndex: Integer - ) { + suspend fun getYearDaySchedule( + yearDayIndex: UByte, + userIndex: UShort + ): GetYearDayScheduleResponse { // Implementation needs to be added here } - fun getYearDaySchedule( - callback: GetYearDayScheduleResponseCallback, - yearDayIndex: Integer, - userIndex: Integer, + suspend fun getYearDaySchedule( + yearDayIndex: UByte, + userIndex: UShort, timedInvokeTimeoutMs: Int - ) { + ): GetYearDayScheduleResponse { // Implementation needs to be added here } - fun clearYearDaySchedule( - callback: DefaultClusterCallback, - yearDayIndex: Integer, - userIndex: Integer - ) { + suspend fun clearYearDaySchedule(yearDayIndex: UByte, userIndex: UShort) { // Implementation needs to be added here } - fun clearYearDaySchedule( - callback: DefaultClusterCallback, - yearDayIndex: Integer, - userIndex: Integer, + suspend fun clearYearDaySchedule( + yearDayIndex: UByte, + userIndex: UShort, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - fun setHolidaySchedule( - callback: DefaultClusterCallback, - holidayIndex: Integer, - localStartTime: Long, - localEndTime: Long, - operatingMode: Integer + suspend fun setHolidaySchedule( + holidayIndex: UByte, + localStartTime: UInt, + localEndTime: UInt, + operatingMode: UInt ) { // Implementation needs to be added here } - fun setHolidaySchedule( - callback: DefaultClusterCallback, - holidayIndex: Integer, - localStartTime: Long, - localEndTime: Long, - operatingMode: Integer, + suspend fun setHolidaySchedule( + holidayIndex: UByte, + localStartTime: UInt, + localEndTime: UInt, + operatingMode: UInt, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - fun getHolidaySchedule(callback: GetHolidayScheduleResponseCallback, holidayIndex: Integer) { + suspend fun getHolidaySchedule(holidayIndex: UByte): GetHolidayScheduleResponse { // Implementation needs to be added here } - fun getHolidaySchedule( - callback: GetHolidayScheduleResponseCallback, - holidayIndex: Integer, + suspend fun getHolidaySchedule( + holidayIndex: UByte, timedInvokeTimeoutMs: Int - ) { + ): GetHolidayScheduleResponse { // Implementation needs to be added here } - fun clearHolidaySchedule(callback: DefaultClusterCallback, holidayIndex: Integer) { + suspend fun clearHolidaySchedule(holidayIndex: UByte) { // Implementation needs to be added here } - fun clearHolidaySchedule( - callback: DefaultClusterCallback, - holidayIndex: Integer, - timedInvokeTimeoutMs: Int - ) { + suspend fun clearHolidaySchedule(holidayIndex: UByte, timedInvokeTimeoutMs: Int) { // Implementation needs to be added here } - fun setUser( - callback: DefaultClusterCallback, - operationType: Integer, - userIndex: Integer, + suspend fun setUser( + operationType: UInt, + userIndex: UShort, userName: String?, - userUniqueID: Long?, - userStatus: Integer?, - userType: Integer?, - credentialRule: Integer?, + userUniqueID: UInt?, + userStatus: UInt?, + userType: UInt?, + credentialRule: UInt?, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - fun getUser(callback: GetUserResponseCallback, userIndex: Integer) { + suspend fun getUser(userIndex: UShort): GetUserResponse { // Implementation needs to be added here } - fun getUser(callback: GetUserResponseCallback, userIndex: Integer, timedInvokeTimeoutMs: Int) { + suspend fun getUser(userIndex: UShort, timedInvokeTimeoutMs: Int): GetUserResponse { // Implementation needs to be added here } - fun clearUser(callback: DefaultClusterCallback, userIndex: Integer, timedInvokeTimeoutMs: Int) { + suspend fun clearUser(userIndex: UShort, timedInvokeTimeoutMs: Int) { // Implementation needs to be added here } - fun setCredential( - callback: SetCredentialResponseCallback, - operationType: Integer, + suspend fun setCredential( + operationType: UInt, credential: ChipStructs.DoorLockClusterCredentialStruct, credentialData: ByteArray, - userIndex: Integer?, - userStatus: Integer?, - userType: Integer?, + userIndex: UShort?, + userStatus: UInt?, + userType: UInt?, timedInvokeTimeoutMs: Int - ) { + ): SetCredentialResponse { // Implementation needs to be added here } - fun getCredentialStatus( - callback: GetCredentialStatusResponseCallback, + suspend fun getCredentialStatus( credential: ChipStructs.DoorLockClusterCredentialStruct - ) { + ): GetCredentialStatusResponse { // Implementation needs to be added here } - fun getCredentialStatus( - callback: GetCredentialStatusResponseCallback, + suspend fun getCredentialStatus( credential: ChipStructs.DoorLockClusterCredentialStruct, timedInvokeTimeoutMs: Int - ) { + ): GetCredentialStatusResponse { // Implementation needs to be added here } - fun clearCredential( - callback: DefaultClusterCallback, + suspend fun clearCredential( credential: ChipStructs.DoorLockClusterCredentialStruct?, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - fun unboltDoor(callback: DefaultClusterCallback, PINCode: ByteArray?, timedInvokeTimeoutMs: Int) { + suspend fun unboltDoor(PINCode: ByteArray?, timedInvokeTimeoutMs: Int) { // Implementation needs to be added here } - interface GetWeekDayScheduleResponseCallback { - fun onSuccess( - weekDayIndex: Integer, - userIndex: Integer, - status: Integer, - daysMask: Integer?, - startHour: Integer?, - startMinute: Integer?, - endHour: Integer?, - endMinute: Integer? - ) - - fun onError(error: Exception) - } - - interface GetYearDayScheduleResponseCallback { - fun onSuccess( - yearDayIndex: Integer, - userIndex: Integer, - status: Integer, - localStartTime: Long?, - localEndTime: Long? - ) - - fun onError(error: Exception) - } - - interface GetHolidayScheduleResponseCallback { - fun onSuccess( - holidayIndex: Integer, - status: Integer, - localStartTime: Long?, - localEndTime: Long?, - operatingMode: Integer? - ) - - fun onError(error: Exception) - } - - interface GetUserResponseCallback { - fun onSuccess( - userIndex: Integer, - userName: String?, - userUniqueID: Long?, - userStatus: Integer?, - userType: Integer?, - credentialRule: Integer?, - credentials: ArrayList?, - creatorFabricIndex: Integer?, - lastModifiedFabricIndex: Integer?, - nextUserIndex: Integer? - ) - - fun onError(error: Exception) - } - - interface SetCredentialResponseCallback { - fun onSuccess(status: Integer, userIndex: Integer?, nextCredentialIndex: Integer?) - - fun onError(error: Exception) - } - - interface GetCredentialStatusResponseCallback { - fun onSuccess( - credentialExists: Boolean, - userIndex: Integer?, - creatorFabricIndex: Integer?, - lastModifiedFabricIndex: Integer?, - nextCredentialIndex: Integer? - ) - - fun onError(error: Exception) - } - - interface LockStateAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface DoorStateAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readLockStateAttribute(callback: LockStateAttributeCallback) { + suspend fun readLockStateAttribute(): LockStateAttribute { // Implementation needs to be added here } - fun subscribeLockStateAttribute( - callback: LockStateAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeLockStateAttribute(minInterval: Int, maxInterval: Int): LockStateAttribute { // Implementation needs to be added here } - fun readLockTypeAttribute(callback: IntegerAttributeCallback) { + suspend fun readLockTypeAttribute(): Integer { // Implementation needs to be added here } - fun subscribeLockTypeAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeLockTypeAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readActuatorEnabledAttribute(callback: BooleanAttributeCallback) { + suspend fun readActuatorEnabledAttribute(): Boolean { // Implementation needs to be added here } - fun subscribeActuatorEnabledAttribute( - callback: BooleanAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeActuatorEnabledAttribute(minInterval: Int, maxInterval: Int): Boolean { // Implementation needs to be added here } - fun readDoorStateAttribute(callback: DoorStateAttributeCallback) { + suspend fun readDoorStateAttribute(): DoorStateAttribute { // Implementation needs to be added here } - fun subscribeDoorStateAttribute( - callback: DoorStateAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeDoorStateAttribute(minInterval: Int, maxInterval: Int): DoorStateAttribute { // Implementation needs to be added here } - fun readDoorOpenEventsAttribute(callback: LongAttributeCallback) { + suspend fun readDoorOpenEventsAttribute(): Long { // Implementation needs to be added here } - fun writeDoorOpenEventsAttribute(callback: DefaultClusterCallback, value: Long) { + suspend fun writeDoorOpenEventsAttribute(value: UInt) { // Implementation needs to be added here } - fun writeDoorOpenEventsAttribute( - callback: DefaultClusterCallback, - value: Long, - timedWriteTimeoutMs: Int - ) { + suspend fun writeDoorOpenEventsAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeDoorOpenEventsAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeDoorOpenEventsAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readDoorClosedEventsAttribute(callback: LongAttributeCallback) { + suspend fun readDoorClosedEventsAttribute(): Long { // Implementation needs to be added here } - fun writeDoorClosedEventsAttribute(callback: DefaultClusterCallback, value: Long) { + suspend fun writeDoorClosedEventsAttribute(value: UInt) { // Implementation needs to be added here } - fun writeDoorClosedEventsAttribute( - callback: DefaultClusterCallback, - value: Long, - timedWriteTimeoutMs: Int - ) { + suspend fun writeDoorClosedEventsAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeDoorClosedEventsAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeDoorClosedEventsAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readOpenPeriodAttribute(callback: IntegerAttributeCallback) { + suspend fun readOpenPeriodAttribute(): Integer { // Implementation needs to be added here } - fun writeOpenPeriodAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeOpenPeriodAttribute(value: UShort) { // Implementation needs to be added here } - fun writeOpenPeriodAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeOpenPeriodAttribute(value: UShort, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeOpenPeriodAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeOpenPeriodAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readNumberOfTotalUsersSupportedAttribute(callback: IntegerAttributeCallback) { + suspend fun readNumberOfTotalUsersSupportedAttribute(): Integer { // Implementation needs to be added here } - fun subscribeNumberOfTotalUsersSupportedAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeNumberOfTotalUsersSupportedAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readNumberOfPINUsersSupportedAttribute(callback: IntegerAttributeCallback) { + suspend fun readNumberOfPINUsersSupportedAttribute(): Integer { // Implementation needs to be added here } - fun subscribeNumberOfPINUsersSupportedAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeNumberOfPINUsersSupportedAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readNumberOfRFIDUsersSupportedAttribute(callback: IntegerAttributeCallback) { + suspend fun readNumberOfRFIDUsersSupportedAttribute(): Integer { // Implementation needs to be added here } - fun subscribeNumberOfRFIDUsersSupportedAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeNumberOfRFIDUsersSupportedAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readNumberOfWeekDaySchedulesSupportedPerUserAttribute(callback: IntegerAttributeCallback) { + suspend fun readNumberOfWeekDaySchedulesSupportedPerUserAttribute(): Integer { // Implementation needs to be added here } - fun subscribeNumberOfWeekDaySchedulesSupportedPerUserAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeNumberOfWeekDaySchedulesSupportedPerUserAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readNumberOfYearDaySchedulesSupportedPerUserAttribute(callback: IntegerAttributeCallback) { + suspend fun readNumberOfYearDaySchedulesSupportedPerUserAttribute(): Integer { // Implementation needs to be added here } - fun subscribeNumberOfYearDaySchedulesSupportedPerUserAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeNumberOfYearDaySchedulesSupportedPerUserAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readNumberOfHolidaySchedulesSupportedAttribute(callback: IntegerAttributeCallback) { + suspend fun readNumberOfHolidaySchedulesSupportedAttribute(): Integer { // Implementation needs to be added here } - fun subscribeNumberOfHolidaySchedulesSupportedAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeNumberOfHolidaySchedulesSupportedAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readMaxPINCodeLengthAttribute(callback: IntegerAttributeCallback) { + suspend fun readMaxPINCodeLengthAttribute(): Integer { // Implementation needs to be added here } - fun subscribeMaxPINCodeLengthAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeMaxPINCodeLengthAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readMinPINCodeLengthAttribute(callback: IntegerAttributeCallback) { + suspend fun readMinPINCodeLengthAttribute(): Integer { // Implementation needs to be added here } - fun subscribeMinPINCodeLengthAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeMinPINCodeLengthAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readMaxRFIDCodeLengthAttribute(callback: IntegerAttributeCallback) { + suspend fun readMaxRFIDCodeLengthAttribute(): Integer { // Implementation needs to be added here } - fun subscribeMaxRFIDCodeLengthAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeMaxRFIDCodeLengthAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readMinRFIDCodeLengthAttribute(callback: IntegerAttributeCallback) { + suspend fun readMinRFIDCodeLengthAttribute(): Integer { // Implementation needs to be added here } - fun subscribeMinRFIDCodeLengthAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeMinRFIDCodeLengthAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readCredentialRulesSupportAttribute(callback: IntegerAttributeCallback) { + suspend fun readCredentialRulesSupportAttribute(): Integer { // Implementation needs to be added here } - fun subscribeCredentialRulesSupportAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeCredentialRulesSupportAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readNumberOfCredentialsSupportedPerUserAttribute(callback: IntegerAttributeCallback) { + suspend fun readNumberOfCredentialsSupportedPerUserAttribute(): Integer { // Implementation needs to be added here } - fun subscribeNumberOfCredentialsSupportedPerUserAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeNumberOfCredentialsSupportedPerUserAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readLanguageAttribute(callback: CharStringAttributeCallback) { + suspend fun readLanguageAttribute(): CharString { // Implementation needs to be added here } - fun writeLanguageAttribute(callback: DefaultClusterCallback, value: String) { + suspend fun writeLanguageAttribute(value: String) { // Implementation needs to be added here } - fun writeLanguageAttribute( - callback: DefaultClusterCallback, - value: String, - timedWriteTimeoutMs: Int - ) { + suspend fun writeLanguageAttribute(value: String, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeLanguageAttribute( - callback: CharStringAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeLanguageAttribute(minInterval: Int, maxInterval: Int): CharString { // Implementation needs to be added here } - fun readLEDSettingsAttribute(callback: IntegerAttributeCallback) { + suspend fun readLEDSettingsAttribute(): Integer { // Implementation needs to be added here } - fun writeLEDSettingsAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeLEDSettingsAttribute(value: UByte) { // Implementation needs to be added here } - fun writeLEDSettingsAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeLEDSettingsAttribute(value: UByte, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeLEDSettingsAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeLEDSettingsAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readAutoRelockTimeAttribute(callback: LongAttributeCallback) { + suspend fun readAutoRelockTimeAttribute(): Long { // Implementation needs to be added here } - fun writeAutoRelockTimeAttribute(callback: DefaultClusterCallback, value: Long) { + suspend fun writeAutoRelockTimeAttribute(value: UInt) { // Implementation needs to be added here } - fun writeAutoRelockTimeAttribute( - callback: DefaultClusterCallback, - value: Long, - timedWriteTimeoutMs: Int - ) { + suspend fun writeAutoRelockTimeAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeAutoRelockTimeAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeAutoRelockTimeAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readSoundVolumeAttribute(callback: IntegerAttributeCallback) { + suspend fun readSoundVolumeAttribute(): Integer { // Implementation needs to be added here } - fun writeSoundVolumeAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeSoundVolumeAttribute(value: UByte) { // Implementation needs to be added here } - fun writeSoundVolumeAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeSoundVolumeAttribute(value: UByte, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeSoundVolumeAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeSoundVolumeAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readOperatingModeAttribute(callback: IntegerAttributeCallback) { + suspend fun readOperatingModeAttribute(): Integer { // Implementation needs to be added here } - fun writeOperatingModeAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeOperatingModeAttribute(value: UInt) { // Implementation needs to be added here } - fun writeOperatingModeAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeOperatingModeAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeOperatingModeAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeOperatingModeAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readSupportedOperatingModesAttribute(callback: IntegerAttributeCallback) { + suspend fun readSupportedOperatingModesAttribute(): Integer { // Implementation needs to be added here } - fun subscribeSupportedOperatingModesAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeSupportedOperatingModesAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readDefaultConfigurationRegisterAttribute(callback: IntegerAttributeCallback) { + suspend fun readDefaultConfigurationRegisterAttribute(): Integer { // Implementation needs to be added here } - fun subscribeDefaultConfigurationRegisterAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeDefaultConfigurationRegisterAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readEnableLocalProgrammingAttribute(callback: BooleanAttributeCallback) { + suspend fun readEnableLocalProgrammingAttribute(): Boolean { // Implementation needs to be added here } - fun writeEnableLocalProgrammingAttribute(callback: DefaultClusterCallback, value: Boolean) { + suspend fun writeEnableLocalProgrammingAttribute(value: Boolean) { // Implementation needs to be added here } - fun writeEnableLocalProgrammingAttribute( - callback: DefaultClusterCallback, - value: Boolean, - timedWriteTimeoutMs: Int - ) { + suspend fun writeEnableLocalProgrammingAttribute(value: Boolean, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeEnableLocalProgrammingAttribute( - callback: BooleanAttributeCallback, + suspend fun subscribeEnableLocalProgrammingAttribute( minInterval: Int, maxInterval: Int - ) { + ): Boolean { // Implementation needs to be added here } - fun readEnableOneTouchLockingAttribute(callback: BooleanAttributeCallback) { + suspend fun readEnableOneTouchLockingAttribute(): Boolean { // Implementation needs to be added here } - fun writeEnableOneTouchLockingAttribute(callback: DefaultClusterCallback, value: Boolean) { + suspend fun writeEnableOneTouchLockingAttribute(value: Boolean) { // Implementation needs to be added here } - fun writeEnableOneTouchLockingAttribute( - callback: DefaultClusterCallback, - value: Boolean, - timedWriteTimeoutMs: Int - ) { + suspend fun writeEnableOneTouchLockingAttribute(value: Boolean, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeEnableOneTouchLockingAttribute( - callback: BooleanAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEnableOneTouchLockingAttribute(minInterval: Int, maxInterval: Int): Boolean { // Implementation needs to be added here } - fun readEnableInsideStatusLEDAttribute(callback: BooleanAttributeCallback) { + suspend fun readEnableInsideStatusLEDAttribute(): Boolean { // Implementation needs to be added here } - fun writeEnableInsideStatusLEDAttribute(callback: DefaultClusterCallback, value: Boolean) { + suspend fun writeEnableInsideStatusLEDAttribute(value: Boolean) { // Implementation needs to be added here } - fun writeEnableInsideStatusLEDAttribute( - callback: DefaultClusterCallback, - value: Boolean, - timedWriteTimeoutMs: Int - ) { + suspend fun writeEnableInsideStatusLEDAttribute(value: Boolean, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeEnableInsideStatusLEDAttribute( - callback: BooleanAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEnableInsideStatusLEDAttribute(minInterval: Int, maxInterval: Int): Boolean { // Implementation needs to be added here } - fun readEnablePrivacyModeButtonAttribute(callback: BooleanAttributeCallback) { + suspend fun readEnablePrivacyModeButtonAttribute(): Boolean { // Implementation needs to be added here } - fun writeEnablePrivacyModeButtonAttribute(callback: DefaultClusterCallback, value: Boolean) { + suspend fun writeEnablePrivacyModeButtonAttribute(value: Boolean) { // Implementation needs to be added here } - fun writeEnablePrivacyModeButtonAttribute( - callback: DefaultClusterCallback, - value: Boolean, - timedWriteTimeoutMs: Int - ) { + suspend fun writeEnablePrivacyModeButtonAttribute(value: Boolean, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeEnablePrivacyModeButtonAttribute( - callback: BooleanAttributeCallback, + suspend fun subscribeEnablePrivacyModeButtonAttribute( minInterval: Int, maxInterval: Int - ) { + ): Boolean { // Implementation needs to be added here } - fun readLocalProgrammingFeaturesAttribute(callback: IntegerAttributeCallback) { + suspend fun readLocalProgrammingFeaturesAttribute(): Integer { // Implementation needs to be added here } - fun writeLocalProgrammingFeaturesAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeLocalProgrammingFeaturesAttribute(value: UInt) { // Implementation needs to be added here } - fun writeLocalProgrammingFeaturesAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeLocalProgrammingFeaturesAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeLocalProgrammingFeaturesAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeLocalProgrammingFeaturesAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readWrongCodeEntryLimitAttribute(callback: IntegerAttributeCallback) { + suspend fun readWrongCodeEntryLimitAttribute(): Integer { // Implementation needs to be added here } - fun writeWrongCodeEntryLimitAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeWrongCodeEntryLimitAttribute(value: UByte) { // Implementation needs to be added here } - fun writeWrongCodeEntryLimitAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeWrongCodeEntryLimitAttribute(value: UByte, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeWrongCodeEntryLimitAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeWrongCodeEntryLimitAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readUserCodeTemporaryDisableTimeAttribute(callback: IntegerAttributeCallback) { + suspend fun readUserCodeTemporaryDisableTimeAttribute(): Integer { // Implementation needs to be added here } - fun writeUserCodeTemporaryDisableTimeAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeUserCodeTemporaryDisableTimeAttribute(value: UByte) { // Implementation needs to be added here } - fun writeUserCodeTemporaryDisableTimeAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeUserCodeTemporaryDisableTimeAttribute(value: UByte, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeUserCodeTemporaryDisableTimeAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeUserCodeTemporaryDisableTimeAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readSendPINOverTheAirAttribute(callback: BooleanAttributeCallback) { + suspend fun readSendPINOverTheAirAttribute(): Boolean { // Implementation needs to be added here } - fun writeSendPINOverTheAirAttribute(callback: DefaultClusterCallback, value: Boolean) { + suspend fun writeSendPINOverTheAirAttribute(value: Boolean) { // Implementation needs to be added here } - fun writeSendPINOverTheAirAttribute( - callback: DefaultClusterCallback, - value: Boolean, - timedWriteTimeoutMs: Int - ) { + suspend fun writeSendPINOverTheAirAttribute(value: Boolean, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeSendPINOverTheAirAttribute( - callback: BooleanAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeSendPINOverTheAirAttribute(minInterval: Int, maxInterval: Int): Boolean { // Implementation needs to be added here } - fun readRequirePINforRemoteOperationAttribute(callback: BooleanAttributeCallback) { + suspend fun readRequirePINforRemoteOperationAttribute(): Boolean { // Implementation needs to be added here } - fun writeRequirePINforRemoteOperationAttribute(callback: DefaultClusterCallback, value: Boolean) { + suspend fun writeRequirePINforRemoteOperationAttribute(value: Boolean) { // Implementation needs to be added here } - fun writeRequirePINforRemoteOperationAttribute( - callback: DefaultClusterCallback, - value: Boolean, - timedWriteTimeoutMs: Int - ) { + suspend fun writeRequirePINforRemoteOperationAttribute(value: Boolean, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeRequirePINforRemoteOperationAttribute( - callback: BooleanAttributeCallback, + suspend fun subscribeRequirePINforRemoteOperationAttribute( minInterval: Int, maxInterval: Int - ) { + ): Boolean { // Implementation needs to be added here } - fun readExpiringUserTimeoutAttribute(callback: IntegerAttributeCallback) { + suspend fun readExpiringUserTimeoutAttribute(): Integer { // Implementation needs to be added here } - fun writeExpiringUserTimeoutAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeExpiringUserTimeoutAttribute(value: UShort) { // Implementation needs to be added here } - fun writeExpiringUserTimeoutAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeExpiringUserTimeoutAttribute(value: UShort, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeExpiringUserTimeoutAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeExpiringUserTimeoutAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 257u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ElectricalMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ElectricalMeasurementCluster.kt index bd0c67644a9f2e..292dfc4797dc83 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ElectricalMeasurementCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ElectricalMeasurementCluster.kt @@ -20,1776 +20,1302 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class ElectricalMeasurementCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 2820u - } + class GeneratedCommandListAttribute(val value: ArrayList) + + class AcceptedCommandListAttribute(val value: ArrayList) + + class EventListAttribute(val value: ArrayList) + + class AttributeListAttribute(val value: ArrayList) - fun getProfileInfoCommand(callback: DefaultClusterCallback) { + suspend fun getProfileInfoCommand() { // Implementation needs to be added here } - fun getProfileInfoCommand(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) { + suspend fun getProfileInfoCommand(timedInvokeTimeoutMs: Int) { // Implementation needs to be added here } - fun getMeasurementProfileCommand( - callback: DefaultClusterCallback, - attributeId: Integer, - startTime: Long, - numberOfIntervals: Integer + suspend fun getMeasurementProfileCommand( + attributeId: UShort, + startTime: UInt, + numberOfIntervals: UInt ) { // Implementation needs to be added here } - fun getMeasurementProfileCommand( - callback: DefaultClusterCallback, - attributeId: Integer, - startTime: Long, - numberOfIntervals: Integer, + suspend fun getMeasurementProfileCommand( + attributeId: UShort, + startTime: UInt, + numberOfIntervals: UInt, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readMeasurementTypeAttribute(callback: LongAttributeCallback) { + suspend fun readMeasurementTypeAttribute(): Long { // Implementation needs to be added here } - fun subscribeMeasurementTypeAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeMeasurementTypeAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readDcVoltageAttribute(callback: IntegerAttributeCallback) { + suspend fun readDcVoltageAttribute(): Integer { // Implementation needs to be added here } - fun subscribeDcVoltageAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeDcVoltageAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readDcVoltageMinAttribute(callback: IntegerAttributeCallback) { + suspend fun readDcVoltageMinAttribute(): Integer { // Implementation needs to be added here } - fun subscribeDcVoltageMinAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeDcVoltageMinAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readDcVoltageMaxAttribute(callback: IntegerAttributeCallback) { + suspend fun readDcVoltageMaxAttribute(): Integer { // Implementation needs to be added here } - fun subscribeDcVoltageMaxAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeDcVoltageMaxAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readDcCurrentAttribute(callback: IntegerAttributeCallback) { + suspend fun readDcCurrentAttribute(): Integer { // Implementation needs to be added here } - fun subscribeDcCurrentAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeDcCurrentAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readDcCurrentMinAttribute(callback: IntegerAttributeCallback) { + suspend fun readDcCurrentMinAttribute(): Integer { // Implementation needs to be added here } - fun subscribeDcCurrentMinAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeDcCurrentMinAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readDcCurrentMaxAttribute(callback: IntegerAttributeCallback) { + suspend fun readDcCurrentMaxAttribute(): Integer { // Implementation needs to be added here } - fun subscribeDcCurrentMaxAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeDcCurrentMaxAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readDcPowerAttribute(callback: IntegerAttributeCallback) { + suspend fun readDcPowerAttribute(): Integer { // Implementation needs to be added here } - fun subscribeDcPowerAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeDcPowerAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readDcPowerMinAttribute(callback: IntegerAttributeCallback) { + suspend fun readDcPowerMinAttribute(): Integer { // Implementation needs to be added here } - fun subscribeDcPowerMinAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeDcPowerMinAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readDcPowerMaxAttribute(callback: IntegerAttributeCallback) { + suspend fun readDcPowerMaxAttribute(): Integer { // Implementation needs to be added here } - fun subscribeDcPowerMaxAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeDcPowerMaxAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readDcVoltageMultiplierAttribute(callback: IntegerAttributeCallback) { + suspend fun readDcVoltageMultiplierAttribute(): Integer { // Implementation needs to be added here } - fun subscribeDcVoltageMultiplierAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeDcVoltageMultiplierAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readDcVoltageDivisorAttribute(callback: IntegerAttributeCallback) { + suspend fun readDcVoltageDivisorAttribute(): Integer { // Implementation needs to be added here } - fun subscribeDcVoltageDivisorAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeDcVoltageDivisorAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readDcCurrentMultiplierAttribute(callback: IntegerAttributeCallback) { + suspend fun readDcCurrentMultiplierAttribute(): Integer { // Implementation needs to be added here } - fun subscribeDcCurrentMultiplierAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeDcCurrentMultiplierAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readDcCurrentDivisorAttribute(callback: IntegerAttributeCallback) { + suspend fun readDcCurrentDivisorAttribute(): Integer { // Implementation needs to be added here } - fun subscribeDcCurrentDivisorAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeDcCurrentDivisorAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readDcPowerMultiplierAttribute(callback: IntegerAttributeCallback) { + suspend fun readDcPowerMultiplierAttribute(): Integer { // Implementation needs to be added here } - fun subscribeDcPowerMultiplierAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeDcPowerMultiplierAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readDcPowerDivisorAttribute(callback: IntegerAttributeCallback) { + suspend fun readDcPowerDivisorAttribute(): Integer { // Implementation needs to be added here } - fun subscribeDcPowerDivisorAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeDcPowerDivisorAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readAcFrequencyAttribute(callback: IntegerAttributeCallback) { + suspend fun readAcFrequencyAttribute(): Integer { // Implementation needs to be added here } - fun subscribeAcFrequencyAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeAcFrequencyAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readAcFrequencyMinAttribute(callback: IntegerAttributeCallback) { + suspend fun readAcFrequencyMinAttribute(): Integer { // Implementation needs to be added here } - fun subscribeAcFrequencyMinAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeAcFrequencyMinAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readAcFrequencyMaxAttribute(callback: IntegerAttributeCallback) { + suspend fun readAcFrequencyMaxAttribute(): Integer { // Implementation needs to be added here } - fun subscribeAcFrequencyMaxAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeAcFrequencyMaxAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readNeutralCurrentAttribute(callback: IntegerAttributeCallback) { + suspend fun readNeutralCurrentAttribute(): Integer { // Implementation needs to be added here } - fun subscribeNeutralCurrentAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeNeutralCurrentAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readTotalActivePowerAttribute(callback: LongAttributeCallback) { + suspend fun readTotalActivePowerAttribute(): Long { // Implementation needs to be added here } - fun subscribeTotalActivePowerAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeTotalActivePowerAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readTotalReactivePowerAttribute(callback: LongAttributeCallback) { + suspend fun readTotalReactivePowerAttribute(): Long { // Implementation needs to be added here } - fun subscribeTotalReactivePowerAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeTotalReactivePowerAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readTotalApparentPowerAttribute(callback: LongAttributeCallback) { + suspend fun readTotalApparentPowerAttribute(): Long { // Implementation needs to be added here } - fun subscribeTotalApparentPowerAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeTotalApparentPowerAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readMeasured1stHarmonicCurrentAttribute(callback: IntegerAttributeCallback) { + suspend fun readMeasured1stHarmonicCurrentAttribute(): Integer { // Implementation needs to be added here } - fun subscribeMeasured1stHarmonicCurrentAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeMeasured1stHarmonicCurrentAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readMeasured3rdHarmonicCurrentAttribute(callback: IntegerAttributeCallback) { + suspend fun readMeasured3rdHarmonicCurrentAttribute(): Integer { // Implementation needs to be added here } - fun subscribeMeasured3rdHarmonicCurrentAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeMeasured3rdHarmonicCurrentAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readMeasured5thHarmonicCurrentAttribute(callback: IntegerAttributeCallback) { + suspend fun readMeasured5thHarmonicCurrentAttribute(): Integer { // Implementation needs to be added here } - fun subscribeMeasured5thHarmonicCurrentAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeMeasured5thHarmonicCurrentAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readMeasured7thHarmonicCurrentAttribute(callback: IntegerAttributeCallback) { + suspend fun readMeasured7thHarmonicCurrentAttribute(): Integer { // Implementation needs to be added here } - fun subscribeMeasured7thHarmonicCurrentAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeMeasured7thHarmonicCurrentAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readMeasured9thHarmonicCurrentAttribute(callback: IntegerAttributeCallback) { + suspend fun readMeasured9thHarmonicCurrentAttribute(): Integer { // Implementation needs to be added here } - fun subscribeMeasured9thHarmonicCurrentAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeMeasured9thHarmonicCurrentAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readMeasured11thHarmonicCurrentAttribute(callback: IntegerAttributeCallback) { + suspend fun readMeasured11thHarmonicCurrentAttribute(): Integer { // Implementation needs to be added here } - fun subscribeMeasured11thHarmonicCurrentAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeMeasured11thHarmonicCurrentAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readMeasuredPhase1stHarmonicCurrentAttribute(callback: IntegerAttributeCallback) { + suspend fun readMeasuredPhase1stHarmonicCurrentAttribute(): Integer { // Implementation needs to be added here } - fun subscribeMeasuredPhase1stHarmonicCurrentAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeMeasuredPhase1stHarmonicCurrentAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readMeasuredPhase3rdHarmonicCurrentAttribute(callback: IntegerAttributeCallback) { + suspend fun readMeasuredPhase3rdHarmonicCurrentAttribute(): Integer { // Implementation needs to be added here } - fun subscribeMeasuredPhase3rdHarmonicCurrentAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeMeasuredPhase3rdHarmonicCurrentAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readMeasuredPhase5thHarmonicCurrentAttribute(callback: IntegerAttributeCallback) { + suspend fun readMeasuredPhase5thHarmonicCurrentAttribute(): Integer { // Implementation needs to be added here } - fun subscribeMeasuredPhase5thHarmonicCurrentAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeMeasuredPhase5thHarmonicCurrentAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readMeasuredPhase7thHarmonicCurrentAttribute(callback: IntegerAttributeCallback) { + suspend fun readMeasuredPhase7thHarmonicCurrentAttribute(): Integer { // Implementation needs to be added here } - fun subscribeMeasuredPhase7thHarmonicCurrentAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeMeasuredPhase7thHarmonicCurrentAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readMeasuredPhase9thHarmonicCurrentAttribute(callback: IntegerAttributeCallback) { + suspend fun readMeasuredPhase9thHarmonicCurrentAttribute(): Integer { // Implementation needs to be added here } - fun subscribeMeasuredPhase9thHarmonicCurrentAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeMeasuredPhase9thHarmonicCurrentAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readMeasuredPhase11thHarmonicCurrentAttribute(callback: IntegerAttributeCallback) { + suspend fun readMeasuredPhase11thHarmonicCurrentAttribute(): Integer { // Implementation needs to be added here } - fun subscribeMeasuredPhase11thHarmonicCurrentAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeMeasuredPhase11thHarmonicCurrentAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readAcFrequencyMultiplierAttribute(callback: IntegerAttributeCallback) { + suspend fun readAcFrequencyMultiplierAttribute(): Integer { // Implementation needs to be added here } - fun subscribeAcFrequencyMultiplierAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeAcFrequencyMultiplierAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readAcFrequencyDivisorAttribute(callback: IntegerAttributeCallback) { + suspend fun readAcFrequencyDivisorAttribute(): Integer { // Implementation needs to be added here } - fun subscribeAcFrequencyDivisorAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeAcFrequencyDivisorAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readPowerMultiplierAttribute(callback: LongAttributeCallback) { + suspend fun readPowerMultiplierAttribute(): Long { // Implementation needs to be added here } - fun subscribePowerMultiplierAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribePowerMultiplierAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readPowerDivisorAttribute(callback: LongAttributeCallback) { + suspend fun readPowerDivisorAttribute(): Long { // Implementation needs to be added here } - fun subscribePowerDivisorAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribePowerDivisorAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readHarmonicCurrentMultiplierAttribute(callback: IntegerAttributeCallback) { + suspend fun readHarmonicCurrentMultiplierAttribute(): Integer { // Implementation needs to be added here } - fun subscribeHarmonicCurrentMultiplierAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeHarmonicCurrentMultiplierAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readPhaseHarmonicCurrentMultiplierAttribute(callback: IntegerAttributeCallback) { + suspend fun readPhaseHarmonicCurrentMultiplierAttribute(): Integer { // Implementation needs to be added here } - fun subscribePhaseHarmonicCurrentMultiplierAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribePhaseHarmonicCurrentMultiplierAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readInstantaneousVoltageAttribute(callback: IntegerAttributeCallback) { + suspend fun readInstantaneousVoltageAttribute(): Integer { // Implementation needs to be added here } - fun subscribeInstantaneousVoltageAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeInstantaneousVoltageAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readInstantaneousLineCurrentAttribute(callback: IntegerAttributeCallback) { + suspend fun readInstantaneousLineCurrentAttribute(): Integer { // Implementation needs to be added here } - fun subscribeInstantaneousLineCurrentAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeInstantaneousLineCurrentAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readInstantaneousActiveCurrentAttribute(callback: IntegerAttributeCallback) { + suspend fun readInstantaneousActiveCurrentAttribute(): Integer { // Implementation needs to be added here } - fun subscribeInstantaneousActiveCurrentAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeInstantaneousActiveCurrentAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readInstantaneousReactiveCurrentAttribute(callback: IntegerAttributeCallback) { + suspend fun readInstantaneousReactiveCurrentAttribute(): Integer { // Implementation needs to be added here } - fun subscribeInstantaneousReactiveCurrentAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeInstantaneousReactiveCurrentAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readInstantaneousPowerAttribute(callback: IntegerAttributeCallback) { + suspend fun readInstantaneousPowerAttribute(): Integer { // Implementation needs to be added here } - fun subscribeInstantaneousPowerAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeInstantaneousPowerAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readRmsVoltageAttribute(callback: IntegerAttributeCallback) { + suspend fun readRmsVoltageAttribute(): Integer { // Implementation needs to be added here } - fun subscribeRmsVoltageAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeRmsVoltageAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readRmsVoltageMinAttribute(callback: IntegerAttributeCallback) { + suspend fun readRmsVoltageMinAttribute(): Integer { // Implementation needs to be added here } - fun subscribeRmsVoltageMinAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeRmsVoltageMinAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readRmsVoltageMaxAttribute(callback: IntegerAttributeCallback) { + suspend fun readRmsVoltageMaxAttribute(): Integer { // Implementation needs to be added here } - fun subscribeRmsVoltageMaxAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeRmsVoltageMaxAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readRmsCurrentAttribute(callback: IntegerAttributeCallback) { + suspend fun readRmsCurrentAttribute(): Integer { // Implementation needs to be added here } - fun subscribeRmsCurrentAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeRmsCurrentAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readRmsCurrentMinAttribute(callback: IntegerAttributeCallback) { + suspend fun readRmsCurrentMinAttribute(): Integer { // Implementation needs to be added here } - fun subscribeRmsCurrentMinAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeRmsCurrentMinAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readRmsCurrentMaxAttribute(callback: IntegerAttributeCallback) { + suspend fun readRmsCurrentMaxAttribute(): Integer { // Implementation needs to be added here } - fun subscribeRmsCurrentMaxAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeRmsCurrentMaxAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readActivePowerAttribute(callback: IntegerAttributeCallback) { + suspend fun readActivePowerAttribute(): Integer { // Implementation needs to be added here } - fun subscribeActivePowerAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeActivePowerAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readActivePowerMinAttribute(callback: IntegerAttributeCallback) { + suspend fun readActivePowerMinAttribute(): Integer { // Implementation needs to be added here } - fun subscribeActivePowerMinAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeActivePowerMinAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readActivePowerMaxAttribute(callback: IntegerAttributeCallback) { + suspend fun readActivePowerMaxAttribute(): Integer { // Implementation needs to be added here } - fun subscribeActivePowerMaxAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeActivePowerMaxAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readReactivePowerAttribute(callback: IntegerAttributeCallback) { + suspend fun readReactivePowerAttribute(): Integer { // Implementation needs to be added here } - fun subscribeReactivePowerAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeReactivePowerAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readApparentPowerAttribute(callback: IntegerAttributeCallback) { + suspend fun readApparentPowerAttribute(): Integer { // Implementation needs to be added here } - fun subscribeApparentPowerAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeApparentPowerAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readPowerFactorAttribute(callback: IntegerAttributeCallback) { + suspend fun readPowerFactorAttribute(): Integer { // Implementation needs to be added here } - fun subscribePowerFactorAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribePowerFactorAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readAverageRmsVoltageMeasurementPeriodAttribute(callback: IntegerAttributeCallback) { + suspend fun readAverageRmsVoltageMeasurementPeriodAttribute(): Integer { // Implementation needs to be added here } - fun writeAverageRmsVoltageMeasurementPeriodAttribute( - callback: DefaultClusterCallback, - value: Integer - ) { + suspend fun writeAverageRmsVoltageMeasurementPeriodAttribute(value: UShort) { // Implementation needs to be added here } - fun writeAverageRmsVoltageMeasurementPeriodAttribute( - callback: DefaultClusterCallback, - value: Integer, + suspend fun writeAverageRmsVoltageMeasurementPeriodAttribute( + value: UShort, timedWriteTimeoutMs: Int ) { // Implementation needs to be added here } - fun subscribeAverageRmsVoltageMeasurementPeriodAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeAverageRmsVoltageMeasurementPeriodAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readAverageRmsUnderVoltageCounterAttribute(callback: IntegerAttributeCallback) { + suspend fun readAverageRmsUnderVoltageCounterAttribute(): Integer { // Implementation needs to be added here } - fun writeAverageRmsUnderVoltageCounterAttribute( - callback: DefaultClusterCallback, - value: Integer - ) { + suspend fun writeAverageRmsUnderVoltageCounterAttribute(value: UShort) { // Implementation needs to be added here } - fun writeAverageRmsUnderVoltageCounterAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeAverageRmsUnderVoltageCounterAttribute(value: UShort, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeAverageRmsUnderVoltageCounterAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeAverageRmsUnderVoltageCounterAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readRmsExtremeOverVoltagePeriodAttribute(callback: IntegerAttributeCallback) { + suspend fun readRmsExtremeOverVoltagePeriodAttribute(): Integer { // Implementation needs to be added here } - fun writeRmsExtremeOverVoltagePeriodAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeRmsExtremeOverVoltagePeriodAttribute(value: UShort) { // Implementation needs to be added here } - fun writeRmsExtremeOverVoltagePeriodAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeRmsExtremeOverVoltagePeriodAttribute(value: UShort, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeRmsExtremeOverVoltagePeriodAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeRmsExtremeOverVoltagePeriodAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readRmsExtremeUnderVoltagePeriodAttribute(callback: IntegerAttributeCallback) { + suspend fun readRmsExtremeUnderVoltagePeriodAttribute(): Integer { // Implementation needs to be added here } - fun writeRmsExtremeUnderVoltagePeriodAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeRmsExtremeUnderVoltagePeriodAttribute(value: UShort) { // Implementation needs to be added here } - fun writeRmsExtremeUnderVoltagePeriodAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeRmsExtremeUnderVoltagePeriodAttribute(value: UShort, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeRmsExtremeUnderVoltagePeriodAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeRmsExtremeUnderVoltagePeriodAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readRmsVoltageSagPeriodAttribute(callback: IntegerAttributeCallback) { + suspend fun readRmsVoltageSagPeriodAttribute(): Integer { // Implementation needs to be added here } - fun writeRmsVoltageSagPeriodAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeRmsVoltageSagPeriodAttribute(value: UShort) { // Implementation needs to be added here } - fun writeRmsVoltageSagPeriodAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeRmsVoltageSagPeriodAttribute(value: UShort, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeRmsVoltageSagPeriodAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeRmsVoltageSagPeriodAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readRmsVoltageSwellPeriodAttribute(callback: IntegerAttributeCallback) { + suspend fun readRmsVoltageSwellPeriodAttribute(): Integer { // Implementation needs to be added here } - fun writeRmsVoltageSwellPeriodAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeRmsVoltageSwellPeriodAttribute(value: UShort) { // Implementation needs to be added here } - fun writeRmsVoltageSwellPeriodAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeRmsVoltageSwellPeriodAttribute(value: UShort, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeRmsVoltageSwellPeriodAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeRmsVoltageSwellPeriodAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readAcVoltageMultiplierAttribute(callback: IntegerAttributeCallback) { + suspend fun readAcVoltageMultiplierAttribute(): Integer { // Implementation needs to be added here } - fun subscribeAcVoltageMultiplierAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeAcVoltageMultiplierAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readAcVoltageDivisorAttribute(callback: IntegerAttributeCallback) { + suspend fun readAcVoltageDivisorAttribute(): Integer { // Implementation needs to be added here } - fun subscribeAcVoltageDivisorAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeAcVoltageDivisorAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readAcCurrentMultiplierAttribute(callback: IntegerAttributeCallback) { + suspend fun readAcCurrentMultiplierAttribute(): Integer { // Implementation needs to be added here } - fun subscribeAcCurrentMultiplierAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeAcCurrentMultiplierAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readAcCurrentDivisorAttribute(callback: IntegerAttributeCallback) { + suspend fun readAcCurrentDivisorAttribute(): Integer { // Implementation needs to be added here } - fun subscribeAcCurrentDivisorAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeAcCurrentDivisorAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readAcPowerMultiplierAttribute(callback: IntegerAttributeCallback) { + suspend fun readAcPowerMultiplierAttribute(): Integer { // Implementation needs to be added here } - fun subscribeAcPowerMultiplierAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeAcPowerMultiplierAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readAcPowerDivisorAttribute(callback: IntegerAttributeCallback) { + suspend fun readAcPowerDivisorAttribute(): Integer { // Implementation needs to be added here } - fun subscribeAcPowerDivisorAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeAcPowerDivisorAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readOverloadAlarmsMaskAttribute(callback: IntegerAttributeCallback) { + suspend fun readOverloadAlarmsMaskAttribute(): Integer { // Implementation needs to be added here } - fun writeOverloadAlarmsMaskAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeOverloadAlarmsMaskAttribute(value: UInt) { // Implementation needs to be added here } - fun writeOverloadAlarmsMaskAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeOverloadAlarmsMaskAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeOverloadAlarmsMaskAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeOverloadAlarmsMaskAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readVoltageOverloadAttribute(callback: IntegerAttributeCallback) { + suspend fun readVoltageOverloadAttribute(): Integer { // Implementation needs to be added here } - fun subscribeVoltageOverloadAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeVoltageOverloadAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readCurrentOverloadAttribute(callback: IntegerAttributeCallback) { + suspend fun readCurrentOverloadAttribute(): Integer { // Implementation needs to be added here } - fun subscribeCurrentOverloadAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeCurrentOverloadAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readAcOverloadAlarmsMaskAttribute(callback: IntegerAttributeCallback) { + suspend fun readAcOverloadAlarmsMaskAttribute(): Integer { // Implementation needs to be added here } - fun writeAcOverloadAlarmsMaskAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeAcOverloadAlarmsMaskAttribute(value: UInt) { // Implementation needs to be added here } - fun writeAcOverloadAlarmsMaskAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeAcOverloadAlarmsMaskAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeAcOverloadAlarmsMaskAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeAcOverloadAlarmsMaskAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readAcVoltageOverloadAttribute(callback: IntegerAttributeCallback) { + suspend fun readAcVoltageOverloadAttribute(): Integer { // Implementation needs to be added here } - fun subscribeAcVoltageOverloadAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeAcVoltageOverloadAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readAcCurrentOverloadAttribute(callback: IntegerAttributeCallback) { + suspend fun readAcCurrentOverloadAttribute(): Integer { // Implementation needs to be added here } - fun subscribeAcCurrentOverloadAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeAcCurrentOverloadAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readAcActivePowerOverloadAttribute(callback: IntegerAttributeCallback) { + suspend fun readAcActivePowerOverloadAttribute(): Integer { // Implementation needs to be added here } - fun subscribeAcActivePowerOverloadAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeAcActivePowerOverloadAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readAcReactivePowerOverloadAttribute(callback: IntegerAttributeCallback) { + suspend fun readAcReactivePowerOverloadAttribute(): Integer { // Implementation needs to be added here } - fun subscribeAcReactivePowerOverloadAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeAcReactivePowerOverloadAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readAverageRmsOverVoltageAttribute(callback: IntegerAttributeCallback) { + suspend fun readAverageRmsOverVoltageAttribute(): Integer { // Implementation needs to be added here } - fun subscribeAverageRmsOverVoltageAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeAverageRmsOverVoltageAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readAverageRmsUnderVoltageAttribute(callback: IntegerAttributeCallback) { + suspend fun readAverageRmsUnderVoltageAttribute(): Integer { // Implementation needs to be added here } - fun subscribeAverageRmsUnderVoltageAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeAverageRmsUnderVoltageAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readRmsExtremeOverVoltageAttribute(callback: IntegerAttributeCallback) { + suspend fun readRmsExtremeOverVoltageAttribute(): Integer { // Implementation needs to be added here } - fun subscribeRmsExtremeOverVoltageAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeRmsExtremeOverVoltageAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readRmsExtremeUnderVoltageAttribute(callback: IntegerAttributeCallback) { + suspend fun readRmsExtremeUnderVoltageAttribute(): Integer { // Implementation needs to be added here } - fun subscribeRmsExtremeUnderVoltageAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeRmsExtremeUnderVoltageAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readRmsVoltageSagAttribute(callback: IntegerAttributeCallback) { + suspend fun readRmsVoltageSagAttribute(): Integer { // Implementation needs to be added here } - fun subscribeRmsVoltageSagAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeRmsVoltageSagAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readRmsVoltageSwellAttribute(callback: IntegerAttributeCallback) { + suspend fun readRmsVoltageSwellAttribute(): Integer { // Implementation needs to be added here } - fun subscribeRmsVoltageSwellAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeRmsVoltageSwellAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readLineCurrentPhaseBAttribute(callback: IntegerAttributeCallback) { + suspend fun readLineCurrentPhaseBAttribute(): Integer { // Implementation needs to be added here } - fun subscribeLineCurrentPhaseBAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeLineCurrentPhaseBAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readActiveCurrentPhaseBAttribute(callback: IntegerAttributeCallback) { + suspend fun readActiveCurrentPhaseBAttribute(): Integer { // Implementation needs to be added here } - fun subscribeActiveCurrentPhaseBAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeActiveCurrentPhaseBAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readReactiveCurrentPhaseBAttribute(callback: IntegerAttributeCallback) { + suspend fun readReactiveCurrentPhaseBAttribute(): Integer { // Implementation needs to be added here } - fun subscribeReactiveCurrentPhaseBAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeReactiveCurrentPhaseBAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readRmsVoltagePhaseBAttribute(callback: IntegerAttributeCallback) { + suspend fun readRmsVoltagePhaseBAttribute(): Integer { // Implementation needs to be added here } - fun subscribeRmsVoltagePhaseBAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeRmsVoltagePhaseBAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readRmsVoltageMinPhaseBAttribute(callback: IntegerAttributeCallback) { + suspend fun readRmsVoltageMinPhaseBAttribute(): Integer { // Implementation needs to be added here } - fun subscribeRmsVoltageMinPhaseBAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeRmsVoltageMinPhaseBAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readRmsVoltageMaxPhaseBAttribute(callback: IntegerAttributeCallback) { + suspend fun readRmsVoltageMaxPhaseBAttribute(): Integer { // Implementation needs to be added here } - fun subscribeRmsVoltageMaxPhaseBAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeRmsVoltageMaxPhaseBAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readRmsCurrentPhaseBAttribute(callback: IntegerAttributeCallback) { + suspend fun readRmsCurrentPhaseBAttribute(): Integer { // Implementation needs to be added here } - fun subscribeRmsCurrentPhaseBAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeRmsCurrentPhaseBAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readRmsCurrentMinPhaseBAttribute(callback: IntegerAttributeCallback) { + suspend fun readRmsCurrentMinPhaseBAttribute(): Integer { // Implementation needs to be added here } - fun subscribeRmsCurrentMinPhaseBAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeRmsCurrentMinPhaseBAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readRmsCurrentMaxPhaseBAttribute(callback: IntegerAttributeCallback) { + suspend fun readRmsCurrentMaxPhaseBAttribute(): Integer { // Implementation needs to be added here } - fun subscribeRmsCurrentMaxPhaseBAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeRmsCurrentMaxPhaseBAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readActivePowerPhaseBAttribute(callback: IntegerAttributeCallback) { + suspend fun readActivePowerPhaseBAttribute(): Integer { // Implementation needs to be added here } - fun subscribeActivePowerPhaseBAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeActivePowerPhaseBAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readActivePowerMinPhaseBAttribute(callback: IntegerAttributeCallback) { + suspend fun readActivePowerMinPhaseBAttribute(): Integer { // Implementation needs to be added here } - fun subscribeActivePowerMinPhaseBAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeActivePowerMinPhaseBAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readActivePowerMaxPhaseBAttribute(callback: IntegerAttributeCallback) { + suspend fun readActivePowerMaxPhaseBAttribute(): Integer { // Implementation needs to be added here } - fun subscribeActivePowerMaxPhaseBAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeActivePowerMaxPhaseBAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readReactivePowerPhaseBAttribute(callback: IntegerAttributeCallback) { + suspend fun readReactivePowerPhaseBAttribute(): Integer { // Implementation needs to be added here } - fun subscribeReactivePowerPhaseBAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeReactivePowerPhaseBAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readApparentPowerPhaseBAttribute(callback: IntegerAttributeCallback) { + suspend fun readApparentPowerPhaseBAttribute(): Integer { // Implementation needs to be added here } - fun subscribeApparentPowerPhaseBAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeApparentPowerPhaseBAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readPowerFactorPhaseBAttribute(callback: IntegerAttributeCallback) { + suspend fun readPowerFactorPhaseBAttribute(): Integer { // Implementation needs to be added here } - fun subscribePowerFactorPhaseBAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribePowerFactorPhaseBAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readAverageRmsVoltageMeasurementPeriodPhaseBAttribute(callback: IntegerAttributeCallback) { + suspend fun readAverageRmsVoltageMeasurementPeriodPhaseBAttribute(): Integer { // Implementation needs to be added here } - fun subscribeAverageRmsVoltageMeasurementPeriodPhaseBAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeAverageRmsVoltageMeasurementPeriodPhaseBAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readAverageRmsOverVoltageCounterPhaseBAttribute(callback: IntegerAttributeCallback) { + suspend fun readAverageRmsOverVoltageCounterPhaseBAttribute(): Integer { // Implementation needs to be added here } - fun subscribeAverageRmsOverVoltageCounterPhaseBAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeAverageRmsOverVoltageCounterPhaseBAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readAverageRmsUnderVoltageCounterPhaseBAttribute(callback: IntegerAttributeCallback) { + suspend fun readAverageRmsUnderVoltageCounterPhaseBAttribute(): Integer { // Implementation needs to be added here } - fun subscribeAverageRmsUnderVoltageCounterPhaseBAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeAverageRmsUnderVoltageCounterPhaseBAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readRmsExtremeOverVoltagePeriodPhaseBAttribute(callback: IntegerAttributeCallback) { + suspend fun readRmsExtremeOverVoltagePeriodPhaseBAttribute(): Integer { // Implementation needs to be added here } - fun subscribeRmsExtremeOverVoltagePeriodPhaseBAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeRmsExtremeOverVoltagePeriodPhaseBAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readRmsExtremeUnderVoltagePeriodPhaseBAttribute(callback: IntegerAttributeCallback) { + suspend fun readRmsExtremeUnderVoltagePeriodPhaseBAttribute(): Integer { // Implementation needs to be added here } - fun subscribeRmsExtremeUnderVoltagePeriodPhaseBAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeRmsExtremeUnderVoltagePeriodPhaseBAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readRmsVoltageSagPeriodPhaseBAttribute(callback: IntegerAttributeCallback) { + suspend fun readRmsVoltageSagPeriodPhaseBAttribute(): Integer { // Implementation needs to be added here } - fun subscribeRmsVoltageSagPeriodPhaseBAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeRmsVoltageSagPeriodPhaseBAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readRmsVoltageSwellPeriodPhaseBAttribute(callback: IntegerAttributeCallback) { + suspend fun readRmsVoltageSwellPeriodPhaseBAttribute(): Integer { // Implementation needs to be added here } - fun subscribeRmsVoltageSwellPeriodPhaseBAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeRmsVoltageSwellPeriodPhaseBAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readLineCurrentPhaseCAttribute(callback: IntegerAttributeCallback) { + suspend fun readLineCurrentPhaseCAttribute(): Integer { // Implementation needs to be added here } - fun subscribeLineCurrentPhaseCAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeLineCurrentPhaseCAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readActiveCurrentPhaseCAttribute(callback: IntegerAttributeCallback) { + suspend fun readActiveCurrentPhaseCAttribute(): Integer { // Implementation needs to be added here } - fun subscribeActiveCurrentPhaseCAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeActiveCurrentPhaseCAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readReactiveCurrentPhaseCAttribute(callback: IntegerAttributeCallback) { + suspend fun readReactiveCurrentPhaseCAttribute(): Integer { // Implementation needs to be added here } - fun subscribeReactiveCurrentPhaseCAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeReactiveCurrentPhaseCAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readRmsVoltagePhaseCAttribute(callback: IntegerAttributeCallback) { + suspend fun readRmsVoltagePhaseCAttribute(): Integer { // Implementation needs to be added here } - fun subscribeRmsVoltagePhaseCAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeRmsVoltagePhaseCAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readRmsVoltageMinPhaseCAttribute(callback: IntegerAttributeCallback) { + suspend fun readRmsVoltageMinPhaseCAttribute(): Integer { // Implementation needs to be added here } - fun subscribeRmsVoltageMinPhaseCAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeRmsVoltageMinPhaseCAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readRmsVoltageMaxPhaseCAttribute(callback: IntegerAttributeCallback) { + suspend fun readRmsVoltageMaxPhaseCAttribute(): Integer { // Implementation needs to be added here } - fun subscribeRmsVoltageMaxPhaseCAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeRmsVoltageMaxPhaseCAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readRmsCurrentPhaseCAttribute(callback: IntegerAttributeCallback) { + suspend fun readRmsCurrentPhaseCAttribute(): Integer { // Implementation needs to be added here } - fun subscribeRmsCurrentPhaseCAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeRmsCurrentPhaseCAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readRmsCurrentMinPhaseCAttribute(callback: IntegerAttributeCallback) { + suspend fun readRmsCurrentMinPhaseCAttribute(): Integer { // Implementation needs to be added here } - fun subscribeRmsCurrentMinPhaseCAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeRmsCurrentMinPhaseCAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readRmsCurrentMaxPhaseCAttribute(callback: IntegerAttributeCallback) { + suspend fun readRmsCurrentMaxPhaseCAttribute(): Integer { // Implementation needs to be added here } - fun subscribeRmsCurrentMaxPhaseCAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeRmsCurrentMaxPhaseCAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readActivePowerPhaseCAttribute(callback: IntegerAttributeCallback) { + suspend fun readActivePowerPhaseCAttribute(): Integer { // Implementation needs to be added here } - fun subscribeActivePowerPhaseCAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeActivePowerPhaseCAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readActivePowerMinPhaseCAttribute(callback: IntegerAttributeCallback) { + suspend fun readActivePowerMinPhaseCAttribute(): Integer { // Implementation needs to be added here } - fun subscribeActivePowerMinPhaseCAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeActivePowerMinPhaseCAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readActivePowerMaxPhaseCAttribute(callback: IntegerAttributeCallback) { + suspend fun readActivePowerMaxPhaseCAttribute(): Integer { // Implementation needs to be added here } - fun subscribeActivePowerMaxPhaseCAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeActivePowerMaxPhaseCAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readReactivePowerPhaseCAttribute(callback: IntegerAttributeCallback) { + suspend fun readReactivePowerPhaseCAttribute(): Integer { // Implementation needs to be added here } - fun subscribeReactivePowerPhaseCAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeReactivePowerPhaseCAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readApparentPowerPhaseCAttribute(callback: IntegerAttributeCallback) { + suspend fun readApparentPowerPhaseCAttribute(): Integer { // Implementation needs to be added here } - fun subscribeApparentPowerPhaseCAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeApparentPowerPhaseCAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readPowerFactorPhaseCAttribute(callback: IntegerAttributeCallback) { + suspend fun readPowerFactorPhaseCAttribute(): Integer { // Implementation needs to be added here } - fun subscribePowerFactorPhaseCAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribePowerFactorPhaseCAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readAverageRmsVoltageMeasurementPeriodPhaseCAttribute(callback: IntegerAttributeCallback) { + suspend fun readAverageRmsVoltageMeasurementPeriodPhaseCAttribute(): Integer { // Implementation needs to be added here } - fun subscribeAverageRmsVoltageMeasurementPeriodPhaseCAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeAverageRmsVoltageMeasurementPeriodPhaseCAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readAverageRmsOverVoltageCounterPhaseCAttribute(callback: IntegerAttributeCallback) { + suspend fun readAverageRmsOverVoltageCounterPhaseCAttribute(): Integer { // Implementation needs to be added here } - fun subscribeAverageRmsOverVoltageCounterPhaseCAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeAverageRmsOverVoltageCounterPhaseCAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readAverageRmsUnderVoltageCounterPhaseCAttribute(callback: IntegerAttributeCallback) { + suspend fun readAverageRmsUnderVoltageCounterPhaseCAttribute(): Integer { // Implementation needs to be added here } - fun subscribeAverageRmsUnderVoltageCounterPhaseCAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeAverageRmsUnderVoltageCounterPhaseCAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readRmsExtremeOverVoltagePeriodPhaseCAttribute(callback: IntegerAttributeCallback) { + suspend fun readRmsExtremeOverVoltagePeriodPhaseCAttribute(): Integer { // Implementation needs to be added here } - fun subscribeRmsExtremeOverVoltagePeriodPhaseCAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeRmsExtremeOverVoltagePeriodPhaseCAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readRmsExtremeUnderVoltagePeriodPhaseCAttribute(callback: IntegerAttributeCallback) { + suspend fun readRmsExtremeUnderVoltagePeriodPhaseCAttribute(): Integer { // Implementation needs to be added here } - fun subscribeRmsExtremeUnderVoltagePeriodPhaseCAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeRmsExtremeUnderVoltagePeriodPhaseCAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readRmsVoltageSagPeriodPhaseCAttribute(callback: IntegerAttributeCallback) { + suspend fun readRmsVoltageSagPeriodPhaseCAttribute(): Integer { // Implementation needs to be added here } - fun subscribeRmsVoltageSagPeriodPhaseCAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeRmsVoltageSagPeriodPhaseCAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readRmsVoltageSwellPeriodPhaseCAttribute(callback: IntegerAttributeCallback) { + suspend fun readRmsVoltageSwellPeriodPhaseCAttribute(): Integer { // Implementation needs to be added here } - fun subscribeRmsVoltageSwellPeriodPhaseCAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeRmsVoltageSwellPeriodPhaseCAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 2820u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/EthernetNetworkDiagnosticsCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/EthernetNetworkDiagnosticsCluster.kt index f61cf30b5f114a..a2dcd32f0c4892 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/EthernetNetworkDiagnosticsCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/EthernetNetworkDiagnosticsCluster.kt @@ -20,251 +20,164 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class EthernetNetworkDiagnosticsCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 55u - } - - fun resetCounts(callback: DefaultClusterCallback) { - // Implementation needs to be added here - } - - fun resetCounts(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } + class PHYRateAttribute(val value: UInt?) - interface PHYRateAttributeCallback { - fun onSuccess(value: Integer?) + class FullDuplexAttribute(val value: Boolean?) - fun onError(ex: Exception) + class CarrierDetectAttribute(val value: Boolean?) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class GeneratedCommandListAttribute(val value: ArrayList) - interface FullDuplexAttributeCallback { - fun onSuccess(value: Boolean?) + class AcceptedCommandListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class EventListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AttributeListAttribute(val value: ArrayList) - interface CarrierDetectAttributeCallback { - fun onSuccess(value: Boolean?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun resetCounts() { + // Implementation needs to be added here } - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun resetCounts(timedInvokeTimeoutMs: Int) { + // Implementation needs to be added here } - fun readPHYRateAttribute(callback: PHYRateAttributeCallback) { + suspend fun readPHYRateAttribute(): PHYRateAttribute { // Implementation needs to be added here } - fun subscribePHYRateAttribute( - callback: PHYRateAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribePHYRateAttribute(minInterval: Int, maxInterval: Int): PHYRateAttribute { // Implementation needs to be added here } - fun readFullDuplexAttribute(callback: FullDuplexAttributeCallback) { + suspend fun readFullDuplexAttribute(): FullDuplexAttribute { // Implementation needs to be added here } - fun subscribeFullDuplexAttribute( - callback: FullDuplexAttributeCallback, + suspend fun subscribeFullDuplexAttribute( minInterval: Int, maxInterval: Int - ) { + ): FullDuplexAttribute { // Implementation needs to be added here } - fun readPacketRxCountAttribute(callback: LongAttributeCallback) { + suspend fun readPacketRxCountAttribute(): Long { // Implementation needs to be added here } - fun subscribePacketRxCountAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribePacketRxCountAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readPacketTxCountAttribute(callback: LongAttributeCallback) { + suspend fun readPacketTxCountAttribute(): Long { // Implementation needs to be added here } - fun subscribePacketTxCountAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribePacketTxCountAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readTxErrCountAttribute(callback: LongAttributeCallback) { + suspend fun readTxErrCountAttribute(): Long { // Implementation needs to be added here } - fun subscribeTxErrCountAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeTxErrCountAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readCollisionCountAttribute(callback: LongAttributeCallback) { + suspend fun readCollisionCountAttribute(): Long { // Implementation needs to be added here } - fun subscribeCollisionCountAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeCollisionCountAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readOverrunCountAttribute(callback: LongAttributeCallback) { + suspend fun readOverrunCountAttribute(): Long { // Implementation needs to be added here } - fun subscribeOverrunCountAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeOverrunCountAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readCarrierDetectAttribute(callback: CarrierDetectAttributeCallback) { + suspend fun readCarrierDetectAttribute(): CarrierDetectAttribute { // Implementation needs to be added here } - fun subscribeCarrierDetectAttribute( - callback: CarrierDetectAttributeCallback, + suspend fun subscribeCarrierDetectAttribute( minInterval: Int, maxInterval: Int - ) { + ): CarrierDetectAttribute { // Implementation needs to be added here } - fun readTimeSinceResetAttribute(callback: LongAttributeCallback) { + suspend fun readTimeSinceResetAttribute(): Long { // Implementation needs to be added here } - fun subscribeTimeSinceResetAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeTimeSinceResetAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 55u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FanControlCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FanControlCluster.kt index fea630a32e28c0..f4c0799dfd06ce 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FanControlCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FanControlCluster.kt @@ -20,22 +20,24 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class FanControlCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 514u - } + class PercentSettingAttribute(val value: UByte?) - fun step( - callback: DefaultClusterCallback, - direction: Integer, - wrap: Boolean?, - lowestOff: Boolean? - ) { + class SpeedSettingAttribute(val value: UByte?) + + class GeneratedCommandListAttribute(val value: ArrayList) + + class AcceptedCommandListAttribute(val value: ArrayList) + + class EventListAttribute(val value: ArrayList) + + class AttributeListAttribute(val value: ArrayList) + + suspend fun step(direction: UInt, wrap: Boolean?, lowestOff: Boolean?) { // Implementation needs to be added here } - fun step( - callback: DefaultClusterCallback, - direction: Integer, + suspend fun step( + direction: UInt, wrap: Boolean?, lowestOff: Boolean?, timedInvokeTimeoutMs: Int @@ -43,351 +45,222 @@ class FanControlCluster(private val endpointId: UShort) { // Implementation needs to be added here } - interface PercentSettingAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface SpeedSettingAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readFanModeAttribute(callback: IntegerAttributeCallback) { + suspend fun readFanModeAttribute(): Integer { // Implementation needs to be added here } - fun writeFanModeAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeFanModeAttribute(value: UInt) { // Implementation needs to be added here } - fun writeFanModeAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeFanModeAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeFanModeAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFanModeAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readFanModeSequenceAttribute(callback: IntegerAttributeCallback) { + suspend fun readFanModeSequenceAttribute(): Integer { // Implementation needs to be added here } - fun writeFanModeSequenceAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeFanModeSequenceAttribute(value: UInt) { // Implementation needs to be added here } - fun writeFanModeSequenceAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeFanModeSequenceAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeFanModeSequenceAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFanModeSequenceAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readPercentSettingAttribute(callback: PercentSettingAttributeCallback) { + suspend fun readPercentSettingAttribute(): PercentSettingAttribute { // Implementation needs to be added here } - fun writePercentSettingAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writePercentSettingAttribute(value: UByte) { // Implementation needs to be added here } - fun writePercentSettingAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writePercentSettingAttribute(value: UByte, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribePercentSettingAttribute( - callback: PercentSettingAttributeCallback, + suspend fun subscribePercentSettingAttribute( minInterval: Int, maxInterval: Int - ) { + ): PercentSettingAttribute { // Implementation needs to be added here } - fun readPercentCurrentAttribute(callback: IntegerAttributeCallback) { + suspend fun readPercentCurrentAttribute(): Integer { // Implementation needs to be added here } - fun subscribePercentCurrentAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribePercentCurrentAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readSpeedMaxAttribute(callback: IntegerAttributeCallback) { + suspend fun readSpeedMaxAttribute(): Integer { // Implementation needs to be added here } - fun subscribeSpeedMaxAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeSpeedMaxAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readSpeedSettingAttribute(callback: SpeedSettingAttributeCallback) { + suspend fun readSpeedSettingAttribute(): SpeedSettingAttribute { // Implementation needs to be added here } - fun writeSpeedSettingAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeSpeedSettingAttribute(value: UByte) { // Implementation needs to be added here } - fun writeSpeedSettingAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeSpeedSettingAttribute(value: UByte, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeSpeedSettingAttribute( - callback: SpeedSettingAttributeCallback, + suspend fun subscribeSpeedSettingAttribute( minInterval: Int, maxInterval: Int - ) { + ): SpeedSettingAttribute { // Implementation needs to be added here } - fun readSpeedCurrentAttribute(callback: IntegerAttributeCallback) { + suspend fun readSpeedCurrentAttribute(): Integer { // Implementation needs to be added here } - fun subscribeSpeedCurrentAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeSpeedCurrentAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readRockSupportAttribute(callback: IntegerAttributeCallback) { + suspend fun readRockSupportAttribute(): Integer { // Implementation needs to be added here } - fun subscribeRockSupportAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeRockSupportAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readRockSettingAttribute(callback: IntegerAttributeCallback) { + suspend fun readRockSettingAttribute(): Integer { // Implementation needs to be added here } - fun writeRockSettingAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeRockSettingAttribute(value: UInt) { // Implementation needs to be added here } - fun writeRockSettingAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeRockSettingAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeRockSettingAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeRockSettingAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readWindSupportAttribute(callback: IntegerAttributeCallback) { + suspend fun readWindSupportAttribute(): Integer { // Implementation needs to be added here } - fun subscribeWindSupportAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeWindSupportAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readWindSettingAttribute(callback: IntegerAttributeCallback) { + suspend fun readWindSettingAttribute(): Integer { // Implementation needs to be added here } - fun writeWindSettingAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeWindSettingAttribute(value: UInt) { // Implementation needs to be added here } - fun writeWindSettingAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeWindSettingAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeWindSettingAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeWindSettingAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readAirflowDirectionAttribute(callback: IntegerAttributeCallback) { + suspend fun readAirflowDirectionAttribute(): Integer { // Implementation needs to be added here } - fun writeAirflowDirectionAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeAirflowDirectionAttribute(value: UInt) { // Implementation needs to be added here } - fun writeAirflowDirectionAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeAirflowDirectionAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeAirflowDirectionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeAirflowDirectionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 514u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FaultInjectionCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FaultInjectionCluster.kt index e7fe9587313e38..6c6c71f2aad3be 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FaultInjectionCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FaultInjectionCluster.kt @@ -20,153 +20,106 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class FaultInjectionCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 4294048774u - } + class GeneratedCommandListAttribute(val value: ArrayList) + + class AcceptedCommandListAttribute(val value: ArrayList) + + class EventListAttribute(val value: ArrayList) - fun failAtFault( - callback: DefaultClusterCallback, - type: Integer, - id: Long, - numCallsToSkip: Long, - numCallsToFail: Long, + class AttributeListAttribute(val value: ArrayList) + + suspend fun failAtFault( + type: UInt, + id: UInt, + numCallsToSkip: UInt, + numCallsToFail: UInt, takeMutex: Boolean ) { // Implementation needs to be added here } - fun failAtFault( - callback: DefaultClusterCallback, - type: Integer, - id: Long, - numCallsToSkip: Long, - numCallsToFail: Long, + suspend fun failAtFault( + type: UInt, + id: UInt, + numCallsToSkip: UInt, + numCallsToFail: UInt, takeMutex: Boolean, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - fun failRandomlyAtFault( - callback: DefaultClusterCallback, - type: Integer, - id: Long, - percentage: Integer - ) { + suspend fun failRandomlyAtFault(type: UInt, id: UInt, percentage: UByte) { // Implementation needs to be added here } - fun failRandomlyAtFault( - callback: DefaultClusterCallback, - type: Integer, - id: Long, - percentage: Integer, + suspend fun failRandomlyAtFault( + type: UInt, + id: UInt, + percentage: UByte, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 4294048774u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FixedLabelCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FixedLabelCluster.kt index bab84393fc7fd2..cc1cb7c4f5df42 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FixedLabelCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FixedLabelCluster.kt @@ -20,131 +20,82 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class FixedLabelCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 64u - } - - interface LabelListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) + class LabelListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class GeneratedCommandListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) + class AcceptedCommandListAttribute(val value: ArrayList) - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class EventListAttribute(val value: ArrayList) - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) + class AttributeListAttribute(val value: ArrayList) - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readLabelListAttribute(callback: LabelListAttributeCallback) { + suspend fun readLabelListAttribute(): LabelListAttribute { // Implementation needs to be added here } - fun subscribeLabelListAttribute( - callback: LabelListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeLabelListAttribute(minInterval: Int, maxInterval: Int): LabelListAttribute { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 64u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FlowMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FlowMeasurementCluster.kt index f1075fa6282d2b..ab5c4ca9c43bf0 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FlowMeasurementCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FlowMeasurementCluster.kt @@ -20,183 +20,119 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class FlowMeasurementCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 1028u - } - - interface MeasuredValueAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) + class MeasuredValueAttribute(val value: UShort?) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface MinMeasuredValueAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class MinMeasuredValueAttribute(val value: UShort?) - interface MaxMeasuredValueAttributeCallback { - fun onSuccess(value: Integer?) + class MaxMeasuredValueAttribute(val value: UShort?) - fun onError(ex: Exception) + class GeneratedCommandListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AcceptedCommandListAttribute(val value: ArrayList) - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) + class EventListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class AttributeListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readMeasuredValueAttribute(callback: MeasuredValueAttributeCallback) { + suspend fun readMeasuredValueAttribute(): MeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeMeasuredValueAttribute( - callback: MeasuredValueAttributeCallback, + suspend fun subscribeMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): MeasuredValueAttribute { // Implementation needs to be added here } - fun readMinMeasuredValueAttribute(callback: MinMeasuredValueAttributeCallback) { + suspend fun readMinMeasuredValueAttribute(): MinMeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeMinMeasuredValueAttribute( - callback: MinMeasuredValueAttributeCallback, + suspend fun subscribeMinMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): MinMeasuredValueAttribute { // Implementation needs to be added here } - fun readMaxMeasuredValueAttribute(callback: MaxMeasuredValueAttributeCallback) { + suspend fun readMaxMeasuredValueAttribute(): MaxMeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeMaxMeasuredValueAttribute( - callback: MaxMeasuredValueAttributeCallback, + suspend fun subscribeMaxMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): MaxMeasuredValueAttribute { // Implementation needs to be added here } - fun readToleranceAttribute(callback: IntegerAttributeCallback) { + suspend fun readToleranceAttribute(): Integer { // Implementation needs to be added here } - fun subscribeToleranceAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeToleranceAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 1028u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FormaldehydeConcentrationMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FormaldehydeConcentrationMeasurementCluster.kt index 5ab1994b688368..682833546af638 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FormaldehydeConcentrationMeasurementCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FormaldehydeConcentrationMeasurementCluster.kt @@ -20,283 +20,188 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class FormaldehydeConcentrationMeasurementCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 1067u - } - - interface MeasuredValueAttributeCallback { - fun onSuccess(value: Float?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface MinMeasuredValueAttributeCallback { - fun onSuccess(value: Float?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface MaxMeasuredValueAttributeCallback { - fun onSuccess(value: Float?) - - fun onError(ex: Exception) + class MeasuredValueAttribute(val value: Float?) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface PeakMeasuredValueAttributeCallback { - fun onSuccess(value: Float?) + class MinMeasuredValueAttribute(val value: Float?) - fun onError(ex: Exception) + class MaxMeasuredValueAttribute(val value: Float?) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class PeakMeasuredValueAttribute(val value: Float?) - interface AverageMeasuredValueAttributeCallback { - fun onSuccess(value: Float?) + class AverageMeasuredValueAttribute(val value: Float?) - fun onError(ex: Exception) + class GeneratedCommandListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AcceptedCommandListAttribute(val value: ArrayList) - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class EventListAttribute(val value: ArrayList) - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) + class AttributeListAttribute(val value: ArrayList) - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readMeasuredValueAttribute(callback: MeasuredValueAttributeCallback) { + suspend fun readMeasuredValueAttribute(): MeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeMeasuredValueAttribute( - callback: MeasuredValueAttributeCallback, + suspend fun subscribeMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): MeasuredValueAttribute { // Implementation needs to be added here } - fun readMinMeasuredValueAttribute(callback: MinMeasuredValueAttributeCallback) { + suspend fun readMinMeasuredValueAttribute(): MinMeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeMinMeasuredValueAttribute( - callback: MinMeasuredValueAttributeCallback, + suspend fun subscribeMinMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): MinMeasuredValueAttribute { // Implementation needs to be added here } - fun readMaxMeasuredValueAttribute(callback: MaxMeasuredValueAttributeCallback) { + suspend fun readMaxMeasuredValueAttribute(): MaxMeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeMaxMeasuredValueAttribute( - callback: MaxMeasuredValueAttributeCallback, + suspend fun subscribeMaxMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): MaxMeasuredValueAttribute { // Implementation needs to be added here } - fun readPeakMeasuredValueAttribute(callback: PeakMeasuredValueAttributeCallback) { + suspend fun readPeakMeasuredValueAttribute(): PeakMeasuredValueAttribute { // Implementation needs to be added here } - fun subscribePeakMeasuredValueAttribute( - callback: PeakMeasuredValueAttributeCallback, + suspend fun subscribePeakMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): PeakMeasuredValueAttribute { // Implementation needs to be added here } - fun readPeakMeasuredValueWindowAttribute(callback: LongAttributeCallback) { + suspend fun readPeakMeasuredValueWindowAttribute(): Long { // Implementation needs to be added here } - fun subscribePeakMeasuredValueWindowAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribePeakMeasuredValueWindowAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readAverageMeasuredValueAttribute(callback: AverageMeasuredValueAttributeCallback) { + suspend fun readAverageMeasuredValueAttribute(): AverageMeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeAverageMeasuredValueAttribute( - callback: AverageMeasuredValueAttributeCallback, + suspend fun subscribeAverageMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): AverageMeasuredValueAttribute { // Implementation needs to be added here } - fun readAverageMeasuredValueWindowAttribute(callback: LongAttributeCallback) { + suspend fun readAverageMeasuredValueWindowAttribute(): Long { // Implementation needs to be added here } - fun subscribeAverageMeasuredValueWindowAttribute( - callback: LongAttributeCallback, + suspend fun subscribeAverageMeasuredValueWindowAttribute( minInterval: Int, maxInterval: Int - ) { + ): Long { // Implementation needs to be added here } - fun readUncertaintyAttribute(callback: FloatAttributeCallback) { + suspend fun readUncertaintyAttribute(): Float { // Implementation needs to be added here } - fun subscribeUncertaintyAttribute( - callback: FloatAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeUncertaintyAttribute(minInterval: Int, maxInterval: Int): Float { // Implementation needs to be added here } - fun readMeasurementUnitAttribute(callback: IntegerAttributeCallback) { + suspend fun readMeasurementUnitAttribute(): Integer { // Implementation needs to be added here } - fun subscribeMeasurementUnitAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeMeasurementUnitAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readMeasurementMediumAttribute(callback: IntegerAttributeCallback) { + suspend fun readMeasurementMediumAttribute(): Integer { // Implementation needs to be added here } - fun subscribeMeasurementMediumAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeMeasurementMediumAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readLevelValueAttribute(callback: IntegerAttributeCallback) { + suspend fun readLevelValueAttribute(): Integer { // Implementation needs to be added here } - fun subscribeLevelValueAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeLevelValueAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 1067u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GeneralCommissioningCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GeneralCommissioningCluster.kt index de430114295af6..59cfa7bb125a32 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GeneralCommissioningCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GeneralCommissioningCluster.kt @@ -20,256 +20,173 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class GeneralCommissioningCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 48u - } + class ArmFailSafeResponse(val errorCode: UInt, val debugText: String) + + class SetRegulatoryConfigResponse(val errorCode: UInt, val debugText: String) + + class CommissioningCompleteResponse(val errorCode: UInt, val debugText: String) + + class BasicCommissioningInfoAttribute( + val value: ChipStructs.GeneralCommissioningClusterBasicCommissioningInfo + ) + + class GeneratedCommandListAttribute(val value: ArrayList) - fun armFailSafe( - callback: ArmFailSafeResponseCallback, - expiryLengthSeconds: Integer, - breadcrumb: Long - ) { + class AcceptedCommandListAttribute(val value: ArrayList) + + class EventListAttribute(val value: ArrayList) + + class AttributeListAttribute(val value: ArrayList) + + suspend fun armFailSafe(expiryLengthSeconds: UShort, breadcrumb: ULong): ArmFailSafeResponse { // Implementation needs to be added here } - fun armFailSafe( - callback: ArmFailSafeResponseCallback, - expiryLengthSeconds: Integer, - breadcrumb: Long, + suspend fun armFailSafe( + expiryLengthSeconds: UShort, + breadcrumb: ULong, timedInvokeTimeoutMs: Int - ) { + ): ArmFailSafeResponse { // Implementation needs to be added here } - fun setRegulatoryConfig( - callback: SetRegulatoryConfigResponseCallback, - newRegulatoryConfig: Integer, + suspend fun setRegulatoryConfig( + newRegulatoryConfig: UInt, countryCode: String, - breadcrumb: Long - ) { + breadcrumb: ULong + ): SetRegulatoryConfigResponse { // Implementation needs to be added here } - fun setRegulatoryConfig( - callback: SetRegulatoryConfigResponseCallback, - newRegulatoryConfig: Integer, + suspend fun setRegulatoryConfig( + newRegulatoryConfig: UInt, countryCode: String, - breadcrumb: Long, + breadcrumb: ULong, timedInvokeTimeoutMs: Int - ) { + ): SetRegulatoryConfigResponse { // Implementation needs to be added here } - fun commissioningComplete(callback: CommissioningCompleteResponseCallback) { + suspend fun commissioningComplete(): CommissioningCompleteResponse { // Implementation needs to be added here } - fun commissioningComplete( - callback: CommissioningCompleteResponseCallback, - timedInvokeTimeoutMs: Int - ) { + suspend fun commissioningComplete(timedInvokeTimeoutMs: Int): CommissioningCompleteResponse { // Implementation needs to be added here } - interface ArmFailSafeResponseCallback { - fun onSuccess(errorCode: Integer, debugText: String) - - fun onError(error: Exception) - } - - interface SetRegulatoryConfigResponseCallback { - fun onSuccess(errorCode: Integer, debugText: String) - - fun onError(error: Exception) - } - - interface CommissioningCompleteResponseCallback { - fun onSuccess(errorCode: Integer, debugText: String) - - fun onError(error: Exception) - } - - interface BasicCommissioningInfoAttributeCallback { - fun onSuccess(value: ChipStructs.GeneralCommissioningClusterBasicCommissioningInfo) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readBreadcrumbAttribute(callback: LongAttributeCallback) { + suspend fun readBreadcrumbAttribute(): Long { // Implementation needs to be added here } - fun writeBreadcrumbAttribute(callback: DefaultClusterCallback, value: Long) { + suspend fun writeBreadcrumbAttribute(value: ULong) { // Implementation needs to be added here } - fun writeBreadcrumbAttribute( - callback: DefaultClusterCallback, - value: Long, - timedWriteTimeoutMs: Int - ) { + suspend fun writeBreadcrumbAttribute(value: ULong, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeBreadcrumbAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeBreadcrumbAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readBasicCommissioningInfoAttribute(callback: BasicCommissioningInfoAttributeCallback) { + suspend fun readBasicCommissioningInfoAttribute(): BasicCommissioningInfoAttribute { // Implementation needs to be added here } - fun subscribeBasicCommissioningInfoAttribute( - callback: BasicCommissioningInfoAttributeCallback, + suspend fun subscribeBasicCommissioningInfoAttribute( minInterval: Int, maxInterval: Int - ) { + ): BasicCommissioningInfoAttribute { // Implementation needs to be added here } - fun readRegulatoryConfigAttribute(callback: IntegerAttributeCallback) { + suspend fun readRegulatoryConfigAttribute(): Integer { // Implementation needs to be added here } - fun subscribeRegulatoryConfigAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeRegulatoryConfigAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readLocationCapabilityAttribute(callback: IntegerAttributeCallback) { + suspend fun readLocationCapabilityAttribute(): Integer { // Implementation needs to be added here } - fun subscribeLocationCapabilityAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeLocationCapabilityAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readSupportsConcurrentConnectionAttribute(callback: BooleanAttributeCallback) { + suspend fun readSupportsConcurrentConnectionAttribute(): Boolean { // Implementation needs to be added here } - fun subscribeSupportsConcurrentConnectionAttribute( - callback: BooleanAttributeCallback, + suspend fun subscribeSupportsConcurrentConnectionAttribute( minInterval: Int, maxInterval: Int - ) { + ): Boolean { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 48u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GeneralDiagnosticsCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GeneralDiagnosticsCluster.kt index 931f3f1904afd6..dabdd0abaebbe5 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GeneralDiagnosticsCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GeneralDiagnosticsCluster.kt @@ -20,276 +20,189 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class GeneralDiagnosticsCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 51u - } + class NetworkInterfacesAttribute( + val value: ArrayList + ) - fun testEventTrigger(callback: DefaultClusterCallback, enableKey: ByteArray, eventTrigger: Long) { - // Implementation needs to be added here - } + class ActiveHardwareFaultsAttribute(val value: ArrayList?) - fun testEventTrigger( - callback: DefaultClusterCallback, - enableKey: ByteArray, - eventTrigger: Long, - timedInvokeTimeoutMs: Int - ) { - // Implementation needs to be added here - } + class ActiveRadioFaultsAttribute(val value: ArrayList?) - interface NetworkInterfacesAttributeCallback { - fun onSuccess(value: ArrayList) + class ActiveNetworkFaultsAttribute(val value: ArrayList?) - fun onError(ex: Exception) + class GeneratedCommandListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface ActiveHardwareFaultsAttributeCallback { - fun onSuccess(value: ArrayList?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface ActiveRadioFaultsAttributeCallback { - fun onSuccess(value: ArrayList?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AcceptedCommandListAttribute(val value: ArrayList) - interface ActiveNetworkFaultsAttributeCallback { - fun onSuccess(value: ArrayList?) + class EventListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class AttributeListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun testEventTrigger(enableKey: ByteArray, eventTrigger: ULong) { + // Implementation needs to be added here } - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun testEventTrigger( + enableKey: ByteArray, + eventTrigger: ULong, + timedInvokeTimeoutMs: Int + ) { + // Implementation needs to be added here } - fun readNetworkInterfacesAttribute(callback: NetworkInterfacesAttributeCallback) { + suspend fun readNetworkInterfacesAttribute(): NetworkInterfacesAttribute { // Implementation needs to be added here } - fun subscribeNetworkInterfacesAttribute( - callback: NetworkInterfacesAttributeCallback, + suspend fun subscribeNetworkInterfacesAttribute( minInterval: Int, maxInterval: Int - ) { + ): NetworkInterfacesAttribute { // Implementation needs to be added here } - fun readRebootCountAttribute(callback: IntegerAttributeCallback) { + suspend fun readRebootCountAttribute(): Integer { // Implementation needs to be added here } - fun subscribeRebootCountAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeRebootCountAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readUpTimeAttribute(callback: LongAttributeCallback) { + suspend fun readUpTimeAttribute(): Long { // Implementation needs to be added here } - fun subscribeUpTimeAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeUpTimeAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readTotalOperationalHoursAttribute(callback: LongAttributeCallback) { + suspend fun readTotalOperationalHoursAttribute(): Long { // Implementation needs to be added here } - fun subscribeTotalOperationalHoursAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeTotalOperationalHoursAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readBootReasonAttribute(callback: IntegerAttributeCallback) { + suspend fun readBootReasonAttribute(): Integer { // Implementation needs to be added here } - fun subscribeBootReasonAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeBootReasonAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readActiveHardwareFaultsAttribute(callback: ActiveHardwareFaultsAttributeCallback) { + suspend fun readActiveHardwareFaultsAttribute(): ActiveHardwareFaultsAttribute { // Implementation needs to be added here } - fun subscribeActiveHardwareFaultsAttribute( - callback: ActiveHardwareFaultsAttributeCallback, + suspend fun subscribeActiveHardwareFaultsAttribute( minInterval: Int, maxInterval: Int - ) { + ): ActiveHardwareFaultsAttribute { // Implementation needs to be added here } - fun readActiveRadioFaultsAttribute(callback: ActiveRadioFaultsAttributeCallback) { + suspend fun readActiveRadioFaultsAttribute(): ActiveRadioFaultsAttribute { // Implementation needs to be added here } - fun subscribeActiveRadioFaultsAttribute( - callback: ActiveRadioFaultsAttributeCallback, + suspend fun subscribeActiveRadioFaultsAttribute( minInterval: Int, maxInterval: Int - ) { + ): ActiveRadioFaultsAttribute { // Implementation needs to be added here } - fun readActiveNetworkFaultsAttribute(callback: ActiveNetworkFaultsAttributeCallback) { + suspend fun readActiveNetworkFaultsAttribute(): ActiveNetworkFaultsAttribute { // Implementation needs to be added here } - fun subscribeActiveNetworkFaultsAttribute( - callback: ActiveNetworkFaultsAttributeCallback, + suspend fun subscribeActiveNetworkFaultsAttribute( minInterval: Int, maxInterval: Int - ) { + ): ActiveNetworkFaultsAttribute { // Implementation needs to be added here } - fun readTestEventTriggersEnabledAttribute(callback: BooleanAttributeCallback) { + suspend fun readTestEventTriggersEnabledAttribute(): Boolean { // Implementation needs to be added here } - fun subscribeTestEventTriggersEnabledAttribute( - callback: BooleanAttributeCallback, + suspend fun subscribeTestEventTriggersEnabledAttribute( minInterval: Int, maxInterval: Int - ) { + ): Boolean { // Implementation needs to be added here } - fun readAverageWearCountAttribute(callback: LongAttributeCallback) { + suspend fun readAverageWearCountAttribute(): Long { // Implementation needs to be added here } - fun subscribeAverageWearCountAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeAverageWearCountAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 51u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GroupKeyManagementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GroupKeyManagementCluster.kt index 724e266df3b59f..59aaa3229a279b 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GroupKeyManagementCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GroupKeyManagementCluster.kt @@ -20,266 +20,182 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class GroupKeyManagementCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 63u - } + class KeySetReadResponse(val groupKeySet: ChipStructs.GroupKeyManagementClusterGroupKeySetStruct) - fun keySetWrite( - callback: DefaultClusterCallback, - groupKeySet: ChipStructs.GroupKeyManagementClusterGroupKeySetStruct - ) { + class KeySetReadAllIndicesResponse(val groupKeySetIDs: ArrayList) + + class GroupKeyMapAttribute( + val value: ArrayList + ) + + class GroupTableAttribute( + val value: ArrayList + ) + + class GeneratedCommandListAttribute(val value: ArrayList) + + class AcceptedCommandListAttribute(val value: ArrayList) + + class EventListAttribute(val value: ArrayList) + + class AttributeListAttribute(val value: ArrayList) + + suspend fun keySetWrite(groupKeySet: ChipStructs.GroupKeyManagementClusterGroupKeySetStruct) { // Implementation needs to be added here } - fun keySetWrite( - callback: DefaultClusterCallback, + suspend fun keySetWrite( groupKeySet: ChipStructs.GroupKeyManagementClusterGroupKeySetStruct, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - fun keySetRead(callback: KeySetReadResponseCallback, groupKeySetID: Integer) { + suspend fun keySetRead(groupKeySetID: UShort): KeySetReadResponse { // Implementation needs to be added here } - fun keySetRead( - callback: KeySetReadResponseCallback, - groupKeySetID: Integer, - timedInvokeTimeoutMs: Int - ) { + suspend fun keySetRead(groupKeySetID: UShort, timedInvokeTimeoutMs: Int): KeySetReadResponse { // Implementation needs to be added here } - fun keySetRemove(callback: DefaultClusterCallback, groupKeySetID: Integer) { + suspend fun keySetRemove(groupKeySetID: UShort) { // Implementation needs to be added here } - fun keySetRemove( - callback: DefaultClusterCallback, - groupKeySetID: Integer, - timedInvokeTimeoutMs: Int - ) { + suspend fun keySetRemove(groupKeySetID: UShort, timedInvokeTimeoutMs: Int) { // Implementation needs to be added here } - fun keySetReadAllIndices(callback: KeySetReadAllIndicesResponseCallback) { + suspend fun keySetReadAllIndices(): KeySetReadAllIndicesResponse { // Implementation needs to be added here } - fun keySetReadAllIndices( - callback: KeySetReadAllIndicesResponseCallback, - timedInvokeTimeoutMs: Int - ) { + suspend fun keySetReadAllIndices(timedInvokeTimeoutMs: Int): KeySetReadAllIndicesResponse { // Implementation needs to be added here } - interface KeySetReadResponseCallback { - fun onSuccess(groupKeySet: ChipStructs.GroupKeyManagementClusterGroupKeySetStruct) - - fun onError(error: Exception) - } - - interface KeySetReadAllIndicesResponseCallback { - fun onSuccess(groupKeySetIDs: ArrayList) - - fun onError(error: Exception) - } - - interface GroupKeyMapAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GroupTableAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readGroupKeyMapAttribute(callback: GroupKeyMapAttributeCallback) { + suspend fun readGroupKeyMapAttribute(): GroupKeyMapAttribute { // Implementation needs to be added here } - fun readGroupKeyMapAttributeWithFabricFilter( - callback: GroupKeyMapAttributeCallback, + suspend fun readGroupKeyMapAttributeWithFabricFilter( isFabricFiltered: Boolean - ) { + ): GroupKeyMapAttribute { // Implementation needs to be added here } - fun writeGroupKeyMapAttribute( - callback: DefaultClusterCallback, + suspend fun writeGroupKeyMapAttribute( value: ArrayList ) { // Implementation needs to be added here } - fun writeGroupKeyMapAttribute( - callback: DefaultClusterCallback, + suspend fun writeGroupKeyMapAttribute( value: ArrayList, timedWriteTimeoutMs: Int ) { // Implementation needs to be added here } - fun subscribeGroupKeyMapAttribute( - callback: GroupKeyMapAttributeCallback, + suspend fun subscribeGroupKeyMapAttribute( minInterval: Int, maxInterval: Int - ) { + ): GroupKeyMapAttribute { // Implementation needs to be added here } - fun readGroupTableAttribute(callback: GroupTableAttributeCallback) { + suspend fun readGroupTableAttribute(): GroupTableAttribute { // Implementation needs to be added here } - fun readGroupTableAttributeWithFabricFilter( - callback: GroupTableAttributeCallback, + suspend fun readGroupTableAttributeWithFabricFilter( isFabricFiltered: Boolean - ) { + ): GroupTableAttribute { // Implementation needs to be added here } - fun subscribeGroupTableAttribute( - callback: GroupTableAttributeCallback, + suspend fun subscribeGroupTableAttribute( minInterval: Int, maxInterval: Int - ) { + ): GroupTableAttribute { // Implementation needs to be added here } - fun readMaxGroupsPerFabricAttribute(callback: IntegerAttributeCallback) { + suspend fun readMaxGroupsPerFabricAttribute(): Integer { // Implementation needs to be added here } - fun subscribeMaxGroupsPerFabricAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeMaxGroupsPerFabricAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readMaxGroupKeysPerFabricAttribute(callback: IntegerAttributeCallback) { + suspend fun readMaxGroupKeysPerFabricAttribute(): Integer { // Implementation needs to be added here } - fun subscribeMaxGroupKeysPerFabricAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeMaxGroupKeysPerFabricAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 63u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GroupsCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GroupsCluster.kt index 95af698e4a9098..53b78b37228a52 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GroupsCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GroupsCluster.kt @@ -20,216 +20,143 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class GroupsCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 4u - } + class AddGroupResponse(val status: UInt, val groupID: UShort) + + class ViewGroupResponse(val status: UInt, val groupID: UShort, val groupName: String) + + class GetGroupMembershipResponse(val capacity: UByte?, val groupList: ArrayList) + + class RemoveGroupResponse(val status: UInt, val groupID: UShort) + + class GeneratedCommandListAttribute(val value: ArrayList) - fun addGroup(callback: AddGroupResponseCallback, groupID: Integer, groupName: String) { + class AcceptedCommandListAttribute(val value: ArrayList) + + class EventListAttribute(val value: ArrayList) + + class AttributeListAttribute(val value: ArrayList) + + suspend fun addGroup(groupID: UShort, groupName: String): AddGroupResponse { // Implementation needs to be added here } - fun addGroup( - callback: AddGroupResponseCallback, - groupID: Integer, + suspend fun addGroup( + groupID: UShort, groupName: String, timedInvokeTimeoutMs: Int - ) { + ): AddGroupResponse { // Implementation needs to be added here } - fun viewGroup(callback: ViewGroupResponseCallback, groupID: Integer) { + suspend fun viewGroup(groupID: UShort): ViewGroupResponse { // Implementation needs to be added here } - fun viewGroup(callback: ViewGroupResponseCallback, groupID: Integer, timedInvokeTimeoutMs: Int) { + suspend fun viewGroup(groupID: UShort, timedInvokeTimeoutMs: Int): ViewGroupResponse { // Implementation needs to be added here } - fun getGroupMembership( - callback: GetGroupMembershipResponseCallback, - groupList: ArrayList - ) { + suspend fun getGroupMembership(groupList: ArrayList): GetGroupMembershipResponse { // Implementation needs to be added here } - fun getGroupMembership( - callback: GetGroupMembershipResponseCallback, - groupList: ArrayList, + suspend fun getGroupMembership( + groupList: ArrayList, timedInvokeTimeoutMs: Int - ) { + ): GetGroupMembershipResponse { // Implementation needs to be added here } - fun removeGroup(callback: RemoveGroupResponseCallback, groupID: Integer) { + suspend fun removeGroup(groupID: UShort): RemoveGroupResponse { // Implementation needs to be added here } - fun removeGroup( - callback: RemoveGroupResponseCallback, - groupID: Integer, - timedInvokeTimeoutMs: Int - ) { + suspend fun removeGroup(groupID: UShort, timedInvokeTimeoutMs: Int): RemoveGroupResponse { // Implementation needs to be added here } - fun removeAllGroups(callback: DefaultClusterCallback) { + suspend fun removeAllGroups() { // Implementation needs to be added here } - fun removeAllGroups(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) { + suspend fun removeAllGroups(timedInvokeTimeoutMs: Int) { // Implementation needs to be added here } - fun addGroupIfIdentifying(callback: DefaultClusterCallback, groupID: Integer, groupName: String) { + suspend fun addGroupIfIdentifying(groupID: UShort, groupName: String) { // Implementation needs to be added here } - fun addGroupIfIdentifying( - callback: DefaultClusterCallback, - groupID: Integer, - groupName: String, - timedInvokeTimeoutMs: Int - ) { + suspend fun addGroupIfIdentifying(groupID: UShort, groupName: String, timedInvokeTimeoutMs: Int) { // Implementation needs to be added here } - interface AddGroupResponseCallback { - fun onSuccess(status: Integer, groupID: Integer) - - fun onError(error: Exception) - } - - interface ViewGroupResponseCallback { - fun onSuccess(status: Integer, groupID: Integer, groupName: String) - - fun onError(error: Exception) - } - - interface GetGroupMembershipResponseCallback { - fun onSuccess(capacity: Integer?, groupList: ArrayList) - - fun onError(error: Exception) - } - - interface RemoveGroupResponseCallback { - fun onSuccess(status: Integer, groupID: Integer) - - fun onError(error: Exception) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readNameSupportAttribute(callback: IntegerAttributeCallback) { + suspend fun readNameSupportAttribute(): Integer { // Implementation needs to be added here } - fun subscribeNameSupportAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeNameSupportAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 4u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/HepaFilterMonitoringCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/HepaFilterMonitoringCluster.kt index 197ec7b96c2d35..20fc9b8bc14303 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/HepaFilterMonitoringCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/HepaFilterMonitoringCluster.kt @@ -20,221 +20,148 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class HepaFilterMonitoringCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 113u - } - - fun resetCondition(callback: DefaultClusterCallback) { - // Implementation needs to be added here - } - - fun resetCondition(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } - - interface LastChangedTimeAttributeCallback { - fun onSuccess(value: Long?) - - fun onError(ex: Exception) + class LastChangedTimeAttribute(val value: UInt?) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface ReplacementProductListAttributeCallback { - fun onSuccess( - value: ArrayList? - ) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) + class ReplacementProductListAttribute( + val value: ArrayList? + ) - fun onError(ex: Exception) + class GeneratedCommandListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AcceptedCommandListAttribute(val value: ArrayList) - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) + class EventListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class AttributeListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun resetCondition() { + // Implementation needs to be added here } - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun resetCondition(timedInvokeTimeoutMs: Int) { + // Implementation needs to be added here } - fun readConditionAttribute(callback: IntegerAttributeCallback) { + suspend fun readConditionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeConditionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeConditionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readDegradationDirectionAttribute(callback: IntegerAttributeCallback) { + suspend fun readDegradationDirectionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeDegradationDirectionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeDegradationDirectionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readChangeIndicationAttribute(callback: IntegerAttributeCallback) { + suspend fun readChangeIndicationAttribute(): Integer { // Implementation needs to be added here } - fun subscribeChangeIndicationAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeChangeIndicationAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readInPlaceIndicatorAttribute(callback: BooleanAttributeCallback) { + suspend fun readInPlaceIndicatorAttribute(): Boolean { // Implementation needs to be added here } - fun subscribeInPlaceIndicatorAttribute( - callback: BooleanAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeInPlaceIndicatorAttribute(minInterval: Int, maxInterval: Int): Boolean { // Implementation needs to be added here } - fun readLastChangedTimeAttribute(callback: LastChangedTimeAttributeCallback) { + suspend fun readLastChangedTimeAttribute(): LastChangedTimeAttribute { // Implementation needs to be added here } - fun writeLastChangedTimeAttribute(callback: DefaultClusterCallback, value: Long) { + suspend fun writeLastChangedTimeAttribute(value: UInt) { // Implementation needs to be added here } - fun writeLastChangedTimeAttribute( - callback: DefaultClusterCallback, - value: Long, - timedWriteTimeoutMs: Int - ) { + suspend fun writeLastChangedTimeAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeLastChangedTimeAttribute( - callback: LastChangedTimeAttributeCallback, + suspend fun subscribeLastChangedTimeAttribute( minInterval: Int, maxInterval: Int - ) { + ): LastChangedTimeAttribute { // Implementation needs to be added here } - fun readReplacementProductListAttribute(callback: ReplacementProductListAttributeCallback) { + suspend fun readReplacementProductListAttribute(): ReplacementProductListAttribute { // Implementation needs to be added here } - fun subscribeReplacementProductListAttribute( - callback: ReplacementProductListAttributeCallback, + suspend fun subscribeReplacementProductListAttribute( minInterval: Int, maxInterval: Int - ) { + ): ReplacementProductListAttribute { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 113u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IcdManagementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IcdManagementCluster.kt index 5356755c8cab03..9678c6c3ff79c5 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IcdManagementCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IcdManagementCluster.kt @@ -20,250 +20,199 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class IcdManagementCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 70u - } + class RegisterClientResponse(val ICDCounter: UInt) + + class RegisteredClientsAttribute( + val value: ArrayList? + ) + + class GeneratedCommandListAttribute(val value: ArrayList) + + class AcceptedCommandListAttribute(val value: ArrayList) + + class EventListAttribute(val value: ArrayList) + + class AttributeListAttribute(val value: ArrayList) - fun registerClient( - callback: RegisterClientResponseCallback, - checkInNodeID: Long, - monitoredSubject: Long, + suspend fun registerClient( + checkInNodeID: ULong, + monitoredSubject: ULong, key: ByteArray, verificationKey: ByteArray? - ) { + ): RegisterClientResponse { // Implementation needs to be added here } - fun registerClient( - callback: RegisterClientResponseCallback, - checkInNodeID: Long, - monitoredSubject: Long, + suspend fun registerClient( + checkInNodeID: ULong, + monitoredSubject: ULong, key: ByteArray, verificationKey: ByteArray?, timedInvokeTimeoutMs: Int - ) { + ): RegisterClientResponse { // Implementation needs to be added here } - fun unregisterClient( - callback: DefaultClusterCallback, - checkInNodeID: Long, - verificationKey: ByteArray? - ) { + suspend fun unregisterClient(checkInNodeID: ULong, verificationKey: ByteArray?) { // Implementation needs to be added here } - fun unregisterClient( - callback: DefaultClusterCallback, - checkInNodeID: Long, + suspend fun unregisterClient( + checkInNodeID: ULong, verificationKey: ByteArray?, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - fun stayActiveRequest(callback: DefaultClusterCallback) { + suspend fun stayActiveRequest() { // Implementation needs to be added here } - fun stayActiveRequest(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) { + suspend fun stayActiveRequest(timedInvokeTimeoutMs: Int) { // Implementation needs to be added here } - interface RegisterClientResponseCallback { - fun onSuccess(ICDCounter: Long) - - fun onError(error: Exception) - } - - interface RegisteredClientsAttributeCallback { - fun onSuccess(value: ArrayList?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun readIdleModeDurationAttribute(): Long { + // Implementation needs to be added here } - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun subscribeIdleModeDurationAttribute(minInterval: Int, maxInterval: Int): Long { + // Implementation needs to be added here } - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun readActiveModeDurationAttribute(): Long { + // Implementation needs to be added here } - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun subscribeActiveModeDurationAttribute(minInterval: Int, maxInterval: Int): Long { + // Implementation needs to be added here } - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun readActiveModeThresholdAttribute(): Integer { + // Implementation needs to be added here } - fun readIdleModeDurationAttribute(callback: LongAttributeCallback) { + suspend fun subscribeActiveModeThresholdAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun subscribeIdleModeDurationAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun readRegisteredClientsAttribute(): RegisteredClientsAttribute { // Implementation needs to be added here } - fun readActiveModeDurationAttribute(callback: LongAttributeCallback) { + suspend fun readRegisteredClientsAttributeWithFabricFilter( + isFabricFiltered: Boolean + ): RegisteredClientsAttribute { // Implementation needs to be added here } - fun subscribeActiveModeDurationAttribute( - callback: LongAttributeCallback, + suspend fun subscribeRegisteredClientsAttribute( minInterval: Int, maxInterval: Int - ) { + ): RegisteredClientsAttribute { // Implementation needs to be added here } - fun readActiveModeThresholdAttribute(callback: IntegerAttributeCallback) { - // Implementation needs to be added here - } - - fun subscribeActiveModeThresholdAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun readICDCounterAttribute(): Long { // Implementation needs to be added here } - fun readRegisteredClientsAttribute(callback: RegisteredClientsAttributeCallback) { + suspend fun subscribeICDCounterAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readRegisteredClientsAttributeWithFabricFilter( - callback: RegisteredClientsAttributeCallback, - isFabricFiltered: Boolean - ) { + suspend fun readClientsSupportedPerFabricAttribute(): Integer { // Implementation needs to be added here } - fun subscribeRegisteredClientsAttribute( - callback: RegisteredClientsAttributeCallback, + suspend fun subscribeClientsSupportedPerFabricAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readICDCounterAttribute(callback: LongAttributeCallback) { + suspend fun readUserActiveModeTriggerHintAttribute(): Long { // Implementation needs to be added here } - fun subscribeICDCounterAttribute( - callback: LongAttributeCallback, + suspend fun subscribeUserActiveModeTriggerHintAttribute( minInterval: Int, maxInterval: Int - ) { + ): Long { // Implementation needs to be added here } - fun readClientsSupportedPerFabricAttribute(callback: IntegerAttributeCallback) { + suspend fun readUserActiveModeTriggerInstructionAttribute(): CharString { // Implementation needs to be added here } - fun subscribeClientsSupportedPerFabricAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeUserActiveModeTriggerInstructionAttribute( minInterval: Int, maxInterval: Int - ) { + ): CharString { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 70u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IdentifyCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IdentifyCluster.kt index be3173b944c2f3..3c6264a693836b 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IdentifyCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IdentifyCluster.kt @@ -20,172 +20,116 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class IdentifyCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 3u - } + class GeneratedCommandListAttribute(val value: ArrayList) + + class AcceptedCommandListAttribute(val value: ArrayList) + + class EventListAttribute(val value: ArrayList) + + class AttributeListAttribute(val value: ArrayList) - fun identify(callback: DefaultClusterCallback, identifyTime: Integer) { + suspend fun identify(identifyTime: UShort) { // Implementation needs to be added here } - fun identify(callback: DefaultClusterCallback, identifyTime: Integer, timedInvokeTimeoutMs: Int) { + suspend fun identify(identifyTime: UShort, timedInvokeTimeoutMs: Int) { // Implementation needs to be added here } - fun triggerEffect( - callback: DefaultClusterCallback, - effectIdentifier: Integer, - effectVariant: Integer - ) { + suspend fun triggerEffect(effectIdentifier: UInt, effectVariant: UInt) { // Implementation needs to be added here } - fun triggerEffect( - callback: DefaultClusterCallback, - effectIdentifier: Integer, - effectVariant: Integer, + suspend fun triggerEffect( + effectIdentifier: UInt, + effectVariant: UInt, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readIdentifyTimeAttribute(callback: IntegerAttributeCallback) { + suspend fun readIdentifyTimeAttribute(): Integer { // Implementation needs to be added here } - fun writeIdentifyTimeAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeIdentifyTimeAttribute(value: UShort) { // Implementation needs to be added here } - fun writeIdentifyTimeAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeIdentifyTimeAttribute(value: UShort, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeIdentifyTimeAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeIdentifyTimeAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readIdentifyTypeAttribute(callback: IntegerAttributeCallback) { + suspend fun readIdentifyTypeAttribute(): Integer { // Implementation needs to be added here } - fun subscribeIdentifyTypeAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeIdentifyTypeAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 3u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IlluminanceMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IlluminanceMeasurementCluster.kt index ddd3a319e7954c..c2d4f98a1ef50d 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IlluminanceMeasurementCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IlluminanceMeasurementCluster.kt @@ -20,203 +20,132 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class IlluminanceMeasurementCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 1024u - } - - interface MeasuredValueAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface MinMeasuredValueAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface MaxMeasuredValueAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface LightSensorTypeAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) + class MeasuredValueAttribute(val value: UShort?) - fun onError(ex: Exception) + class MinMeasuredValueAttribute(val value: UShort?) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class MaxMeasuredValueAttribute(val value: UShort?) - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) + class LightSensorTypeAttribute(val value: UInt?) - fun onError(ex: Exception) + class GeneratedCommandListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) + class AcceptedCommandListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class EventListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AttributeListAttribute(val value: ArrayList) - fun readMeasuredValueAttribute(callback: MeasuredValueAttributeCallback) { + suspend fun readMeasuredValueAttribute(): MeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeMeasuredValueAttribute( - callback: MeasuredValueAttributeCallback, + suspend fun subscribeMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): MeasuredValueAttribute { // Implementation needs to be added here } - fun readMinMeasuredValueAttribute(callback: MinMeasuredValueAttributeCallback) { + suspend fun readMinMeasuredValueAttribute(): MinMeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeMinMeasuredValueAttribute( - callback: MinMeasuredValueAttributeCallback, + suspend fun subscribeMinMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): MinMeasuredValueAttribute { // Implementation needs to be added here } - fun readMaxMeasuredValueAttribute(callback: MaxMeasuredValueAttributeCallback) { + suspend fun readMaxMeasuredValueAttribute(): MaxMeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeMaxMeasuredValueAttribute( - callback: MaxMeasuredValueAttributeCallback, + suspend fun subscribeMaxMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): MaxMeasuredValueAttribute { // Implementation needs to be added here } - fun readToleranceAttribute(callback: IntegerAttributeCallback) { + suspend fun readToleranceAttribute(): Integer { // Implementation needs to be added here } - fun subscribeToleranceAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeToleranceAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readLightSensorTypeAttribute(callback: LightSensorTypeAttributeCallback) { + suspend fun readLightSensorTypeAttribute(): LightSensorTypeAttribute { // Implementation needs to be added here } - fun subscribeLightSensorTypeAttribute( - callback: LightSensorTypeAttributeCallback, + suspend fun subscribeLightSensorTypeAttribute( minInterval: Int, maxInterval: Int - ) { + ): LightSensorTypeAttribute { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 1024u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/KeypadInputCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/KeypadInputCluster.kt index cb3b2175937043..cbb6b3e62dff98 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/KeypadInputCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/KeypadInputCluster.kt @@ -20,125 +20,82 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class KeypadInputCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 1289u - } - - fun sendKey(callback: SendKeyResponseCallback, keyCode: Integer) { - // Implementation needs to be added here - } - - fun sendKey(callback: SendKeyResponseCallback, keyCode: Integer, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } - - interface SendKeyResponseCallback { - fun onSuccess(status: Integer) - - fun onError(error: Exception) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class SendKeyResponse(val status: UInt) - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) + class GeneratedCommandListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class AcceptedCommandListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) + class EventListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class AttributeListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun sendKey(keyCode: UInt): SendKeyResponse { + // Implementation needs to be added here } - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun sendKey(keyCode: UInt, timedInvokeTimeoutMs: Int): SendKeyResponse { + // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 1289u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LaundryWasherControlsCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LaundryWasherControlsCluster.kt index 525094a60feb69..f2906fd080f351 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LaundryWasherControlsCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LaundryWasherControlsCluster.kt @@ -20,207 +20,135 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class LaundryWasherControlsCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 83u - } - - interface SpinSpeedsAttributeCallback { - fun onSuccess(value: ArrayList?) - - fun onError(ex: Exception) + class SpinSpeedsAttribute(val value: ArrayList?) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface SpinSpeedCurrentAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class SpinSpeedCurrentAttribute(val value: UByte?) - interface SupportedRinsesAttributeCallback { - fun onSuccess(value: ArrayList?) + class SupportedRinsesAttribute(val value: ArrayList?) - fun onError(ex: Exception) + class GeneratedCommandListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AcceptedCommandListAttribute(val value: ArrayList) - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) + class EventListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class AttributeListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readSpinSpeedsAttribute(callback: SpinSpeedsAttributeCallback) { + suspend fun readSpinSpeedsAttribute(): SpinSpeedsAttribute { // Implementation needs to be added here } - fun subscribeSpinSpeedsAttribute( - callback: SpinSpeedsAttributeCallback, + suspend fun subscribeSpinSpeedsAttribute( minInterval: Int, maxInterval: Int - ) { + ): SpinSpeedsAttribute { // Implementation needs to be added here } - fun readSpinSpeedCurrentAttribute(callback: SpinSpeedCurrentAttributeCallback) { + suspend fun readSpinSpeedCurrentAttribute(): SpinSpeedCurrentAttribute { // Implementation needs to be added here } - fun writeSpinSpeedCurrentAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeSpinSpeedCurrentAttribute(value: UByte) { // Implementation needs to be added here } - fun writeSpinSpeedCurrentAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeSpinSpeedCurrentAttribute(value: UByte, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeSpinSpeedCurrentAttribute( - callback: SpinSpeedCurrentAttributeCallback, + suspend fun subscribeSpinSpeedCurrentAttribute( minInterval: Int, maxInterval: Int - ) { + ): SpinSpeedCurrentAttribute { // Implementation needs to be added here } - fun readNumberOfRinsesAttribute(callback: IntegerAttributeCallback) { + suspend fun readNumberOfRinsesAttribute(): Integer { // Implementation needs to be added here } - fun writeNumberOfRinsesAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeNumberOfRinsesAttribute(value: UInt) { // Implementation needs to be added here } - fun writeNumberOfRinsesAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeNumberOfRinsesAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeNumberOfRinsesAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeNumberOfRinsesAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readSupportedRinsesAttribute(callback: SupportedRinsesAttributeCallback) { + suspend fun readSupportedRinsesAttribute(): SupportedRinsesAttribute { // Implementation needs to be added here } - fun subscribeSupportedRinsesAttribute( - callback: SupportedRinsesAttributeCallback, + suspend fun subscribeSupportedRinsesAttribute( minInterval: Int, maxInterval: Int - ) { + ): SupportedRinsesAttribute { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 83u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LaundryWasherModeCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LaundryWasherModeCluster.kt index 0064e8588a5bc3..6a13b78d10ef32 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LaundryWasherModeCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LaundryWasherModeCluster.kt @@ -20,225 +20,144 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class LaundryWasherModeCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 81u - } - - fun changeToMode(callback: ChangeToModeResponseCallback, newMode: Integer) { - // Implementation needs to be added here - } + class ChangeToModeResponse(val status: UInt, val statusText: String?) - fun changeToMode( - callback: ChangeToModeResponseCallback, - newMode: Integer, - timedInvokeTimeoutMs: Int - ) { - // Implementation needs to be added here - } - - interface ChangeToModeResponseCallback { - fun onSuccess(status: Integer, statusText: String?) + class SupportedModesAttribute( + val value: ArrayList + ) - fun onError(error: Exception) - } - - interface SupportedModesAttributeCallback { - fun onSuccess(value: ArrayList) + class StartUpModeAttribute(val value: UByte?) - fun onError(ex: Exception) + class OnModeAttribute(val value: UByte?) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class GeneratedCommandListAttribute(val value: ArrayList) - interface StartUpModeAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface OnModeAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AcceptedCommandListAttribute(val value: ArrayList) - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) + class EventListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class AttributeListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun changeToMode(newMode: UByte): ChangeToModeResponse { + // Implementation needs to be added here } - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun changeToMode(newMode: UByte, timedInvokeTimeoutMs: Int): ChangeToModeResponse { + // Implementation needs to be added here } - fun readSupportedModesAttribute(callback: SupportedModesAttributeCallback) { + suspend fun readSupportedModesAttribute(): SupportedModesAttribute { // Implementation needs to be added here } - fun subscribeSupportedModesAttribute( - callback: SupportedModesAttributeCallback, + suspend fun subscribeSupportedModesAttribute( minInterval: Int, maxInterval: Int - ) { + ): SupportedModesAttribute { // Implementation needs to be added here } - fun readCurrentModeAttribute(callback: IntegerAttributeCallback) { + suspend fun readCurrentModeAttribute(): Integer { // Implementation needs to be added here } - fun subscribeCurrentModeAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeCurrentModeAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readStartUpModeAttribute(callback: StartUpModeAttributeCallback) { + suspend fun readStartUpModeAttribute(): StartUpModeAttribute { // Implementation needs to be added here } - fun writeStartUpModeAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeStartUpModeAttribute(value: UByte) { // Implementation needs to be added here } - fun writeStartUpModeAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeStartUpModeAttribute(value: UByte, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeStartUpModeAttribute( - callback: StartUpModeAttributeCallback, + suspend fun subscribeStartUpModeAttribute( minInterval: Int, maxInterval: Int - ) { + ): StartUpModeAttribute { // Implementation needs to be added here } - fun readOnModeAttribute(callback: OnModeAttributeCallback) { + suspend fun readOnModeAttribute(): OnModeAttribute { // Implementation needs to be added here } - fun writeOnModeAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeOnModeAttribute(value: UByte) { // Implementation needs to be added here } - fun writeOnModeAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeOnModeAttribute(value: UByte, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeOnModeAttribute( - callback: OnModeAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeOnModeAttribute(minInterval: Int, maxInterval: Int): OnModeAttribute { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 81u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LevelControlCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LevelControlCluster.kt index fd0c0ecd34dc6c..10b579a79f0f50 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LevelControlCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LevelControlCluster.kt @@ -20,583 +20,404 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class LevelControlCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 8u - } + class CurrentLevelAttribute(val value: UByte?) + + class OnLevelAttribute(val value: UByte?) + + class OnTransitionTimeAttribute(val value: UShort?) + + class OffTransitionTimeAttribute(val value: UShort?) + + class DefaultMoveRateAttribute(val value: UByte?) + + class StartUpCurrentLevelAttribute(val value: UByte?) - fun moveToLevel( - callback: DefaultClusterCallback, - level: Integer, - transitionTime: Integer?, - optionsMask: Integer, - optionsOverride: Integer + class GeneratedCommandListAttribute(val value: ArrayList) + + class AcceptedCommandListAttribute(val value: ArrayList) + + class EventListAttribute(val value: ArrayList) + + class AttributeListAttribute(val value: ArrayList) + + suspend fun moveToLevel( + level: UByte, + transitionTime: UShort?, + optionsMask: UInt, + optionsOverride: UInt ) { // Implementation needs to be added here } - fun moveToLevel( - callback: DefaultClusterCallback, - level: Integer, - transitionTime: Integer?, - optionsMask: Integer, - optionsOverride: Integer, + suspend fun moveToLevel( + level: UByte, + transitionTime: UShort?, + optionsMask: UInt, + optionsOverride: UInt, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - fun move( - callback: DefaultClusterCallback, - moveMode: Integer, - rate: Integer?, - optionsMask: Integer, - optionsOverride: Integer - ) { + suspend fun move(moveMode: UInt, rate: UByte?, optionsMask: UInt, optionsOverride: UInt) { // Implementation needs to be added here } - fun move( - callback: DefaultClusterCallback, - moveMode: Integer, - rate: Integer?, - optionsMask: Integer, - optionsOverride: Integer, + suspend fun move( + moveMode: UInt, + rate: UByte?, + optionsMask: UInt, + optionsOverride: UInt, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - fun step( - callback: DefaultClusterCallback, - stepMode: Integer, - stepSize: Integer, - transitionTime: Integer?, - optionsMask: Integer, - optionsOverride: Integer + suspend fun step( + stepMode: UInt, + stepSize: UByte, + transitionTime: UShort?, + optionsMask: UInt, + optionsOverride: UInt ) { // Implementation needs to be added here } - fun step( - callback: DefaultClusterCallback, - stepMode: Integer, - stepSize: Integer, - transitionTime: Integer?, - optionsMask: Integer, - optionsOverride: Integer, + suspend fun step( + stepMode: UInt, + stepSize: UByte, + transitionTime: UShort?, + optionsMask: UInt, + optionsOverride: UInt, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - fun stop(callback: DefaultClusterCallback, optionsMask: Integer, optionsOverride: Integer) { + suspend fun stop(optionsMask: UInt, optionsOverride: UInt) { // Implementation needs to be added here } - fun stop( - callback: DefaultClusterCallback, - optionsMask: Integer, - optionsOverride: Integer, - timedInvokeTimeoutMs: Int - ) { + suspend fun stop(optionsMask: UInt, optionsOverride: UInt, timedInvokeTimeoutMs: Int) { // Implementation needs to be added here } - fun moveToLevelWithOnOff( - callback: DefaultClusterCallback, - level: Integer, - transitionTime: Integer?, - optionsMask: Integer, - optionsOverride: Integer + suspend fun moveToLevelWithOnOff( + level: UByte, + transitionTime: UShort?, + optionsMask: UInt, + optionsOverride: UInt ) { // Implementation needs to be added here } - fun moveToLevelWithOnOff( - callback: DefaultClusterCallback, - level: Integer, - transitionTime: Integer?, - optionsMask: Integer, - optionsOverride: Integer, + suspend fun moveToLevelWithOnOff( + level: UByte, + transitionTime: UShort?, + optionsMask: UInt, + optionsOverride: UInt, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - fun moveWithOnOff( - callback: DefaultClusterCallback, - moveMode: Integer, - rate: Integer?, - optionsMask: Integer, - optionsOverride: Integer + suspend fun moveWithOnOff( + moveMode: UInt, + rate: UByte?, + optionsMask: UInt, + optionsOverride: UInt ) { // Implementation needs to be added here } - fun moveWithOnOff( - callback: DefaultClusterCallback, - moveMode: Integer, - rate: Integer?, - optionsMask: Integer, - optionsOverride: Integer, + suspend fun moveWithOnOff( + moveMode: UInt, + rate: UByte?, + optionsMask: UInt, + optionsOverride: UInt, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - fun stepWithOnOff( - callback: DefaultClusterCallback, - stepMode: Integer, - stepSize: Integer, - transitionTime: Integer?, - optionsMask: Integer, - optionsOverride: Integer + suspend fun stepWithOnOff( + stepMode: UInt, + stepSize: UByte, + transitionTime: UShort?, + optionsMask: UInt, + optionsOverride: UInt ) { // Implementation needs to be added here } - fun stepWithOnOff( - callback: DefaultClusterCallback, - stepMode: Integer, - stepSize: Integer, - transitionTime: Integer?, - optionsMask: Integer, - optionsOverride: Integer, + suspend fun stepWithOnOff( + stepMode: UInt, + stepSize: UByte, + transitionTime: UShort?, + optionsMask: UInt, + optionsOverride: UInt, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - fun stopWithOnOff( - callback: DefaultClusterCallback, - optionsMask: Integer, - optionsOverride: Integer - ) { + suspend fun stopWithOnOff(optionsMask: UInt, optionsOverride: UInt) { // Implementation needs to be added here } - fun stopWithOnOff( - callback: DefaultClusterCallback, - optionsMask: Integer, - optionsOverride: Integer, - timedInvokeTimeoutMs: Int - ) { + suspend fun stopWithOnOff(optionsMask: UInt, optionsOverride: UInt, timedInvokeTimeoutMs: Int) { // Implementation needs to be added here } - fun moveToClosestFrequency(callback: DefaultClusterCallback, frequency: Integer) { + suspend fun moveToClosestFrequency(frequency: UShort) { // Implementation needs to be added here } - fun moveToClosestFrequency( - callback: DefaultClusterCallback, - frequency: Integer, - timedInvokeTimeoutMs: Int - ) { + suspend fun moveToClosestFrequency(frequency: UShort, timedInvokeTimeoutMs: Int) { // Implementation needs to be added here } - interface CurrentLevelAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface OnLevelAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface OnTransitionTimeAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface OffTransitionTimeAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface DefaultMoveRateAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface StartUpCurrentLevelAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readCurrentLevelAttribute(callback: CurrentLevelAttributeCallback) { + suspend fun readCurrentLevelAttribute(): CurrentLevelAttribute { // Implementation needs to be added here } - fun subscribeCurrentLevelAttribute( - callback: CurrentLevelAttributeCallback, + suspend fun subscribeCurrentLevelAttribute( minInterval: Int, maxInterval: Int - ) { + ): CurrentLevelAttribute { // Implementation needs to be added here } - fun readRemainingTimeAttribute(callback: IntegerAttributeCallback) { + suspend fun readRemainingTimeAttribute(): Integer { // Implementation needs to be added here } - fun subscribeRemainingTimeAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeRemainingTimeAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readMinLevelAttribute(callback: IntegerAttributeCallback) { + suspend fun readMinLevelAttribute(): Integer { // Implementation needs to be added here } - fun subscribeMinLevelAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeMinLevelAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readMaxLevelAttribute(callback: IntegerAttributeCallback) { + suspend fun readMaxLevelAttribute(): Integer { // Implementation needs to be added here } - fun subscribeMaxLevelAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeMaxLevelAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readCurrentFrequencyAttribute(callback: IntegerAttributeCallback) { + suspend fun readCurrentFrequencyAttribute(): Integer { // Implementation needs to be added here } - fun subscribeCurrentFrequencyAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeCurrentFrequencyAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readMinFrequencyAttribute(callback: IntegerAttributeCallback) { + suspend fun readMinFrequencyAttribute(): Integer { // Implementation needs to be added here } - fun subscribeMinFrequencyAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeMinFrequencyAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readMaxFrequencyAttribute(callback: IntegerAttributeCallback) { + suspend fun readMaxFrequencyAttribute(): Integer { // Implementation needs to be added here } - fun subscribeMaxFrequencyAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeMaxFrequencyAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readOptionsAttribute(callback: IntegerAttributeCallback) { + suspend fun readOptionsAttribute(): Integer { // Implementation needs to be added here } - fun writeOptionsAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeOptionsAttribute(value: UInt) { // Implementation needs to be added here } - fun writeOptionsAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeOptionsAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeOptionsAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeOptionsAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readOnOffTransitionTimeAttribute(callback: IntegerAttributeCallback) { + suspend fun readOnOffTransitionTimeAttribute(): Integer { // Implementation needs to be added here } - fun writeOnOffTransitionTimeAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeOnOffTransitionTimeAttribute(value: UShort) { // Implementation needs to be added here } - fun writeOnOffTransitionTimeAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeOnOffTransitionTimeAttribute(value: UShort, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeOnOffTransitionTimeAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeOnOffTransitionTimeAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readOnLevelAttribute(callback: OnLevelAttributeCallback) { + suspend fun readOnLevelAttribute(): OnLevelAttribute { // Implementation needs to be added here } - fun writeOnLevelAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeOnLevelAttribute(value: UByte) { // Implementation needs to be added here } - fun writeOnLevelAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeOnLevelAttribute(value: UByte, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeOnLevelAttribute( - callback: OnLevelAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeOnLevelAttribute(minInterval: Int, maxInterval: Int): OnLevelAttribute { // Implementation needs to be added here } - fun readOnTransitionTimeAttribute(callback: OnTransitionTimeAttributeCallback) { + suspend fun readOnTransitionTimeAttribute(): OnTransitionTimeAttribute { // Implementation needs to be added here } - fun writeOnTransitionTimeAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeOnTransitionTimeAttribute(value: UShort) { // Implementation needs to be added here } - fun writeOnTransitionTimeAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeOnTransitionTimeAttribute(value: UShort, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeOnTransitionTimeAttribute( - callback: OnTransitionTimeAttributeCallback, + suspend fun subscribeOnTransitionTimeAttribute( minInterval: Int, maxInterval: Int - ) { + ): OnTransitionTimeAttribute { // Implementation needs to be added here } - fun readOffTransitionTimeAttribute(callback: OffTransitionTimeAttributeCallback) { + suspend fun readOffTransitionTimeAttribute(): OffTransitionTimeAttribute { // Implementation needs to be added here } - fun writeOffTransitionTimeAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeOffTransitionTimeAttribute(value: UShort) { // Implementation needs to be added here } - fun writeOffTransitionTimeAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeOffTransitionTimeAttribute(value: UShort, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeOffTransitionTimeAttribute( - callback: OffTransitionTimeAttributeCallback, + suspend fun subscribeOffTransitionTimeAttribute( minInterval: Int, maxInterval: Int - ) { + ): OffTransitionTimeAttribute { // Implementation needs to be added here } - fun readDefaultMoveRateAttribute(callback: DefaultMoveRateAttributeCallback) { + suspend fun readDefaultMoveRateAttribute(): DefaultMoveRateAttribute { // Implementation needs to be added here } - fun writeDefaultMoveRateAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeDefaultMoveRateAttribute(value: UByte) { // Implementation needs to be added here } - fun writeDefaultMoveRateAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeDefaultMoveRateAttribute(value: UByte, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeDefaultMoveRateAttribute( - callback: DefaultMoveRateAttributeCallback, + suspend fun subscribeDefaultMoveRateAttribute( minInterval: Int, maxInterval: Int - ) { + ): DefaultMoveRateAttribute { // Implementation needs to be added here } - fun readStartUpCurrentLevelAttribute(callback: StartUpCurrentLevelAttributeCallback) { + suspend fun readStartUpCurrentLevelAttribute(): StartUpCurrentLevelAttribute { // Implementation needs to be added here } - fun writeStartUpCurrentLevelAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeStartUpCurrentLevelAttribute(value: UByte) { // Implementation needs to be added here } - fun writeStartUpCurrentLevelAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeStartUpCurrentLevelAttribute(value: UByte, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeStartUpCurrentLevelAttribute( - callback: StartUpCurrentLevelAttributeCallback, + suspend fun subscribeStartUpCurrentLevelAttribute( minInterval: Int, maxInterval: Int - ) { + ): StartUpCurrentLevelAttribute { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 8u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LocalizationConfigurationCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LocalizationConfigurationCluster.kt index f83ccd57f56f5d..e09a9092d6e38a 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LocalizationConfigurationCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LocalizationConfigurationCluster.kt @@ -20,155 +20,101 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class LocalizationConfigurationCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 43u - } - - interface SupportedLocalesAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) + class SupportedLocalesAttribute(val value: ArrayList) - fun onError(ex: Exception) + class GeneratedCommandListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) + class AcceptedCommandListAttribute(val value: ArrayList) - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class EventListAttribute(val value: ArrayList) - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) + class AttributeListAttribute(val value: ArrayList) - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readActiveLocaleAttribute(callback: CharStringAttributeCallback) { + suspend fun readActiveLocaleAttribute(): CharString { // Implementation needs to be added here } - fun writeActiveLocaleAttribute(callback: DefaultClusterCallback, value: String) { + suspend fun writeActiveLocaleAttribute(value: String) { // Implementation needs to be added here } - fun writeActiveLocaleAttribute( - callback: DefaultClusterCallback, - value: String, - timedWriteTimeoutMs: Int - ) { + suspend fun writeActiveLocaleAttribute(value: String, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeActiveLocaleAttribute( - callback: CharStringAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeActiveLocaleAttribute(minInterval: Int, maxInterval: Int): CharString { // Implementation needs to be added here } - fun readSupportedLocalesAttribute(callback: SupportedLocalesAttributeCallback) { + suspend fun readSupportedLocalesAttribute(): SupportedLocalesAttribute { // Implementation needs to be added here } - fun subscribeSupportedLocalesAttribute( - callback: SupportedLocalesAttributeCallback, + suspend fun subscribeSupportedLocalesAttribute( minInterval: Int, maxInterval: Int - ) { + ): SupportedLocalesAttribute { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 43u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LowPowerCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LowPowerCluster.kt index b21f9f213b3bf0..3e60dd2206919d 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LowPowerCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LowPowerCluster.kt @@ -20,119 +20,80 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class LowPowerCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 1288u - } - - fun sleep(callback: DefaultClusterCallback) { - // Implementation needs to be added here - } - - fun sleep(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) + class GeneratedCommandListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AcceptedCommandListAttribute(val value: ArrayList) - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) + class EventListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class AttributeListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun sleep() { + // Implementation needs to be added here } - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun sleep(timedInvokeTimeoutMs: Int) { + // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 1288u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MediaInputCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MediaInputCluster.kt index 27482138fe32a0..7bc5bf60d0cb97 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MediaInputCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MediaInputCluster.kt @@ -20,180 +20,122 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class MediaInputCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 1287u - } + class InputListAttribute(val value: ArrayList) - fun selectInput(callback: DefaultClusterCallback, index: Integer) { - // Implementation needs to be added here - } + class GeneratedCommandListAttribute(val value: ArrayList) - fun selectInput(callback: DefaultClusterCallback, index: Integer, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } + class AcceptedCommandListAttribute(val value: ArrayList) - fun showInputStatus(callback: DefaultClusterCallback) { - // Implementation needs to be added here - } + class EventListAttribute(val value: ArrayList) - fun showInputStatus(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } + class AttributeListAttribute(val value: ArrayList) - fun hideInputStatus(callback: DefaultClusterCallback) { + suspend fun selectInput(index: UByte) { // Implementation needs to be added here } - fun hideInputStatus(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) { + suspend fun selectInput(index: UByte, timedInvokeTimeoutMs: Int) { // Implementation needs to be added here } - fun renameInput(callback: DefaultClusterCallback, index: Integer, name: String) { + suspend fun showInputStatus() { // Implementation needs to be added here } - fun renameInput( - callback: DefaultClusterCallback, - index: Integer, - name: String, - timedInvokeTimeoutMs: Int - ) { + suspend fun showInputStatus(timedInvokeTimeoutMs: Int) { // Implementation needs to be added here } - interface InputListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun hideInputStatus() { + // Implementation needs to be added here } - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun hideInputStatus(timedInvokeTimeoutMs: Int) { + // Implementation needs to be added here } - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun renameInput(index: UByte, name: String) { + // Implementation needs to be added here } - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun renameInput(index: UByte, name: String, timedInvokeTimeoutMs: Int) { + // Implementation needs to be added here } - fun readInputListAttribute(callback: InputListAttributeCallback) { + suspend fun readInputListAttribute(): InputListAttribute { // Implementation needs to be added here } - fun subscribeInputListAttribute( - callback: InputListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeInputListAttribute(minInterval: Int, maxInterval: Int): InputListAttribute { // Implementation needs to be added here } - fun readCurrentInputAttribute(callback: IntegerAttributeCallback) { + suspend fun readCurrentInputAttribute(): Integer { // Implementation needs to be added here } - fun subscribeCurrentInputAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeCurrentInputAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 1287u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MediaPlaybackCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MediaPlaybackCluster.kt index cfceceef431065..53990b4f12c416 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MediaPlaybackCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MediaPlaybackCluster.kt @@ -20,337 +20,245 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class MediaPlaybackCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 1286u - } + class PlaybackResponse(val status: UInt, val data: String?) + + class StartTimeAttribute(val value: ULong?) + + class DurationAttribute(val value: ULong?) + + class SampledPositionAttribute( + val value: ChipStructs.MediaPlaybackClusterPlaybackPositionStruct? + ) + + class SeekRangeEndAttribute(val value: ULong?) + + class SeekRangeStartAttribute(val value: ULong?) + + class GeneratedCommandListAttribute(val value: ArrayList) - fun play(callback: PlaybackResponseCallback) { + class AcceptedCommandListAttribute(val value: ArrayList) + + class EventListAttribute(val value: ArrayList) + + class AttributeListAttribute(val value: ArrayList) + + suspend fun play(): PlaybackResponse { // Implementation needs to be added here } - fun play(callback: PlaybackResponseCallback, timedInvokeTimeoutMs: Int) { + suspend fun play(timedInvokeTimeoutMs: Int): PlaybackResponse { // Implementation needs to be added here } - fun pause(callback: PlaybackResponseCallback) { + suspend fun pause(): PlaybackResponse { // Implementation needs to be added here } - fun pause(callback: PlaybackResponseCallback, timedInvokeTimeoutMs: Int) { + suspend fun pause(timedInvokeTimeoutMs: Int): PlaybackResponse { // Implementation needs to be added here } - fun stop(callback: PlaybackResponseCallback) { + suspend fun stop(): PlaybackResponse { // Implementation needs to be added here } - fun stop(callback: PlaybackResponseCallback, timedInvokeTimeoutMs: Int) { + suspend fun stop(timedInvokeTimeoutMs: Int): PlaybackResponse { // Implementation needs to be added here } - fun startOver(callback: PlaybackResponseCallback) { + suspend fun startOver(): PlaybackResponse { // Implementation needs to be added here } - fun startOver(callback: PlaybackResponseCallback, timedInvokeTimeoutMs: Int) { + suspend fun startOver(timedInvokeTimeoutMs: Int): PlaybackResponse { // Implementation needs to be added here } - fun previous(callback: PlaybackResponseCallback) { + suspend fun previous(): PlaybackResponse { // Implementation needs to be added here } - fun previous(callback: PlaybackResponseCallback, timedInvokeTimeoutMs: Int) { + suspend fun previous(timedInvokeTimeoutMs: Int): PlaybackResponse { // Implementation needs to be added here } - fun next(callback: PlaybackResponseCallback) { + suspend fun next(): PlaybackResponse { // Implementation needs to be added here } - fun next(callback: PlaybackResponseCallback, timedInvokeTimeoutMs: Int) { + suspend fun next(timedInvokeTimeoutMs: Int): PlaybackResponse { // Implementation needs to be added here } - fun rewind(callback: PlaybackResponseCallback) { + suspend fun rewind(): PlaybackResponse { // Implementation needs to be added here } - fun rewind(callback: PlaybackResponseCallback, timedInvokeTimeoutMs: Int) { + suspend fun rewind(timedInvokeTimeoutMs: Int): PlaybackResponse { // Implementation needs to be added here } - fun fastForward(callback: PlaybackResponseCallback) { + suspend fun fastForward(): PlaybackResponse { // Implementation needs to be added here } - fun fastForward(callback: PlaybackResponseCallback, timedInvokeTimeoutMs: Int) { + suspend fun fastForward(timedInvokeTimeoutMs: Int): PlaybackResponse { // Implementation needs to be added here } - fun skipForward(callback: PlaybackResponseCallback, deltaPositionMilliseconds: Long) { + suspend fun skipForward(deltaPositionMilliseconds: ULong): PlaybackResponse { // Implementation needs to be added here } - fun skipForward( - callback: PlaybackResponseCallback, - deltaPositionMilliseconds: Long, + suspend fun skipForward( + deltaPositionMilliseconds: ULong, timedInvokeTimeoutMs: Int - ) { + ): PlaybackResponse { // Implementation needs to be added here } - fun skipBackward(callback: PlaybackResponseCallback, deltaPositionMilliseconds: Long) { + suspend fun skipBackward(deltaPositionMilliseconds: ULong): PlaybackResponse { // Implementation needs to be added here } - fun skipBackward( - callback: PlaybackResponseCallback, - deltaPositionMilliseconds: Long, + suspend fun skipBackward( + deltaPositionMilliseconds: ULong, timedInvokeTimeoutMs: Int - ) { + ): PlaybackResponse { // Implementation needs to be added here } - fun seek(callback: PlaybackResponseCallback, position: Long) { + suspend fun seek(position: ULong): PlaybackResponse { // Implementation needs to be added here } - fun seek(callback: PlaybackResponseCallback, position: Long, timedInvokeTimeoutMs: Int) { + suspend fun seek(position: ULong, timedInvokeTimeoutMs: Int): PlaybackResponse { // Implementation needs to be added here } - interface PlaybackResponseCallback { - fun onSuccess(status: Integer, data: String?) - - fun onError(error: Exception) - } - - interface StartTimeAttributeCallback { - fun onSuccess(value: Long?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface DurationAttributeCallback { - fun onSuccess(value: Long?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface SampledPositionAttributeCallback { - fun onSuccess(value: ChipStructs.MediaPlaybackClusterPlaybackPositionStruct?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface SeekRangeEndAttributeCallback { - fun onSuccess(value: Long?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface SeekRangeStartAttributeCallback { - fun onSuccess(value: Long?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readCurrentStateAttribute(callback: IntegerAttributeCallback) { + suspend fun readCurrentStateAttribute(): Integer { // Implementation needs to be added here } - fun subscribeCurrentStateAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeCurrentStateAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readStartTimeAttribute(callback: StartTimeAttributeCallback) { + suspend fun readStartTimeAttribute(): StartTimeAttribute { // Implementation needs to be added here } - fun subscribeStartTimeAttribute( - callback: StartTimeAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeStartTimeAttribute(minInterval: Int, maxInterval: Int): StartTimeAttribute { // Implementation needs to be added here } - fun readDurationAttribute(callback: DurationAttributeCallback) { + suspend fun readDurationAttribute(): DurationAttribute { // Implementation needs to be added here } - fun subscribeDurationAttribute( - callback: DurationAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeDurationAttribute(minInterval: Int, maxInterval: Int): DurationAttribute { // Implementation needs to be added here } - fun readSampledPositionAttribute(callback: SampledPositionAttributeCallback) { + suspend fun readSampledPositionAttribute(): SampledPositionAttribute { // Implementation needs to be added here } - fun subscribeSampledPositionAttribute( - callback: SampledPositionAttributeCallback, + suspend fun subscribeSampledPositionAttribute( minInterval: Int, maxInterval: Int - ) { + ): SampledPositionAttribute { // Implementation needs to be added here } - fun readPlaybackSpeedAttribute(callback: FloatAttributeCallback) { + suspend fun readPlaybackSpeedAttribute(): Float { // Implementation needs to be added here } - fun subscribePlaybackSpeedAttribute( - callback: FloatAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribePlaybackSpeedAttribute(minInterval: Int, maxInterval: Int): Float { // Implementation needs to be added here } - fun readSeekRangeEndAttribute(callback: SeekRangeEndAttributeCallback) { + suspend fun readSeekRangeEndAttribute(): SeekRangeEndAttribute { // Implementation needs to be added here } - fun subscribeSeekRangeEndAttribute( - callback: SeekRangeEndAttributeCallback, + suspend fun subscribeSeekRangeEndAttribute( minInterval: Int, maxInterval: Int - ) { + ): SeekRangeEndAttribute { // Implementation needs to be added here } - fun readSeekRangeStartAttribute(callback: SeekRangeStartAttributeCallback) { + suspend fun readSeekRangeStartAttribute(): SeekRangeStartAttribute { // Implementation needs to be added here } - fun subscribeSeekRangeStartAttribute( - callback: SeekRangeStartAttributeCallback, + suspend fun subscribeSeekRangeStartAttribute( minInterval: Int, maxInterval: Int - ) { + ): SeekRangeStartAttribute { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 1286u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ModeSelectCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ModeSelectCluster.kt index a54d83e4866bba..f6439d6d367d6f 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ModeSelectCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ModeSelectCluster.kt @@ -20,247 +20,163 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class ModeSelectCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 80u - } - - fun changeToMode(callback: DefaultClusterCallback, newMode: Integer) { - // Implementation needs to be added here - } - - fun changeToMode(callback: DefaultClusterCallback, newMode: Integer, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } - - interface StandardNamespaceAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface SupportedModesAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface StartUpModeAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface OnModeAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) + class StandardNamespaceAttribute(val value: UInt?) - fun onError(ex: Exception) + class SupportedModesAttribute( + val value: ArrayList + ) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class StartUpModeAttribute(val value: UByte?) - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) + class OnModeAttribute(val value: UByte?) - fun onError(ex: Exception) + class GeneratedCommandListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AcceptedCommandListAttribute(val value: ArrayList) - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) + class EventListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class AttributeListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun changeToMode(newMode: UByte) { + // Implementation needs to be added here } - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun changeToMode(newMode: UByte, timedInvokeTimeoutMs: Int) { + // Implementation needs to be added here } - fun readDescriptionAttribute(callback: CharStringAttributeCallback) { + suspend fun readDescriptionAttribute(): CharString { // Implementation needs to be added here } - fun subscribeDescriptionAttribute( - callback: CharStringAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeDescriptionAttribute(minInterval: Int, maxInterval: Int): CharString { // Implementation needs to be added here } - fun readStandardNamespaceAttribute(callback: StandardNamespaceAttributeCallback) { + suspend fun readStandardNamespaceAttribute(): StandardNamespaceAttribute { // Implementation needs to be added here } - fun subscribeStandardNamespaceAttribute( - callback: StandardNamespaceAttributeCallback, + suspend fun subscribeStandardNamespaceAttribute( minInterval: Int, maxInterval: Int - ) { + ): StandardNamespaceAttribute { // Implementation needs to be added here } - fun readSupportedModesAttribute(callback: SupportedModesAttributeCallback) { + suspend fun readSupportedModesAttribute(): SupportedModesAttribute { // Implementation needs to be added here } - fun subscribeSupportedModesAttribute( - callback: SupportedModesAttributeCallback, + suspend fun subscribeSupportedModesAttribute( minInterval: Int, maxInterval: Int - ) { + ): SupportedModesAttribute { // Implementation needs to be added here } - fun readCurrentModeAttribute(callback: IntegerAttributeCallback) { + suspend fun readCurrentModeAttribute(): Integer { // Implementation needs to be added here } - fun subscribeCurrentModeAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeCurrentModeAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readStartUpModeAttribute(callback: StartUpModeAttributeCallback) { + suspend fun readStartUpModeAttribute(): StartUpModeAttribute { // Implementation needs to be added here } - fun writeStartUpModeAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeStartUpModeAttribute(value: UByte) { // Implementation needs to be added here } - fun writeStartUpModeAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeStartUpModeAttribute(value: UByte, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeStartUpModeAttribute( - callback: StartUpModeAttributeCallback, + suspend fun subscribeStartUpModeAttribute( minInterval: Int, maxInterval: Int - ) { + ): StartUpModeAttribute { // Implementation needs to be added here } - fun readOnModeAttribute(callback: OnModeAttributeCallback) { + suspend fun readOnModeAttribute(): OnModeAttribute { // Implementation needs to be added here } - fun writeOnModeAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeOnModeAttribute(value: UByte) { // Implementation needs to be added here } - fun writeOnModeAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeOnModeAttribute(value: UByte, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeOnModeAttribute( - callback: OnModeAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeOnModeAttribute(minInterval: Int, maxInterval: Int): OnModeAttribute { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 80u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/NetworkCommissioningCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/NetworkCommissioningCluster.kt index a946c8cb89c8b7..9d8832cafe4f9a 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/NetworkCommissioningCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/NetworkCommissioningCluster.kt @@ -20,422 +20,301 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class NetworkCommissioningCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 49u - } + class ScanNetworksResponse( + val networkingStatus: UInt, + val debugText: String?, + val wiFiScanResults: + ArrayList?, + val threadScanResults: + ArrayList? + ) + + class NetworkConfigResponse( + val networkingStatus: UInt, + val debugText: String?, + val networkIndex: UByte? + ) + + class ConnectNetworkResponse( + val networkingStatus: UInt, + val debugText: String?, + val errorValue: Int? + ) + + class NetworksAttribute( + val value: ArrayList + ) + + class LastNetworkingStatusAttribute(val value: UInt?) + + class LastNetworkIDAttribute(val value: ByteArray?) + + class LastConnectErrorValueAttribute(val value: Int?) + + class SupportedWiFiBandsAttribute(val value: ArrayList?) + + class GeneratedCommandListAttribute(val value: ArrayList) - fun scanNetworks(callback: ScanNetworksResponseCallback, ssid: ByteArray?, breadcrumb: Long?) { + class AcceptedCommandListAttribute(val value: ArrayList) + + class EventListAttribute(val value: ArrayList) + + class AttributeListAttribute(val value: ArrayList) + + suspend fun scanNetworks(ssid: ByteArray?, breadcrumb: ULong?): ScanNetworksResponse { // Implementation needs to be added here } - fun scanNetworks( - callback: ScanNetworksResponseCallback, + suspend fun scanNetworks( ssid: ByteArray?, - breadcrumb: Long?, + breadcrumb: ULong?, timedInvokeTimeoutMs: Int - ) { + ): ScanNetworksResponse { // Implementation needs to be added here } - fun addOrUpdateWiFiNetwork( - callback: NetworkConfigResponseCallback, + suspend fun addOrUpdateWiFiNetwork( ssid: ByteArray, credentials: ByteArray, - breadcrumb: Long? - ) { + breadcrumb: ULong? + ): NetworkConfigResponse { // Implementation needs to be added here } - fun addOrUpdateWiFiNetwork( - callback: NetworkConfigResponseCallback, + suspend fun addOrUpdateWiFiNetwork( ssid: ByteArray, credentials: ByteArray, - breadcrumb: Long?, + breadcrumb: ULong?, timedInvokeTimeoutMs: Int - ) { + ): NetworkConfigResponse { // Implementation needs to be added here } - fun addOrUpdateThreadNetwork( - callback: NetworkConfigResponseCallback, + suspend fun addOrUpdateThreadNetwork( operationalDataset: ByteArray, - breadcrumb: Long? - ) { + breadcrumb: ULong? + ): NetworkConfigResponse { // Implementation needs to be added here } - fun addOrUpdateThreadNetwork( - callback: NetworkConfigResponseCallback, + suspend fun addOrUpdateThreadNetwork( operationalDataset: ByteArray, - breadcrumb: Long?, + breadcrumb: ULong?, timedInvokeTimeoutMs: Int - ) { + ): NetworkConfigResponse { // Implementation needs to be added here } - fun removeNetwork( - callback: NetworkConfigResponseCallback, - networkID: ByteArray, - breadcrumb: Long? - ) { + suspend fun removeNetwork(networkID: ByteArray, breadcrumb: ULong?): NetworkConfigResponse { // Implementation needs to be added here } - fun removeNetwork( - callback: NetworkConfigResponseCallback, + suspend fun removeNetwork( networkID: ByteArray, - breadcrumb: Long?, + breadcrumb: ULong?, timedInvokeTimeoutMs: Int - ) { + ): NetworkConfigResponse { // Implementation needs to be added here } - fun connectNetwork( - callback: ConnectNetworkResponseCallback, - networkID: ByteArray, - breadcrumb: Long? - ) { + suspend fun connectNetwork(networkID: ByteArray, breadcrumb: ULong?): ConnectNetworkResponse { // Implementation needs to be added here } - fun connectNetwork( - callback: ConnectNetworkResponseCallback, + suspend fun connectNetwork( networkID: ByteArray, - breadcrumb: Long?, + breadcrumb: ULong?, timedInvokeTimeoutMs: Int - ) { + ): ConnectNetworkResponse { // Implementation needs to be added here } - fun reorderNetwork( - callback: NetworkConfigResponseCallback, + suspend fun reorderNetwork( networkID: ByteArray, - networkIndex: Integer, - breadcrumb: Long? - ) { + networkIndex: UByte, + breadcrumb: ULong? + ): NetworkConfigResponse { // Implementation needs to be added here } - fun reorderNetwork( - callback: NetworkConfigResponseCallback, + suspend fun reorderNetwork( networkID: ByteArray, - networkIndex: Integer, - breadcrumb: Long?, + networkIndex: UByte, + breadcrumb: ULong?, timedInvokeTimeoutMs: Int - ) { + ): NetworkConfigResponse { // Implementation needs to be added here } - interface ScanNetworksResponseCallback { - fun onSuccess( - networkingStatus: Integer, - debugText: String?, - wiFiScanResults: - ArrayList?, - threadScanResults: - ArrayList? - ) - - fun onError(error: Exception) - } - - interface NetworkConfigResponseCallback { - fun onSuccess(networkingStatus: Integer, debugText: String?, networkIndex: Integer?) - - fun onError(error: Exception) - } - - interface ConnectNetworkResponseCallback { - fun onSuccess(networkingStatus: Integer, debugText: String?, errorValue: Long?) - - fun onError(error: Exception) - } - - interface NetworksAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface LastNetworkingStatusAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface LastNetworkIDAttributeCallback { - fun onSuccess(value: ByteArray?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface LastConnectErrorValueAttributeCallback { - fun onSuccess(value: Long?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface SupportedWiFiBandsAttributeCallback { - fun onSuccess(value: ArrayList?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readMaxNetworksAttribute(callback: IntegerAttributeCallback) { + suspend fun readMaxNetworksAttribute(): Integer { // Implementation needs to be added here } - fun subscribeMaxNetworksAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeMaxNetworksAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readNetworksAttribute(callback: NetworksAttributeCallback) { + suspend fun readNetworksAttribute(): NetworksAttribute { // Implementation needs to be added here } - fun subscribeNetworksAttribute( - callback: NetworksAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeNetworksAttribute(minInterval: Int, maxInterval: Int): NetworksAttribute { // Implementation needs to be added here } - fun readScanMaxTimeSecondsAttribute(callback: IntegerAttributeCallback) { + suspend fun readScanMaxTimeSecondsAttribute(): Integer { // Implementation needs to be added here } - fun subscribeScanMaxTimeSecondsAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeScanMaxTimeSecondsAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readConnectMaxTimeSecondsAttribute(callback: IntegerAttributeCallback) { + suspend fun readConnectMaxTimeSecondsAttribute(): Integer { // Implementation needs to be added here } - fun subscribeConnectMaxTimeSecondsAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeConnectMaxTimeSecondsAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readInterfaceEnabledAttribute(callback: BooleanAttributeCallback) { + suspend fun readInterfaceEnabledAttribute(): Boolean { // Implementation needs to be added here } - fun writeInterfaceEnabledAttribute(callback: DefaultClusterCallback, value: Boolean) { + suspend fun writeInterfaceEnabledAttribute(value: Boolean) { // Implementation needs to be added here } - fun writeInterfaceEnabledAttribute( - callback: DefaultClusterCallback, - value: Boolean, - timedWriteTimeoutMs: Int - ) { + suspend fun writeInterfaceEnabledAttribute(value: Boolean, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeInterfaceEnabledAttribute( - callback: BooleanAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeInterfaceEnabledAttribute(minInterval: Int, maxInterval: Int): Boolean { // Implementation needs to be added here } - fun readLastNetworkingStatusAttribute(callback: LastNetworkingStatusAttributeCallback) { + suspend fun readLastNetworkingStatusAttribute(): LastNetworkingStatusAttribute { // Implementation needs to be added here } - fun subscribeLastNetworkingStatusAttribute( - callback: LastNetworkingStatusAttributeCallback, + suspend fun subscribeLastNetworkingStatusAttribute( minInterval: Int, maxInterval: Int - ) { + ): LastNetworkingStatusAttribute { // Implementation needs to be added here } - fun readLastNetworkIDAttribute(callback: LastNetworkIDAttributeCallback) { + suspend fun readLastNetworkIDAttribute(): LastNetworkIDAttribute { // Implementation needs to be added here } - fun subscribeLastNetworkIDAttribute( - callback: LastNetworkIDAttributeCallback, + suspend fun subscribeLastNetworkIDAttribute( minInterval: Int, maxInterval: Int - ) { + ): LastNetworkIDAttribute { // Implementation needs to be added here } - fun readLastConnectErrorValueAttribute(callback: LastConnectErrorValueAttributeCallback) { + suspend fun readLastConnectErrorValueAttribute(): LastConnectErrorValueAttribute { // Implementation needs to be added here } - fun subscribeLastConnectErrorValueAttribute( - callback: LastConnectErrorValueAttributeCallback, + suspend fun subscribeLastConnectErrorValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): LastConnectErrorValueAttribute { // Implementation needs to be added here } - fun readSupportedWiFiBandsAttribute(callback: SupportedWiFiBandsAttributeCallback) { + suspend fun readSupportedWiFiBandsAttribute(): SupportedWiFiBandsAttribute { // Implementation needs to be added here } - fun subscribeSupportedWiFiBandsAttribute( - callback: SupportedWiFiBandsAttributeCallback, + suspend fun subscribeSupportedWiFiBandsAttribute( minInterval: Int, maxInterval: Int - ) { + ): SupportedWiFiBandsAttribute { // Implementation needs to be added here } - fun readSupportedThreadFeaturesAttribute(callback: IntegerAttributeCallback) { + suspend fun readSupportedThreadFeaturesAttribute(): Integer { // Implementation needs to be added here } - fun subscribeSupportedThreadFeaturesAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeSupportedThreadFeaturesAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readThreadVersionAttribute(callback: IntegerAttributeCallback) { + suspend fun readThreadVersionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeThreadVersionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeThreadVersionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 49u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/NitrogenDioxideConcentrationMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/NitrogenDioxideConcentrationMeasurementCluster.kt index 5d1496588b3d58..7db03647a72a57 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/NitrogenDioxideConcentrationMeasurementCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/NitrogenDioxideConcentrationMeasurementCluster.kt @@ -20,283 +20,188 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class NitrogenDioxideConcentrationMeasurementCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 1043u - } - - interface MeasuredValueAttributeCallback { - fun onSuccess(value: Float?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface MinMeasuredValueAttributeCallback { - fun onSuccess(value: Float?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface MaxMeasuredValueAttributeCallback { - fun onSuccess(value: Float?) - - fun onError(ex: Exception) + class MeasuredValueAttribute(val value: Float?) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface PeakMeasuredValueAttributeCallback { - fun onSuccess(value: Float?) + class MinMeasuredValueAttribute(val value: Float?) - fun onError(ex: Exception) + class MaxMeasuredValueAttribute(val value: Float?) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class PeakMeasuredValueAttribute(val value: Float?) - interface AverageMeasuredValueAttributeCallback { - fun onSuccess(value: Float?) + class AverageMeasuredValueAttribute(val value: Float?) - fun onError(ex: Exception) + class GeneratedCommandListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AcceptedCommandListAttribute(val value: ArrayList) - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class EventListAttribute(val value: ArrayList) - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) + class AttributeListAttribute(val value: ArrayList) - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readMeasuredValueAttribute(callback: MeasuredValueAttributeCallback) { + suspend fun readMeasuredValueAttribute(): MeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeMeasuredValueAttribute( - callback: MeasuredValueAttributeCallback, + suspend fun subscribeMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): MeasuredValueAttribute { // Implementation needs to be added here } - fun readMinMeasuredValueAttribute(callback: MinMeasuredValueAttributeCallback) { + suspend fun readMinMeasuredValueAttribute(): MinMeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeMinMeasuredValueAttribute( - callback: MinMeasuredValueAttributeCallback, + suspend fun subscribeMinMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): MinMeasuredValueAttribute { // Implementation needs to be added here } - fun readMaxMeasuredValueAttribute(callback: MaxMeasuredValueAttributeCallback) { + suspend fun readMaxMeasuredValueAttribute(): MaxMeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeMaxMeasuredValueAttribute( - callback: MaxMeasuredValueAttributeCallback, + suspend fun subscribeMaxMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): MaxMeasuredValueAttribute { // Implementation needs to be added here } - fun readPeakMeasuredValueAttribute(callback: PeakMeasuredValueAttributeCallback) { + suspend fun readPeakMeasuredValueAttribute(): PeakMeasuredValueAttribute { // Implementation needs to be added here } - fun subscribePeakMeasuredValueAttribute( - callback: PeakMeasuredValueAttributeCallback, + suspend fun subscribePeakMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): PeakMeasuredValueAttribute { // Implementation needs to be added here } - fun readPeakMeasuredValueWindowAttribute(callback: LongAttributeCallback) { + suspend fun readPeakMeasuredValueWindowAttribute(): Long { // Implementation needs to be added here } - fun subscribePeakMeasuredValueWindowAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribePeakMeasuredValueWindowAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readAverageMeasuredValueAttribute(callback: AverageMeasuredValueAttributeCallback) { + suspend fun readAverageMeasuredValueAttribute(): AverageMeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeAverageMeasuredValueAttribute( - callback: AverageMeasuredValueAttributeCallback, + suspend fun subscribeAverageMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): AverageMeasuredValueAttribute { // Implementation needs to be added here } - fun readAverageMeasuredValueWindowAttribute(callback: LongAttributeCallback) { + suspend fun readAverageMeasuredValueWindowAttribute(): Long { // Implementation needs to be added here } - fun subscribeAverageMeasuredValueWindowAttribute( - callback: LongAttributeCallback, + suspend fun subscribeAverageMeasuredValueWindowAttribute( minInterval: Int, maxInterval: Int - ) { + ): Long { // Implementation needs to be added here } - fun readUncertaintyAttribute(callback: FloatAttributeCallback) { + suspend fun readUncertaintyAttribute(): Float { // Implementation needs to be added here } - fun subscribeUncertaintyAttribute( - callback: FloatAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeUncertaintyAttribute(minInterval: Int, maxInterval: Int): Float { // Implementation needs to be added here } - fun readMeasurementUnitAttribute(callback: IntegerAttributeCallback) { + suspend fun readMeasurementUnitAttribute(): Integer { // Implementation needs to be added here } - fun subscribeMeasurementUnitAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeMeasurementUnitAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readMeasurementMediumAttribute(callback: IntegerAttributeCallback) { + suspend fun readMeasurementMediumAttribute(): Integer { // Implementation needs to be added here } - fun subscribeMeasurementMediumAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeMeasurementMediumAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readLevelValueAttribute(callback: IntegerAttributeCallback) { + suspend fun readLevelValueAttribute(): Integer { // Implementation needs to be added here } - fun subscribeLevelValueAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeLevelValueAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 1043u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OccupancySensingCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OccupancySensingCluster.kt index f6fbba4620386b..33784c096a054e 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OccupancySensingCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OccupancySensingCluster.kt @@ -20,386 +20,291 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class OccupancySensingCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 1030u - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class GeneratedCommandListAttribute(val value: ArrayList) - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) + class AcceptedCommandListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class EventListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AttributeListAttribute(val value: ArrayList) - fun readOccupancyAttribute(callback: IntegerAttributeCallback) { + suspend fun readOccupancyAttribute(): Integer { // Implementation needs to be added here } - fun subscribeOccupancyAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeOccupancyAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readOccupancySensorTypeAttribute(callback: IntegerAttributeCallback) { + suspend fun readOccupancySensorTypeAttribute(): Integer { // Implementation needs to be added here } - fun subscribeOccupancySensorTypeAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeOccupancySensorTypeAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readOccupancySensorTypeBitmapAttribute(callback: IntegerAttributeCallback) { + suspend fun readOccupancySensorTypeBitmapAttribute(): Integer { // Implementation needs to be added here } - fun subscribeOccupancySensorTypeBitmapAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeOccupancySensorTypeBitmapAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readPIROccupiedToUnoccupiedDelayAttribute(callback: IntegerAttributeCallback) { + suspend fun readPIROccupiedToUnoccupiedDelayAttribute(): Integer { // Implementation needs to be added here } - fun writePIROccupiedToUnoccupiedDelayAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writePIROccupiedToUnoccupiedDelayAttribute(value: UShort) { // Implementation needs to be added here } - fun writePIROccupiedToUnoccupiedDelayAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writePIROccupiedToUnoccupiedDelayAttribute(value: UShort, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribePIROccupiedToUnoccupiedDelayAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribePIROccupiedToUnoccupiedDelayAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readPIRUnoccupiedToOccupiedDelayAttribute(callback: IntegerAttributeCallback) { + suspend fun readPIRUnoccupiedToOccupiedDelayAttribute(): Integer { // Implementation needs to be added here } - fun writePIRUnoccupiedToOccupiedDelayAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writePIRUnoccupiedToOccupiedDelayAttribute(value: UShort) { // Implementation needs to be added here } - fun writePIRUnoccupiedToOccupiedDelayAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writePIRUnoccupiedToOccupiedDelayAttribute(value: UShort, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribePIRUnoccupiedToOccupiedDelayAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribePIRUnoccupiedToOccupiedDelayAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readPIRUnoccupiedToOccupiedThresholdAttribute(callback: IntegerAttributeCallback) { + suspend fun readPIRUnoccupiedToOccupiedThresholdAttribute(): Integer { // Implementation needs to be added here } - fun writePIRUnoccupiedToOccupiedThresholdAttribute( - callback: DefaultClusterCallback, - value: Integer - ) { + suspend fun writePIRUnoccupiedToOccupiedThresholdAttribute(value: UByte) { // Implementation needs to be added here } - fun writePIRUnoccupiedToOccupiedThresholdAttribute( - callback: DefaultClusterCallback, - value: Integer, + suspend fun writePIRUnoccupiedToOccupiedThresholdAttribute( + value: UByte, timedWriteTimeoutMs: Int ) { // Implementation needs to be added here } - fun subscribePIRUnoccupiedToOccupiedThresholdAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribePIRUnoccupiedToOccupiedThresholdAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readUltrasonicOccupiedToUnoccupiedDelayAttribute(callback: IntegerAttributeCallback) { + suspend fun readUltrasonicOccupiedToUnoccupiedDelayAttribute(): Integer { // Implementation needs to be added here } - fun writeUltrasonicOccupiedToUnoccupiedDelayAttribute( - callback: DefaultClusterCallback, - value: Integer - ) { + suspend fun writeUltrasonicOccupiedToUnoccupiedDelayAttribute(value: UShort) { // Implementation needs to be added here } - fun writeUltrasonicOccupiedToUnoccupiedDelayAttribute( - callback: DefaultClusterCallback, - value: Integer, + suspend fun writeUltrasonicOccupiedToUnoccupiedDelayAttribute( + value: UShort, timedWriteTimeoutMs: Int ) { // Implementation needs to be added here } - fun subscribeUltrasonicOccupiedToUnoccupiedDelayAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeUltrasonicOccupiedToUnoccupiedDelayAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readUltrasonicUnoccupiedToOccupiedDelayAttribute(callback: IntegerAttributeCallback) { + suspend fun readUltrasonicUnoccupiedToOccupiedDelayAttribute(): Integer { // Implementation needs to be added here } - fun writeUltrasonicUnoccupiedToOccupiedDelayAttribute( - callback: DefaultClusterCallback, - value: Integer - ) { + suspend fun writeUltrasonicUnoccupiedToOccupiedDelayAttribute(value: UShort) { // Implementation needs to be added here } - fun writeUltrasonicUnoccupiedToOccupiedDelayAttribute( - callback: DefaultClusterCallback, - value: Integer, + suspend fun writeUltrasonicUnoccupiedToOccupiedDelayAttribute( + value: UShort, timedWriteTimeoutMs: Int ) { // Implementation needs to be added here } - fun subscribeUltrasonicUnoccupiedToOccupiedDelayAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeUltrasonicUnoccupiedToOccupiedDelayAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readUltrasonicUnoccupiedToOccupiedThresholdAttribute(callback: IntegerAttributeCallback) { + suspend fun readUltrasonicUnoccupiedToOccupiedThresholdAttribute(): Integer { // Implementation needs to be added here } - fun writeUltrasonicUnoccupiedToOccupiedThresholdAttribute( - callback: DefaultClusterCallback, - value: Integer - ) { + suspend fun writeUltrasonicUnoccupiedToOccupiedThresholdAttribute(value: UByte) { // Implementation needs to be added here } - fun writeUltrasonicUnoccupiedToOccupiedThresholdAttribute( - callback: DefaultClusterCallback, - value: Integer, + suspend fun writeUltrasonicUnoccupiedToOccupiedThresholdAttribute( + value: UByte, timedWriteTimeoutMs: Int ) { // Implementation needs to be added here } - fun subscribeUltrasonicUnoccupiedToOccupiedThresholdAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeUltrasonicUnoccupiedToOccupiedThresholdAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readPhysicalContactOccupiedToUnoccupiedDelayAttribute(callback: IntegerAttributeCallback) { + suspend fun readPhysicalContactOccupiedToUnoccupiedDelayAttribute(): Integer { // Implementation needs to be added here } - fun writePhysicalContactOccupiedToUnoccupiedDelayAttribute( - callback: DefaultClusterCallback, - value: Integer - ) { + suspend fun writePhysicalContactOccupiedToUnoccupiedDelayAttribute(value: UShort) { // Implementation needs to be added here } - fun writePhysicalContactOccupiedToUnoccupiedDelayAttribute( - callback: DefaultClusterCallback, - value: Integer, + suspend fun writePhysicalContactOccupiedToUnoccupiedDelayAttribute( + value: UShort, timedWriteTimeoutMs: Int ) { // Implementation needs to be added here } - fun subscribePhysicalContactOccupiedToUnoccupiedDelayAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribePhysicalContactOccupiedToUnoccupiedDelayAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readPhysicalContactUnoccupiedToOccupiedDelayAttribute(callback: IntegerAttributeCallback) { + suspend fun readPhysicalContactUnoccupiedToOccupiedDelayAttribute(): Integer { // Implementation needs to be added here } - fun writePhysicalContactUnoccupiedToOccupiedDelayAttribute( - callback: DefaultClusterCallback, - value: Integer - ) { + suspend fun writePhysicalContactUnoccupiedToOccupiedDelayAttribute(value: UShort) { // Implementation needs to be added here } - fun writePhysicalContactUnoccupiedToOccupiedDelayAttribute( - callback: DefaultClusterCallback, - value: Integer, + suspend fun writePhysicalContactUnoccupiedToOccupiedDelayAttribute( + value: UShort, timedWriteTimeoutMs: Int ) { // Implementation needs to be added here } - fun subscribePhysicalContactUnoccupiedToOccupiedDelayAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribePhysicalContactUnoccupiedToOccupiedDelayAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readPhysicalContactUnoccupiedToOccupiedThresholdAttribute( - callback: IntegerAttributeCallback - ) { + suspend fun readPhysicalContactUnoccupiedToOccupiedThresholdAttribute(): Integer { // Implementation needs to be added here } - fun writePhysicalContactUnoccupiedToOccupiedThresholdAttribute( - callback: DefaultClusterCallback, - value: Integer - ) { + suspend fun writePhysicalContactUnoccupiedToOccupiedThresholdAttribute(value: UByte) { // Implementation needs to be added here } - fun writePhysicalContactUnoccupiedToOccupiedThresholdAttribute( - callback: DefaultClusterCallback, - value: Integer, + suspend fun writePhysicalContactUnoccupiedToOccupiedThresholdAttribute( + value: UByte, timedWriteTimeoutMs: Int ) { // Implementation needs to be added here } - fun subscribePhysicalContactUnoccupiedToOccupiedThresholdAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribePhysicalContactUnoccupiedToOccupiedThresholdAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 1030u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OnOffCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OnOffCluster.kt index 85474449bd5c4d..a38157c7adf85c 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OnOffCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OnOffCluster.kt @@ -20,283 +20,198 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class OnOffCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 6u - } + class StartUpOnOffAttribute(val value: UInt?) + + class GeneratedCommandListAttribute(val value: ArrayList) - fun off(callback: DefaultClusterCallback) { + class AcceptedCommandListAttribute(val value: ArrayList) + + class EventListAttribute(val value: ArrayList) + + class AttributeListAttribute(val value: ArrayList) + + suspend fun off() { // Implementation needs to be added here } - fun off(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) { + suspend fun off(timedInvokeTimeoutMs: Int) { // Implementation needs to be added here } - fun on(callback: DefaultClusterCallback) { + suspend fun on() { // Implementation needs to be added here } - fun on(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) { + suspend fun on(timedInvokeTimeoutMs: Int) { // Implementation needs to be added here } - fun toggle(callback: DefaultClusterCallback) { + suspend fun toggle() { // Implementation needs to be added here } - fun toggle(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) { + suspend fun toggle(timedInvokeTimeoutMs: Int) { // Implementation needs to be added here } - fun offWithEffect( - callback: DefaultClusterCallback, - effectIdentifier: Integer, - effectVariant: Integer - ) { + suspend fun offWithEffect(effectIdentifier: UInt, effectVariant: UByte) { // Implementation needs to be added here } - fun offWithEffect( - callback: DefaultClusterCallback, - effectIdentifier: Integer, - effectVariant: Integer, + suspend fun offWithEffect( + effectIdentifier: UInt, + effectVariant: UByte, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - fun onWithRecallGlobalScene(callback: DefaultClusterCallback) { + suspend fun onWithRecallGlobalScene() { // Implementation needs to be added here } - fun onWithRecallGlobalScene(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) { + suspend fun onWithRecallGlobalScene(timedInvokeTimeoutMs: Int) { // Implementation needs to be added here } - fun onWithTimedOff( - callback: DefaultClusterCallback, - onOffControl: Integer, - onTime: Integer, - offWaitTime: Integer - ) { + suspend fun onWithTimedOff(onOffControl: UInt, onTime: UShort, offWaitTime: UShort) { // Implementation needs to be added here } - fun onWithTimedOff( - callback: DefaultClusterCallback, - onOffControl: Integer, - onTime: Integer, - offWaitTime: Integer, + suspend fun onWithTimedOff( + onOffControl: UInt, + onTime: UShort, + offWaitTime: UShort, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - interface StartUpOnOffAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readOnOffAttribute(callback: BooleanAttributeCallback) { + suspend fun readOnOffAttribute(): Boolean { // Implementation needs to be added here } - fun subscribeOnOffAttribute( - callback: BooleanAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeOnOffAttribute(minInterval: Int, maxInterval: Int): Boolean { // Implementation needs to be added here } - fun readGlobalSceneControlAttribute(callback: BooleanAttributeCallback) { + suspend fun readGlobalSceneControlAttribute(): Boolean { // Implementation needs to be added here } - fun subscribeGlobalSceneControlAttribute( - callback: BooleanAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeGlobalSceneControlAttribute(minInterval: Int, maxInterval: Int): Boolean { // Implementation needs to be added here } - fun readOnTimeAttribute(callback: IntegerAttributeCallback) { + suspend fun readOnTimeAttribute(): Integer { // Implementation needs to be added here } - fun writeOnTimeAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeOnTimeAttribute(value: UShort) { // Implementation needs to be added here } - fun writeOnTimeAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeOnTimeAttribute(value: UShort, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeOnTimeAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeOnTimeAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readOffWaitTimeAttribute(callback: IntegerAttributeCallback) { + suspend fun readOffWaitTimeAttribute(): Integer { // Implementation needs to be added here } - fun writeOffWaitTimeAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeOffWaitTimeAttribute(value: UShort) { // Implementation needs to be added here } - fun writeOffWaitTimeAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeOffWaitTimeAttribute(value: UShort, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeOffWaitTimeAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeOffWaitTimeAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readStartUpOnOffAttribute(callback: StartUpOnOffAttributeCallback) { + suspend fun readStartUpOnOffAttribute(): StartUpOnOffAttribute { // Implementation needs to be added here } - fun writeStartUpOnOffAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeStartUpOnOffAttribute(value: UInt) { // Implementation needs to be added here } - fun writeStartUpOnOffAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeStartUpOnOffAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeStartUpOnOffAttribute( - callback: StartUpOnOffAttributeCallback, + suspend fun subscribeStartUpOnOffAttribute( minInterval: Int, maxInterval: Int - ) { + ): StartUpOnOffAttribute { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 6u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OnOffSwitchConfigurationCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OnOffSwitchConfigurationCluster.kt index b7317187237aca..5547c47d4c8898 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OnOffSwitchConfigurationCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OnOffSwitchConfigurationCluster.kt @@ -20,147 +20,96 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class OnOffSwitchConfigurationCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 7u - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class GeneratedCommandListAttribute(val value: ArrayList) - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) + class AcceptedCommandListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class EventListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AttributeListAttribute(val value: ArrayList) - fun readSwitchTypeAttribute(callback: IntegerAttributeCallback) { + suspend fun readSwitchTypeAttribute(): Integer { // Implementation needs to be added here } - fun subscribeSwitchTypeAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeSwitchTypeAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readSwitchActionsAttribute(callback: IntegerAttributeCallback) { + suspend fun readSwitchActionsAttribute(): Integer { // Implementation needs to be added here } - fun writeSwitchActionsAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeSwitchActionsAttribute(value: UInt) { // Implementation needs to be added here } - fun writeSwitchActionsAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeSwitchActionsAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeSwitchActionsAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeSwitchActionsAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 7u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OperationalCredentialsCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OperationalCredentialsCluster.kt index 7bb50af382d269..f02704b6eb6e4e 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OperationalCredentialsCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OperationalCredentialsCluster.kt @@ -20,345 +20,241 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class OperationalCredentialsCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 62u - } + class AttestationResponse( + val attestationElements: ByteArray, + val attestationSignature: ByteArray + ) + + class CertificateChainResponse(val certificate: ByteArray) + + class CSRResponse(val NOCSRElements: ByteArray, val attestationSignature: ByteArray) + + class NOCResponse(val statusCode: UInt, val fabricIndex: UByte?, val debugText: String?) + + class NOCsAttribute(val value: ArrayList) + + class FabricsAttribute( + val value: ArrayList + ) + + class TrustedRootCertificatesAttribute(val value: ArrayList) - fun attestationRequest(callback: AttestationResponseCallback, attestationNonce: ByteArray) { + class GeneratedCommandListAttribute(val value: ArrayList) + + class AcceptedCommandListAttribute(val value: ArrayList) + + class EventListAttribute(val value: ArrayList) + + class AttributeListAttribute(val value: ArrayList) + + suspend fun attestationRequest(attestationNonce: ByteArray): AttestationResponse { // Implementation needs to be added here } - fun attestationRequest( - callback: AttestationResponseCallback, + suspend fun attestationRequest( attestationNonce: ByteArray, timedInvokeTimeoutMs: Int - ) { + ): AttestationResponse { // Implementation needs to be added here } - fun certificateChainRequest( - callback: CertificateChainResponseCallback, - certificateType: Integer - ) { + suspend fun certificateChainRequest(certificateType: UInt): CertificateChainResponse { // Implementation needs to be added here } - fun certificateChainRequest( - callback: CertificateChainResponseCallback, - certificateType: Integer, + suspend fun certificateChainRequest( + certificateType: UInt, timedInvokeTimeoutMs: Int - ) { + ): CertificateChainResponse { // Implementation needs to be added here } - fun CSRRequest(callback: CSRResponseCallback, CSRNonce: ByteArray, isForUpdateNOC: Boolean?) { + suspend fun CSRRequest(CSRNonce: ByteArray, isForUpdateNOC: Boolean?): CSRResponse { // Implementation needs to be added here } - fun CSRRequest( - callback: CSRResponseCallback, + suspend fun CSRRequest( CSRNonce: ByteArray, isForUpdateNOC: Boolean?, timedInvokeTimeoutMs: Int - ) { + ): CSRResponse { // Implementation needs to be added here } - fun addNOC( - callback: NOCResponseCallback, + suspend fun addNOC( NOCValue: ByteArray, ICACValue: ByteArray?, IPKValue: ByteArray, - caseAdminSubject: Long, - adminVendorId: Integer - ) { + caseAdminSubject: ULong, + adminVendorId: UShort + ): NOCResponse { // Implementation needs to be added here } - fun addNOC( - callback: NOCResponseCallback, + suspend fun addNOC( NOCValue: ByteArray, ICACValue: ByteArray?, IPKValue: ByteArray, - caseAdminSubject: Long, - adminVendorId: Integer, + caseAdminSubject: ULong, + adminVendorId: UShort, timedInvokeTimeoutMs: Int - ) { + ): NOCResponse { // Implementation needs to be added here } - fun updateNOC(callback: NOCResponseCallback, NOCValue: ByteArray, ICACValue: ByteArray?) { + suspend fun updateNOC(NOCValue: ByteArray, ICACValue: ByteArray?): NOCResponse { // Implementation needs to be added here } - fun updateNOC( - callback: NOCResponseCallback, + suspend fun updateNOC( NOCValue: ByteArray, ICACValue: ByteArray?, timedInvokeTimeoutMs: Int - ) { + ): NOCResponse { // Implementation needs to be added here } - fun updateFabricLabel(callback: NOCResponseCallback, label: String) { + suspend fun updateFabricLabel(label: String): NOCResponse { // Implementation needs to be added here } - fun updateFabricLabel(callback: NOCResponseCallback, label: String, timedInvokeTimeoutMs: Int) { + suspend fun updateFabricLabel(label: String, timedInvokeTimeoutMs: Int): NOCResponse { // Implementation needs to be added here } - fun removeFabric(callback: NOCResponseCallback, fabricIndex: Integer) { + suspend fun removeFabric(fabricIndex: UByte): NOCResponse { // Implementation needs to be added here } - fun removeFabric(callback: NOCResponseCallback, fabricIndex: Integer, timedInvokeTimeoutMs: Int) { + suspend fun removeFabric(fabricIndex: UByte, timedInvokeTimeoutMs: Int): NOCResponse { // Implementation needs to be added here } - fun addTrustedRootCertificate(callback: DefaultClusterCallback, rootCACertificate: ByteArray) { + suspend fun addTrustedRootCertificate(rootCACertificate: ByteArray) { // Implementation needs to be added here } - fun addTrustedRootCertificate( - callback: DefaultClusterCallback, - rootCACertificate: ByteArray, - timedInvokeTimeoutMs: Int - ) { + suspend fun addTrustedRootCertificate(rootCACertificate: ByteArray, timedInvokeTimeoutMs: Int) { // Implementation needs to be added here } - interface AttestationResponseCallback { - fun onSuccess(attestationElements: ByteArray, attestationSignature: ByteArray) - - fun onError(error: Exception) - } - - interface CertificateChainResponseCallback { - fun onSuccess(certificate: ByteArray) - - fun onError(error: Exception) - } - - interface CSRResponseCallback { - fun onSuccess(NOCSRElements: ByteArray, attestationSignature: ByteArray) - - fun onError(error: Exception) - } - - interface NOCResponseCallback { - fun onSuccess(statusCode: Integer, fabricIndex: Integer?, debugText: String?) - - fun onError(error: Exception) - } - - interface NOCsAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface FabricsAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface TrustedRootCertificatesAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readNOCsAttribute(callback: NOCsAttributeCallback) { + suspend fun readNOCsAttribute(): NOCsAttribute { // Implementation needs to be added here } - fun readNOCsAttributeWithFabricFilter( - callback: NOCsAttributeCallback, - isFabricFiltered: Boolean - ) { + suspend fun readNOCsAttributeWithFabricFilter(isFabricFiltered: Boolean): NOCsAttribute { // Implementation needs to be added here } - fun subscribeNOCsAttribute(callback: NOCsAttributeCallback, minInterval: Int, maxInterval: Int) { + suspend fun subscribeNOCsAttribute(minInterval: Int, maxInterval: Int): NOCsAttribute { // Implementation needs to be added here } - fun readFabricsAttribute(callback: FabricsAttributeCallback) { + suspend fun readFabricsAttribute(): FabricsAttribute { // Implementation needs to be added here } - fun readFabricsAttributeWithFabricFilter( - callback: FabricsAttributeCallback, - isFabricFiltered: Boolean - ) { + suspend fun readFabricsAttributeWithFabricFilter(isFabricFiltered: Boolean): FabricsAttribute { // Implementation needs to be added here } - fun subscribeFabricsAttribute( - callback: FabricsAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFabricsAttribute(minInterval: Int, maxInterval: Int): FabricsAttribute { // Implementation needs to be added here } - fun readSupportedFabricsAttribute(callback: IntegerAttributeCallback) { + suspend fun readSupportedFabricsAttribute(): Integer { // Implementation needs to be added here } - fun subscribeSupportedFabricsAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeSupportedFabricsAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readCommissionedFabricsAttribute(callback: IntegerAttributeCallback) { + suspend fun readCommissionedFabricsAttribute(): Integer { // Implementation needs to be added here } - fun subscribeCommissionedFabricsAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeCommissionedFabricsAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readTrustedRootCertificatesAttribute(callback: TrustedRootCertificatesAttributeCallback) { + suspend fun readTrustedRootCertificatesAttribute(): TrustedRootCertificatesAttribute { // Implementation needs to be added here } - fun subscribeTrustedRootCertificatesAttribute( - callback: TrustedRootCertificatesAttributeCallback, + suspend fun subscribeTrustedRootCertificatesAttribute( minInterval: Int, maxInterval: Int - ) { + ): TrustedRootCertificatesAttribute { // Implementation needs to be added here } - fun readCurrentFabricIndexAttribute(callback: IntegerAttributeCallback) { + suspend fun readCurrentFabricIndexAttribute(): Integer { // Implementation needs to be added here } - fun subscribeCurrentFabricIndexAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeCurrentFabricIndexAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 62u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OperationalStateCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OperationalStateCluster.kt index df377c879437b6..64542a3c0fde13 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OperationalStateCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OperationalStateCluster.kt @@ -20,261 +20,180 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class OperationalStateCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 96u - } - - fun pause(callback: OperationalCommandResponseCallback) { - // Implementation needs to be added here - } - - fun pause(callback: OperationalCommandResponseCallback, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } - - fun stop(callback: OperationalCommandResponseCallback) { - // Implementation needs to be added here - } - - fun stop(callback: OperationalCommandResponseCallback, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } - - fun start(callback: OperationalCommandResponseCallback) { - // Implementation needs to be added here - } - - fun start(callback: OperationalCommandResponseCallback, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } + class OperationalCommandResponse( + val commandResponseState: ChipStructs.OperationalStateClusterErrorStateStruct + ) - fun resume(callback: OperationalCommandResponseCallback) { - // Implementation needs to be added here - } + class PhaseListAttribute(val value: ArrayList?) - fun resume(callback: OperationalCommandResponseCallback, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } + class CurrentPhaseAttribute(val value: UByte?) - interface OperationalCommandResponseCallback { - fun onSuccess(commandResponseState: ChipStructs.OperationalStateClusterErrorStateStruct) + class CountdownTimeAttribute(val value: UInt?) - fun onError(error: Exception) - } + class OperationalStateListAttribute( + val value: ArrayList + ) - interface PhaseListAttributeCallback { - fun onSuccess(value: ArrayList?) + class OperationalErrorAttribute(val value: ChipStructs.OperationalStateClusterErrorStateStruct) - fun onError(ex: Exception) + class GeneratedCommandListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AcceptedCommandListAttribute(val value: ArrayList) - interface CurrentPhaseAttributeCallback { - fun onSuccess(value: Integer?) + class EventListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class AttributeListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun pause(): OperationalCommandResponse { + // Implementation needs to be added here } - interface CountdownTimeAttributeCallback { - fun onSuccess(value: Long?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun pause(timedInvokeTimeoutMs: Int): OperationalCommandResponse { + // Implementation needs to be added here } - interface OperationalStateListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun stop(): OperationalCommandResponse { + // Implementation needs to be added here } - interface OperationalErrorAttributeCallback { - fun onSuccess(value: ChipStructs.OperationalStateClusterErrorStateStruct) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun stop(timedInvokeTimeoutMs: Int): OperationalCommandResponse { + // Implementation needs to be added here } - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun start(): OperationalCommandResponse { + // Implementation needs to be added here } - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun start(timedInvokeTimeoutMs: Int): OperationalCommandResponse { + // Implementation needs to be added here } - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun resume(): OperationalCommandResponse { + // Implementation needs to be added here } - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun resume(timedInvokeTimeoutMs: Int): OperationalCommandResponse { + // Implementation needs to be added here } - fun readPhaseListAttribute(callback: PhaseListAttributeCallback) { + suspend fun readPhaseListAttribute(): PhaseListAttribute { // Implementation needs to be added here } - fun subscribePhaseListAttribute( - callback: PhaseListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribePhaseListAttribute(minInterval: Int, maxInterval: Int): PhaseListAttribute { // Implementation needs to be added here } - fun readCurrentPhaseAttribute(callback: CurrentPhaseAttributeCallback) { + suspend fun readCurrentPhaseAttribute(): CurrentPhaseAttribute { // Implementation needs to be added here } - fun subscribeCurrentPhaseAttribute( - callback: CurrentPhaseAttributeCallback, + suspend fun subscribeCurrentPhaseAttribute( minInterval: Int, maxInterval: Int - ) { + ): CurrentPhaseAttribute { // Implementation needs to be added here } - fun readCountdownTimeAttribute(callback: CountdownTimeAttributeCallback) { + suspend fun readCountdownTimeAttribute(): CountdownTimeAttribute { // Implementation needs to be added here } - fun subscribeCountdownTimeAttribute( - callback: CountdownTimeAttributeCallback, + suspend fun subscribeCountdownTimeAttribute( minInterval: Int, maxInterval: Int - ) { + ): CountdownTimeAttribute { // Implementation needs to be added here } - fun readOperationalStateListAttribute(callback: OperationalStateListAttributeCallback) { + suspend fun readOperationalStateListAttribute(): OperationalStateListAttribute { // Implementation needs to be added here } - fun subscribeOperationalStateListAttribute( - callback: OperationalStateListAttributeCallback, + suspend fun subscribeOperationalStateListAttribute( minInterval: Int, maxInterval: Int - ) { + ): OperationalStateListAttribute { // Implementation needs to be added here } - fun readOperationalStateAttribute(callback: IntegerAttributeCallback) { + suspend fun readOperationalStateAttribute(): Integer { // Implementation needs to be added here } - fun subscribeOperationalStateAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeOperationalStateAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readOperationalErrorAttribute(callback: OperationalErrorAttributeCallback) { + suspend fun readOperationalErrorAttribute(): OperationalErrorAttribute { // Implementation needs to be added here } - fun subscribeOperationalErrorAttribute( - callback: OperationalErrorAttributeCallback, + suspend fun subscribeOperationalErrorAttribute( minInterval: Int, maxInterval: Int - ) { + ): OperationalErrorAttribute { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 96u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OtaSoftwareUpdateProviderCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OtaSoftwareUpdateProviderCluster.kt index 04a51a0416f34d..f2d8ec68044131 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OtaSoftwareUpdateProviderCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OtaSoftwareUpdateProviderCluster.kt @@ -20,195 +20,136 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class OtaSoftwareUpdateProviderCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 41u - } + class QueryImageResponse( + val status: UInt, + val delayedActionTime: UInt?, + val imageURI: String?, + val softwareVersion: UInt?, + val softwareVersionString: String?, + val updateToken: ByteArray?, + val userConsentNeeded: Boolean?, + val metadataForRequestor: ByteArray? + ) + + class ApplyUpdateResponse(val action: UInt, val delayedActionTime: UInt) + + class GeneratedCommandListAttribute(val value: ArrayList) + + class AcceptedCommandListAttribute(val value: ArrayList) + + class EventListAttribute(val value: ArrayList) - fun queryImage( - callback: QueryImageResponseCallback, - vendorID: Integer, - productID: Integer, - softwareVersion: Long, - protocolsSupported: ArrayList, - hardwareVersion: Integer?, + class AttributeListAttribute(val value: ArrayList) + + suspend fun queryImage( + vendorID: UShort, + productID: UShort, + softwareVersion: UInt, + protocolsSupported: ArrayList, + hardwareVersion: UShort?, location: String?, requestorCanConsent: Boolean?, metadataForProvider: ByteArray? - ) { + ): QueryImageResponse { // Implementation needs to be added here } - fun queryImage( - callback: QueryImageResponseCallback, - vendorID: Integer, - productID: Integer, - softwareVersion: Long, - protocolsSupported: ArrayList, - hardwareVersion: Integer?, + suspend fun queryImage( + vendorID: UShort, + productID: UShort, + softwareVersion: UInt, + protocolsSupported: ArrayList, + hardwareVersion: UShort?, location: String?, requestorCanConsent: Boolean?, metadataForProvider: ByteArray?, timedInvokeTimeoutMs: Int - ) { + ): QueryImageResponse { // Implementation needs to be added here } - fun applyUpdateRequest( - callback: ApplyUpdateResponseCallback, - updateToken: ByteArray, - newVersion: Long - ) { + suspend fun applyUpdateRequest(updateToken: ByteArray, newVersion: UInt): ApplyUpdateResponse { // Implementation needs to be added here } - fun applyUpdateRequest( - callback: ApplyUpdateResponseCallback, + suspend fun applyUpdateRequest( updateToken: ByteArray, - newVersion: Long, + newVersion: UInt, timedInvokeTimeoutMs: Int - ) { + ): ApplyUpdateResponse { // Implementation needs to be added here } - fun notifyUpdateApplied( - callback: DefaultClusterCallback, - updateToken: ByteArray, - softwareVersion: Long - ) { + suspend fun notifyUpdateApplied(updateToken: ByteArray, softwareVersion: UInt) { // Implementation needs to be added here } - fun notifyUpdateApplied( - callback: DefaultClusterCallback, + suspend fun notifyUpdateApplied( updateToken: ByteArray, - softwareVersion: Long, + softwareVersion: UInt, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - interface QueryImageResponseCallback { - fun onSuccess( - status: Integer, - delayedActionTime: Long?, - imageURI: String?, - softwareVersion: Long?, - softwareVersionString: String?, - updateToken: ByteArray?, - userConsentNeeded: Boolean?, - metadataForRequestor: ByteArray? - ) - - fun onError(error: Exception) - } - - interface ApplyUpdateResponseCallback { - fun onSuccess(action: Integer, delayedActionTime: Long) - - fun onError(error: Exception) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 41u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OtaSoftwareUpdateRequestorCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OtaSoftwareUpdateRequestorCluster.kt index 6085a4e7e6d2d3..3860fd36046920 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OtaSoftwareUpdateRequestorCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OtaSoftwareUpdateRequestorCluster.kt @@ -20,220 +20,156 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class OtaSoftwareUpdateRequestorCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 42u - } + class DefaultOTAProvidersAttribute( + val value: ArrayList + ) + + class UpdateStateProgressAttribute(val value: UByte?) + + class GeneratedCommandListAttribute(val value: ArrayList) + + class AcceptedCommandListAttribute(val value: ArrayList) + + class EventListAttribute(val value: ArrayList) + + class AttributeListAttribute(val value: ArrayList) - fun announceOTAProvider( - callback: DefaultClusterCallback, - providerNodeID: Long, - vendorID: Integer, - announcementReason: Integer, + suspend fun announceOTAProvider( + providerNodeID: ULong, + vendorID: UShort, + announcementReason: UInt, metadataForNode: ByteArray?, - endpoint: Integer + endpoint: UShort ) { // Implementation needs to be added here } - fun announceOTAProvider( - callback: DefaultClusterCallback, - providerNodeID: Long, - vendorID: Integer, - announcementReason: Integer, + suspend fun announceOTAProvider( + providerNodeID: ULong, + vendorID: UShort, + announcementReason: UInt, metadataForNode: ByteArray?, - endpoint: Integer, + endpoint: UShort, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - interface DefaultOTAProvidersAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface UpdateStateProgressAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readDefaultOTAProvidersAttribute(callback: DefaultOTAProvidersAttributeCallback) { + suspend fun readDefaultOTAProvidersAttribute(): DefaultOTAProvidersAttribute { // Implementation needs to be added here } - fun readDefaultOTAProvidersAttributeWithFabricFilter( - callback: DefaultOTAProvidersAttributeCallback, + suspend fun readDefaultOTAProvidersAttributeWithFabricFilter( isFabricFiltered: Boolean - ) { + ): DefaultOTAProvidersAttribute { // Implementation needs to be added here } - fun writeDefaultOTAProvidersAttribute( - callback: DefaultClusterCallback, + suspend fun writeDefaultOTAProvidersAttribute( value: ArrayList ) { // Implementation needs to be added here } - fun writeDefaultOTAProvidersAttribute( - callback: DefaultClusterCallback, + suspend fun writeDefaultOTAProvidersAttribute( value: ArrayList, timedWriteTimeoutMs: Int ) { // Implementation needs to be added here } - fun subscribeDefaultOTAProvidersAttribute( - callback: DefaultOTAProvidersAttributeCallback, + suspend fun subscribeDefaultOTAProvidersAttribute( minInterval: Int, maxInterval: Int - ) { + ): DefaultOTAProvidersAttribute { // Implementation needs to be added here } - fun readUpdatePossibleAttribute(callback: BooleanAttributeCallback) { + suspend fun readUpdatePossibleAttribute(): Boolean { // Implementation needs to be added here } - fun subscribeUpdatePossibleAttribute( - callback: BooleanAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeUpdatePossibleAttribute(minInterval: Int, maxInterval: Int): Boolean { // Implementation needs to be added here } - fun readUpdateStateAttribute(callback: IntegerAttributeCallback) { + suspend fun readUpdateStateAttribute(): Integer { // Implementation needs to be added here } - fun subscribeUpdateStateAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeUpdateStateAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readUpdateStateProgressAttribute(callback: UpdateStateProgressAttributeCallback) { + suspend fun readUpdateStateProgressAttribute(): UpdateStateProgressAttribute { // Implementation needs to be added here } - fun subscribeUpdateStateProgressAttribute( - callback: UpdateStateProgressAttributeCallback, + suspend fun subscribeUpdateStateProgressAttribute( minInterval: Int, maxInterval: Int - ) { + ): UpdateStateProgressAttribute { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 42u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OzoneConcentrationMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OzoneConcentrationMeasurementCluster.kt index b63a519ed9b572..ad1f4f1e3c24cc 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OzoneConcentrationMeasurementCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OzoneConcentrationMeasurementCluster.kt @@ -20,283 +20,188 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class OzoneConcentrationMeasurementCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 1045u - } - - interface MeasuredValueAttributeCallback { - fun onSuccess(value: Float?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface MinMeasuredValueAttributeCallback { - fun onSuccess(value: Float?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface MaxMeasuredValueAttributeCallback { - fun onSuccess(value: Float?) - - fun onError(ex: Exception) + class MeasuredValueAttribute(val value: Float?) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface PeakMeasuredValueAttributeCallback { - fun onSuccess(value: Float?) + class MinMeasuredValueAttribute(val value: Float?) - fun onError(ex: Exception) + class MaxMeasuredValueAttribute(val value: Float?) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class PeakMeasuredValueAttribute(val value: Float?) - interface AverageMeasuredValueAttributeCallback { - fun onSuccess(value: Float?) + class AverageMeasuredValueAttribute(val value: Float?) - fun onError(ex: Exception) + class GeneratedCommandListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AcceptedCommandListAttribute(val value: ArrayList) - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class EventListAttribute(val value: ArrayList) - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) + class AttributeListAttribute(val value: ArrayList) - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readMeasuredValueAttribute(callback: MeasuredValueAttributeCallback) { + suspend fun readMeasuredValueAttribute(): MeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeMeasuredValueAttribute( - callback: MeasuredValueAttributeCallback, + suspend fun subscribeMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): MeasuredValueAttribute { // Implementation needs to be added here } - fun readMinMeasuredValueAttribute(callback: MinMeasuredValueAttributeCallback) { + suspend fun readMinMeasuredValueAttribute(): MinMeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeMinMeasuredValueAttribute( - callback: MinMeasuredValueAttributeCallback, + suspend fun subscribeMinMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): MinMeasuredValueAttribute { // Implementation needs to be added here } - fun readMaxMeasuredValueAttribute(callback: MaxMeasuredValueAttributeCallback) { + suspend fun readMaxMeasuredValueAttribute(): MaxMeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeMaxMeasuredValueAttribute( - callback: MaxMeasuredValueAttributeCallback, + suspend fun subscribeMaxMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): MaxMeasuredValueAttribute { // Implementation needs to be added here } - fun readPeakMeasuredValueAttribute(callback: PeakMeasuredValueAttributeCallback) { + suspend fun readPeakMeasuredValueAttribute(): PeakMeasuredValueAttribute { // Implementation needs to be added here } - fun subscribePeakMeasuredValueAttribute( - callback: PeakMeasuredValueAttributeCallback, + suspend fun subscribePeakMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): PeakMeasuredValueAttribute { // Implementation needs to be added here } - fun readPeakMeasuredValueWindowAttribute(callback: LongAttributeCallback) { + suspend fun readPeakMeasuredValueWindowAttribute(): Long { // Implementation needs to be added here } - fun subscribePeakMeasuredValueWindowAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribePeakMeasuredValueWindowAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readAverageMeasuredValueAttribute(callback: AverageMeasuredValueAttributeCallback) { + suspend fun readAverageMeasuredValueAttribute(): AverageMeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeAverageMeasuredValueAttribute( - callback: AverageMeasuredValueAttributeCallback, + suspend fun subscribeAverageMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): AverageMeasuredValueAttribute { // Implementation needs to be added here } - fun readAverageMeasuredValueWindowAttribute(callback: LongAttributeCallback) { + suspend fun readAverageMeasuredValueWindowAttribute(): Long { // Implementation needs to be added here } - fun subscribeAverageMeasuredValueWindowAttribute( - callback: LongAttributeCallback, + suspend fun subscribeAverageMeasuredValueWindowAttribute( minInterval: Int, maxInterval: Int - ) { + ): Long { // Implementation needs to be added here } - fun readUncertaintyAttribute(callback: FloatAttributeCallback) { + suspend fun readUncertaintyAttribute(): Float { // Implementation needs to be added here } - fun subscribeUncertaintyAttribute( - callback: FloatAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeUncertaintyAttribute(minInterval: Int, maxInterval: Int): Float { // Implementation needs to be added here } - fun readMeasurementUnitAttribute(callback: IntegerAttributeCallback) { + suspend fun readMeasurementUnitAttribute(): Integer { // Implementation needs to be added here } - fun subscribeMeasurementUnitAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeMeasurementUnitAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readMeasurementMediumAttribute(callback: IntegerAttributeCallback) { + suspend fun readMeasurementMediumAttribute(): Integer { // Implementation needs to be added here } - fun subscribeMeasurementMediumAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeMeasurementMediumAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readLevelValueAttribute(callback: IntegerAttributeCallback) { + suspend fun readLevelValueAttribute(): Integer { // Implementation needs to be added here } - fun subscribeLevelValueAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeLevelValueAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 1045u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm10ConcentrationMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm10ConcentrationMeasurementCluster.kt index c700eb641f2fb9..3218382267451d 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm10ConcentrationMeasurementCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm10ConcentrationMeasurementCluster.kt @@ -20,283 +20,188 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class Pm10ConcentrationMeasurementCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 1069u - } - - interface MeasuredValueAttributeCallback { - fun onSuccess(value: Float?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface MinMeasuredValueAttributeCallback { - fun onSuccess(value: Float?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface MaxMeasuredValueAttributeCallback { - fun onSuccess(value: Float?) - - fun onError(ex: Exception) + class MeasuredValueAttribute(val value: Float?) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface PeakMeasuredValueAttributeCallback { - fun onSuccess(value: Float?) + class MinMeasuredValueAttribute(val value: Float?) - fun onError(ex: Exception) + class MaxMeasuredValueAttribute(val value: Float?) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class PeakMeasuredValueAttribute(val value: Float?) - interface AverageMeasuredValueAttributeCallback { - fun onSuccess(value: Float?) + class AverageMeasuredValueAttribute(val value: Float?) - fun onError(ex: Exception) + class GeneratedCommandListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AcceptedCommandListAttribute(val value: ArrayList) - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class EventListAttribute(val value: ArrayList) - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) + class AttributeListAttribute(val value: ArrayList) - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readMeasuredValueAttribute(callback: MeasuredValueAttributeCallback) { + suspend fun readMeasuredValueAttribute(): MeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeMeasuredValueAttribute( - callback: MeasuredValueAttributeCallback, + suspend fun subscribeMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): MeasuredValueAttribute { // Implementation needs to be added here } - fun readMinMeasuredValueAttribute(callback: MinMeasuredValueAttributeCallback) { + suspend fun readMinMeasuredValueAttribute(): MinMeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeMinMeasuredValueAttribute( - callback: MinMeasuredValueAttributeCallback, + suspend fun subscribeMinMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): MinMeasuredValueAttribute { // Implementation needs to be added here } - fun readMaxMeasuredValueAttribute(callback: MaxMeasuredValueAttributeCallback) { + suspend fun readMaxMeasuredValueAttribute(): MaxMeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeMaxMeasuredValueAttribute( - callback: MaxMeasuredValueAttributeCallback, + suspend fun subscribeMaxMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): MaxMeasuredValueAttribute { // Implementation needs to be added here } - fun readPeakMeasuredValueAttribute(callback: PeakMeasuredValueAttributeCallback) { + suspend fun readPeakMeasuredValueAttribute(): PeakMeasuredValueAttribute { // Implementation needs to be added here } - fun subscribePeakMeasuredValueAttribute( - callback: PeakMeasuredValueAttributeCallback, + suspend fun subscribePeakMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): PeakMeasuredValueAttribute { // Implementation needs to be added here } - fun readPeakMeasuredValueWindowAttribute(callback: LongAttributeCallback) { + suspend fun readPeakMeasuredValueWindowAttribute(): Long { // Implementation needs to be added here } - fun subscribePeakMeasuredValueWindowAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribePeakMeasuredValueWindowAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readAverageMeasuredValueAttribute(callback: AverageMeasuredValueAttributeCallback) { + suspend fun readAverageMeasuredValueAttribute(): AverageMeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeAverageMeasuredValueAttribute( - callback: AverageMeasuredValueAttributeCallback, + suspend fun subscribeAverageMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): AverageMeasuredValueAttribute { // Implementation needs to be added here } - fun readAverageMeasuredValueWindowAttribute(callback: LongAttributeCallback) { + suspend fun readAverageMeasuredValueWindowAttribute(): Long { // Implementation needs to be added here } - fun subscribeAverageMeasuredValueWindowAttribute( - callback: LongAttributeCallback, + suspend fun subscribeAverageMeasuredValueWindowAttribute( minInterval: Int, maxInterval: Int - ) { + ): Long { // Implementation needs to be added here } - fun readUncertaintyAttribute(callback: FloatAttributeCallback) { + suspend fun readUncertaintyAttribute(): Float { // Implementation needs to be added here } - fun subscribeUncertaintyAttribute( - callback: FloatAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeUncertaintyAttribute(minInterval: Int, maxInterval: Int): Float { // Implementation needs to be added here } - fun readMeasurementUnitAttribute(callback: IntegerAttributeCallback) { + suspend fun readMeasurementUnitAttribute(): Integer { // Implementation needs to be added here } - fun subscribeMeasurementUnitAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeMeasurementUnitAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readMeasurementMediumAttribute(callback: IntegerAttributeCallback) { + suspend fun readMeasurementMediumAttribute(): Integer { // Implementation needs to be added here } - fun subscribeMeasurementMediumAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeMeasurementMediumAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readLevelValueAttribute(callback: IntegerAttributeCallback) { + suspend fun readLevelValueAttribute(): Integer { // Implementation needs to be added here } - fun subscribeLevelValueAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeLevelValueAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 1069u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm1ConcentrationMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm1ConcentrationMeasurementCluster.kt index 5a3c72eb8e30dc..eca3c3c7888954 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm1ConcentrationMeasurementCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm1ConcentrationMeasurementCluster.kt @@ -20,283 +20,188 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class Pm1ConcentrationMeasurementCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 1068u - } - - interface MeasuredValueAttributeCallback { - fun onSuccess(value: Float?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface MinMeasuredValueAttributeCallback { - fun onSuccess(value: Float?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface MaxMeasuredValueAttributeCallback { - fun onSuccess(value: Float?) - - fun onError(ex: Exception) + class MeasuredValueAttribute(val value: Float?) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface PeakMeasuredValueAttributeCallback { - fun onSuccess(value: Float?) + class MinMeasuredValueAttribute(val value: Float?) - fun onError(ex: Exception) + class MaxMeasuredValueAttribute(val value: Float?) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class PeakMeasuredValueAttribute(val value: Float?) - interface AverageMeasuredValueAttributeCallback { - fun onSuccess(value: Float?) + class AverageMeasuredValueAttribute(val value: Float?) - fun onError(ex: Exception) + class GeneratedCommandListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AcceptedCommandListAttribute(val value: ArrayList) - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class EventListAttribute(val value: ArrayList) - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) + class AttributeListAttribute(val value: ArrayList) - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readMeasuredValueAttribute(callback: MeasuredValueAttributeCallback) { + suspend fun readMeasuredValueAttribute(): MeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeMeasuredValueAttribute( - callback: MeasuredValueAttributeCallback, + suspend fun subscribeMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): MeasuredValueAttribute { // Implementation needs to be added here } - fun readMinMeasuredValueAttribute(callback: MinMeasuredValueAttributeCallback) { + suspend fun readMinMeasuredValueAttribute(): MinMeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeMinMeasuredValueAttribute( - callback: MinMeasuredValueAttributeCallback, + suspend fun subscribeMinMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): MinMeasuredValueAttribute { // Implementation needs to be added here } - fun readMaxMeasuredValueAttribute(callback: MaxMeasuredValueAttributeCallback) { + suspend fun readMaxMeasuredValueAttribute(): MaxMeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeMaxMeasuredValueAttribute( - callback: MaxMeasuredValueAttributeCallback, + suspend fun subscribeMaxMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): MaxMeasuredValueAttribute { // Implementation needs to be added here } - fun readPeakMeasuredValueAttribute(callback: PeakMeasuredValueAttributeCallback) { + suspend fun readPeakMeasuredValueAttribute(): PeakMeasuredValueAttribute { // Implementation needs to be added here } - fun subscribePeakMeasuredValueAttribute( - callback: PeakMeasuredValueAttributeCallback, + suspend fun subscribePeakMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): PeakMeasuredValueAttribute { // Implementation needs to be added here } - fun readPeakMeasuredValueWindowAttribute(callback: LongAttributeCallback) { + suspend fun readPeakMeasuredValueWindowAttribute(): Long { // Implementation needs to be added here } - fun subscribePeakMeasuredValueWindowAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribePeakMeasuredValueWindowAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readAverageMeasuredValueAttribute(callback: AverageMeasuredValueAttributeCallback) { + suspend fun readAverageMeasuredValueAttribute(): AverageMeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeAverageMeasuredValueAttribute( - callback: AverageMeasuredValueAttributeCallback, + suspend fun subscribeAverageMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): AverageMeasuredValueAttribute { // Implementation needs to be added here } - fun readAverageMeasuredValueWindowAttribute(callback: LongAttributeCallback) { + suspend fun readAverageMeasuredValueWindowAttribute(): Long { // Implementation needs to be added here } - fun subscribeAverageMeasuredValueWindowAttribute( - callback: LongAttributeCallback, + suspend fun subscribeAverageMeasuredValueWindowAttribute( minInterval: Int, maxInterval: Int - ) { + ): Long { // Implementation needs to be added here } - fun readUncertaintyAttribute(callback: FloatAttributeCallback) { + suspend fun readUncertaintyAttribute(): Float { // Implementation needs to be added here } - fun subscribeUncertaintyAttribute( - callback: FloatAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeUncertaintyAttribute(minInterval: Int, maxInterval: Int): Float { // Implementation needs to be added here } - fun readMeasurementUnitAttribute(callback: IntegerAttributeCallback) { + suspend fun readMeasurementUnitAttribute(): Integer { // Implementation needs to be added here } - fun subscribeMeasurementUnitAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeMeasurementUnitAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readMeasurementMediumAttribute(callback: IntegerAttributeCallback) { + suspend fun readMeasurementMediumAttribute(): Integer { // Implementation needs to be added here } - fun subscribeMeasurementMediumAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeMeasurementMediumAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readLevelValueAttribute(callback: IntegerAttributeCallback) { + suspend fun readLevelValueAttribute(): Integer { // Implementation needs to be added here } - fun subscribeLevelValueAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeLevelValueAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 1068u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm25ConcentrationMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm25ConcentrationMeasurementCluster.kt index cd979770c0f4f5..251190e5dc24dc 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm25ConcentrationMeasurementCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm25ConcentrationMeasurementCluster.kt @@ -20,283 +20,188 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class Pm25ConcentrationMeasurementCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 1066u - } - - interface MeasuredValueAttributeCallback { - fun onSuccess(value: Float?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface MinMeasuredValueAttributeCallback { - fun onSuccess(value: Float?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface MaxMeasuredValueAttributeCallback { - fun onSuccess(value: Float?) - - fun onError(ex: Exception) + class MeasuredValueAttribute(val value: Float?) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface PeakMeasuredValueAttributeCallback { - fun onSuccess(value: Float?) + class MinMeasuredValueAttribute(val value: Float?) - fun onError(ex: Exception) + class MaxMeasuredValueAttribute(val value: Float?) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class PeakMeasuredValueAttribute(val value: Float?) - interface AverageMeasuredValueAttributeCallback { - fun onSuccess(value: Float?) + class AverageMeasuredValueAttribute(val value: Float?) - fun onError(ex: Exception) + class GeneratedCommandListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AcceptedCommandListAttribute(val value: ArrayList) - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class EventListAttribute(val value: ArrayList) - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) + class AttributeListAttribute(val value: ArrayList) - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readMeasuredValueAttribute(callback: MeasuredValueAttributeCallback) { + suspend fun readMeasuredValueAttribute(): MeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeMeasuredValueAttribute( - callback: MeasuredValueAttributeCallback, + suspend fun subscribeMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): MeasuredValueAttribute { // Implementation needs to be added here } - fun readMinMeasuredValueAttribute(callback: MinMeasuredValueAttributeCallback) { + suspend fun readMinMeasuredValueAttribute(): MinMeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeMinMeasuredValueAttribute( - callback: MinMeasuredValueAttributeCallback, + suspend fun subscribeMinMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): MinMeasuredValueAttribute { // Implementation needs to be added here } - fun readMaxMeasuredValueAttribute(callback: MaxMeasuredValueAttributeCallback) { + suspend fun readMaxMeasuredValueAttribute(): MaxMeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeMaxMeasuredValueAttribute( - callback: MaxMeasuredValueAttributeCallback, + suspend fun subscribeMaxMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): MaxMeasuredValueAttribute { // Implementation needs to be added here } - fun readPeakMeasuredValueAttribute(callback: PeakMeasuredValueAttributeCallback) { + suspend fun readPeakMeasuredValueAttribute(): PeakMeasuredValueAttribute { // Implementation needs to be added here } - fun subscribePeakMeasuredValueAttribute( - callback: PeakMeasuredValueAttributeCallback, + suspend fun subscribePeakMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): PeakMeasuredValueAttribute { // Implementation needs to be added here } - fun readPeakMeasuredValueWindowAttribute(callback: LongAttributeCallback) { + suspend fun readPeakMeasuredValueWindowAttribute(): Long { // Implementation needs to be added here } - fun subscribePeakMeasuredValueWindowAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribePeakMeasuredValueWindowAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readAverageMeasuredValueAttribute(callback: AverageMeasuredValueAttributeCallback) { + suspend fun readAverageMeasuredValueAttribute(): AverageMeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeAverageMeasuredValueAttribute( - callback: AverageMeasuredValueAttributeCallback, + suspend fun subscribeAverageMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): AverageMeasuredValueAttribute { // Implementation needs to be added here } - fun readAverageMeasuredValueWindowAttribute(callback: LongAttributeCallback) { + suspend fun readAverageMeasuredValueWindowAttribute(): Long { // Implementation needs to be added here } - fun subscribeAverageMeasuredValueWindowAttribute( - callback: LongAttributeCallback, + suspend fun subscribeAverageMeasuredValueWindowAttribute( minInterval: Int, maxInterval: Int - ) { + ): Long { // Implementation needs to be added here } - fun readUncertaintyAttribute(callback: FloatAttributeCallback) { + suspend fun readUncertaintyAttribute(): Float { // Implementation needs to be added here } - fun subscribeUncertaintyAttribute( - callback: FloatAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeUncertaintyAttribute(minInterval: Int, maxInterval: Int): Float { // Implementation needs to be added here } - fun readMeasurementUnitAttribute(callback: IntegerAttributeCallback) { + suspend fun readMeasurementUnitAttribute(): Integer { // Implementation needs to be added here } - fun subscribeMeasurementUnitAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeMeasurementUnitAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readMeasurementMediumAttribute(callback: IntegerAttributeCallback) { + suspend fun readMeasurementMediumAttribute(): Integer { // Implementation needs to be added here } - fun subscribeMeasurementMediumAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeMeasurementMediumAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readLevelValueAttribute(callback: IntegerAttributeCallback) { + suspend fun readLevelValueAttribute(): Integer { // Implementation needs to be added here } - fun subscribeLevelValueAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeLevelValueAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 1066u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PowerSourceCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PowerSourceCluster.kt index b2e21c408b0e8c..f4a7540167e7f3 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PowerSourceCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PowerSourceCluster.kt @@ -20,593 +20,394 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class PowerSourceCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 47u - } + class WiredAssessedInputVoltageAttribute(val value: UInt?) - interface WiredAssessedInputVoltageAttributeCallback { - fun onSuccess(value: Long?) + class WiredAssessedInputFrequencyAttribute(val value: UShort?) - fun onError(ex: Exception) + class WiredAssessedCurrentAttribute(val value: UInt?) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class ActiveWiredFaultsAttribute(val value: ArrayList?) - interface WiredAssessedInputFrequencyAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class BatVoltageAttribute(val value: UInt?) - interface WiredAssessedCurrentAttributeCallback { - fun onSuccess(value: Long?) + class BatPercentRemainingAttribute(val value: UByte?) - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface ActiveWiredFaultsAttributeCallback { - fun onSuccess(value: ArrayList?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface BatVoltageAttributeCallback { - fun onSuccess(value: Long?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface BatPercentRemainingAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface BatTimeRemainingAttributeCallback { - fun onSuccess(value: Long?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface ActiveBatFaultsAttributeCallback { - fun onSuccess(value: ArrayList?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface BatTimeToFullChargeAttributeCallback { - fun onSuccess(value: Long?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface BatChargingCurrentAttributeCallback { - fun onSuccess(value: Long?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface ActiveBatChargeFaultsAttributeCallback { - fun onSuccess(value: ArrayList?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EndpointListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class BatTimeRemainingAttribute(val value: UInt?) - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) + class ActiveBatFaultsAttribute(val value: ArrayList?) - fun onError(ex: Exception) + class BatTimeToFullChargeAttribute(val value: UInt?) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class BatChargingCurrentAttribute(val value: UInt?) - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) + class ActiveBatChargeFaultsAttribute(val value: ArrayList?) - fun onError(ex: Exception) + class EndpointListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class GeneratedCommandListAttribute(val value: ArrayList) - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) + class AcceptedCommandListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class EventListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AttributeListAttribute(val value: ArrayList) - fun readStatusAttribute(callback: IntegerAttributeCallback) { + suspend fun readStatusAttribute(): Integer { // Implementation needs to be added here } - fun subscribeStatusAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeStatusAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readOrderAttribute(callback: IntegerAttributeCallback) { + suspend fun readOrderAttribute(): Integer { // Implementation needs to be added here } - fun subscribeOrderAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeOrderAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readDescriptionAttribute(callback: CharStringAttributeCallback) { + suspend fun readDescriptionAttribute(): CharString { // Implementation needs to be added here } - fun subscribeDescriptionAttribute( - callback: CharStringAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeDescriptionAttribute(minInterval: Int, maxInterval: Int): CharString { // Implementation needs to be added here } - fun readWiredAssessedInputVoltageAttribute(callback: WiredAssessedInputVoltageAttributeCallback) { + suspend fun readWiredAssessedInputVoltageAttribute(): WiredAssessedInputVoltageAttribute { // Implementation needs to be added here } - fun subscribeWiredAssessedInputVoltageAttribute( - callback: WiredAssessedInputVoltageAttributeCallback, + suspend fun subscribeWiredAssessedInputVoltageAttribute( minInterval: Int, maxInterval: Int - ) { + ): WiredAssessedInputVoltageAttribute { // Implementation needs to be added here } - fun readWiredAssessedInputFrequencyAttribute( - callback: WiredAssessedInputFrequencyAttributeCallback - ) { + suspend fun readWiredAssessedInputFrequencyAttribute(): WiredAssessedInputFrequencyAttribute { // Implementation needs to be added here } - fun subscribeWiredAssessedInputFrequencyAttribute( - callback: WiredAssessedInputFrequencyAttributeCallback, + suspend fun subscribeWiredAssessedInputFrequencyAttribute( minInterval: Int, maxInterval: Int - ) { + ): WiredAssessedInputFrequencyAttribute { // Implementation needs to be added here } - fun readWiredCurrentTypeAttribute(callback: IntegerAttributeCallback) { + suspend fun readWiredCurrentTypeAttribute(): Integer { // Implementation needs to be added here } - fun subscribeWiredCurrentTypeAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeWiredCurrentTypeAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readWiredAssessedCurrentAttribute(callback: WiredAssessedCurrentAttributeCallback) { + suspend fun readWiredAssessedCurrentAttribute(): WiredAssessedCurrentAttribute { // Implementation needs to be added here } - fun subscribeWiredAssessedCurrentAttribute( - callback: WiredAssessedCurrentAttributeCallback, + suspend fun subscribeWiredAssessedCurrentAttribute( minInterval: Int, maxInterval: Int - ) { + ): WiredAssessedCurrentAttribute { // Implementation needs to be added here } - fun readWiredNominalVoltageAttribute(callback: LongAttributeCallback) { + suspend fun readWiredNominalVoltageAttribute(): Long { // Implementation needs to be added here } - fun subscribeWiredNominalVoltageAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeWiredNominalVoltageAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readWiredMaximumCurrentAttribute(callback: LongAttributeCallback) { + suspend fun readWiredMaximumCurrentAttribute(): Long { // Implementation needs to be added here } - fun subscribeWiredMaximumCurrentAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeWiredMaximumCurrentAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readWiredPresentAttribute(callback: BooleanAttributeCallback) { + suspend fun readWiredPresentAttribute(): Boolean { // Implementation needs to be added here } - fun subscribeWiredPresentAttribute( - callback: BooleanAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeWiredPresentAttribute(minInterval: Int, maxInterval: Int): Boolean { // Implementation needs to be added here } - fun readActiveWiredFaultsAttribute(callback: ActiveWiredFaultsAttributeCallback) { + suspend fun readActiveWiredFaultsAttribute(): ActiveWiredFaultsAttribute { // Implementation needs to be added here } - fun subscribeActiveWiredFaultsAttribute( - callback: ActiveWiredFaultsAttributeCallback, + suspend fun subscribeActiveWiredFaultsAttribute( minInterval: Int, maxInterval: Int - ) { + ): ActiveWiredFaultsAttribute { // Implementation needs to be added here } - fun readBatVoltageAttribute(callback: BatVoltageAttributeCallback) { + suspend fun readBatVoltageAttribute(): BatVoltageAttribute { // Implementation needs to be added here } - fun subscribeBatVoltageAttribute( - callback: BatVoltageAttributeCallback, + suspend fun subscribeBatVoltageAttribute( minInterval: Int, maxInterval: Int - ) { + ): BatVoltageAttribute { // Implementation needs to be added here } - fun readBatPercentRemainingAttribute(callback: BatPercentRemainingAttributeCallback) { + suspend fun readBatPercentRemainingAttribute(): BatPercentRemainingAttribute { // Implementation needs to be added here } - fun subscribeBatPercentRemainingAttribute( - callback: BatPercentRemainingAttributeCallback, + suspend fun subscribeBatPercentRemainingAttribute( minInterval: Int, maxInterval: Int - ) { + ): BatPercentRemainingAttribute { // Implementation needs to be added here } - fun readBatTimeRemainingAttribute(callback: BatTimeRemainingAttributeCallback) { + suspend fun readBatTimeRemainingAttribute(): BatTimeRemainingAttribute { // Implementation needs to be added here } - fun subscribeBatTimeRemainingAttribute( - callback: BatTimeRemainingAttributeCallback, + suspend fun subscribeBatTimeRemainingAttribute( minInterval: Int, maxInterval: Int - ) { + ): BatTimeRemainingAttribute { // Implementation needs to be added here } - fun readBatChargeLevelAttribute(callback: IntegerAttributeCallback) { + suspend fun readBatChargeLevelAttribute(): Integer { // Implementation needs to be added here } - fun subscribeBatChargeLevelAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeBatChargeLevelAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readBatReplacementNeededAttribute(callback: BooleanAttributeCallback) { + suspend fun readBatReplacementNeededAttribute(): Boolean { // Implementation needs to be added here } - fun subscribeBatReplacementNeededAttribute( - callback: BooleanAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeBatReplacementNeededAttribute(minInterval: Int, maxInterval: Int): Boolean { // Implementation needs to be added here } - fun readBatReplaceabilityAttribute(callback: IntegerAttributeCallback) { + suspend fun readBatReplaceabilityAttribute(): Integer { // Implementation needs to be added here } - fun subscribeBatReplaceabilityAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeBatReplaceabilityAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readBatPresentAttribute(callback: BooleanAttributeCallback) { + suspend fun readBatPresentAttribute(): Boolean { // Implementation needs to be added here } - fun subscribeBatPresentAttribute( - callback: BooleanAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeBatPresentAttribute(minInterval: Int, maxInterval: Int): Boolean { // Implementation needs to be added here } - fun readActiveBatFaultsAttribute(callback: ActiveBatFaultsAttributeCallback) { + suspend fun readActiveBatFaultsAttribute(): ActiveBatFaultsAttribute { // Implementation needs to be added here } - fun subscribeActiveBatFaultsAttribute( - callback: ActiveBatFaultsAttributeCallback, + suspend fun subscribeActiveBatFaultsAttribute( minInterval: Int, maxInterval: Int - ) { + ): ActiveBatFaultsAttribute { // Implementation needs to be added here } - fun readBatReplacementDescriptionAttribute(callback: CharStringAttributeCallback) { + suspend fun readBatReplacementDescriptionAttribute(): CharString { // Implementation needs to be added here } - fun subscribeBatReplacementDescriptionAttribute( - callback: CharStringAttributeCallback, + suspend fun subscribeBatReplacementDescriptionAttribute( minInterval: Int, maxInterval: Int - ) { + ): CharString { // Implementation needs to be added here } - fun readBatCommonDesignationAttribute(callback: IntegerAttributeCallback) { + suspend fun readBatCommonDesignationAttribute(): Integer { // Implementation needs to be added here } - fun subscribeBatCommonDesignationAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeBatCommonDesignationAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readBatANSIDesignationAttribute(callback: CharStringAttributeCallback) { + suspend fun readBatANSIDesignationAttribute(): CharString { // Implementation needs to be added here } - fun subscribeBatANSIDesignationAttribute( - callback: CharStringAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeBatANSIDesignationAttribute(minInterval: Int, maxInterval: Int): CharString { // Implementation needs to be added here } - fun readBatIECDesignationAttribute(callback: CharStringAttributeCallback) { + suspend fun readBatIECDesignationAttribute(): CharString { // Implementation needs to be added here } - fun subscribeBatIECDesignationAttribute( - callback: CharStringAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeBatIECDesignationAttribute(minInterval: Int, maxInterval: Int): CharString { // Implementation needs to be added here } - fun readBatApprovedChemistryAttribute(callback: IntegerAttributeCallback) { + suspend fun readBatApprovedChemistryAttribute(): Integer { // Implementation needs to be added here } - fun subscribeBatApprovedChemistryAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeBatApprovedChemistryAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readBatCapacityAttribute(callback: LongAttributeCallback) { + suspend fun readBatCapacityAttribute(): Long { // Implementation needs to be added here } - fun subscribeBatCapacityAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeBatCapacityAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readBatQuantityAttribute(callback: IntegerAttributeCallback) { + suspend fun readBatQuantityAttribute(): Integer { // Implementation needs to be added here } - fun subscribeBatQuantityAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeBatQuantityAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readBatChargeStateAttribute(callback: IntegerAttributeCallback) { + suspend fun readBatChargeStateAttribute(): Integer { // Implementation needs to be added here } - fun subscribeBatChargeStateAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeBatChargeStateAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readBatTimeToFullChargeAttribute(callback: BatTimeToFullChargeAttributeCallback) { + suspend fun readBatTimeToFullChargeAttribute(): BatTimeToFullChargeAttribute { // Implementation needs to be added here } - fun subscribeBatTimeToFullChargeAttribute( - callback: BatTimeToFullChargeAttributeCallback, + suspend fun subscribeBatTimeToFullChargeAttribute( minInterval: Int, maxInterval: Int - ) { + ): BatTimeToFullChargeAttribute { // Implementation needs to be added here } - fun readBatFunctionalWhileChargingAttribute(callback: BooleanAttributeCallback) { + suspend fun readBatFunctionalWhileChargingAttribute(): Boolean { // Implementation needs to be added here } - fun subscribeBatFunctionalWhileChargingAttribute( - callback: BooleanAttributeCallback, + suspend fun subscribeBatFunctionalWhileChargingAttribute( minInterval: Int, maxInterval: Int - ) { + ): Boolean { // Implementation needs to be added here } - fun readBatChargingCurrentAttribute(callback: BatChargingCurrentAttributeCallback) { + suspend fun readBatChargingCurrentAttribute(): BatChargingCurrentAttribute { // Implementation needs to be added here } - fun subscribeBatChargingCurrentAttribute( - callback: BatChargingCurrentAttributeCallback, + suspend fun subscribeBatChargingCurrentAttribute( minInterval: Int, maxInterval: Int - ) { + ): BatChargingCurrentAttribute { // Implementation needs to be added here } - fun readActiveBatChargeFaultsAttribute(callback: ActiveBatChargeFaultsAttributeCallback) { + suspend fun readActiveBatChargeFaultsAttribute(): ActiveBatChargeFaultsAttribute { // Implementation needs to be added here } - fun subscribeActiveBatChargeFaultsAttribute( - callback: ActiveBatChargeFaultsAttributeCallback, + suspend fun subscribeActiveBatChargeFaultsAttribute( minInterval: Int, maxInterval: Int - ) { + ): ActiveBatChargeFaultsAttribute { // Implementation needs to be added here } - fun readEndpointListAttribute(callback: EndpointListAttributeCallback) { + suspend fun readEndpointListAttribute(): EndpointListAttribute { // Implementation needs to be added here } - fun subscribeEndpointListAttribute( - callback: EndpointListAttributeCallback, + suspend fun subscribeEndpointListAttribute( minInterval: Int, maxInterval: Int - ) { + ): EndpointListAttribute { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 47u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PowerSourceConfigurationCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PowerSourceConfigurationCluster.kt index d81ff7109df0b8..34e8ca1b244df2 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PowerSourceConfigurationCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PowerSourceConfigurationCluster.kt @@ -20,131 +20,82 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class PowerSourceConfigurationCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 46u - } - - interface SourcesAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) + class SourcesAttribute(val value: ArrayList) - fun onError(ex: Exception) + class GeneratedCommandListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) + class AcceptedCommandListAttribute(val value: ArrayList) - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class EventListAttribute(val value: ArrayList) - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) + class AttributeListAttribute(val value: ArrayList) - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readSourcesAttribute(callback: SourcesAttributeCallback) { + suspend fun readSourcesAttribute(): SourcesAttribute { // Implementation needs to be added here } - fun subscribeSourcesAttribute( - callback: SourcesAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeSourcesAttribute(minInterval: Int, maxInterval: Int): SourcesAttribute { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 46u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PressureMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PressureMeasurementCluster.kt index 46a06ca398630e..52e73b9e3eab25 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PressureMeasurementCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PressureMeasurementCluster.kt @@ -20,267 +20,174 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class PressureMeasurementCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 1027u - } - - interface MeasuredValueAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface MinMeasuredValueAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface MaxMeasuredValueAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface ScaledValueAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface MinScaledValueAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface MaxScaledValueAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) + class MeasuredValueAttribute(val value: Short?) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) + class MinMeasuredValueAttribute(val value: Short?) - fun onError(ex: Exception) + class MaxMeasuredValueAttribute(val value: Short?) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class ScaledValueAttribute(val value: Short?) - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) + class MinScaledValueAttribute(val value: Short?) - fun onError(ex: Exception) + class MaxScaledValueAttribute(val value: Short?) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class GeneratedCommandListAttribute(val value: ArrayList) - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AcceptedCommandListAttribute(val value: ArrayList) - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) + class EventListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class AttributeListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readMeasuredValueAttribute(callback: MeasuredValueAttributeCallback) { + suspend fun readMeasuredValueAttribute(): MeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeMeasuredValueAttribute( - callback: MeasuredValueAttributeCallback, + suspend fun subscribeMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): MeasuredValueAttribute { // Implementation needs to be added here } - fun readMinMeasuredValueAttribute(callback: MinMeasuredValueAttributeCallback) { + suspend fun readMinMeasuredValueAttribute(): MinMeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeMinMeasuredValueAttribute( - callback: MinMeasuredValueAttributeCallback, + suspend fun subscribeMinMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): MinMeasuredValueAttribute { // Implementation needs to be added here } - fun readMaxMeasuredValueAttribute(callback: MaxMeasuredValueAttributeCallback) { + suspend fun readMaxMeasuredValueAttribute(): MaxMeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeMaxMeasuredValueAttribute( - callback: MaxMeasuredValueAttributeCallback, + suspend fun subscribeMaxMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): MaxMeasuredValueAttribute { // Implementation needs to be added here } - fun readToleranceAttribute(callback: IntegerAttributeCallback) { + suspend fun readToleranceAttribute(): Integer { // Implementation needs to be added here } - fun subscribeToleranceAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeToleranceAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readScaledValueAttribute(callback: ScaledValueAttributeCallback) { + suspend fun readScaledValueAttribute(): ScaledValueAttribute { // Implementation needs to be added here } - fun subscribeScaledValueAttribute( - callback: ScaledValueAttributeCallback, + suspend fun subscribeScaledValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): ScaledValueAttribute { // Implementation needs to be added here } - fun readMinScaledValueAttribute(callback: MinScaledValueAttributeCallback) { + suspend fun readMinScaledValueAttribute(): MinScaledValueAttribute { // Implementation needs to be added here } - fun subscribeMinScaledValueAttribute( - callback: MinScaledValueAttributeCallback, + suspend fun subscribeMinScaledValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): MinScaledValueAttribute { // Implementation needs to be added here } - fun readMaxScaledValueAttribute(callback: MaxScaledValueAttributeCallback) { + suspend fun readMaxScaledValueAttribute(): MaxScaledValueAttribute { // Implementation needs to be added here } - fun subscribeMaxScaledValueAttribute( - callback: MaxScaledValueAttributeCallback, + suspend fun subscribeMaxScaledValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): MaxScaledValueAttribute { // Implementation needs to be added here } - fun readScaledToleranceAttribute(callback: IntegerAttributeCallback) { + suspend fun readScaledToleranceAttribute(): Integer { // Implementation needs to be added here } - fun subscribeScaledToleranceAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeScaledToleranceAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readScaleAttribute(callback: IntegerAttributeCallback) { + suspend fun readScaleAttribute(): Integer { // Implementation needs to be added here } - fun subscribeScaleAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeScaleAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 1027u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyConfigurationCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyConfigurationCluster.kt index 6c558514fc7a72..9d75f438e3f861 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyConfigurationCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyConfigurationCluster.kt @@ -20,111 +20,72 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class ProxyConfigurationCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 66u - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) + class GeneratedCommandListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) + class AcceptedCommandListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class EventListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AttributeListAttribute(val value: ArrayList) - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 66u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyDiscoveryCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyDiscoveryCluster.kt index aa4463f9176547..2933f46526fc51 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyDiscoveryCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyDiscoveryCluster.kt @@ -20,111 +20,72 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class ProxyDiscoveryCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 67u - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) + class GeneratedCommandListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) + class AcceptedCommandListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class EventListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AttributeListAttribute(val value: ArrayList) - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 67u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyValidCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyValidCluster.kt index 7903220186e8c0..b7c2f43e30810c 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyValidCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyValidCluster.kt @@ -20,111 +20,72 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class ProxyValidCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 68u - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) + class GeneratedCommandListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) + class AcceptedCommandListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class EventListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AttributeListAttribute(val value: ArrayList) - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 68u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PulseWidthModulationCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PulseWidthModulationCluster.kt index 1c2a93699d5d41..f0ebebcd008dde 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PulseWidthModulationCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PulseWidthModulationCluster.kt @@ -20,111 +20,72 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class PulseWidthModulationCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 28u - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) + class GeneratedCommandListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) + class AcceptedCommandListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class EventListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AttributeListAttribute(val value: ArrayList) - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 28u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PumpConfigurationAndControlCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PumpConfigurationAndControlCluster.kt index add5d698398fb5..3b92a86031b99a 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PumpConfigurationAndControlCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PumpConfigurationAndControlCluster.kt @@ -20,579 +20,366 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class PumpConfigurationAndControlCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 512u - } - - interface MaxPressureAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface MaxSpeedAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface MaxFlowAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface MinConstPressureAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface MaxConstPressureAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface MinCompPressureAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface MaxCompPressureAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface MinConstSpeedAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface MaxConstSpeedAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface MinConstFlowAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface MaxConstFlowAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface MinConstTempAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) + class MaxPressureAttribute(val value: Short?) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class MaxSpeedAttribute(val value: UShort?) - interface MaxConstTempAttributeCallback { - fun onSuccess(value: Integer?) + class MaxFlowAttribute(val value: UShort?) - fun onError(ex: Exception) + class MinConstPressureAttribute(val value: Short?) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class MaxConstPressureAttribute(val value: Short?) - interface CapacityAttributeCallback { - fun onSuccess(value: Integer?) + class MinCompPressureAttribute(val value: Short?) - fun onError(ex: Exception) + class MaxCompPressureAttribute(val value: Short?) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class MinConstSpeedAttribute(val value: UShort?) - interface SpeedAttributeCallback { - fun onSuccess(value: Integer?) + class MaxConstSpeedAttribute(val value: UShort?) - fun onError(ex: Exception) + class MinConstFlowAttribute(val value: UShort?) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class MaxConstFlowAttribute(val value: UShort?) - interface LifetimeRunningHoursAttributeCallback { - fun onSuccess(value: Long?) + class MinConstTempAttribute(val value: Short?) - fun onError(ex: Exception) + class MaxConstTempAttribute(val value: Short?) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class CapacityAttribute(val value: Short?) - interface PowerAttributeCallback { - fun onSuccess(value: Long?) + class SpeedAttribute(val value: UShort?) - fun onError(ex: Exception) + class LifetimeRunningHoursAttribute(val value: UInt?) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class PowerAttribute(val value: UInt?) - interface LifetimeEnergyConsumedAttributeCallback { - fun onSuccess(value: Long?) + class LifetimeEnergyConsumedAttribute(val value: UInt?) - fun onError(ex: Exception) + class GeneratedCommandListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AcceptedCommandListAttribute(val value: ArrayList) - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) + class EventListAttribute(val value: ArrayList) - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AttributeListAttribute(val value: ArrayList) - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readMaxPressureAttribute(callback: MaxPressureAttributeCallback) { + suspend fun readMaxPressureAttribute(): MaxPressureAttribute { // Implementation needs to be added here } - fun subscribeMaxPressureAttribute( - callback: MaxPressureAttributeCallback, + suspend fun subscribeMaxPressureAttribute( minInterval: Int, maxInterval: Int - ) { + ): MaxPressureAttribute { // Implementation needs to be added here } - fun readMaxSpeedAttribute(callback: MaxSpeedAttributeCallback) { + suspend fun readMaxSpeedAttribute(): MaxSpeedAttribute { // Implementation needs to be added here } - fun subscribeMaxSpeedAttribute( - callback: MaxSpeedAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeMaxSpeedAttribute(minInterval: Int, maxInterval: Int): MaxSpeedAttribute { // Implementation needs to be added here } - fun readMaxFlowAttribute(callback: MaxFlowAttributeCallback) { + suspend fun readMaxFlowAttribute(): MaxFlowAttribute { // Implementation needs to be added here } - fun subscribeMaxFlowAttribute( - callback: MaxFlowAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeMaxFlowAttribute(minInterval: Int, maxInterval: Int): MaxFlowAttribute { // Implementation needs to be added here } - fun readMinConstPressureAttribute(callback: MinConstPressureAttributeCallback) { + suspend fun readMinConstPressureAttribute(): MinConstPressureAttribute { // Implementation needs to be added here } - fun subscribeMinConstPressureAttribute( - callback: MinConstPressureAttributeCallback, + suspend fun subscribeMinConstPressureAttribute( minInterval: Int, maxInterval: Int - ) { + ): MinConstPressureAttribute { // Implementation needs to be added here } - fun readMaxConstPressureAttribute(callback: MaxConstPressureAttributeCallback) { + suspend fun readMaxConstPressureAttribute(): MaxConstPressureAttribute { // Implementation needs to be added here } - fun subscribeMaxConstPressureAttribute( - callback: MaxConstPressureAttributeCallback, + suspend fun subscribeMaxConstPressureAttribute( minInterval: Int, maxInterval: Int - ) { + ): MaxConstPressureAttribute { // Implementation needs to be added here } - fun readMinCompPressureAttribute(callback: MinCompPressureAttributeCallback) { + suspend fun readMinCompPressureAttribute(): MinCompPressureAttribute { // Implementation needs to be added here } - fun subscribeMinCompPressureAttribute( - callback: MinCompPressureAttributeCallback, + suspend fun subscribeMinCompPressureAttribute( minInterval: Int, maxInterval: Int - ) { + ): MinCompPressureAttribute { // Implementation needs to be added here } - fun readMaxCompPressureAttribute(callback: MaxCompPressureAttributeCallback) { + suspend fun readMaxCompPressureAttribute(): MaxCompPressureAttribute { // Implementation needs to be added here } - fun subscribeMaxCompPressureAttribute( - callback: MaxCompPressureAttributeCallback, + suspend fun subscribeMaxCompPressureAttribute( minInterval: Int, maxInterval: Int - ) { + ): MaxCompPressureAttribute { // Implementation needs to be added here } - fun readMinConstSpeedAttribute(callback: MinConstSpeedAttributeCallback) { + suspend fun readMinConstSpeedAttribute(): MinConstSpeedAttribute { // Implementation needs to be added here } - fun subscribeMinConstSpeedAttribute( - callback: MinConstSpeedAttributeCallback, + suspend fun subscribeMinConstSpeedAttribute( minInterval: Int, maxInterval: Int - ) { + ): MinConstSpeedAttribute { // Implementation needs to be added here } - fun readMaxConstSpeedAttribute(callback: MaxConstSpeedAttributeCallback) { + suspend fun readMaxConstSpeedAttribute(): MaxConstSpeedAttribute { // Implementation needs to be added here } - fun subscribeMaxConstSpeedAttribute( - callback: MaxConstSpeedAttributeCallback, + suspend fun subscribeMaxConstSpeedAttribute( minInterval: Int, maxInterval: Int - ) { + ): MaxConstSpeedAttribute { // Implementation needs to be added here } - fun readMinConstFlowAttribute(callback: MinConstFlowAttributeCallback) { + suspend fun readMinConstFlowAttribute(): MinConstFlowAttribute { // Implementation needs to be added here } - fun subscribeMinConstFlowAttribute( - callback: MinConstFlowAttributeCallback, + suspend fun subscribeMinConstFlowAttribute( minInterval: Int, maxInterval: Int - ) { + ): MinConstFlowAttribute { // Implementation needs to be added here } - fun readMaxConstFlowAttribute(callback: MaxConstFlowAttributeCallback) { + suspend fun readMaxConstFlowAttribute(): MaxConstFlowAttribute { // Implementation needs to be added here } - fun subscribeMaxConstFlowAttribute( - callback: MaxConstFlowAttributeCallback, + suspend fun subscribeMaxConstFlowAttribute( minInterval: Int, maxInterval: Int - ) { + ): MaxConstFlowAttribute { // Implementation needs to be added here } - fun readMinConstTempAttribute(callback: MinConstTempAttributeCallback) { + suspend fun readMinConstTempAttribute(): MinConstTempAttribute { // Implementation needs to be added here } - fun subscribeMinConstTempAttribute( - callback: MinConstTempAttributeCallback, + suspend fun subscribeMinConstTempAttribute( minInterval: Int, maxInterval: Int - ) { + ): MinConstTempAttribute { // Implementation needs to be added here } - fun readMaxConstTempAttribute(callback: MaxConstTempAttributeCallback) { + suspend fun readMaxConstTempAttribute(): MaxConstTempAttribute { // Implementation needs to be added here } - fun subscribeMaxConstTempAttribute( - callback: MaxConstTempAttributeCallback, + suspend fun subscribeMaxConstTempAttribute( minInterval: Int, maxInterval: Int - ) { + ): MaxConstTempAttribute { // Implementation needs to be added here } - fun readPumpStatusAttribute(callback: IntegerAttributeCallback) { + suspend fun readPumpStatusAttribute(): Integer { // Implementation needs to be added here } - fun subscribePumpStatusAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribePumpStatusAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readEffectiveOperationModeAttribute(callback: IntegerAttributeCallback) { + suspend fun readEffectiveOperationModeAttribute(): Integer { // Implementation needs to be added here } - fun subscribeEffectiveOperationModeAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeEffectiveOperationModeAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readEffectiveControlModeAttribute(callback: IntegerAttributeCallback) { + suspend fun readEffectiveControlModeAttribute(): Integer { // Implementation needs to be added here } - fun subscribeEffectiveControlModeAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEffectiveControlModeAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readCapacityAttribute(callback: CapacityAttributeCallback) { + suspend fun readCapacityAttribute(): CapacityAttribute { // Implementation needs to be added here } - fun subscribeCapacityAttribute( - callback: CapacityAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeCapacityAttribute(minInterval: Int, maxInterval: Int): CapacityAttribute { // Implementation needs to be added here } - fun readSpeedAttribute(callback: SpeedAttributeCallback) { + suspend fun readSpeedAttribute(): SpeedAttribute { // Implementation needs to be added here } - fun subscribeSpeedAttribute( - callback: SpeedAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeSpeedAttribute(minInterval: Int, maxInterval: Int): SpeedAttribute { // Implementation needs to be added here } - fun readLifetimeRunningHoursAttribute(callback: LifetimeRunningHoursAttributeCallback) { + suspend fun readLifetimeRunningHoursAttribute(): LifetimeRunningHoursAttribute { // Implementation needs to be added here } - fun writeLifetimeRunningHoursAttribute(callback: DefaultClusterCallback, value: Long) { + suspend fun writeLifetimeRunningHoursAttribute(value: UInt) { // Implementation needs to be added here } - fun writeLifetimeRunningHoursAttribute( - callback: DefaultClusterCallback, - value: Long, - timedWriteTimeoutMs: Int - ) { + suspend fun writeLifetimeRunningHoursAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeLifetimeRunningHoursAttribute( - callback: LifetimeRunningHoursAttributeCallback, + suspend fun subscribeLifetimeRunningHoursAttribute( minInterval: Int, maxInterval: Int - ) { + ): LifetimeRunningHoursAttribute { // Implementation needs to be added here } - fun readPowerAttribute(callback: PowerAttributeCallback) { + suspend fun readPowerAttribute(): PowerAttribute { // Implementation needs to be added here } - fun subscribePowerAttribute( - callback: PowerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribePowerAttribute(minInterval: Int, maxInterval: Int): PowerAttribute { // Implementation needs to be added here } - fun readLifetimeEnergyConsumedAttribute(callback: LifetimeEnergyConsumedAttributeCallback) { + suspend fun readLifetimeEnergyConsumedAttribute(): LifetimeEnergyConsumedAttribute { // Implementation needs to be added here } - fun writeLifetimeEnergyConsumedAttribute(callback: DefaultClusterCallback, value: Long) { + suspend fun writeLifetimeEnergyConsumedAttribute(value: UInt) { // Implementation needs to be added here } - fun writeLifetimeEnergyConsumedAttribute( - callback: DefaultClusterCallback, - value: Long, - timedWriteTimeoutMs: Int - ) { + suspend fun writeLifetimeEnergyConsumedAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeLifetimeEnergyConsumedAttribute( - callback: LifetimeEnergyConsumedAttributeCallback, + suspend fun subscribeLifetimeEnergyConsumedAttribute( minInterval: Int, maxInterval: Int - ) { + ): LifetimeEnergyConsumedAttribute { // Implementation needs to be added here } - fun readOperationModeAttribute(callback: IntegerAttributeCallback) { + suspend fun readOperationModeAttribute(): Integer { // Implementation needs to be added here } - fun writeOperationModeAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeOperationModeAttribute(value: UInt) { // Implementation needs to be added here } - fun writeOperationModeAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeOperationModeAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeOperationModeAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeOperationModeAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readControlModeAttribute(callback: IntegerAttributeCallback) { + suspend fun readControlModeAttribute(): Integer { // Implementation needs to be added here } - fun writeControlModeAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeControlModeAttribute(value: UInt) { // Implementation needs to be added here } - fun writeControlModeAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeControlModeAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeControlModeAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeControlModeAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 512u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RadonConcentrationMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RadonConcentrationMeasurementCluster.kt index 53454570dcc3c5..8e3a86a1da46dd 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RadonConcentrationMeasurementCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RadonConcentrationMeasurementCluster.kt @@ -20,283 +20,188 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class RadonConcentrationMeasurementCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 1071u - } - - interface MeasuredValueAttributeCallback { - fun onSuccess(value: Float?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface MinMeasuredValueAttributeCallback { - fun onSuccess(value: Float?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface MaxMeasuredValueAttributeCallback { - fun onSuccess(value: Float?) - - fun onError(ex: Exception) + class MeasuredValueAttribute(val value: Float?) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface PeakMeasuredValueAttributeCallback { - fun onSuccess(value: Float?) + class MinMeasuredValueAttribute(val value: Float?) - fun onError(ex: Exception) + class MaxMeasuredValueAttribute(val value: Float?) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class PeakMeasuredValueAttribute(val value: Float?) - interface AverageMeasuredValueAttributeCallback { - fun onSuccess(value: Float?) + class AverageMeasuredValueAttribute(val value: Float?) - fun onError(ex: Exception) + class GeneratedCommandListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AcceptedCommandListAttribute(val value: ArrayList) - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class EventListAttribute(val value: ArrayList) - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) + class AttributeListAttribute(val value: ArrayList) - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readMeasuredValueAttribute(callback: MeasuredValueAttributeCallback) { + suspend fun readMeasuredValueAttribute(): MeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeMeasuredValueAttribute( - callback: MeasuredValueAttributeCallback, + suspend fun subscribeMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): MeasuredValueAttribute { // Implementation needs to be added here } - fun readMinMeasuredValueAttribute(callback: MinMeasuredValueAttributeCallback) { + suspend fun readMinMeasuredValueAttribute(): MinMeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeMinMeasuredValueAttribute( - callback: MinMeasuredValueAttributeCallback, + suspend fun subscribeMinMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): MinMeasuredValueAttribute { // Implementation needs to be added here } - fun readMaxMeasuredValueAttribute(callback: MaxMeasuredValueAttributeCallback) { + suspend fun readMaxMeasuredValueAttribute(): MaxMeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeMaxMeasuredValueAttribute( - callback: MaxMeasuredValueAttributeCallback, + suspend fun subscribeMaxMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): MaxMeasuredValueAttribute { // Implementation needs to be added here } - fun readPeakMeasuredValueAttribute(callback: PeakMeasuredValueAttributeCallback) { + suspend fun readPeakMeasuredValueAttribute(): PeakMeasuredValueAttribute { // Implementation needs to be added here } - fun subscribePeakMeasuredValueAttribute( - callback: PeakMeasuredValueAttributeCallback, + suspend fun subscribePeakMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): PeakMeasuredValueAttribute { // Implementation needs to be added here } - fun readPeakMeasuredValueWindowAttribute(callback: LongAttributeCallback) { + suspend fun readPeakMeasuredValueWindowAttribute(): Long { // Implementation needs to be added here } - fun subscribePeakMeasuredValueWindowAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribePeakMeasuredValueWindowAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readAverageMeasuredValueAttribute(callback: AverageMeasuredValueAttributeCallback) { + suspend fun readAverageMeasuredValueAttribute(): AverageMeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeAverageMeasuredValueAttribute( - callback: AverageMeasuredValueAttributeCallback, + suspend fun subscribeAverageMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): AverageMeasuredValueAttribute { // Implementation needs to be added here } - fun readAverageMeasuredValueWindowAttribute(callback: LongAttributeCallback) { + suspend fun readAverageMeasuredValueWindowAttribute(): Long { // Implementation needs to be added here } - fun subscribeAverageMeasuredValueWindowAttribute( - callback: LongAttributeCallback, + suspend fun subscribeAverageMeasuredValueWindowAttribute( minInterval: Int, maxInterval: Int - ) { + ): Long { // Implementation needs to be added here } - fun readUncertaintyAttribute(callback: FloatAttributeCallback) { + suspend fun readUncertaintyAttribute(): Float { // Implementation needs to be added here } - fun subscribeUncertaintyAttribute( - callback: FloatAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeUncertaintyAttribute(minInterval: Int, maxInterval: Int): Float { // Implementation needs to be added here } - fun readMeasurementUnitAttribute(callback: IntegerAttributeCallback) { + suspend fun readMeasurementUnitAttribute(): Integer { // Implementation needs to be added here } - fun subscribeMeasurementUnitAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeMeasurementUnitAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readMeasurementMediumAttribute(callback: IntegerAttributeCallback) { + suspend fun readMeasurementMediumAttribute(): Integer { // Implementation needs to be added here } - fun subscribeMeasurementMediumAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeMeasurementMediumAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readLevelValueAttribute(callback: IntegerAttributeCallback) { + suspend fun readLevelValueAttribute(): Integer { // Implementation needs to be added here } - fun subscribeLevelValueAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeLevelValueAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 1071u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RefrigeratorAlarmCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RefrigeratorAlarmCluster.kt index f401bcd1ad70bf..12d8df79b35501 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RefrigeratorAlarmCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RefrigeratorAlarmCluster.kt @@ -20,139 +20,96 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class RefrigeratorAlarmCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 87u - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class GeneratedCommandListAttribute(val value: ArrayList) - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) + class AcceptedCommandListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class EventListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AttributeListAttribute(val value: ArrayList) - fun readMaskAttribute(callback: LongAttributeCallback) { + suspend fun readMaskAttribute(): Long { // Implementation needs to be added here } - fun subscribeMaskAttribute(callback: LongAttributeCallback, minInterval: Int, maxInterval: Int) { + suspend fun subscribeMaskAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readStateAttribute(callback: LongAttributeCallback) { + suspend fun readStateAttribute(): Long { // Implementation needs to be added here } - fun subscribeStateAttribute(callback: LongAttributeCallback, minInterval: Int, maxInterval: Int) { + suspend fun subscribeStateAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readSupportedAttribute(callback: LongAttributeCallback) { + suspend fun readSupportedAttribute(): Long { // Implementation needs to be added here } - fun subscribeSupportedAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeSupportedAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 87u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RefrigeratorAndTemperatureControlledCabinetModeCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RefrigeratorAndTemperatureControlledCabinetModeCluster.kt index bbb249603c474c..be0d2f76bbe092 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RefrigeratorAndTemperatureControlledCabinetModeCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RefrigeratorAndTemperatureControlledCabinetModeCluster.kt @@ -20,230 +20,145 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class RefrigeratorAndTemperatureControlledCabinetModeCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 82u - } - - fun changeToMode(callback: ChangeToModeResponseCallback, newMode: Integer) { - // Implementation needs to be added here - } + class ChangeToModeResponse(val status: UInt, val statusText: String?) - fun changeToMode( - callback: ChangeToModeResponseCallback, - newMode: Integer, - timedInvokeTimeoutMs: Int - ) { - // Implementation needs to be added here - } - - interface ChangeToModeResponseCallback { - fun onSuccess(status: Integer, statusText: String?) + class SupportedModesAttribute( + val value: + ArrayList + ) - fun onError(error: Exception) - } - - interface SupportedModesAttributeCallback { - fun onSuccess( - value: - ArrayList< - ChipStructs.RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct - > - ) + class StartUpModeAttribute(val value: UByte?) - fun onError(ex: Exception) + class OnModeAttribute(val value: UByte?) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class GeneratedCommandListAttribute(val value: ArrayList) - interface StartUpModeAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface OnModeAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AcceptedCommandListAttribute(val value: ArrayList) - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) + class EventListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class AttributeListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun changeToMode(newMode: UByte): ChangeToModeResponse { + // Implementation needs to be added here } - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun changeToMode(newMode: UByte, timedInvokeTimeoutMs: Int): ChangeToModeResponse { + // Implementation needs to be added here } - fun readSupportedModesAttribute(callback: SupportedModesAttributeCallback) { + suspend fun readSupportedModesAttribute(): SupportedModesAttribute { // Implementation needs to be added here } - fun subscribeSupportedModesAttribute( - callback: SupportedModesAttributeCallback, + suspend fun subscribeSupportedModesAttribute( minInterval: Int, maxInterval: Int - ) { + ): SupportedModesAttribute { // Implementation needs to be added here } - fun readCurrentModeAttribute(callback: IntegerAttributeCallback) { + suspend fun readCurrentModeAttribute(): Integer { // Implementation needs to be added here } - fun subscribeCurrentModeAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeCurrentModeAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readStartUpModeAttribute(callback: StartUpModeAttributeCallback) { + suspend fun readStartUpModeAttribute(): StartUpModeAttribute { // Implementation needs to be added here } - fun writeStartUpModeAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeStartUpModeAttribute(value: UByte) { // Implementation needs to be added here } - fun writeStartUpModeAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeStartUpModeAttribute(value: UByte, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeStartUpModeAttribute( - callback: StartUpModeAttributeCallback, + suspend fun subscribeStartUpModeAttribute( minInterval: Int, maxInterval: Int - ) { + ): StartUpModeAttribute { // Implementation needs to be added here } - fun readOnModeAttribute(callback: OnModeAttributeCallback) { + suspend fun readOnModeAttribute(): OnModeAttribute { // Implementation needs to be added here } - fun writeOnModeAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeOnModeAttribute(value: UByte) { // Implementation needs to be added here } - fun writeOnModeAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeOnModeAttribute(value: UByte, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeOnModeAttribute( - callback: OnModeAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeOnModeAttribute(minInterval: Int, maxInterval: Int): OnModeAttribute { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 82u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RelativeHumidityMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RelativeHumidityMeasurementCluster.kt index 7efad29eaaf8f0..7ad724957088a0 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RelativeHumidityMeasurementCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RelativeHumidityMeasurementCluster.kt @@ -20,183 +20,119 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class RelativeHumidityMeasurementCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 1029u - } - - interface MeasuredValueAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) + class MeasuredValueAttribute(val value: UShort?) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface MinMeasuredValueAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class MinMeasuredValueAttribute(val value: UShort?) - interface MaxMeasuredValueAttributeCallback { - fun onSuccess(value: Integer?) + class MaxMeasuredValueAttribute(val value: UShort?) - fun onError(ex: Exception) + class GeneratedCommandListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AcceptedCommandListAttribute(val value: ArrayList) - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) + class EventListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class AttributeListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readMeasuredValueAttribute(callback: MeasuredValueAttributeCallback) { + suspend fun readMeasuredValueAttribute(): MeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeMeasuredValueAttribute( - callback: MeasuredValueAttributeCallback, + suspend fun subscribeMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): MeasuredValueAttribute { // Implementation needs to be added here } - fun readMinMeasuredValueAttribute(callback: MinMeasuredValueAttributeCallback) { + suspend fun readMinMeasuredValueAttribute(): MinMeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeMinMeasuredValueAttribute( - callback: MinMeasuredValueAttributeCallback, + suspend fun subscribeMinMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): MinMeasuredValueAttribute { // Implementation needs to be added here } - fun readMaxMeasuredValueAttribute(callback: MaxMeasuredValueAttributeCallback) { + suspend fun readMaxMeasuredValueAttribute(): MaxMeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeMaxMeasuredValueAttribute( - callback: MaxMeasuredValueAttributeCallback, + suspend fun subscribeMaxMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): MaxMeasuredValueAttribute { // Implementation needs to be added here } - fun readToleranceAttribute(callback: IntegerAttributeCallback) { + suspend fun readToleranceAttribute(): Integer { // Implementation needs to be added here } - fun subscribeToleranceAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeToleranceAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 1029u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcCleanModeCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcCleanModeCluster.kt index f51c947cd1c472..183c9b4d5b9e37 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcCleanModeCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcCleanModeCluster.kt @@ -20,193 +20,123 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class RvcCleanModeCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 85u - } - - fun changeToMode(callback: ChangeToModeResponseCallback, newMode: Integer) { - // Implementation needs to be added here - } - - fun changeToMode( - callback: ChangeToModeResponseCallback, - newMode: Integer, - timedInvokeTimeoutMs: Int - ) { - // Implementation needs to be added here - } - - interface ChangeToModeResponseCallback { - fun onSuccess(status: Integer, statusText: String?) - - fun onError(error: Exception) - } - - interface SupportedModesAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface OnModeAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) + class ChangeToModeResponse(val status: UInt, val statusText: String?) - fun onError(ex: Exception) + class SupportedModesAttribute( + val value: ArrayList + ) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) + class OnModeAttribute(val value: UByte?) - fun onError(ex: Exception) + class GeneratedCommandListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AcceptedCommandListAttribute(val value: ArrayList) - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) + class EventListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class AttributeListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun changeToMode(newMode: UByte): ChangeToModeResponse { + // Implementation needs to be added here } - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun changeToMode(newMode: UByte, timedInvokeTimeoutMs: Int): ChangeToModeResponse { + // Implementation needs to be added here } - fun readSupportedModesAttribute(callback: SupportedModesAttributeCallback) { + suspend fun readSupportedModesAttribute(): SupportedModesAttribute { // Implementation needs to be added here } - fun subscribeSupportedModesAttribute( - callback: SupportedModesAttributeCallback, + suspend fun subscribeSupportedModesAttribute( minInterval: Int, maxInterval: Int - ) { + ): SupportedModesAttribute { // Implementation needs to be added here } - fun readCurrentModeAttribute(callback: IntegerAttributeCallback) { + suspend fun readCurrentModeAttribute(): Integer { // Implementation needs to be added here } - fun subscribeCurrentModeAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeCurrentModeAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readOnModeAttribute(callback: OnModeAttributeCallback) { + suspend fun readOnModeAttribute(): OnModeAttribute { // Implementation needs to be added here } - fun writeOnModeAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeOnModeAttribute(value: UByte) { // Implementation needs to be added here } - fun writeOnModeAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeOnModeAttribute(value: UByte, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeOnModeAttribute( - callback: OnModeAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeOnModeAttribute(minInterval: Int, maxInterval: Int): OnModeAttribute { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 85u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcOperationalStateCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcOperationalStateCluster.kt index dab1335f74f2cd..c05135a17ce6e8 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcOperationalStateCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcOperationalStateCluster.kt @@ -20,261 +20,182 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class RvcOperationalStateCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 97u - } - - fun pause(callback: OperationalCommandResponseCallback) { - // Implementation needs to be added here - } - - fun pause(callback: OperationalCommandResponseCallback, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } - - fun stop(callback: OperationalCommandResponseCallback) { - // Implementation needs to be added here - } - - fun stop(callback: OperationalCommandResponseCallback, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } - - fun start(callback: OperationalCommandResponseCallback) { - // Implementation needs to be added here - } - - fun start(callback: OperationalCommandResponseCallback, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } + class OperationalCommandResponse( + val commandResponseState: ChipStructs.RvcOperationalStateClusterErrorStateStruct + ) - fun resume(callback: OperationalCommandResponseCallback) { - // Implementation needs to be added here - } + class PhaseListAttribute(val value: ArrayList?) - fun resume(callback: OperationalCommandResponseCallback, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } + class CurrentPhaseAttribute(val value: UByte?) - interface OperationalCommandResponseCallback { - fun onSuccess(commandResponseState: ChipStructs.RvcOperationalStateClusterErrorStateStruct) + class CountdownTimeAttribute(val value: UInt?) - fun onError(error: Exception) - } + class OperationalStateListAttribute( + val value: ArrayList + ) - interface PhaseListAttributeCallback { - fun onSuccess(value: ArrayList?) + class OperationalErrorAttribute( + val value: ChipStructs.RvcOperationalStateClusterErrorStateStruct + ) - fun onError(ex: Exception) + class GeneratedCommandListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AcceptedCommandListAttribute(val value: ArrayList) - interface CurrentPhaseAttributeCallback { - fun onSuccess(value: Integer?) + class EventListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class AttributeListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun pause(): OperationalCommandResponse { + // Implementation needs to be added here } - interface CountdownTimeAttributeCallback { - fun onSuccess(value: Long?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun pause(timedInvokeTimeoutMs: Int): OperationalCommandResponse { + // Implementation needs to be added here } - interface OperationalStateListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun stop(): OperationalCommandResponse { + // Implementation needs to be added here } - interface OperationalErrorAttributeCallback { - fun onSuccess(value: ChipStructs.RvcOperationalStateClusterErrorStateStruct) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun stop(timedInvokeTimeoutMs: Int): OperationalCommandResponse { + // Implementation needs to be added here } - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun start(): OperationalCommandResponse { + // Implementation needs to be added here } - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun start(timedInvokeTimeoutMs: Int): OperationalCommandResponse { + // Implementation needs to be added here } - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun resume(): OperationalCommandResponse { + // Implementation needs to be added here } - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun resume(timedInvokeTimeoutMs: Int): OperationalCommandResponse { + // Implementation needs to be added here } - fun readPhaseListAttribute(callback: PhaseListAttributeCallback) { + suspend fun readPhaseListAttribute(): PhaseListAttribute { // Implementation needs to be added here } - fun subscribePhaseListAttribute( - callback: PhaseListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribePhaseListAttribute(minInterval: Int, maxInterval: Int): PhaseListAttribute { // Implementation needs to be added here } - fun readCurrentPhaseAttribute(callback: CurrentPhaseAttributeCallback) { + suspend fun readCurrentPhaseAttribute(): CurrentPhaseAttribute { // Implementation needs to be added here } - fun subscribeCurrentPhaseAttribute( - callback: CurrentPhaseAttributeCallback, + suspend fun subscribeCurrentPhaseAttribute( minInterval: Int, maxInterval: Int - ) { + ): CurrentPhaseAttribute { // Implementation needs to be added here } - fun readCountdownTimeAttribute(callback: CountdownTimeAttributeCallback) { + suspend fun readCountdownTimeAttribute(): CountdownTimeAttribute { // Implementation needs to be added here } - fun subscribeCountdownTimeAttribute( - callback: CountdownTimeAttributeCallback, + suspend fun subscribeCountdownTimeAttribute( minInterval: Int, maxInterval: Int - ) { + ): CountdownTimeAttribute { // Implementation needs to be added here } - fun readOperationalStateListAttribute(callback: OperationalStateListAttributeCallback) { + suspend fun readOperationalStateListAttribute(): OperationalStateListAttribute { // Implementation needs to be added here } - fun subscribeOperationalStateListAttribute( - callback: OperationalStateListAttributeCallback, + suspend fun subscribeOperationalStateListAttribute( minInterval: Int, maxInterval: Int - ) { + ): OperationalStateListAttribute { // Implementation needs to be added here } - fun readOperationalStateAttribute(callback: IntegerAttributeCallback) { + suspend fun readOperationalStateAttribute(): Integer { // Implementation needs to be added here } - fun subscribeOperationalStateAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeOperationalStateAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readOperationalErrorAttribute(callback: OperationalErrorAttributeCallback) { + suspend fun readOperationalErrorAttribute(): OperationalErrorAttribute { // Implementation needs to be added here } - fun subscribeOperationalErrorAttribute( - callback: OperationalErrorAttributeCallback, + suspend fun subscribeOperationalErrorAttribute( minInterval: Int, maxInterval: Int - ) { + ): OperationalErrorAttribute { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 97u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcRunModeCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcRunModeCluster.kt index 0160a183f48e96..7e157abea4027f 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcRunModeCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcRunModeCluster.kt @@ -20,193 +20,123 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class RvcRunModeCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 84u - } - - fun changeToMode(callback: ChangeToModeResponseCallback, newMode: Integer) { - // Implementation needs to be added here - } - - fun changeToMode( - callback: ChangeToModeResponseCallback, - newMode: Integer, - timedInvokeTimeoutMs: Int - ) { - // Implementation needs to be added here - } - - interface ChangeToModeResponseCallback { - fun onSuccess(status: Integer, statusText: String?) - - fun onError(error: Exception) - } - - interface SupportedModesAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface OnModeAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) + class ChangeToModeResponse(val status: UInt, val statusText: String?) - fun onError(ex: Exception) + class SupportedModesAttribute( + val value: ArrayList + ) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) + class OnModeAttribute(val value: UByte?) - fun onError(ex: Exception) + class GeneratedCommandListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AcceptedCommandListAttribute(val value: ArrayList) - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) + class EventListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class AttributeListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun changeToMode(newMode: UByte): ChangeToModeResponse { + // Implementation needs to be added here } - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun changeToMode(newMode: UByte, timedInvokeTimeoutMs: Int): ChangeToModeResponse { + // Implementation needs to be added here } - fun readSupportedModesAttribute(callback: SupportedModesAttributeCallback) { + suspend fun readSupportedModesAttribute(): SupportedModesAttribute { // Implementation needs to be added here } - fun subscribeSupportedModesAttribute( - callback: SupportedModesAttributeCallback, + suspend fun subscribeSupportedModesAttribute( minInterval: Int, maxInterval: Int - ) { + ): SupportedModesAttribute { // Implementation needs to be added here } - fun readCurrentModeAttribute(callback: IntegerAttributeCallback) { + suspend fun readCurrentModeAttribute(): Integer { // Implementation needs to be added here } - fun subscribeCurrentModeAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeCurrentModeAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readOnModeAttribute(callback: OnModeAttributeCallback) { + suspend fun readOnModeAttribute(): OnModeAttribute { // Implementation needs to be added here } - fun writeOnModeAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeOnModeAttribute(value: UByte) { // Implementation needs to be added here } - fun writeOnModeAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeOnModeAttribute(value: UByte, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeOnModeAttribute( - callback: OnModeAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeOnModeAttribute(minInterval: Int, maxInterval: Int): OnModeAttribute { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 84u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SampleMeiCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SampleMeiCluster.kt index 37d98e704f5d10..bddd578ea3b2d5 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SampleMeiCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SampleMeiCluster.kt @@ -20,162 +20,110 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class SampleMeiCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 4294048800u - } + class AddArgumentsResponse(val returnValue: UByte) + + class GeneratedCommandListAttribute(val value: ArrayList) + + class AcceptedCommandListAttribute(val value: ArrayList) - fun ping(callback: DefaultClusterCallback) { + class EventListAttribute(val value: ArrayList) + + class AttributeListAttribute(val value: ArrayList) + + suspend fun ping() { // Implementation needs to be added here } - fun ping(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) { + suspend fun ping(timedInvokeTimeoutMs: Int) { // Implementation needs to be added here } - fun addArguments(callback: AddArgumentsResponseCallback, arg1: Integer, arg2: Integer) { + suspend fun addArguments(arg1: UByte, arg2: UByte): AddArgumentsResponse { // Implementation needs to be added here } - fun addArguments( - callback: AddArgumentsResponseCallback, - arg1: Integer, - arg2: Integer, + suspend fun addArguments( + arg1: UByte, + arg2: UByte, timedInvokeTimeoutMs: Int - ) { + ): AddArgumentsResponse { // Implementation needs to be added here } - interface AddArgumentsResponseCallback { - fun onSuccess(returnValue: Integer) - - fun onError(error: Exception) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readFlipFlopAttribute(callback: BooleanAttributeCallback) { + suspend fun readFlipFlopAttribute(): Boolean { // Implementation needs to be added here } - fun writeFlipFlopAttribute(callback: DefaultClusterCallback, value: Boolean) { + suspend fun writeFlipFlopAttribute(value: Boolean) { // Implementation needs to be added here } - fun writeFlipFlopAttribute( - callback: DefaultClusterCallback, - value: Boolean, - timedWriteTimeoutMs: Int - ) { + suspend fun writeFlipFlopAttribute(value: Boolean, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeFlipFlopAttribute( - callback: BooleanAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFlipFlopAttribute(minInterval: Int, maxInterval: Int): Boolean { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 4294048800u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ScenesCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ScenesCluster.kt index a075d23e1129ae..fdff3ad57b9aa6 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ScenesCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ScenesCluster.kt @@ -20,456 +20,325 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class ScenesCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 5u - } + class AddSceneResponse(val status: UShort, val groupID: UShort, val sceneID: UByte) + + class ViewSceneResponse( + val status: UShort, + val groupID: UShort, + val sceneID: UByte, + val transitionTime: UShort?, + val sceneName: String?, + val extensionFieldSets: ArrayList? + ) + + class RemoveSceneResponse(val status: UShort, val groupID: UShort, val sceneID: UByte) + + class RemoveAllScenesResponse(val status: UShort, val groupID: UShort) + + class StoreSceneResponse(val status: UShort, val groupID: UShort, val sceneID: UByte) + + class GetSceneMembershipResponse( + val status: UShort, + val capacity: UByte?, + val groupID: UShort, + val sceneList: ArrayList? + ) + + class EnhancedAddSceneResponse(val status: UShort, val groupID: UShort, val sceneID: UByte) + + class EnhancedViewSceneResponse( + val status: UShort, + val groupID: UShort, + val sceneID: UByte, + val transitionTime: UShort?, + val sceneName: String?, + val extensionFieldSets: ArrayList? + ) + + class CopySceneResponse( + val status: UShort, + val groupIdentifierFrom: UShort, + val sceneIdentifierFrom: UByte + ) + + class LastConfiguredByAttribute(val value: ULong?) + + class GeneratedCommandListAttribute(val value: ArrayList) + + class AcceptedCommandListAttribute(val value: ArrayList) + + class EventListAttribute(val value: ArrayList) - fun addScene( - callback: AddSceneResponseCallback, - groupID: Integer, - sceneID: Integer, - transitionTime: Integer, + class AttributeListAttribute(val value: ArrayList) + + suspend fun addScene( + groupID: UShort, + sceneID: UByte, + transitionTime: UShort, sceneName: String, extensionFieldSets: ArrayList - ) { + ): AddSceneResponse { // Implementation needs to be added here } - fun addScene( - callback: AddSceneResponseCallback, - groupID: Integer, - sceneID: Integer, - transitionTime: Integer, + suspend fun addScene( + groupID: UShort, + sceneID: UByte, + transitionTime: UShort, sceneName: String, extensionFieldSets: ArrayList, timedInvokeTimeoutMs: Int - ) { + ): AddSceneResponse { // Implementation needs to be added here } - fun viewScene(callback: ViewSceneResponseCallback, groupID: Integer, sceneID: Integer) { + suspend fun viewScene(groupID: UShort, sceneID: UByte): ViewSceneResponse { // Implementation needs to be added here } - fun viewScene( - callback: ViewSceneResponseCallback, - groupID: Integer, - sceneID: Integer, + suspend fun viewScene( + groupID: UShort, + sceneID: UByte, timedInvokeTimeoutMs: Int - ) { + ): ViewSceneResponse { // Implementation needs to be added here } - fun removeScene(callback: RemoveSceneResponseCallback, groupID: Integer, sceneID: Integer) { + suspend fun removeScene(groupID: UShort, sceneID: UByte): RemoveSceneResponse { // Implementation needs to be added here } - fun removeScene( - callback: RemoveSceneResponseCallback, - groupID: Integer, - sceneID: Integer, + suspend fun removeScene( + groupID: UShort, + sceneID: UByte, timedInvokeTimeoutMs: Int - ) { + ): RemoveSceneResponse { // Implementation needs to be added here } - fun removeAllScenes(callback: RemoveAllScenesResponseCallback, groupID: Integer) { + suspend fun removeAllScenes(groupID: UShort): RemoveAllScenesResponse { // Implementation needs to be added here } - fun removeAllScenes( - callback: RemoveAllScenesResponseCallback, - groupID: Integer, - timedInvokeTimeoutMs: Int - ) { + suspend fun removeAllScenes(groupID: UShort, timedInvokeTimeoutMs: Int): RemoveAllScenesResponse { // Implementation needs to be added here } - fun storeScene(callback: StoreSceneResponseCallback, groupID: Integer, sceneID: Integer) { + suspend fun storeScene(groupID: UShort, sceneID: UByte): StoreSceneResponse { // Implementation needs to be added here } - fun storeScene( - callback: StoreSceneResponseCallback, - groupID: Integer, - sceneID: Integer, + suspend fun storeScene( + groupID: UShort, + sceneID: UByte, timedInvokeTimeoutMs: Int - ) { + ): StoreSceneResponse { // Implementation needs to be added here } - fun recallScene( - callback: DefaultClusterCallback, - groupID: Integer, - sceneID: Integer, - transitionTime: Integer? - ) { + suspend fun recallScene(groupID: UShort, sceneID: UByte, transitionTime: UShort?) { // Implementation needs to be added here } - fun recallScene( - callback: DefaultClusterCallback, - groupID: Integer, - sceneID: Integer, - transitionTime: Integer?, + suspend fun recallScene( + groupID: UShort, + sceneID: UByte, + transitionTime: UShort?, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - fun getSceneMembership(callback: GetSceneMembershipResponseCallback, groupID: Integer) { + suspend fun getSceneMembership(groupID: UShort): GetSceneMembershipResponse { // Implementation needs to be added here } - fun getSceneMembership( - callback: GetSceneMembershipResponseCallback, - groupID: Integer, + suspend fun getSceneMembership( + groupID: UShort, timedInvokeTimeoutMs: Int - ) { + ): GetSceneMembershipResponse { // Implementation needs to be added here } - fun enhancedAddScene( - callback: EnhancedAddSceneResponseCallback, - groupID: Integer, - sceneID: Integer, - transitionTime: Integer, + suspend fun enhancedAddScene( + groupID: UShort, + sceneID: UByte, + transitionTime: UShort, sceneName: String, extensionFieldSets: ArrayList - ) { + ): EnhancedAddSceneResponse { // Implementation needs to be added here } - fun enhancedAddScene( - callback: EnhancedAddSceneResponseCallback, - groupID: Integer, - sceneID: Integer, - transitionTime: Integer, + suspend fun enhancedAddScene( + groupID: UShort, + sceneID: UByte, + transitionTime: UShort, sceneName: String, extensionFieldSets: ArrayList, timedInvokeTimeoutMs: Int - ) { + ): EnhancedAddSceneResponse { // Implementation needs to be added here } - fun enhancedViewScene( - callback: EnhancedViewSceneResponseCallback, - groupID: Integer, - sceneID: Integer - ) { + suspend fun enhancedViewScene(groupID: UShort, sceneID: UByte): EnhancedViewSceneResponse { // Implementation needs to be added here } - fun enhancedViewScene( - callback: EnhancedViewSceneResponseCallback, - groupID: Integer, - sceneID: Integer, + suspend fun enhancedViewScene( + groupID: UShort, + sceneID: UByte, timedInvokeTimeoutMs: Int - ) { + ): EnhancedViewSceneResponse { // Implementation needs to be added here } - fun copyScene( - callback: CopySceneResponseCallback, - mode: Integer, - groupIdentifierFrom: Integer, - sceneIdentifierFrom: Integer, - groupIdentifierTo: Integer, - sceneIdentifierTo: Integer - ) { + suspend fun copyScene( + mode: UInt, + groupIdentifierFrom: UShort, + sceneIdentifierFrom: UByte, + groupIdentifierTo: UShort, + sceneIdentifierTo: UByte + ): CopySceneResponse { // Implementation needs to be added here } - fun copyScene( - callback: CopySceneResponseCallback, - mode: Integer, - groupIdentifierFrom: Integer, - sceneIdentifierFrom: Integer, - groupIdentifierTo: Integer, - sceneIdentifierTo: Integer, + suspend fun copyScene( + mode: UInt, + groupIdentifierFrom: UShort, + sceneIdentifierFrom: UByte, + groupIdentifierTo: UShort, + sceneIdentifierTo: UByte, timedInvokeTimeoutMs: Int - ) { + ): CopySceneResponse { // Implementation needs to be added here } - interface AddSceneResponseCallback { - fun onSuccess(status: Integer, groupID: Integer, sceneID: Integer) - - fun onError(error: Exception) - } - - interface ViewSceneResponseCallback { - fun onSuccess( - status: Integer, - groupID: Integer, - sceneID: Integer, - transitionTime: Integer?, - sceneName: String?, - extensionFieldSets: ArrayList? - ) - - fun onError(error: Exception) - } - - interface RemoveSceneResponseCallback { - fun onSuccess(status: Integer, groupID: Integer, sceneID: Integer) - - fun onError(error: Exception) - } - - interface RemoveAllScenesResponseCallback { - fun onSuccess(status: Integer, groupID: Integer) - - fun onError(error: Exception) - } - - interface StoreSceneResponseCallback { - fun onSuccess(status: Integer, groupID: Integer, sceneID: Integer) - - fun onError(error: Exception) - } - - interface GetSceneMembershipResponseCallback { - fun onSuccess( - status: Integer, - capacity: Integer?, - groupID: Integer, - sceneList: ArrayList? - ) - - fun onError(error: Exception) - } - - interface EnhancedAddSceneResponseCallback { - fun onSuccess(status: Integer, groupID: Integer, sceneID: Integer) - - fun onError(error: Exception) - } - - interface EnhancedViewSceneResponseCallback { - fun onSuccess( - status: Integer, - groupID: Integer, - sceneID: Integer, - transitionTime: Integer?, - sceneName: String?, - extensionFieldSets: ArrayList? - ) - - fun onError(error: Exception) - } - - interface CopySceneResponseCallback { - fun onSuccess(status: Integer, groupIdentifierFrom: Integer, sceneIdentifierFrom: Integer) - - fun onError(error: Exception) - } - - interface LastConfiguredByAttributeCallback { - fun onSuccess(value: Long?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readSceneCountAttribute(callback: IntegerAttributeCallback) { + suspend fun readSceneCountAttribute(): Integer { // Implementation needs to be added here } - fun subscribeSceneCountAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeSceneCountAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readCurrentSceneAttribute(callback: IntegerAttributeCallback) { + suspend fun readCurrentSceneAttribute(): Integer { // Implementation needs to be added here } - fun subscribeCurrentSceneAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeCurrentSceneAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readCurrentGroupAttribute(callback: IntegerAttributeCallback) { + suspend fun readCurrentGroupAttribute(): Integer { // Implementation needs to be added here } - fun subscribeCurrentGroupAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeCurrentGroupAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readSceneValidAttribute(callback: BooleanAttributeCallback) { + suspend fun readSceneValidAttribute(): Boolean { // Implementation needs to be added here } - fun subscribeSceneValidAttribute( - callback: BooleanAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeSceneValidAttribute(minInterval: Int, maxInterval: Int): Boolean { // Implementation needs to be added here } - fun readNameSupportAttribute(callback: IntegerAttributeCallback) { + suspend fun readNameSupportAttribute(): Integer { // Implementation needs to be added here } - fun subscribeNameSupportAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeNameSupportAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readLastConfiguredByAttribute(callback: LastConfiguredByAttributeCallback) { + suspend fun readLastConfiguredByAttribute(): LastConfiguredByAttribute { // Implementation needs to be added here } - fun subscribeLastConfiguredByAttribute( - callback: LastConfiguredByAttributeCallback, + suspend fun subscribeLastConfiguredByAttribute( minInterval: Int, maxInterval: Int - ) { + ): LastConfiguredByAttribute { // Implementation needs to be added here } - fun readSceneTableSizeAttribute(callback: IntegerAttributeCallback) { + suspend fun readSceneTableSizeAttribute(): Integer { // Implementation needs to be added here } - fun subscribeSceneTableSizeAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeSceneTableSizeAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readRemainingCapacityAttribute(callback: IntegerAttributeCallback) { + suspend fun readRemainingCapacityAttribute(): Integer { // Implementation needs to be added here } - fun subscribeRemainingCapacityAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeRemainingCapacityAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 5u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SmokeCoAlarmCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SmokeCoAlarmCluster.kt index eae9b36d990a6d..e9a153e56bb2cc 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SmokeCoAlarmCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SmokeCoAlarmCluster.kt @@ -20,287 +20,195 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class SmokeCoAlarmCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 92u - } - - fun selfTestRequest(callback: DefaultClusterCallback) { - // Implementation needs to be added here - } - - fun selfTestRequest(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } + class GeneratedCommandListAttribute(val value: ArrayList) - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) + class AcceptedCommandListAttribute(val value: ArrayList) - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class EventListAttribute(val value: ArrayList) - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AttributeListAttribute(val value: ArrayList) - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun selfTestRequest() { + // Implementation needs to be added here } - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun selfTestRequest(timedInvokeTimeoutMs: Int) { + // Implementation needs to be added here } - fun readExpressedStateAttribute(callback: IntegerAttributeCallback) { + suspend fun readExpressedStateAttribute(): Integer { // Implementation needs to be added here } - fun subscribeExpressedStateAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeExpressedStateAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readSmokeStateAttribute(callback: IntegerAttributeCallback) { + suspend fun readSmokeStateAttribute(): Integer { // Implementation needs to be added here } - fun subscribeSmokeStateAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeSmokeStateAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readCOStateAttribute(callback: IntegerAttributeCallback) { + suspend fun readCOStateAttribute(): Integer { // Implementation needs to be added here } - fun subscribeCOStateAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeCOStateAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readBatteryAlertAttribute(callback: IntegerAttributeCallback) { + suspend fun readBatteryAlertAttribute(): Integer { // Implementation needs to be added here } - fun subscribeBatteryAlertAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeBatteryAlertAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readDeviceMutedAttribute(callback: IntegerAttributeCallback) { + suspend fun readDeviceMutedAttribute(): Integer { // Implementation needs to be added here } - fun subscribeDeviceMutedAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeDeviceMutedAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readTestInProgressAttribute(callback: BooleanAttributeCallback) { + suspend fun readTestInProgressAttribute(): Boolean { // Implementation needs to be added here } - fun subscribeTestInProgressAttribute( - callback: BooleanAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeTestInProgressAttribute(minInterval: Int, maxInterval: Int): Boolean { // Implementation needs to be added here } - fun readHardwareFaultAlertAttribute(callback: BooleanAttributeCallback) { + suspend fun readHardwareFaultAlertAttribute(): Boolean { // Implementation needs to be added here } - fun subscribeHardwareFaultAlertAttribute( - callback: BooleanAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeHardwareFaultAlertAttribute(minInterval: Int, maxInterval: Int): Boolean { // Implementation needs to be added here } - fun readEndOfServiceAlertAttribute(callback: IntegerAttributeCallback) { + suspend fun readEndOfServiceAlertAttribute(): Integer { // Implementation needs to be added here } - fun subscribeEndOfServiceAlertAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEndOfServiceAlertAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readInterconnectSmokeAlarmAttribute(callback: IntegerAttributeCallback) { + suspend fun readInterconnectSmokeAlarmAttribute(): Integer { // Implementation needs to be added here } - fun subscribeInterconnectSmokeAlarmAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeInterconnectSmokeAlarmAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readInterconnectCOAlarmAttribute(callback: IntegerAttributeCallback) { + suspend fun readInterconnectCOAlarmAttribute(): Integer { // Implementation needs to be added here } - fun subscribeInterconnectCOAlarmAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeInterconnectCOAlarmAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readContaminationStateAttribute(callback: IntegerAttributeCallback) { + suspend fun readContaminationStateAttribute(): Integer { // Implementation needs to be added here } - fun subscribeContaminationStateAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeContaminationStateAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readSmokeSensitivityLevelAttribute(callback: IntegerAttributeCallback) { + suspend fun readSmokeSensitivityLevelAttribute(): Integer { // Implementation needs to be added here } - fun writeSmokeSensitivityLevelAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeSmokeSensitivityLevelAttribute(value: UInt) { // Implementation needs to be added here } - fun writeSmokeSensitivityLevelAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeSmokeSensitivityLevelAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeSmokeSensitivityLevelAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeSmokeSensitivityLevelAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readExpiryDateAttribute(callback: LongAttributeCallback) { + suspend fun readExpiryDateAttribute(): Long { // Implementation needs to be added here } - fun subscribeExpiryDateAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeExpiryDateAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 92u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SoftwareDiagnosticsCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SoftwareDiagnosticsCluster.kt index 79c817ba943239..4b541c607a8399 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SoftwareDiagnosticsCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SoftwareDiagnosticsCluster.kt @@ -20,175 +20,119 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class SoftwareDiagnosticsCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 52u - } - - fun resetWatermarks(callback: DefaultClusterCallback) { - // Implementation needs to be added here - } - - fun resetWatermarks(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } - - interface ThreadMetricsAttributeCallback { - fun onSuccess(value: ArrayList?) + class ThreadMetricsAttribute( + val value: ArrayList? + ) - fun onError(ex: Exception) + class GeneratedCommandListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AcceptedCommandListAttribute(val value: ArrayList) - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) + class EventListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class AttributeListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun resetWatermarks() { + // Implementation needs to be added here } - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun resetWatermarks(timedInvokeTimeoutMs: Int) { + // Implementation needs to be added here } - fun readThreadMetricsAttribute(callback: ThreadMetricsAttributeCallback) { + suspend fun readThreadMetricsAttribute(): ThreadMetricsAttribute { // Implementation needs to be added here } - fun subscribeThreadMetricsAttribute( - callback: ThreadMetricsAttributeCallback, + suspend fun subscribeThreadMetricsAttribute( minInterval: Int, maxInterval: Int - ) { + ): ThreadMetricsAttribute { // Implementation needs to be added here } - fun readCurrentHeapFreeAttribute(callback: LongAttributeCallback) { + suspend fun readCurrentHeapFreeAttribute(): Long { // Implementation needs to be added here } - fun subscribeCurrentHeapFreeAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeCurrentHeapFreeAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readCurrentHeapUsedAttribute(callback: LongAttributeCallback) { + suspend fun readCurrentHeapUsedAttribute(): Long { // Implementation needs to be added here } - fun subscribeCurrentHeapUsedAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeCurrentHeapUsedAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readCurrentHeapHighWatermarkAttribute(callback: LongAttributeCallback) { + suspend fun readCurrentHeapHighWatermarkAttribute(): Long { // Implementation needs to be added here } - fun subscribeCurrentHeapHighWatermarkAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeCurrentHeapHighWatermarkAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 52u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SwitchCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SwitchCluster.kt index 7d9685744e2ffc..b9d35970afe971 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SwitchCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SwitchCluster.kt @@ -20,147 +20,96 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class SwitchCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 59u - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) + class GeneratedCommandListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class AcceptedCommandListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) + class EventListAttribute(val value: ArrayList) - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AttributeListAttribute(val value: ArrayList) - fun readNumberOfPositionsAttribute(callback: IntegerAttributeCallback) { + suspend fun readNumberOfPositionsAttribute(): Integer { // Implementation needs to be added here } - fun subscribeNumberOfPositionsAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeNumberOfPositionsAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readCurrentPositionAttribute(callback: IntegerAttributeCallback) { + suspend fun readCurrentPositionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeCurrentPositionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeCurrentPositionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readMultiPressMaxAttribute(callback: IntegerAttributeCallback) { + suspend fun readMultiPressMaxAttribute(): Integer { // Implementation needs to be added here } - fun subscribeMultiPressMaxAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeMultiPressMaxAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 59u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TargetNavigatorCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TargetNavigatorCluster.kt index 11eebe726ebc63..e1d3dfeb51b644 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TargetNavigatorCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TargetNavigatorCluster.kt @@ -20,162 +20,109 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class TargetNavigatorCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 1285u - } + class NavigateTargetResponse(val status: UInt, val data: String?) - fun navigateTarget(callback: NavigateTargetResponseCallback, target: Integer, data: String?) { - // Implementation needs to be added here - } + class TargetListAttribute( + val value: ArrayList + ) - fun navigateTarget( - callback: NavigateTargetResponseCallback, - target: Integer, - data: String?, - timedInvokeTimeoutMs: Int - ) { - // Implementation needs to be added here - } + class GeneratedCommandListAttribute(val value: ArrayList) - interface NavigateTargetResponseCallback { - fun onSuccess(status: Integer, data: String?) - - fun onError(error: Exception) - } + class AcceptedCommandListAttribute(val value: ArrayList) - interface TargetListAttributeCallback { - fun onSuccess(value: ArrayList) + class EventListAttribute(val value: ArrayList) - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AttributeListAttribute(val value: ArrayList) - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun navigateTarget(target: UByte, data: String?): NavigateTargetResponse { + // Implementation needs to be added here } - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun navigateTarget( + target: UByte, + data: String?, + timedInvokeTimeoutMs: Int + ): NavigateTargetResponse { + // Implementation needs to be added here } - fun readTargetListAttribute(callback: TargetListAttributeCallback) { + suspend fun readTargetListAttribute(): TargetListAttribute { // Implementation needs to be added here } - fun subscribeTargetListAttribute( - callback: TargetListAttributeCallback, + suspend fun subscribeTargetListAttribute( minInterval: Int, maxInterval: Int - ) { + ): TargetListAttribute { // Implementation needs to be added here } - fun readCurrentTargetAttribute(callback: IntegerAttributeCallback) { + suspend fun readCurrentTargetAttribute(): Integer { // Implementation needs to be added here } - fun subscribeCurrentTargetAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeCurrentTargetAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 1285u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TemperatureControlCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TemperatureControlCluster.kt index e828002cddf0b8..ab185aac10dbd7 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TemperatureControlCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TemperatureControlCluster.kt @@ -20,210 +20,140 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class TemperatureControlCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 86u - } - - fun setTemperature( - callback: DefaultClusterCallback, - targetTemperature: Integer?, - targetTemperatureLevel: Integer? - ) { - // Implementation needs to be added here - } - - fun setTemperature( - callback: DefaultClusterCallback, - targetTemperature: Integer?, - targetTemperatureLevel: Integer?, - timedInvokeTimeoutMs: Int - ) { - // Implementation needs to be added here - } - - interface SupportedTemperatureLevelsAttributeCallback { - fun onSuccess(value: ArrayList?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) + class SupportedTemperatureLevelsAttribute(val value: ArrayList?) - fun onError(ex: Exception) + class GeneratedCommandListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AcceptedCommandListAttribute(val value: ArrayList) - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) + class EventListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class AttributeListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun setTemperature(targetTemperature: Short?, targetTemperatureLevel: UByte?) { + // Implementation needs to be added here } - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun setTemperature( + targetTemperature: Short?, + targetTemperatureLevel: UByte?, + timedInvokeTimeoutMs: Int + ) { + // Implementation needs to be added here } - fun readTemperatureSetpointAttribute(callback: IntegerAttributeCallback) { + suspend fun readTemperatureSetpointAttribute(): Integer { // Implementation needs to be added here } - fun subscribeTemperatureSetpointAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeTemperatureSetpointAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readMinTemperatureAttribute(callback: IntegerAttributeCallback) { + suspend fun readMinTemperatureAttribute(): Integer { // Implementation needs to be added here } - fun subscribeMinTemperatureAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeMinTemperatureAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readMaxTemperatureAttribute(callback: IntegerAttributeCallback) { + suspend fun readMaxTemperatureAttribute(): Integer { // Implementation needs to be added here } - fun subscribeMaxTemperatureAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeMaxTemperatureAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readStepAttribute(callback: IntegerAttributeCallback) { + suspend fun readStepAttribute(): Integer { // Implementation needs to be added here } - fun subscribeStepAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeStepAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readSelectedTemperatureLevelAttribute(callback: IntegerAttributeCallback) { + suspend fun readSelectedTemperatureLevelAttribute(): Integer { // Implementation needs to be added here } - fun subscribeSelectedTemperatureLevelAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeSelectedTemperatureLevelAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readSupportedTemperatureLevelsAttribute( - callback: SupportedTemperatureLevelsAttributeCallback - ) { + suspend fun readSupportedTemperatureLevelsAttribute(): SupportedTemperatureLevelsAttribute { // Implementation needs to be added here } - fun subscribeSupportedTemperatureLevelsAttribute( - callback: SupportedTemperatureLevelsAttributeCallback, + suspend fun subscribeSupportedTemperatureLevelsAttribute( minInterval: Int, maxInterval: Int - ) { + ): SupportedTemperatureLevelsAttribute { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 86u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TemperatureMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TemperatureMeasurementCluster.kt index cda7f5102d348b..363a575465d724 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TemperatureMeasurementCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TemperatureMeasurementCluster.kt @@ -20,183 +20,119 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class TemperatureMeasurementCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 1026u - } - - interface MeasuredValueAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) + class MeasuredValueAttribute(val value: Short?) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface MinMeasuredValueAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class MinMeasuredValueAttribute(val value: Short?) - interface MaxMeasuredValueAttributeCallback { - fun onSuccess(value: Integer?) + class MaxMeasuredValueAttribute(val value: Short?) - fun onError(ex: Exception) + class GeneratedCommandListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AcceptedCommandListAttribute(val value: ArrayList) - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) + class EventListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class AttributeListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readMeasuredValueAttribute(callback: MeasuredValueAttributeCallback) { + suspend fun readMeasuredValueAttribute(): MeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeMeasuredValueAttribute( - callback: MeasuredValueAttributeCallback, + suspend fun subscribeMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): MeasuredValueAttribute { // Implementation needs to be added here } - fun readMinMeasuredValueAttribute(callback: MinMeasuredValueAttributeCallback) { + suspend fun readMinMeasuredValueAttribute(): MinMeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeMinMeasuredValueAttribute( - callback: MinMeasuredValueAttributeCallback, + suspend fun subscribeMinMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): MinMeasuredValueAttribute { // Implementation needs to be added here } - fun readMaxMeasuredValueAttribute(callback: MaxMeasuredValueAttributeCallback) { + suspend fun readMaxMeasuredValueAttribute(): MaxMeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeMaxMeasuredValueAttribute( - callback: MaxMeasuredValueAttributeCallback, + suspend fun subscribeMaxMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): MaxMeasuredValueAttribute { // Implementation needs to be added here } - fun readToleranceAttribute(callback: IntegerAttributeCallback) { + suspend fun readToleranceAttribute(): Integer { // Implementation needs to be added here } - fun subscribeToleranceAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeToleranceAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 1026u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThermostatCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThermostatCluster.kt index efe49d68aa9df2..2136037e98be10 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThermostatCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThermostatCluster.kt @@ -20,1189 +20,847 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class ThermostatCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 513u - } + class GetWeeklyScheduleResponse( + val numberOfTransitionsForSequence: UByte, + val dayOfWeekForSequence: UInt, + val modeForSequence: UInt, + val transitions: ArrayList + ) - fun setpointRaiseLower(callback: DefaultClusterCallback, mode: Integer, amount: Integer) { - // Implementation needs to be added here - } + class LocalTemperatureAttribute(val value: Short?) - fun setpointRaiseLower( - callback: DefaultClusterCallback, - mode: Integer, - amount: Integer, - timedInvokeTimeoutMs: Int - ) { - // Implementation needs to be added here - } + class OutdoorTemperatureAttribute(val value: Short?) - fun setWeeklySchedule( - callback: DefaultClusterCallback, - numberOfTransitionsForSequence: Integer, - dayOfWeekForSequence: Integer, - modeForSequence: Integer, - transitions: ArrayList - ) { - // Implementation needs to be added here - } + class TemperatureSetpointHoldDurationAttribute(val value: UShort?) - fun setWeeklySchedule( - callback: DefaultClusterCallback, - numberOfTransitionsForSequence: Integer, - dayOfWeekForSequence: Integer, - modeForSequence: Integer, - transitions: ArrayList, - timedInvokeTimeoutMs: Int - ) { - // Implementation needs to be added here - } + class SetpointChangeAmountAttribute(val value: Short?) - fun getWeeklySchedule( - callback: GetWeeklyScheduleResponseCallback, - daysToReturn: Integer, - modeToReturn: Integer - ) { - // Implementation needs to be added here - } + class OccupiedSetbackAttribute(val value: UByte?) - fun getWeeklySchedule( - callback: GetWeeklyScheduleResponseCallback, - daysToReturn: Integer, - modeToReturn: Integer, - timedInvokeTimeoutMs: Int - ) { - // Implementation needs to be added here - } + class OccupiedSetbackMinAttribute(val value: UByte?) - fun clearWeeklySchedule(callback: DefaultClusterCallback) { - // Implementation needs to be added here - } + class OccupiedSetbackMaxAttribute(val value: UByte?) - fun clearWeeklySchedule(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } + class UnoccupiedSetbackAttribute(val value: UByte?) - interface GetWeeklyScheduleResponseCallback { - fun onSuccess( - numberOfTransitionsForSequence: Integer, - dayOfWeekForSequence: Integer, - modeForSequence: Integer, - transitions: ArrayList - ) + class UnoccupiedSetbackMinAttribute(val value: UByte?) - fun onError(error: Exception) - } + class UnoccupiedSetbackMaxAttribute(val value: UByte?) - interface LocalTemperatureAttributeCallback { - fun onSuccess(value: Integer?) + class ACCoilTemperatureAttribute(val value: Short?) - fun onError(ex: Exception) + class GeneratedCommandListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AcceptedCommandListAttribute(val value: ArrayList) - interface OutdoorTemperatureAttributeCallback { - fun onSuccess(value: Integer?) + class EventListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class AttributeListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface TemperatureSetpointHoldDurationAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface SetpointChangeAmountAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface OccupiedSetbackAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface OccupiedSetbackMinAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface OccupiedSetbackMaxAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface UnoccupiedSetbackAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun setpointRaiseLower(mode: UInt, amount: Byte) { + // Implementation needs to be added here } - interface UnoccupiedSetbackMinAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun setpointRaiseLower(mode: UInt, amount: Byte, timedInvokeTimeoutMs: Int) { + // Implementation needs to be added here } - interface UnoccupiedSetbackMaxAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun setWeeklySchedule( + numberOfTransitionsForSequence: UByte, + dayOfWeekForSequence: UInt, + modeForSequence: UInt, + transitions: ArrayList + ) { + // Implementation needs to be added here } - interface ACCoilTemperatureAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun setWeeklySchedule( + numberOfTransitionsForSequence: UByte, + dayOfWeekForSequence: UInt, + modeForSequence: UInt, + transitions: ArrayList, + timedInvokeTimeoutMs: Int + ) { + // Implementation needs to be added here } - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun getWeeklySchedule(daysToReturn: UInt, modeToReturn: UInt): GetWeeklyScheduleResponse { + // Implementation needs to be added here } - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun getWeeklySchedule( + daysToReturn: UInt, + modeToReturn: UInt, + timedInvokeTimeoutMs: Int + ): GetWeeklyScheduleResponse { + // Implementation needs to be added here } - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun clearWeeklySchedule() { + // Implementation needs to be added here } - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun clearWeeklySchedule(timedInvokeTimeoutMs: Int) { + // Implementation needs to be added here } - fun readLocalTemperatureAttribute(callback: LocalTemperatureAttributeCallback) { + suspend fun readLocalTemperatureAttribute(): LocalTemperatureAttribute { // Implementation needs to be added here } - fun subscribeLocalTemperatureAttribute( - callback: LocalTemperatureAttributeCallback, + suspend fun subscribeLocalTemperatureAttribute( minInterval: Int, maxInterval: Int - ) { + ): LocalTemperatureAttribute { // Implementation needs to be added here } - fun readOutdoorTemperatureAttribute(callback: OutdoorTemperatureAttributeCallback) { + suspend fun readOutdoorTemperatureAttribute(): OutdoorTemperatureAttribute { // Implementation needs to be added here } - fun subscribeOutdoorTemperatureAttribute( - callback: OutdoorTemperatureAttributeCallback, + suspend fun subscribeOutdoorTemperatureAttribute( minInterval: Int, maxInterval: Int - ) { + ): OutdoorTemperatureAttribute { // Implementation needs to be added here } - fun readOccupancyAttribute(callback: IntegerAttributeCallback) { + suspend fun readOccupancyAttribute(): Integer { // Implementation needs to be added here } - fun subscribeOccupancyAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeOccupancyAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readAbsMinHeatSetpointLimitAttribute(callback: IntegerAttributeCallback) { + suspend fun readAbsMinHeatSetpointLimitAttribute(): Integer { // Implementation needs to be added here } - fun subscribeAbsMinHeatSetpointLimitAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeAbsMinHeatSetpointLimitAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readAbsMaxHeatSetpointLimitAttribute(callback: IntegerAttributeCallback) { + suspend fun readAbsMaxHeatSetpointLimitAttribute(): Integer { // Implementation needs to be added here } - fun subscribeAbsMaxHeatSetpointLimitAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeAbsMaxHeatSetpointLimitAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readAbsMinCoolSetpointLimitAttribute(callback: IntegerAttributeCallback) { + suspend fun readAbsMinCoolSetpointLimitAttribute(): Integer { // Implementation needs to be added here } - fun subscribeAbsMinCoolSetpointLimitAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeAbsMinCoolSetpointLimitAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readAbsMaxCoolSetpointLimitAttribute(callback: IntegerAttributeCallback) { + suspend fun readAbsMaxCoolSetpointLimitAttribute(): Integer { // Implementation needs to be added here } - fun subscribeAbsMaxCoolSetpointLimitAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeAbsMaxCoolSetpointLimitAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readPICoolingDemandAttribute(callback: IntegerAttributeCallback) { + suspend fun readPICoolingDemandAttribute(): Integer { // Implementation needs to be added here } - fun subscribePICoolingDemandAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribePICoolingDemandAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readPIHeatingDemandAttribute(callback: IntegerAttributeCallback) { + suspend fun readPIHeatingDemandAttribute(): Integer { // Implementation needs to be added here } - fun subscribePIHeatingDemandAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribePIHeatingDemandAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readHVACSystemTypeConfigurationAttribute(callback: IntegerAttributeCallback) { + suspend fun readHVACSystemTypeConfigurationAttribute(): Integer { // Implementation needs to be added here } - fun writeHVACSystemTypeConfigurationAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeHVACSystemTypeConfigurationAttribute(value: UInt) { // Implementation needs to be added here } - fun writeHVACSystemTypeConfigurationAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeHVACSystemTypeConfigurationAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeHVACSystemTypeConfigurationAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeHVACSystemTypeConfigurationAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readLocalTemperatureCalibrationAttribute(callback: IntegerAttributeCallback) { + suspend fun readLocalTemperatureCalibrationAttribute(): Integer { // Implementation needs to be added here } - fun writeLocalTemperatureCalibrationAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeLocalTemperatureCalibrationAttribute(value: Byte) { // Implementation needs to be added here } - fun writeLocalTemperatureCalibrationAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeLocalTemperatureCalibrationAttribute(value: Byte, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeLocalTemperatureCalibrationAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeLocalTemperatureCalibrationAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readOccupiedCoolingSetpointAttribute(callback: IntegerAttributeCallback) { + suspend fun readOccupiedCoolingSetpointAttribute(): Integer { // Implementation needs to be added here } - fun writeOccupiedCoolingSetpointAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeOccupiedCoolingSetpointAttribute(value: Short) { // Implementation needs to be added here } - fun writeOccupiedCoolingSetpointAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeOccupiedCoolingSetpointAttribute(value: Short, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeOccupiedCoolingSetpointAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeOccupiedCoolingSetpointAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readOccupiedHeatingSetpointAttribute(callback: IntegerAttributeCallback) { + suspend fun readOccupiedHeatingSetpointAttribute(): Integer { // Implementation needs to be added here } - fun writeOccupiedHeatingSetpointAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeOccupiedHeatingSetpointAttribute(value: Short) { // Implementation needs to be added here } - fun writeOccupiedHeatingSetpointAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeOccupiedHeatingSetpointAttribute(value: Short, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeOccupiedHeatingSetpointAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeOccupiedHeatingSetpointAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readUnoccupiedCoolingSetpointAttribute(callback: IntegerAttributeCallback) { + suspend fun readUnoccupiedCoolingSetpointAttribute(): Integer { // Implementation needs to be added here } - fun writeUnoccupiedCoolingSetpointAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeUnoccupiedCoolingSetpointAttribute(value: Short) { // Implementation needs to be added here } - fun writeUnoccupiedCoolingSetpointAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeUnoccupiedCoolingSetpointAttribute(value: Short, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeUnoccupiedCoolingSetpointAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeUnoccupiedCoolingSetpointAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readUnoccupiedHeatingSetpointAttribute(callback: IntegerAttributeCallback) { + suspend fun readUnoccupiedHeatingSetpointAttribute(): Integer { // Implementation needs to be added here } - fun writeUnoccupiedHeatingSetpointAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeUnoccupiedHeatingSetpointAttribute(value: Short) { // Implementation needs to be added here } - fun writeUnoccupiedHeatingSetpointAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeUnoccupiedHeatingSetpointAttribute(value: Short, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeUnoccupiedHeatingSetpointAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeUnoccupiedHeatingSetpointAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readMinHeatSetpointLimitAttribute(callback: IntegerAttributeCallback) { + suspend fun readMinHeatSetpointLimitAttribute(): Integer { // Implementation needs to be added here } - fun writeMinHeatSetpointLimitAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeMinHeatSetpointLimitAttribute(value: Short) { // Implementation needs to be added here } - fun writeMinHeatSetpointLimitAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeMinHeatSetpointLimitAttribute(value: Short, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeMinHeatSetpointLimitAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeMinHeatSetpointLimitAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readMaxHeatSetpointLimitAttribute(callback: IntegerAttributeCallback) { + suspend fun readMaxHeatSetpointLimitAttribute(): Integer { // Implementation needs to be added here } - fun writeMaxHeatSetpointLimitAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeMaxHeatSetpointLimitAttribute(value: Short) { // Implementation needs to be added here } - fun writeMaxHeatSetpointLimitAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeMaxHeatSetpointLimitAttribute(value: Short, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeMaxHeatSetpointLimitAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeMaxHeatSetpointLimitAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readMinCoolSetpointLimitAttribute(callback: IntegerAttributeCallback) { + suspend fun readMinCoolSetpointLimitAttribute(): Integer { // Implementation needs to be added here } - fun writeMinCoolSetpointLimitAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeMinCoolSetpointLimitAttribute(value: Short) { // Implementation needs to be added here } - fun writeMinCoolSetpointLimitAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeMinCoolSetpointLimitAttribute(value: Short, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeMinCoolSetpointLimitAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeMinCoolSetpointLimitAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readMaxCoolSetpointLimitAttribute(callback: IntegerAttributeCallback) { + suspend fun readMaxCoolSetpointLimitAttribute(): Integer { // Implementation needs to be added here } - fun writeMaxCoolSetpointLimitAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeMaxCoolSetpointLimitAttribute(value: Short) { // Implementation needs to be added here } - fun writeMaxCoolSetpointLimitAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeMaxCoolSetpointLimitAttribute(value: Short, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeMaxCoolSetpointLimitAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeMaxCoolSetpointLimitAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readMinSetpointDeadBandAttribute(callback: IntegerAttributeCallback) { + suspend fun readMinSetpointDeadBandAttribute(): Integer { // Implementation needs to be added here } - fun writeMinSetpointDeadBandAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeMinSetpointDeadBandAttribute(value: Byte) { // Implementation needs to be added here } - fun writeMinSetpointDeadBandAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeMinSetpointDeadBandAttribute(value: Byte, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeMinSetpointDeadBandAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeMinSetpointDeadBandAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readRemoteSensingAttribute(callback: IntegerAttributeCallback) { + suspend fun readRemoteSensingAttribute(): Integer { // Implementation needs to be added here } - fun writeRemoteSensingAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeRemoteSensingAttribute(value: UInt) { // Implementation needs to be added here } - fun writeRemoteSensingAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeRemoteSensingAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeRemoteSensingAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeRemoteSensingAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readControlSequenceOfOperationAttribute(callback: IntegerAttributeCallback) { + suspend fun readControlSequenceOfOperationAttribute(): Integer { // Implementation needs to be added here } - fun writeControlSequenceOfOperationAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeControlSequenceOfOperationAttribute(value: UInt) { // Implementation needs to be added here } - fun writeControlSequenceOfOperationAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeControlSequenceOfOperationAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeControlSequenceOfOperationAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeControlSequenceOfOperationAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readSystemModeAttribute(callback: IntegerAttributeCallback) { + suspend fun readSystemModeAttribute(): Integer { // Implementation needs to be added here } - fun writeSystemModeAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeSystemModeAttribute(value: UInt) { // Implementation needs to be added here } - fun writeSystemModeAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeSystemModeAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeSystemModeAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeSystemModeAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readThermostatRunningModeAttribute(callback: IntegerAttributeCallback) { + suspend fun readThermostatRunningModeAttribute(): Integer { // Implementation needs to be added here } - fun subscribeThermostatRunningModeAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeThermostatRunningModeAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readStartOfWeekAttribute(callback: IntegerAttributeCallback) { + suspend fun readStartOfWeekAttribute(): Integer { // Implementation needs to be added here } - fun subscribeStartOfWeekAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeStartOfWeekAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readNumberOfWeeklyTransitionsAttribute(callback: IntegerAttributeCallback) { + suspend fun readNumberOfWeeklyTransitionsAttribute(): Integer { // Implementation needs to be added here } - fun subscribeNumberOfWeeklyTransitionsAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeNumberOfWeeklyTransitionsAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readNumberOfDailyTransitionsAttribute(callback: IntegerAttributeCallback) { + suspend fun readNumberOfDailyTransitionsAttribute(): Integer { // Implementation needs to be added here } - fun subscribeNumberOfDailyTransitionsAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeNumberOfDailyTransitionsAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readTemperatureSetpointHoldAttribute(callback: IntegerAttributeCallback) { + suspend fun readTemperatureSetpointHoldAttribute(): Integer { // Implementation needs to be added here } - fun writeTemperatureSetpointHoldAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeTemperatureSetpointHoldAttribute(value: UInt) { // Implementation needs to be added here } - fun writeTemperatureSetpointHoldAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeTemperatureSetpointHoldAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeTemperatureSetpointHoldAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeTemperatureSetpointHoldAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readTemperatureSetpointHoldDurationAttribute( - callback: TemperatureSetpointHoldDurationAttributeCallback - ) { + suspend fun readTemperatureSetpointHoldDurationAttribute(): + TemperatureSetpointHoldDurationAttribute { // Implementation needs to be added here } - fun writeTemperatureSetpointHoldDurationAttribute( - callback: DefaultClusterCallback, - value: Integer - ) { + suspend fun writeTemperatureSetpointHoldDurationAttribute(value: UShort) { // Implementation needs to be added here } - fun writeTemperatureSetpointHoldDurationAttribute( - callback: DefaultClusterCallback, - value: Integer, + suspend fun writeTemperatureSetpointHoldDurationAttribute( + value: UShort, timedWriteTimeoutMs: Int ) { // Implementation needs to be added here } - fun subscribeTemperatureSetpointHoldDurationAttribute( - callback: TemperatureSetpointHoldDurationAttributeCallback, + suspend fun subscribeTemperatureSetpointHoldDurationAttribute( minInterval: Int, maxInterval: Int - ) { + ): TemperatureSetpointHoldDurationAttribute { // Implementation needs to be added here } - fun readThermostatProgrammingOperationModeAttribute(callback: IntegerAttributeCallback) { + suspend fun readThermostatProgrammingOperationModeAttribute(): Integer { // Implementation needs to be added here } - fun writeThermostatProgrammingOperationModeAttribute( - callback: DefaultClusterCallback, - value: Integer - ) { + suspend fun writeThermostatProgrammingOperationModeAttribute(value: UInt) { // Implementation needs to be added here } - fun writeThermostatProgrammingOperationModeAttribute( - callback: DefaultClusterCallback, - value: Integer, + suspend fun writeThermostatProgrammingOperationModeAttribute( + value: UInt, timedWriteTimeoutMs: Int ) { // Implementation needs to be added here } - fun subscribeThermostatProgrammingOperationModeAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeThermostatProgrammingOperationModeAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readThermostatRunningStateAttribute(callback: IntegerAttributeCallback) { + suspend fun readThermostatRunningStateAttribute(): Integer { // Implementation needs to be added here } - fun subscribeThermostatRunningStateAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeThermostatRunningStateAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readSetpointChangeSourceAttribute(callback: IntegerAttributeCallback) { + suspend fun readSetpointChangeSourceAttribute(): Integer { // Implementation needs to be added here } - fun subscribeSetpointChangeSourceAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeSetpointChangeSourceAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readSetpointChangeAmountAttribute(callback: SetpointChangeAmountAttributeCallback) { + suspend fun readSetpointChangeAmountAttribute(): SetpointChangeAmountAttribute { // Implementation needs to be added here } - fun subscribeSetpointChangeAmountAttribute( - callback: SetpointChangeAmountAttributeCallback, + suspend fun subscribeSetpointChangeAmountAttribute( minInterval: Int, maxInterval: Int - ) { + ): SetpointChangeAmountAttribute { // Implementation needs to be added here } - fun readSetpointChangeSourceTimestampAttribute(callback: LongAttributeCallback) { + suspend fun readSetpointChangeSourceTimestampAttribute(): Long { // Implementation needs to be added here } - fun subscribeSetpointChangeSourceTimestampAttribute( - callback: LongAttributeCallback, + suspend fun subscribeSetpointChangeSourceTimestampAttribute( minInterval: Int, maxInterval: Int - ) { + ): Long { // Implementation needs to be added here } - fun readOccupiedSetbackAttribute(callback: OccupiedSetbackAttributeCallback) { + suspend fun readOccupiedSetbackAttribute(): OccupiedSetbackAttribute { // Implementation needs to be added here } - fun writeOccupiedSetbackAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeOccupiedSetbackAttribute(value: UByte) { // Implementation needs to be added here } - fun writeOccupiedSetbackAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeOccupiedSetbackAttribute(value: UByte, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeOccupiedSetbackAttribute( - callback: OccupiedSetbackAttributeCallback, + suspend fun subscribeOccupiedSetbackAttribute( minInterval: Int, maxInterval: Int - ) { + ): OccupiedSetbackAttribute { // Implementation needs to be added here } - fun readOccupiedSetbackMinAttribute(callback: OccupiedSetbackMinAttributeCallback) { + suspend fun readOccupiedSetbackMinAttribute(): OccupiedSetbackMinAttribute { // Implementation needs to be added here } - fun subscribeOccupiedSetbackMinAttribute( - callback: OccupiedSetbackMinAttributeCallback, + suspend fun subscribeOccupiedSetbackMinAttribute( minInterval: Int, maxInterval: Int - ) { + ): OccupiedSetbackMinAttribute { // Implementation needs to be added here } - fun readOccupiedSetbackMaxAttribute(callback: OccupiedSetbackMaxAttributeCallback) { + suspend fun readOccupiedSetbackMaxAttribute(): OccupiedSetbackMaxAttribute { // Implementation needs to be added here } - fun subscribeOccupiedSetbackMaxAttribute( - callback: OccupiedSetbackMaxAttributeCallback, + suspend fun subscribeOccupiedSetbackMaxAttribute( minInterval: Int, maxInterval: Int - ) { + ): OccupiedSetbackMaxAttribute { // Implementation needs to be added here } - fun readUnoccupiedSetbackAttribute(callback: UnoccupiedSetbackAttributeCallback) { + suspend fun readUnoccupiedSetbackAttribute(): UnoccupiedSetbackAttribute { // Implementation needs to be added here } - fun writeUnoccupiedSetbackAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeUnoccupiedSetbackAttribute(value: UByte) { // Implementation needs to be added here } - fun writeUnoccupiedSetbackAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeUnoccupiedSetbackAttribute(value: UByte, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeUnoccupiedSetbackAttribute( - callback: UnoccupiedSetbackAttributeCallback, + suspend fun subscribeUnoccupiedSetbackAttribute( minInterval: Int, maxInterval: Int - ) { + ): UnoccupiedSetbackAttribute { // Implementation needs to be added here } - fun readUnoccupiedSetbackMinAttribute(callback: UnoccupiedSetbackMinAttributeCallback) { + suspend fun readUnoccupiedSetbackMinAttribute(): UnoccupiedSetbackMinAttribute { // Implementation needs to be added here } - fun subscribeUnoccupiedSetbackMinAttribute( - callback: UnoccupiedSetbackMinAttributeCallback, + suspend fun subscribeUnoccupiedSetbackMinAttribute( minInterval: Int, maxInterval: Int - ) { + ): UnoccupiedSetbackMinAttribute { // Implementation needs to be added here } - fun readUnoccupiedSetbackMaxAttribute(callback: UnoccupiedSetbackMaxAttributeCallback) { + suspend fun readUnoccupiedSetbackMaxAttribute(): UnoccupiedSetbackMaxAttribute { // Implementation needs to be added here } - fun subscribeUnoccupiedSetbackMaxAttribute( - callback: UnoccupiedSetbackMaxAttributeCallback, + suspend fun subscribeUnoccupiedSetbackMaxAttribute( minInterval: Int, maxInterval: Int - ) { + ): UnoccupiedSetbackMaxAttribute { // Implementation needs to be added here } - fun readEmergencyHeatDeltaAttribute(callback: IntegerAttributeCallback) { + suspend fun readEmergencyHeatDeltaAttribute(): Integer { // Implementation needs to be added here } - fun writeEmergencyHeatDeltaAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeEmergencyHeatDeltaAttribute(value: UByte) { // Implementation needs to be added here } - fun writeEmergencyHeatDeltaAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeEmergencyHeatDeltaAttribute(value: UByte, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeEmergencyHeatDeltaAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEmergencyHeatDeltaAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readACTypeAttribute(callback: IntegerAttributeCallback) { + suspend fun readACTypeAttribute(): Integer { // Implementation needs to be added here } - fun writeACTypeAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeACTypeAttribute(value: UInt) { // Implementation needs to be added here } - fun writeACTypeAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeACTypeAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeACTypeAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeACTypeAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readACCapacityAttribute(callback: IntegerAttributeCallback) { + suspend fun readACCapacityAttribute(): Integer { // Implementation needs to be added here } - fun writeACCapacityAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeACCapacityAttribute(value: UShort) { // Implementation needs to be added here } - fun writeACCapacityAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeACCapacityAttribute(value: UShort, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeACCapacityAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeACCapacityAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readACRefrigerantTypeAttribute(callback: IntegerAttributeCallback) { + suspend fun readACRefrigerantTypeAttribute(): Integer { // Implementation needs to be added here } - fun writeACRefrigerantTypeAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeACRefrigerantTypeAttribute(value: UInt) { // Implementation needs to be added here } - fun writeACRefrigerantTypeAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeACRefrigerantTypeAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeACRefrigerantTypeAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeACRefrigerantTypeAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readACCompressorTypeAttribute(callback: IntegerAttributeCallback) { + suspend fun readACCompressorTypeAttribute(): Integer { // Implementation needs to be added here } - fun writeACCompressorTypeAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeACCompressorTypeAttribute(value: UInt) { // Implementation needs to be added here } - fun writeACCompressorTypeAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeACCompressorTypeAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeACCompressorTypeAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeACCompressorTypeAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readACErrorCodeAttribute(callback: LongAttributeCallback) { + suspend fun readACErrorCodeAttribute(): Long { // Implementation needs to be added here } - fun writeACErrorCodeAttribute(callback: DefaultClusterCallback, value: Long) { + suspend fun writeACErrorCodeAttribute(value: ULong) { // Implementation needs to be added here } - fun writeACErrorCodeAttribute( - callback: DefaultClusterCallback, - value: Long, - timedWriteTimeoutMs: Int - ) { + suspend fun writeACErrorCodeAttribute(value: ULong, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeACErrorCodeAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeACErrorCodeAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readACLouverPositionAttribute(callback: IntegerAttributeCallback) { + suspend fun readACLouverPositionAttribute(): Integer { // Implementation needs to be added here } - fun writeACLouverPositionAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeACLouverPositionAttribute(value: UInt) { // Implementation needs to be added here } - fun writeACLouverPositionAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeACLouverPositionAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeACLouverPositionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeACLouverPositionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readACCoilTemperatureAttribute(callback: ACCoilTemperatureAttributeCallback) { + suspend fun readACCoilTemperatureAttribute(): ACCoilTemperatureAttribute { // Implementation needs to be added here } - fun subscribeACCoilTemperatureAttribute( - callback: ACCoilTemperatureAttributeCallback, + suspend fun subscribeACCoilTemperatureAttribute( minInterval: Int, maxInterval: Int - ) { + ): ACCoilTemperatureAttribute { // Implementation needs to be added here } - fun readACCapacityformatAttribute(callback: IntegerAttributeCallback) { + suspend fun readACCapacityformatAttribute(): Integer { // Implementation needs to be added here } - fun writeACCapacityformatAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeACCapacityformatAttribute(value: UInt) { // Implementation needs to be added here } - fun writeACCapacityformatAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeACCapacityformatAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeACCapacityformatAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeACCapacityformatAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 513u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThermostatUserInterfaceConfigurationCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThermostatUserInterfaceConfigurationCluster.kt index c1d944c7854743..1a07633e2bc31c 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThermostatUserInterfaceConfigurationCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThermostatUserInterfaceConfigurationCluster.kt @@ -20,186 +20,126 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class ThermostatUserInterfaceConfigurationCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 516u - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class GeneratedCommandListAttribute(val value: ArrayList) - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) + class AcceptedCommandListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class EventListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AttributeListAttribute(val value: ArrayList) - fun readTemperatureDisplayModeAttribute(callback: IntegerAttributeCallback) { + suspend fun readTemperatureDisplayModeAttribute(): Integer { // Implementation needs to be added here } - fun writeTemperatureDisplayModeAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeTemperatureDisplayModeAttribute(value: UInt) { // Implementation needs to be added here } - fun writeTemperatureDisplayModeAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeTemperatureDisplayModeAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeTemperatureDisplayModeAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeTemperatureDisplayModeAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readKeypadLockoutAttribute(callback: IntegerAttributeCallback) { + suspend fun readKeypadLockoutAttribute(): Integer { // Implementation needs to be added here } - fun writeKeypadLockoutAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeKeypadLockoutAttribute(value: UInt) { // Implementation needs to be added here } - fun writeKeypadLockoutAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeKeypadLockoutAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeKeypadLockoutAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeKeypadLockoutAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readScheduleProgrammingVisibilityAttribute(callback: IntegerAttributeCallback) { + suspend fun readScheduleProgrammingVisibilityAttribute(): Integer { // Implementation needs to be added here } - fun writeScheduleProgrammingVisibilityAttribute( - callback: DefaultClusterCallback, - value: Integer - ) { + suspend fun writeScheduleProgrammingVisibilityAttribute(value: UInt) { // Implementation needs to be added here } - fun writeScheduleProgrammingVisibilityAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeScheduleProgrammingVisibilityAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeScheduleProgrammingVisibilityAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeScheduleProgrammingVisibilityAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 516u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThreadNetworkDiagnosticsCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThreadNetworkDiagnosticsCluster.kt index 2050e5b5dcc69a..a9fa281c1384b3 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThreadNetworkDiagnosticsCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThreadNetworkDiagnosticsCluster.kt @@ -20,1037 +20,695 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class ThreadNetworkDiagnosticsCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 53u - } - - fun resetCounts(callback: DefaultClusterCallback) { - // Implementation needs to be added here - } - - fun resetCounts(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } - - interface ChannelAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface RoutingRoleAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface NetworkNameAttributeCallback { - fun onSuccess(value: String?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface PanIdAttributeCallback { - fun onSuccess(value: Integer?) + class ChannelAttribute(val value: UShort?) - fun onError(ex: Exception) + class RoutingRoleAttribute(val value: UInt?) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface ExtendedPanIdAttributeCallback { - fun onSuccess(value: Long?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface MeshLocalPrefixAttributeCallback { - fun onSuccess(value: ByteArray?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface NeighborTableAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) + class NetworkNameAttribute(val value: String?) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class PanIdAttribute(val value: UShort?) - interface RouteTableAttributeCallback { - fun onSuccess(value: ArrayList) + class ExtendedPanIdAttribute(val value: ULong?) - fun onError(ex: Exception) + class MeshLocalPrefixAttribute(val value: ByteArray?) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class NeighborTableAttribute( + val value: ArrayList + ) - interface PartitionIdAttributeCallback { - fun onSuccess(value: Long?) + class RouteTableAttribute( + val value: ArrayList + ) - fun onError(ex: Exception) + class PartitionIdAttribute(val value: UInt?) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class WeightingAttribute(val value: UByte?) - interface WeightingAttributeCallback { - fun onSuccess(value: Integer?) + class DataVersionAttribute(val value: UByte?) - fun onError(ex: Exception) + class StableDataVersionAttribute(val value: UByte?) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class LeaderRouterIdAttribute(val value: UByte?) - interface DataVersionAttributeCallback { - fun onSuccess(value: Integer?) + class ActiveTimestampAttribute(val value: ULong?) - fun onError(ex: Exception) + class PendingTimestampAttribute(val value: ULong?) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class DelayAttribute(val value: UInt?) - interface StableDataVersionAttributeCallback { - fun onSuccess(value: Integer?) + class SecurityPolicyAttribute( + val value: ChipStructs.ThreadNetworkDiagnosticsClusterSecurityPolicy? + ) - fun onError(ex: Exception) + class ChannelPage0MaskAttribute(val value: ByteArray?) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class OperationalDatasetComponentsAttribute( + val value: ChipStructs.ThreadNetworkDiagnosticsClusterOperationalDatasetComponents? + ) - interface LeaderRouterIdAttributeCallback { - fun onSuccess(value: Integer?) + class ActiveNetworkFaultsListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class GeneratedCommandListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface ActiveTimestampAttributeCallback { - fun onSuccess(value: Long?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AcceptedCommandListAttribute(val value: ArrayList) - interface PendingTimestampAttributeCallback { - fun onSuccess(value: Long?) + class EventListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class AttributeListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface DelayAttributeCallback { - fun onSuccess(value: Long?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface SecurityPolicyAttributeCallback { - fun onSuccess(value: ChipStructs.ThreadNetworkDiagnosticsClusterSecurityPolicy?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface ChannelPage0MaskAttributeCallback { - fun onSuccess(value: ByteArray?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface OperationalDatasetComponentsAttributeCallback { - fun onSuccess(value: ChipStructs.ThreadNetworkDiagnosticsClusterOperationalDatasetComponents?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface ActiveNetworkFaultsListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun resetCounts() { + // Implementation needs to be added here } - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun resetCounts(timedInvokeTimeoutMs: Int) { + // Implementation needs to be added here } - fun readChannelAttribute(callback: ChannelAttributeCallback) { + suspend fun readChannelAttribute(): ChannelAttribute { // Implementation needs to be added here } - fun subscribeChannelAttribute( - callback: ChannelAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeChannelAttribute(minInterval: Int, maxInterval: Int): ChannelAttribute { // Implementation needs to be added here } - fun readRoutingRoleAttribute(callback: RoutingRoleAttributeCallback) { + suspend fun readRoutingRoleAttribute(): RoutingRoleAttribute { // Implementation needs to be added here } - fun subscribeRoutingRoleAttribute( - callback: RoutingRoleAttributeCallback, + suspend fun subscribeRoutingRoleAttribute( minInterval: Int, maxInterval: Int - ) { + ): RoutingRoleAttribute { // Implementation needs to be added here } - fun readNetworkNameAttribute(callback: NetworkNameAttributeCallback) { + suspend fun readNetworkNameAttribute(): NetworkNameAttribute { // Implementation needs to be added here } - fun subscribeNetworkNameAttribute( - callback: NetworkNameAttributeCallback, + suspend fun subscribeNetworkNameAttribute( minInterval: Int, maxInterval: Int - ) { + ): NetworkNameAttribute { // Implementation needs to be added here } - fun readPanIdAttribute(callback: PanIdAttributeCallback) { + suspend fun readPanIdAttribute(): PanIdAttribute { // Implementation needs to be added here } - fun subscribePanIdAttribute( - callback: PanIdAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribePanIdAttribute(minInterval: Int, maxInterval: Int): PanIdAttribute { // Implementation needs to be added here } - fun readExtendedPanIdAttribute(callback: ExtendedPanIdAttributeCallback) { + suspend fun readExtendedPanIdAttribute(): ExtendedPanIdAttribute { // Implementation needs to be added here } - fun subscribeExtendedPanIdAttribute( - callback: ExtendedPanIdAttributeCallback, + suspend fun subscribeExtendedPanIdAttribute( minInterval: Int, maxInterval: Int - ) { + ): ExtendedPanIdAttribute { // Implementation needs to be added here } - fun readMeshLocalPrefixAttribute(callback: MeshLocalPrefixAttributeCallback) { + suspend fun readMeshLocalPrefixAttribute(): MeshLocalPrefixAttribute { // Implementation needs to be added here } - fun subscribeMeshLocalPrefixAttribute( - callback: MeshLocalPrefixAttributeCallback, + suspend fun subscribeMeshLocalPrefixAttribute( minInterval: Int, maxInterval: Int - ) { + ): MeshLocalPrefixAttribute { // Implementation needs to be added here } - fun readOverrunCountAttribute(callback: LongAttributeCallback) { + suspend fun readOverrunCountAttribute(): Long { // Implementation needs to be added here } - fun subscribeOverrunCountAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeOverrunCountAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readNeighborTableAttribute(callback: NeighborTableAttributeCallback) { + suspend fun readNeighborTableAttribute(): NeighborTableAttribute { // Implementation needs to be added here } - fun subscribeNeighborTableAttribute( - callback: NeighborTableAttributeCallback, + suspend fun subscribeNeighborTableAttribute( minInterval: Int, maxInterval: Int - ) { + ): NeighborTableAttribute { // Implementation needs to be added here } - fun readRouteTableAttribute(callback: RouteTableAttributeCallback) { + suspend fun readRouteTableAttribute(): RouteTableAttribute { // Implementation needs to be added here } - fun subscribeRouteTableAttribute( - callback: RouteTableAttributeCallback, + suspend fun subscribeRouteTableAttribute( minInterval: Int, maxInterval: Int - ) { + ): RouteTableAttribute { // Implementation needs to be added here } - fun readPartitionIdAttribute(callback: PartitionIdAttributeCallback) { + suspend fun readPartitionIdAttribute(): PartitionIdAttribute { // Implementation needs to be added here } - fun subscribePartitionIdAttribute( - callback: PartitionIdAttributeCallback, + suspend fun subscribePartitionIdAttribute( minInterval: Int, maxInterval: Int - ) { + ): PartitionIdAttribute { // Implementation needs to be added here } - fun readWeightingAttribute(callback: WeightingAttributeCallback) { + suspend fun readWeightingAttribute(): WeightingAttribute { // Implementation needs to be added here } - fun subscribeWeightingAttribute( - callback: WeightingAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeWeightingAttribute(minInterval: Int, maxInterval: Int): WeightingAttribute { // Implementation needs to be added here } - fun readDataVersionAttribute(callback: DataVersionAttributeCallback) { + suspend fun readDataVersionAttribute(): DataVersionAttribute { // Implementation needs to be added here } - fun subscribeDataVersionAttribute( - callback: DataVersionAttributeCallback, + suspend fun subscribeDataVersionAttribute( minInterval: Int, maxInterval: Int - ) { + ): DataVersionAttribute { // Implementation needs to be added here } - fun readStableDataVersionAttribute(callback: StableDataVersionAttributeCallback) { + suspend fun readStableDataVersionAttribute(): StableDataVersionAttribute { // Implementation needs to be added here } - fun subscribeStableDataVersionAttribute( - callback: StableDataVersionAttributeCallback, + suspend fun subscribeStableDataVersionAttribute( minInterval: Int, maxInterval: Int - ) { + ): StableDataVersionAttribute { // Implementation needs to be added here } - fun readLeaderRouterIdAttribute(callback: LeaderRouterIdAttributeCallback) { + suspend fun readLeaderRouterIdAttribute(): LeaderRouterIdAttribute { // Implementation needs to be added here } - fun subscribeLeaderRouterIdAttribute( - callback: LeaderRouterIdAttributeCallback, + suspend fun subscribeLeaderRouterIdAttribute( minInterval: Int, maxInterval: Int - ) { + ): LeaderRouterIdAttribute { // Implementation needs to be added here } - fun readDetachedRoleCountAttribute(callback: IntegerAttributeCallback) { + suspend fun readDetachedRoleCountAttribute(): Integer { // Implementation needs to be added here } - fun subscribeDetachedRoleCountAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeDetachedRoleCountAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readChildRoleCountAttribute(callback: IntegerAttributeCallback) { + suspend fun readChildRoleCountAttribute(): Integer { // Implementation needs to be added here } - fun subscribeChildRoleCountAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeChildRoleCountAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readRouterRoleCountAttribute(callback: IntegerAttributeCallback) { + suspend fun readRouterRoleCountAttribute(): Integer { // Implementation needs to be added here } - fun subscribeRouterRoleCountAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeRouterRoleCountAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readLeaderRoleCountAttribute(callback: IntegerAttributeCallback) { + suspend fun readLeaderRoleCountAttribute(): Integer { // Implementation needs to be added here } - fun subscribeLeaderRoleCountAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeLeaderRoleCountAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readAttachAttemptCountAttribute(callback: IntegerAttributeCallback) { + suspend fun readAttachAttemptCountAttribute(): Integer { // Implementation needs to be added here } - fun subscribeAttachAttemptCountAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeAttachAttemptCountAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readPartitionIdChangeCountAttribute(callback: IntegerAttributeCallback) { + suspend fun readPartitionIdChangeCountAttribute(): Integer { // Implementation needs to be added here } - fun subscribePartitionIdChangeCountAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribePartitionIdChangeCountAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readBetterPartitionAttachAttemptCountAttribute(callback: IntegerAttributeCallback) { + suspend fun readBetterPartitionAttachAttemptCountAttribute(): Integer { // Implementation needs to be added here } - fun subscribeBetterPartitionAttachAttemptCountAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeBetterPartitionAttachAttemptCountAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readParentChangeCountAttribute(callback: IntegerAttributeCallback) { + suspend fun readParentChangeCountAttribute(): Integer { // Implementation needs to be added here } - fun subscribeParentChangeCountAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeParentChangeCountAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readTxTotalCountAttribute(callback: LongAttributeCallback) { + suspend fun readTxTotalCountAttribute(): Long { // Implementation needs to be added here } - fun subscribeTxTotalCountAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeTxTotalCountAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readTxUnicastCountAttribute(callback: LongAttributeCallback) { + suspend fun readTxUnicastCountAttribute(): Long { // Implementation needs to be added here } - fun subscribeTxUnicastCountAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeTxUnicastCountAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readTxBroadcastCountAttribute(callback: LongAttributeCallback) { + suspend fun readTxBroadcastCountAttribute(): Long { // Implementation needs to be added here } - fun subscribeTxBroadcastCountAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeTxBroadcastCountAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readTxAckRequestedCountAttribute(callback: LongAttributeCallback) { + suspend fun readTxAckRequestedCountAttribute(): Long { // Implementation needs to be added here } - fun subscribeTxAckRequestedCountAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeTxAckRequestedCountAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readTxAckedCountAttribute(callback: LongAttributeCallback) { + suspend fun readTxAckedCountAttribute(): Long { // Implementation needs to be added here } - fun subscribeTxAckedCountAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeTxAckedCountAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readTxNoAckRequestedCountAttribute(callback: LongAttributeCallback) { + suspend fun readTxNoAckRequestedCountAttribute(): Long { // Implementation needs to be added here } - fun subscribeTxNoAckRequestedCountAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeTxNoAckRequestedCountAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readTxDataCountAttribute(callback: LongAttributeCallback) { + suspend fun readTxDataCountAttribute(): Long { // Implementation needs to be added here } - fun subscribeTxDataCountAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeTxDataCountAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readTxDataPollCountAttribute(callback: LongAttributeCallback) { + suspend fun readTxDataPollCountAttribute(): Long { // Implementation needs to be added here } - fun subscribeTxDataPollCountAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeTxDataPollCountAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readTxBeaconCountAttribute(callback: LongAttributeCallback) { + suspend fun readTxBeaconCountAttribute(): Long { // Implementation needs to be added here } - fun subscribeTxBeaconCountAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeTxBeaconCountAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readTxBeaconRequestCountAttribute(callback: LongAttributeCallback) { + suspend fun readTxBeaconRequestCountAttribute(): Long { // Implementation needs to be added here } - fun subscribeTxBeaconRequestCountAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeTxBeaconRequestCountAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readTxOtherCountAttribute(callback: LongAttributeCallback) { + suspend fun readTxOtherCountAttribute(): Long { // Implementation needs to be added here } - fun subscribeTxOtherCountAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeTxOtherCountAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readTxRetryCountAttribute(callback: LongAttributeCallback) { + suspend fun readTxRetryCountAttribute(): Long { // Implementation needs to be added here } - fun subscribeTxRetryCountAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeTxRetryCountAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readTxDirectMaxRetryExpiryCountAttribute(callback: LongAttributeCallback) { + suspend fun readTxDirectMaxRetryExpiryCountAttribute(): Long { // Implementation needs to be added here } - fun subscribeTxDirectMaxRetryExpiryCountAttribute( - callback: LongAttributeCallback, + suspend fun subscribeTxDirectMaxRetryExpiryCountAttribute( minInterval: Int, maxInterval: Int - ) { + ): Long { // Implementation needs to be added here } - fun readTxIndirectMaxRetryExpiryCountAttribute(callback: LongAttributeCallback) { + suspend fun readTxIndirectMaxRetryExpiryCountAttribute(): Long { // Implementation needs to be added here } - fun subscribeTxIndirectMaxRetryExpiryCountAttribute( - callback: LongAttributeCallback, + suspend fun subscribeTxIndirectMaxRetryExpiryCountAttribute( minInterval: Int, maxInterval: Int - ) { + ): Long { // Implementation needs to be added here } - fun readTxErrCcaCountAttribute(callback: LongAttributeCallback) { + suspend fun readTxErrCcaCountAttribute(): Long { // Implementation needs to be added here } - fun subscribeTxErrCcaCountAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeTxErrCcaCountAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readTxErrAbortCountAttribute(callback: LongAttributeCallback) { + suspend fun readTxErrAbortCountAttribute(): Long { // Implementation needs to be added here } - fun subscribeTxErrAbortCountAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeTxErrAbortCountAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readTxErrBusyChannelCountAttribute(callback: LongAttributeCallback) { + suspend fun readTxErrBusyChannelCountAttribute(): Long { // Implementation needs to be added here } - fun subscribeTxErrBusyChannelCountAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeTxErrBusyChannelCountAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readRxTotalCountAttribute(callback: LongAttributeCallback) { + suspend fun readRxTotalCountAttribute(): Long { // Implementation needs to be added here } - fun subscribeRxTotalCountAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeRxTotalCountAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readRxUnicastCountAttribute(callback: LongAttributeCallback) { + suspend fun readRxUnicastCountAttribute(): Long { // Implementation needs to be added here } - fun subscribeRxUnicastCountAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeRxUnicastCountAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readRxBroadcastCountAttribute(callback: LongAttributeCallback) { + suspend fun readRxBroadcastCountAttribute(): Long { // Implementation needs to be added here } - fun subscribeRxBroadcastCountAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeRxBroadcastCountAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readRxDataCountAttribute(callback: LongAttributeCallback) { + suspend fun readRxDataCountAttribute(): Long { // Implementation needs to be added here } - fun subscribeRxDataCountAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeRxDataCountAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readRxDataPollCountAttribute(callback: LongAttributeCallback) { + suspend fun readRxDataPollCountAttribute(): Long { // Implementation needs to be added here } - fun subscribeRxDataPollCountAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeRxDataPollCountAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readRxBeaconCountAttribute(callback: LongAttributeCallback) { + suspend fun readRxBeaconCountAttribute(): Long { // Implementation needs to be added here } - fun subscribeRxBeaconCountAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeRxBeaconCountAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readRxBeaconRequestCountAttribute(callback: LongAttributeCallback) { + suspend fun readRxBeaconRequestCountAttribute(): Long { // Implementation needs to be added here } - fun subscribeRxBeaconRequestCountAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeRxBeaconRequestCountAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readRxOtherCountAttribute(callback: LongAttributeCallback) { + suspend fun readRxOtherCountAttribute(): Long { // Implementation needs to be added here } - fun subscribeRxOtherCountAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeRxOtherCountAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readRxAddressFilteredCountAttribute(callback: LongAttributeCallback) { + suspend fun readRxAddressFilteredCountAttribute(): Long { // Implementation needs to be added here } - fun subscribeRxAddressFilteredCountAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeRxAddressFilteredCountAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readRxDestAddrFilteredCountAttribute(callback: LongAttributeCallback) { + suspend fun readRxDestAddrFilteredCountAttribute(): Long { // Implementation needs to be added here } - fun subscribeRxDestAddrFilteredCountAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeRxDestAddrFilteredCountAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readRxDuplicatedCountAttribute(callback: LongAttributeCallback) { + suspend fun readRxDuplicatedCountAttribute(): Long { // Implementation needs to be added here } - fun subscribeRxDuplicatedCountAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeRxDuplicatedCountAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readRxErrNoFrameCountAttribute(callback: LongAttributeCallback) { + suspend fun readRxErrNoFrameCountAttribute(): Long { // Implementation needs to be added here } - fun subscribeRxErrNoFrameCountAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeRxErrNoFrameCountAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readRxErrUnknownNeighborCountAttribute(callback: LongAttributeCallback) { + suspend fun readRxErrUnknownNeighborCountAttribute(): Long { // Implementation needs to be added here } - fun subscribeRxErrUnknownNeighborCountAttribute( - callback: LongAttributeCallback, + suspend fun subscribeRxErrUnknownNeighborCountAttribute( minInterval: Int, maxInterval: Int - ) { + ): Long { // Implementation needs to be added here } - fun readRxErrInvalidSrcAddrCountAttribute(callback: LongAttributeCallback) { + suspend fun readRxErrInvalidSrcAddrCountAttribute(): Long { // Implementation needs to be added here } - fun subscribeRxErrInvalidSrcAddrCountAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeRxErrInvalidSrcAddrCountAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readRxErrSecCountAttribute(callback: LongAttributeCallback) { + suspend fun readRxErrSecCountAttribute(): Long { // Implementation needs to be added here } - fun subscribeRxErrSecCountAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeRxErrSecCountAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readRxErrFcsCountAttribute(callback: LongAttributeCallback) { + suspend fun readRxErrFcsCountAttribute(): Long { // Implementation needs to be added here } - fun subscribeRxErrFcsCountAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeRxErrFcsCountAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readRxErrOtherCountAttribute(callback: LongAttributeCallback) { + suspend fun readRxErrOtherCountAttribute(): Long { // Implementation needs to be added here } - fun subscribeRxErrOtherCountAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeRxErrOtherCountAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readActiveTimestampAttribute(callback: ActiveTimestampAttributeCallback) { + suspend fun readActiveTimestampAttribute(): ActiveTimestampAttribute { // Implementation needs to be added here } - fun subscribeActiveTimestampAttribute( - callback: ActiveTimestampAttributeCallback, + suspend fun subscribeActiveTimestampAttribute( minInterval: Int, maxInterval: Int - ) { + ): ActiveTimestampAttribute { // Implementation needs to be added here } - fun readPendingTimestampAttribute(callback: PendingTimestampAttributeCallback) { + suspend fun readPendingTimestampAttribute(): PendingTimestampAttribute { // Implementation needs to be added here } - fun subscribePendingTimestampAttribute( - callback: PendingTimestampAttributeCallback, + suspend fun subscribePendingTimestampAttribute( minInterval: Int, maxInterval: Int - ) { + ): PendingTimestampAttribute { // Implementation needs to be added here } - fun readDelayAttribute(callback: DelayAttributeCallback) { + suspend fun readDelayAttribute(): DelayAttribute { // Implementation needs to be added here } - fun subscribeDelayAttribute( - callback: DelayAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeDelayAttribute(minInterval: Int, maxInterval: Int): DelayAttribute { // Implementation needs to be added here } - fun readSecurityPolicyAttribute(callback: SecurityPolicyAttributeCallback) { + suspend fun readSecurityPolicyAttribute(): SecurityPolicyAttribute { // Implementation needs to be added here } - fun subscribeSecurityPolicyAttribute( - callback: SecurityPolicyAttributeCallback, + suspend fun subscribeSecurityPolicyAttribute( minInterval: Int, maxInterval: Int - ) { + ): SecurityPolicyAttribute { // Implementation needs to be added here } - fun readChannelPage0MaskAttribute(callback: ChannelPage0MaskAttributeCallback) { + suspend fun readChannelPage0MaskAttribute(): ChannelPage0MaskAttribute { // Implementation needs to be added here } - fun subscribeChannelPage0MaskAttribute( - callback: ChannelPage0MaskAttributeCallback, + suspend fun subscribeChannelPage0MaskAttribute( minInterval: Int, maxInterval: Int - ) { + ): ChannelPage0MaskAttribute { // Implementation needs to be added here } - fun readOperationalDatasetComponentsAttribute( - callback: OperationalDatasetComponentsAttributeCallback - ) { + suspend fun readOperationalDatasetComponentsAttribute(): OperationalDatasetComponentsAttribute { // Implementation needs to be added here } - fun subscribeOperationalDatasetComponentsAttribute( - callback: OperationalDatasetComponentsAttributeCallback, + suspend fun subscribeOperationalDatasetComponentsAttribute( minInterval: Int, maxInterval: Int - ) { + ): OperationalDatasetComponentsAttribute { // Implementation needs to be added here } - fun readActiveNetworkFaultsListAttribute(callback: ActiveNetworkFaultsListAttributeCallback) { + suspend fun readActiveNetworkFaultsListAttribute(): ActiveNetworkFaultsListAttribute { // Implementation needs to be added here } - fun subscribeActiveNetworkFaultsListAttribute( - callback: ActiveNetworkFaultsListAttributeCallback, + suspend fun subscribeActiveNetworkFaultsListAttribute( minInterval: Int, maxInterval: Int - ) { + ): ActiveNetworkFaultsListAttribute { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 53u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TimeFormatLocalizationCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TimeFormatLocalizationCluster.kt index 040b51246a2cf4..176b4a4e04ac94 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TimeFormatLocalizationCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TimeFormatLocalizationCluster.kt @@ -20,179 +20,117 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class TimeFormatLocalizationCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 44u - } + class SupportedCalendarTypesAttribute(val value: ArrayList?) - interface SupportedCalendarTypesAttributeCallback { - fun onSuccess(value: ArrayList?) + class GeneratedCommandListAttribute(val value: ArrayList) - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AcceptedCommandListAttribute(val value: ArrayList) - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) + class EventListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class AttributeListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readHourFormatAttribute(callback: IntegerAttributeCallback) { + suspend fun readHourFormatAttribute(): Integer { // Implementation needs to be added here } - fun writeHourFormatAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeHourFormatAttribute(value: UInt) { // Implementation needs to be added here } - fun writeHourFormatAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeHourFormatAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeHourFormatAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeHourFormatAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readActiveCalendarTypeAttribute(callback: IntegerAttributeCallback) { + suspend fun readActiveCalendarTypeAttribute(): Integer { // Implementation needs to be added here } - fun writeActiveCalendarTypeAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeActiveCalendarTypeAttribute(value: UInt) { // Implementation needs to be added here } - fun writeActiveCalendarTypeAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeActiveCalendarTypeAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeActiveCalendarTypeAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeActiveCalendarTypeAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readSupportedCalendarTypesAttribute(callback: SupportedCalendarTypesAttributeCallback) { + suspend fun readSupportedCalendarTypesAttribute(): SupportedCalendarTypesAttribute { // Implementation needs to be added here } - fun subscribeSupportedCalendarTypesAttribute( - callback: SupportedCalendarTypesAttributeCallback, + suspend fun subscribeSupportedCalendarTypesAttribute( minInterval: Int, maxInterval: Int - ) { + ): SupportedCalendarTypesAttribute { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 44u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TimeSynchronizationCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TimeSynchronizationCluster.kt index 4d7b431cc9d501..7f49fa4b98cdfb 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TimeSynchronizationCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TimeSynchronizationCluster.kt @@ -20,397 +20,262 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class TimeSynchronizationCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 56u - } + class SetTimeZoneResponse(val DSTOffsetRequired: Boolean) - fun setUTCTime( - callback: DefaultClusterCallback, - UTCTime: Long, - granularity: Integer, - timeSource: Integer? - ) { + class UTCTimeAttribute(val value: ULong?) + + class TrustedTimeSourceAttribute( + val value: ChipStructs.TimeSynchronizationClusterTrustedTimeSourceStruct? + ) + + class DefaultNTPAttribute(val value: String?) + + class TimeZoneAttribute( + val value: ArrayList? + ) + + class DSTOffsetAttribute( + val value: ArrayList? + ) + + class LocalTimeAttribute(val value: ULong?) + + class GeneratedCommandListAttribute(val value: ArrayList) + + class AcceptedCommandListAttribute(val value: ArrayList) + + class EventListAttribute(val value: ArrayList) + + class AttributeListAttribute(val value: ArrayList) + + suspend fun setUTCTime(UTCTime: ULong, granularity: UInt, timeSource: UInt?) { // Implementation needs to be added here } - fun setUTCTime( - callback: DefaultClusterCallback, - UTCTime: Long, - granularity: Integer, - timeSource: Integer?, + suspend fun setUTCTime( + UTCTime: ULong, + granularity: UInt, + timeSource: UInt?, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - fun setTrustedTimeSource( - callback: DefaultClusterCallback, + suspend fun setTrustedTimeSource( trustedTimeSource: ChipStructs.TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct? ) { // Implementation needs to be added here } - fun setTrustedTimeSource( - callback: DefaultClusterCallback, + suspend fun setTrustedTimeSource( trustedTimeSource: ChipStructs.TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct?, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - fun setTimeZone( - callback: SetTimeZoneResponseCallback, + suspend fun setTimeZone( timeZone: ArrayList - ) { + ): SetTimeZoneResponse { // Implementation needs to be added here } - fun setTimeZone( - callback: SetTimeZoneResponseCallback, + suspend fun setTimeZone( timeZone: ArrayList, timedInvokeTimeoutMs: Int - ) { + ): SetTimeZoneResponse { // Implementation needs to be added here } - fun setDSTOffset( - callback: DefaultClusterCallback, + suspend fun setDSTOffset( DSTOffset: ArrayList ) { // Implementation needs to be added here } - fun setDSTOffset( - callback: DefaultClusterCallback, + suspend fun setDSTOffset( DSTOffset: ArrayList, timedInvokeTimeoutMs: Int ) { // Implementation needs to be added here } - fun setDefaultNTP(callback: DefaultClusterCallback, defaultNTP: String?) { + suspend fun setDefaultNTP(defaultNTP: String?) { // Implementation needs to be added here } - fun setDefaultNTP( - callback: DefaultClusterCallback, - defaultNTP: String?, - timedInvokeTimeoutMs: Int - ) { + suspend fun setDefaultNTP(defaultNTP: String?, timedInvokeTimeoutMs: Int) { // Implementation needs to be added here } - interface SetTimeZoneResponseCallback { - fun onSuccess(DSTOffsetRequired: Boolean) - - fun onError(error: Exception) - } - - interface UTCTimeAttributeCallback { - fun onSuccess(value: Long?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface TrustedTimeSourceAttributeCallback { - fun onSuccess(value: ChipStructs.TimeSynchronizationClusterTrustedTimeSourceStruct?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface DefaultNTPAttributeCallback { - fun onSuccess(value: String?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface TimeZoneAttributeCallback { - fun onSuccess(value: ArrayList?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface DSTOffsetAttributeCallback { - fun onSuccess(value: ArrayList?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface LocalTimeAttributeCallback { - fun onSuccess(value: Long?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readUTCTimeAttribute(callback: UTCTimeAttributeCallback) { + suspend fun readUTCTimeAttribute(): UTCTimeAttribute { // Implementation needs to be added here } - fun subscribeUTCTimeAttribute( - callback: UTCTimeAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeUTCTimeAttribute(minInterval: Int, maxInterval: Int): UTCTimeAttribute { // Implementation needs to be added here } - fun readGranularityAttribute(callback: IntegerAttributeCallback) { + suspend fun readGranularityAttribute(): Integer { // Implementation needs to be added here } - fun subscribeGranularityAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeGranularityAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readTimeSourceAttribute(callback: IntegerAttributeCallback) { + suspend fun readTimeSourceAttribute(): Integer { // Implementation needs to be added here } - fun subscribeTimeSourceAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeTimeSourceAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readTrustedTimeSourceAttribute(callback: TrustedTimeSourceAttributeCallback) { + suspend fun readTrustedTimeSourceAttribute(): TrustedTimeSourceAttribute { // Implementation needs to be added here } - fun subscribeTrustedTimeSourceAttribute( - callback: TrustedTimeSourceAttributeCallback, + suspend fun subscribeTrustedTimeSourceAttribute( minInterval: Int, maxInterval: Int - ) { + ): TrustedTimeSourceAttribute { // Implementation needs to be added here } - fun readDefaultNTPAttribute(callback: DefaultNTPAttributeCallback) { + suspend fun readDefaultNTPAttribute(): DefaultNTPAttribute { // Implementation needs to be added here } - fun subscribeDefaultNTPAttribute( - callback: DefaultNTPAttributeCallback, + suspend fun subscribeDefaultNTPAttribute( minInterval: Int, maxInterval: Int - ) { + ): DefaultNTPAttribute { // Implementation needs to be added here } - fun readTimeZoneAttribute(callback: TimeZoneAttributeCallback) { + suspend fun readTimeZoneAttribute(): TimeZoneAttribute { // Implementation needs to be added here } - fun subscribeTimeZoneAttribute( - callback: TimeZoneAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeTimeZoneAttribute(minInterval: Int, maxInterval: Int): TimeZoneAttribute { // Implementation needs to be added here } - fun readDSTOffsetAttribute(callback: DSTOffsetAttributeCallback) { + suspend fun readDSTOffsetAttribute(): DSTOffsetAttribute { // Implementation needs to be added here } - fun subscribeDSTOffsetAttribute( - callback: DSTOffsetAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeDSTOffsetAttribute(minInterval: Int, maxInterval: Int): DSTOffsetAttribute { // Implementation needs to be added here } - fun readLocalTimeAttribute(callback: LocalTimeAttributeCallback) { + suspend fun readLocalTimeAttribute(): LocalTimeAttribute { // Implementation needs to be added here } - fun subscribeLocalTimeAttribute( - callback: LocalTimeAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeLocalTimeAttribute(minInterval: Int, maxInterval: Int): LocalTimeAttribute { // Implementation needs to be added here } - fun readTimeZoneDatabaseAttribute(callback: IntegerAttributeCallback) { + suspend fun readTimeZoneDatabaseAttribute(): Integer { // Implementation needs to be added here } - fun subscribeTimeZoneDatabaseAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeTimeZoneDatabaseAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readNTPServerAvailableAttribute(callback: BooleanAttributeCallback) { + suspend fun readNTPServerAvailableAttribute(): Boolean { // Implementation needs to be added here } - fun subscribeNTPServerAvailableAttribute( - callback: BooleanAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeNTPServerAvailableAttribute(minInterval: Int, maxInterval: Int): Boolean { // Implementation needs to be added here } - fun readTimeZoneListMaxSizeAttribute(callback: IntegerAttributeCallback) { + suspend fun readTimeZoneListMaxSizeAttribute(): Integer { // Implementation needs to be added here } - fun subscribeTimeZoneListMaxSizeAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeTimeZoneListMaxSizeAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readDSTOffsetListMaxSizeAttribute(callback: IntegerAttributeCallback) { + suspend fun readDSTOffsetListMaxSizeAttribute(): Integer { // Implementation needs to be added here } - fun subscribeDSTOffsetListMaxSizeAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeDSTOffsetListMaxSizeAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readSupportsDNSResolveAttribute(callback: BooleanAttributeCallback) { + suspend fun readSupportsDNSResolveAttribute(): Boolean { // Implementation needs to be added here } - fun subscribeSupportsDNSResolveAttribute( - callback: BooleanAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeSupportsDNSResolveAttribute(minInterval: Int, maxInterval: Int): Boolean { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 56u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TotalVolatileOrganicCompoundsConcentrationMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TotalVolatileOrganicCompoundsConcentrationMeasurementCluster.kt index a212e62b2059a5..33fecf7e590537 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TotalVolatileOrganicCompoundsConcentrationMeasurementCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TotalVolatileOrganicCompoundsConcentrationMeasurementCluster.kt @@ -20,283 +20,188 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class TotalVolatileOrganicCompoundsConcentrationMeasurementCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 1070u - } - - interface MeasuredValueAttributeCallback { - fun onSuccess(value: Float?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface MinMeasuredValueAttributeCallback { - fun onSuccess(value: Float?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface MaxMeasuredValueAttributeCallback { - fun onSuccess(value: Float?) - - fun onError(ex: Exception) + class MeasuredValueAttribute(val value: Float?) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface PeakMeasuredValueAttributeCallback { - fun onSuccess(value: Float?) + class MinMeasuredValueAttribute(val value: Float?) - fun onError(ex: Exception) + class MaxMeasuredValueAttribute(val value: Float?) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class PeakMeasuredValueAttribute(val value: Float?) - interface AverageMeasuredValueAttributeCallback { - fun onSuccess(value: Float?) + class AverageMeasuredValueAttribute(val value: Float?) - fun onError(ex: Exception) + class GeneratedCommandListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AcceptedCommandListAttribute(val value: ArrayList) - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class EventListAttribute(val value: ArrayList) - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) + class AttributeListAttribute(val value: ArrayList) - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readMeasuredValueAttribute(callback: MeasuredValueAttributeCallback) { + suspend fun readMeasuredValueAttribute(): MeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeMeasuredValueAttribute( - callback: MeasuredValueAttributeCallback, + suspend fun subscribeMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): MeasuredValueAttribute { // Implementation needs to be added here } - fun readMinMeasuredValueAttribute(callback: MinMeasuredValueAttributeCallback) { + suspend fun readMinMeasuredValueAttribute(): MinMeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeMinMeasuredValueAttribute( - callback: MinMeasuredValueAttributeCallback, + suspend fun subscribeMinMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): MinMeasuredValueAttribute { // Implementation needs to be added here } - fun readMaxMeasuredValueAttribute(callback: MaxMeasuredValueAttributeCallback) { + suspend fun readMaxMeasuredValueAttribute(): MaxMeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeMaxMeasuredValueAttribute( - callback: MaxMeasuredValueAttributeCallback, + suspend fun subscribeMaxMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): MaxMeasuredValueAttribute { // Implementation needs to be added here } - fun readPeakMeasuredValueAttribute(callback: PeakMeasuredValueAttributeCallback) { + suspend fun readPeakMeasuredValueAttribute(): PeakMeasuredValueAttribute { // Implementation needs to be added here } - fun subscribePeakMeasuredValueAttribute( - callback: PeakMeasuredValueAttributeCallback, + suspend fun subscribePeakMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): PeakMeasuredValueAttribute { // Implementation needs to be added here } - fun readPeakMeasuredValueWindowAttribute(callback: LongAttributeCallback) { + suspend fun readPeakMeasuredValueWindowAttribute(): Long { // Implementation needs to be added here } - fun subscribePeakMeasuredValueWindowAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribePeakMeasuredValueWindowAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readAverageMeasuredValueAttribute(callback: AverageMeasuredValueAttributeCallback) { + suspend fun readAverageMeasuredValueAttribute(): AverageMeasuredValueAttribute { // Implementation needs to be added here } - fun subscribeAverageMeasuredValueAttribute( - callback: AverageMeasuredValueAttributeCallback, + suspend fun subscribeAverageMeasuredValueAttribute( minInterval: Int, maxInterval: Int - ) { + ): AverageMeasuredValueAttribute { // Implementation needs to be added here } - fun readAverageMeasuredValueWindowAttribute(callback: LongAttributeCallback) { + suspend fun readAverageMeasuredValueWindowAttribute(): Long { // Implementation needs to be added here } - fun subscribeAverageMeasuredValueWindowAttribute( - callback: LongAttributeCallback, + suspend fun subscribeAverageMeasuredValueWindowAttribute( minInterval: Int, maxInterval: Int - ) { + ): Long { // Implementation needs to be added here } - fun readUncertaintyAttribute(callback: FloatAttributeCallback) { + suspend fun readUncertaintyAttribute(): Float { // Implementation needs to be added here } - fun subscribeUncertaintyAttribute( - callback: FloatAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeUncertaintyAttribute(minInterval: Int, maxInterval: Int): Float { // Implementation needs to be added here } - fun readMeasurementUnitAttribute(callback: IntegerAttributeCallback) { + suspend fun readMeasurementUnitAttribute(): Integer { // Implementation needs to be added here } - fun subscribeMeasurementUnitAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeMeasurementUnitAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readMeasurementMediumAttribute(callback: IntegerAttributeCallback) { + suspend fun readMeasurementMediumAttribute(): Integer { // Implementation needs to be added here } - fun subscribeMeasurementMediumAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeMeasurementMediumAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readLevelValueAttribute(callback: IntegerAttributeCallback) { + suspend fun readLevelValueAttribute(): Integer { // Implementation needs to be added here } - fun subscribeLevelValueAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeLevelValueAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 1070u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UnitLocalizationCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UnitLocalizationCluster.kt index f72c32be0af306..5a621abdcd9189 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UnitLocalizationCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UnitLocalizationCluster.kt @@ -20,135 +20,88 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class UnitLocalizationCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 45u - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class GeneratedCommandListAttribute(val value: ArrayList) - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) + class AcceptedCommandListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class EventListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AttributeListAttribute(val value: ArrayList) - fun readTemperatureUnitAttribute(callback: IntegerAttributeCallback) { + suspend fun readTemperatureUnitAttribute(): Integer { // Implementation needs to be added here } - fun writeTemperatureUnitAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeTemperatureUnitAttribute(value: UInt) { // Implementation needs to be added here } - fun writeTemperatureUnitAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeTemperatureUnitAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeTemperatureUnitAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeTemperatureUnitAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 45u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UnitTestingCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UnitTestingCluster.kt index 16e4708245a97b..918c3aa8fee80b 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UnitTestingCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UnitTestingCluster.kt @@ -20,2855 +20,1957 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class UnitTestingCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 4294048773u - } + class TestSpecificResponse(val returnValue: UByte) + + class TestAddArgumentsResponse(val returnValue: UByte) + + class TestSimpleArgumentResponse(val returnValue: Boolean) + + class TestStructArrayArgumentResponse( + val arg1: ArrayList, + val arg2: ArrayList, + val arg3: ArrayList, + val arg4: ArrayList, + val arg5: UInt, + val arg6: Boolean + ) + + class BooleanResponse(val value: Boolean) + + class TestListInt8UReverseResponse(val arg1: ArrayList) + + class TestEnumsResponse(val arg1: UShort, val arg2: UInt) + + class TestNullableOptionalResponse( + val wasPresent: Boolean, + val wasNull: Boolean?, + val value: UByte?, + val originalValue: UByte? + ) + + class TestComplexNullableOptionalResponse( + val nullableIntWasNull: Boolean, + val nullableIntValue: UShort?, + val optionalIntWasPresent: Boolean, + val optionalIntValue: UShort?, + val nullableOptionalIntWasPresent: Boolean, + val nullableOptionalIntWasNull: Boolean?, + val nullableOptionalIntValue: UShort?, + val nullableStringWasNull: Boolean, + val nullableStringValue: String?, + val optionalStringWasPresent: Boolean, + val optionalStringValue: String?, + val nullableOptionalStringWasPresent: Boolean, + val nullableOptionalStringWasNull: Boolean?, + val nullableOptionalStringValue: String?, + val nullableStructWasNull: Boolean, + val nullableStructValue: ChipStructs.UnitTestingClusterSimpleStruct?, + val optionalStructWasPresent: Boolean, + val optionalStructValue: ChipStructs.UnitTestingClusterSimpleStruct?, + val nullableOptionalStructWasPresent: Boolean, + val nullableOptionalStructWasNull: Boolean?, + val nullableOptionalStructValue: ChipStructs.UnitTestingClusterSimpleStruct?, + val nullableListWasNull: Boolean, + val nullableListValue: ArrayList?, + val optionalListWasPresent: Boolean, + val optionalListValue: ArrayList?, + val nullableOptionalListWasPresent: Boolean, + val nullableOptionalListWasNull: Boolean?, + val nullableOptionalListValue: ArrayList? + ) + + class SimpleStructResponse(val arg1: ChipStructs.UnitTestingClusterSimpleStruct) + + class TestEmitTestEventResponse(val value: ULong) + + class TestEmitTestFabricScopedEventResponse(val value: ULong) + + class ListInt8uAttribute(val value: ArrayList) + + class ListOctetStringAttribute(val value: ArrayList) + + class ListStructOctetStringAttribute( + val value: ArrayList + ) + + class ListNullablesAndOptionalsStructAttribute( + val value: ArrayList + ) + + class StructAttrAttribute(val value: ChipStructs.UnitTestingClusterSimpleStruct) + + class ListLongOctetStringAttribute(val value: ArrayList) + + class ListFabricScopedAttribute( + val value: ArrayList + ) + + class NullableBooleanAttribute(val value: Boolean?) + + class NullableBitmap8Attribute(val value: UInt?) + + class NullableBitmap16Attribute(val value: UInt?) + + class NullableBitmap32Attribute(val value: ULong?) + + class NullableBitmap64Attribute(val value: ULong?) + + class NullableInt8uAttribute(val value: UByte?) + + class NullableInt16uAttribute(val value: UShort?) + + class NullableInt24uAttribute(val value: UInt?) + + class NullableInt32uAttribute(val value: UInt?) + + class NullableInt40uAttribute(val value: ULong?) + + class NullableInt48uAttribute(val value: ULong?) + + class NullableInt56uAttribute(val value: ULong?) + + class NullableInt64uAttribute(val value: ULong?) + + class NullableInt8sAttribute(val value: Byte?) + + class NullableInt16sAttribute(val value: Short?) + + class NullableInt24sAttribute(val value: Int?) + + class NullableInt32sAttribute(val value: Int?) + + class NullableInt40sAttribute(val value: Long?) + + class NullableInt48sAttribute(val value: Long?) + + class NullableInt56sAttribute(val value: Long?) + + class NullableInt64sAttribute(val value: Long?) + + class NullableEnum8Attribute(val value: UInt?) + + class NullableEnum16Attribute(val value: UInt?) + + class NullableFloatSingleAttribute(val value: Float?) + + class NullableFloatDoubleAttribute(val value: Double?) + + class NullableOctetStringAttribute(val value: ByteArray?) + + class NullableCharStringAttribute(val value: String?) + + class NullableEnumAttrAttribute(val value: UInt?) - fun test(callback: DefaultClusterCallback) { + class NullableStructAttribute(val value: ChipStructs.UnitTestingClusterSimpleStruct?) + + class NullableRangeRestrictedInt8uAttribute(val value: UByte?) + + class NullableRangeRestrictedInt8sAttribute(val value: Byte?) + + class NullableRangeRestrictedInt16uAttribute(val value: UShort?) + + class NullableRangeRestrictedInt16sAttribute(val value: Short?) + + class GeneratedCommandListAttribute(val value: ArrayList) + + class AcceptedCommandListAttribute(val value: ArrayList) + + class EventListAttribute(val value: ArrayList) + + class AttributeListAttribute(val value: ArrayList) + + suspend fun test() { // Implementation needs to be added here } - fun test(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) { + suspend fun test(timedInvokeTimeoutMs: Int) { // Implementation needs to be added here } - fun testNotHandled(callback: DefaultClusterCallback) { + suspend fun testNotHandled() { // Implementation needs to be added here } - fun testNotHandled(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) { + suspend fun testNotHandled(timedInvokeTimeoutMs: Int) { // Implementation needs to be added here } - fun testSpecific(callback: TestSpecificResponseCallback) { + suspend fun testSpecific(): TestSpecificResponse { // Implementation needs to be added here } - fun testSpecific(callback: TestSpecificResponseCallback, timedInvokeTimeoutMs: Int) { + suspend fun testSpecific(timedInvokeTimeoutMs: Int): TestSpecificResponse { // Implementation needs to be added here } - fun testUnknownCommand(callback: DefaultClusterCallback) { + suspend fun testUnknownCommand() { // Implementation needs to be added here } - fun testUnknownCommand(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) { + suspend fun testUnknownCommand(timedInvokeTimeoutMs: Int) { // Implementation needs to be added here } - fun testAddArguments(callback: TestAddArgumentsResponseCallback, arg1: Integer, arg2: Integer) { + suspend fun testAddArguments(arg1: UByte, arg2: UByte): TestAddArgumentsResponse { // Implementation needs to be added here } - fun testAddArguments( - callback: TestAddArgumentsResponseCallback, - arg1: Integer, - arg2: Integer, + suspend fun testAddArguments( + arg1: UByte, + arg2: UByte, timedInvokeTimeoutMs: Int - ) { + ): TestAddArgumentsResponse { // Implementation needs to be added here } - fun testSimpleArgumentRequest(callback: TestSimpleArgumentResponseCallback, arg1: Boolean) { + suspend fun testSimpleArgumentRequest(arg1: Boolean): TestSimpleArgumentResponse { // Implementation needs to be added here } - fun testSimpleArgumentRequest( - callback: TestSimpleArgumentResponseCallback, + suspend fun testSimpleArgumentRequest( arg1: Boolean, timedInvokeTimeoutMs: Int - ) { + ): TestSimpleArgumentResponse { // Implementation needs to be added here } - fun testStructArrayArgumentRequest( - callback: TestStructArrayArgumentResponseCallback, + suspend fun testStructArrayArgumentRequest( arg1: ArrayList, arg2: ArrayList, - arg3: ArrayList, + arg3: ArrayList, arg4: ArrayList, - arg5: Integer, + arg5: UInt, arg6: Boolean - ) { + ): TestStructArrayArgumentResponse { // Implementation needs to be added here } - fun testStructArrayArgumentRequest( - callback: TestStructArrayArgumentResponseCallback, + suspend fun testStructArrayArgumentRequest( arg1: ArrayList, arg2: ArrayList, - arg3: ArrayList, + arg3: ArrayList, arg4: ArrayList, - arg5: Integer, + arg5: UInt, arg6: Boolean, timedInvokeTimeoutMs: Int - ) { + ): TestStructArrayArgumentResponse { // Implementation needs to be added here } - fun testStructArgumentRequest( - callback: BooleanResponseCallback, + suspend fun testStructArgumentRequest( arg1: ChipStructs.UnitTestingClusterSimpleStruct - ) { + ): BooleanResponse { // Implementation needs to be added here } - fun testStructArgumentRequest( - callback: BooleanResponseCallback, + suspend fun testStructArgumentRequest( arg1: ChipStructs.UnitTestingClusterSimpleStruct, timedInvokeTimeoutMs: Int - ) { + ): BooleanResponse { // Implementation needs to be added here } - fun testNestedStructArgumentRequest( - callback: BooleanResponseCallback, + suspend fun testNestedStructArgumentRequest( arg1: ChipStructs.UnitTestingClusterNestedStruct - ) { + ): BooleanResponse { // Implementation needs to be added here } - fun testNestedStructArgumentRequest( - callback: BooleanResponseCallback, + suspend fun testNestedStructArgumentRequest( arg1: ChipStructs.UnitTestingClusterNestedStruct, timedInvokeTimeoutMs: Int - ) { + ): BooleanResponse { // Implementation needs to be added here } - fun testListStructArgumentRequest( - callback: BooleanResponseCallback, + suspend fun testListStructArgumentRequest( arg1: ArrayList - ) { + ): BooleanResponse { // Implementation needs to be added here } - fun testListStructArgumentRequest( - callback: BooleanResponseCallback, + suspend fun testListStructArgumentRequest( arg1: ArrayList, timedInvokeTimeoutMs: Int - ) { + ): BooleanResponse { // Implementation needs to be added here } - fun testListInt8UArgumentRequest(callback: BooleanResponseCallback, arg1: ArrayList) { + suspend fun testListInt8UArgumentRequest(arg1: ArrayList): BooleanResponse { // Implementation needs to be added here } - fun testListInt8UArgumentRequest( - callback: BooleanResponseCallback, - arg1: ArrayList, + suspend fun testListInt8UArgumentRequest( + arg1: ArrayList, timedInvokeTimeoutMs: Int - ) { + ): BooleanResponse { // Implementation needs to be added here } - fun testNestedStructListArgumentRequest( - callback: BooleanResponseCallback, + suspend fun testNestedStructListArgumentRequest( arg1: ChipStructs.UnitTestingClusterNestedStructList - ) { + ): BooleanResponse { // Implementation needs to be added here } - fun testNestedStructListArgumentRequest( - callback: BooleanResponseCallback, + suspend fun testNestedStructListArgumentRequest( arg1: ChipStructs.UnitTestingClusterNestedStructList, timedInvokeTimeoutMs: Int - ) { + ): BooleanResponse { // Implementation needs to be added here } - fun testListNestedStructListArgumentRequest( - callback: BooleanResponseCallback, + suspend fun testListNestedStructListArgumentRequest( arg1: ArrayList - ) { + ): BooleanResponse { // Implementation needs to be added here } - fun testListNestedStructListArgumentRequest( - callback: BooleanResponseCallback, + suspend fun testListNestedStructListArgumentRequest( arg1: ArrayList, timedInvokeTimeoutMs: Int - ) { + ): BooleanResponse { // Implementation needs to be added here } - fun testListInt8UReverseRequest( - callback: TestListInt8UReverseResponseCallback, - arg1: ArrayList - ) { + suspend fun testListInt8UReverseRequest(arg1: ArrayList): TestListInt8UReverseResponse { // Implementation needs to be added here } - fun testListInt8UReverseRequest( - callback: TestListInt8UReverseResponseCallback, - arg1: ArrayList, + suspend fun testListInt8UReverseRequest( + arg1: ArrayList, timedInvokeTimeoutMs: Int - ) { + ): TestListInt8UReverseResponse { // Implementation needs to be added here } - fun testEnumsRequest(callback: TestEnumsResponseCallback, arg1: Integer, arg2: Integer) { + suspend fun testEnumsRequest(arg1: UShort, arg2: UInt): TestEnumsResponse { // Implementation needs to be added here } - fun testEnumsRequest( - callback: TestEnumsResponseCallback, - arg1: Integer, - arg2: Integer, + suspend fun testEnumsRequest( + arg1: UShort, + arg2: UInt, timedInvokeTimeoutMs: Int - ) { + ): TestEnumsResponse { // Implementation needs to be added here } - fun testNullableOptionalRequest(callback: TestNullableOptionalResponseCallback, arg1: Integer?) { + suspend fun testNullableOptionalRequest(arg1: UByte?): TestNullableOptionalResponse { // Implementation needs to be added here } - fun testNullableOptionalRequest( - callback: TestNullableOptionalResponseCallback, - arg1: Integer?, + suspend fun testNullableOptionalRequest( + arg1: UByte?, timedInvokeTimeoutMs: Int - ) { + ): TestNullableOptionalResponse { // Implementation needs to be added here } - fun testComplexNullableOptionalRequest( - callback: TestComplexNullableOptionalResponseCallback, - nullableInt: Integer?, - optionalInt: Integer?, - nullableOptionalInt: Integer?, + suspend fun testComplexNullableOptionalRequest( + nullableInt: UShort?, + optionalInt: UShort?, + nullableOptionalInt: UShort?, nullableString: String?, optionalString: String?, nullableOptionalString: String?, nullableStruct: ChipStructs.UnitTestingClusterSimpleStruct?, optionalStruct: ChipStructs.UnitTestingClusterSimpleStruct?, nullableOptionalStruct: ChipStructs.UnitTestingClusterSimpleStruct?, - nullableList: ArrayList?, - optionalList: ArrayList?, - nullableOptionalList: ArrayList? - ) { + nullableList: ArrayList?, + optionalList: ArrayList?, + nullableOptionalList: ArrayList? + ): TestComplexNullableOptionalResponse { // Implementation needs to be added here } - fun testComplexNullableOptionalRequest( - callback: TestComplexNullableOptionalResponseCallback, - nullableInt: Integer?, - optionalInt: Integer?, - nullableOptionalInt: Integer?, + suspend fun testComplexNullableOptionalRequest( + nullableInt: UShort?, + optionalInt: UShort?, + nullableOptionalInt: UShort?, nullableString: String?, optionalString: String?, nullableOptionalString: String?, nullableStruct: ChipStructs.UnitTestingClusterSimpleStruct?, optionalStruct: ChipStructs.UnitTestingClusterSimpleStruct?, nullableOptionalStruct: ChipStructs.UnitTestingClusterSimpleStruct?, - nullableList: ArrayList?, - optionalList: ArrayList?, - nullableOptionalList: ArrayList?, + nullableList: ArrayList?, + optionalList: ArrayList?, + nullableOptionalList: ArrayList?, timedInvokeTimeoutMs: Int - ) { + ): TestComplexNullableOptionalResponse { // Implementation needs to be added here } - fun simpleStructEchoRequest( - callback: SimpleStructResponseCallback, + suspend fun simpleStructEchoRequest( arg1: ChipStructs.UnitTestingClusterSimpleStruct - ) { + ): SimpleStructResponse { // Implementation needs to be added here } - fun simpleStructEchoRequest( - callback: SimpleStructResponseCallback, + suspend fun simpleStructEchoRequest( arg1: ChipStructs.UnitTestingClusterSimpleStruct, timedInvokeTimeoutMs: Int - ) { + ): SimpleStructResponse { // Implementation needs to be added here } - fun timedInvokeRequest(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) { + suspend fun timedInvokeRequest(timedInvokeTimeoutMs: Int) { // Implementation needs to be added here } - fun testSimpleOptionalArgumentRequest(callback: DefaultClusterCallback, arg1: Boolean?) { + suspend fun testSimpleOptionalArgumentRequest(arg1: Boolean?) { // Implementation needs to be added here } - fun testSimpleOptionalArgumentRequest( - callback: DefaultClusterCallback, - arg1: Boolean?, - timedInvokeTimeoutMs: Int - ) { + suspend fun testSimpleOptionalArgumentRequest(arg1: Boolean?, timedInvokeTimeoutMs: Int) { // Implementation needs to be added here } - fun testEmitTestEventRequest( - callback: TestEmitTestEventResponseCallback, - arg1: Integer, - arg2: Integer, + suspend fun testEmitTestEventRequest( + arg1: UByte, + arg2: UInt, arg3: Boolean - ) { + ): TestEmitTestEventResponse { // Implementation needs to be added here } - fun testEmitTestEventRequest( - callback: TestEmitTestEventResponseCallback, - arg1: Integer, - arg2: Integer, + suspend fun testEmitTestEventRequest( + arg1: UByte, + arg2: UInt, arg3: Boolean, timedInvokeTimeoutMs: Int - ) { + ): TestEmitTestEventResponse { // Implementation needs to be added here } - fun testEmitTestFabricScopedEventRequest( - callback: TestEmitTestFabricScopedEventResponseCallback, - arg1: Integer - ) { + suspend fun testEmitTestFabricScopedEventRequest( + arg1: UByte + ): TestEmitTestFabricScopedEventResponse { // Implementation needs to be added here } - fun testEmitTestFabricScopedEventRequest( - callback: TestEmitTestFabricScopedEventResponseCallback, - arg1: Integer, + suspend fun testEmitTestFabricScopedEventRequest( + arg1: UByte, timedInvokeTimeoutMs: Int - ) { + ): TestEmitTestFabricScopedEventResponse { // Implementation needs to be added here } - interface TestSpecificResponseCallback { - fun onSuccess(returnValue: Integer) - - fun onError(error: Exception) - } - - interface TestAddArgumentsResponseCallback { - fun onSuccess(returnValue: Integer) - - fun onError(error: Exception) - } - - interface TestSimpleArgumentResponseCallback { - fun onSuccess(returnValue: Boolean) - - fun onError(error: Exception) - } - - interface TestStructArrayArgumentResponseCallback { - fun onSuccess( - arg1: ArrayList, - arg2: ArrayList, - arg3: ArrayList, - arg4: ArrayList, - arg5: Integer, - arg6: Boolean - ) - - fun onError(error: Exception) - } - - interface BooleanResponseCallback { - fun onSuccess(value: Boolean) - - fun onError(error: Exception) - } - - interface TestListInt8UReverseResponseCallback { - fun onSuccess(arg1: ArrayList) - - fun onError(error: Exception) - } - - interface TestEnumsResponseCallback { - fun onSuccess(arg1: Integer, arg2: Integer) - - fun onError(error: Exception) - } - - interface TestNullableOptionalResponseCallback { - fun onSuccess(wasPresent: Boolean, wasNull: Boolean?, value: Integer?, originalValue: Integer?) - - fun onError(error: Exception) - } - - interface TestComplexNullableOptionalResponseCallback { - fun onSuccess( - nullableIntWasNull: Boolean, - nullableIntValue: Integer?, - optionalIntWasPresent: Boolean, - optionalIntValue: Integer?, - nullableOptionalIntWasPresent: Boolean, - nullableOptionalIntWasNull: Boolean?, - nullableOptionalIntValue: Integer?, - nullableStringWasNull: Boolean, - nullableStringValue: String?, - optionalStringWasPresent: Boolean, - optionalStringValue: String?, - nullableOptionalStringWasPresent: Boolean, - nullableOptionalStringWasNull: Boolean?, - nullableOptionalStringValue: String?, - nullableStructWasNull: Boolean, - nullableStructValue: ChipStructs.UnitTestingClusterSimpleStruct?, - optionalStructWasPresent: Boolean, - optionalStructValue: ChipStructs.UnitTestingClusterSimpleStruct?, - nullableOptionalStructWasPresent: Boolean, - nullableOptionalStructWasNull: Boolean?, - nullableOptionalStructValue: ChipStructs.UnitTestingClusterSimpleStruct?, - nullableListWasNull: Boolean, - nullableListValue: ArrayList?, - optionalListWasPresent: Boolean, - optionalListValue: ArrayList?, - nullableOptionalListWasPresent: Boolean, - nullableOptionalListWasNull: Boolean?, - nullableOptionalListValue: ArrayList? - ) - - fun onError(error: Exception) - } - - interface SimpleStructResponseCallback { - fun onSuccess(arg1: ChipStructs.UnitTestingClusterSimpleStruct) - - fun onError(error: Exception) - } - - interface TestEmitTestEventResponseCallback { - fun onSuccess(value: Long) - - fun onError(error: Exception) - } - - interface TestEmitTestFabricScopedEventResponseCallback { - fun onSuccess(value: Long) - - fun onError(error: Exception) - } - - interface ListInt8uAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface ListOctetStringAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface ListStructOctetStringAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface ListNullablesAndOptionalsStructAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface StructAttrAttributeCallback { - fun onSuccess(value: ChipStructs.UnitTestingClusterSimpleStruct) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface ListLongOctetStringAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface ListFabricScopedAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface NullableBooleanAttributeCallback { - fun onSuccess(value: Boolean?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface NullableBitmap8AttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface NullableBitmap16AttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface NullableBitmap32AttributeCallback { - fun onSuccess(value: Long?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface NullableBitmap64AttributeCallback { - fun onSuccess(value: Long?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface NullableInt8uAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface NullableInt16uAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface NullableInt24uAttributeCallback { - fun onSuccess(value: Long?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface NullableInt32uAttributeCallback { - fun onSuccess(value: Long?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface NullableInt40uAttributeCallback { - fun onSuccess(value: Long?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface NullableInt48uAttributeCallback { - fun onSuccess(value: Long?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface NullableInt56uAttributeCallback { - fun onSuccess(value: Long?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface NullableInt64uAttributeCallback { - fun onSuccess(value: Long?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface NullableInt8sAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface NullableInt16sAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface NullableInt24sAttributeCallback { - fun onSuccess(value: Long?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface NullableInt32sAttributeCallback { - fun onSuccess(value: Long?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface NullableInt40sAttributeCallback { - fun onSuccess(value: Long?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface NullableInt48sAttributeCallback { - fun onSuccess(value: Long?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface NullableInt56sAttributeCallback { - fun onSuccess(value: Long?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface NullableInt64sAttributeCallback { - fun onSuccess(value: Long?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface NullableEnum8AttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface NullableEnum16AttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface NullableFloatSingleAttributeCallback { - fun onSuccess(value: Float?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface NullableFloatDoubleAttributeCallback { - fun onSuccess(value: Double?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface NullableOctetStringAttributeCallback { - fun onSuccess(value: ByteArray?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface NullableCharStringAttributeCallback { - fun onSuccess(value: String?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface NullableEnumAttrAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface NullableStructAttributeCallback { - fun onSuccess(value: ChipStructs.UnitTestingClusterSimpleStruct?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface NullableRangeRestrictedInt8uAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface NullableRangeRestrictedInt8sAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface NullableRangeRestrictedInt16uAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface NullableRangeRestrictedInt16sAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readBooleanAttribute(callback: BooleanAttributeCallback) { + suspend fun readBooleanAttribute(): Boolean { // Implementation needs to be added here } - fun writeBooleanAttribute(callback: DefaultClusterCallback, value: Boolean) { + suspend fun writeBooleanAttribute(value: Boolean) { // Implementation needs to be added here } - fun writeBooleanAttribute( - callback: DefaultClusterCallback, - value: Boolean, - timedWriteTimeoutMs: Int - ) { + suspend fun writeBooleanAttribute(value: Boolean, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeBooleanAttribute( - callback: BooleanAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeBooleanAttribute(minInterval: Int, maxInterval: Int): Boolean { // Implementation needs to be added here } - fun readBitmap8Attribute(callback: IntegerAttributeCallback) { + suspend fun readBitmap8Attribute(): Integer { // Implementation needs to be added here } - fun writeBitmap8Attribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeBitmap8Attribute(value: UInt) { // Implementation needs to be added here } - fun writeBitmap8Attribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeBitmap8Attribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeBitmap8Attribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeBitmap8Attribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readBitmap16Attribute(callback: IntegerAttributeCallback) { + suspend fun readBitmap16Attribute(): Integer { // Implementation needs to be added here } - fun writeBitmap16Attribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeBitmap16Attribute(value: UInt) { // Implementation needs to be added here } - fun writeBitmap16Attribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeBitmap16Attribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeBitmap16Attribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeBitmap16Attribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readBitmap32Attribute(callback: LongAttributeCallback) { + suspend fun readBitmap32Attribute(): Long { // Implementation needs to be added here } - fun writeBitmap32Attribute(callback: DefaultClusterCallback, value: Long) { + suspend fun writeBitmap32Attribute(value: ULong) { // Implementation needs to be added here } - fun writeBitmap32Attribute( - callback: DefaultClusterCallback, - value: Long, - timedWriteTimeoutMs: Int - ) { + suspend fun writeBitmap32Attribute(value: ULong, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeBitmap32Attribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeBitmap32Attribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readBitmap64Attribute(callback: LongAttributeCallback) { + suspend fun readBitmap64Attribute(): Long { // Implementation needs to be added here } - fun writeBitmap64Attribute(callback: DefaultClusterCallback, value: Long) { + suspend fun writeBitmap64Attribute(value: ULong) { // Implementation needs to be added here } - fun writeBitmap64Attribute( - callback: DefaultClusterCallback, - value: Long, - timedWriteTimeoutMs: Int - ) { + suspend fun writeBitmap64Attribute(value: ULong, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeBitmap64Attribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeBitmap64Attribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readInt8uAttribute(callback: IntegerAttributeCallback) { + suspend fun readInt8uAttribute(): Integer { // Implementation needs to be added here } - fun writeInt8uAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeInt8uAttribute(value: UByte) { // Implementation needs to be added here } - fun writeInt8uAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeInt8uAttribute(value: UByte, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeInt8uAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeInt8uAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readInt16uAttribute(callback: IntegerAttributeCallback) { + suspend fun readInt16uAttribute(): Integer { // Implementation needs to be added here } - fun writeInt16uAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeInt16uAttribute(value: UShort) { // Implementation needs to be added here } - fun writeInt16uAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeInt16uAttribute(value: UShort, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeInt16uAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeInt16uAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readInt24uAttribute(callback: LongAttributeCallback) { + suspend fun readInt24uAttribute(): Long { // Implementation needs to be added here } - fun writeInt24uAttribute(callback: DefaultClusterCallback, value: Long) { + suspend fun writeInt24uAttribute(value: UInt) { // Implementation needs to be added here } - fun writeInt24uAttribute( - callback: DefaultClusterCallback, - value: Long, - timedWriteTimeoutMs: Int - ) { + suspend fun writeInt24uAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeInt24uAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeInt24uAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readInt32uAttribute(callback: LongAttributeCallback) { + suspend fun readInt32uAttribute(): Long { // Implementation needs to be added here } - fun writeInt32uAttribute(callback: DefaultClusterCallback, value: Long) { + suspend fun writeInt32uAttribute(value: UInt) { // Implementation needs to be added here } - fun writeInt32uAttribute( - callback: DefaultClusterCallback, - value: Long, - timedWriteTimeoutMs: Int - ) { + suspend fun writeInt32uAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeInt32uAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeInt32uAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readInt40uAttribute(callback: LongAttributeCallback) { + suspend fun readInt40uAttribute(): Long { // Implementation needs to be added here } - fun writeInt40uAttribute(callback: DefaultClusterCallback, value: Long) { + suspend fun writeInt40uAttribute(value: ULong) { // Implementation needs to be added here } - fun writeInt40uAttribute( - callback: DefaultClusterCallback, - value: Long, - timedWriteTimeoutMs: Int - ) { + suspend fun writeInt40uAttribute(value: ULong, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeInt40uAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeInt40uAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readInt48uAttribute(callback: LongAttributeCallback) { + suspend fun readInt48uAttribute(): Long { // Implementation needs to be added here } - fun writeInt48uAttribute(callback: DefaultClusterCallback, value: Long) { + suspend fun writeInt48uAttribute(value: ULong) { // Implementation needs to be added here } - fun writeInt48uAttribute( - callback: DefaultClusterCallback, - value: Long, - timedWriteTimeoutMs: Int - ) { + suspend fun writeInt48uAttribute(value: ULong, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeInt48uAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeInt48uAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readInt56uAttribute(callback: LongAttributeCallback) { + suspend fun readInt56uAttribute(): Long { // Implementation needs to be added here } - fun writeInt56uAttribute(callback: DefaultClusterCallback, value: Long) { + suspend fun writeInt56uAttribute(value: ULong) { // Implementation needs to be added here } - fun writeInt56uAttribute( - callback: DefaultClusterCallback, - value: Long, - timedWriteTimeoutMs: Int - ) { + suspend fun writeInt56uAttribute(value: ULong, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeInt56uAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeInt56uAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readInt64uAttribute(callback: LongAttributeCallback) { + suspend fun readInt64uAttribute(): Long { // Implementation needs to be added here } - fun writeInt64uAttribute(callback: DefaultClusterCallback, value: Long) { + suspend fun writeInt64uAttribute(value: ULong) { // Implementation needs to be added here } - fun writeInt64uAttribute( - callback: DefaultClusterCallback, - value: Long, - timedWriteTimeoutMs: Int - ) { + suspend fun writeInt64uAttribute(value: ULong, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeInt64uAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeInt64uAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readInt8sAttribute(callback: IntegerAttributeCallback) { + suspend fun readInt8sAttribute(): Integer { // Implementation needs to be added here } - fun writeInt8sAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeInt8sAttribute(value: Byte) { // Implementation needs to be added here } - fun writeInt8sAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeInt8sAttribute(value: Byte, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeInt8sAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeInt8sAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readInt16sAttribute(callback: IntegerAttributeCallback) { + suspend fun readInt16sAttribute(): Integer { // Implementation needs to be added here } - fun writeInt16sAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeInt16sAttribute(value: Short) { // Implementation needs to be added here } - fun writeInt16sAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeInt16sAttribute(value: Short, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeInt16sAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeInt16sAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readInt24sAttribute(callback: LongAttributeCallback) { + suspend fun readInt24sAttribute(): Long { // Implementation needs to be added here } - fun writeInt24sAttribute(callback: DefaultClusterCallback, value: Long) { + suspend fun writeInt24sAttribute(value: Int) { // Implementation needs to be added here } - fun writeInt24sAttribute( - callback: DefaultClusterCallback, - value: Long, - timedWriteTimeoutMs: Int - ) { + suspend fun writeInt24sAttribute(value: Int, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeInt24sAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeInt24sAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readInt32sAttribute(callback: LongAttributeCallback) { + suspend fun readInt32sAttribute(): Long { // Implementation needs to be added here } - fun writeInt32sAttribute(callback: DefaultClusterCallback, value: Long) { + suspend fun writeInt32sAttribute(value: Int) { // Implementation needs to be added here } - fun writeInt32sAttribute( - callback: DefaultClusterCallback, - value: Long, - timedWriteTimeoutMs: Int - ) { + suspend fun writeInt32sAttribute(value: Int, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeInt32sAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeInt32sAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readInt40sAttribute(callback: LongAttributeCallback) { + suspend fun readInt40sAttribute(): Long { // Implementation needs to be added here } - fun writeInt40sAttribute(callback: DefaultClusterCallback, value: Long) { + suspend fun writeInt40sAttribute(value: Long) { // Implementation needs to be added here } - fun writeInt40sAttribute( - callback: DefaultClusterCallback, - value: Long, - timedWriteTimeoutMs: Int - ) { + suspend fun writeInt40sAttribute(value: Long, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeInt40sAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeInt40sAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readInt48sAttribute(callback: LongAttributeCallback) { + suspend fun readInt48sAttribute(): Long { // Implementation needs to be added here } - fun writeInt48sAttribute(callback: DefaultClusterCallback, value: Long) { + suspend fun writeInt48sAttribute(value: Long) { // Implementation needs to be added here } - fun writeInt48sAttribute( - callback: DefaultClusterCallback, - value: Long, - timedWriteTimeoutMs: Int - ) { + suspend fun writeInt48sAttribute(value: Long, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeInt48sAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeInt48sAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readInt56sAttribute(callback: LongAttributeCallback) { + suspend fun readInt56sAttribute(): Long { // Implementation needs to be added here } - fun writeInt56sAttribute(callback: DefaultClusterCallback, value: Long) { + suspend fun writeInt56sAttribute(value: Long) { // Implementation needs to be added here } - fun writeInt56sAttribute( - callback: DefaultClusterCallback, - value: Long, - timedWriteTimeoutMs: Int - ) { + suspend fun writeInt56sAttribute(value: Long, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeInt56sAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeInt56sAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readInt64sAttribute(callback: LongAttributeCallback) { + suspend fun readInt64sAttribute(): Long { // Implementation needs to be added here } - fun writeInt64sAttribute(callback: DefaultClusterCallback, value: Long) { + suspend fun writeInt64sAttribute(value: Long) { // Implementation needs to be added here } - fun writeInt64sAttribute( - callback: DefaultClusterCallback, - value: Long, - timedWriteTimeoutMs: Int - ) { + suspend fun writeInt64sAttribute(value: Long, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeInt64sAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeInt64sAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readEnum8Attribute(callback: IntegerAttributeCallback) { + suspend fun readEnum8Attribute(): Integer { // Implementation needs to be added here } - fun writeEnum8Attribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeEnum8Attribute(value: UInt) { // Implementation needs to be added here } - fun writeEnum8Attribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeEnum8Attribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeEnum8Attribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEnum8Attribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readEnum16Attribute(callback: IntegerAttributeCallback) { + suspend fun readEnum16Attribute(): Integer { // Implementation needs to be added here } - fun writeEnum16Attribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeEnum16Attribute(value: UInt) { // Implementation needs to be added here } - fun writeEnum16Attribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeEnum16Attribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeEnum16Attribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEnum16Attribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readFloatSingleAttribute(callback: FloatAttributeCallback) { + suspend fun readFloatSingleAttribute(): Float { // Implementation needs to be added here } - fun writeFloatSingleAttribute(callback: DefaultClusterCallback, value: Float) { + suspend fun writeFloatSingleAttribute(value: Float) { // Implementation needs to be added here } - fun writeFloatSingleAttribute( - callback: DefaultClusterCallback, - value: Float, - timedWriteTimeoutMs: Int - ) { + suspend fun writeFloatSingleAttribute(value: Float, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeFloatSingleAttribute( - callback: FloatAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFloatSingleAttribute(minInterval: Int, maxInterval: Int): Float { // Implementation needs to be added here } - fun readFloatDoubleAttribute(callback: DoubleAttributeCallback) { + suspend fun readFloatDoubleAttribute(): Double { // Implementation needs to be added here } - fun writeFloatDoubleAttribute(callback: DefaultClusterCallback, value: Double) { + suspend fun writeFloatDoubleAttribute(value: Double) { // Implementation needs to be added here } - fun writeFloatDoubleAttribute( - callback: DefaultClusterCallback, - value: Double, - timedWriteTimeoutMs: Int - ) { + suspend fun writeFloatDoubleAttribute(value: Double, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeFloatDoubleAttribute( - callback: DoubleAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFloatDoubleAttribute(minInterval: Int, maxInterval: Int): Double { // Implementation needs to be added here } - fun readOctetStringAttribute(callback: OctetStringAttributeCallback) { + suspend fun readOctetStringAttribute(): OctetString { // Implementation needs to be added here } - fun writeOctetStringAttribute(callback: DefaultClusterCallback, value: ByteArray) { + suspend fun writeOctetStringAttribute(value: ByteArray) { // Implementation needs to be added here } - fun writeOctetStringAttribute( - callback: DefaultClusterCallback, - value: ByteArray, - timedWriteTimeoutMs: Int - ) { + suspend fun writeOctetStringAttribute(value: ByteArray, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeOctetStringAttribute( - callback: OctetStringAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeOctetStringAttribute(minInterval: Int, maxInterval: Int): OctetString { // Implementation needs to be added here } - fun readListInt8uAttribute(callback: ListInt8uAttributeCallback) { + suspend fun readListInt8uAttribute(): ListInt8uAttribute { // Implementation needs to be added here } - fun writeListInt8uAttribute(callback: DefaultClusterCallback, value: ArrayList) { + suspend fun writeListInt8uAttribute(value: ArrayList) { // Implementation needs to be added here } - fun writeListInt8uAttribute( - callback: DefaultClusterCallback, - value: ArrayList, - timedWriteTimeoutMs: Int - ) { + suspend fun writeListInt8uAttribute(value: ArrayList, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeListInt8uAttribute( - callback: ListInt8uAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeListInt8uAttribute(minInterval: Int, maxInterval: Int): ListInt8uAttribute { // Implementation needs to be added here } - fun readListOctetStringAttribute(callback: ListOctetStringAttributeCallback) { + suspend fun readListOctetStringAttribute(): ListOctetStringAttribute { // Implementation needs to be added here } - fun writeListOctetStringAttribute(callback: DefaultClusterCallback, value: ArrayList) { + suspend fun writeListOctetStringAttribute(value: ArrayList) { // Implementation needs to be added here } - fun writeListOctetStringAttribute( - callback: DefaultClusterCallback, - value: ArrayList, - timedWriteTimeoutMs: Int - ) { + suspend fun writeListOctetStringAttribute(value: ArrayList, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeListOctetStringAttribute( - callback: ListOctetStringAttributeCallback, + suspend fun subscribeListOctetStringAttribute( minInterval: Int, maxInterval: Int - ) { + ): ListOctetStringAttribute { // Implementation needs to be added here } - fun readListStructOctetStringAttribute(callback: ListStructOctetStringAttributeCallback) { + suspend fun readListStructOctetStringAttribute(): ListStructOctetStringAttribute { // Implementation needs to be added here } - fun writeListStructOctetStringAttribute( - callback: DefaultClusterCallback, + suspend fun writeListStructOctetStringAttribute( value: ArrayList ) { // Implementation needs to be added here } - fun writeListStructOctetStringAttribute( - callback: DefaultClusterCallback, + suspend fun writeListStructOctetStringAttribute( value: ArrayList, timedWriteTimeoutMs: Int ) { // Implementation needs to be added here } - fun subscribeListStructOctetStringAttribute( - callback: ListStructOctetStringAttributeCallback, + suspend fun subscribeListStructOctetStringAttribute( minInterval: Int, maxInterval: Int - ) { + ): ListStructOctetStringAttribute { // Implementation needs to be added here } - fun readLongOctetStringAttribute(callback: OctetStringAttributeCallback) { + suspend fun readLongOctetStringAttribute(): OctetString { // Implementation needs to be added here } - fun writeLongOctetStringAttribute(callback: DefaultClusterCallback, value: ByteArray) { + suspend fun writeLongOctetStringAttribute(value: ByteArray) { // Implementation needs to be added here } - fun writeLongOctetStringAttribute( - callback: DefaultClusterCallback, - value: ByteArray, - timedWriteTimeoutMs: Int - ) { + suspend fun writeLongOctetStringAttribute(value: ByteArray, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeLongOctetStringAttribute( - callback: OctetStringAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeLongOctetStringAttribute(minInterval: Int, maxInterval: Int): OctetString { // Implementation needs to be added here } - fun readCharStringAttribute(callback: CharStringAttributeCallback) { + suspend fun readCharStringAttribute(): CharString { // Implementation needs to be added here } - fun writeCharStringAttribute(callback: DefaultClusterCallback, value: String) { + suspend fun writeCharStringAttribute(value: String) { // Implementation needs to be added here } - fun writeCharStringAttribute( - callback: DefaultClusterCallback, - value: String, - timedWriteTimeoutMs: Int - ) { + suspend fun writeCharStringAttribute(value: String, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeCharStringAttribute( - callback: CharStringAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeCharStringAttribute(minInterval: Int, maxInterval: Int): CharString { // Implementation needs to be added here } - fun readLongCharStringAttribute(callback: CharStringAttributeCallback) { + suspend fun readLongCharStringAttribute(): CharString { // Implementation needs to be added here } - fun writeLongCharStringAttribute(callback: DefaultClusterCallback, value: String) { + suspend fun writeLongCharStringAttribute(value: String) { // Implementation needs to be added here } - fun writeLongCharStringAttribute( - callback: DefaultClusterCallback, - value: String, - timedWriteTimeoutMs: Int - ) { + suspend fun writeLongCharStringAttribute(value: String, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeLongCharStringAttribute( - callback: CharStringAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeLongCharStringAttribute(minInterval: Int, maxInterval: Int): CharString { // Implementation needs to be added here } - fun readEpochUsAttribute(callback: LongAttributeCallback) { + suspend fun readEpochUsAttribute(): Long { // Implementation needs to be added here } - fun writeEpochUsAttribute(callback: DefaultClusterCallback, value: Long) { + suspend fun writeEpochUsAttribute(value: ULong) { // Implementation needs to be added here } - fun writeEpochUsAttribute( - callback: DefaultClusterCallback, - value: Long, - timedWriteTimeoutMs: Int - ) { + suspend fun writeEpochUsAttribute(value: ULong, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeEpochUsAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEpochUsAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readEpochSAttribute(callback: LongAttributeCallback) { + suspend fun readEpochSAttribute(): Long { // Implementation needs to be added here } - fun writeEpochSAttribute(callback: DefaultClusterCallback, value: Long) { + suspend fun writeEpochSAttribute(value: UInt) { // Implementation needs to be added here } - fun writeEpochSAttribute( - callback: DefaultClusterCallback, - value: Long, - timedWriteTimeoutMs: Int - ) { + suspend fun writeEpochSAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeEpochSAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEpochSAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readVendorIdAttribute(callback: IntegerAttributeCallback) { + suspend fun readVendorIdAttribute(): Integer { // Implementation needs to be added here } - fun writeVendorIdAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeVendorIdAttribute(value: UShort) { // Implementation needs to be added here } - fun writeVendorIdAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeVendorIdAttribute(value: UShort, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeVendorIdAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeVendorIdAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readListNullablesAndOptionalsStructAttribute( - callback: ListNullablesAndOptionalsStructAttributeCallback - ) { + suspend fun readListNullablesAndOptionalsStructAttribute(): + ListNullablesAndOptionalsStructAttribute { // Implementation needs to be added here } - fun writeListNullablesAndOptionalsStructAttribute( - callback: DefaultClusterCallback, + suspend fun writeListNullablesAndOptionalsStructAttribute( value: ArrayList ) { // Implementation needs to be added here } - fun writeListNullablesAndOptionalsStructAttribute( - callback: DefaultClusterCallback, + suspend fun writeListNullablesAndOptionalsStructAttribute( value: ArrayList, timedWriteTimeoutMs: Int ) { // Implementation needs to be added here } - fun subscribeListNullablesAndOptionalsStructAttribute( - callback: ListNullablesAndOptionalsStructAttributeCallback, + suspend fun subscribeListNullablesAndOptionalsStructAttribute( minInterval: Int, maxInterval: Int - ) { + ): ListNullablesAndOptionalsStructAttribute { // Implementation needs to be added here } - fun readEnumAttrAttribute(callback: IntegerAttributeCallback) { + suspend fun readEnumAttrAttribute(): Integer { // Implementation needs to be added here } - fun writeEnumAttrAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeEnumAttrAttribute(value: UInt) { // Implementation needs to be added here } - fun writeEnumAttrAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeEnumAttrAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeEnumAttrAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEnumAttrAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readStructAttrAttribute(callback: StructAttrAttributeCallback) { + suspend fun readStructAttrAttribute(): StructAttrAttribute { // Implementation needs to be added here } - fun writeStructAttrAttribute( - callback: DefaultClusterCallback, - value: ChipStructs.UnitTestingClusterSimpleStruct - ) { + suspend fun writeStructAttrAttribute(value: ChipStructs.UnitTestingClusterSimpleStruct) { // Implementation needs to be added here } - fun writeStructAttrAttribute( - callback: DefaultClusterCallback, + suspend fun writeStructAttrAttribute( value: ChipStructs.UnitTestingClusterSimpleStruct, timedWriteTimeoutMs: Int ) { // Implementation needs to be added here } - fun subscribeStructAttrAttribute( - callback: StructAttrAttributeCallback, + suspend fun subscribeStructAttrAttribute( minInterval: Int, maxInterval: Int - ) { + ): StructAttrAttribute { // Implementation needs to be added here } - fun readRangeRestrictedInt8uAttribute(callback: IntegerAttributeCallback) { + suspend fun readRangeRestrictedInt8uAttribute(): Integer { // Implementation needs to be added here } - fun writeRangeRestrictedInt8uAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeRangeRestrictedInt8uAttribute(value: UByte) { // Implementation needs to be added here } - fun writeRangeRestrictedInt8uAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeRangeRestrictedInt8uAttribute(value: UByte, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeRangeRestrictedInt8uAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeRangeRestrictedInt8uAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readRangeRestrictedInt8sAttribute(callback: IntegerAttributeCallback) { + suspend fun readRangeRestrictedInt8sAttribute(): Integer { // Implementation needs to be added here } - fun writeRangeRestrictedInt8sAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeRangeRestrictedInt8sAttribute(value: Byte) { // Implementation needs to be added here } - fun writeRangeRestrictedInt8sAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeRangeRestrictedInt8sAttribute(value: Byte, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeRangeRestrictedInt8sAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeRangeRestrictedInt8sAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readRangeRestrictedInt16uAttribute(callback: IntegerAttributeCallback) { + suspend fun readRangeRestrictedInt16uAttribute(): Integer { // Implementation needs to be added here } - fun writeRangeRestrictedInt16uAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeRangeRestrictedInt16uAttribute(value: UShort) { // Implementation needs to be added here } - fun writeRangeRestrictedInt16uAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeRangeRestrictedInt16uAttribute(value: UShort, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeRangeRestrictedInt16uAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeRangeRestrictedInt16uAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readRangeRestrictedInt16sAttribute(callback: IntegerAttributeCallback) { + suspend fun readRangeRestrictedInt16sAttribute(): Integer { // Implementation needs to be added here } - fun writeRangeRestrictedInt16sAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeRangeRestrictedInt16sAttribute(value: Short) { // Implementation needs to be added here } - fun writeRangeRestrictedInt16sAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeRangeRestrictedInt16sAttribute(value: Short, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeRangeRestrictedInt16sAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeRangeRestrictedInt16sAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readListLongOctetStringAttribute(callback: ListLongOctetStringAttributeCallback) { + suspend fun readListLongOctetStringAttribute(): ListLongOctetStringAttribute { // Implementation needs to be added here } - fun writeListLongOctetStringAttribute( - callback: DefaultClusterCallback, - value: ArrayList - ) { + suspend fun writeListLongOctetStringAttribute(value: ArrayList) { // Implementation needs to be added here } - fun writeListLongOctetStringAttribute( - callback: DefaultClusterCallback, + suspend fun writeListLongOctetStringAttribute( value: ArrayList, timedWriteTimeoutMs: Int ) { // Implementation needs to be added here } - fun subscribeListLongOctetStringAttribute( - callback: ListLongOctetStringAttributeCallback, + suspend fun subscribeListLongOctetStringAttribute( minInterval: Int, maxInterval: Int - ) { + ): ListLongOctetStringAttribute { // Implementation needs to be added here } - fun readListFabricScopedAttribute(callback: ListFabricScopedAttributeCallback) { + suspend fun readListFabricScopedAttribute(): ListFabricScopedAttribute { // Implementation needs to be added here } - fun readListFabricScopedAttributeWithFabricFilter( - callback: ListFabricScopedAttributeCallback, + suspend fun readListFabricScopedAttributeWithFabricFilter( isFabricFiltered: Boolean - ) { + ): ListFabricScopedAttribute { // Implementation needs to be added here } - fun writeListFabricScopedAttribute( - callback: DefaultClusterCallback, + suspend fun writeListFabricScopedAttribute( value: ArrayList ) { // Implementation needs to be added here } - fun writeListFabricScopedAttribute( - callback: DefaultClusterCallback, + suspend fun writeListFabricScopedAttribute( value: ArrayList, timedWriteTimeoutMs: Int ) { // Implementation needs to be added here } - fun subscribeListFabricScopedAttribute( - callback: ListFabricScopedAttributeCallback, + suspend fun subscribeListFabricScopedAttribute( minInterval: Int, maxInterval: Int - ) { + ): ListFabricScopedAttribute { // Implementation needs to be added here } - fun readTimedWriteBooleanAttribute(callback: BooleanAttributeCallback) { + suspend fun readTimedWriteBooleanAttribute(): Boolean { // Implementation needs to be added here } - fun writeTimedWriteBooleanAttribute( - callback: DefaultClusterCallback, - value: Boolean, - timedWriteTimeoutMs: Int - ) { + suspend fun writeTimedWriteBooleanAttribute(value: Boolean, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeTimedWriteBooleanAttribute( - callback: BooleanAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeTimedWriteBooleanAttribute(minInterval: Int, maxInterval: Int): Boolean { // Implementation needs to be added here } - fun readGeneralErrorBooleanAttribute(callback: BooleanAttributeCallback) { + suspend fun readGeneralErrorBooleanAttribute(): Boolean { // Implementation needs to be added here } - fun writeGeneralErrorBooleanAttribute(callback: DefaultClusterCallback, value: Boolean) { + suspend fun writeGeneralErrorBooleanAttribute(value: Boolean) { // Implementation needs to be added here } - fun writeGeneralErrorBooleanAttribute( - callback: DefaultClusterCallback, - value: Boolean, - timedWriteTimeoutMs: Int - ) { + suspend fun writeGeneralErrorBooleanAttribute(value: Boolean, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeGeneralErrorBooleanAttribute( - callback: BooleanAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeGeneralErrorBooleanAttribute(minInterval: Int, maxInterval: Int): Boolean { // Implementation needs to be added here } - fun readClusterErrorBooleanAttribute(callback: BooleanAttributeCallback) { + suspend fun readClusterErrorBooleanAttribute(): Boolean { // Implementation needs to be added here } - fun writeClusterErrorBooleanAttribute(callback: DefaultClusterCallback, value: Boolean) { + suspend fun writeClusterErrorBooleanAttribute(value: Boolean) { // Implementation needs to be added here } - fun writeClusterErrorBooleanAttribute( - callback: DefaultClusterCallback, - value: Boolean, - timedWriteTimeoutMs: Int - ) { + suspend fun writeClusterErrorBooleanAttribute(value: Boolean, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeClusterErrorBooleanAttribute( - callback: BooleanAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterErrorBooleanAttribute(minInterval: Int, maxInterval: Int): Boolean { // Implementation needs to be added here } - fun readUnsupportedAttribute(callback: BooleanAttributeCallback) { + suspend fun readUnsupportedAttribute(): Boolean { // Implementation needs to be added here } - fun writeUnsupportedAttribute(callback: DefaultClusterCallback, value: Boolean) { + suspend fun writeUnsupportedAttribute(value: Boolean) { // Implementation needs to be added here } - fun writeUnsupportedAttribute( - callback: DefaultClusterCallback, - value: Boolean, - timedWriteTimeoutMs: Int - ) { + suspend fun writeUnsupportedAttribute(value: Boolean, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeUnsupportedAttribute( - callback: BooleanAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeUnsupportedAttribute(minInterval: Int, maxInterval: Int): Boolean { // Implementation needs to be added here } - fun readNullableBooleanAttribute(callback: NullableBooleanAttributeCallback) { + suspend fun readNullableBooleanAttribute(): NullableBooleanAttribute { // Implementation needs to be added here } - fun writeNullableBooleanAttribute(callback: DefaultClusterCallback, value: Boolean) { + suspend fun writeNullableBooleanAttribute(value: Boolean) { // Implementation needs to be added here } - fun writeNullableBooleanAttribute( - callback: DefaultClusterCallback, - value: Boolean, - timedWriteTimeoutMs: Int - ) { + suspend fun writeNullableBooleanAttribute(value: Boolean, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeNullableBooleanAttribute( - callback: NullableBooleanAttributeCallback, + suspend fun subscribeNullableBooleanAttribute( minInterval: Int, maxInterval: Int - ) { + ): NullableBooleanAttribute { // Implementation needs to be added here } - fun readNullableBitmap8Attribute(callback: NullableBitmap8AttributeCallback) { + suspend fun readNullableBitmap8Attribute(): NullableBitmap8Attribute { // Implementation needs to be added here } - fun writeNullableBitmap8Attribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeNullableBitmap8Attribute(value: UInt) { // Implementation needs to be added here } - fun writeNullableBitmap8Attribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeNullableBitmap8Attribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeNullableBitmap8Attribute( - callback: NullableBitmap8AttributeCallback, + suspend fun subscribeNullableBitmap8Attribute( minInterval: Int, maxInterval: Int - ) { + ): NullableBitmap8Attribute { // Implementation needs to be added here } - fun readNullableBitmap16Attribute(callback: NullableBitmap16AttributeCallback) { + suspend fun readNullableBitmap16Attribute(): NullableBitmap16Attribute { // Implementation needs to be added here } - fun writeNullableBitmap16Attribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeNullableBitmap16Attribute(value: UInt) { // Implementation needs to be added here } - fun writeNullableBitmap16Attribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeNullableBitmap16Attribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeNullableBitmap16Attribute( - callback: NullableBitmap16AttributeCallback, + suspend fun subscribeNullableBitmap16Attribute( minInterval: Int, maxInterval: Int - ) { + ): NullableBitmap16Attribute { // Implementation needs to be added here } - fun readNullableBitmap32Attribute(callback: NullableBitmap32AttributeCallback) { + suspend fun readNullableBitmap32Attribute(): NullableBitmap32Attribute { // Implementation needs to be added here } - fun writeNullableBitmap32Attribute(callback: DefaultClusterCallback, value: Long) { + suspend fun writeNullableBitmap32Attribute(value: ULong) { // Implementation needs to be added here } - fun writeNullableBitmap32Attribute( - callback: DefaultClusterCallback, - value: Long, - timedWriteTimeoutMs: Int - ) { + suspend fun writeNullableBitmap32Attribute(value: ULong, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeNullableBitmap32Attribute( - callback: NullableBitmap32AttributeCallback, + suspend fun subscribeNullableBitmap32Attribute( minInterval: Int, maxInterval: Int - ) { + ): NullableBitmap32Attribute { // Implementation needs to be added here } - fun readNullableBitmap64Attribute(callback: NullableBitmap64AttributeCallback) { + suspend fun readNullableBitmap64Attribute(): NullableBitmap64Attribute { // Implementation needs to be added here } - fun writeNullableBitmap64Attribute(callback: DefaultClusterCallback, value: Long) { + suspend fun writeNullableBitmap64Attribute(value: ULong) { // Implementation needs to be added here } - fun writeNullableBitmap64Attribute( - callback: DefaultClusterCallback, - value: Long, - timedWriteTimeoutMs: Int - ) { + suspend fun writeNullableBitmap64Attribute(value: ULong, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeNullableBitmap64Attribute( - callback: NullableBitmap64AttributeCallback, + suspend fun subscribeNullableBitmap64Attribute( minInterval: Int, maxInterval: Int - ) { + ): NullableBitmap64Attribute { // Implementation needs to be added here } - fun readNullableInt8uAttribute(callback: NullableInt8uAttributeCallback) { + suspend fun readNullableInt8uAttribute(): NullableInt8uAttribute { // Implementation needs to be added here } - fun writeNullableInt8uAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeNullableInt8uAttribute(value: UByte) { // Implementation needs to be added here } - fun writeNullableInt8uAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeNullableInt8uAttribute(value: UByte, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeNullableInt8uAttribute( - callback: NullableInt8uAttributeCallback, + suspend fun subscribeNullableInt8uAttribute( minInterval: Int, maxInterval: Int - ) { + ): NullableInt8uAttribute { // Implementation needs to be added here } - fun readNullableInt16uAttribute(callback: NullableInt16uAttributeCallback) { + suspend fun readNullableInt16uAttribute(): NullableInt16uAttribute { // Implementation needs to be added here } - fun writeNullableInt16uAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeNullableInt16uAttribute(value: UShort) { // Implementation needs to be added here } - fun writeNullableInt16uAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeNullableInt16uAttribute(value: UShort, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeNullableInt16uAttribute( - callback: NullableInt16uAttributeCallback, + suspend fun subscribeNullableInt16uAttribute( minInterval: Int, maxInterval: Int - ) { + ): NullableInt16uAttribute { // Implementation needs to be added here } - fun readNullableInt24uAttribute(callback: NullableInt24uAttributeCallback) { + suspend fun readNullableInt24uAttribute(): NullableInt24uAttribute { // Implementation needs to be added here } - fun writeNullableInt24uAttribute(callback: DefaultClusterCallback, value: Long) { + suspend fun writeNullableInt24uAttribute(value: UInt) { // Implementation needs to be added here } - fun writeNullableInt24uAttribute( - callback: DefaultClusterCallback, - value: Long, - timedWriteTimeoutMs: Int - ) { + suspend fun writeNullableInt24uAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeNullableInt24uAttribute( - callback: NullableInt24uAttributeCallback, + suspend fun subscribeNullableInt24uAttribute( minInterval: Int, maxInterval: Int - ) { + ): NullableInt24uAttribute { // Implementation needs to be added here } - fun readNullableInt32uAttribute(callback: NullableInt32uAttributeCallback) { + suspend fun readNullableInt32uAttribute(): NullableInt32uAttribute { // Implementation needs to be added here } - fun writeNullableInt32uAttribute(callback: DefaultClusterCallback, value: Long) { + suspend fun writeNullableInt32uAttribute(value: UInt) { // Implementation needs to be added here } - fun writeNullableInt32uAttribute( - callback: DefaultClusterCallback, - value: Long, - timedWriteTimeoutMs: Int - ) { + suspend fun writeNullableInt32uAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeNullableInt32uAttribute( - callback: NullableInt32uAttributeCallback, + suspend fun subscribeNullableInt32uAttribute( minInterval: Int, maxInterval: Int - ) { + ): NullableInt32uAttribute { // Implementation needs to be added here } - fun readNullableInt40uAttribute(callback: NullableInt40uAttributeCallback) { + suspend fun readNullableInt40uAttribute(): NullableInt40uAttribute { // Implementation needs to be added here } - fun writeNullableInt40uAttribute(callback: DefaultClusterCallback, value: Long) { + suspend fun writeNullableInt40uAttribute(value: ULong) { // Implementation needs to be added here } - fun writeNullableInt40uAttribute( - callback: DefaultClusterCallback, - value: Long, - timedWriteTimeoutMs: Int - ) { + suspend fun writeNullableInt40uAttribute(value: ULong, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeNullableInt40uAttribute( - callback: NullableInt40uAttributeCallback, + suspend fun subscribeNullableInt40uAttribute( minInterval: Int, maxInterval: Int - ) { + ): NullableInt40uAttribute { // Implementation needs to be added here } - fun readNullableInt48uAttribute(callback: NullableInt48uAttributeCallback) { + suspend fun readNullableInt48uAttribute(): NullableInt48uAttribute { // Implementation needs to be added here } - fun writeNullableInt48uAttribute(callback: DefaultClusterCallback, value: Long) { + suspend fun writeNullableInt48uAttribute(value: ULong) { // Implementation needs to be added here } - fun writeNullableInt48uAttribute( - callback: DefaultClusterCallback, - value: Long, - timedWriteTimeoutMs: Int - ) { + suspend fun writeNullableInt48uAttribute(value: ULong, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeNullableInt48uAttribute( - callback: NullableInt48uAttributeCallback, + suspend fun subscribeNullableInt48uAttribute( minInterval: Int, maxInterval: Int - ) { + ): NullableInt48uAttribute { // Implementation needs to be added here } - fun readNullableInt56uAttribute(callback: NullableInt56uAttributeCallback) { + suspend fun readNullableInt56uAttribute(): NullableInt56uAttribute { // Implementation needs to be added here } - fun writeNullableInt56uAttribute(callback: DefaultClusterCallback, value: Long) { + suspend fun writeNullableInt56uAttribute(value: ULong) { // Implementation needs to be added here } - fun writeNullableInt56uAttribute( - callback: DefaultClusterCallback, - value: Long, - timedWriteTimeoutMs: Int - ) { + suspend fun writeNullableInt56uAttribute(value: ULong, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeNullableInt56uAttribute( - callback: NullableInt56uAttributeCallback, + suspend fun subscribeNullableInt56uAttribute( minInterval: Int, maxInterval: Int - ) { + ): NullableInt56uAttribute { // Implementation needs to be added here } - fun readNullableInt64uAttribute(callback: NullableInt64uAttributeCallback) { + suspend fun readNullableInt64uAttribute(): NullableInt64uAttribute { // Implementation needs to be added here } - fun writeNullableInt64uAttribute(callback: DefaultClusterCallback, value: Long) { + suspend fun writeNullableInt64uAttribute(value: ULong) { // Implementation needs to be added here } - fun writeNullableInt64uAttribute( - callback: DefaultClusterCallback, - value: Long, - timedWriteTimeoutMs: Int - ) { + suspend fun writeNullableInt64uAttribute(value: ULong, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeNullableInt64uAttribute( - callback: NullableInt64uAttributeCallback, + suspend fun subscribeNullableInt64uAttribute( minInterval: Int, maxInterval: Int - ) { + ): NullableInt64uAttribute { // Implementation needs to be added here } - fun readNullableInt8sAttribute(callback: NullableInt8sAttributeCallback) { + suspend fun readNullableInt8sAttribute(): NullableInt8sAttribute { // Implementation needs to be added here } - fun writeNullableInt8sAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeNullableInt8sAttribute(value: Byte) { // Implementation needs to be added here } - fun writeNullableInt8sAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeNullableInt8sAttribute(value: Byte, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeNullableInt8sAttribute( - callback: NullableInt8sAttributeCallback, + suspend fun subscribeNullableInt8sAttribute( minInterval: Int, maxInterval: Int - ) { + ): NullableInt8sAttribute { // Implementation needs to be added here } - fun readNullableInt16sAttribute(callback: NullableInt16sAttributeCallback) { + suspend fun readNullableInt16sAttribute(): NullableInt16sAttribute { // Implementation needs to be added here } - fun writeNullableInt16sAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeNullableInt16sAttribute(value: Short) { // Implementation needs to be added here } - fun writeNullableInt16sAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeNullableInt16sAttribute(value: Short, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeNullableInt16sAttribute( - callback: NullableInt16sAttributeCallback, + suspend fun subscribeNullableInt16sAttribute( minInterval: Int, maxInterval: Int - ) { + ): NullableInt16sAttribute { // Implementation needs to be added here } - fun readNullableInt24sAttribute(callback: NullableInt24sAttributeCallback) { + suspend fun readNullableInt24sAttribute(): NullableInt24sAttribute { // Implementation needs to be added here } - fun writeNullableInt24sAttribute(callback: DefaultClusterCallback, value: Long) { + suspend fun writeNullableInt24sAttribute(value: Int) { // Implementation needs to be added here } - fun writeNullableInt24sAttribute( - callback: DefaultClusterCallback, - value: Long, - timedWriteTimeoutMs: Int - ) { + suspend fun writeNullableInt24sAttribute(value: Int, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeNullableInt24sAttribute( - callback: NullableInt24sAttributeCallback, + suspend fun subscribeNullableInt24sAttribute( minInterval: Int, maxInterval: Int - ) { + ): NullableInt24sAttribute { // Implementation needs to be added here } - fun readNullableInt32sAttribute(callback: NullableInt32sAttributeCallback) { + suspend fun readNullableInt32sAttribute(): NullableInt32sAttribute { // Implementation needs to be added here } - fun writeNullableInt32sAttribute(callback: DefaultClusterCallback, value: Long) { + suspend fun writeNullableInt32sAttribute(value: Int) { // Implementation needs to be added here } - fun writeNullableInt32sAttribute( - callback: DefaultClusterCallback, - value: Long, - timedWriteTimeoutMs: Int - ) { + suspend fun writeNullableInt32sAttribute(value: Int, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeNullableInt32sAttribute( - callback: NullableInt32sAttributeCallback, + suspend fun subscribeNullableInt32sAttribute( minInterval: Int, maxInterval: Int - ) { + ): NullableInt32sAttribute { // Implementation needs to be added here } - fun readNullableInt40sAttribute(callback: NullableInt40sAttributeCallback) { + suspend fun readNullableInt40sAttribute(): NullableInt40sAttribute { // Implementation needs to be added here } - fun writeNullableInt40sAttribute(callback: DefaultClusterCallback, value: Long) { + suspend fun writeNullableInt40sAttribute(value: Long) { // Implementation needs to be added here } - fun writeNullableInt40sAttribute( - callback: DefaultClusterCallback, - value: Long, - timedWriteTimeoutMs: Int - ) { + suspend fun writeNullableInt40sAttribute(value: Long, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeNullableInt40sAttribute( - callback: NullableInt40sAttributeCallback, + suspend fun subscribeNullableInt40sAttribute( minInterval: Int, maxInterval: Int - ) { + ): NullableInt40sAttribute { // Implementation needs to be added here } - fun readNullableInt48sAttribute(callback: NullableInt48sAttributeCallback) { + suspend fun readNullableInt48sAttribute(): NullableInt48sAttribute { // Implementation needs to be added here } - fun writeNullableInt48sAttribute(callback: DefaultClusterCallback, value: Long) { + suspend fun writeNullableInt48sAttribute(value: Long) { // Implementation needs to be added here } - fun writeNullableInt48sAttribute( - callback: DefaultClusterCallback, - value: Long, - timedWriteTimeoutMs: Int - ) { + suspend fun writeNullableInt48sAttribute(value: Long, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeNullableInt48sAttribute( - callback: NullableInt48sAttributeCallback, + suspend fun subscribeNullableInt48sAttribute( minInterval: Int, maxInterval: Int - ) { + ): NullableInt48sAttribute { // Implementation needs to be added here } - fun readNullableInt56sAttribute(callback: NullableInt56sAttributeCallback) { + suspend fun readNullableInt56sAttribute(): NullableInt56sAttribute { // Implementation needs to be added here } - fun writeNullableInt56sAttribute(callback: DefaultClusterCallback, value: Long) { + suspend fun writeNullableInt56sAttribute(value: Long) { // Implementation needs to be added here } - fun writeNullableInt56sAttribute( - callback: DefaultClusterCallback, - value: Long, - timedWriteTimeoutMs: Int - ) { + suspend fun writeNullableInt56sAttribute(value: Long, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeNullableInt56sAttribute( - callback: NullableInt56sAttributeCallback, + suspend fun subscribeNullableInt56sAttribute( minInterval: Int, maxInterval: Int - ) { + ): NullableInt56sAttribute { // Implementation needs to be added here } - fun readNullableInt64sAttribute(callback: NullableInt64sAttributeCallback) { + suspend fun readNullableInt64sAttribute(): NullableInt64sAttribute { // Implementation needs to be added here } - fun writeNullableInt64sAttribute(callback: DefaultClusterCallback, value: Long) { + suspend fun writeNullableInt64sAttribute(value: Long) { // Implementation needs to be added here } - fun writeNullableInt64sAttribute( - callback: DefaultClusterCallback, - value: Long, - timedWriteTimeoutMs: Int - ) { + suspend fun writeNullableInt64sAttribute(value: Long, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeNullableInt64sAttribute( - callback: NullableInt64sAttributeCallback, + suspend fun subscribeNullableInt64sAttribute( minInterval: Int, maxInterval: Int - ) { + ): NullableInt64sAttribute { // Implementation needs to be added here } - fun readNullableEnum8Attribute(callback: NullableEnum8AttributeCallback) { + suspend fun readNullableEnum8Attribute(): NullableEnum8Attribute { // Implementation needs to be added here } - fun writeNullableEnum8Attribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeNullableEnum8Attribute(value: UInt) { // Implementation needs to be added here } - fun writeNullableEnum8Attribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeNullableEnum8Attribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeNullableEnum8Attribute( - callback: NullableEnum8AttributeCallback, + suspend fun subscribeNullableEnum8Attribute( minInterval: Int, maxInterval: Int - ) { + ): NullableEnum8Attribute { // Implementation needs to be added here } - fun readNullableEnum16Attribute(callback: NullableEnum16AttributeCallback) { + suspend fun readNullableEnum16Attribute(): NullableEnum16Attribute { // Implementation needs to be added here } - fun writeNullableEnum16Attribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeNullableEnum16Attribute(value: UInt) { // Implementation needs to be added here } - fun writeNullableEnum16Attribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeNullableEnum16Attribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeNullableEnum16Attribute( - callback: NullableEnum16AttributeCallback, + suspend fun subscribeNullableEnum16Attribute( minInterval: Int, maxInterval: Int - ) { + ): NullableEnum16Attribute { // Implementation needs to be added here } - fun readNullableFloatSingleAttribute(callback: NullableFloatSingleAttributeCallback) { + suspend fun readNullableFloatSingleAttribute(): NullableFloatSingleAttribute { // Implementation needs to be added here } - fun writeNullableFloatSingleAttribute(callback: DefaultClusterCallback, value: Float) { + suspend fun writeNullableFloatSingleAttribute(value: Float) { // Implementation needs to be added here } - fun writeNullableFloatSingleAttribute( - callback: DefaultClusterCallback, - value: Float, - timedWriteTimeoutMs: Int - ) { + suspend fun writeNullableFloatSingleAttribute(value: Float, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeNullableFloatSingleAttribute( - callback: NullableFloatSingleAttributeCallback, + suspend fun subscribeNullableFloatSingleAttribute( minInterval: Int, maxInterval: Int - ) { + ): NullableFloatSingleAttribute { // Implementation needs to be added here } - fun readNullableFloatDoubleAttribute(callback: NullableFloatDoubleAttributeCallback) { + suspend fun readNullableFloatDoubleAttribute(): NullableFloatDoubleAttribute { // Implementation needs to be added here } - fun writeNullableFloatDoubleAttribute(callback: DefaultClusterCallback, value: Double) { + suspend fun writeNullableFloatDoubleAttribute(value: Double) { // Implementation needs to be added here } - fun writeNullableFloatDoubleAttribute( - callback: DefaultClusterCallback, - value: Double, - timedWriteTimeoutMs: Int - ) { + suspend fun writeNullableFloatDoubleAttribute(value: Double, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeNullableFloatDoubleAttribute( - callback: NullableFloatDoubleAttributeCallback, + suspend fun subscribeNullableFloatDoubleAttribute( minInterval: Int, maxInterval: Int - ) { + ): NullableFloatDoubleAttribute { // Implementation needs to be added here } - fun readNullableOctetStringAttribute(callback: NullableOctetStringAttributeCallback) { + suspend fun readNullableOctetStringAttribute(): NullableOctetStringAttribute { // Implementation needs to be added here } - fun writeNullableOctetStringAttribute(callback: DefaultClusterCallback, value: ByteArray) { + suspend fun writeNullableOctetStringAttribute(value: ByteArray) { // Implementation needs to be added here } - fun writeNullableOctetStringAttribute( - callback: DefaultClusterCallback, - value: ByteArray, - timedWriteTimeoutMs: Int - ) { + suspend fun writeNullableOctetStringAttribute(value: ByteArray, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeNullableOctetStringAttribute( - callback: NullableOctetStringAttributeCallback, + suspend fun subscribeNullableOctetStringAttribute( minInterval: Int, maxInterval: Int - ) { + ): NullableOctetStringAttribute { // Implementation needs to be added here } - fun readNullableCharStringAttribute(callback: NullableCharStringAttributeCallback) { + suspend fun readNullableCharStringAttribute(): NullableCharStringAttribute { // Implementation needs to be added here } - fun writeNullableCharStringAttribute(callback: DefaultClusterCallback, value: String) { + suspend fun writeNullableCharStringAttribute(value: String) { // Implementation needs to be added here } - fun writeNullableCharStringAttribute( - callback: DefaultClusterCallback, - value: String, - timedWriteTimeoutMs: Int - ) { + suspend fun writeNullableCharStringAttribute(value: String, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeNullableCharStringAttribute( - callback: NullableCharStringAttributeCallback, + suspend fun subscribeNullableCharStringAttribute( minInterval: Int, maxInterval: Int - ) { + ): NullableCharStringAttribute { // Implementation needs to be added here } - fun readNullableEnumAttrAttribute(callback: NullableEnumAttrAttributeCallback) { + suspend fun readNullableEnumAttrAttribute(): NullableEnumAttrAttribute { // Implementation needs to be added here } - fun writeNullableEnumAttrAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeNullableEnumAttrAttribute(value: UInt) { // Implementation needs to be added here } - fun writeNullableEnumAttrAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeNullableEnumAttrAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeNullableEnumAttrAttribute( - callback: NullableEnumAttrAttributeCallback, + suspend fun subscribeNullableEnumAttrAttribute( minInterval: Int, maxInterval: Int - ) { + ): NullableEnumAttrAttribute { // Implementation needs to be added here } - fun readNullableStructAttribute(callback: NullableStructAttributeCallback) { + suspend fun readNullableStructAttribute(): NullableStructAttribute { // Implementation needs to be added here } - fun writeNullableStructAttribute( - callback: DefaultClusterCallback, - value: ChipStructs.UnitTestingClusterSimpleStruct - ) { + suspend fun writeNullableStructAttribute(value: ChipStructs.UnitTestingClusterSimpleStruct) { // Implementation needs to be added here } - fun writeNullableStructAttribute( - callback: DefaultClusterCallback, + suspend fun writeNullableStructAttribute( value: ChipStructs.UnitTestingClusterSimpleStruct, timedWriteTimeoutMs: Int ) { // Implementation needs to be added here } - fun subscribeNullableStructAttribute( - callback: NullableStructAttributeCallback, + suspend fun subscribeNullableStructAttribute( minInterval: Int, maxInterval: Int - ) { + ): NullableStructAttribute { // Implementation needs to be added here } - fun readNullableRangeRestrictedInt8uAttribute( - callback: NullableRangeRestrictedInt8uAttributeCallback - ) { + suspend fun readNullableRangeRestrictedInt8uAttribute(): NullableRangeRestrictedInt8uAttribute { // Implementation needs to be added here } - fun writeNullableRangeRestrictedInt8uAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeNullableRangeRestrictedInt8uAttribute(value: UByte) { // Implementation needs to be added here } - fun writeNullableRangeRestrictedInt8uAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeNullableRangeRestrictedInt8uAttribute(value: UByte, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeNullableRangeRestrictedInt8uAttribute( - callback: NullableRangeRestrictedInt8uAttributeCallback, + suspend fun subscribeNullableRangeRestrictedInt8uAttribute( minInterval: Int, maxInterval: Int - ) { + ): NullableRangeRestrictedInt8uAttribute { // Implementation needs to be added here } - fun readNullableRangeRestrictedInt8sAttribute( - callback: NullableRangeRestrictedInt8sAttributeCallback - ) { + suspend fun readNullableRangeRestrictedInt8sAttribute(): NullableRangeRestrictedInt8sAttribute { // Implementation needs to be added here } - fun writeNullableRangeRestrictedInt8sAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeNullableRangeRestrictedInt8sAttribute(value: Byte) { // Implementation needs to be added here } - fun writeNullableRangeRestrictedInt8sAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeNullableRangeRestrictedInt8sAttribute(value: Byte, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeNullableRangeRestrictedInt8sAttribute( - callback: NullableRangeRestrictedInt8sAttributeCallback, + suspend fun subscribeNullableRangeRestrictedInt8sAttribute( minInterval: Int, maxInterval: Int - ) { + ): NullableRangeRestrictedInt8sAttribute { // Implementation needs to be added here } - fun readNullableRangeRestrictedInt16uAttribute( - callback: NullableRangeRestrictedInt16uAttributeCallback - ) { + suspend fun readNullableRangeRestrictedInt16uAttribute(): NullableRangeRestrictedInt16uAttribute { // Implementation needs to be added here } - fun writeNullableRangeRestrictedInt16uAttribute( - callback: DefaultClusterCallback, - value: Integer - ) { + suspend fun writeNullableRangeRestrictedInt16uAttribute(value: UShort) { // Implementation needs to be added here } - fun writeNullableRangeRestrictedInt16uAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeNullableRangeRestrictedInt16uAttribute(value: UShort, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeNullableRangeRestrictedInt16uAttribute( - callback: NullableRangeRestrictedInt16uAttributeCallback, + suspend fun subscribeNullableRangeRestrictedInt16uAttribute( minInterval: Int, maxInterval: Int - ) { + ): NullableRangeRestrictedInt16uAttribute { // Implementation needs to be added here } - fun readNullableRangeRestrictedInt16sAttribute( - callback: NullableRangeRestrictedInt16sAttributeCallback - ) { + suspend fun readNullableRangeRestrictedInt16sAttribute(): NullableRangeRestrictedInt16sAttribute { // Implementation needs to be added here } - fun writeNullableRangeRestrictedInt16sAttribute( - callback: DefaultClusterCallback, - value: Integer - ) { + suspend fun writeNullableRangeRestrictedInt16sAttribute(value: Short) { // Implementation needs to be added here } - fun writeNullableRangeRestrictedInt16sAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeNullableRangeRestrictedInt16sAttribute(value: Short, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeNullableRangeRestrictedInt16sAttribute( - callback: NullableRangeRestrictedInt16sAttributeCallback, + suspend fun subscribeNullableRangeRestrictedInt16sAttribute( minInterval: Int, maxInterval: Int - ) { + ): NullableRangeRestrictedInt16sAttribute { // Implementation needs to be added here } - fun readWriteOnlyInt8uAttribute(callback: IntegerAttributeCallback) { + suspend fun readWriteOnlyInt8uAttribute(): Integer { // Implementation needs to be added here } - fun writeWriteOnlyInt8uAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeWriteOnlyInt8uAttribute(value: UByte) { // Implementation needs to be added here } - fun writeWriteOnlyInt8uAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeWriteOnlyInt8uAttribute(value: UByte, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeWriteOnlyInt8uAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeWriteOnlyInt8uAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 4294048773u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UserLabelCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UserLabelCluster.kt index 25b36155c2cdd1..37f240160f798c 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UserLabelCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UserLabelCluster.kt @@ -20,146 +20,93 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class UserLabelCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 65u - } - - interface LabelListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class LabelListAttribute(val value: ArrayList) - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) + class GeneratedCommandListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class AcceptedCommandListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) + class EventListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class AttributeListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - fun readLabelListAttribute(callback: LabelListAttributeCallback) { + suspend fun readLabelListAttribute(): LabelListAttribute { // Implementation needs to be added here } - fun writeLabelListAttribute( - callback: DefaultClusterCallback, - value: ArrayList - ) { + suspend fun writeLabelListAttribute(value: ArrayList) { // Implementation needs to be added here } - fun writeLabelListAttribute( - callback: DefaultClusterCallback, + suspend fun writeLabelListAttribute( value: ArrayList, timedWriteTimeoutMs: Int ) { // Implementation needs to be added here } - fun subscribeLabelListAttribute( - callback: LabelListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeLabelListAttribute(minInterval: Int, maxInterval: Int): LabelListAttribute { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 65u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WakeOnLanCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WakeOnLanCluster.kt index 267032c85e34f1..94a34ee6faab32 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WakeOnLanCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WakeOnLanCluster.kt @@ -20,123 +20,80 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class WakeOnLanCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 1283u - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class GeneratedCommandListAttribute(val value: ArrayList) - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) + class AcceptedCommandListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class EventListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AttributeListAttribute(val value: ArrayList) - fun readMACAddressAttribute(callback: CharStringAttributeCallback) { + suspend fun readMACAddressAttribute(): CharString { // Implementation needs to be added here } - fun subscribeMACAddressAttribute( - callback: CharStringAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeMACAddressAttribute(minInterval: Int, maxInterval: Int): CharString { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 1283u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WiFiNetworkDiagnosticsCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WiFiNetworkDiagnosticsCluster.kt index bdb5a96acc96b7..d7a7f8bd1b4350 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WiFiNetworkDiagnosticsCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WiFiNetworkDiagnosticsCluster.kt @@ -20,375 +20,243 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class WiFiNetworkDiagnosticsCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 54u - } - - fun resetCounts(callback: DefaultClusterCallback) { - // Implementation needs to be added here - } - - fun resetCounts(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } - - interface BssidAttributeCallback { - fun onSuccess(value: ByteArray?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface SecurityTypeAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface WiFiVersionAttributeCallback { - fun onSuccess(value: Integer?) + class BssidAttribute(val value: ByteArray?) - fun onError(ex: Exception) + class SecurityTypeAttribute(val value: UInt?) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface ChannelNumberAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface RssiAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } + class WiFiVersionAttribute(val value: UInt?) - interface BeaconLostCountAttributeCallback { - fun onSuccess(value: Long?) + class ChannelNumberAttribute(val value: UShort?) - fun onError(ex: Exception) + class RssiAttribute(val value: Byte?) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class BeaconLostCountAttribute(val value: UInt?) - interface BeaconRxCountAttributeCallback { - fun onSuccess(value: Long?) + class BeaconRxCountAttribute(val value: UInt?) - fun onError(ex: Exception) + class PacketMulticastRxCountAttribute(val value: UInt?) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class PacketMulticastTxCountAttribute(val value: UInt?) - interface PacketMulticastRxCountAttributeCallback { - fun onSuccess(value: Long?) + class PacketUnicastRxCountAttribute(val value: UInt?) - fun onError(ex: Exception) + class PacketUnicastTxCountAttribute(val value: UInt?) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class CurrentMaxRateAttribute(val value: ULong?) - interface PacketMulticastTxCountAttributeCallback { - fun onSuccess(value: Long?) + class OverrunCountAttribute(val value: ULong?) - fun onError(ex: Exception) + class GeneratedCommandListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } + class AcceptedCommandListAttribute(val value: ArrayList) - interface PacketUnicastRxCountAttributeCallback { - fun onSuccess(value: Long?) + class EventListAttribute(val value: ArrayList) - fun onError(ex: Exception) + class AttributeListAttribute(val value: ArrayList) - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface PacketUnicastTxCountAttributeCallback { - fun onSuccess(value: Long?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface CurrentMaxRateAttributeCallback { - fun onSuccess(value: Long?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface OverrunCountAttributeCallback { - fun onSuccess(value: Long?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun resetCounts() { + // Implementation needs to be added here } - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun resetCounts(timedInvokeTimeoutMs: Int) { + // Implementation needs to be added here } - fun readBssidAttribute(callback: BssidAttributeCallback) { + suspend fun readBssidAttribute(): BssidAttribute { // Implementation needs to be added here } - fun subscribeBssidAttribute( - callback: BssidAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeBssidAttribute(minInterval: Int, maxInterval: Int): BssidAttribute { // Implementation needs to be added here } - fun readSecurityTypeAttribute(callback: SecurityTypeAttributeCallback) { + suspend fun readSecurityTypeAttribute(): SecurityTypeAttribute { // Implementation needs to be added here } - fun subscribeSecurityTypeAttribute( - callback: SecurityTypeAttributeCallback, + suspend fun subscribeSecurityTypeAttribute( minInterval: Int, maxInterval: Int - ) { + ): SecurityTypeAttribute { // Implementation needs to be added here } - fun readWiFiVersionAttribute(callback: WiFiVersionAttributeCallback) { + suspend fun readWiFiVersionAttribute(): WiFiVersionAttribute { // Implementation needs to be added here } - fun subscribeWiFiVersionAttribute( - callback: WiFiVersionAttributeCallback, + suspend fun subscribeWiFiVersionAttribute( minInterval: Int, maxInterval: Int - ) { + ): WiFiVersionAttribute { // Implementation needs to be added here } - fun readChannelNumberAttribute(callback: ChannelNumberAttributeCallback) { + suspend fun readChannelNumberAttribute(): ChannelNumberAttribute { // Implementation needs to be added here } - fun subscribeChannelNumberAttribute( - callback: ChannelNumberAttributeCallback, + suspend fun subscribeChannelNumberAttribute( minInterval: Int, maxInterval: Int - ) { + ): ChannelNumberAttribute { // Implementation needs to be added here } - fun readRssiAttribute(callback: RssiAttributeCallback) { + suspend fun readRssiAttribute(): RssiAttribute { // Implementation needs to be added here } - fun subscribeRssiAttribute(callback: RssiAttributeCallback, minInterval: Int, maxInterval: Int) { + suspend fun subscribeRssiAttribute(minInterval: Int, maxInterval: Int): RssiAttribute { // Implementation needs to be added here } - fun readBeaconLostCountAttribute(callback: BeaconLostCountAttributeCallback) { + suspend fun readBeaconLostCountAttribute(): BeaconLostCountAttribute { // Implementation needs to be added here } - fun subscribeBeaconLostCountAttribute( - callback: BeaconLostCountAttributeCallback, + suspend fun subscribeBeaconLostCountAttribute( minInterval: Int, maxInterval: Int - ) { + ): BeaconLostCountAttribute { // Implementation needs to be added here } - fun readBeaconRxCountAttribute(callback: BeaconRxCountAttributeCallback) { + suspend fun readBeaconRxCountAttribute(): BeaconRxCountAttribute { // Implementation needs to be added here } - fun subscribeBeaconRxCountAttribute( - callback: BeaconRxCountAttributeCallback, + suspend fun subscribeBeaconRxCountAttribute( minInterval: Int, maxInterval: Int - ) { + ): BeaconRxCountAttribute { // Implementation needs to be added here } - fun readPacketMulticastRxCountAttribute(callback: PacketMulticastRxCountAttributeCallback) { + suspend fun readPacketMulticastRxCountAttribute(): PacketMulticastRxCountAttribute { // Implementation needs to be added here } - fun subscribePacketMulticastRxCountAttribute( - callback: PacketMulticastRxCountAttributeCallback, + suspend fun subscribePacketMulticastRxCountAttribute( minInterval: Int, maxInterval: Int - ) { + ): PacketMulticastRxCountAttribute { // Implementation needs to be added here } - fun readPacketMulticastTxCountAttribute(callback: PacketMulticastTxCountAttributeCallback) { + suspend fun readPacketMulticastTxCountAttribute(): PacketMulticastTxCountAttribute { // Implementation needs to be added here } - fun subscribePacketMulticastTxCountAttribute( - callback: PacketMulticastTxCountAttributeCallback, + suspend fun subscribePacketMulticastTxCountAttribute( minInterval: Int, maxInterval: Int - ) { + ): PacketMulticastTxCountAttribute { // Implementation needs to be added here } - fun readPacketUnicastRxCountAttribute(callback: PacketUnicastRxCountAttributeCallback) { + suspend fun readPacketUnicastRxCountAttribute(): PacketUnicastRxCountAttribute { // Implementation needs to be added here } - fun subscribePacketUnicastRxCountAttribute( - callback: PacketUnicastRxCountAttributeCallback, + suspend fun subscribePacketUnicastRxCountAttribute( minInterval: Int, maxInterval: Int - ) { + ): PacketUnicastRxCountAttribute { // Implementation needs to be added here } - fun readPacketUnicastTxCountAttribute(callback: PacketUnicastTxCountAttributeCallback) { + suspend fun readPacketUnicastTxCountAttribute(): PacketUnicastTxCountAttribute { // Implementation needs to be added here } - fun subscribePacketUnicastTxCountAttribute( - callback: PacketUnicastTxCountAttributeCallback, + suspend fun subscribePacketUnicastTxCountAttribute( minInterval: Int, maxInterval: Int - ) { + ): PacketUnicastTxCountAttribute { // Implementation needs to be added here } - fun readCurrentMaxRateAttribute(callback: CurrentMaxRateAttributeCallback) { + suspend fun readCurrentMaxRateAttribute(): CurrentMaxRateAttribute { // Implementation needs to be added here } - fun subscribeCurrentMaxRateAttribute( - callback: CurrentMaxRateAttributeCallback, + suspend fun subscribeCurrentMaxRateAttribute( minInterval: Int, maxInterval: Int - ) { + ): CurrentMaxRateAttribute { // Implementation needs to be added here } - fun readOverrunCountAttribute(callback: OverrunCountAttributeCallback) { + suspend fun readOverrunCountAttribute(): OverrunCountAttribute { // Implementation needs to be added here } - fun subscribeOverrunCountAttribute( - callback: OverrunCountAttributeCallback, + suspend fun subscribeOverrunCountAttribute( minInterval: Int, maxInterval: Int - ) { + ): OverrunCountAttribute { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 54u + } } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WindowCoveringCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WindowCoveringCluster.kt index c57ba09b1f33d7..e90983f4f4a8d2 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WindowCoveringCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WindowCoveringCluster.kt @@ -20,535 +20,380 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class WindowCoveringCluster(private val endpointId: UShort) { - companion object { - const val CLUSTER_ID: UInt = 258u - } + class CurrentPositionLiftAttribute(val value: UShort?) - fun upOrOpen(callback: DefaultClusterCallback) { - // Implementation needs to be added here - } + class CurrentPositionTiltAttribute(val value: UShort?) - fun upOrOpen(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } + class CurrentPositionLiftPercentageAttribute(val value: UByte?) - fun downOrClose(callback: DefaultClusterCallback) { - // Implementation needs to be added here - } + class CurrentPositionTiltPercentageAttribute(val value: UByte?) - fun downOrClose(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } + class TargetPositionLiftPercent100thsAttribute(val value: UShort?) - fun stopMotion(callback: DefaultClusterCallback) { - // Implementation needs to be added here - } + class TargetPositionTiltPercent100thsAttribute(val value: UShort?) - fun stopMotion(callback: DefaultClusterCallback, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } + class CurrentPositionLiftPercent100thsAttribute(val value: UShort?) - fun goToLiftValue(callback: DefaultClusterCallback, liftValue: Integer) { - // Implementation needs to be added here - } + class CurrentPositionTiltPercent100thsAttribute(val value: UShort?) - fun goToLiftValue( - callback: DefaultClusterCallback, - liftValue: Integer, - timedInvokeTimeoutMs: Int - ) { - // Implementation needs to be added here - } + class GeneratedCommandListAttribute(val value: ArrayList) - fun goToLiftPercentage(callback: DefaultClusterCallback, liftPercent100thsValue: Integer) { - // Implementation needs to be added here - } + class AcceptedCommandListAttribute(val value: ArrayList) - fun goToLiftPercentage( - callback: DefaultClusterCallback, - liftPercent100thsValue: Integer, - timedInvokeTimeoutMs: Int - ) { - // Implementation needs to be added here - } + class EventListAttribute(val value: ArrayList) - fun goToTiltValue(callback: DefaultClusterCallback, tiltValue: Integer) { - // Implementation needs to be added here - } + class AttributeListAttribute(val value: ArrayList) - fun goToTiltValue( - callback: DefaultClusterCallback, - tiltValue: Integer, - timedInvokeTimeoutMs: Int - ) { + suspend fun upOrOpen() { // Implementation needs to be added here } - fun goToTiltPercentage(callback: DefaultClusterCallback, tiltPercent100thsValue: Integer) { + suspend fun upOrOpen(timedInvokeTimeoutMs: Int) { // Implementation needs to be added here } - fun goToTiltPercentage( - callback: DefaultClusterCallback, - tiltPercent100thsValue: Integer, - timedInvokeTimeoutMs: Int - ) { + suspend fun downOrClose() { // Implementation needs to be added here } - interface CurrentPositionLiftAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) - } - - interface CurrentPositionTiltAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun downOrClose(timedInvokeTimeoutMs: Int) { + // Implementation needs to be added here } - interface CurrentPositionLiftPercentageAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun stopMotion() { + // Implementation needs to be added here } - interface CurrentPositionTiltPercentageAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun stopMotion(timedInvokeTimeoutMs: Int) { + // Implementation needs to be added here } - interface TargetPositionLiftPercent100thsAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun goToLiftValue(liftValue: UShort) { + // Implementation needs to be added here } - interface TargetPositionTiltPercent100thsAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun goToLiftValue(liftValue: UShort, timedInvokeTimeoutMs: Int) { + // Implementation needs to be added here } - interface CurrentPositionLiftPercent100thsAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun goToLiftPercentage(liftPercent100thsValue: UShort) { + // Implementation needs to be added here } - interface CurrentPositionTiltPercent100thsAttributeCallback { - fun onSuccess(value: Integer?) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun goToLiftPercentage(liftPercent100thsValue: UShort, timedInvokeTimeoutMs: Int) { + // Implementation needs to be added here } - interface GeneratedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun goToTiltValue(tiltValue: UShort) { + // Implementation needs to be added here } - interface AcceptedCommandListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun goToTiltValue(tiltValue: UShort, timedInvokeTimeoutMs: Int) { + // Implementation needs to be added here } - interface EventListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun goToTiltPercentage(tiltPercent100thsValue: UShort) { + // Implementation needs to be added here } - interface AttributeListAttributeCallback { - fun onSuccess(value: ArrayList) - - fun onError(ex: Exception) - - fun onSubscriptionEstablished(subscriptionId: Long) + suspend fun goToTiltPercentage(tiltPercent100thsValue: UShort, timedInvokeTimeoutMs: Int) { + // Implementation needs to be added here } - fun readTypeAttribute(callback: IntegerAttributeCallback) { + suspend fun readTypeAttribute(): Integer { // Implementation needs to be added here } - fun subscribeTypeAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeTypeAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readPhysicalClosedLimitLiftAttribute(callback: IntegerAttributeCallback) { + suspend fun readPhysicalClosedLimitLiftAttribute(): Integer { // Implementation needs to be added here } - fun subscribePhysicalClosedLimitLiftAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribePhysicalClosedLimitLiftAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readPhysicalClosedLimitTiltAttribute(callback: IntegerAttributeCallback) { + suspend fun readPhysicalClosedLimitTiltAttribute(): Integer { // Implementation needs to be added here } - fun subscribePhysicalClosedLimitTiltAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribePhysicalClosedLimitTiltAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readCurrentPositionLiftAttribute(callback: CurrentPositionLiftAttributeCallback) { + suspend fun readCurrentPositionLiftAttribute(): CurrentPositionLiftAttribute { // Implementation needs to be added here } - fun subscribeCurrentPositionLiftAttribute( - callback: CurrentPositionLiftAttributeCallback, + suspend fun subscribeCurrentPositionLiftAttribute( minInterval: Int, maxInterval: Int - ) { + ): CurrentPositionLiftAttribute { // Implementation needs to be added here } - fun readCurrentPositionTiltAttribute(callback: CurrentPositionTiltAttributeCallback) { + suspend fun readCurrentPositionTiltAttribute(): CurrentPositionTiltAttribute { // Implementation needs to be added here } - fun subscribeCurrentPositionTiltAttribute( - callback: CurrentPositionTiltAttributeCallback, + suspend fun subscribeCurrentPositionTiltAttribute( minInterval: Int, maxInterval: Int - ) { + ): CurrentPositionTiltAttribute { // Implementation needs to be added here } - fun readNumberOfActuationsLiftAttribute(callback: IntegerAttributeCallback) { + suspend fun readNumberOfActuationsLiftAttribute(): Integer { // Implementation needs to be added here } - fun subscribeNumberOfActuationsLiftAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeNumberOfActuationsLiftAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readNumberOfActuationsTiltAttribute(callback: IntegerAttributeCallback) { + suspend fun readNumberOfActuationsTiltAttribute(): Integer { // Implementation needs to be added here } - fun subscribeNumberOfActuationsTiltAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeNumberOfActuationsTiltAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readConfigStatusAttribute(callback: IntegerAttributeCallback) { + suspend fun readConfigStatusAttribute(): Integer { // Implementation needs to be added here } - fun subscribeConfigStatusAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeConfigStatusAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readCurrentPositionLiftPercentageAttribute( - callback: CurrentPositionLiftPercentageAttributeCallback - ) { + suspend fun readCurrentPositionLiftPercentageAttribute(): CurrentPositionLiftPercentageAttribute { // Implementation needs to be added here } - fun subscribeCurrentPositionLiftPercentageAttribute( - callback: CurrentPositionLiftPercentageAttributeCallback, + suspend fun subscribeCurrentPositionLiftPercentageAttribute( minInterval: Int, maxInterval: Int - ) { + ): CurrentPositionLiftPercentageAttribute { // Implementation needs to be added here } - fun readCurrentPositionTiltPercentageAttribute( - callback: CurrentPositionTiltPercentageAttributeCallback - ) { + suspend fun readCurrentPositionTiltPercentageAttribute(): CurrentPositionTiltPercentageAttribute { // Implementation needs to be added here } - fun subscribeCurrentPositionTiltPercentageAttribute( - callback: CurrentPositionTiltPercentageAttributeCallback, + suspend fun subscribeCurrentPositionTiltPercentageAttribute( minInterval: Int, maxInterval: Int - ) { + ): CurrentPositionTiltPercentageAttribute { // Implementation needs to be added here } - fun readOperationalStatusAttribute(callback: IntegerAttributeCallback) { + suspend fun readOperationalStatusAttribute(): Integer { // Implementation needs to be added here } - fun subscribeOperationalStatusAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeOperationalStatusAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readTargetPositionLiftPercent100thsAttribute( - callback: TargetPositionLiftPercent100thsAttributeCallback - ) { + suspend fun readTargetPositionLiftPercent100thsAttribute(): + TargetPositionLiftPercent100thsAttribute { // Implementation needs to be added here } - fun subscribeTargetPositionLiftPercent100thsAttribute( - callback: TargetPositionLiftPercent100thsAttributeCallback, + suspend fun subscribeTargetPositionLiftPercent100thsAttribute( minInterval: Int, maxInterval: Int - ) { + ): TargetPositionLiftPercent100thsAttribute { // Implementation needs to be added here } - fun readTargetPositionTiltPercent100thsAttribute( - callback: TargetPositionTiltPercent100thsAttributeCallback - ) { + suspend fun readTargetPositionTiltPercent100thsAttribute(): + TargetPositionTiltPercent100thsAttribute { // Implementation needs to be added here } - fun subscribeTargetPositionTiltPercent100thsAttribute( - callback: TargetPositionTiltPercent100thsAttributeCallback, + suspend fun subscribeTargetPositionTiltPercent100thsAttribute( minInterval: Int, maxInterval: Int - ) { + ): TargetPositionTiltPercent100thsAttribute { // Implementation needs to be added here } - fun readEndProductTypeAttribute(callback: IntegerAttributeCallback) { + suspend fun readEndProductTypeAttribute(): Integer { // Implementation needs to be added here } - fun subscribeEndProductTypeAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEndProductTypeAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readCurrentPositionLiftPercent100thsAttribute( - callback: CurrentPositionLiftPercent100thsAttributeCallback - ) { + suspend fun readCurrentPositionLiftPercent100thsAttribute(): + CurrentPositionLiftPercent100thsAttribute { // Implementation needs to be added here } - fun subscribeCurrentPositionLiftPercent100thsAttribute( - callback: CurrentPositionLiftPercent100thsAttributeCallback, + suspend fun subscribeCurrentPositionLiftPercent100thsAttribute( minInterval: Int, maxInterval: Int - ) { + ): CurrentPositionLiftPercent100thsAttribute { // Implementation needs to be added here } - fun readCurrentPositionTiltPercent100thsAttribute( - callback: CurrentPositionTiltPercent100thsAttributeCallback - ) { + suspend fun readCurrentPositionTiltPercent100thsAttribute(): + CurrentPositionTiltPercent100thsAttribute { // Implementation needs to be added here } - fun subscribeCurrentPositionTiltPercent100thsAttribute( - callback: CurrentPositionTiltPercent100thsAttributeCallback, + suspend fun subscribeCurrentPositionTiltPercent100thsAttribute( minInterval: Int, maxInterval: Int - ) { + ): CurrentPositionTiltPercent100thsAttribute { // Implementation needs to be added here } - fun readInstalledOpenLimitLiftAttribute(callback: IntegerAttributeCallback) { + suspend fun readInstalledOpenLimitLiftAttribute(): Integer { // Implementation needs to be added here } - fun subscribeInstalledOpenLimitLiftAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeInstalledOpenLimitLiftAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readInstalledClosedLimitLiftAttribute(callback: IntegerAttributeCallback) { + suspend fun readInstalledClosedLimitLiftAttribute(): Integer { // Implementation needs to be added here } - fun subscribeInstalledClosedLimitLiftAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeInstalledClosedLimitLiftAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readInstalledOpenLimitTiltAttribute(callback: IntegerAttributeCallback) { + suspend fun readInstalledOpenLimitTiltAttribute(): Integer { // Implementation needs to be added here } - fun subscribeInstalledOpenLimitTiltAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeInstalledOpenLimitTiltAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readInstalledClosedLimitTiltAttribute(callback: IntegerAttributeCallback) { + suspend fun readInstalledClosedLimitTiltAttribute(): Integer { // Implementation needs to be added here } - fun subscribeInstalledClosedLimitTiltAttribute( - callback: IntegerAttributeCallback, + suspend fun subscribeInstalledClosedLimitTiltAttribute( minInterval: Int, maxInterval: Int - ) { + ): Integer { // Implementation needs to be added here } - fun readModeAttribute(callback: IntegerAttributeCallback) { + suspend fun readModeAttribute(): Integer { // Implementation needs to be added here } - fun writeModeAttribute(callback: DefaultClusterCallback, value: Integer) { + suspend fun writeModeAttribute(value: UInt) { // Implementation needs to be added here } - fun writeModeAttribute( - callback: DefaultClusterCallback, - value: Integer, - timedWriteTimeoutMs: Int - ) { + suspend fun writeModeAttribute(value: UInt, timedWriteTimeoutMs: Int) { // Implementation needs to be added here } - fun subscribeModeAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeModeAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readSafetyStatusAttribute(callback: IntegerAttributeCallback) { + suspend fun readSafetyStatusAttribute(): Integer { // Implementation needs to be added here } - fun subscribeSafetyStatusAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeSafetyStatusAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } - fun readGeneratedCommandListAttribute(callback: GeneratedCommandListAttributeCallback) { + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun subscribeGeneratedCommandListAttribute( - callback: GeneratedCommandListAttributeCallback, + suspend fun subscribeGeneratedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): GeneratedCommandListAttribute { // Implementation needs to be added here } - fun readAcceptedCommandListAttribute(callback: AcceptedCommandListAttributeCallback) { + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun subscribeAcceptedCommandListAttribute( - callback: AcceptedCommandListAttributeCallback, + suspend fun subscribeAcceptedCommandListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AcceptedCommandListAttribute { // Implementation needs to be added here } - fun readEventListAttribute(callback: EventListAttributeCallback) { + suspend fun readEventListAttribute(): EventListAttribute { // Implementation needs to be added here } - fun subscribeEventListAttribute( - callback: EventListAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute { // Implementation needs to be added here } - fun readAttributeListAttribute(callback: AttributeListAttributeCallback) { + suspend fun readAttributeListAttribute(): AttributeListAttribute { // Implementation needs to be added here } - fun subscribeAttributeListAttribute( - callback: AttributeListAttributeCallback, + suspend fun subscribeAttributeListAttribute( minInterval: Int, maxInterval: Int - ) { + ): AttributeListAttribute { // Implementation needs to be added here } - fun readFeatureMapAttribute(callback: LongAttributeCallback) { + suspend fun readFeatureMapAttribute(): Long { // Implementation needs to be added here } - fun subscribeFeatureMapAttribute( - callback: LongAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { // Implementation needs to be added here } - fun readClusterRevisionAttribute(callback: IntegerAttributeCallback) { + suspend fun readClusterRevisionAttribute(): Integer { // Implementation needs to be added here } - fun subscribeClusterRevisionAttribute( - callback: IntegerAttributeCallback, - minInterval: Int, - maxInterval: Int - ) { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { // Implementation needs to be added here } + + companion object { + const val CLUSTER_ID: UInt = 258u + } } From a16d6e95a9185dd6053d8d6f297086f7b5c41ae2 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Mon, 30 Oct 2023 13:44:32 -0400 Subject: [PATCH 31/41] Update `Temperature Measurement Cluster` to spec (#30093) * Update data type * ZAP regen --- .../air-purifier-app.matter | 8 +++---- .../air-quality-sensor-app.matter | 6 ++--- .../all-clusters-app.matter | 8 +++---- .../all-clusters-minimal-app.matter | 6 ++--- .../bridge-common/bridge-app.matter | 6 ++--- ...umiditysensor_thermostat_56de3d5f45.matter | 6 ++--- ...ootnode_airqualitysensor_e63187f6c9.matter | 8 +++---- .../devices/rootnode_pump_5f904818cc.matter | 6 ++--- ...otnode_temperaturesensor_Qy1zkNW7c3.matter | 6 ++--- .../rootnode_thermostat_bm3fb8dhYi.matter | 8 +++---- .../placeholder/linux/apps/app1/config.matter | 16 +++++++------- .../placeholder/linux/apps/app2/config.matter | 16 +++++++------- examples/pump-app/pump-common/pump-app.matter | 8 +++---- .../silabs/data_model/pump-thread-app.matter | 8 +++---- .../silabs/data_model/pump-wifi-app.matter | 8 +++---- .../pump-controller-app.matter | 8 +++---- .../temperature-measurement.matter | 6 ++--- .../app-templates/endpoint_config.h | 15 ++++++++----- .../chip/temperature-measurement-cluster.xml | 8 +++---- .../data_model/controller-clusters.matter | 8 +++---- .../python/chip/clusters/Objects.py | 8 +++---- .../MTRAttributeTLVValueDecoder.mm | 2 +- .../zap-generated/attributes/Accessors.cpp | 22 +++++++++---------- .../zap-generated/attributes/Accessors.h | 10 ++++----- .../zap-generated/cluster-objects.h | 8 +++---- .../zap-generated/cluster/Commands.h | 4 ++-- .../cluster/logging/DataModelLogger.cpp | 2 +- .../zap-generated/test/Commands.h | 12 +++++----- 28 files changed, 120 insertions(+), 117 deletions(-) diff --git a/examples/air-purifier-app/air-purifier-common/air-purifier-app.matter b/examples/air-purifier-app/air-purifier-common/air-purifier-app.matter index d210cebb350c3a..1f912fcd64e643 100644 --- a/examples/air-purifier-app/air-purifier-common/air-purifier-app.matter +++ b/examples/air-purifier-app/air-purifier-common/air-purifier-app.matter @@ -1180,10 +1180,10 @@ provisional server cluster FanControl = 514 { /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */ server cluster TemperatureMeasurement = 1026 { - readonly attribute nullable int16s measuredValue = 0; - readonly attribute nullable int16s minMeasuredValue = 1; - readonly attribute nullable int16s maxMeasuredValue = 2; - readonly attribute int16u tolerance = 3; + readonly attribute nullable temperature measuredValue = 0; + readonly attribute nullable temperature minMeasuredValue = 1; + readonly attribute nullable temperature maxMeasuredValue = 2; + readonly attribute temperature tolerance = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; diff --git a/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter b/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter index fd0ebb160daf13..736803eaad9c70 100644 --- a/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter +++ b/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter @@ -1272,9 +1272,9 @@ server cluster AirQuality = 91 { /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */ server cluster TemperatureMeasurement = 1026 { - readonly attribute nullable int16s measuredValue = 0; - readonly attribute nullable int16s minMeasuredValue = 1; - readonly attribute nullable int16s maxMeasuredValue = 2; + readonly attribute nullable temperature measuredValue = 0; + readonly attribute nullable temperature minMeasuredValue = 1; + readonly attribute nullable temperature maxMeasuredValue = 2; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; 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 dba512b0bd986c..a27629bc4da66d 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 @@ -4117,10 +4117,10 @@ server cluster IlluminanceMeasurement = 1024 { /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */ server cluster TemperatureMeasurement = 1026 { - readonly attribute nullable int16s measuredValue = 0; - readonly attribute nullable int16s minMeasuredValue = 1; - readonly attribute nullable int16s maxMeasuredValue = 2; - readonly attribute int16u tolerance = 3; + readonly attribute nullable temperature measuredValue = 0; + readonly attribute nullable temperature minMeasuredValue = 1; + readonly attribute nullable temperature maxMeasuredValue = 2; + readonly attribute temperature tolerance = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; 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 9253007d08e616..5a4a521d090db2 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 @@ -3033,9 +3033,9 @@ server cluster IlluminanceMeasurement = 1024 { /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */ server cluster TemperatureMeasurement = 1026 { - readonly attribute nullable int16s measuredValue = 0; - readonly attribute nullable int16s minMeasuredValue = 1; - readonly attribute nullable int16s maxMeasuredValue = 2; + readonly attribute nullable temperature measuredValue = 0; + readonly attribute nullable temperature minMeasuredValue = 1; + readonly attribute nullable temperature maxMeasuredValue = 2; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter index 4b6e552b10cc92..63f5eb56aa9021 100644 --- a/examples/bridge-app/bridge-common/bridge-app.matter +++ b/examples/bridge-app/bridge-common/bridge-app.matter @@ -1617,9 +1617,9 @@ server cluster UserLabel = 65 { /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */ server cluster TemperatureMeasurement = 1026 { - readonly attribute nullable int16s measuredValue = 0; - readonly attribute nullable int16s minMeasuredValue = 1; - readonly attribute nullable int16s maxMeasuredValue = 2; + readonly attribute nullable temperature measuredValue = 0; + readonly attribute nullable temperature minMeasuredValue = 1; + readonly attribute nullable temperature maxMeasuredValue = 2; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; diff --git a/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter b/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter index 309178d53e154c..7e202205baad3c 100644 --- a/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter +++ b/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter @@ -1172,9 +1172,9 @@ provisional server cluster FanControl = 514 { /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */ server cluster TemperatureMeasurement = 1026 { - readonly attribute nullable int16s measuredValue = 0; - readonly attribute nullable int16s minMeasuredValue = 1; - readonly attribute nullable int16s maxMeasuredValue = 2; + readonly attribute nullable temperature measuredValue = 0; + readonly attribute nullable temperature minMeasuredValue = 1; + readonly attribute nullable temperature maxMeasuredValue = 2; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; diff --git a/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter b/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter index 38eda3781d4801..25c89264dc5cc4 100644 --- a/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter +++ b/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter @@ -1105,10 +1105,10 @@ server cluster AirQuality = 91 { /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */ server cluster TemperatureMeasurement = 1026 { - readonly attribute nullable int16s measuredValue = 0; - readonly attribute nullable int16s minMeasuredValue = 1; - readonly attribute nullable int16s maxMeasuredValue = 2; - readonly attribute int16u tolerance = 3; + readonly attribute nullable temperature measuredValue = 0; + readonly attribute nullable temperature minMeasuredValue = 1; + readonly attribute nullable temperature maxMeasuredValue = 2; + readonly attribute temperature tolerance = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; diff --git a/examples/chef/devices/rootnode_pump_5f904818cc.matter b/examples/chef/devices/rootnode_pump_5f904818cc.matter index dcccce26d70827..a5bd2bf03297bb 100644 --- a/examples/chef/devices/rootnode_pump_5f904818cc.matter +++ b/examples/chef/devices/rootnode_pump_5f904818cc.matter @@ -1010,9 +1010,9 @@ server cluster PumpConfigurationAndControl = 512 { /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */ server cluster TemperatureMeasurement = 1026 { - readonly attribute nullable int16s measuredValue = 0; - readonly attribute nullable int16s minMeasuredValue = 1; - readonly attribute nullable int16s maxMeasuredValue = 2; + readonly attribute nullable temperature measuredValue = 0; + readonly attribute nullable temperature minMeasuredValue = 1; + readonly attribute nullable temperature maxMeasuredValue = 2; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter index 7f88ae608aeabf..8eb9c77b6fc45e 100644 --- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter +++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter @@ -1171,9 +1171,9 @@ server cluster FixedLabel = 64 { /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */ server cluster TemperatureMeasurement = 1026 { - readonly attribute nullable int16s measuredValue = 0; - readonly attribute nullable int16s minMeasuredValue = 1; - readonly attribute nullable int16s maxMeasuredValue = 2; + readonly attribute nullable temperature measuredValue = 0; + readonly attribute nullable temperature minMeasuredValue = 1; + readonly attribute nullable temperature maxMeasuredValue = 2; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter index b34d514d77fd7a..73d5d7df7262a2 100644 --- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter +++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter @@ -1366,10 +1366,10 @@ server cluster ThermostatUserInterfaceConfiguration = 516 { /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */ client cluster TemperatureMeasurement = 1026 { - readonly attribute nullable int16s measuredValue = 0; - readonly attribute nullable int16s minMeasuredValue = 1; - readonly attribute nullable int16s maxMeasuredValue = 2; - readonly attribute optional int16u tolerance = 3; + readonly attribute nullable temperature measuredValue = 0; + readonly attribute nullable temperature minMeasuredValue = 1; + readonly attribute nullable temperature maxMeasuredValue = 2; + readonly attribute optional temperature tolerance = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index bf42f6c10610c6..1040513cc7c557 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -5170,10 +5170,10 @@ server cluster IlluminanceMeasurement = 1024 { /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */ client cluster TemperatureMeasurement = 1026 { - readonly attribute nullable int16s measuredValue = 0; - readonly attribute nullable int16s minMeasuredValue = 1; - readonly attribute nullable int16s maxMeasuredValue = 2; - readonly attribute optional int16u tolerance = 3; + readonly attribute nullable temperature measuredValue = 0; + readonly attribute nullable temperature minMeasuredValue = 1; + readonly attribute nullable temperature maxMeasuredValue = 2; + readonly attribute optional temperature tolerance = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; @@ -5184,10 +5184,10 @@ client cluster TemperatureMeasurement = 1026 { /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */ server cluster TemperatureMeasurement = 1026 { - readonly attribute nullable int16s measuredValue = 0; - readonly attribute nullable int16s minMeasuredValue = 1; - readonly attribute nullable int16s maxMeasuredValue = 2; - readonly attribute int16u tolerance = 3; + readonly attribute nullable temperature measuredValue = 0; + readonly attribute nullable temperature minMeasuredValue = 1; + readonly attribute nullable temperature maxMeasuredValue = 2; + readonly attribute temperature tolerance = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index ffb7febbab9470..a2662b804165b9 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -5129,10 +5129,10 @@ server cluster IlluminanceMeasurement = 1024 { /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */ client cluster TemperatureMeasurement = 1026 { - readonly attribute nullable int16s measuredValue = 0; - readonly attribute nullable int16s minMeasuredValue = 1; - readonly attribute nullable int16s maxMeasuredValue = 2; - readonly attribute optional int16u tolerance = 3; + readonly attribute nullable temperature measuredValue = 0; + readonly attribute nullable temperature minMeasuredValue = 1; + readonly attribute nullable temperature maxMeasuredValue = 2; + readonly attribute optional temperature tolerance = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; @@ -5143,10 +5143,10 @@ client cluster TemperatureMeasurement = 1026 { /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */ server cluster TemperatureMeasurement = 1026 { - readonly attribute nullable int16s measuredValue = 0; - readonly attribute nullable int16s minMeasuredValue = 1; - readonly attribute nullable int16s maxMeasuredValue = 2; - readonly attribute int16u tolerance = 3; + readonly attribute nullable temperature measuredValue = 0; + readonly attribute nullable temperature minMeasuredValue = 1; + readonly attribute nullable temperature maxMeasuredValue = 2; + readonly attribute temperature tolerance = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter index b73ddb2d490f40..97ece6ceda452c 100644 --- a/examples/pump-app/pump-common/pump-app.matter +++ b/examples/pump-app/pump-common/pump-app.matter @@ -1321,10 +1321,10 @@ server cluster PumpConfigurationAndControl = 512 { /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */ server cluster TemperatureMeasurement = 1026 { - readonly attribute nullable int16s measuredValue = 0; - readonly attribute nullable int16s minMeasuredValue = 1; - readonly attribute nullable int16s maxMeasuredValue = 2; - readonly attribute int16u tolerance = 3; + readonly attribute nullable temperature measuredValue = 0; + readonly attribute nullable temperature minMeasuredValue = 1; + readonly attribute nullable temperature maxMeasuredValue = 2; + readonly attribute temperature tolerance = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; diff --git a/examples/pump-app/silabs/data_model/pump-thread-app.matter b/examples/pump-app/silabs/data_model/pump-thread-app.matter index 1738d10a837777..8112f63eebb16f 100644 --- a/examples/pump-app/silabs/data_model/pump-thread-app.matter +++ b/examples/pump-app/silabs/data_model/pump-thread-app.matter @@ -1321,10 +1321,10 @@ server cluster PumpConfigurationAndControl = 512 { /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */ server cluster TemperatureMeasurement = 1026 { - readonly attribute nullable int16s measuredValue = 0; - readonly attribute nullable int16s minMeasuredValue = 1; - readonly attribute nullable int16s maxMeasuredValue = 2; - readonly attribute int16u tolerance = 3; + readonly attribute nullable temperature measuredValue = 0; + readonly attribute nullable temperature minMeasuredValue = 1; + readonly attribute nullable temperature maxMeasuredValue = 2; + readonly attribute temperature tolerance = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; diff --git a/examples/pump-app/silabs/data_model/pump-wifi-app.matter b/examples/pump-app/silabs/data_model/pump-wifi-app.matter index 1738d10a837777..8112f63eebb16f 100644 --- a/examples/pump-app/silabs/data_model/pump-wifi-app.matter +++ b/examples/pump-app/silabs/data_model/pump-wifi-app.matter @@ -1321,10 +1321,10 @@ server cluster PumpConfigurationAndControl = 512 { /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */ server cluster TemperatureMeasurement = 1026 { - readonly attribute nullable int16s measuredValue = 0; - readonly attribute nullable int16s minMeasuredValue = 1; - readonly attribute nullable int16s maxMeasuredValue = 2; - readonly attribute int16u tolerance = 3; + readonly attribute nullable temperature measuredValue = 0; + readonly attribute nullable temperature minMeasuredValue = 1; + readonly attribute nullable temperature maxMeasuredValue = 2; + readonly attribute temperature tolerance = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; 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 0f95bb9b2ac941..fd542a29b72f78 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 @@ -1246,10 +1246,10 @@ client cluster PumpConfigurationAndControl = 512 { /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */ client cluster TemperatureMeasurement = 1026 { - readonly attribute nullable int16s measuredValue = 0; - readonly attribute nullable int16s minMeasuredValue = 1; - readonly attribute nullable int16s maxMeasuredValue = 2; - readonly attribute optional int16u tolerance = 3; + readonly attribute nullable temperature measuredValue = 0; + readonly attribute nullable temperature minMeasuredValue = 1; + readonly attribute nullable temperature maxMeasuredValue = 2; + readonly attribute optional temperature tolerance = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; 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 d7d7e77f8c931a..187f8d14112801 100644 --- a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter +++ b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter @@ -1028,9 +1028,9 @@ server cluster UserLabel = 65 { /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */ server cluster TemperatureMeasurement = 1026 { - readonly attribute nullable int16s measuredValue = 0; - readonly attribute nullable int16s minMeasuredValue = 1; - readonly attribute nullable int16s maxMeasuredValue = 2; + readonly attribute nullable temperature measuredValue = 0; + readonly attribute nullable temperature minMeasuredValue = 1; + readonly attribute nullable temperature maxMeasuredValue = 2; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; diff --git a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h index 4679085f1570dd..16e6c92fe83576 100644 --- a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h +++ b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h @@ -1143,12 +1143,15 @@ { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Temperature Measurement (server) */ \ - { ZAP_SIMPLE_DEFAULT(0x8000), 0x00000000, 2, ZAP_TYPE(INT16S), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */ \ - { ZAP_SIMPLE_DEFAULT(0x8000), 0x00000001, 2, ZAP_TYPE(INT16S), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinMeasuredValue */ \ - { ZAP_SIMPLE_DEFAULT(0x8000), 0x00000002, 2, ZAP_TYPE(INT16S), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxMeasuredValue */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000003, 2, ZAP_TYPE(INT16U), 0 }, /* Tolerance */ \ - { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(4), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ + { ZAP_SIMPLE_DEFAULT(0x8000), 0x00000000, 2, ZAP_TYPE(TEMPERATURE), \ + ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */ \ + { ZAP_SIMPLE_DEFAULT(0x8000), 0x00000001, 2, ZAP_TYPE(TEMPERATURE), \ + ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinMeasuredValue */ \ + { ZAP_SIMPLE_DEFAULT(0x8000), 0x00000002, 2, ZAP_TYPE(TEMPERATURE), \ + ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxMeasuredValue */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000003, 2, ZAP_TYPE(TEMPERATURE), 0 }, /* Tolerance */ \ + { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ + { ZAP_SIMPLE_DEFAULT(4), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Pressure Measurement (server) */ \ { ZAP_SIMPLE_DEFAULT(0x0000), 0x00000000, 2, ZAP_TYPE(INT16S), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */ \ diff --git a/src/app/zap-templates/zcl/data-model/chip/temperature-measurement-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/temperature-measurement-cluster.xml index e24738ead95da0..aee79b86eea3c0 100644 --- a/src/app/zap-templates/zcl/data-model/chip/temperature-measurement-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/temperature-measurement-cluster.xml @@ -24,9 +24,9 @@ limitations under the License. TEMPERATURE_MEASUREMENT_CLUSTER true true - MeasuredValue - MinMeasuredValue - MaxMeasuredValue - Tolerance + MeasuredValue + MinMeasuredValue + MaxMeasuredValue + Tolerance diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 6e5b4327b8c240..d5b1691dc9eb9f 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -5132,10 +5132,10 @@ client cluster IlluminanceMeasurement = 1024 { /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */ client cluster TemperatureMeasurement = 1026 { - readonly attribute nullable int16s measuredValue = 0; - readonly attribute nullable int16s minMeasuredValue = 1; - readonly attribute nullable int16s maxMeasuredValue = 2; - readonly attribute optional int16u tolerance = 3; + readonly attribute nullable temperature measuredValue = 0; + readonly attribute nullable temperature minMeasuredValue = 1; + readonly attribute nullable temperature maxMeasuredValue = 2; + readonly attribute optional temperature tolerance = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 4c2040ab846a39..38c92ee15ed234 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -27573,7 +27573,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor(Label="measuredValue", Tag=0x00000000, Type=typing.Union[Nullable, int]), ClusterObjectFieldDescriptor(Label="minMeasuredValue", Tag=0x00000001, Type=typing.Union[Nullable, int]), ClusterObjectFieldDescriptor(Label="maxMeasuredValue", Tag=0x00000002, Type=typing.Union[Nullable, int]), - ClusterObjectFieldDescriptor(Label="tolerance", Tag=0x00000003, Type=typing.Optional[uint]), + ClusterObjectFieldDescriptor(Label="tolerance", Tag=0x00000003, Type=typing.Optional[int]), 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]), @@ -27585,7 +27585,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: measuredValue: 'typing.Union[Nullable, int]' = None minMeasuredValue: 'typing.Union[Nullable, int]' = None maxMeasuredValue: 'typing.Union[Nullable, int]' = None - tolerance: 'typing.Optional[uint]' = None + tolerance: 'typing.Optional[int]' = None generatedCommandList: 'typing.List[uint]' = None acceptedCommandList: 'typing.List[uint]' = None eventList: 'typing.List[uint]' = None @@ -27654,9 +27654,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.Optional[uint]) + return ClusterObjectFieldDescriptor(Type=typing.Optional[int]) - value: 'typing.Optional[uint]' = None + value: 'typing.Optional[int]' = None @dataclass class GeneratedCommandList(ClusterAttributeDescriptor): diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm index 0d2a197ad2cdda..4aaa93b2fc98c9 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm @@ -9952,7 +9952,7 @@ static id _Nullable DecodeAttributeValueForTemperatureMeasurementCluster(Attribu return nil; } NSNumber * _Nonnull value; - value = [NSNumber numberWithUnsignedShort:cppValue]; + value = [NSNumber numberWithShort:cppValue]; return value; } default: { 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 de97d22f4d964e..9563ed39d85707 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 @@ -17603,7 +17603,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, int16_t value) Traits::StorageType storageValue; Traits::WorkingToStorage(value, storageValue); uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); - return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE); + return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE); } EmberAfStatus SetNull(chip::EndpointId endpoint) @@ -17612,7 +17612,7 @@ EmberAfStatus SetNull(chip::EndpointId endpoint) Traits::StorageType value; Traits::SetNull(value); uint8_t * writable = Traits::ToAttributeStoreRepresentation(value); - return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE); + return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE); } EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable & value) @@ -17656,7 +17656,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, int16_t value) Traits::StorageType storageValue; Traits::WorkingToStorage(value, storageValue); uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); - return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE); + return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE); } EmberAfStatus SetNull(chip::EndpointId endpoint) @@ -17665,7 +17665,7 @@ EmberAfStatus SetNull(chip::EndpointId endpoint) Traits::StorageType value; Traits::SetNull(value); uint8_t * writable = Traits::ToAttributeStoreRepresentation(value); - return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE); + return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE); } EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable & value) @@ -17709,7 +17709,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, int16_t value) Traits::StorageType storageValue; Traits::WorkingToStorage(value, storageValue); uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); - return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE); + return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE); } EmberAfStatus SetNull(chip::EndpointId endpoint) @@ -17718,7 +17718,7 @@ EmberAfStatus SetNull(chip::EndpointId endpoint) Traits::StorageType value; Traits::SetNull(value); uint8_t * writable = Traits::ToAttributeStoreRepresentation(value); - return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE); + return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE); } EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable & value) @@ -17735,9 +17735,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullabl namespace Tolerance { -EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value) +EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value) { - using Traits = NumericAttributeTraits; + using Traits = NumericAttributeTraits; Traits::StorageType temp; uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, readable, sizeof(temp)); @@ -17749,9 +17749,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value) *value = Traits::StorageToWorking(temp); return status; } -EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) +EmberAfStatus Set(chip::EndpointId endpoint, int16_t value) { - using Traits = NumericAttributeTraits; + using Traits = NumericAttributeTraits; if (!Traits::CanRepresentValue(/* isNullable = */ false, value)) { return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; @@ -17759,7 +17759,7 @@ 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::TemperatureMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE); + return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE); } } // namespace Tolerance 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 4486856ee4a374..e993b63df4c0ea 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 @@ -3107,29 +3107,29 @@ namespace TemperatureMeasurement { namespace Attributes { namespace MeasuredValue { -EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable & value); // int16s +EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable & value); // temperature EmberAfStatus Set(chip::EndpointId endpoint, int16_t value); EmberAfStatus SetNull(chip::EndpointId endpoint); EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable & value); } // namespace MeasuredValue namespace MinMeasuredValue { -EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable & value); // int16s +EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable & value); // temperature EmberAfStatus Set(chip::EndpointId endpoint, int16_t value); EmberAfStatus SetNull(chip::EndpointId endpoint); EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable & value); } // namespace MinMeasuredValue namespace MaxMeasuredValue { -EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable & value); // int16s +EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable & value); // temperature EmberAfStatus Set(chip::EndpointId endpoint, int16_t value); EmberAfStatus SetNull(chip::EndpointId endpoint); EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable & value); } // namespace MaxMeasuredValue namespace Tolerance { -EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u -EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); +EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // temperature +EmberAfStatus Set(chip::EndpointId endpoint, int16_t value); } // namespace Tolerance namespace FeatureMap { 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 53ad0bc00adb44..ca8a7867870c28 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 @@ -24992,9 +24992,9 @@ struct TypeInfo namespace Tolerance { struct TypeInfo { - using Type = uint16_t; - using DecodableType = uint16_t; - using DecodableArgType = uint16_t; + using Type = int16_t; + using DecodableType = int16_t; + using DecodableArgType = int16_t; static constexpr ClusterId GetClusterId() { return Clusters::TemperatureMeasurement::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::Tolerance::Id; } @@ -25049,7 +25049,7 @@ struct TypeInfo Attributes::MeasuredValue::TypeInfo::DecodableType measuredValue; Attributes::MinMeasuredValue::TypeInfo::DecodableType minMeasuredValue; Attributes::MaxMeasuredValue::TypeInfo::DecodableType maxMeasuredValue; - Attributes::Tolerance::TypeInfo::DecodableType tolerance = static_cast(0); + Attributes::Tolerance::TypeInfo::DecodableType tolerance = static_cast(0); Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList; Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList; Attributes::EventList::TypeInfo::DecodableType eventList; diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index 0dfa96f5ed563d..f65b3063fba7bd 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -18036,8 +18036,8 @@ void registerClusterTemperatureMeasurement(Commands & commands, CredentialIssuer make_unique>>(Id, "max-measured-value", INT16_MIN, INT16_MAX, Attributes::MaxMeasuredValue::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // - make_unique>(Id, "tolerance", 0, UINT16_MAX, Attributes::Tolerance::Id, - WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "tolerance", INT16_MIN, INT16_MAX, Attributes::Tolerance::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique>>( Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp index 820f5680f25761..f26ae6d1c32025 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -10533,7 +10533,7 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP return DataModelLogger::LogValue("MaxMeasuredValue", 1, value); } case TemperatureMeasurement::Attributes::Tolerance::Id: { - uint16_t value; + int16_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("Tolerance", 1, value); } 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 5cce9bf5cd4a62..fe9d1ee034da7c 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h @@ -93594,7 +93594,7 @@ class Test_TC_TMP_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("minMeasuredValue", "int16s", "int16s")); + VerifyOrReturn(CheckConstraintType("minMeasuredValue", "temperature", "int16s")); VerifyOrReturn(CheckConstraintMinValue("minMeasuredValue", [value shortValue], -27315)); VerifyOrReturn(CheckConstraintMaxValue("minMeasuredValue", [value shortValue], 32766)); } @@ -93623,7 +93623,7 @@ class Test_TC_TMP_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("maxMeasuredValue", "int16s", "int16s")); + VerifyOrReturn(CheckConstraintType("maxMeasuredValue", "temperature", "int16s")); VerifyOrReturn(CheckConstraintMinValue("maxMeasuredValue", [value shortValue], CurrentMinMeasured)); VerifyOrReturn(CheckConstraintMaxValue("maxMeasuredValue", [value shortValue], 32767)); } @@ -93651,7 +93651,7 @@ class Test_TC_TMP_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("measuredValue", "int16s", "int16s")); + VerifyOrReturn(CheckConstraintType("measuredValue", "temperature", "int16s")); VerifyOrReturn(CheckConstraintMinValue("measuredValue", [value shortValue], CurrentMinMeasured)); VerifyOrReturn(CheckConstraintMaxValue("measuredValue", [value shortValue], CurrentMaxMeasured)); } @@ -93674,9 +93674,9 @@ class Test_TC_TMP_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("tolerance", "int16u", "int16u")); - VerifyOrReturn(CheckConstraintMinValue("tolerance", [value unsignedShortValue], 0U)); - VerifyOrReturn(CheckConstraintMaxValue("tolerance", [value unsignedShortValue], 2048U)); + VerifyOrReturn(CheckConstraintType("tolerance", "temperature", "int16u")); + VerifyOrReturn(CheckConstraintMinValue("tolerance", [value shortValue], 0)); + VerifyOrReturn(CheckConstraintMaxValue("tolerance", [value shortValue], 2048)); NextTest(); }]; From 4ec129c4fb6334dfae806794bfad4dfa3bb81b82 Mon Sep 17 00:00:00 2001 From: Wang Qixiang <43193572+wqx6@users.noreply.github.com> Date: Tue, 31 Oct 2023 04:15:22 +0800 Subject: [PATCH 32/41] esp32: make the shell command line buffer size configurable (#30050) --- config/esp32/components/chip/Kconfig | 16 ++++++++++++++++ src/lib/shell/streamer_esp32.cpp | 4 ++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/config/esp32/components/chip/Kconfig b/config/esp32/components/chip/Kconfig index 00bfed5df9b124..43a766b7dbf8dd 100644 --- a/config/esp32/components/chip/Kconfig +++ b/config/esp32/components/chip/Kconfig @@ -96,6 +96,22 @@ menu "CHIP Core" help Link the application against CHIP interactive shell. + config CHIP_SHELL_CMD_LINE_BUF_MAX_LENGTH + int "Maximum command line buffer length of the chip shell" + depends on ENABLE_CHIP_SHELL + default 256 + help + Maximum command line buffer length of the chip shell. The command strings might be received + incompletely in the command handlers if they are longer than this buffer length. + + config CHIP_SHELL_CMD_LINE_ARG_MAX_COUNT + int "Maximum command line arguments count of the chip shell" + depends on ENABLE_CHIP_SHELL + default 32 + help + Maximum command line arguments count of the chip shell. The command arguments might be ignored + if they are more than this count. + config ENABLE_CHIP_CONTROLLER_BUILD bool "Enable chip-controller build" default n diff --git a/src/lib/shell/streamer_esp32.cpp b/src/lib/shell/streamer_esp32.cpp index 5f71279a0cc0bc..c92170ec730812 100644 --- a/src/lib/shell/streamer_esp32.cpp +++ b/src/lib/shell/streamer_esp32.cpp @@ -95,8 +95,8 @@ int streamer_esp32_init(streamer_t * streamer) esp_vfs_dev_uart_register(); #endif // CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG esp_console_config_t console_config = { - .max_cmdline_length = 256, - .max_cmdline_args = 32, + .max_cmdline_length = CONFIG_CHIP_SHELL_CMD_LINE_BUF_MAX_LENGTH, + .max_cmdline_args = CONFIG_CHIP_SHELL_CMD_LINE_ARG_MAX_COUNT, }; ESP_ERROR_CHECK(esp_console_init(&console_config)); linenoiseSetMultiLine(1); From 1e7da37eab162444b41e481192ccba4d6b274155 Mon Sep 17 00:00:00 2001 From: Kamil Kasperczyk <66371704+kkasperczyk-no@users.noreply.github.com> Date: Mon, 30 Oct 2023 21:15:51 +0100 Subject: [PATCH 33/41] [nrfconnect] Updated nRF Connect SDK version in Docker to 2.5.0 (#30051) Regular update of nRF Connect SDK to 2.5.0 version including zephyr toolchain and west versions bump. --- integrations/docker/images/base/chip-build/version | 2 +- .../stage-2/chip-build-nrf-platform/Dockerfile | 12 ++++++------ .../images/vscode/chip-build-vscode/Dockerfile | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/integrations/docker/images/base/chip-build/version b/integrations/docker/images/base/chip-build/version index d9efef43fe6d6d..3bc07693a047b5 100644 --- a/integrations/docker/images/base/chip-build/version +++ b/integrations/docker/images/base/chip-build/version @@ -1 +1 @@ -23 : [TI] Update Sysconfig version +24 : [nrfconnect] Update nRF Connect SDK version. diff --git a/integrations/docker/images/stage-2/chip-build-nrf-platform/Dockerfile b/integrations/docker/images/stage-2/chip-build-nrf-platform/Dockerfile index b01028f4708310..86148668a86e0b 100644 --- a/integrations/docker/images/stage-2/chip-build-nrf-platform/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-nrf-platform/Dockerfile @@ -7,7 +7,7 @@ ARG VERSION=1 FROM ghcr.io/project-chip/chip-build:${VERSION} as build LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip # Compatible Nordic Connect SDK revision. -ARG NCS_REVISION=v2.4.0 +ARG NCS_REVISION=v2.5.0 SHELL ["/bin/bash", "-o", "pipefail", "-c"] WORKDIR /opt/NordicSemiconductor/nRF5_tools @@ -16,14 +16,14 @@ RUN set -x \ | tar zxvf - \ && tar xvf JLink_Linux_V780c_x86_64.tgz \ && rm JLink_Linux_V780c_x86_64.* \ - && curl --location https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.0/zephyr-sdk-0.16.0_linux-x86_64_minimal.tar.xz --output zephyr-sdk-0.16.0_linux-x86_64_minimal.tar.xz \ - && tar xvf zephyr-sdk-0.16.0_linux-x86_64_minimal.tar.xz \ - && zephyr-sdk-0.16.0/setup.sh -t arm-zephyr-eabi \ + && curl --location https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.1/zephyr-sdk-0.16.1_linux-x86_64_minimal.tar.xz --output zephyr-sdk-0.16.1_linux-x86_64_minimal.tar.xz \ + && tar xvf zephyr-sdk-0.16.1_linux-x86_64_minimal.tar.xz \ + && zephyr-sdk-0.16.1/setup.sh -t arm-zephyr-eabi \ && : # last line WORKDIR /opt/NordicSemiconductor/nrfconnect RUN set -x \ - && python3 -m pip install -U --no-cache-dir west==1.0.0 \ + && python3 -m pip install -U --no-cache-dir west==1.1.0 \ && west init -m https://github.com/nrfconnect/sdk-nrf --mr "$NCS_REVISION" \ && west config update.narrow true \ && west config update.fetch smart \ @@ -63,6 +63,6 @@ ENV LD_LIBRARY_PATH=${NRF5_TOOLS_ROOT}/JLink_Linux_V780c_x86_64:${LD_LIBRARY_PAT ENV LC_ALL=C.UTF-8 ENV LANG=C.UTF-8 ENV ZEPHYR_BASE=/opt/NordicSemiconductor/nrfconnect/zephyr -ENV ZEPHYR_SDK_INSTALL_DIR=${NRF5_TOOLS_ROOT}/zephyr-sdk-0.16.0 +ENV ZEPHYR_SDK_INSTALL_DIR=${NRF5_TOOLS_ROOT}/zephyr-sdk-0.16.1 ENV ZEPHYR_TOOLCHAIN_VARIANT=zephyr ENV ZEPHYR_TOOLCHAIN_PATH=${ZEPHYR_SDK_INSTALL_DIR}/arm-zephyr-eabi diff --git a/integrations/docker/images/vscode/chip-build-vscode/Dockerfile b/integrations/docker/images/vscode/chip-build-vscode/Dockerfile index fbe5986187ca6d..8ca2f980f0cf6f 100644 --- a/integrations/docker/images/vscode/chip-build-vscode/Dockerfile +++ b/integrations/docker/images/vscode/chip-build-vscode/Dockerfile @@ -122,7 +122,7 @@ ENV TELINK_ZEPHYR_BASE=/opt/telink/zephyrproject/zephyr ENV TELINK_ZEPHYR_SDK_DIR=/opt/telink/zephyr-sdk-0.16.1 ENV TI_SYSCONFIG_ROOT=/opt/ti/sysconfig_1.16.2 ENV ZEPHYR_BASE=/opt/NordicSemiconductor/nrfconnect/zephyr -ENV ZEPHYR_SDK_INSTALL_DIR=/opt/NordicSemiconductor/nRF5_tools/zephyr-sdk-0.16.0 +ENV ZEPHYR_SDK_INSTALL_DIR=/opt/NordicSemiconductor/nRF5_tools/zephyr-sdk-0.16.1 ENV ZEPHYR_TOOLCHAIN_VARIANT=gnuarmemb ENV TIZEN_VERSION 7.0 From 739f72a539388c65a3ff09fc4d556fb795bf6e00 Mon Sep 17 00:00:00 2001 From: Yufeng Wang Date: Mon, 30 Oct 2023 14:23:10 -0700 Subject: [PATCH 34/41] Make timedInvokeTimeoutMs optional (#30099) --- .../generators/kotlin/MatterClusters.jinja | 31 +- .../matter_idl/generators/kotlin/__init__.py | 22 +- .../cluster/clusters/AccessControlCluster.kt | 20 +- .../cluster/clusters/AccountLoginCluster.kt | 36 +- .../cluster/clusters/ActionsCluster.kt | 156 +++-- .../ActivatedCarbonFilterMonitoringCluster.kt | 32 +- .../AdministratorCommissioningCluster.kt | 36 +- .../cluster/clusters/AirQualityCluster.kt | 12 +- .../clusters/ApplicationBasicCluster.kt | 20 +- .../clusters/ApplicationLauncherCluster.kt | 51 +- .../cluster/clusters/AudioOutputCluster.kt | 36 +- .../clusters/BallastConfigurationCluster.kt | 36 +- .../cluster/clusters/BarrierControlCluster.kt | 72 +-- .../clusters/BasicInformationCluster.kt | 40 +- .../clusters/BinaryInputBasicCluster.kt | 24 +- .../cluster/clusters/BindingCluster.kt | 8 +- .../cluster/clusters/BooleanStateCluster.kt | 8 +- .../BridgedDeviceBasicInformationCluster.kt | 20 +- ...nDioxideConcentrationMeasurementCluster.kt | 28 +- ...MonoxideConcentrationMeasurementCluster.kt | 28 +- .../cluster/clusters/ChannelCluster.kt | 47 +- .../cluster/clusters/ColorControlCluster.kt | 496 +++++++--------- .../clusters/ContentLauncherCluster.kt | 44 +- .../cluster/clusters/DescriptorCluster.kt | 8 +- .../cluster/clusters/DiagnosticLogsCluster.kt | 24 +- .../clusters/DishwasherAlarmCluster.kt | 48 +- .../cluster/clusters/DishwasherModeCluster.kt | 27 +- .../cluster/clusters/DoorLockCluster.kt | 347 +++++------ .../clusters/ElectricalMeasurementCluster.kt | 557 +++++++++--------- .../EthernetNetworkDiagnosticsCluster.kt | 44 +- .../cluster/clusters/FanControlCluster.kt | 60 +- .../cluster/clusters/FaultInjectionCluster.kt | 38 +- .../cluster/clusters/FixedLabelCluster.kt | 8 +- .../clusters/FlowMeasurementCluster.kt | 12 +- ...aldehydeConcentrationMeasurementCluster.kt | 28 +- .../clusters/GeneralCommissioningCluster.kt | 62 +- .../clusters/GeneralDiagnosticsCluster.kt | 40 +- .../clusters/GroupKeyManagementCluster.kt | 81 +-- .../cluster/clusters/GroupsCluster.kt | 88 +-- .../clusters/HepaFilterMonitoringCluster.kt | 32 +- .../cluster/clusters/IcdManagementCluster.kt | 73 ++- .../cluster/clusters/IdentifyCluster.kt | 40 +- .../clusters/IlluminanceMeasurementCluster.kt | 12 +- .../cluster/clusters/KeypadInputCluster.kt | 20 +- .../clusters/LaundryWasherControlsCluster.kt | 12 +- .../clusters/LaundryWasherModeCluster.kt | 27 +- .../cluster/clusters/LevelControlCluster.kt | 175 +++--- .../LocalizationConfigurationCluster.kt | 8 +- .../cluster/clusters/LowPowerCluster.kt | 20 +- .../cluster/clusters/MediaInputCluster.kt | 60 +- .../cluster/clusters/MediaPlaybackCluster.kt | 144 ++--- .../cluster/clusters/ModeSelectCluster.kt | 24 +- .../clusters/NetworkCommissioningCluster.kt | 111 ++-- ...nDioxideConcentrationMeasurementCluster.kt | 28 +- .../clusters/OccupancySensingCluster.kt | 56 +- .../cluster/clusters/OnOffCluster.kt | 88 +-- .../OnOffSwitchConfigurationCluster.kt | 16 +- .../clusters/OperationalCredentialsCluster.kt | 125 ++-- .../clusters/OperationalStateCluster.kt | 60 +- .../OtaSoftwareUpdateProviderCluster.kt | 53 +- .../OtaSoftwareUpdateRequestorCluster.kt | 30 +- .../OzoneConcentrationMeasurementCluster.kt | 28 +- .../Pm10ConcentrationMeasurementCluster.kt | 28 +- .../Pm1ConcentrationMeasurementCluster.kt | 28 +- .../Pm25ConcentrationMeasurementCluster.kt | 28 +- .../cluster/clusters/PowerSourceCluster.kt | 56 +- .../PowerSourceConfigurationCluster.kt | 10 +- .../clusters/PressureMeasurementCluster.kt | 20 +- .../clusters/ProxyConfigurationCluster.kt | 8 +- .../cluster/clusters/ProxyDiscoveryCluster.kt | 8 +- .../cluster/clusters/ProxyValidCluster.kt | 8 +- .../clusters/PulseWidthModulationCluster.kt | 8 +- .../PumpConfigurationAndControlCluster.kt | 31 +- .../RadonConcentrationMeasurementCluster.kt | 28 +- .../clusters/RefrigeratorAlarmCluster.kt | 20 +- ...TemperatureControlledCabinetModeCluster.kt | 27 +- .../RelativeHumidityMeasurementCluster.kt | 12 +- .../cluster/clusters/RvcCleanModeCluster.kt | 27 +- .../clusters/RvcOperationalStateCluster.kt | 60 +- .../cluster/clusters/RvcRunModeCluster.kt | 27 +- .../cluster/clusters/SampleMeiCluster.kt | 32 +- .../cluster/clusters/ScenesCluster.kt | 173 +++--- .../cluster/clusters/SmokeCoAlarmCluster.kt | 67 +-- .../clusters/SoftwareDiagnosticsCluster.kt | 35 +- .../cluster/clusters/SwitchCluster.kt | 20 +- .../clusters/TargetNavigatorCluster.kt | 24 +- .../clusters/TemperatureControlCluster.kt | 40 +- .../clusters/TemperatureMeasurementCluster.kt | 12 +- .../cluster/clusters/ThermostatCluster.kt | 237 ++++---- ...mostatUserInterfaceConfigurationCluster.kt | 23 +- .../ThreadNetworkDiagnosticsCluster.kt | 195 +++--- .../clusters/TimeFormatLocalizationCluster.kt | 16 +- .../clusters/TimeSynchronizationCluster.kt | 94 ++- ...ompoundsConcentrationMeasurementCluster.kt | 28 +- .../clusters/UnitLocalizationCluster.kt | 12 +- .../cluster/clusters/UnitTestingCluster.kt | 414 ++++++------- .../cluster/clusters/UserLabelCluster.kt | 8 +- .../cluster/clusters/WakeOnLanCluster.kt | 8 +- .../clusters/WiFiNetworkDiagnosticsCluster.kt | 20 +- .../cluster/clusters/WindowCoveringCluster.kt | 166 +++--- 100 files changed, 2920 insertions(+), 3155 deletions(-) diff --git a/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterClusters.jinja b/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterClusters.jinja index 2562d5faf2245b..76fa2eb6b22967 100644 --- a/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterClusters.jinja +++ b/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterClusters.jinja @@ -93,40 +93,27 @@ class {{cluster.name}}Cluster(private val endpointId: UShort) { {%- endif -%} {% endfor -%} -{%- for command in cluster.commands | sort(attribute='code') -%} -{%- set callbackName = command | javaCommandCallbackName() -%} -{%- if not command.is_timed_invoke %} - suspend fun {{command.name | lowfirst_except_acronym}}( -{%- if command.input_param -%} -{%- for field in (cluster.structs | named(command.input_param)).fields -%} - {{field.name | lowfirst_except_acronym}}: {{encode_value(cluster, field | asEncodable(typeLookup), 0)}} -{%- if not loop.last -%}, {% endif %} -{%- endfor -%} -{%- endif -%} - ) -{%- if command | hasResponse -%} - : {{callbackName}} { -{%- else %} { -{%- endif %} - // Implementation needs to be added here - } -{%- endif %} - +{% for command in cluster.commands | sort(attribute='code') -%} +{%- set callbackName = command | javaCommandCallbackName() %} suspend fun {{command.name | lowfirst_except_acronym}}( {%- if command.input_param -%} {%- for field in (cluster.structs | named(command.input_param)).fields -%} {{field.name | lowfirst_except_acronym}}: {{encode_value(cluster, field | asEncodable(typeLookup), 0)}} {%- if not loop.last -%}, {% endif %} {%- endfor -%} - , timedInvokeTimeoutMs: Int) + , timedInvokeTimeoutMs: Int? = null) {%- else -%} - timedInvokeTimeoutMs: Int) + timedInvokeTimeoutMs: Int? = null) {%- endif -%} {%- if command | hasResponse -%} : {{callbackName}} { {%- else %} { {%- endif %} - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } {% endfor -%} diff --git a/scripts/py_matter_idl/matter_idl/generators/kotlin/__init__.py b/scripts/py_matter_idl/matter_idl/generators/kotlin/__init__.py index 0650d8c1b5e080..025a314685367e 100644 --- a/scripts/py_matter_idl/matter_idl/generators/kotlin/__init__.py +++ b/scripts/py_matter_idl/matter_idl/generators/kotlin/__init__.py @@ -132,13 +132,25 @@ def FieldToGlobalName(field: Field, context: TypeLookupContext) -> Optional[str] def GlobalNameToJavaName(name: str) -> str: - if name in {'Int8u', 'Int8s', 'Int16u', 'Int16s'}: - return 'Integer' - - if name.startswith('Int'): + if name == 'Int8s': + return 'Byte' + if name == 'Int8u': + return 'UByte' + if name == 'Int16s': + return 'Short' + if name == 'Int16u': + return 'UShort' + + if name == 'Int32s': + return 'Int' + if name == 'Int32u': + return 'UInt' + if name == 'Int64s': return 'Long' + if name == 'Int64u': + return 'ULong' - # Double/Float/Booleans/CharString/OctetString + # Double/Float/Boolean/CharString/OctetString return name diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AccessControlCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AccessControlCluster.kt index bb31661959c92c..2fbee5e99184f9 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AccessControlCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AccessControlCluster.kt @@ -88,36 +88,36 @@ class AccessControlCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readSubjectsPerAccessControlEntryAttribute(): Integer { + suspend fun readSubjectsPerAccessControlEntryAttribute(): UShort { // Implementation needs to be added here } suspend fun subscribeSubjectsPerAccessControlEntryAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UShort { // Implementation needs to be added here } - suspend fun readTargetsPerAccessControlEntryAttribute(): Integer { + suspend fun readTargetsPerAccessControlEntryAttribute(): UShort { // Implementation needs to be added here } suspend fun subscribeTargetsPerAccessControlEntryAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UShort { // Implementation needs to be added here } - suspend fun readAccessControlEntriesPerFabricAttribute(): Integer { + suspend fun readAccessControlEntriesPerFabricAttribute(): UShort { // Implementation needs to be added here } suspend fun subscribeAccessControlEntriesPerFabricAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UShort { // Implementation needs to be added here } @@ -162,19 +162,19 @@ class AccessControlCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AccountLoginCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AccountLoginCluster.kt index 5c7ee571556c36..f3021af650c22d 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AccountLoginCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AccountLoginCluster.kt @@ -32,17 +32,33 @@ class AccountLoginCluster(private val endpointId: UShort) { suspend fun getSetupPIN( tempAccountIdentifier: String, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): GetSetupPINResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun login(tempAccountIdentifier: String, setupPIN: String, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here + suspend fun login( + tempAccountIdentifier: String, + setupPIN: String, + timedInvokeTimeoutMs: Int? = null + ) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun logout(timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here + suspend fun logout(timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { @@ -86,19 +102,19 @@ class AccountLoginCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ActionsCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ActionsCluster.kt index 112a217dfa2bba..1b7e91e08d78d0 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ActionsCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ActionsCluster.kt @@ -32,129 +32,125 @@ class ActionsCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun instantAction(actionID: UShort, invokeID: UInt?) { - // Implementation needs to be added here - } - - suspend fun instantAction(actionID: UShort, invokeID: UInt?, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } - - suspend fun instantActionWithTransition( - actionID: UShort, - invokeID: UInt?, - transitionTime: UShort - ) { - // Implementation needs to be added here + suspend fun instantAction(actionID: UShort, invokeID: UInt?, timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun instantActionWithTransition( actionID: UShort, invokeID: UInt?, transitionTime: UShort, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here - } - - suspend fun startAction(actionID: UShort, invokeID: UInt?) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun startAction(actionID: UShort, invokeID: UInt?, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } - - suspend fun startActionWithDuration(actionID: UShort, invokeID: UInt?, duration: UInt) { - // Implementation needs to be added here + suspend fun startAction(actionID: UShort, invokeID: UInt?, timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun startActionWithDuration( actionID: UShort, invokeID: UInt?, duration: UInt, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here - } - - suspend fun stopAction(actionID: UShort, invokeID: UInt?) { - // Implementation needs to be added here - } - - suspend fun stopAction(actionID: UShort, invokeID: UInt?, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun pauseAction(actionID: UShort, invokeID: UInt?) { - // Implementation needs to be added here + suspend fun stopAction(actionID: UShort, invokeID: UInt?, timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun pauseAction(actionID: UShort, invokeID: UInt?, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } - - suspend fun pauseActionWithDuration(actionID: UShort, invokeID: UInt?, duration: UInt) { - // Implementation needs to be added here + suspend fun pauseAction(actionID: UShort, invokeID: UInt?, timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun pauseActionWithDuration( actionID: UShort, invokeID: UInt?, duration: UInt, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here - } - - suspend fun resumeAction(actionID: UShort, invokeID: UInt?) { - // Implementation needs to be added here - } - - suspend fun resumeAction(actionID: UShort, invokeID: UInt?, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } - - suspend fun enableAction(actionID: UShort, invokeID: UInt?) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun enableAction(actionID: UShort, invokeID: UInt?, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here + suspend fun resumeAction(actionID: UShort, invokeID: UInt?, timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun enableActionWithDuration(actionID: UShort, invokeID: UInt?, duration: UInt) { - // Implementation needs to be added here + suspend fun enableAction(actionID: UShort, invokeID: UInt?, timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun enableActionWithDuration( actionID: UShort, invokeID: UInt?, duration: UInt, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun disableAction(actionID: UShort, invokeID: UInt?) { - // Implementation needs to be added here - } - - suspend fun disableAction(actionID: UShort, invokeID: UInt?, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } - - suspend fun disableActionWithDuration(actionID: UShort, invokeID: UInt?, duration: UInt) { - // Implementation needs to be added here + suspend fun disableAction(actionID: UShort, invokeID: UInt?, timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun disableActionWithDuration( actionID: UShort, invokeID: UInt?, duration: UInt, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun readActionListAttribute(): ActionListAttribute { @@ -228,19 +224,19 @@ class ActionsCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ActivatedCarbonFilterMonitoringCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ActivatedCarbonFilterMonitoringCluster.kt index 9f093fa13923f5..1133dea37122ec 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ActivatedCarbonFilterMonitoringCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ActivatedCarbonFilterMonitoringCluster.kt @@ -35,35 +35,35 @@ class ActivatedCarbonFilterMonitoringCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun resetCondition() { - // Implementation needs to be added here - } - - suspend fun resetCondition(timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here + suspend fun resetCondition(timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun readConditionAttribute(): Integer { + suspend fun readConditionAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeConditionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeConditionAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readDegradationDirectionAttribute(): Integer { + suspend fun readDegradationDirectionAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeDegradationDirectionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeDegradationDirectionAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readChangeIndicationAttribute(): Integer { + suspend fun readChangeIndicationAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeChangeIndicationAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeChangeIndicationAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -146,19 +146,19 @@ class ActivatedCarbonFilterMonitoringCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AdministratorCommissioningCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AdministratorCommissioningCluster.kt index bd60ac30b9f4e1..359feb433b7194 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AdministratorCommissioningCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AdministratorCommissioningCluster.kt @@ -38,27 +38,39 @@ class AdministratorCommissioningCluster(private val endpointId: UShort) { discriminator: UShort, iterations: UInt, salt: ByteArray, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun openBasicCommissioningWindow( commissioningTimeout: UShort, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun revokeCommissioning(timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here + suspend fun revokeCommissioning(timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun readWindowStatusAttribute(): Integer { + suspend fun readWindowStatusAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeWindowStatusAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeWindowStatusAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -125,19 +137,19 @@ class AdministratorCommissioningCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AirQualityCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AirQualityCluster.kt index 4a88ec4d147938..ed191ea82883eb 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AirQualityCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AirQualityCluster.kt @@ -28,11 +28,11 @@ class AirQualityCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun readAirQualityAttribute(): Integer { + suspend fun readAirQualityAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeAirQualityAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeAirQualityAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -77,19 +77,19 @@ class AirQualityCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ApplicationBasicCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ApplicationBasicCluster.kt index d02e2dacd7dd53..aba8f4afbe36ef 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ApplicationBasicCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ApplicationBasicCluster.kt @@ -40,11 +40,11 @@ class ApplicationBasicCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readVendorIDAttribute(): Integer { + suspend fun readVendorIDAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeVendorIDAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeVendorIDAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } @@ -56,11 +56,11 @@ class ApplicationBasicCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readProductIDAttribute(): Integer { + suspend fun readProductIDAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeProductIDAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeProductIDAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } @@ -75,11 +75,11 @@ class ApplicationBasicCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readStatusAttribute(): Integer { + suspend fun readStatusAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeStatusAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeStatusAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -143,19 +143,19 @@ class ApplicationBasicCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ApplicationLauncherCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ApplicationLauncherCluster.kt index 8da3f1866530fc..2dfd1f16ee3986 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ApplicationLauncherCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ApplicationLauncherCluster.kt @@ -34,45 +34,38 @@ class ApplicationLauncherCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun launchApp( - application: ChipStructs.ApplicationLauncherClusterApplicationStruct?, - data: ByteArray? - ): LauncherResponse { - // Implementation needs to be added here - } - suspend fun launchApp( application: ChipStructs.ApplicationLauncherClusterApplicationStruct?, data: ByteArray?, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): LauncherResponse { - // Implementation needs to be added here - } - - suspend fun stopApp( - application: ChipStructs.ApplicationLauncherClusterApplicationStruct? - ): LauncherResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun stopApp( application: ChipStructs.ApplicationLauncherClusterApplicationStruct?, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): LauncherResponse { - // Implementation needs to be added here - } - - suspend fun hideApp( - application: ChipStructs.ApplicationLauncherClusterApplicationStruct? - ): LauncherResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun hideApp( application: ChipStructs.ApplicationLauncherClusterApplicationStruct?, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): LauncherResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun readCatalogListAttribute(): CatalogListAttribute { @@ -151,19 +144,19 @@ class ApplicationLauncherCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AudioOutputCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AudioOutputCluster.kt index 901b65d253a1e2..02f8838eccb061 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AudioOutputCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AudioOutputCluster.kt @@ -30,20 +30,20 @@ class AudioOutputCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun selectOutput(index: UByte) { - // Implementation needs to be added here - } - - suspend fun selectOutput(index: UByte, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here + suspend fun selectOutput(index: UByte, timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun renameOutput(index: UByte, name: String) { - // Implementation needs to be added here - } - - suspend fun renameOutput(index: UByte, name: String, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here + suspend fun renameOutput(index: UByte, name: String, timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun readOutputListAttribute(): OutputListAttribute { @@ -57,11 +57,11 @@ class AudioOutputCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readCurrentOutputAttribute(): Integer { + suspend fun readCurrentOutputAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeCurrentOutputAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeCurrentOutputAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -106,19 +106,19 @@ class AudioOutputCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BallastConfigurationCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BallastConfigurationCluster.kt index f931c4c1be0ead..6acc691b935284 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BallastConfigurationCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BallastConfigurationCluster.kt @@ -38,31 +38,31 @@ class BallastConfigurationCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun readPhysicalMinLevelAttribute(): Integer { + suspend fun readPhysicalMinLevelAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribePhysicalMinLevelAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribePhysicalMinLevelAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readPhysicalMaxLevelAttribute(): Integer { + suspend fun readPhysicalMaxLevelAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribePhysicalMaxLevelAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribePhysicalMaxLevelAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readBallastStatusAttribute(): Integer { + suspend fun readBallastStatusAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeBallastStatusAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeBallastStatusAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readMinLevelAttribute(): Integer { + suspend fun readMinLevelAttribute(): UByte { // Implementation needs to be added here } @@ -74,11 +74,11 @@ class BallastConfigurationCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeMinLevelAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeMinLevelAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readMaxLevelAttribute(): Integer { + suspend fun readMaxLevelAttribute(): UByte { // Implementation needs to be added here } @@ -90,7 +90,7 @@ class BallastConfigurationCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeMaxLevelAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeMaxLevelAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -132,11 +132,11 @@ class BallastConfigurationCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readLampQuantityAttribute(): Integer { + suspend fun readLampQuantityAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeLampQuantityAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeLampQuantityAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -210,7 +210,7 @@ class BallastConfigurationCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readLampAlarmModeAttribute(): Integer { + suspend fun readLampAlarmModeAttribute(): UByte { // Implementation needs to be added here } @@ -222,7 +222,7 @@ class BallastConfigurationCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeLampAlarmModeAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeLampAlarmModeAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -286,19 +286,19 @@ class BallastConfigurationCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BarrierControlCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BarrierControlCluster.kt index 505fd47478f65a..0c963de7d252df 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BarrierControlCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BarrierControlCluster.kt @@ -28,47 +28,47 @@ class BarrierControlCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun barrierControlGoToPercent(percentOpen: UByte) { - // Implementation needs to be added here - } - - suspend fun barrierControlGoToPercent(percentOpen: UByte, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here + suspend fun barrierControlGoToPercent(percentOpen: UByte, timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun barrierControlStop() { - // Implementation needs to be added here - } - - suspend fun barrierControlStop(timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here + suspend fun barrierControlStop(timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun readBarrierMovingStateAttribute(): Integer { + suspend fun readBarrierMovingStateAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeBarrierMovingStateAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeBarrierMovingStateAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readBarrierSafetyStatusAttribute(): Integer { + suspend fun readBarrierSafetyStatusAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeBarrierSafetyStatusAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeBarrierSafetyStatusAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readBarrierCapabilitiesAttribute(): Integer { + suspend fun readBarrierCapabilitiesAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeBarrierCapabilitiesAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeBarrierCapabilitiesAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readBarrierOpenEventsAttribute(): Integer { + suspend fun readBarrierOpenEventsAttribute(): UShort { // Implementation needs to be added here } @@ -80,11 +80,11 @@ class BarrierControlCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeBarrierOpenEventsAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeBarrierOpenEventsAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readBarrierCloseEventsAttribute(): Integer { + suspend fun readBarrierCloseEventsAttribute(): UShort { // Implementation needs to be added here } @@ -96,11 +96,11 @@ class BarrierControlCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeBarrierCloseEventsAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeBarrierCloseEventsAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readBarrierCommandOpenEventsAttribute(): Integer { + suspend fun readBarrierCommandOpenEventsAttribute(): UShort { // Implementation needs to be added here } @@ -115,11 +115,11 @@ class BarrierControlCluster(private val endpointId: UShort) { suspend fun subscribeBarrierCommandOpenEventsAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UShort { // Implementation needs to be added here } - suspend fun readBarrierCommandCloseEventsAttribute(): Integer { + suspend fun readBarrierCommandCloseEventsAttribute(): UShort { // Implementation needs to be added here } @@ -134,11 +134,11 @@ class BarrierControlCluster(private val endpointId: UShort) { suspend fun subscribeBarrierCommandCloseEventsAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UShort { // Implementation needs to be added here } - suspend fun readBarrierOpenPeriodAttribute(): Integer { + suspend fun readBarrierOpenPeriodAttribute(): UShort { // Implementation needs to be added here } @@ -150,11 +150,11 @@ class BarrierControlCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeBarrierOpenPeriodAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeBarrierOpenPeriodAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readBarrierClosePeriodAttribute(): Integer { + suspend fun readBarrierClosePeriodAttribute(): UShort { // Implementation needs to be added here } @@ -166,15 +166,15 @@ class BarrierControlCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeBarrierClosePeriodAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeBarrierClosePeriodAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readBarrierPositionAttribute(): Integer { + suspend fun readBarrierPositionAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeBarrierPositionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeBarrierPositionAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -219,19 +219,19 @@ class BarrierControlCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BasicInformationCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BasicInformationCluster.kt index 69dbbdbe4fa6eb..bef0dafdb25437 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BasicInformationCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BasicInformationCluster.kt @@ -36,19 +36,19 @@ class BasicInformationCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun mfgSpecificPing() { - // Implementation needs to be added here - } - - suspend fun mfgSpecificPing(timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here + suspend fun mfgSpecificPing(timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun readDataModelRevisionAttribute(): Integer { + suspend fun readDataModelRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeDataModelRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeDataModelRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } @@ -60,11 +60,11 @@ class BasicInformationCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readVendorIDAttribute(): Integer { + suspend fun readVendorIDAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeVendorIDAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeVendorIDAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } @@ -76,11 +76,11 @@ class BasicInformationCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readProductIDAttribute(): Integer { + suspend fun readProductIDAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeProductIDAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeProductIDAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } @@ -116,11 +116,11 @@ class BasicInformationCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readHardwareVersionAttribute(): Integer { + suspend fun readHardwareVersionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeHardwareVersionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeHardwareVersionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } @@ -135,11 +135,11 @@ class BasicInformationCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readSoftwareVersionAttribute(): Long { + suspend fun readSoftwareVersionAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeSoftwareVersionAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeSoftwareVersionAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } @@ -289,19 +289,19 @@ class BasicInformationCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BinaryInputBasicCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BinaryInputBasicCluster.kt index 7fee672d5abae9..65c305c956aa18 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BinaryInputBasicCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BinaryInputBasicCluster.kt @@ -92,11 +92,11 @@ class BinaryInputBasicCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readPolarityAttribute(): Integer { + suspend fun readPolarityAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribePolarityAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribePolarityAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -116,7 +116,7 @@ class BinaryInputBasicCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readReliabilityAttribute(): Integer { + suspend fun readReliabilityAttribute(): UByte { // Implementation needs to be added here } @@ -128,23 +128,23 @@ class BinaryInputBasicCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeReliabilityAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeReliabilityAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readStatusFlagsAttribute(): Integer { + suspend fun readStatusFlagsAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeStatusFlagsAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeStatusFlagsAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readApplicationTypeAttribute(): Long { + suspend fun readApplicationTypeAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeApplicationTypeAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeApplicationTypeAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } @@ -189,19 +189,19 @@ class BinaryInputBasicCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BindingCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BindingCluster.kt index edc98cfe3ecb9b..10a9bcb5c9f910 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BindingCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BindingCluster.kt @@ -94,19 +94,19 @@ class BindingCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BooleanStateCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BooleanStateCluster.kt index 2ba45f0b6a5dca..4d3d86e005cbbb 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BooleanStateCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BooleanStateCluster.kt @@ -77,19 +77,19 @@ class BooleanStateCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BridgedDeviceBasicInformationCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BridgedDeviceBasicInformationCluster.kt index 3c825cc8387b62..f8f0764762fdfc 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BridgedDeviceBasicInformationCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BridgedDeviceBasicInformationCluster.kt @@ -40,11 +40,11 @@ class BridgedDeviceBasicInformationCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readVendorIDAttribute(): Integer { + suspend fun readVendorIDAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeVendorIDAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeVendorIDAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } @@ -72,11 +72,11 @@ class BridgedDeviceBasicInformationCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readHardwareVersionAttribute(): Integer { + suspend fun readHardwareVersionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeHardwareVersionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeHardwareVersionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } @@ -91,11 +91,11 @@ class BridgedDeviceBasicInformationCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readSoftwareVersionAttribute(): Long { + suspend fun readSoftwareVersionAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeSoftwareVersionAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeSoftwareVersionAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } @@ -218,19 +218,19 @@ class BridgedDeviceBasicInformationCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/CarbonDioxideConcentrationMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/CarbonDioxideConcentrationMeasurementCluster.kt index 4ec67d9b9cb9fe..ced39ab41618ee 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/CarbonDioxideConcentrationMeasurementCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/CarbonDioxideConcentrationMeasurementCluster.kt @@ -82,11 +82,11 @@ class CarbonDioxideConcentrationMeasurementCluster(private val endpointId: UShor // Implementation needs to be added here } - suspend fun readPeakMeasuredValueWindowAttribute(): Long { + suspend fun readPeakMeasuredValueWindowAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribePeakMeasuredValueWindowAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribePeakMeasuredValueWindowAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } @@ -101,14 +101,14 @@ class CarbonDioxideConcentrationMeasurementCluster(private val endpointId: UShor // Implementation needs to be added here } - suspend fun readAverageMeasuredValueWindowAttribute(): Long { + suspend fun readAverageMeasuredValueWindowAttribute(): UInt { // Implementation needs to be added here } suspend fun subscribeAverageMeasuredValueWindowAttribute( minInterval: Int, maxInterval: Int - ): Long { + ): UInt { // Implementation needs to be added here } @@ -120,27 +120,27 @@ class CarbonDioxideConcentrationMeasurementCluster(private val endpointId: UShor // Implementation needs to be added here } - suspend fun readMeasurementUnitAttribute(): Integer { + suspend fun readMeasurementUnitAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeMeasurementUnitAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeMeasurementUnitAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readMeasurementMediumAttribute(): Integer { + suspend fun readMeasurementMediumAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeMeasurementMediumAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeMeasurementMediumAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readLevelValueAttribute(): Integer { + suspend fun readLevelValueAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeLevelValueAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeLevelValueAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -185,19 +185,19 @@ class CarbonDioxideConcentrationMeasurementCluster(private val endpointId: UShor // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/CarbonMonoxideConcentrationMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/CarbonMonoxideConcentrationMeasurementCluster.kt index 30c75be5175ecb..f7e0ca1937eeb0 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/CarbonMonoxideConcentrationMeasurementCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/CarbonMonoxideConcentrationMeasurementCluster.kt @@ -82,11 +82,11 @@ class CarbonMonoxideConcentrationMeasurementCluster(private val endpointId: USho // Implementation needs to be added here } - suspend fun readPeakMeasuredValueWindowAttribute(): Long { + suspend fun readPeakMeasuredValueWindowAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribePeakMeasuredValueWindowAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribePeakMeasuredValueWindowAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } @@ -101,14 +101,14 @@ class CarbonMonoxideConcentrationMeasurementCluster(private val endpointId: USho // Implementation needs to be added here } - suspend fun readAverageMeasuredValueWindowAttribute(): Long { + suspend fun readAverageMeasuredValueWindowAttribute(): UInt { // Implementation needs to be added here } suspend fun subscribeAverageMeasuredValueWindowAttribute( minInterval: Int, maxInterval: Int - ): Long { + ): UInt { // Implementation needs to be added here } @@ -120,27 +120,27 @@ class CarbonMonoxideConcentrationMeasurementCluster(private val endpointId: USho // Implementation needs to be added here } - suspend fun readMeasurementUnitAttribute(): Integer { + suspend fun readMeasurementUnitAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeMeasurementUnitAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeMeasurementUnitAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readMeasurementMediumAttribute(): Integer { + suspend fun readMeasurementMediumAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeMeasurementMediumAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeMeasurementMediumAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readLevelValueAttribute(): Integer { + suspend fun readLevelValueAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeLevelValueAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeLevelValueAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -185,19 +185,19 @@ class CarbonMonoxideConcentrationMeasurementCluster(private val endpointId: USho // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ChannelCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ChannelCluster.kt index dc9db0efb936a4..92cb96d50a1e1e 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ChannelCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ChannelCluster.kt @@ -36,32 +36,35 @@ class ChannelCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun changeChannel(match: String): ChangeChannelResponse { - // Implementation needs to be added here - } - - suspend fun changeChannel(match: String, timedInvokeTimeoutMs: Int): ChangeChannelResponse { - // Implementation needs to be added here - } - - suspend fun changeChannelByNumber(majorNumber: UShort, minorNumber: UShort) { - // Implementation needs to be added here + suspend fun changeChannel( + match: String, + timedInvokeTimeoutMs: Int? = null + ): ChangeChannelResponse { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun changeChannelByNumber( majorNumber: UShort, minorNumber: UShort, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here - } - - suspend fun skipChannel(count: Short) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun skipChannel(count: Short, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here + suspend fun skipChannel(count: Short, timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun readChannelListAttribute(): ChannelListAttribute { @@ -135,19 +138,19 @@ class ChannelCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ColorControlCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ColorControlCluster.kt index 4312bfe45a4f5c..0529929d21ee5b 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ColorControlCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ColorControlCluster.kt @@ -50,29 +50,19 @@ class ColorControlCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun moveToHue( - hue: UByte, - direction: UInt, - transitionTime: UShort, - optionsMask: UInt, - optionsOverride: UInt - ) { - // Implementation needs to be added here - } - suspend fun moveToHue( hue: UByte, direction: UInt, transitionTime: UShort, optionsMask: UInt, optionsOverride: UInt, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here - } - - suspend fun moveHue(moveMode: UInt, rate: UByte, optionsMask: UInt, optionsOverride: UInt) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun moveHue( @@ -80,19 +70,13 @@ class ColorControlCluster(private val endpointId: UShort) { rate: UByte, optionsMask: UInt, optionsOverride: UInt, - timedInvokeTimeoutMs: Int - ) { - // Implementation needs to be added here - } - - suspend fun stepHue( - stepMode: UInt, - stepSize: UByte, - transitionTime: UByte, - optionsMask: UInt, - optionsOverride: UInt + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun stepHue( @@ -101,18 +85,13 @@ class ColorControlCluster(private val endpointId: UShort) { transitionTime: UByte, optionsMask: UInt, optionsOverride: UInt, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here - } - - suspend fun moveToSaturation( - saturation: UByte, - transitionTime: UShort, - optionsMask: UInt, - optionsOverride: UInt - ) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun moveToSaturation( @@ -120,18 +99,13 @@ class ColorControlCluster(private val endpointId: UShort) { transitionTime: UShort, optionsMask: UInt, optionsOverride: UInt, - timedInvokeTimeoutMs: Int - ) { - // Implementation needs to be added here - } - - suspend fun moveSaturation( - moveMode: UInt, - rate: UByte, - optionsMask: UInt, - optionsOverride: UInt + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun moveSaturation( @@ -139,19 +113,13 @@ class ColorControlCluster(private val endpointId: UShort) { rate: UByte, optionsMask: UInt, optionsOverride: UInt, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here - } - - suspend fun stepSaturation( - stepMode: UInt, - stepSize: UByte, - transitionTime: UByte, - optionsMask: UInt, - optionsOverride: UInt - ) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun stepSaturation( @@ -160,19 +128,13 @@ class ColorControlCluster(private val endpointId: UShort) { transitionTime: UByte, optionsMask: UInt, optionsOverride: UInt, - timedInvokeTimeoutMs: Int - ) { - // Implementation needs to be added here - } - - suspend fun moveToHueAndSaturation( - hue: UByte, - saturation: UByte, - transitionTime: UShort, - optionsMask: UInt, - optionsOverride: UInt + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun moveToHueAndSaturation( @@ -181,19 +143,13 @@ class ColorControlCluster(private val endpointId: UShort) { transitionTime: UShort, optionsMask: UInt, optionsOverride: UInt, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here - } - - suspend fun moveToColor( - colorX: UShort, - colorY: UShort, - transitionTime: UShort, - optionsMask: UInt, - optionsOverride: UInt - ) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun moveToColor( @@ -202,13 +158,13 @@ class ColorControlCluster(private val endpointId: UShort) { transitionTime: UShort, optionsMask: UInt, optionsOverride: UInt, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here - } - - suspend fun moveColor(rateX: Short, rateY: Short, optionsMask: UInt, optionsOverride: UInt) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun moveColor( @@ -216,19 +172,13 @@ class ColorControlCluster(private val endpointId: UShort) { rateY: Short, optionsMask: UInt, optionsOverride: UInt, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here - } - - suspend fun stepColor( - stepX: Short, - stepY: Short, - transitionTime: UShort, - optionsMask: UInt, - optionsOverride: UInt - ) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun stepColor( @@ -237,18 +187,13 @@ class ColorControlCluster(private val endpointId: UShort) { transitionTime: UShort, optionsMask: UInt, optionsOverride: UInt, - timedInvokeTimeoutMs: Int - ) { - // Implementation needs to be added here - } - - suspend fun moveToColorTemperature( - colorTemperatureMireds: UShort, - transitionTime: UShort, - optionsMask: UInt, - optionsOverride: UInt + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun moveToColorTemperature( @@ -256,19 +201,13 @@ class ColorControlCluster(private val endpointId: UShort) { transitionTime: UShort, optionsMask: UInt, optionsOverride: UInt, - timedInvokeTimeoutMs: Int - ) { - // Implementation needs to be added here - } - - suspend fun enhancedMoveToHue( - enhancedHue: UShort, - direction: UInt, - transitionTime: UShort, - optionsMask: UInt, - optionsOverride: UInt + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun enhancedMoveToHue( @@ -277,18 +216,13 @@ class ColorControlCluster(private val endpointId: UShort) { transitionTime: UShort, optionsMask: UInt, optionsOverride: UInt, - timedInvokeTimeoutMs: Int - ) { - // Implementation needs to be added here - } - - suspend fun enhancedMoveHue( - moveMode: UInt, - rate: UShort, - optionsMask: UInt, - optionsOverride: UInt + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun enhancedMoveHue( @@ -296,19 +230,13 @@ class ColorControlCluster(private val endpointId: UShort) { rate: UShort, optionsMask: UInt, optionsOverride: UInt, - timedInvokeTimeoutMs: Int - ) { - // Implementation needs to be added here - } - - suspend fun enhancedStepHue( - stepMode: UInt, - stepSize: UShort, - transitionTime: UShort, - optionsMask: UInt, - optionsOverride: UInt + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun enhancedStepHue( @@ -317,19 +245,13 @@ class ColorControlCluster(private val endpointId: UShort) { transitionTime: UShort, optionsMask: UInt, optionsOverride: UInt, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here - } - - suspend fun enhancedMoveToHueAndSaturation( - enhancedHue: UShort, - saturation: UByte, - transitionTime: UShort, - optionsMask: UInt, - optionsOverride: UInt - ) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun enhancedMoveToHueAndSaturation( @@ -338,21 +260,13 @@ class ColorControlCluster(private val endpointId: UShort) { transitionTime: UShort, optionsMask: UInt, optionsOverride: UInt, - timedInvokeTimeoutMs: Int - ) { - // Implementation needs to be added here - } - - suspend fun colorLoopSet( - updateFlags: UInt, - action: UInt, - direction: UInt, - time: UShort, - startHue: UShort, - optionsMask: UInt, - optionsOverride: UInt + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun colorLoopSet( @@ -363,28 +277,25 @@ class ColorControlCluster(private val endpointId: UShort) { startHue: UShort, optionsMask: UInt, optionsOverride: UInt, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun stopMoveStep(optionsMask: UInt, optionsOverride: UInt) { - // Implementation needs to be added here - } - - suspend fun stopMoveStep(optionsMask: UInt, optionsOverride: UInt, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } - - suspend fun moveColorTemperature( - moveMode: UInt, - rate: UShort, - colorTemperatureMinimumMireds: UShort, - colorTemperatureMaximumMireds: UShort, + suspend fun stopMoveStep( optionsMask: UInt, - optionsOverride: UInt + optionsOverride: UInt, + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun moveColorTemperature( @@ -394,21 +305,13 @@ class ColorControlCluster(private val endpointId: UShort) { colorTemperatureMaximumMireds: UShort, optionsMask: UInt, optionsOverride: UInt, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here - } - - suspend fun stepColorTemperature( - stepMode: UInt, - stepSize: UShort, - transitionTime: UShort, - colorTemperatureMinimumMireds: UShort, - colorTemperatureMaximumMireds: UShort, - optionsMask: UInt, - optionsOverride: UInt - ) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun stepColorTemperature( @@ -419,56 +322,60 @@ class ColorControlCluster(private val endpointId: UShort) { colorTemperatureMaximumMireds: UShort, optionsMask: UInt, optionsOverride: UInt, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun readCurrentHueAttribute(): Integer { + suspend fun readCurrentHueAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeCurrentHueAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeCurrentHueAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readCurrentSaturationAttribute(): Integer { + suspend fun readCurrentSaturationAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeCurrentSaturationAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeCurrentSaturationAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readRemainingTimeAttribute(): Integer { + suspend fun readRemainingTimeAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeRemainingTimeAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeRemainingTimeAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readCurrentXAttribute(): Integer { + suspend fun readCurrentXAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeCurrentXAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeCurrentXAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readCurrentYAttribute(): Integer { + suspend fun readCurrentYAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeCurrentYAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeCurrentYAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readDriftCompensationAttribute(): Integer { + suspend fun readDriftCompensationAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeDriftCompensationAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeDriftCompensationAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -480,26 +387,23 @@ class ColorControlCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readColorTemperatureMiredsAttribute(): Integer { + suspend fun readColorTemperatureMiredsAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeColorTemperatureMiredsAttribute( - minInterval: Int, - maxInterval: Int - ): Integer { + suspend fun subscribeColorTemperatureMiredsAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readColorModeAttribute(): Integer { + suspend fun readColorModeAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeColorModeAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeColorModeAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readOptionsAttribute(): Integer { + suspend fun readOptionsAttribute(): UByte { // Implementation needs to be added here } @@ -511,7 +415,7 @@ class ColorControlCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeOptionsAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeOptionsAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -526,19 +430,19 @@ class ColorControlCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readPrimary1XAttribute(): Integer { + suspend fun readPrimary1XAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribePrimary1XAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribePrimary1XAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readPrimary1YAttribute(): Integer { + suspend fun readPrimary1YAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribePrimary1YAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribePrimary1YAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } @@ -553,19 +457,19 @@ class ColorControlCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readPrimary2XAttribute(): Integer { + suspend fun readPrimary2XAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribePrimary2XAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribePrimary2XAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readPrimary2YAttribute(): Integer { + suspend fun readPrimary2YAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribePrimary2YAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribePrimary2YAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } @@ -580,19 +484,19 @@ class ColorControlCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readPrimary3XAttribute(): Integer { + suspend fun readPrimary3XAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribePrimary3XAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribePrimary3XAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readPrimary3YAttribute(): Integer { + suspend fun readPrimary3YAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribePrimary3YAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribePrimary3YAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } @@ -607,19 +511,19 @@ class ColorControlCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readPrimary4XAttribute(): Integer { + suspend fun readPrimary4XAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribePrimary4XAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribePrimary4XAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readPrimary4YAttribute(): Integer { + suspend fun readPrimary4YAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribePrimary4YAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribePrimary4YAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } @@ -634,19 +538,19 @@ class ColorControlCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readPrimary5XAttribute(): Integer { + suspend fun readPrimary5XAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribePrimary5XAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribePrimary5XAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readPrimary5YAttribute(): Integer { + suspend fun readPrimary5YAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribePrimary5YAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribePrimary5YAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } @@ -661,19 +565,19 @@ class ColorControlCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readPrimary6XAttribute(): Integer { + suspend fun readPrimary6XAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribePrimary6XAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribePrimary6XAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readPrimary6YAttribute(): Integer { + suspend fun readPrimary6YAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribePrimary6YAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribePrimary6YAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } @@ -688,7 +592,7 @@ class ColorControlCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readWhitePointXAttribute(): Integer { + suspend fun readWhitePointXAttribute(): UShort { // Implementation needs to be added here } @@ -700,11 +604,11 @@ class ColorControlCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeWhitePointXAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeWhitePointXAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readWhitePointYAttribute(): Integer { + suspend fun readWhitePointYAttribute(): UShort { // Implementation needs to be added here } @@ -716,11 +620,11 @@ class ColorControlCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeWhitePointYAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeWhitePointYAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readColorPointRXAttribute(): Integer { + suspend fun readColorPointRXAttribute(): UShort { // Implementation needs to be added here } @@ -732,11 +636,11 @@ class ColorControlCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeColorPointRXAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeColorPointRXAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readColorPointRYAttribute(): Integer { + suspend fun readColorPointRYAttribute(): UShort { // Implementation needs to be added here } @@ -748,7 +652,7 @@ class ColorControlCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeColorPointRYAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeColorPointRYAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } @@ -771,7 +675,7 @@ class ColorControlCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readColorPointGXAttribute(): Integer { + suspend fun readColorPointGXAttribute(): UShort { // Implementation needs to be added here } @@ -783,11 +687,11 @@ class ColorControlCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeColorPointGXAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeColorPointGXAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readColorPointGYAttribute(): Integer { + suspend fun readColorPointGYAttribute(): UShort { // Implementation needs to be added here } @@ -799,7 +703,7 @@ class ColorControlCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeColorPointGYAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeColorPointGYAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } @@ -822,7 +726,7 @@ class ColorControlCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readColorPointBXAttribute(): Integer { + suspend fun readColorPointBXAttribute(): UShort { // Implementation needs to be added here } @@ -834,11 +738,11 @@ class ColorControlCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeColorPointBXAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeColorPointBXAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readColorPointBYAttribute(): Integer { + suspend fun readColorPointBYAttribute(): UShort { // Implementation needs to be added here } @@ -850,7 +754,7 @@ class ColorControlCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeColorPointBYAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeColorPointBYAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } @@ -873,106 +777,106 @@ class ColorControlCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readEnhancedCurrentHueAttribute(): Integer { + suspend fun readEnhancedCurrentHueAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeEnhancedCurrentHueAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeEnhancedCurrentHueAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readEnhancedColorModeAttribute(): Integer { + suspend fun readEnhancedColorModeAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeEnhancedColorModeAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeEnhancedColorModeAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readColorLoopActiveAttribute(): Integer { + suspend fun readColorLoopActiveAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeColorLoopActiveAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeColorLoopActiveAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readColorLoopDirectionAttribute(): Integer { + suspend fun readColorLoopDirectionAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeColorLoopDirectionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeColorLoopDirectionAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readColorLoopTimeAttribute(): Integer { + suspend fun readColorLoopTimeAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeColorLoopTimeAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeColorLoopTimeAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readColorLoopStartEnhancedHueAttribute(): Integer { + suspend fun readColorLoopStartEnhancedHueAttribute(): UShort { // Implementation needs to be added here } suspend fun subscribeColorLoopStartEnhancedHueAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UShort { // Implementation needs to be added here } - suspend fun readColorLoopStoredEnhancedHueAttribute(): Integer { + suspend fun readColorLoopStoredEnhancedHueAttribute(): UShort { // Implementation needs to be added here } suspend fun subscribeColorLoopStoredEnhancedHueAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UShort { // Implementation needs to be added here } - suspend fun readColorCapabilitiesAttribute(): Integer { + suspend fun readColorCapabilitiesAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeColorCapabilitiesAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeColorCapabilitiesAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readColorTempPhysicalMinMiredsAttribute(): Integer { + suspend fun readColorTempPhysicalMinMiredsAttribute(): UShort { // Implementation needs to be added here } suspend fun subscribeColorTempPhysicalMinMiredsAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UShort { // Implementation needs to be added here } - suspend fun readColorTempPhysicalMaxMiredsAttribute(): Integer { + suspend fun readColorTempPhysicalMaxMiredsAttribute(): UShort { // Implementation needs to be added here } suspend fun subscribeColorTempPhysicalMaxMiredsAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UShort { // Implementation needs to be added here } - suspend fun readCoupleColorTempToLevelMinMiredsAttribute(): Integer { + suspend fun readCoupleColorTempToLevelMinMiredsAttribute(): UShort { // Implementation needs to be added here } suspend fun subscribeCoupleColorTempToLevelMinMiredsAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UShort { // Implementation needs to be added here } @@ -1036,19 +940,19 @@ class ColorControlCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ContentLauncherCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ContentLauncherCluster.kt index ee6dcff8f5fd6b..014ba9f1828189 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ContentLauncherCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ContentLauncherCluster.kt @@ -32,38 +32,30 @@ class ContentLauncherCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun launchContent( - search: ChipStructs.ContentLauncherClusterContentSearchStruct, - autoPlay: Boolean, - data: String? - ): LauncherResponse { - // Implementation needs to be added here - } - suspend fun launchContent( search: ChipStructs.ContentLauncherClusterContentSearchStruct, autoPlay: Boolean, data: String?, - timedInvokeTimeoutMs: Int - ): LauncherResponse { - // Implementation needs to be added here - } - - suspend fun launchURL( - contentURL: String, - displayString: String?, - brandingInformation: ChipStructs.ContentLauncherClusterBrandingInformationStruct? + timedInvokeTimeoutMs: Int? = null ): LauncherResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun launchURL( contentURL: String, displayString: String?, brandingInformation: ChipStructs.ContentLauncherClusterBrandingInformationStruct?, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): LauncherResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun readAcceptHeaderAttribute(): AcceptHeaderAttribute { @@ -77,7 +69,7 @@ class ContentLauncherCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readSupportedStreamingProtocolsAttribute(): Long { + suspend fun readSupportedStreamingProtocolsAttribute(): UInt { // Implementation needs to be added here } @@ -92,7 +84,7 @@ class ContentLauncherCluster(private val endpointId: UShort) { suspend fun subscribeSupportedStreamingProtocolsAttribute( minInterval: Int, maxInterval: Int - ): Long { + ): UInt { // Implementation needs to be added here } @@ -137,19 +129,19 @@ class ContentLauncherCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DescriptorCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DescriptorCluster.kt index 813c7b9d1c51d1..d0cedbee38f8ec 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DescriptorCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DescriptorCluster.kt @@ -130,19 +130,19 @@ class DescriptorCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DiagnosticLogsCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DiagnosticLogsCluster.kt index af66e72cdc3fe9..fbf46e3991d075 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DiagnosticLogsCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DiagnosticLogsCluster.kt @@ -35,21 +35,17 @@ class DiagnosticLogsCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun retrieveLogsRequest( - intent: UInt, - requestedProtocol: UInt, - transferFileDesignator: String? - ): RetrieveLogsResponse { - // Implementation needs to be added here - } - suspend fun retrieveLogsRequest( intent: UInt, requestedProtocol: UInt, transferFileDesignator: String?, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): RetrieveLogsResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { @@ -93,19 +89,19 @@ class DiagnosticLogsCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DishwasherAlarmCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DishwasherAlarmCluster.kt index bdfa74c5dd49b2..a13c51a52da55f 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DishwasherAlarmCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DishwasherAlarmCluster.kt @@ -28,51 +28,51 @@ class DishwasherAlarmCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun reset(alarms: ULong) { - // Implementation needs to be added here - } - - suspend fun reset(alarms: ULong, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here + suspend fun reset(alarms: ULong, timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun modifyEnabledAlarms(mask: ULong) { - // Implementation needs to be added here - } - - suspend fun modifyEnabledAlarms(mask: ULong, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here + suspend fun modifyEnabledAlarms(mask: ULong, timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun readMaskAttribute(): Long { + suspend fun readMaskAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeMaskAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeMaskAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readLatchAttribute(): Long { + suspend fun readLatchAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeLatchAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeLatchAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readStateAttribute(): Long { + suspend fun readStateAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeStateAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeStateAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readSupportedAttribute(): Long { + suspend fun readSupportedAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeSupportedAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeSupportedAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } @@ -117,19 +117,19 @@ class DishwasherAlarmCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DishwasherModeCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DishwasherModeCluster.kt index 57db5faffaaed2..f24f914fc1075e 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DishwasherModeCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DishwasherModeCluster.kt @@ -38,12 +38,15 @@ class DishwasherModeCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun changeToMode(newMode: UByte): ChangeToModeResponse { - // Implementation needs to be added here - } - - suspend fun changeToMode(newMode: UByte, timedInvokeTimeoutMs: Int): ChangeToModeResponse { - // Implementation needs to be added here + suspend fun changeToMode( + newMode: UByte, + timedInvokeTimeoutMs: Int? = null + ): ChangeToModeResponse { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun readSupportedModesAttribute(): SupportedModesAttribute { @@ -57,11 +60,11 @@ class DishwasherModeCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readCurrentModeAttribute(): Integer { + suspend fun readCurrentModeAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeCurrentModeAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeCurrentModeAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -141,19 +144,19 @@ class DishwasherModeCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DoorLockCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DoorLockCluster.kt index 851df952f4289a..53e16956f29cbd 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DoorLockCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DoorLockCluster.kt @@ -86,28 +86,32 @@ class DoorLockCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun lockDoor(PINCode: ByteArray?, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } - - suspend fun unlockDoor(PINCode: ByteArray?, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } - - suspend fun unlockWithTimeout(timeout: UShort, PINCode: ByteArray?, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } - - suspend fun setWeekDaySchedule( - weekDayIndex: UByte, - userIndex: UShort, - daysMask: UInt, - startHour: UByte, - startMinute: UByte, - endHour: UByte, - endMinute: UByte + suspend fun lockDoor(PINCode: ByteArray?, timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } + } + + suspend fun unlockDoor(PINCode: ByteArray?, timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } + } + + suspend fun unlockWithTimeout( + timeout: UShort, + PINCode: ByteArray?, + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun setWeekDaySchedule( @@ -118,45 +122,37 @@ class DoorLockCluster(private val endpointId: UShort) { startMinute: UByte, endHour: UByte, endMinute: UByte, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here - } - - suspend fun getWeekDaySchedule( - weekDayIndex: UByte, - userIndex: UShort - ): GetWeekDayScheduleResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun getWeekDaySchedule( weekDayIndex: UByte, userIndex: UShort, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): GetWeekDayScheduleResponse { - // Implementation needs to be added here - } - - suspend fun clearWeekDaySchedule(weekDayIndex: UByte, userIndex: UShort) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun clearWeekDaySchedule( weekDayIndex: UByte, userIndex: UShort, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here - } - - suspend fun setYearDaySchedule( - yearDayIndex: UByte, - userIndex: UShort, - localStartTime: UInt, - localEndTime: UInt - ) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun setYearDaySchedule( @@ -164,45 +160,37 @@ class DoorLockCluster(private val endpointId: UShort) { userIndex: UShort, localStartTime: UInt, localEndTime: UInt, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here - } - - suspend fun getYearDaySchedule( - yearDayIndex: UByte, - userIndex: UShort - ): GetYearDayScheduleResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun getYearDaySchedule( yearDayIndex: UByte, userIndex: UShort, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): GetYearDayScheduleResponse { - // Implementation needs to be added here - } - - suspend fun clearYearDaySchedule(yearDayIndex: UByte, userIndex: UShort) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun clearYearDaySchedule( yearDayIndex: UByte, userIndex: UShort, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here - } - - suspend fun setHolidaySchedule( - holidayIndex: UByte, - localStartTime: UInt, - localEndTime: UInt, - operatingMode: UInt - ) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun setHolidaySchedule( @@ -210,28 +198,32 @@ class DoorLockCluster(private val endpointId: UShort) { localStartTime: UInt, localEndTime: UInt, operatingMode: UInt, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here - } - - suspend fun getHolidaySchedule(holidayIndex: UByte): GetHolidayScheduleResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun getHolidaySchedule( holidayIndex: UByte, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): GetHolidayScheduleResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun clearHolidaySchedule(holidayIndex: UByte) { - // Implementation needs to be added here - } - - suspend fun clearHolidaySchedule(holidayIndex: UByte, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here + suspend fun clearHolidaySchedule(holidayIndex: UByte, timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun setUser( @@ -242,21 +234,29 @@ class DoorLockCluster(private val endpointId: UShort) { userStatus: UInt?, userType: UInt?, credentialRule: UInt?, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here - } - - suspend fun getUser(userIndex: UShort): GetUserResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun getUser(userIndex: UShort, timedInvokeTimeoutMs: Int): GetUserResponse { - // Implementation needs to be added here + suspend fun getUser(userIndex: UShort, timedInvokeTimeoutMs: Int? = null): GetUserResponse { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun clearUser(userIndex: UShort, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here + suspend fun clearUser(userIndex: UShort, timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun setCredential( @@ -266,33 +266,43 @@ class DoorLockCluster(private val endpointId: UShort) { userIndex: UShort?, userStatus: UInt?, userType: UInt?, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): SetCredentialResponse { - // Implementation needs to be added here - } - - suspend fun getCredentialStatus( - credential: ChipStructs.DoorLockClusterCredentialStruct - ): GetCredentialStatusResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun getCredentialStatus( credential: ChipStructs.DoorLockClusterCredentialStruct, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): GetCredentialStatusResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun clearCredential( credential: ChipStructs.DoorLockClusterCredentialStruct?, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun unboltDoor(PINCode: ByteArray?, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here + suspend fun unboltDoor(PINCode: ByteArray?, timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun readLockStateAttribute(): LockStateAttribute { @@ -303,11 +313,11 @@ class DoorLockCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readLockTypeAttribute(): Integer { + suspend fun readLockTypeAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeLockTypeAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeLockTypeAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -327,7 +337,7 @@ class DoorLockCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readDoorOpenEventsAttribute(): Long { + suspend fun readDoorOpenEventsAttribute(): UInt { // Implementation needs to be added here } @@ -339,11 +349,11 @@ class DoorLockCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeDoorOpenEventsAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeDoorOpenEventsAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readDoorClosedEventsAttribute(): Long { + suspend fun readDoorClosedEventsAttribute(): UInt { // Implementation needs to be added here } @@ -355,11 +365,11 @@ class DoorLockCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeDoorClosedEventsAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeDoorClosedEventsAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readOpenPeriodAttribute(): Integer { + suspend fun readOpenPeriodAttribute(): UShort { // Implementation needs to be added here } @@ -371,127 +381,124 @@ class DoorLockCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeOpenPeriodAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeOpenPeriodAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readNumberOfTotalUsersSupportedAttribute(): Integer { + suspend fun readNumberOfTotalUsersSupportedAttribute(): UShort { // Implementation needs to be added here } suspend fun subscribeNumberOfTotalUsersSupportedAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UShort { // Implementation needs to be added here } - suspend fun readNumberOfPINUsersSupportedAttribute(): Integer { + suspend fun readNumberOfPINUsersSupportedAttribute(): UShort { // Implementation needs to be added here } suspend fun subscribeNumberOfPINUsersSupportedAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UShort { // Implementation needs to be added here } - suspend fun readNumberOfRFIDUsersSupportedAttribute(): Integer { + suspend fun readNumberOfRFIDUsersSupportedAttribute(): UShort { // Implementation needs to be added here } suspend fun subscribeNumberOfRFIDUsersSupportedAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UShort { // Implementation needs to be added here } - suspend fun readNumberOfWeekDaySchedulesSupportedPerUserAttribute(): Integer { + suspend fun readNumberOfWeekDaySchedulesSupportedPerUserAttribute(): UByte { // Implementation needs to be added here } suspend fun subscribeNumberOfWeekDaySchedulesSupportedPerUserAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UByte { // Implementation needs to be added here } - suspend fun readNumberOfYearDaySchedulesSupportedPerUserAttribute(): Integer { + suspend fun readNumberOfYearDaySchedulesSupportedPerUserAttribute(): UByte { // Implementation needs to be added here } suspend fun subscribeNumberOfYearDaySchedulesSupportedPerUserAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UByte { // Implementation needs to be added here } - suspend fun readNumberOfHolidaySchedulesSupportedAttribute(): Integer { + suspend fun readNumberOfHolidaySchedulesSupportedAttribute(): UByte { // Implementation needs to be added here } suspend fun subscribeNumberOfHolidaySchedulesSupportedAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UByte { // Implementation needs to be added here } - suspend fun readMaxPINCodeLengthAttribute(): Integer { + suspend fun readMaxPINCodeLengthAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeMaxPINCodeLengthAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeMaxPINCodeLengthAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readMinPINCodeLengthAttribute(): Integer { + suspend fun readMinPINCodeLengthAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeMinPINCodeLengthAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeMinPINCodeLengthAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readMaxRFIDCodeLengthAttribute(): Integer { + suspend fun readMaxRFIDCodeLengthAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeMaxRFIDCodeLengthAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeMaxRFIDCodeLengthAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readMinRFIDCodeLengthAttribute(): Integer { + suspend fun readMinRFIDCodeLengthAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeMinRFIDCodeLengthAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeMinRFIDCodeLengthAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readCredentialRulesSupportAttribute(): Integer { + suspend fun readCredentialRulesSupportAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeCredentialRulesSupportAttribute( - minInterval: Int, - maxInterval: Int - ): Integer { + suspend fun subscribeCredentialRulesSupportAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readNumberOfCredentialsSupportedPerUserAttribute(): Integer { + suspend fun readNumberOfCredentialsSupportedPerUserAttribute(): UByte { // Implementation needs to be added here } suspend fun subscribeNumberOfCredentialsSupportedPerUserAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UByte { // Implementation needs to be added here } @@ -511,7 +518,7 @@ class DoorLockCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readLEDSettingsAttribute(): Integer { + suspend fun readLEDSettingsAttribute(): UByte { // Implementation needs to be added here } @@ -523,11 +530,11 @@ class DoorLockCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeLEDSettingsAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeLEDSettingsAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readAutoRelockTimeAttribute(): Long { + suspend fun readAutoRelockTimeAttribute(): UInt { // Implementation needs to be added here } @@ -539,11 +546,11 @@ class DoorLockCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeAutoRelockTimeAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeAutoRelockTimeAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readSoundVolumeAttribute(): Integer { + suspend fun readSoundVolumeAttribute(): UByte { // Implementation needs to be added here } @@ -555,11 +562,11 @@ class DoorLockCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeSoundVolumeAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeSoundVolumeAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readOperatingModeAttribute(): Integer { + suspend fun readOperatingModeAttribute(): UByte { // Implementation needs to be added here } @@ -571,29 +578,29 @@ class DoorLockCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeOperatingModeAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeOperatingModeAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readSupportedOperatingModesAttribute(): Integer { + suspend fun readSupportedOperatingModesAttribute(): UShort { // Implementation needs to be added here } suspend fun subscribeSupportedOperatingModesAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UShort { // Implementation needs to be added here } - suspend fun readDefaultConfigurationRegisterAttribute(): Integer { + suspend fun readDefaultConfigurationRegisterAttribute(): UShort { // Implementation needs to be added here } suspend fun subscribeDefaultConfigurationRegisterAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UShort { // Implementation needs to be added here } @@ -667,7 +674,7 @@ class DoorLockCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readLocalProgrammingFeaturesAttribute(): Integer { + suspend fun readLocalProgrammingFeaturesAttribute(): UByte { // Implementation needs to be added here } @@ -682,11 +689,11 @@ class DoorLockCluster(private val endpointId: UShort) { suspend fun subscribeLocalProgrammingFeaturesAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UByte { // Implementation needs to be added here } - suspend fun readWrongCodeEntryLimitAttribute(): Integer { + suspend fun readWrongCodeEntryLimitAttribute(): UByte { // Implementation needs to be added here } @@ -698,11 +705,11 @@ class DoorLockCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeWrongCodeEntryLimitAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeWrongCodeEntryLimitAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readUserCodeTemporaryDisableTimeAttribute(): Integer { + suspend fun readUserCodeTemporaryDisableTimeAttribute(): UByte { // Implementation needs to be added here } @@ -717,7 +724,7 @@ class DoorLockCluster(private val endpointId: UShort) { suspend fun subscribeUserCodeTemporaryDisableTimeAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UByte { // Implementation needs to be added here } @@ -756,7 +763,7 @@ class DoorLockCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readExpiringUserTimeoutAttribute(): Integer { + suspend fun readExpiringUserTimeoutAttribute(): UShort { // Implementation needs to be added here } @@ -768,7 +775,7 @@ class DoorLockCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeExpiringUserTimeoutAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeExpiringUserTimeoutAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } @@ -813,19 +820,19 @@ class DoorLockCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ElectricalMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ElectricalMeasurementCluster.kt index 292dfc4797dc83..17ad4bca3238c9 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ElectricalMeasurementCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ElectricalMeasurementCluster.kt @@ -28,547 +28,543 @@ class ElectricalMeasurementCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun getProfileInfoCommand() { - // Implementation needs to be added here - } - - suspend fun getProfileInfoCommand(timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } - - suspend fun getMeasurementProfileCommand( - attributeId: UShort, - startTime: UInt, - numberOfIntervals: UInt - ) { - // Implementation needs to be added here + suspend fun getProfileInfoCommand(timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun getMeasurementProfileCommand( attributeId: UShort, startTime: UInt, numberOfIntervals: UInt, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun readMeasurementTypeAttribute(): Long { + suspend fun readMeasurementTypeAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeMeasurementTypeAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeMeasurementTypeAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readDcVoltageAttribute(): Integer { + suspend fun readDcVoltageAttribute(): Short { // Implementation needs to be added here } - suspend fun subscribeDcVoltageAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeDcVoltageAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readDcVoltageMinAttribute(): Integer { + suspend fun readDcVoltageMinAttribute(): Short { // Implementation needs to be added here } - suspend fun subscribeDcVoltageMinAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeDcVoltageMinAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readDcVoltageMaxAttribute(): Integer { + suspend fun readDcVoltageMaxAttribute(): Short { // Implementation needs to be added here } - suspend fun subscribeDcVoltageMaxAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeDcVoltageMaxAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readDcCurrentAttribute(): Integer { + suspend fun readDcCurrentAttribute(): Short { // Implementation needs to be added here } - suspend fun subscribeDcCurrentAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeDcCurrentAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readDcCurrentMinAttribute(): Integer { + suspend fun readDcCurrentMinAttribute(): Short { // Implementation needs to be added here } - suspend fun subscribeDcCurrentMinAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeDcCurrentMinAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readDcCurrentMaxAttribute(): Integer { + suspend fun readDcCurrentMaxAttribute(): Short { // Implementation needs to be added here } - suspend fun subscribeDcCurrentMaxAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeDcCurrentMaxAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readDcPowerAttribute(): Integer { + suspend fun readDcPowerAttribute(): Short { // Implementation needs to be added here } - suspend fun subscribeDcPowerAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeDcPowerAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readDcPowerMinAttribute(): Integer { + suspend fun readDcPowerMinAttribute(): Short { // Implementation needs to be added here } - suspend fun subscribeDcPowerMinAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeDcPowerMinAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readDcPowerMaxAttribute(): Integer { + suspend fun readDcPowerMaxAttribute(): Short { // Implementation needs to be added here } - suspend fun subscribeDcPowerMaxAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeDcPowerMaxAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readDcVoltageMultiplierAttribute(): Integer { + suspend fun readDcVoltageMultiplierAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeDcVoltageMultiplierAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeDcVoltageMultiplierAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readDcVoltageDivisorAttribute(): Integer { + suspend fun readDcVoltageDivisorAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeDcVoltageDivisorAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeDcVoltageDivisorAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readDcCurrentMultiplierAttribute(): Integer { + suspend fun readDcCurrentMultiplierAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeDcCurrentMultiplierAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeDcCurrentMultiplierAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readDcCurrentDivisorAttribute(): Integer { + suspend fun readDcCurrentDivisorAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeDcCurrentDivisorAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeDcCurrentDivisorAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readDcPowerMultiplierAttribute(): Integer { + suspend fun readDcPowerMultiplierAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeDcPowerMultiplierAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeDcPowerMultiplierAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readDcPowerDivisorAttribute(): Integer { + suspend fun readDcPowerDivisorAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeDcPowerDivisorAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeDcPowerDivisorAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readAcFrequencyAttribute(): Integer { + suspend fun readAcFrequencyAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeAcFrequencyAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeAcFrequencyAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readAcFrequencyMinAttribute(): Integer { + suspend fun readAcFrequencyMinAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeAcFrequencyMinAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeAcFrequencyMinAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readAcFrequencyMaxAttribute(): Integer { + suspend fun readAcFrequencyMaxAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeAcFrequencyMaxAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeAcFrequencyMaxAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readNeutralCurrentAttribute(): Integer { + suspend fun readNeutralCurrentAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeNeutralCurrentAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeNeutralCurrentAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readTotalActivePowerAttribute(): Long { + suspend fun readTotalActivePowerAttribute(): Int { // Implementation needs to be added here } - suspend fun subscribeTotalActivePowerAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeTotalActivePowerAttribute(minInterval: Int, maxInterval: Int): Int { // Implementation needs to be added here } - suspend fun readTotalReactivePowerAttribute(): Long { + suspend fun readTotalReactivePowerAttribute(): Int { // Implementation needs to be added here } - suspend fun subscribeTotalReactivePowerAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeTotalReactivePowerAttribute(minInterval: Int, maxInterval: Int): Int { // Implementation needs to be added here } - suspend fun readTotalApparentPowerAttribute(): Long { + suspend fun readTotalApparentPowerAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeTotalApparentPowerAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeTotalApparentPowerAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readMeasured1stHarmonicCurrentAttribute(): Integer { + suspend fun readMeasured1stHarmonicCurrentAttribute(): Short { // Implementation needs to be added here } suspend fun subscribeMeasured1stHarmonicCurrentAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): Short { // Implementation needs to be added here } - suspend fun readMeasured3rdHarmonicCurrentAttribute(): Integer { + suspend fun readMeasured3rdHarmonicCurrentAttribute(): Short { // Implementation needs to be added here } suspend fun subscribeMeasured3rdHarmonicCurrentAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): Short { // Implementation needs to be added here } - suspend fun readMeasured5thHarmonicCurrentAttribute(): Integer { + suspend fun readMeasured5thHarmonicCurrentAttribute(): Short { // Implementation needs to be added here } suspend fun subscribeMeasured5thHarmonicCurrentAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): Short { // Implementation needs to be added here } - suspend fun readMeasured7thHarmonicCurrentAttribute(): Integer { + suspend fun readMeasured7thHarmonicCurrentAttribute(): Short { // Implementation needs to be added here } suspend fun subscribeMeasured7thHarmonicCurrentAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): Short { // Implementation needs to be added here } - suspend fun readMeasured9thHarmonicCurrentAttribute(): Integer { + suspend fun readMeasured9thHarmonicCurrentAttribute(): Short { // Implementation needs to be added here } suspend fun subscribeMeasured9thHarmonicCurrentAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): Short { // Implementation needs to be added here } - suspend fun readMeasured11thHarmonicCurrentAttribute(): Integer { + suspend fun readMeasured11thHarmonicCurrentAttribute(): Short { // Implementation needs to be added here } suspend fun subscribeMeasured11thHarmonicCurrentAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): Short { // Implementation needs to be added here } - suspend fun readMeasuredPhase1stHarmonicCurrentAttribute(): Integer { + suspend fun readMeasuredPhase1stHarmonicCurrentAttribute(): Short { // Implementation needs to be added here } suspend fun subscribeMeasuredPhase1stHarmonicCurrentAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): Short { // Implementation needs to be added here } - suspend fun readMeasuredPhase3rdHarmonicCurrentAttribute(): Integer { + suspend fun readMeasuredPhase3rdHarmonicCurrentAttribute(): Short { // Implementation needs to be added here } suspend fun subscribeMeasuredPhase3rdHarmonicCurrentAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): Short { // Implementation needs to be added here } - suspend fun readMeasuredPhase5thHarmonicCurrentAttribute(): Integer { + suspend fun readMeasuredPhase5thHarmonicCurrentAttribute(): Short { // Implementation needs to be added here } suspend fun subscribeMeasuredPhase5thHarmonicCurrentAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): Short { // Implementation needs to be added here } - suspend fun readMeasuredPhase7thHarmonicCurrentAttribute(): Integer { + suspend fun readMeasuredPhase7thHarmonicCurrentAttribute(): Short { // Implementation needs to be added here } suspend fun subscribeMeasuredPhase7thHarmonicCurrentAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): Short { // Implementation needs to be added here } - suspend fun readMeasuredPhase9thHarmonicCurrentAttribute(): Integer { + suspend fun readMeasuredPhase9thHarmonicCurrentAttribute(): Short { // Implementation needs to be added here } suspend fun subscribeMeasuredPhase9thHarmonicCurrentAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): Short { // Implementation needs to be added here } - suspend fun readMeasuredPhase11thHarmonicCurrentAttribute(): Integer { + suspend fun readMeasuredPhase11thHarmonicCurrentAttribute(): Short { // Implementation needs to be added here } suspend fun subscribeMeasuredPhase11thHarmonicCurrentAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): Short { // Implementation needs to be added here } - suspend fun readAcFrequencyMultiplierAttribute(): Integer { + suspend fun readAcFrequencyMultiplierAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeAcFrequencyMultiplierAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeAcFrequencyMultiplierAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readAcFrequencyDivisorAttribute(): Integer { + suspend fun readAcFrequencyDivisorAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeAcFrequencyDivisorAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeAcFrequencyDivisorAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readPowerMultiplierAttribute(): Long { + suspend fun readPowerMultiplierAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribePowerMultiplierAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribePowerMultiplierAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readPowerDivisorAttribute(): Long { + suspend fun readPowerDivisorAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribePowerDivisorAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribePowerDivisorAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readHarmonicCurrentMultiplierAttribute(): Integer { + suspend fun readHarmonicCurrentMultiplierAttribute(): Byte { // Implementation needs to be added here } suspend fun subscribeHarmonicCurrentMultiplierAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): Byte { // Implementation needs to be added here } - suspend fun readPhaseHarmonicCurrentMultiplierAttribute(): Integer { + suspend fun readPhaseHarmonicCurrentMultiplierAttribute(): Byte { // Implementation needs to be added here } suspend fun subscribePhaseHarmonicCurrentMultiplierAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): Byte { // Implementation needs to be added here } - suspend fun readInstantaneousVoltageAttribute(): Integer { + suspend fun readInstantaneousVoltageAttribute(): Short { // Implementation needs to be added here } - suspend fun subscribeInstantaneousVoltageAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeInstantaneousVoltageAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readInstantaneousLineCurrentAttribute(): Integer { + suspend fun readInstantaneousLineCurrentAttribute(): UShort { // Implementation needs to be added here } suspend fun subscribeInstantaneousLineCurrentAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UShort { // Implementation needs to be added here } - suspend fun readInstantaneousActiveCurrentAttribute(): Integer { + suspend fun readInstantaneousActiveCurrentAttribute(): Short { // Implementation needs to be added here } suspend fun subscribeInstantaneousActiveCurrentAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): Short { // Implementation needs to be added here } - suspend fun readInstantaneousReactiveCurrentAttribute(): Integer { + suspend fun readInstantaneousReactiveCurrentAttribute(): Short { // Implementation needs to be added here } suspend fun subscribeInstantaneousReactiveCurrentAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): Short { // Implementation needs to be added here } - suspend fun readInstantaneousPowerAttribute(): Integer { + suspend fun readInstantaneousPowerAttribute(): Short { // Implementation needs to be added here } - suspend fun subscribeInstantaneousPowerAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeInstantaneousPowerAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readRmsVoltageAttribute(): Integer { + suspend fun readRmsVoltageAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeRmsVoltageAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeRmsVoltageAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readRmsVoltageMinAttribute(): Integer { + suspend fun readRmsVoltageMinAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeRmsVoltageMinAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeRmsVoltageMinAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readRmsVoltageMaxAttribute(): Integer { + suspend fun readRmsVoltageMaxAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeRmsVoltageMaxAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeRmsVoltageMaxAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readRmsCurrentAttribute(): Integer { + suspend fun readRmsCurrentAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeRmsCurrentAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeRmsCurrentAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readRmsCurrentMinAttribute(): Integer { + suspend fun readRmsCurrentMinAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeRmsCurrentMinAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeRmsCurrentMinAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readRmsCurrentMaxAttribute(): Integer { + suspend fun readRmsCurrentMaxAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeRmsCurrentMaxAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeRmsCurrentMaxAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readActivePowerAttribute(): Integer { + suspend fun readActivePowerAttribute(): Short { // Implementation needs to be added here } - suspend fun subscribeActivePowerAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeActivePowerAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readActivePowerMinAttribute(): Integer { + suspend fun readActivePowerMinAttribute(): Short { // Implementation needs to be added here } - suspend fun subscribeActivePowerMinAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeActivePowerMinAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readActivePowerMaxAttribute(): Integer { + suspend fun readActivePowerMaxAttribute(): Short { // Implementation needs to be added here } - suspend fun subscribeActivePowerMaxAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeActivePowerMaxAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readReactivePowerAttribute(): Integer { + suspend fun readReactivePowerAttribute(): Short { // Implementation needs to be added here } - suspend fun subscribeReactivePowerAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeReactivePowerAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readApparentPowerAttribute(): Integer { + suspend fun readApparentPowerAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeApparentPowerAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeApparentPowerAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readPowerFactorAttribute(): Integer { + suspend fun readPowerFactorAttribute(): Byte { // Implementation needs to be added here } - suspend fun subscribePowerFactorAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribePowerFactorAttribute(minInterval: Int, maxInterval: Int): Byte { // Implementation needs to be added here } - suspend fun readAverageRmsVoltageMeasurementPeriodAttribute(): Integer { + suspend fun readAverageRmsVoltageMeasurementPeriodAttribute(): UShort { // Implementation needs to be added here } @@ -586,11 +582,11 @@ class ElectricalMeasurementCluster(private val endpointId: UShort) { suspend fun subscribeAverageRmsVoltageMeasurementPeriodAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UShort { // Implementation needs to be added here } - suspend fun readAverageRmsUnderVoltageCounterAttribute(): Integer { + suspend fun readAverageRmsUnderVoltageCounterAttribute(): UShort { // Implementation needs to be added here } @@ -605,11 +601,11 @@ class ElectricalMeasurementCluster(private val endpointId: UShort) { suspend fun subscribeAverageRmsUnderVoltageCounterAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UShort { // Implementation needs to be added here } - suspend fun readRmsExtremeOverVoltagePeriodAttribute(): Integer { + suspend fun readRmsExtremeOverVoltagePeriodAttribute(): UShort { // Implementation needs to be added here } @@ -624,11 +620,11 @@ class ElectricalMeasurementCluster(private val endpointId: UShort) { suspend fun subscribeRmsExtremeOverVoltagePeriodAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UShort { // Implementation needs to be added here } - suspend fun readRmsExtremeUnderVoltagePeriodAttribute(): Integer { + suspend fun readRmsExtremeUnderVoltagePeriodAttribute(): UShort { // Implementation needs to be added here } @@ -643,11 +639,11 @@ class ElectricalMeasurementCluster(private val endpointId: UShort) { suspend fun subscribeRmsExtremeUnderVoltagePeriodAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UShort { // Implementation needs to be added here } - suspend fun readRmsVoltageSagPeriodAttribute(): Integer { + suspend fun readRmsVoltageSagPeriodAttribute(): UShort { // Implementation needs to be added here } @@ -659,11 +655,11 @@ class ElectricalMeasurementCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeRmsVoltageSagPeriodAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeRmsVoltageSagPeriodAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readRmsVoltageSwellPeriodAttribute(): Integer { + suspend fun readRmsVoltageSwellPeriodAttribute(): UShort { // Implementation needs to be added here } @@ -675,59 +671,59 @@ class ElectricalMeasurementCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeRmsVoltageSwellPeriodAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeRmsVoltageSwellPeriodAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readAcVoltageMultiplierAttribute(): Integer { + suspend fun readAcVoltageMultiplierAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeAcVoltageMultiplierAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeAcVoltageMultiplierAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readAcVoltageDivisorAttribute(): Integer { + suspend fun readAcVoltageDivisorAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeAcVoltageDivisorAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeAcVoltageDivisorAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readAcCurrentMultiplierAttribute(): Integer { + suspend fun readAcCurrentMultiplierAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeAcCurrentMultiplierAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeAcCurrentMultiplierAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readAcCurrentDivisorAttribute(): Integer { + suspend fun readAcCurrentDivisorAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeAcCurrentDivisorAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeAcCurrentDivisorAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readAcPowerMultiplierAttribute(): Integer { + suspend fun readAcPowerMultiplierAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeAcPowerMultiplierAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeAcPowerMultiplierAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readAcPowerDivisorAttribute(): Integer { + suspend fun readAcPowerDivisorAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeAcPowerDivisorAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeAcPowerDivisorAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readOverloadAlarmsMaskAttribute(): Integer { + suspend fun readOverloadAlarmsMaskAttribute(): UByte { // Implementation needs to be added here } @@ -739,27 +735,27 @@ class ElectricalMeasurementCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeOverloadAlarmsMaskAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeOverloadAlarmsMaskAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readVoltageOverloadAttribute(): Integer { + suspend fun readVoltageOverloadAttribute(): Short { // Implementation needs to be added here } - suspend fun subscribeVoltageOverloadAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeVoltageOverloadAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readCurrentOverloadAttribute(): Integer { + suspend fun readCurrentOverloadAttribute(): Short { // Implementation needs to be added here } - suspend fun subscribeCurrentOverloadAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeCurrentOverloadAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readAcOverloadAlarmsMaskAttribute(): Integer { + suspend fun readAcOverloadAlarmsMaskAttribute(): UShort { // Implementation needs to be added here } @@ -771,490 +767,481 @@ class ElectricalMeasurementCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeAcOverloadAlarmsMaskAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeAcOverloadAlarmsMaskAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readAcVoltageOverloadAttribute(): Integer { + suspend fun readAcVoltageOverloadAttribute(): Short { // Implementation needs to be added here } - suspend fun subscribeAcVoltageOverloadAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeAcVoltageOverloadAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readAcCurrentOverloadAttribute(): Integer { + suspend fun readAcCurrentOverloadAttribute(): Short { // Implementation needs to be added here } - suspend fun subscribeAcCurrentOverloadAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeAcCurrentOverloadAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readAcActivePowerOverloadAttribute(): Integer { + suspend fun readAcActivePowerOverloadAttribute(): Short { // Implementation needs to be added here } - suspend fun subscribeAcActivePowerOverloadAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeAcActivePowerOverloadAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readAcReactivePowerOverloadAttribute(): Integer { + suspend fun readAcReactivePowerOverloadAttribute(): Short { // Implementation needs to be added here } - suspend fun subscribeAcReactivePowerOverloadAttribute( - minInterval: Int, - maxInterval: Int - ): Integer { + suspend fun subscribeAcReactivePowerOverloadAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readAverageRmsOverVoltageAttribute(): Integer { + suspend fun readAverageRmsOverVoltageAttribute(): Short { // Implementation needs to be added here } - suspend fun subscribeAverageRmsOverVoltageAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeAverageRmsOverVoltageAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readAverageRmsUnderVoltageAttribute(): Integer { + suspend fun readAverageRmsUnderVoltageAttribute(): Short { // Implementation needs to be added here } - suspend fun subscribeAverageRmsUnderVoltageAttribute( - minInterval: Int, - maxInterval: Int - ): Integer { + suspend fun subscribeAverageRmsUnderVoltageAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readRmsExtremeOverVoltageAttribute(): Integer { + suspend fun readRmsExtremeOverVoltageAttribute(): Short { // Implementation needs to be added here } - suspend fun subscribeRmsExtremeOverVoltageAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeRmsExtremeOverVoltageAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readRmsExtremeUnderVoltageAttribute(): Integer { + suspend fun readRmsExtremeUnderVoltageAttribute(): Short { // Implementation needs to be added here } - suspend fun subscribeRmsExtremeUnderVoltageAttribute( - minInterval: Int, - maxInterval: Int - ): Integer { + suspend fun subscribeRmsExtremeUnderVoltageAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readRmsVoltageSagAttribute(): Integer { + suspend fun readRmsVoltageSagAttribute(): Short { // Implementation needs to be added here } - suspend fun subscribeRmsVoltageSagAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeRmsVoltageSagAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readRmsVoltageSwellAttribute(): Integer { + suspend fun readRmsVoltageSwellAttribute(): Short { // Implementation needs to be added here } - suspend fun subscribeRmsVoltageSwellAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeRmsVoltageSwellAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readLineCurrentPhaseBAttribute(): Integer { + suspend fun readLineCurrentPhaseBAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeLineCurrentPhaseBAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeLineCurrentPhaseBAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readActiveCurrentPhaseBAttribute(): Integer { + suspend fun readActiveCurrentPhaseBAttribute(): Short { // Implementation needs to be added here } - suspend fun subscribeActiveCurrentPhaseBAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeActiveCurrentPhaseBAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readReactiveCurrentPhaseBAttribute(): Integer { + suspend fun readReactiveCurrentPhaseBAttribute(): Short { // Implementation needs to be added here } - suspend fun subscribeReactiveCurrentPhaseBAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeReactiveCurrentPhaseBAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readRmsVoltagePhaseBAttribute(): Integer { + suspend fun readRmsVoltagePhaseBAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeRmsVoltagePhaseBAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeRmsVoltagePhaseBAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readRmsVoltageMinPhaseBAttribute(): Integer { + suspend fun readRmsVoltageMinPhaseBAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeRmsVoltageMinPhaseBAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeRmsVoltageMinPhaseBAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readRmsVoltageMaxPhaseBAttribute(): Integer { + suspend fun readRmsVoltageMaxPhaseBAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeRmsVoltageMaxPhaseBAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeRmsVoltageMaxPhaseBAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readRmsCurrentPhaseBAttribute(): Integer { + suspend fun readRmsCurrentPhaseBAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeRmsCurrentPhaseBAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeRmsCurrentPhaseBAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readRmsCurrentMinPhaseBAttribute(): Integer { + suspend fun readRmsCurrentMinPhaseBAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeRmsCurrentMinPhaseBAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeRmsCurrentMinPhaseBAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readRmsCurrentMaxPhaseBAttribute(): Integer { + suspend fun readRmsCurrentMaxPhaseBAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeRmsCurrentMaxPhaseBAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeRmsCurrentMaxPhaseBAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readActivePowerPhaseBAttribute(): Integer { + suspend fun readActivePowerPhaseBAttribute(): Short { // Implementation needs to be added here } - suspend fun subscribeActivePowerPhaseBAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeActivePowerPhaseBAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readActivePowerMinPhaseBAttribute(): Integer { + suspend fun readActivePowerMinPhaseBAttribute(): Short { // Implementation needs to be added here } - suspend fun subscribeActivePowerMinPhaseBAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeActivePowerMinPhaseBAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readActivePowerMaxPhaseBAttribute(): Integer { + suspend fun readActivePowerMaxPhaseBAttribute(): Short { // Implementation needs to be added here } - suspend fun subscribeActivePowerMaxPhaseBAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeActivePowerMaxPhaseBAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readReactivePowerPhaseBAttribute(): Integer { + suspend fun readReactivePowerPhaseBAttribute(): Short { // Implementation needs to be added here } - suspend fun subscribeReactivePowerPhaseBAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeReactivePowerPhaseBAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readApparentPowerPhaseBAttribute(): Integer { + suspend fun readApparentPowerPhaseBAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeApparentPowerPhaseBAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeApparentPowerPhaseBAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readPowerFactorPhaseBAttribute(): Integer { + suspend fun readPowerFactorPhaseBAttribute(): Byte { // Implementation needs to be added here } - suspend fun subscribePowerFactorPhaseBAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribePowerFactorPhaseBAttribute(minInterval: Int, maxInterval: Int): Byte { // Implementation needs to be added here } - suspend fun readAverageRmsVoltageMeasurementPeriodPhaseBAttribute(): Integer { + suspend fun readAverageRmsVoltageMeasurementPeriodPhaseBAttribute(): UShort { // Implementation needs to be added here } suspend fun subscribeAverageRmsVoltageMeasurementPeriodPhaseBAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UShort { // Implementation needs to be added here } - suspend fun readAverageRmsOverVoltageCounterPhaseBAttribute(): Integer { + suspend fun readAverageRmsOverVoltageCounterPhaseBAttribute(): UShort { // Implementation needs to be added here } suspend fun subscribeAverageRmsOverVoltageCounterPhaseBAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UShort { // Implementation needs to be added here } - suspend fun readAverageRmsUnderVoltageCounterPhaseBAttribute(): Integer { + suspend fun readAverageRmsUnderVoltageCounterPhaseBAttribute(): UShort { // Implementation needs to be added here } suspend fun subscribeAverageRmsUnderVoltageCounterPhaseBAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UShort { // Implementation needs to be added here } - suspend fun readRmsExtremeOverVoltagePeriodPhaseBAttribute(): Integer { + suspend fun readRmsExtremeOverVoltagePeriodPhaseBAttribute(): UShort { // Implementation needs to be added here } suspend fun subscribeRmsExtremeOverVoltagePeriodPhaseBAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UShort { // Implementation needs to be added here } - suspend fun readRmsExtremeUnderVoltagePeriodPhaseBAttribute(): Integer { + suspend fun readRmsExtremeUnderVoltagePeriodPhaseBAttribute(): UShort { // Implementation needs to be added here } suspend fun subscribeRmsExtremeUnderVoltagePeriodPhaseBAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UShort { // Implementation needs to be added here } - suspend fun readRmsVoltageSagPeriodPhaseBAttribute(): Integer { + suspend fun readRmsVoltageSagPeriodPhaseBAttribute(): UShort { // Implementation needs to be added here } suspend fun subscribeRmsVoltageSagPeriodPhaseBAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UShort { // Implementation needs to be added here } - suspend fun readRmsVoltageSwellPeriodPhaseBAttribute(): Integer { + suspend fun readRmsVoltageSwellPeriodPhaseBAttribute(): UShort { // Implementation needs to be added here } suspend fun subscribeRmsVoltageSwellPeriodPhaseBAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UShort { // Implementation needs to be added here } - suspend fun readLineCurrentPhaseCAttribute(): Integer { + suspend fun readLineCurrentPhaseCAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeLineCurrentPhaseCAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeLineCurrentPhaseCAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readActiveCurrentPhaseCAttribute(): Integer { + suspend fun readActiveCurrentPhaseCAttribute(): Short { // Implementation needs to be added here } - suspend fun subscribeActiveCurrentPhaseCAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeActiveCurrentPhaseCAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readReactiveCurrentPhaseCAttribute(): Integer { + suspend fun readReactiveCurrentPhaseCAttribute(): Short { // Implementation needs to be added here } - suspend fun subscribeReactiveCurrentPhaseCAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeReactiveCurrentPhaseCAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readRmsVoltagePhaseCAttribute(): Integer { + suspend fun readRmsVoltagePhaseCAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeRmsVoltagePhaseCAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeRmsVoltagePhaseCAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readRmsVoltageMinPhaseCAttribute(): Integer { + suspend fun readRmsVoltageMinPhaseCAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeRmsVoltageMinPhaseCAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeRmsVoltageMinPhaseCAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readRmsVoltageMaxPhaseCAttribute(): Integer { + suspend fun readRmsVoltageMaxPhaseCAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeRmsVoltageMaxPhaseCAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeRmsVoltageMaxPhaseCAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readRmsCurrentPhaseCAttribute(): Integer { + suspend fun readRmsCurrentPhaseCAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeRmsCurrentPhaseCAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeRmsCurrentPhaseCAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readRmsCurrentMinPhaseCAttribute(): Integer { + suspend fun readRmsCurrentMinPhaseCAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeRmsCurrentMinPhaseCAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeRmsCurrentMinPhaseCAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readRmsCurrentMaxPhaseCAttribute(): Integer { + suspend fun readRmsCurrentMaxPhaseCAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeRmsCurrentMaxPhaseCAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeRmsCurrentMaxPhaseCAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readActivePowerPhaseCAttribute(): Integer { + suspend fun readActivePowerPhaseCAttribute(): Short { // Implementation needs to be added here } - suspend fun subscribeActivePowerPhaseCAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeActivePowerPhaseCAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readActivePowerMinPhaseCAttribute(): Integer { + suspend fun readActivePowerMinPhaseCAttribute(): Short { // Implementation needs to be added here } - suspend fun subscribeActivePowerMinPhaseCAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeActivePowerMinPhaseCAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readActivePowerMaxPhaseCAttribute(): Integer { + suspend fun readActivePowerMaxPhaseCAttribute(): Short { // Implementation needs to be added here } - suspend fun subscribeActivePowerMaxPhaseCAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeActivePowerMaxPhaseCAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readReactivePowerPhaseCAttribute(): Integer { + suspend fun readReactivePowerPhaseCAttribute(): Short { // Implementation needs to be added here } - suspend fun subscribeReactivePowerPhaseCAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeReactivePowerPhaseCAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readApparentPowerPhaseCAttribute(): Integer { + suspend fun readApparentPowerPhaseCAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeApparentPowerPhaseCAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeApparentPowerPhaseCAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readPowerFactorPhaseCAttribute(): Integer { + suspend fun readPowerFactorPhaseCAttribute(): Byte { // Implementation needs to be added here } - suspend fun subscribePowerFactorPhaseCAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribePowerFactorPhaseCAttribute(minInterval: Int, maxInterval: Int): Byte { // Implementation needs to be added here } - suspend fun readAverageRmsVoltageMeasurementPeriodPhaseCAttribute(): Integer { + suspend fun readAverageRmsVoltageMeasurementPeriodPhaseCAttribute(): UShort { // Implementation needs to be added here } suspend fun subscribeAverageRmsVoltageMeasurementPeriodPhaseCAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UShort { // Implementation needs to be added here } - suspend fun readAverageRmsOverVoltageCounterPhaseCAttribute(): Integer { + suspend fun readAverageRmsOverVoltageCounterPhaseCAttribute(): UShort { // Implementation needs to be added here } suspend fun subscribeAverageRmsOverVoltageCounterPhaseCAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UShort { // Implementation needs to be added here } - suspend fun readAverageRmsUnderVoltageCounterPhaseCAttribute(): Integer { + suspend fun readAverageRmsUnderVoltageCounterPhaseCAttribute(): UShort { // Implementation needs to be added here } suspend fun subscribeAverageRmsUnderVoltageCounterPhaseCAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UShort { // Implementation needs to be added here } - suspend fun readRmsExtremeOverVoltagePeriodPhaseCAttribute(): Integer { + suspend fun readRmsExtremeOverVoltagePeriodPhaseCAttribute(): UShort { // Implementation needs to be added here } suspend fun subscribeRmsExtremeOverVoltagePeriodPhaseCAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UShort { // Implementation needs to be added here } - suspend fun readRmsExtremeUnderVoltagePeriodPhaseCAttribute(): Integer { + suspend fun readRmsExtremeUnderVoltagePeriodPhaseCAttribute(): UShort { // Implementation needs to be added here } suspend fun subscribeRmsExtremeUnderVoltagePeriodPhaseCAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UShort { // Implementation needs to be added here } - suspend fun readRmsVoltageSagPeriodPhaseCAttribute(): Integer { + suspend fun readRmsVoltageSagPeriodPhaseCAttribute(): UShort { // Implementation needs to be added here } suspend fun subscribeRmsVoltageSagPeriodPhaseCAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UShort { // Implementation needs to be added here } - suspend fun readRmsVoltageSwellPeriodPhaseCAttribute(): Integer { + suspend fun readRmsVoltageSwellPeriodPhaseCAttribute(): UShort { // Implementation needs to be added here } suspend fun subscribeRmsVoltageSwellPeriodPhaseCAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UShort { // Implementation needs to be added here } @@ -1299,19 +1286,19 @@ class ElectricalMeasurementCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/EthernetNetworkDiagnosticsCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/EthernetNetworkDiagnosticsCluster.kt index a2dcd32f0c4892..7211471daa9e22 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/EthernetNetworkDiagnosticsCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/EthernetNetworkDiagnosticsCluster.kt @@ -34,12 +34,12 @@ class EthernetNetworkDiagnosticsCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun resetCounts() { - // Implementation needs to be added here - } - - suspend fun resetCounts(timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here + suspend fun resetCounts(timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun readPHYRateAttribute(): PHYRateAttribute { @@ -61,43 +61,43 @@ class EthernetNetworkDiagnosticsCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readPacketRxCountAttribute(): Long { + suspend fun readPacketRxCountAttribute(): ULong { // Implementation needs to be added here } - suspend fun subscribePacketRxCountAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribePacketRxCountAttribute(minInterval: Int, maxInterval: Int): ULong { // Implementation needs to be added here } - suspend fun readPacketTxCountAttribute(): Long { + suspend fun readPacketTxCountAttribute(): ULong { // Implementation needs to be added here } - suspend fun subscribePacketTxCountAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribePacketTxCountAttribute(minInterval: Int, maxInterval: Int): ULong { // Implementation needs to be added here } - suspend fun readTxErrCountAttribute(): Long { + suspend fun readTxErrCountAttribute(): ULong { // Implementation needs to be added here } - suspend fun subscribeTxErrCountAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeTxErrCountAttribute(minInterval: Int, maxInterval: Int): ULong { // Implementation needs to be added here } - suspend fun readCollisionCountAttribute(): Long { + suspend fun readCollisionCountAttribute(): ULong { // Implementation needs to be added here } - suspend fun subscribeCollisionCountAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeCollisionCountAttribute(minInterval: Int, maxInterval: Int): ULong { // Implementation needs to be added here } - suspend fun readOverrunCountAttribute(): Long { + suspend fun readOverrunCountAttribute(): ULong { // Implementation needs to be added here } - suspend fun subscribeOverrunCountAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeOverrunCountAttribute(minInterval: Int, maxInterval: Int): ULong { // Implementation needs to be added here } @@ -112,11 +112,11 @@ class EthernetNetworkDiagnosticsCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readTimeSinceResetAttribute(): Long { + suspend fun readTimeSinceResetAttribute(): ULong { // Implementation needs to be added here } - suspend fun subscribeTimeSinceResetAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeTimeSinceResetAttribute(minInterval: Int, maxInterval: Int): ULong { // Implementation needs to be added here } @@ -161,19 +161,19 @@ class EthernetNetworkDiagnosticsCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FanControlCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FanControlCluster.kt index f4c0799dfd06ce..50126d392ae8e3 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FanControlCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FanControlCluster.kt @@ -32,20 +32,20 @@ class FanControlCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun step(direction: UInt, wrap: Boolean?, lowestOff: Boolean?) { - // Implementation needs to be added here - } - suspend fun step( direction: UInt, wrap: Boolean?, lowestOff: Boolean?, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun readFanModeAttribute(): Integer { + suspend fun readFanModeAttribute(): UByte { // Implementation needs to be added here } @@ -57,11 +57,11 @@ class FanControlCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeFanModeAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeFanModeAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readFanModeSequenceAttribute(): Integer { + suspend fun readFanModeSequenceAttribute(): UByte { // Implementation needs to be added here } @@ -73,7 +73,7 @@ class FanControlCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeFanModeSequenceAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeFanModeSequenceAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -96,19 +96,19 @@ class FanControlCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readPercentCurrentAttribute(): Integer { + suspend fun readPercentCurrentAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribePercentCurrentAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribePercentCurrentAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readSpeedMaxAttribute(): Integer { + suspend fun readSpeedMaxAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeSpeedMaxAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeSpeedMaxAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -131,23 +131,23 @@ class FanControlCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readSpeedCurrentAttribute(): Integer { + suspend fun readSpeedCurrentAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeSpeedCurrentAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeSpeedCurrentAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readRockSupportAttribute(): Integer { + suspend fun readRockSupportAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeRockSupportAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeRockSupportAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readRockSettingAttribute(): Integer { + suspend fun readRockSettingAttribute(): UByte { // Implementation needs to be added here } @@ -159,19 +159,19 @@ class FanControlCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeRockSettingAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeRockSettingAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readWindSupportAttribute(): Integer { + suspend fun readWindSupportAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeWindSupportAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeWindSupportAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readWindSettingAttribute(): Integer { + suspend fun readWindSettingAttribute(): UByte { // Implementation needs to be added here } @@ -183,11 +183,11 @@ class FanControlCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeWindSettingAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeWindSettingAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readAirflowDirectionAttribute(): Integer { + suspend fun readAirflowDirectionAttribute(): UByte { // Implementation needs to be added here } @@ -199,7 +199,7 @@ class FanControlCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeAirflowDirectionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeAirflowDirectionAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -244,19 +244,19 @@ class FanControlCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FaultInjectionCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FaultInjectionCluster.kt index 6c6c71f2aad3be..2caa5da496557a 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FaultInjectionCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FaultInjectionCluster.kt @@ -28,38 +28,32 @@ class FaultInjectionCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun failAtFault( - type: UInt, - id: UInt, - numCallsToSkip: UInt, - numCallsToFail: UInt, - takeMutex: Boolean - ) { - // Implementation needs to be added here - } - suspend fun failAtFault( type: UInt, id: UInt, numCallsToSkip: UInt, numCallsToFail: UInt, takeMutex: Boolean, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here - } - - suspend fun failRandomlyAtFault(type: UInt, id: UInt, percentage: UByte) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun failRandomlyAtFault( type: UInt, id: UInt, percentage: UByte, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { @@ -103,19 +97,19 @@ class FaultInjectionCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FixedLabelCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FixedLabelCluster.kt index cc1cb7c4f5df42..f57fc133305b04 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FixedLabelCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FixedLabelCluster.kt @@ -79,19 +79,19 @@ class FixedLabelCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FlowMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FlowMeasurementCluster.kt index ab5c4ca9c43bf0..68704d81bc332c 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FlowMeasurementCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FlowMeasurementCluster.kt @@ -67,11 +67,11 @@ class FlowMeasurementCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readToleranceAttribute(): Integer { + suspend fun readToleranceAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeToleranceAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeToleranceAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } @@ -116,19 +116,19 @@ class FlowMeasurementCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FormaldehydeConcentrationMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FormaldehydeConcentrationMeasurementCluster.kt index 682833546af638..a609f5446fb170 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FormaldehydeConcentrationMeasurementCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FormaldehydeConcentrationMeasurementCluster.kt @@ -82,11 +82,11 @@ class FormaldehydeConcentrationMeasurementCluster(private val endpointId: UShort // Implementation needs to be added here } - suspend fun readPeakMeasuredValueWindowAttribute(): Long { + suspend fun readPeakMeasuredValueWindowAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribePeakMeasuredValueWindowAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribePeakMeasuredValueWindowAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } @@ -101,14 +101,14 @@ class FormaldehydeConcentrationMeasurementCluster(private val endpointId: UShort // Implementation needs to be added here } - suspend fun readAverageMeasuredValueWindowAttribute(): Long { + suspend fun readAverageMeasuredValueWindowAttribute(): UInt { // Implementation needs to be added here } suspend fun subscribeAverageMeasuredValueWindowAttribute( minInterval: Int, maxInterval: Int - ): Long { + ): UInt { // Implementation needs to be added here } @@ -120,27 +120,27 @@ class FormaldehydeConcentrationMeasurementCluster(private val endpointId: UShort // Implementation needs to be added here } - suspend fun readMeasurementUnitAttribute(): Integer { + suspend fun readMeasurementUnitAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeMeasurementUnitAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeMeasurementUnitAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readMeasurementMediumAttribute(): Integer { + suspend fun readMeasurementMediumAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeMeasurementMediumAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeMeasurementMediumAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readLevelValueAttribute(): Integer { + suspend fun readLevelValueAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeLevelValueAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeLevelValueAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -185,19 +185,19 @@ class FormaldehydeConcentrationMeasurementCluster(private val endpointId: UShort // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GeneralCommissioningCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GeneralCommissioningCluster.kt index 59cfa7bb125a32..3ba91b04a0d7a2 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GeneralCommissioningCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GeneralCommissioningCluster.kt @@ -38,44 +38,42 @@ class GeneralCommissioningCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun armFailSafe(expiryLengthSeconds: UShort, breadcrumb: ULong): ArmFailSafeResponse { - // Implementation needs to be added here - } - suspend fun armFailSafe( expiryLengthSeconds: UShort, breadcrumb: ULong, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): ArmFailSafeResponse { - // Implementation needs to be added here - } - - suspend fun setRegulatoryConfig( - newRegulatoryConfig: UInt, - countryCode: String, - breadcrumb: ULong - ): SetRegulatoryConfigResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun setRegulatoryConfig( newRegulatoryConfig: UInt, countryCode: String, breadcrumb: ULong, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): SetRegulatoryConfigResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun commissioningComplete(): CommissioningCompleteResponse { - // Implementation needs to be added here - } - - suspend fun commissioningComplete(timedInvokeTimeoutMs: Int): CommissioningCompleteResponse { - // Implementation needs to be added here + suspend fun commissioningComplete( + timedInvokeTimeoutMs: Int? = null + ): CommissioningCompleteResponse { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun readBreadcrumbAttribute(): Long { + suspend fun readBreadcrumbAttribute(): ULong { // Implementation needs to be added here } @@ -87,7 +85,7 @@ class GeneralCommissioningCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeBreadcrumbAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeBreadcrumbAttribute(minInterval: Int, maxInterval: Int): ULong { // Implementation needs to be added here } @@ -102,19 +100,19 @@ class GeneralCommissioningCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readRegulatoryConfigAttribute(): Integer { + suspend fun readRegulatoryConfigAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeRegulatoryConfigAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeRegulatoryConfigAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readLocationCapabilityAttribute(): Integer { + suspend fun readLocationCapabilityAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeLocationCapabilityAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeLocationCapabilityAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -170,19 +168,19 @@ class GeneralCommissioningCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GeneralDiagnosticsCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GeneralDiagnosticsCluster.kt index dabdd0abaebbe5..83b0786c2ac77f 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GeneralDiagnosticsCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GeneralDiagnosticsCluster.kt @@ -38,16 +38,16 @@ class GeneralDiagnosticsCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun testEventTrigger(enableKey: ByteArray, eventTrigger: ULong) { - // Implementation needs to be added here - } - suspend fun testEventTrigger( enableKey: ByteArray, eventTrigger: ULong, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun readNetworkInterfacesAttribute(): NetworkInterfacesAttribute { @@ -61,35 +61,35 @@ class GeneralDiagnosticsCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readRebootCountAttribute(): Integer { + suspend fun readRebootCountAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeRebootCountAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeRebootCountAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readUpTimeAttribute(): Long { + suspend fun readUpTimeAttribute(): ULong { // Implementation needs to be added here } - suspend fun subscribeUpTimeAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeUpTimeAttribute(minInterval: Int, maxInterval: Int): ULong { // Implementation needs to be added here } - suspend fun readTotalOperationalHoursAttribute(): Long { + suspend fun readTotalOperationalHoursAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeTotalOperationalHoursAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeTotalOperationalHoursAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readBootReasonAttribute(): Integer { + suspend fun readBootReasonAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeBootReasonAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeBootReasonAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -137,11 +137,11 @@ class GeneralDiagnosticsCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readAverageWearCountAttribute(): Long { + suspend fun readAverageWearCountAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeAverageWearCountAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeAverageWearCountAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } @@ -186,19 +186,19 @@ class GeneralDiagnosticsCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GroupKeyManagementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GroupKeyManagementCluster.kt index 59aaa3229a279b..11ca30cc8f5a3f 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GroupKeyManagementCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GroupKeyManagementCluster.kt @@ -40,39 +40,44 @@ class GroupKeyManagementCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun keySetWrite(groupKeySet: ChipStructs.GroupKeyManagementClusterGroupKeySetStruct) { - // Implementation needs to be added here - } - suspend fun keySetWrite( groupKeySet: ChipStructs.GroupKeyManagementClusterGroupKeySetStruct, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here - } - - suspend fun keySetRead(groupKeySetID: UShort): KeySetReadResponse { - // Implementation needs to be added here - } - - suspend fun keySetRead(groupKeySetID: UShort, timedInvokeTimeoutMs: Int): KeySetReadResponse { - // Implementation needs to be added here - } - - suspend fun keySetRemove(groupKeySetID: UShort) { - // Implementation needs to be added here - } - - suspend fun keySetRemove(groupKeySetID: UShort, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } - - suspend fun keySetReadAllIndices(): KeySetReadAllIndicesResponse { - // Implementation needs to be added here - } - - suspend fun keySetReadAllIndices(timedInvokeTimeoutMs: Int): KeySetReadAllIndicesResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } + } + + suspend fun keySetRead( + groupKeySetID: UShort, + timedInvokeTimeoutMs: Int? = null + ): KeySetReadResponse { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } + } + + suspend fun keySetRemove(groupKeySetID: UShort, timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } + } + + suspend fun keySetReadAllIndices( + timedInvokeTimeoutMs: Int? = null + ): KeySetReadAllIndicesResponse { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun readGroupKeyMapAttribute(): GroupKeyMapAttribute { @@ -122,19 +127,19 @@ class GroupKeyManagementCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readMaxGroupsPerFabricAttribute(): Integer { + suspend fun readMaxGroupsPerFabricAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeMaxGroupsPerFabricAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeMaxGroupsPerFabricAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readMaxGroupKeysPerFabricAttribute(): Integer { + suspend fun readMaxGroupKeysPerFabricAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeMaxGroupKeysPerFabricAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeMaxGroupKeysPerFabricAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } @@ -179,19 +184,19 @@ class GroupKeyManagementCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GroupsCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GroupsCluster.kt index 53b78b37228a52..01c1dec237e116 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GroupsCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GroupsCluster.kt @@ -36,66 +36,70 @@ class GroupsCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun addGroup(groupID: UShort, groupName: String): AddGroupResponse { - // Implementation needs to be added here - } - suspend fun addGroup( groupID: UShort, groupName: String, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): AddGroupResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun viewGroup(groupID: UShort): ViewGroupResponse { - // Implementation needs to be added here - } - - suspend fun viewGroup(groupID: UShort, timedInvokeTimeoutMs: Int): ViewGroupResponse { - // Implementation needs to be added here - } - - suspend fun getGroupMembership(groupList: ArrayList): GetGroupMembershipResponse { - // Implementation needs to be added here + suspend fun viewGroup(groupID: UShort, timedInvokeTimeoutMs: Int? = null): ViewGroupResponse { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun getGroupMembership( groupList: ArrayList, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): GetGroupMembershipResponse { - // Implementation needs to be added here - } - - suspend fun removeGroup(groupID: UShort): RemoveGroupResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun removeGroup(groupID: UShort, timedInvokeTimeoutMs: Int): RemoveGroupResponse { - // Implementation needs to be added here + suspend fun removeGroup(groupID: UShort, timedInvokeTimeoutMs: Int? = null): RemoveGroupResponse { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun removeAllGroups() { - // Implementation needs to be added here - } - - suspend fun removeAllGroups(timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here + suspend fun removeAllGroups(timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun addGroupIfIdentifying(groupID: UShort, groupName: String) { - // Implementation needs to be added here - } - - suspend fun addGroupIfIdentifying(groupID: UShort, groupName: String, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here + suspend fun addGroupIfIdentifying( + groupID: UShort, + groupName: String, + timedInvokeTimeoutMs: Int? = null + ) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun readNameSupportAttribute(): Integer { + suspend fun readNameSupportAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeNameSupportAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeNameSupportAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -140,19 +144,19 @@ class GroupsCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/HepaFilterMonitoringCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/HepaFilterMonitoringCluster.kt index 20fc9b8bc14303..261d7a1740d98b 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/HepaFilterMonitoringCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/HepaFilterMonitoringCluster.kt @@ -34,35 +34,35 @@ class HepaFilterMonitoringCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun resetCondition() { - // Implementation needs to be added here - } - - suspend fun resetCondition(timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here + suspend fun resetCondition(timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun readConditionAttribute(): Integer { + suspend fun readConditionAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeConditionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeConditionAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readDegradationDirectionAttribute(): Integer { + suspend fun readDegradationDirectionAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeDegradationDirectionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeDegradationDirectionAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readChangeIndicationAttribute(): Integer { + suspend fun readChangeIndicationAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeChangeIndicationAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeChangeIndicationAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -145,19 +145,19 @@ class HepaFilterMonitoringCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IcdManagementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IcdManagementCluster.kt index 9678c6c3ff79c5..124385d641dd9f 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IcdManagementCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IcdManagementCluster.kt @@ -34,66 +34,61 @@ class IcdManagementCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun registerClient( - checkInNodeID: ULong, - monitoredSubject: ULong, - key: ByteArray, - verificationKey: ByteArray? - ): RegisterClientResponse { - // Implementation needs to be added here - } - suspend fun registerClient( checkInNodeID: ULong, monitoredSubject: ULong, key: ByteArray, verificationKey: ByteArray?, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): RegisterClientResponse { - // Implementation needs to be added here - } - - suspend fun unregisterClient(checkInNodeID: ULong, verificationKey: ByteArray?) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun unregisterClient( checkInNodeID: ULong, verificationKey: ByteArray?, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun stayActiveRequest() { - // Implementation needs to be added here - } - - suspend fun stayActiveRequest(timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here + suspend fun stayActiveRequest(timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun readIdleModeDurationAttribute(): Long { + suspend fun readIdleModeDurationAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeIdleModeDurationAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeIdleModeDurationAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readActiveModeDurationAttribute(): Long { + suspend fun readActiveModeDurationAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeActiveModeDurationAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeActiveModeDurationAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readActiveModeThresholdAttribute(): Integer { + suspend fun readActiveModeThresholdAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeActiveModeThresholdAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeActiveModeThresholdAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } @@ -114,33 +109,33 @@ class IcdManagementCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readICDCounterAttribute(): Long { + suspend fun readICDCounterAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeICDCounterAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeICDCounterAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClientsSupportedPerFabricAttribute(): Integer { + suspend fun readClientsSupportedPerFabricAttribute(): UShort { // Implementation needs to be added here } suspend fun subscribeClientsSupportedPerFabricAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UShort { // Implementation needs to be added here } - suspend fun readUserActiveModeTriggerHintAttribute(): Long { + suspend fun readUserActiveModeTriggerHintAttribute(): UInt { // Implementation needs to be added here } suspend fun subscribeUserActiveModeTriggerHintAttribute( minInterval: Int, maxInterval: Int - ): Long { + ): UInt { // Implementation needs to be added here } @@ -196,19 +191,19 @@ class IcdManagementCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IdentifyCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IdentifyCluster.kt index 3c6264a693836b..1726a21d39257d 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IdentifyCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IdentifyCluster.kt @@ -28,27 +28,27 @@ class IdentifyCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun identify(identifyTime: UShort) { - // Implementation needs to be added here - } - - suspend fun identify(identifyTime: UShort, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } - - suspend fun triggerEffect(effectIdentifier: UInt, effectVariant: UInt) { - // Implementation needs to be added here + suspend fun identify(identifyTime: UShort, timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun triggerEffect( effectIdentifier: UInt, effectVariant: UInt, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun readIdentifyTimeAttribute(): Integer { + suspend fun readIdentifyTimeAttribute(): UShort { // Implementation needs to be added here } @@ -60,15 +60,15 @@ class IdentifyCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeIdentifyTimeAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeIdentifyTimeAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readIdentifyTypeAttribute(): Integer { + suspend fun readIdentifyTypeAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeIdentifyTypeAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeIdentifyTypeAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -113,19 +113,19 @@ class IdentifyCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IlluminanceMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IlluminanceMeasurementCluster.kt index c2d4f98a1ef50d..5c00ce53208a43 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IlluminanceMeasurementCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IlluminanceMeasurementCluster.kt @@ -69,11 +69,11 @@ class IlluminanceMeasurementCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readToleranceAttribute(): Integer { + suspend fun readToleranceAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeToleranceAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeToleranceAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } @@ -129,19 +129,19 @@ class IlluminanceMeasurementCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/KeypadInputCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/KeypadInputCluster.kt index cbb6b3e62dff98..bf2b852f33a5b3 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/KeypadInputCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/KeypadInputCluster.kt @@ -30,12 +30,12 @@ class KeypadInputCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun sendKey(keyCode: UInt): SendKeyResponse { - // Implementation needs to be added here - } - - suspend fun sendKey(keyCode: UInt, timedInvokeTimeoutMs: Int): SendKeyResponse { - // Implementation needs to be added here + suspend fun sendKey(keyCode: UInt, timedInvokeTimeoutMs: Int? = null): SendKeyResponse { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { @@ -79,19 +79,19 @@ class KeypadInputCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LaundryWasherControlsCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LaundryWasherControlsCluster.kt index f2906fd080f351..e9f6ffa9de625a 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LaundryWasherControlsCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LaundryWasherControlsCluster.kt @@ -64,7 +64,7 @@ class LaundryWasherControlsCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readNumberOfRinsesAttribute(): Integer { + suspend fun readNumberOfRinsesAttribute(): UByte { // Implementation needs to be added here } @@ -76,7 +76,7 @@ class LaundryWasherControlsCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeNumberOfRinsesAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeNumberOfRinsesAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -132,19 +132,19 @@ class LaundryWasherControlsCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LaundryWasherModeCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LaundryWasherModeCluster.kt index 6a13b78d10ef32..7e41ed91ea99e2 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LaundryWasherModeCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LaundryWasherModeCluster.kt @@ -38,12 +38,15 @@ class LaundryWasherModeCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun changeToMode(newMode: UByte): ChangeToModeResponse { - // Implementation needs to be added here - } - - suspend fun changeToMode(newMode: UByte, timedInvokeTimeoutMs: Int): ChangeToModeResponse { - // Implementation needs to be added here + suspend fun changeToMode( + newMode: UByte, + timedInvokeTimeoutMs: Int? = null + ): ChangeToModeResponse { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun readSupportedModesAttribute(): SupportedModesAttribute { @@ -57,11 +60,11 @@ class LaundryWasherModeCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readCurrentModeAttribute(): Integer { + suspend fun readCurrentModeAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeCurrentModeAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeCurrentModeAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -141,19 +144,19 @@ class LaundryWasherModeCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LevelControlCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LevelControlCluster.kt index 10b579a79f0f50..c60bb74c788614 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LevelControlCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LevelControlCluster.kt @@ -40,27 +40,18 @@ class LevelControlCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun moveToLevel( - level: UByte, - transitionTime: UShort?, - optionsMask: UInt, - optionsOverride: UInt - ) { - // Implementation needs to be added here - } - suspend fun moveToLevel( level: UByte, transitionTime: UShort?, optionsMask: UInt, optionsOverride: UInt, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here - } - - suspend fun move(moveMode: UInt, rate: UByte?, optionsMask: UInt, optionsOverride: UInt) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun move( @@ -68,19 +59,13 @@ class LevelControlCluster(private val endpointId: UShort) { rate: UByte?, optionsMask: UInt, optionsOverride: UInt, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here - } - - suspend fun step( - stepMode: UInt, - stepSize: UByte, - transitionTime: UShort?, - optionsMask: UInt, - optionsOverride: UInt - ) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun step( @@ -89,26 +74,21 @@ class LevelControlCluster(private val endpointId: UShort) { transitionTime: UShort?, optionsMask: UInt, optionsOverride: UInt, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun stop(optionsMask: UInt, optionsOverride: UInt) { - // Implementation needs to be added here - } - - suspend fun stop(optionsMask: UInt, optionsOverride: UInt, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } - - suspend fun moveToLevelWithOnOff( - level: UByte, - transitionTime: UShort?, - optionsMask: UInt, - optionsOverride: UInt - ) { - // Implementation needs to be added here + suspend fun stop(optionsMask: UInt, optionsOverride: UInt, timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun moveToLevelWithOnOff( @@ -116,18 +96,13 @@ class LevelControlCluster(private val endpointId: UShort) { transitionTime: UShort?, optionsMask: UInt, optionsOverride: UInt, - timedInvokeTimeoutMs: Int - ) { - // Implementation needs to be added here - } - - suspend fun moveWithOnOff( - moveMode: UInt, - rate: UByte?, - optionsMask: UInt, - optionsOverride: UInt + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun moveWithOnOff( @@ -135,9 +110,13 @@ class LevelControlCluster(private val endpointId: UShort) { rate: UByte?, optionsMask: UInt, optionsOverride: UInt, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun stepWithOnOff( @@ -145,36 +124,34 @@ class LevelControlCluster(private val endpointId: UShort) { stepSize: UByte, transitionTime: UShort?, optionsMask: UInt, - optionsOverride: UInt + optionsOverride: UInt, + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun stepWithOnOff( - stepMode: UInt, - stepSize: UByte, - transitionTime: UShort?, + suspend fun stopWithOnOff( optionsMask: UInt, optionsOverride: UInt, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here - } - - suspend fun stopWithOnOff(optionsMask: UInt, optionsOverride: UInt) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun stopWithOnOff(optionsMask: UInt, optionsOverride: UInt, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } - - suspend fun moveToClosestFrequency(frequency: UShort) { - // Implementation needs to be added here - } - - suspend fun moveToClosestFrequency(frequency: UShort, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here + suspend fun moveToClosestFrequency(frequency: UShort, timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun readCurrentLevelAttribute(): CurrentLevelAttribute { @@ -188,55 +165,55 @@ class LevelControlCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readRemainingTimeAttribute(): Integer { + suspend fun readRemainingTimeAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeRemainingTimeAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeRemainingTimeAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readMinLevelAttribute(): Integer { + suspend fun readMinLevelAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeMinLevelAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeMinLevelAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readMaxLevelAttribute(): Integer { + suspend fun readMaxLevelAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeMaxLevelAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeMaxLevelAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readCurrentFrequencyAttribute(): Integer { + suspend fun readCurrentFrequencyAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeCurrentFrequencyAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeCurrentFrequencyAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readMinFrequencyAttribute(): Integer { + suspend fun readMinFrequencyAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeMinFrequencyAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeMinFrequencyAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readMaxFrequencyAttribute(): Integer { + suspend fun readMaxFrequencyAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeMaxFrequencyAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeMaxFrequencyAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readOptionsAttribute(): Integer { + suspend fun readOptionsAttribute(): UByte { // Implementation needs to be added here } @@ -248,11 +225,11 @@ class LevelControlCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeOptionsAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeOptionsAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readOnOffTransitionTimeAttribute(): Integer { + suspend fun readOnOffTransitionTimeAttribute(): UShort { // Implementation needs to be added here } @@ -264,7 +241,7 @@ class LevelControlCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeOnOffTransitionTimeAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeOnOffTransitionTimeAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } @@ -401,19 +378,19 @@ class LevelControlCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LocalizationConfigurationCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LocalizationConfigurationCluster.kt index e09a9092d6e38a..60b89689489ade 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LocalizationConfigurationCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LocalizationConfigurationCluster.kt @@ -98,19 +98,19 @@ class LocalizationConfigurationCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LowPowerCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LowPowerCluster.kt index 3e60dd2206919d..4dca4c58fe9beb 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LowPowerCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LowPowerCluster.kt @@ -28,12 +28,12 @@ class LowPowerCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun sleep() { - // Implementation needs to be added here - } - - suspend fun sleep(timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here + suspend fun sleep(timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { @@ -77,19 +77,19 @@ class LowPowerCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MediaInputCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MediaInputCluster.kt index 7bc5bf60d0cb97..5e013126be4f21 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MediaInputCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MediaInputCluster.kt @@ -30,36 +30,36 @@ class MediaInputCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun selectInput(index: UByte) { - // Implementation needs to be added here - } - - suspend fun selectInput(index: UByte, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } - - suspend fun showInputStatus() { - // Implementation needs to be added here - } - - suspend fun showInputStatus(timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } - - suspend fun hideInputStatus() { - // Implementation needs to be added here + suspend fun selectInput(index: UByte, timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun hideInputStatus(timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here + suspend fun showInputStatus(timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun renameInput(index: UByte, name: String) { - // Implementation needs to be added here + suspend fun hideInputStatus(timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun renameInput(index: UByte, name: String, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here + suspend fun renameInput(index: UByte, name: String, timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun readInputListAttribute(): InputListAttribute { @@ -70,11 +70,11 @@ class MediaInputCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readCurrentInputAttribute(): Integer { + suspend fun readCurrentInputAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeCurrentInputAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeCurrentInputAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -119,19 +119,19 @@ class MediaInputCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MediaPlaybackCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MediaPlaybackCluster.kt index 53990b4f12c416..3769725825a9c5 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MediaPlaybackCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MediaPlaybackCluster.kt @@ -42,105 +42,105 @@ class MediaPlaybackCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun play(): PlaybackResponse { - // Implementation needs to be added here - } - - suspend fun play(timedInvokeTimeoutMs: Int): PlaybackResponse { - // Implementation needs to be added here - } - - suspend fun pause(): PlaybackResponse { - // Implementation needs to be added here - } - - suspend fun pause(timedInvokeTimeoutMs: Int): PlaybackResponse { - // Implementation needs to be added here - } - - suspend fun stop(): PlaybackResponse { - // Implementation needs to be added here - } - - suspend fun stop(timedInvokeTimeoutMs: Int): PlaybackResponse { - // Implementation needs to be added here - } - - suspend fun startOver(): PlaybackResponse { - // Implementation needs to be added here - } - - suspend fun startOver(timedInvokeTimeoutMs: Int): PlaybackResponse { - // Implementation needs to be added here + suspend fun play(timedInvokeTimeoutMs: Int? = null): PlaybackResponse { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun previous(): PlaybackResponse { - // Implementation needs to be added here + suspend fun pause(timedInvokeTimeoutMs: Int? = null): PlaybackResponse { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun previous(timedInvokeTimeoutMs: Int): PlaybackResponse { - // Implementation needs to be added here + suspend fun stop(timedInvokeTimeoutMs: Int? = null): PlaybackResponse { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun next(): PlaybackResponse { - // Implementation needs to be added here + suspend fun startOver(timedInvokeTimeoutMs: Int? = null): PlaybackResponse { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun next(timedInvokeTimeoutMs: Int): PlaybackResponse { - // Implementation needs to be added here + suspend fun previous(timedInvokeTimeoutMs: Int? = null): PlaybackResponse { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun rewind(): PlaybackResponse { - // Implementation needs to be added here - } - - suspend fun rewind(timedInvokeTimeoutMs: Int): PlaybackResponse { - // Implementation needs to be added here - } - - suspend fun fastForward(): PlaybackResponse { - // Implementation needs to be added here + suspend fun next(timedInvokeTimeoutMs: Int? = null): PlaybackResponse { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun fastForward(timedInvokeTimeoutMs: Int): PlaybackResponse { - // Implementation needs to be added here + suspend fun rewind(timedInvokeTimeoutMs: Int? = null): PlaybackResponse { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun skipForward(deltaPositionMilliseconds: ULong): PlaybackResponse { - // Implementation needs to be added here + suspend fun fastForward(timedInvokeTimeoutMs: Int? = null): PlaybackResponse { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun skipForward( deltaPositionMilliseconds: ULong, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): PlaybackResponse { - // Implementation needs to be added here - } - - suspend fun skipBackward(deltaPositionMilliseconds: ULong): PlaybackResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun skipBackward( deltaPositionMilliseconds: ULong, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): PlaybackResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun seek(position: ULong): PlaybackResponse { - // Implementation needs to be added here - } - - suspend fun seek(position: ULong, timedInvokeTimeoutMs: Int): PlaybackResponse { - // Implementation needs to be added here + suspend fun seek(position: ULong, timedInvokeTimeoutMs: Int? = null): PlaybackResponse { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun readCurrentStateAttribute(): Integer { + suspend fun readCurrentStateAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeCurrentStateAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeCurrentStateAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -242,19 +242,19 @@ class MediaPlaybackCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ModeSelectCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ModeSelectCluster.kt index f6439d6d367d6f..7b32db37c44eb0 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ModeSelectCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ModeSelectCluster.kt @@ -38,12 +38,12 @@ class ModeSelectCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun changeToMode(newMode: UByte) { - // Implementation needs to be added here - } - - suspend fun changeToMode(newMode: UByte, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here + suspend fun changeToMode(newMode: UByte, timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun readDescriptionAttribute(): CharString { @@ -76,11 +76,11 @@ class ModeSelectCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readCurrentModeAttribute(): Integer { + suspend fun readCurrentModeAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeCurrentModeAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeCurrentModeAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -160,19 +160,19 @@ class ModeSelectCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/NetworkCommissioningCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/NetworkCommissioningCluster.kt index 9d8832cafe4f9a..c3ffa0cd078e4a 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/NetworkCommissioningCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/NetworkCommissioningCluster.kt @@ -61,96 +61,85 @@ class NetworkCommissioningCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun scanNetworks(ssid: ByteArray?, breadcrumb: ULong?): ScanNetworksResponse { - // Implementation needs to be added here - } - suspend fun scanNetworks( ssid: ByteArray?, breadcrumb: ULong?, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): ScanNetworksResponse { - // Implementation needs to be added here - } - - suspend fun addOrUpdateWiFiNetwork( - ssid: ByteArray, - credentials: ByteArray, - breadcrumb: ULong? - ): NetworkConfigResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun addOrUpdateWiFiNetwork( ssid: ByteArray, credentials: ByteArray, breadcrumb: ULong?, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): NetworkConfigResponse { - // Implementation needs to be added here - } - - suspend fun addOrUpdateThreadNetwork( - operationalDataset: ByteArray, - breadcrumb: ULong? - ): NetworkConfigResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun addOrUpdateThreadNetwork( operationalDataset: ByteArray, breadcrumb: ULong?, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): NetworkConfigResponse { - // Implementation needs to be added here - } - - suspend fun removeNetwork(networkID: ByteArray, breadcrumb: ULong?): NetworkConfigResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun removeNetwork( networkID: ByteArray, breadcrumb: ULong?, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): NetworkConfigResponse { - // Implementation needs to be added here - } - - suspend fun connectNetwork(networkID: ByteArray, breadcrumb: ULong?): ConnectNetworkResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun connectNetwork( networkID: ByteArray, breadcrumb: ULong?, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): ConnectNetworkResponse { - // Implementation needs to be added here - } - - suspend fun reorderNetwork( - networkID: ByteArray, - networkIndex: UByte, - breadcrumb: ULong? - ): NetworkConfigResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun reorderNetwork( networkID: ByteArray, networkIndex: UByte, breadcrumb: ULong?, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): NetworkConfigResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun readMaxNetworksAttribute(): Integer { + suspend fun readMaxNetworksAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeMaxNetworksAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeMaxNetworksAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -162,19 +151,19 @@ class NetworkCommissioningCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readScanMaxTimeSecondsAttribute(): Integer { + suspend fun readScanMaxTimeSecondsAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeScanMaxTimeSecondsAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeScanMaxTimeSecondsAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readConnectMaxTimeSecondsAttribute(): Integer { + suspend fun readConnectMaxTimeSecondsAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeConnectMaxTimeSecondsAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeConnectMaxTimeSecondsAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -238,22 +227,22 @@ class NetworkCommissioningCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readSupportedThreadFeaturesAttribute(): Integer { + suspend fun readSupportedThreadFeaturesAttribute(): UShort { // Implementation needs to be added here } suspend fun subscribeSupportedThreadFeaturesAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UShort { // Implementation needs to be added here } - suspend fun readThreadVersionAttribute(): Integer { + suspend fun readThreadVersionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeThreadVersionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeThreadVersionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } @@ -298,19 +287,19 @@ class NetworkCommissioningCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/NitrogenDioxideConcentrationMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/NitrogenDioxideConcentrationMeasurementCluster.kt index 7db03647a72a57..a7b9f91a0db969 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/NitrogenDioxideConcentrationMeasurementCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/NitrogenDioxideConcentrationMeasurementCluster.kt @@ -82,11 +82,11 @@ class NitrogenDioxideConcentrationMeasurementCluster(private val endpointId: USh // Implementation needs to be added here } - suspend fun readPeakMeasuredValueWindowAttribute(): Long { + suspend fun readPeakMeasuredValueWindowAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribePeakMeasuredValueWindowAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribePeakMeasuredValueWindowAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } @@ -101,14 +101,14 @@ class NitrogenDioxideConcentrationMeasurementCluster(private val endpointId: USh // Implementation needs to be added here } - suspend fun readAverageMeasuredValueWindowAttribute(): Long { + suspend fun readAverageMeasuredValueWindowAttribute(): UInt { // Implementation needs to be added here } suspend fun subscribeAverageMeasuredValueWindowAttribute( minInterval: Int, maxInterval: Int - ): Long { + ): UInt { // Implementation needs to be added here } @@ -120,27 +120,27 @@ class NitrogenDioxideConcentrationMeasurementCluster(private val endpointId: USh // Implementation needs to be added here } - suspend fun readMeasurementUnitAttribute(): Integer { + suspend fun readMeasurementUnitAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeMeasurementUnitAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeMeasurementUnitAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readMeasurementMediumAttribute(): Integer { + suspend fun readMeasurementMediumAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeMeasurementMediumAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeMeasurementMediumAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readLevelValueAttribute(): Integer { + suspend fun readLevelValueAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeLevelValueAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeLevelValueAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -185,19 +185,19 @@ class NitrogenDioxideConcentrationMeasurementCluster(private val endpointId: USh // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OccupancySensingCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OccupancySensingCluster.kt index 33784c096a054e..b1e422f9a6d427 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OccupancySensingCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OccupancySensingCluster.kt @@ -28,34 +28,34 @@ class OccupancySensingCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun readOccupancyAttribute(): Integer { + suspend fun readOccupancyAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeOccupancyAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeOccupancyAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readOccupancySensorTypeAttribute(): Integer { + suspend fun readOccupancySensorTypeAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeOccupancySensorTypeAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeOccupancySensorTypeAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readOccupancySensorTypeBitmapAttribute(): Integer { + suspend fun readOccupancySensorTypeBitmapAttribute(): UByte { // Implementation needs to be added here } suspend fun subscribeOccupancySensorTypeBitmapAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UByte { // Implementation needs to be added here } - suspend fun readPIROccupiedToUnoccupiedDelayAttribute(): Integer { + suspend fun readPIROccupiedToUnoccupiedDelayAttribute(): UShort { // Implementation needs to be added here } @@ -70,11 +70,11 @@ class OccupancySensingCluster(private val endpointId: UShort) { suspend fun subscribePIROccupiedToUnoccupiedDelayAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UShort { // Implementation needs to be added here } - suspend fun readPIRUnoccupiedToOccupiedDelayAttribute(): Integer { + suspend fun readPIRUnoccupiedToOccupiedDelayAttribute(): UShort { // Implementation needs to be added here } @@ -89,11 +89,11 @@ class OccupancySensingCluster(private val endpointId: UShort) { suspend fun subscribePIRUnoccupiedToOccupiedDelayAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UShort { // Implementation needs to be added here } - suspend fun readPIRUnoccupiedToOccupiedThresholdAttribute(): Integer { + suspend fun readPIRUnoccupiedToOccupiedThresholdAttribute(): UByte { // Implementation needs to be added here } @@ -111,11 +111,11 @@ class OccupancySensingCluster(private val endpointId: UShort) { suspend fun subscribePIRUnoccupiedToOccupiedThresholdAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UByte { // Implementation needs to be added here } - suspend fun readUltrasonicOccupiedToUnoccupiedDelayAttribute(): Integer { + suspend fun readUltrasonicOccupiedToUnoccupiedDelayAttribute(): UShort { // Implementation needs to be added here } @@ -133,11 +133,11 @@ class OccupancySensingCluster(private val endpointId: UShort) { suspend fun subscribeUltrasonicOccupiedToUnoccupiedDelayAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UShort { // Implementation needs to be added here } - suspend fun readUltrasonicUnoccupiedToOccupiedDelayAttribute(): Integer { + suspend fun readUltrasonicUnoccupiedToOccupiedDelayAttribute(): UShort { // Implementation needs to be added here } @@ -155,11 +155,11 @@ class OccupancySensingCluster(private val endpointId: UShort) { suspend fun subscribeUltrasonicUnoccupiedToOccupiedDelayAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UShort { // Implementation needs to be added here } - suspend fun readUltrasonicUnoccupiedToOccupiedThresholdAttribute(): Integer { + suspend fun readUltrasonicUnoccupiedToOccupiedThresholdAttribute(): UByte { // Implementation needs to be added here } @@ -177,11 +177,11 @@ class OccupancySensingCluster(private val endpointId: UShort) { suspend fun subscribeUltrasonicUnoccupiedToOccupiedThresholdAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UByte { // Implementation needs to be added here } - suspend fun readPhysicalContactOccupiedToUnoccupiedDelayAttribute(): Integer { + suspend fun readPhysicalContactOccupiedToUnoccupiedDelayAttribute(): UShort { // Implementation needs to be added here } @@ -199,11 +199,11 @@ class OccupancySensingCluster(private val endpointId: UShort) { suspend fun subscribePhysicalContactOccupiedToUnoccupiedDelayAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UShort { // Implementation needs to be added here } - suspend fun readPhysicalContactUnoccupiedToOccupiedDelayAttribute(): Integer { + suspend fun readPhysicalContactUnoccupiedToOccupiedDelayAttribute(): UShort { // Implementation needs to be added here } @@ -221,11 +221,11 @@ class OccupancySensingCluster(private val endpointId: UShort) { suspend fun subscribePhysicalContactUnoccupiedToOccupiedDelayAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UShort { // Implementation needs to be added here } - suspend fun readPhysicalContactUnoccupiedToOccupiedThresholdAttribute(): Integer { + suspend fun readPhysicalContactUnoccupiedToOccupiedThresholdAttribute(): UByte { // Implementation needs to be added here } @@ -243,7 +243,7 @@ class OccupancySensingCluster(private val endpointId: UShort) { suspend fun subscribePhysicalContactUnoccupiedToOccupiedThresholdAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UByte { // Implementation needs to be added here } @@ -288,19 +288,19 @@ class OccupancySensingCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OnOffCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OnOffCluster.kt index a38157c7adf85c..1a664fcca03619 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OnOffCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OnOffCluster.kt @@ -30,61 +30,61 @@ class OnOffCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun off() { - // Implementation needs to be added here - } - - suspend fun off(timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } - - suspend fun on() { - // Implementation needs to be added here - } - - suspend fun on(timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } - - suspend fun toggle() { - // Implementation needs to be added here + suspend fun off(timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun toggle(timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here + suspend fun on(timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun offWithEffect(effectIdentifier: UInt, effectVariant: UByte) { - // Implementation needs to be added here + suspend fun toggle(timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun offWithEffect( effectIdentifier: UInt, effectVariant: UByte, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here - } - - suspend fun onWithRecallGlobalScene() { - // Implementation needs to be added here - } - - suspend fun onWithRecallGlobalScene(timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun onWithTimedOff(onOffControl: UInt, onTime: UShort, offWaitTime: UShort) { - // Implementation needs to be added here + suspend fun onWithRecallGlobalScene(timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun onWithTimedOff( onOffControl: UInt, onTime: UShort, offWaitTime: UShort, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun readOnOffAttribute(): Boolean { @@ -103,7 +103,7 @@ class OnOffCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readOnTimeAttribute(): Integer { + suspend fun readOnTimeAttribute(): UShort { // Implementation needs to be added here } @@ -115,11 +115,11 @@ class OnOffCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeOnTimeAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeOnTimeAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readOffWaitTimeAttribute(): Integer { + suspend fun readOffWaitTimeAttribute(): UShort { // Implementation needs to be added here } @@ -131,7 +131,7 @@ class OnOffCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeOffWaitTimeAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeOffWaitTimeAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } @@ -195,19 +195,19 @@ class OnOffCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OnOffSwitchConfigurationCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OnOffSwitchConfigurationCluster.kt index 5547c47d4c8898..6db5a92ae7ec92 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OnOffSwitchConfigurationCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OnOffSwitchConfigurationCluster.kt @@ -28,15 +28,15 @@ class OnOffSwitchConfigurationCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun readSwitchTypeAttribute(): Integer { + suspend fun readSwitchTypeAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeSwitchTypeAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeSwitchTypeAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readSwitchActionsAttribute(): Integer { + suspend fun readSwitchActionsAttribute(): UByte { // Implementation needs to be added here } @@ -48,7 +48,7 @@ class OnOffSwitchConfigurationCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeSwitchActionsAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeSwitchActionsAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -93,19 +93,19 @@ class OnOffSwitchConfigurationCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OperationalCredentialsCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OperationalCredentialsCluster.kt index f02704b6eb6e4e..f63ff9156c4845 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OperationalCredentialsCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OperationalCredentialsCluster.kt @@ -47,48 +47,38 @@ class OperationalCredentialsCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun attestationRequest(attestationNonce: ByteArray): AttestationResponse { - // Implementation needs to be added here - } - suspend fun attestationRequest( attestationNonce: ByteArray, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): AttestationResponse { - // Implementation needs to be added here - } - - suspend fun certificateChainRequest(certificateType: UInt): CertificateChainResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun certificateChainRequest( certificateType: UInt, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): CertificateChainResponse { - // Implementation needs to be added here - } - - suspend fun CSRRequest(CSRNonce: ByteArray, isForUpdateNOC: Boolean?): CSRResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun CSRRequest( CSRNonce: ByteArray, isForUpdateNOC: Boolean?, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): CSRResponse { - // Implementation needs to be added here - } - - suspend fun addNOC( - NOCValue: ByteArray, - ICACValue: ByteArray?, - IPKValue: ByteArray, - caseAdminSubject: ULong, - adminVendorId: UShort - ): NOCResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun addNOC( @@ -97,45 +87,52 @@ class OperationalCredentialsCluster(private val endpointId: UShort) { IPKValue: ByteArray, caseAdminSubject: ULong, adminVendorId: UShort, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): NOCResponse { - // Implementation needs to be added here - } - - suspend fun updateNOC(NOCValue: ByteArray, ICACValue: ByteArray?): NOCResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun updateNOC( NOCValue: ByteArray, ICACValue: ByteArray?, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): NOCResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun updateFabricLabel(label: String): NOCResponse { - // Implementation needs to be added here + suspend fun updateFabricLabel(label: String, timedInvokeTimeoutMs: Int? = null): NOCResponse { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun updateFabricLabel(label: String, timedInvokeTimeoutMs: Int): NOCResponse { - // Implementation needs to be added here + suspend fun removeFabric(fabricIndex: UByte, timedInvokeTimeoutMs: Int? = null): NOCResponse { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun removeFabric(fabricIndex: UByte): NOCResponse { - // Implementation needs to be added here - } - - suspend fun removeFabric(fabricIndex: UByte, timedInvokeTimeoutMs: Int): NOCResponse { - // Implementation needs to be added here - } - - suspend fun addTrustedRootCertificate(rootCACertificate: ByteArray) { - // Implementation needs to be added here - } - - suspend fun addTrustedRootCertificate(rootCACertificate: ByteArray, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here + suspend fun addTrustedRootCertificate( + rootCACertificate: ByteArray, + timedInvokeTimeoutMs: Int? = null + ) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun readNOCsAttribute(): NOCsAttribute { @@ -162,19 +159,19 @@ class OperationalCredentialsCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readSupportedFabricsAttribute(): Integer { + suspend fun readSupportedFabricsAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeSupportedFabricsAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeSupportedFabricsAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readCommissionedFabricsAttribute(): Integer { + suspend fun readCommissionedFabricsAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeCommissionedFabricsAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeCommissionedFabricsAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -189,11 +186,11 @@ class OperationalCredentialsCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readCurrentFabricIndexAttribute(): Integer { + suspend fun readCurrentFabricIndexAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeCurrentFabricIndexAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeCurrentFabricIndexAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -238,19 +235,19 @@ class OperationalCredentialsCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OperationalStateCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OperationalStateCluster.kt index 64542a3c0fde13..67a438780eb9d3 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OperationalStateCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OperationalStateCluster.kt @@ -44,36 +44,36 @@ class OperationalStateCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun pause(): OperationalCommandResponse { - // Implementation needs to be added here - } - - suspend fun pause(timedInvokeTimeoutMs: Int): OperationalCommandResponse { - // Implementation needs to be added here - } - - suspend fun stop(): OperationalCommandResponse { - // Implementation needs to be added here - } - - suspend fun stop(timedInvokeTimeoutMs: Int): OperationalCommandResponse { - // Implementation needs to be added here - } - - suspend fun start(): OperationalCommandResponse { - // Implementation needs to be added here + suspend fun pause(timedInvokeTimeoutMs: Int? = null): OperationalCommandResponse { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun start(timedInvokeTimeoutMs: Int): OperationalCommandResponse { - // Implementation needs to be added here + suspend fun stop(timedInvokeTimeoutMs: Int? = null): OperationalCommandResponse { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun resume(): OperationalCommandResponse { - // Implementation needs to be added here + suspend fun start(timedInvokeTimeoutMs: Int? = null): OperationalCommandResponse { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun resume(timedInvokeTimeoutMs: Int): OperationalCommandResponse { - // Implementation needs to be added here + suspend fun resume(timedInvokeTimeoutMs: Int? = null): OperationalCommandResponse { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun readPhaseListAttribute(): PhaseListAttribute { @@ -117,11 +117,11 @@ class OperationalStateCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readOperationalStateAttribute(): Integer { + suspend fun readOperationalStateAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeOperationalStateAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeOperationalStateAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -177,19 +177,19 @@ class OperationalStateCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OtaSoftwareUpdateProviderCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OtaSoftwareUpdateProviderCluster.kt index f2d8ec68044131..7b252ac5dc8fac 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OtaSoftwareUpdateProviderCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OtaSoftwareUpdateProviderCluster.kt @@ -41,19 +41,6 @@ class OtaSoftwareUpdateProviderCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun queryImage( - vendorID: UShort, - productID: UShort, - softwareVersion: UInt, - protocolsSupported: ArrayList, - hardwareVersion: UShort?, - location: String?, - requestorCanConsent: Boolean?, - metadataForProvider: ByteArray? - ): QueryImageResponse { - // Implementation needs to be added here - } - suspend fun queryImage( vendorID: UShort, productID: UShort, @@ -63,33 +50,37 @@ class OtaSoftwareUpdateProviderCluster(private val endpointId: UShort) { location: String?, requestorCanConsent: Boolean?, metadataForProvider: ByteArray?, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): QueryImageResponse { - // Implementation needs to be added here - } - - suspend fun applyUpdateRequest(updateToken: ByteArray, newVersion: UInt): ApplyUpdateResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun applyUpdateRequest( updateToken: ByteArray, newVersion: UInt, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): ApplyUpdateResponse { - // Implementation needs to be added here - } - - suspend fun notifyUpdateApplied(updateToken: ByteArray, softwareVersion: UInt) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun notifyUpdateApplied( updateToken: ByteArray, softwareVersion: UInt, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { @@ -133,19 +124,19 @@ class OtaSoftwareUpdateProviderCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OtaSoftwareUpdateRequestorCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OtaSoftwareUpdateRequestorCluster.kt index 3860fd36046920..0073fd7f2b621b 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OtaSoftwareUpdateRequestorCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OtaSoftwareUpdateRequestorCluster.kt @@ -34,25 +34,19 @@ class OtaSoftwareUpdateRequestorCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun announceOTAProvider( - providerNodeID: ULong, - vendorID: UShort, - announcementReason: UInt, - metadataForNode: ByteArray?, - endpoint: UShort - ) { - // Implementation needs to be added here - } - suspend fun announceOTAProvider( providerNodeID: ULong, vendorID: UShort, announcementReason: UInt, metadataForNode: ByteArray?, endpoint: UShort, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun readDefaultOTAProvidersAttribute(): DefaultOTAProvidersAttribute { @@ -93,11 +87,11 @@ class OtaSoftwareUpdateRequestorCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readUpdateStateAttribute(): Integer { + suspend fun readUpdateStateAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeUpdateStateAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeUpdateStateAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -153,19 +147,19 @@ class OtaSoftwareUpdateRequestorCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OzoneConcentrationMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OzoneConcentrationMeasurementCluster.kt index ad1f4f1e3c24cc..8a9f00bcb930ee 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OzoneConcentrationMeasurementCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OzoneConcentrationMeasurementCluster.kt @@ -82,11 +82,11 @@ class OzoneConcentrationMeasurementCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readPeakMeasuredValueWindowAttribute(): Long { + suspend fun readPeakMeasuredValueWindowAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribePeakMeasuredValueWindowAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribePeakMeasuredValueWindowAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } @@ -101,14 +101,14 @@ class OzoneConcentrationMeasurementCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readAverageMeasuredValueWindowAttribute(): Long { + suspend fun readAverageMeasuredValueWindowAttribute(): UInt { // Implementation needs to be added here } suspend fun subscribeAverageMeasuredValueWindowAttribute( minInterval: Int, maxInterval: Int - ): Long { + ): UInt { // Implementation needs to be added here } @@ -120,27 +120,27 @@ class OzoneConcentrationMeasurementCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readMeasurementUnitAttribute(): Integer { + suspend fun readMeasurementUnitAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeMeasurementUnitAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeMeasurementUnitAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readMeasurementMediumAttribute(): Integer { + suspend fun readMeasurementMediumAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeMeasurementMediumAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeMeasurementMediumAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readLevelValueAttribute(): Integer { + suspend fun readLevelValueAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeLevelValueAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeLevelValueAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -185,19 +185,19 @@ class OzoneConcentrationMeasurementCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm10ConcentrationMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm10ConcentrationMeasurementCluster.kt index 3218382267451d..5c62e414efbcd4 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm10ConcentrationMeasurementCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm10ConcentrationMeasurementCluster.kt @@ -82,11 +82,11 @@ class Pm10ConcentrationMeasurementCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readPeakMeasuredValueWindowAttribute(): Long { + suspend fun readPeakMeasuredValueWindowAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribePeakMeasuredValueWindowAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribePeakMeasuredValueWindowAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } @@ -101,14 +101,14 @@ class Pm10ConcentrationMeasurementCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readAverageMeasuredValueWindowAttribute(): Long { + suspend fun readAverageMeasuredValueWindowAttribute(): UInt { // Implementation needs to be added here } suspend fun subscribeAverageMeasuredValueWindowAttribute( minInterval: Int, maxInterval: Int - ): Long { + ): UInt { // Implementation needs to be added here } @@ -120,27 +120,27 @@ class Pm10ConcentrationMeasurementCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readMeasurementUnitAttribute(): Integer { + suspend fun readMeasurementUnitAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeMeasurementUnitAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeMeasurementUnitAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readMeasurementMediumAttribute(): Integer { + suspend fun readMeasurementMediumAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeMeasurementMediumAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeMeasurementMediumAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readLevelValueAttribute(): Integer { + suspend fun readLevelValueAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeLevelValueAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeLevelValueAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -185,19 +185,19 @@ class Pm10ConcentrationMeasurementCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm1ConcentrationMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm1ConcentrationMeasurementCluster.kt index eca3c3c7888954..8cfae81b81c12b 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm1ConcentrationMeasurementCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm1ConcentrationMeasurementCluster.kt @@ -82,11 +82,11 @@ class Pm1ConcentrationMeasurementCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readPeakMeasuredValueWindowAttribute(): Long { + suspend fun readPeakMeasuredValueWindowAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribePeakMeasuredValueWindowAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribePeakMeasuredValueWindowAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } @@ -101,14 +101,14 @@ class Pm1ConcentrationMeasurementCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readAverageMeasuredValueWindowAttribute(): Long { + suspend fun readAverageMeasuredValueWindowAttribute(): UInt { // Implementation needs to be added here } suspend fun subscribeAverageMeasuredValueWindowAttribute( minInterval: Int, maxInterval: Int - ): Long { + ): UInt { // Implementation needs to be added here } @@ -120,27 +120,27 @@ class Pm1ConcentrationMeasurementCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readMeasurementUnitAttribute(): Integer { + suspend fun readMeasurementUnitAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeMeasurementUnitAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeMeasurementUnitAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readMeasurementMediumAttribute(): Integer { + suspend fun readMeasurementMediumAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeMeasurementMediumAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeMeasurementMediumAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readLevelValueAttribute(): Integer { + suspend fun readLevelValueAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeLevelValueAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeLevelValueAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -185,19 +185,19 @@ class Pm1ConcentrationMeasurementCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm25ConcentrationMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm25ConcentrationMeasurementCluster.kt index 251190e5dc24dc..bcc05a26a5f124 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm25ConcentrationMeasurementCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm25ConcentrationMeasurementCluster.kt @@ -82,11 +82,11 @@ class Pm25ConcentrationMeasurementCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readPeakMeasuredValueWindowAttribute(): Long { + suspend fun readPeakMeasuredValueWindowAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribePeakMeasuredValueWindowAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribePeakMeasuredValueWindowAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } @@ -101,14 +101,14 @@ class Pm25ConcentrationMeasurementCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readAverageMeasuredValueWindowAttribute(): Long { + suspend fun readAverageMeasuredValueWindowAttribute(): UInt { // Implementation needs to be added here } suspend fun subscribeAverageMeasuredValueWindowAttribute( minInterval: Int, maxInterval: Int - ): Long { + ): UInt { // Implementation needs to be added here } @@ -120,27 +120,27 @@ class Pm25ConcentrationMeasurementCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readMeasurementUnitAttribute(): Integer { + suspend fun readMeasurementUnitAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeMeasurementUnitAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeMeasurementUnitAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readMeasurementMediumAttribute(): Integer { + suspend fun readMeasurementMediumAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeMeasurementMediumAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeMeasurementMediumAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readLevelValueAttribute(): Integer { + suspend fun readLevelValueAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeLevelValueAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeLevelValueAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -185,19 +185,19 @@ class Pm25ConcentrationMeasurementCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PowerSourceCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PowerSourceCluster.kt index f4a7540167e7f3..a1a4ca2b53c0a1 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PowerSourceCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PowerSourceCluster.kt @@ -52,19 +52,19 @@ class PowerSourceCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun readStatusAttribute(): Integer { + suspend fun readStatusAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeStatusAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeStatusAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readOrderAttribute(): Integer { + suspend fun readOrderAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeOrderAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeOrderAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -98,11 +98,11 @@ class PowerSourceCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readWiredCurrentTypeAttribute(): Integer { + suspend fun readWiredCurrentTypeAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeWiredCurrentTypeAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeWiredCurrentTypeAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -117,19 +117,19 @@ class PowerSourceCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readWiredNominalVoltageAttribute(): Long { + suspend fun readWiredNominalVoltageAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeWiredNominalVoltageAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeWiredNominalVoltageAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readWiredMaximumCurrentAttribute(): Long { + suspend fun readWiredMaximumCurrentAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeWiredMaximumCurrentAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeWiredMaximumCurrentAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } @@ -185,11 +185,11 @@ class PowerSourceCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readBatChargeLevelAttribute(): Integer { + suspend fun readBatChargeLevelAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeBatChargeLevelAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeBatChargeLevelAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -201,11 +201,11 @@ class PowerSourceCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readBatReplaceabilityAttribute(): Integer { + suspend fun readBatReplaceabilityAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeBatReplaceabilityAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeBatReplaceabilityAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -239,11 +239,11 @@ class PowerSourceCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readBatCommonDesignationAttribute(): Integer { + suspend fun readBatCommonDesignationAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeBatCommonDesignationAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeBatCommonDesignationAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } @@ -263,35 +263,35 @@ class PowerSourceCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readBatApprovedChemistryAttribute(): Integer { + suspend fun readBatApprovedChemistryAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeBatApprovedChemistryAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeBatApprovedChemistryAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readBatCapacityAttribute(): Long { + suspend fun readBatCapacityAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeBatCapacityAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeBatCapacityAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readBatQuantityAttribute(): Integer { + suspend fun readBatQuantityAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeBatQuantityAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeBatQuantityAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readBatChargeStateAttribute(): Integer { + suspend fun readBatChargeStateAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeBatChargeStateAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeBatChargeStateAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -391,19 +391,19 @@ class PowerSourceCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PowerSourceConfigurationCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PowerSourceConfigurationCluster.kt index 34e8ca1b244df2..465df21407c031 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PowerSourceConfigurationCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PowerSourceConfigurationCluster.kt @@ -20,7 +20,7 @@ package matter.devicecontroller.cluster.clusters import java.util.ArrayList class PowerSourceConfigurationCluster(private val endpointId: UShort) { - class SourcesAttribute(val value: ArrayList) + class SourcesAttribute(val value: ArrayList) class GeneratedCommandListAttribute(val value: ArrayList) @@ -79,19 +79,19 @@ class PowerSourceConfigurationCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PressureMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PressureMeasurementCluster.kt index 52e73b9e3eab25..4bbc2eb021dd60 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PressureMeasurementCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PressureMeasurementCluster.kt @@ -73,11 +73,11 @@ class PressureMeasurementCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readToleranceAttribute(): Integer { + suspend fun readToleranceAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeToleranceAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeToleranceAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } @@ -114,19 +114,19 @@ class PressureMeasurementCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readScaledToleranceAttribute(): Integer { + suspend fun readScaledToleranceAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeScaledToleranceAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeScaledToleranceAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readScaleAttribute(): Integer { + suspend fun readScaleAttribute(): Byte { // Implementation needs to be added here } - suspend fun subscribeScaleAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeScaleAttribute(minInterval: Int, maxInterval: Int): Byte { // Implementation needs to be added here } @@ -171,19 +171,19 @@ class PressureMeasurementCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyConfigurationCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyConfigurationCluster.kt index 9d75f438e3f861..a4ccebc42ac090 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyConfigurationCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyConfigurationCluster.kt @@ -69,19 +69,19 @@ class ProxyConfigurationCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyDiscoveryCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyDiscoveryCluster.kt index 2933f46526fc51..bb36d71e8eb07f 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyDiscoveryCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyDiscoveryCluster.kt @@ -69,19 +69,19 @@ class ProxyDiscoveryCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyValidCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyValidCluster.kt index b7c2f43e30810c..9e0e7d84c3a0d0 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyValidCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyValidCluster.kt @@ -69,19 +69,19 @@ class ProxyValidCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PulseWidthModulationCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PulseWidthModulationCluster.kt index f0ebebcd008dde..0183a08f7f10dc 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PulseWidthModulationCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PulseWidthModulationCluster.kt @@ -69,19 +69,19 @@ class PulseWidthModulationCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PumpConfigurationAndControlCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PumpConfigurationAndControlCluster.kt index 3b92a86031b99a..08f4c5c5c0aab9 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PumpConfigurationAndControlCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PumpConfigurationAndControlCluster.kt @@ -201,30 +201,27 @@ class PumpConfigurationAndControlCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readPumpStatusAttribute(): Integer { + suspend fun readPumpStatusAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribePumpStatusAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribePumpStatusAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readEffectiveOperationModeAttribute(): Integer { + suspend fun readEffectiveOperationModeAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeEffectiveOperationModeAttribute( - minInterval: Int, - maxInterval: Int - ): Integer { + suspend fun subscribeEffectiveOperationModeAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readEffectiveControlModeAttribute(): Integer { + suspend fun readEffectiveControlModeAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeEffectiveControlModeAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeEffectiveControlModeAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -290,7 +287,7 @@ class PumpConfigurationAndControlCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readOperationModeAttribute(): Integer { + suspend fun readOperationModeAttribute(): UByte { // Implementation needs to be added here } @@ -302,11 +299,11 @@ class PumpConfigurationAndControlCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeOperationModeAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeOperationModeAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readControlModeAttribute(): Integer { + suspend fun readControlModeAttribute(): UByte { // Implementation needs to be added here } @@ -318,7 +315,7 @@ class PumpConfigurationAndControlCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeControlModeAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeControlModeAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -363,19 +360,19 @@ class PumpConfigurationAndControlCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RadonConcentrationMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RadonConcentrationMeasurementCluster.kt index 8e3a86a1da46dd..945e652210361b 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RadonConcentrationMeasurementCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RadonConcentrationMeasurementCluster.kt @@ -82,11 +82,11 @@ class RadonConcentrationMeasurementCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readPeakMeasuredValueWindowAttribute(): Long { + suspend fun readPeakMeasuredValueWindowAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribePeakMeasuredValueWindowAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribePeakMeasuredValueWindowAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } @@ -101,14 +101,14 @@ class RadonConcentrationMeasurementCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readAverageMeasuredValueWindowAttribute(): Long { + suspend fun readAverageMeasuredValueWindowAttribute(): UInt { // Implementation needs to be added here } suspend fun subscribeAverageMeasuredValueWindowAttribute( minInterval: Int, maxInterval: Int - ): Long { + ): UInt { // Implementation needs to be added here } @@ -120,27 +120,27 @@ class RadonConcentrationMeasurementCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readMeasurementUnitAttribute(): Integer { + suspend fun readMeasurementUnitAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeMeasurementUnitAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeMeasurementUnitAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readMeasurementMediumAttribute(): Integer { + suspend fun readMeasurementMediumAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeMeasurementMediumAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeMeasurementMediumAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readLevelValueAttribute(): Integer { + suspend fun readLevelValueAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeLevelValueAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeLevelValueAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -185,19 +185,19 @@ class RadonConcentrationMeasurementCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RefrigeratorAlarmCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RefrigeratorAlarmCluster.kt index 12d8df79b35501..817abe4adb6e3a 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RefrigeratorAlarmCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RefrigeratorAlarmCluster.kt @@ -28,27 +28,27 @@ class RefrigeratorAlarmCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun readMaskAttribute(): Long { + suspend fun readMaskAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeMaskAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeMaskAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readStateAttribute(): Long { + suspend fun readStateAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeStateAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeStateAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readSupportedAttribute(): Long { + suspend fun readSupportedAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeSupportedAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeSupportedAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } @@ -93,19 +93,19 @@ class RefrigeratorAlarmCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RefrigeratorAndTemperatureControlledCabinetModeCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RefrigeratorAndTemperatureControlledCabinetModeCluster.kt index be0d2f76bbe092..f36b82ceee2fb7 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RefrigeratorAndTemperatureControlledCabinetModeCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RefrigeratorAndTemperatureControlledCabinetModeCluster.kt @@ -39,12 +39,15 @@ class RefrigeratorAndTemperatureControlledCabinetModeCluster(private val endpoin class AttributeListAttribute(val value: ArrayList) - suspend fun changeToMode(newMode: UByte): ChangeToModeResponse { - // Implementation needs to be added here - } - - suspend fun changeToMode(newMode: UByte, timedInvokeTimeoutMs: Int): ChangeToModeResponse { - // Implementation needs to be added here + suspend fun changeToMode( + newMode: UByte, + timedInvokeTimeoutMs: Int? = null + ): ChangeToModeResponse { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun readSupportedModesAttribute(): SupportedModesAttribute { @@ -58,11 +61,11 @@ class RefrigeratorAndTemperatureControlledCabinetModeCluster(private val endpoin // Implementation needs to be added here } - suspend fun readCurrentModeAttribute(): Integer { + suspend fun readCurrentModeAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeCurrentModeAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeCurrentModeAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -142,19 +145,19 @@ class RefrigeratorAndTemperatureControlledCabinetModeCluster(private val endpoin // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RelativeHumidityMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RelativeHumidityMeasurementCluster.kt index 7ad724957088a0..d33ab1e6c9a7a4 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RelativeHumidityMeasurementCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RelativeHumidityMeasurementCluster.kt @@ -67,11 +67,11 @@ class RelativeHumidityMeasurementCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readToleranceAttribute(): Integer { + suspend fun readToleranceAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeToleranceAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeToleranceAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } @@ -116,19 +116,19 @@ class RelativeHumidityMeasurementCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcCleanModeCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcCleanModeCluster.kt index 183c9b4d5b9e37..3265616a9ed3dd 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcCleanModeCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcCleanModeCluster.kt @@ -36,12 +36,15 @@ class RvcCleanModeCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun changeToMode(newMode: UByte): ChangeToModeResponse { - // Implementation needs to be added here - } - - suspend fun changeToMode(newMode: UByte, timedInvokeTimeoutMs: Int): ChangeToModeResponse { - // Implementation needs to be added here + suspend fun changeToMode( + newMode: UByte, + timedInvokeTimeoutMs: Int? = null + ): ChangeToModeResponse { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun readSupportedModesAttribute(): SupportedModesAttribute { @@ -55,11 +58,11 @@ class RvcCleanModeCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readCurrentModeAttribute(): Integer { + suspend fun readCurrentModeAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeCurrentModeAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeCurrentModeAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -120,19 +123,19 @@ class RvcCleanModeCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcOperationalStateCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcOperationalStateCluster.kt index c05135a17ce6e8..913d76d7375be9 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcOperationalStateCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcOperationalStateCluster.kt @@ -46,36 +46,36 @@ class RvcOperationalStateCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun pause(): OperationalCommandResponse { - // Implementation needs to be added here - } - - suspend fun pause(timedInvokeTimeoutMs: Int): OperationalCommandResponse { - // Implementation needs to be added here - } - - suspend fun stop(): OperationalCommandResponse { - // Implementation needs to be added here - } - - suspend fun stop(timedInvokeTimeoutMs: Int): OperationalCommandResponse { - // Implementation needs to be added here - } - - suspend fun start(): OperationalCommandResponse { - // Implementation needs to be added here + suspend fun pause(timedInvokeTimeoutMs: Int? = null): OperationalCommandResponse { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun start(timedInvokeTimeoutMs: Int): OperationalCommandResponse { - // Implementation needs to be added here + suspend fun stop(timedInvokeTimeoutMs: Int? = null): OperationalCommandResponse { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun resume(): OperationalCommandResponse { - // Implementation needs to be added here + suspend fun start(timedInvokeTimeoutMs: Int? = null): OperationalCommandResponse { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun resume(timedInvokeTimeoutMs: Int): OperationalCommandResponse { - // Implementation needs to be added here + suspend fun resume(timedInvokeTimeoutMs: Int? = null): OperationalCommandResponse { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun readPhaseListAttribute(): PhaseListAttribute { @@ -119,11 +119,11 @@ class RvcOperationalStateCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readOperationalStateAttribute(): Integer { + suspend fun readOperationalStateAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeOperationalStateAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeOperationalStateAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -179,19 +179,19 @@ class RvcOperationalStateCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcRunModeCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcRunModeCluster.kt index 7e157abea4027f..045aab80dd57c2 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcRunModeCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcRunModeCluster.kt @@ -36,12 +36,15 @@ class RvcRunModeCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun changeToMode(newMode: UByte): ChangeToModeResponse { - // Implementation needs to be added here - } - - suspend fun changeToMode(newMode: UByte, timedInvokeTimeoutMs: Int): ChangeToModeResponse { - // Implementation needs to be added here + suspend fun changeToMode( + newMode: UByte, + timedInvokeTimeoutMs: Int? = null + ): ChangeToModeResponse { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun readSupportedModesAttribute(): SupportedModesAttribute { @@ -55,11 +58,11 @@ class RvcRunModeCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readCurrentModeAttribute(): Integer { + suspend fun readCurrentModeAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeCurrentModeAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeCurrentModeAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -120,19 +123,19 @@ class RvcRunModeCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SampleMeiCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SampleMeiCluster.kt index bddd578ea3b2d5..3453b23490904b 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SampleMeiCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SampleMeiCluster.kt @@ -30,24 +30,24 @@ class SampleMeiCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun ping() { - // Implementation needs to be added here - } - - suspend fun ping(timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } - - suspend fun addArguments(arg1: UByte, arg2: UByte): AddArgumentsResponse { - // Implementation needs to be added here + suspend fun ping(timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun addArguments( arg1: UByte, arg2: UByte, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): AddArgumentsResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun readFlipFlopAttribute(): Boolean { @@ -107,19 +107,19 @@ class SampleMeiCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ScenesCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ScenesCluster.kt index fdff3ad57b9aa6..11d3113f504488 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ScenesCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ScenesCluster.kt @@ -71,103 +71,90 @@ class ScenesCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun addScene( - groupID: UShort, - sceneID: UByte, - transitionTime: UShort, - sceneName: String, - extensionFieldSets: ArrayList - ): AddSceneResponse { - // Implementation needs to be added here - } - suspend fun addScene( groupID: UShort, sceneID: UByte, transitionTime: UShort, sceneName: String, extensionFieldSets: ArrayList, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): AddSceneResponse { - // Implementation needs to be added here - } - - suspend fun viewScene(groupID: UShort, sceneID: UByte): ViewSceneResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun viewScene( groupID: UShort, sceneID: UByte, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): ViewSceneResponse { - // Implementation needs to be added here - } - - suspend fun removeScene(groupID: UShort, sceneID: UByte): RemoveSceneResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun removeScene( groupID: UShort, sceneID: UByte, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): RemoveSceneResponse { - // Implementation needs to be added here - } - - suspend fun removeAllScenes(groupID: UShort): RemoveAllScenesResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun removeAllScenes(groupID: UShort, timedInvokeTimeoutMs: Int): RemoveAllScenesResponse { - // Implementation needs to be added here - } - - suspend fun storeScene(groupID: UShort, sceneID: UByte): StoreSceneResponse { - // Implementation needs to be added here + suspend fun removeAllScenes( + groupID: UShort, + timedInvokeTimeoutMs: Int? = null + ): RemoveAllScenesResponse { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun storeScene( groupID: UShort, sceneID: UByte, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): StoreSceneResponse { - // Implementation needs to be added here - } - - suspend fun recallScene(groupID: UShort, sceneID: UByte, transitionTime: UShort?) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun recallScene( groupID: UShort, sceneID: UByte, transitionTime: UShort?, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here - } - - suspend fun getSceneMembership(groupID: UShort): GetSceneMembershipResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun getSceneMembership( groupID: UShort, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): GetSceneMembershipResponse { - // Implementation needs to be added here - } - - suspend fun enhancedAddScene( - groupID: UShort, - sceneID: UByte, - transitionTime: UShort, - sceneName: String, - extensionFieldSets: ArrayList - ): EnhancedAddSceneResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun enhancedAddScene( @@ -176,31 +163,25 @@ class ScenesCluster(private val endpointId: UShort) { transitionTime: UShort, sceneName: String, extensionFieldSets: ArrayList, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): EnhancedAddSceneResponse { - // Implementation needs to be added here - } - - suspend fun enhancedViewScene(groupID: UShort, sceneID: UByte): EnhancedViewSceneResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun enhancedViewScene( groupID: UShort, sceneID: UByte, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): EnhancedViewSceneResponse { - // Implementation needs to be added here - } - - suspend fun copyScene( - mode: UInt, - groupIdentifierFrom: UShort, - sceneIdentifierFrom: UByte, - groupIdentifierTo: UShort, - sceneIdentifierTo: UByte - ): CopySceneResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun copyScene( @@ -209,32 +190,36 @@ class ScenesCluster(private val endpointId: UShort) { sceneIdentifierFrom: UByte, groupIdentifierTo: UShort, sceneIdentifierTo: UByte, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): CopySceneResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun readSceneCountAttribute(): Integer { + suspend fun readSceneCountAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeSceneCountAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeSceneCountAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readCurrentSceneAttribute(): Integer { + suspend fun readCurrentSceneAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeCurrentSceneAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeCurrentSceneAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readCurrentGroupAttribute(): Integer { + suspend fun readCurrentGroupAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeCurrentGroupAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeCurrentGroupAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } @@ -246,11 +231,11 @@ class ScenesCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readNameSupportAttribute(): Integer { + suspend fun readNameSupportAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeNameSupportAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeNameSupportAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -265,19 +250,19 @@ class ScenesCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readSceneTableSizeAttribute(): Integer { + suspend fun readSceneTableSizeAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeSceneTableSizeAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeSceneTableSizeAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readRemainingCapacityAttribute(): Integer { + suspend fun readRemainingCapacityAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeRemainingCapacityAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeRemainingCapacityAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -322,19 +307,19 @@ class ScenesCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SmokeCoAlarmCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SmokeCoAlarmCluster.kt index e9a153e56bb2cc..3b0e50ed0434ee 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SmokeCoAlarmCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SmokeCoAlarmCluster.kt @@ -28,51 +28,51 @@ class SmokeCoAlarmCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun selfTestRequest() { - // Implementation needs to be added here - } - - suspend fun selfTestRequest(timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here + suspend fun selfTestRequest(timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun readExpressedStateAttribute(): Integer { + suspend fun readExpressedStateAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeExpressedStateAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeExpressedStateAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readSmokeStateAttribute(): Integer { + suspend fun readSmokeStateAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeSmokeStateAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeSmokeStateAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readCOStateAttribute(): Integer { + suspend fun readCOStateAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeCOStateAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeCOStateAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readBatteryAlertAttribute(): Integer { + suspend fun readBatteryAlertAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeBatteryAlertAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeBatteryAlertAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readDeviceMutedAttribute(): Integer { + suspend fun readDeviceMutedAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeDeviceMutedAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeDeviceMutedAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -92,42 +92,39 @@ class SmokeCoAlarmCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readEndOfServiceAlertAttribute(): Integer { + suspend fun readEndOfServiceAlertAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeEndOfServiceAlertAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeEndOfServiceAlertAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readInterconnectSmokeAlarmAttribute(): Integer { + suspend fun readInterconnectSmokeAlarmAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeInterconnectSmokeAlarmAttribute( - minInterval: Int, - maxInterval: Int - ): Integer { + suspend fun subscribeInterconnectSmokeAlarmAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readInterconnectCOAlarmAttribute(): Integer { + suspend fun readInterconnectCOAlarmAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeInterconnectCOAlarmAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeInterconnectCOAlarmAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readContaminationStateAttribute(): Integer { + suspend fun readContaminationStateAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeContaminationStateAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeContaminationStateAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readSmokeSensitivityLevelAttribute(): Integer { + suspend fun readSmokeSensitivityLevelAttribute(): UByte { // Implementation needs to be added here } @@ -139,15 +136,15 @@ class SmokeCoAlarmCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeSmokeSensitivityLevelAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeSmokeSensitivityLevelAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readExpiryDateAttribute(): Long { + suspend fun readExpiryDateAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeExpiryDateAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeExpiryDateAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } @@ -192,19 +189,19 @@ class SmokeCoAlarmCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SoftwareDiagnosticsCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SoftwareDiagnosticsCluster.kt index 4b541c607a8399..7188448084f1db 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SoftwareDiagnosticsCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SoftwareDiagnosticsCluster.kt @@ -32,12 +32,12 @@ class SoftwareDiagnosticsCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun resetWatermarks() { - // Implementation needs to be added here - } - - suspend fun resetWatermarks(timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here + suspend fun resetWatermarks(timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun readThreadMetricsAttribute(): ThreadMetricsAttribute { @@ -51,27 +51,30 @@ class SoftwareDiagnosticsCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readCurrentHeapFreeAttribute(): Long { + suspend fun readCurrentHeapFreeAttribute(): ULong { // Implementation needs to be added here } - suspend fun subscribeCurrentHeapFreeAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeCurrentHeapFreeAttribute(minInterval: Int, maxInterval: Int): ULong { // Implementation needs to be added here } - suspend fun readCurrentHeapUsedAttribute(): Long { + suspend fun readCurrentHeapUsedAttribute(): ULong { // Implementation needs to be added here } - suspend fun subscribeCurrentHeapUsedAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeCurrentHeapUsedAttribute(minInterval: Int, maxInterval: Int): ULong { // Implementation needs to be added here } - suspend fun readCurrentHeapHighWatermarkAttribute(): Long { + suspend fun readCurrentHeapHighWatermarkAttribute(): ULong { // Implementation needs to be added here } - suspend fun subscribeCurrentHeapHighWatermarkAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeCurrentHeapHighWatermarkAttribute( + minInterval: Int, + maxInterval: Int + ): ULong { // Implementation needs to be added here } @@ -116,19 +119,19 @@ class SoftwareDiagnosticsCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SwitchCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SwitchCluster.kt index b9d35970afe971..a7d2a5eaac0e94 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SwitchCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SwitchCluster.kt @@ -28,27 +28,27 @@ class SwitchCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun readNumberOfPositionsAttribute(): Integer { + suspend fun readNumberOfPositionsAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeNumberOfPositionsAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeNumberOfPositionsAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readCurrentPositionAttribute(): Integer { + suspend fun readCurrentPositionAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeCurrentPositionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeCurrentPositionAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readMultiPressMaxAttribute(): Integer { + suspend fun readMultiPressMaxAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeMultiPressMaxAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeMultiPressMaxAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -93,19 +93,19 @@ class SwitchCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TargetNavigatorCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TargetNavigatorCluster.kt index e1d3dfeb51b644..1f74204e4b7ee1 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TargetNavigatorCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TargetNavigatorCluster.kt @@ -34,16 +34,16 @@ class TargetNavigatorCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun navigateTarget(target: UByte, data: String?): NavigateTargetResponse { - // Implementation needs to be added here - } - suspend fun navigateTarget( target: UByte, data: String?, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): NavigateTargetResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun readTargetListAttribute(): TargetListAttribute { @@ -57,11 +57,11 @@ class TargetNavigatorCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readCurrentTargetAttribute(): Integer { + suspend fun readCurrentTargetAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeCurrentTargetAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeCurrentTargetAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -106,19 +106,19 @@ class TargetNavigatorCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TemperatureControlCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TemperatureControlCluster.kt index ab185aac10dbd7..eeb0afbba7a049 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TemperatureControlCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TemperatureControlCluster.kt @@ -30,58 +30,58 @@ class TemperatureControlCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun setTemperature(targetTemperature: Short?, targetTemperatureLevel: UByte?) { - // Implementation needs to be added here - } - suspend fun setTemperature( targetTemperature: Short?, targetTemperatureLevel: UByte?, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun readTemperatureSetpointAttribute(): Integer { + suspend fun readTemperatureSetpointAttribute(): Short { // Implementation needs to be added here } - suspend fun subscribeTemperatureSetpointAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeTemperatureSetpointAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readMinTemperatureAttribute(): Integer { + suspend fun readMinTemperatureAttribute(): Short { // Implementation needs to be added here } - suspend fun subscribeMinTemperatureAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeMinTemperatureAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readMaxTemperatureAttribute(): Integer { + suspend fun readMaxTemperatureAttribute(): Short { // Implementation needs to be added here } - suspend fun subscribeMaxTemperatureAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeMaxTemperatureAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readStepAttribute(): Integer { + suspend fun readStepAttribute(): Short { // Implementation needs to be added here } - suspend fun subscribeStepAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeStepAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readSelectedTemperatureLevelAttribute(): Integer { + suspend fun readSelectedTemperatureLevelAttribute(): UByte { // Implementation needs to be added here } suspend fun subscribeSelectedTemperatureLevelAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UByte { // Implementation needs to be added here } @@ -137,19 +137,19 @@ class TemperatureControlCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TemperatureMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TemperatureMeasurementCluster.kt index 363a575465d724..e7e758d9d92a39 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TemperatureMeasurementCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TemperatureMeasurementCluster.kt @@ -67,11 +67,11 @@ class TemperatureMeasurementCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readToleranceAttribute(): Integer { + suspend fun readToleranceAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeToleranceAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeToleranceAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } @@ -116,19 +116,19 @@ class TemperatureMeasurementCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThermostatCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThermostatCluster.kt index 2136037e98be10..857a84b6ff9430 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThermostatCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThermostatCluster.kt @@ -57,21 +57,12 @@ class ThermostatCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun setpointRaiseLower(mode: UInt, amount: Byte) { - // Implementation needs to be added here - } - - suspend fun setpointRaiseLower(mode: UInt, amount: Byte, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } - - suspend fun setWeeklySchedule( - numberOfTransitionsForSequence: UByte, - dayOfWeekForSequence: UInt, - modeForSequence: UInt, - transitions: ArrayList - ) { - // Implementation needs to be added here + suspend fun setpointRaiseLower(mode: UInt, amount: Byte, timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun setWeeklySchedule( @@ -79,29 +70,33 @@ class ThermostatCluster(private val endpointId: UShort) { dayOfWeekForSequence: UInt, modeForSequence: UInt, transitions: ArrayList, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here - } - - suspend fun getWeeklySchedule(daysToReturn: UInt, modeToReturn: UInt): GetWeeklyScheduleResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun getWeeklySchedule( daysToReturn: UInt, modeToReturn: UInt, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): GetWeeklyScheduleResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun clearWeeklySchedule() { - // Implementation needs to be added here - } - - suspend fun clearWeeklySchedule(timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here + suspend fun clearWeeklySchedule(timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun readLocalTemperatureAttribute(): LocalTemperatureAttribute { @@ -126,75 +121,63 @@ class ThermostatCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readOccupancyAttribute(): Integer { + suspend fun readOccupancyAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeOccupancyAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeOccupancyAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readAbsMinHeatSetpointLimitAttribute(): Integer { + suspend fun readAbsMinHeatSetpointLimitAttribute(): Short { // Implementation needs to be added here } - suspend fun subscribeAbsMinHeatSetpointLimitAttribute( - minInterval: Int, - maxInterval: Int - ): Integer { + suspend fun subscribeAbsMinHeatSetpointLimitAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readAbsMaxHeatSetpointLimitAttribute(): Integer { + suspend fun readAbsMaxHeatSetpointLimitAttribute(): Short { // Implementation needs to be added here } - suspend fun subscribeAbsMaxHeatSetpointLimitAttribute( - minInterval: Int, - maxInterval: Int - ): Integer { + suspend fun subscribeAbsMaxHeatSetpointLimitAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readAbsMinCoolSetpointLimitAttribute(): Integer { + suspend fun readAbsMinCoolSetpointLimitAttribute(): Short { // Implementation needs to be added here } - suspend fun subscribeAbsMinCoolSetpointLimitAttribute( - minInterval: Int, - maxInterval: Int - ): Integer { + suspend fun subscribeAbsMinCoolSetpointLimitAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readAbsMaxCoolSetpointLimitAttribute(): Integer { + suspend fun readAbsMaxCoolSetpointLimitAttribute(): Short { // Implementation needs to be added here } - suspend fun subscribeAbsMaxCoolSetpointLimitAttribute( - minInterval: Int, - maxInterval: Int - ): Integer { + suspend fun subscribeAbsMaxCoolSetpointLimitAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readPICoolingDemandAttribute(): Integer { + suspend fun readPICoolingDemandAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribePICoolingDemandAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribePICoolingDemandAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readPIHeatingDemandAttribute(): Integer { + suspend fun readPIHeatingDemandAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribePIHeatingDemandAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribePIHeatingDemandAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readHVACSystemTypeConfigurationAttribute(): Integer { + suspend fun readHVACSystemTypeConfigurationAttribute(): UByte { // Implementation needs to be added here } @@ -209,11 +192,11 @@ class ThermostatCluster(private val endpointId: UShort) { suspend fun subscribeHVACSystemTypeConfigurationAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UByte { // Implementation needs to be added here } - suspend fun readLocalTemperatureCalibrationAttribute(): Integer { + suspend fun readLocalTemperatureCalibrationAttribute(): Byte { // Implementation needs to be added here } @@ -228,11 +211,11 @@ class ThermostatCluster(private val endpointId: UShort) { suspend fun subscribeLocalTemperatureCalibrationAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): Byte { // Implementation needs to be added here } - suspend fun readOccupiedCoolingSetpointAttribute(): Integer { + suspend fun readOccupiedCoolingSetpointAttribute(): Short { // Implementation needs to be added here } @@ -244,14 +227,11 @@ class ThermostatCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeOccupiedCoolingSetpointAttribute( - minInterval: Int, - maxInterval: Int - ): Integer { + suspend fun subscribeOccupiedCoolingSetpointAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readOccupiedHeatingSetpointAttribute(): Integer { + suspend fun readOccupiedHeatingSetpointAttribute(): Short { // Implementation needs to be added here } @@ -263,14 +243,11 @@ class ThermostatCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeOccupiedHeatingSetpointAttribute( - minInterval: Int, - maxInterval: Int - ): Integer { + suspend fun subscribeOccupiedHeatingSetpointAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readUnoccupiedCoolingSetpointAttribute(): Integer { + suspend fun readUnoccupiedCoolingSetpointAttribute(): Short { // Implementation needs to be added here } @@ -285,11 +262,11 @@ class ThermostatCluster(private val endpointId: UShort) { suspend fun subscribeUnoccupiedCoolingSetpointAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): Short { // Implementation needs to be added here } - suspend fun readUnoccupiedHeatingSetpointAttribute(): Integer { + suspend fun readUnoccupiedHeatingSetpointAttribute(): Short { // Implementation needs to be added here } @@ -304,11 +281,11 @@ class ThermostatCluster(private val endpointId: UShort) { suspend fun subscribeUnoccupiedHeatingSetpointAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): Short { // Implementation needs to be added here } - suspend fun readMinHeatSetpointLimitAttribute(): Integer { + suspend fun readMinHeatSetpointLimitAttribute(): Short { // Implementation needs to be added here } @@ -320,11 +297,11 @@ class ThermostatCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeMinHeatSetpointLimitAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeMinHeatSetpointLimitAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readMaxHeatSetpointLimitAttribute(): Integer { + suspend fun readMaxHeatSetpointLimitAttribute(): Short { // Implementation needs to be added here } @@ -336,11 +313,11 @@ class ThermostatCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeMaxHeatSetpointLimitAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeMaxHeatSetpointLimitAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readMinCoolSetpointLimitAttribute(): Integer { + suspend fun readMinCoolSetpointLimitAttribute(): Short { // Implementation needs to be added here } @@ -352,11 +329,11 @@ class ThermostatCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeMinCoolSetpointLimitAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeMinCoolSetpointLimitAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readMaxCoolSetpointLimitAttribute(): Integer { + suspend fun readMaxCoolSetpointLimitAttribute(): Short { // Implementation needs to be added here } @@ -368,11 +345,11 @@ class ThermostatCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeMaxCoolSetpointLimitAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeMaxCoolSetpointLimitAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readMinSetpointDeadBandAttribute(): Integer { + suspend fun readMinSetpointDeadBandAttribute(): Byte { // Implementation needs to be added here } @@ -384,11 +361,11 @@ class ThermostatCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeMinSetpointDeadBandAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeMinSetpointDeadBandAttribute(minInterval: Int, maxInterval: Int): Byte { // Implementation needs to be added here } - suspend fun readRemoteSensingAttribute(): Integer { + suspend fun readRemoteSensingAttribute(): UByte { // Implementation needs to be added here } @@ -400,11 +377,11 @@ class ThermostatCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeRemoteSensingAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeRemoteSensingAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readControlSequenceOfOperationAttribute(): Integer { + suspend fun readControlSequenceOfOperationAttribute(): UByte { // Implementation needs to be added here } @@ -419,11 +396,11 @@ class ThermostatCluster(private val endpointId: UShort) { suspend fun subscribeControlSequenceOfOperationAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UByte { // Implementation needs to be added here } - suspend fun readSystemModeAttribute(): Integer { + suspend fun readSystemModeAttribute(): UByte { // Implementation needs to be added here } @@ -435,49 +412,49 @@ class ThermostatCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeSystemModeAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeSystemModeAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readThermostatRunningModeAttribute(): Integer { + suspend fun readThermostatRunningModeAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeThermostatRunningModeAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeThermostatRunningModeAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readStartOfWeekAttribute(): Integer { + suspend fun readStartOfWeekAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeStartOfWeekAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeStartOfWeekAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readNumberOfWeeklyTransitionsAttribute(): Integer { + suspend fun readNumberOfWeeklyTransitionsAttribute(): UByte { // Implementation needs to be added here } suspend fun subscribeNumberOfWeeklyTransitionsAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UByte { // Implementation needs to be added here } - suspend fun readNumberOfDailyTransitionsAttribute(): Integer { + suspend fun readNumberOfDailyTransitionsAttribute(): UByte { // Implementation needs to be added here } suspend fun subscribeNumberOfDailyTransitionsAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UByte { // Implementation needs to be added here } - suspend fun readTemperatureSetpointHoldAttribute(): Integer { + suspend fun readTemperatureSetpointHoldAttribute(): UByte { // Implementation needs to be added here } @@ -489,10 +466,7 @@ class ThermostatCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeTemperatureSetpointHoldAttribute( - minInterval: Int, - maxInterval: Int - ): Integer { + suspend fun subscribeTemperatureSetpointHoldAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -519,7 +493,7 @@ class ThermostatCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readThermostatProgrammingOperationModeAttribute(): Integer { + suspend fun readThermostatProgrammingOperationModeAttribute(): UByte { // Implementation needs to be added here } @@ -537,26 +511,23 @@ class ThermostatCluster(private val endpointId: UShort) { suspend fun subscribeThermostatProgrammingOperationModeAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UByte { // Implementation needs to be added here } - suspend fun readThermostatRunningStateAttribute(): Integer { + suspend fun readThermostatRunningStateAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeThermostatRunningStateAttribute( - minInterval: Int, - maxInterval: Int - ): Integer { + suspend fun subscribeThermostatRunningStateAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readSetpointChangeSourceAttribute(): Integer { + suspend fun readSetpointChangeSourceAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeSetpointChangeSourceAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeSetpointChangeSourceAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -571,14 +542,14 @@ class ThermostatCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readSetpointChangeSourceTimestampAttribute(): Long { + suspend fun readSetpointChangeSourceTimestampAttribute(): UInt { // Implementation needs to be added here } suspend fun subscribeSetpointChangeSourceTimestampAttribute( minInterval: Int, maxInterval: Int - ): Long { + ): UInt { // Implementation needs to be added here } @@ -664,7 +635,7 @@ class ThermostatCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readEmergencyHeatDeltaAttribute(): Integer { + suspend fun readEmergencyHeatDeltaAttribute(): UByte { // Implementation needs to be added here } @@ -676,11 +647,11 @@ class ThermostatCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeEmergencyHeatDeltaAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeEmergencyHeatDeltaAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readACTypeAttribute(): Integer { + suspend fun readACTypeAttribute(): UByte { // Implementation needs to be added here } @@ -692,11 +663,11 @@ class ThermostatCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeACTypeAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeACTypeAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readACCapacityAttribute(): Integer { + suspend fun readACCapacityAttribute(): UShort { // Implementation needs to be added here } @@ -708,11 +679,11 @@ class ThermostatCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeACCapacityAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeACCapacityAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readACRefrigerantTypeAttribute(): Integer { + suspend fun readACRefrigerantTypeAttribute(): UByte { // Implementation needs to be added here } @@ -724,11 +695,11 @@ class ThermostatCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeACRefrigerantTypeAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeACRefrigerantTypeAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readACCompressorTypeAttribute(): Integer { + suspend fun readACCompressorTypeAttribute(): UByte { // Implementation needs to be added here } @@ -740,11 +711,11 @@ class ThermostatCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeACCompressorTypeAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeACCompressorTypeAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readACErrorCodeAttribute(): Long { + suspend fun readACErrorCodeAttribute(): UInt { // Implementation needs to be added here } @@ -756,11 +727,11 @@ class ThermostatCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeACErrorCodeAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeACErrorCodeAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readACLouverPositionAttribute(): Integer { + suspend fun readACLouverPositionAttribute(): UByte { // Implementation needs to be added here } @@ -772,7 +743,7 @@ class ThermostatCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeACLouverPositionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeACLouverPositionAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -787,7 +758,7 @@ class ThermostatCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readACCapacityformatAttribute(): Integer { + suspend fun readACCapacityformatAttribute(): UByte { // Implementation needs to be added here } @@ -799,7 +770,7 @@ class ThermostatCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeACCapacityformatAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeACCapacityformatAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -844,19 +815,19 @@ class ThermostatCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThermostatUserInterfaceConfigurationCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThermostatUserInterfaceConfigurationCluster.kt index 1a07633e2bc31c..78192bd598e59a 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThermostatUserInterfaceConfigurationCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThermostatUserInterfaceConfigurationCluster.kt @@ -28,7 +28,7 @@ class ThermostatUserInterfaceConfigurationCluster(private val endpointId: UShort class AttributeListAttribute(val value: ArrayList) - suspend fun readTemperatureDisplayModeAttribute(): Integer { + suspend fun readTemperatureDisplayModeAttribute(): UByte { // Implementation needs to be added here } @@ -40,14 +40,11 @@ class ThermostatUserInterfaceConfigurationCluster(private val endpointId: UShort // Implementation needs to be added here } - suspend fun subscribeTemperatureDisplayModeAttribute( - minInterval: Int, - maxInterval: Int - ): Integer { + suspend fun subscribeTemperatureDisplayModeAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readKeypadLockoutAttribute(): Integer { + suspend fun readKeypadLockoutAttribute(): UByte { // Implementation needs to be added here } @@ -59,11 +56,11 @@ class ThermostatUserInterfaceConfigurationCluster(private val endpointId: UShort // Implementation needs to be added here } - suspend fun subscribeKeypadLockoutAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeKeypadLockoutAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readScheduleProgrammingVisibilityAttribute(): Integer { + suspend fun readScheduleProgrammingVisibilityAttribute(): UByte { // Implementation needs to be added here } @@ -78,7 +75,7 @@ class ThermostatUserInterfaceConfigurationCluster(private val endpointId: UShort suspend fun subscribeScheduleProgrammingVisibilityAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UByte { // Implementation needs to be added here } @@ -123,19 +120,19 @@ class ThermostatUserInterfaceConfigurationCluster(private val endpointId: UShort // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThreadNetworkDiagnosticsCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThreadNetworkDiagnosticsCluster.kt index a9fa281c1384b3..bf26e9cf3dc874 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThreadNetworkDiagnosticsCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThreadNetworkDiagnosticsCluster.kt @@ -76,12 +76,12 @@ class ThreadNetworkDiagnosticsCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun resetCounts() { - // Implementation needs to be added here - } - - suspend fun resetCounts(timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here + suspend fun resetCounts(timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun readChannelAttribute(): ChannelAttribute { @@ -144,11 +144,11 @@ class ThreadNetworkDiagnosticsCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readOverrunCountAttribute(): Long { + suspend fun readOverrunCountAttribute(): ULong { // Implementation needs to be added here } - suspend fun subscribeOverrunCountAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeOverrunCountAttribute(minInterval: Int, maxInterval: Int): ULong { // Implementation needs to be added here } @@ -226,354 +226,351 @@ class ThreadNetworkDiagnosticsCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readDetachedRoleCountAttribute(): Integer { + suspend fun readDetachedRoleCountAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeDetachedRoleCountAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeDetachedRoleCountAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readChildRoleCountAttribute(): Integer { + suspend fun readChildRoleCountAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeChildRoleCountAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeChildRoleCountAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readRouterRoleCountAttribute(): Integer { + suspend fun readRouterRoleCountAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeRouterRoleCountAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeRouterRoleCountAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readLeaderRoleCountAttribute(): Integer { + suspend fun readLeaderRoleCountAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeLeaderRoleCountAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeLeaderRoleCountAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readAttachAttemptCountAttribute(): Integer { + suspend fun readAttachAttemptCountAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeAttachAttemptCountAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeAttachAttemptCountAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readPartitionIdChangeCountAttribute(): Integer { + suspend fun readPartitionIdChangeCountAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribePartitionIdChangeCountAttribute( - minInterval: Int, - maxInterval: Int - ): Integer { + suspend fun subscribePartitionIdChangeCountAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readBetterPartitionAttachAttemptCountAttribute(): Integer { + suspend fun readBetterPartitionAttachAttemptCountAttribute(): UShort { // Implementation needs to be added here } suspend fun subscribeBetterPartitionAttachAttemptCountAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UShort { // Implementation needs to be added here } - suspend fun readParentChangeCountAttribute(): Integer { + suspend fun readParentChangeCountAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeParentChangeCountAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeParentChangeCountAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readTxTotalCountAttribute(): Long { + suspend fun readTxTotalCountAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeTxTotalCountAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeTxTotalCountAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readTxUnicastCountAttribute(): Long { + suspend fun readTxUnicastCountAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeTxUnicastCountAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeTxUnicastCountAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readTxBroadcastCountAttribute(): Long { + suspend fun readTxBroadcastCountAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeTxBroadcastCountAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeTxBroadcastCountAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readTxAckRequestedCountAttribute(): Long { + suspend fun readTxAckRequestedCountAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeTxAckRequestedCountAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeTxAckRequestedCountAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readTxAckedCountAttribute(): Long { + suspend fun readTxAckedCountAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeTxAckedCountAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeTxAckedCountAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readTxNoAckRequestedCountAttribute(): Long { + suspend fun readTxNoAckRequestedCountAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeTxNoAckRequestedCountAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeTxNoAckRequestedCountAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readTxDataCountAttribute(): Long { + suspend fun readTxDataCountAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeTxDataCountAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeTxDataCountAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readTxDataPollCountAttribute(): Long { + suspend fun readTxDataPollCountAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeTxDataPollCountAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeTxDataPollCountAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readTxBeaconCountAttribute(): Long { + suspend fun readTxBeaconCountAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeTxBeaconCountAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeTxBeaconCountAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readTxBeaconRequestCountAttribute(): Long { + suspend fun readTxBeaconRequestCountAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeTxBeaconRequestCountAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeTxBeaconRequestCountAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readTxOtherCountAttribute(): Long { + suspend fun readTxOtherCountAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeTxOtherCountAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeTxOtherCountAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readTxRetryCountAttribute(): Long { + suspend fun readTxRetryCountAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeTxRetryCountAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeTxRetryCountAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readTxDirectMaxRetryExpiryCountAttribute(): Long { + suspend fun readTxDirectMaxRetryExpiryCountAttribute(): UInt { // Implementation needs to be added here } suspend fun subscribeTxDirectMaxRetryExpiryCountAttribute( minInterval: Int, maxInterval: Int - ): Long { + ): UInt { // Implementation needs to be added here } - suspend fun readTxIndirectMaxRetryExpiryCountAttribute(): Long { + suspend fun readTxIndirectMaxRetryExpiryCountAttribute(): UInt { // Implementation needs to be added here } suspend fun subscribeTxIndirectMaxRetryExpiryCountAttribute( minInterval: Int, maxInterval: Int - ): Long { + ): UInt { // Implementation needs to be added here } - suspend fun readTxErrCcaCountAttribute(): Long { + suspend fun readTxErrCcaCountAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeTxErrCcaCountAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeTxErrCcaCountAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readTxErrAbortCountAttribute(): Long { + suspend fun readTxErrAbortCountAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeTxErrAbortCountAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeTxErrAbortCountAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readTxErrBusyChannelCountAttribute(): Long { + suspend fun readTxErrBusyChannelCountAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeTxErrBusyChannelCountAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeTxErrBusyChannelCountAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readRxTotalCountAttribute(): Long { + suspend fun readRxTotalCountAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeRxTotalCountAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeRxTotalCountAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readRxUnicastCountAttribute(): Long { + suspend fun readRxUnicastCountAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeRxUnicastCountAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeRxUnicastCountAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readRxBroadcastCountAttribute(): Long { + suspend fun readRxBroadcastCountAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeRxBroadcastCountAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeRxBroadcastCountAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readRxDataCountAttribute(): Long { + suspend fun readRxDataCountAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeRxDataCountAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeRxDataCountAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readRxDataPollCountAttribute(): Long { + suspend fun readRxDataPollCountAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeRxDataPollCountAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeRxDataPollCountAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readRxBeaconCountAttribute(): Long { + suspend fun readRxBeaconCountAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeRxBeaconCountAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeRxBeaconCountAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readRxBeaconRequestCountAttribute(): Long { + suspend fun readRxBeaconRequestCountAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeRxBeaconRequestCountAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeRxBeaconRequestCountAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readRxOtherCountAttribute(): Long { + suspend fun readRxOtherCountAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeRxOtherCountAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeRxOtherCountAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readRxAddressFilteredCountAttribute(): Long { + suspend fun readRxAddressFilteredCountAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeRxAddressFilteredCountAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeRxAddressFilteredCountAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readRxDestAddrFilteredCountAttribute(): Long { + suspend fun readRxDestAddrFilteredCountAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeRxDestAddrFilteredCountAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeRxDestAddrFilteredCountAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readRxDuplicatedCountAttribute(): Long { + suspend fun readRxDuplicatedCountAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeRxDuplicatedCountAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeRxDuplicatedCountAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readRxErrNoFrameCountAttribute(): Long { + suspend fun readRxErrNoFrameCountAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeRxErrNoFrameCountAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeRxErrNoFrameCountAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readRxErrUnknownNeighborCountAttribute(): Long { + suspend fun readRxErrUnknownNeighborCountAttribute(): UInt { // Implementation needs to be added here } suspend fun subscribeRxErrUnknownNeighborCountAttribute( minInterval: Int, maxInterval: Int - ): Long { + ): UInt { // Implementation needs to be added here } - suspend fun readRxErrInvalidSrcAddrCountAttribute(): Long { + suspend fun readRxErrInvalidSrcAddrCountAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeRxErrInvalidSrcAddrCountAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeRxErrInvalidSrcAddrCountAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readRxErrSecCountAttribute(): Long { + suspend fun readRxErrSecCountAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeRxErrSecCountAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeRxErrSecCountAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readRxErrFcsCountAttribute(): Long { + suspend fun readRxErrFcsCountAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeRxErrFcsCountAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeRxErrFcsCountAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readRxErrOtherCountAttribute(): Long { + suspend fun readRxErrOtherCountAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeRxErrOtherCountAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeRxErrOtherCountAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } @@ -692,19 +689,19 @@ class ThreadNetworkDiagnosticsCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TimeFormatLocalizationCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TimeFormatLocalizationCluster.kt index 176b4a4e04ac94..593223c563e697 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TimeFormatLocalizationCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TimeFormatLocalizationCluster.kt @@ -30,7 +30,7 @@ class TimeFormatLocalizationCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun readHourFormatAttribute(): Integer { + suspend fun readHourFormatAttribute(): UByte { // Implementation needs to be added here } @@ -42,11 +42,11 @@ class TimeFormatLocalizationCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeHourFormatAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeHourFormatAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readActiveCalendarTypeAttribute(): Integer { + suspend fun readActiveCalendarTypeAttribute(): UByte { // Implementation needs to be added here } @@ -58,7 +58,7 @@ class TimeFormatLocalizationCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeActiveCalendarTypeAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeActiveCalendarTypeAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -114,19 +114,19 @@ class TimeFormatLocalizationCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TimeSynchronizationCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TimeSynchronizationCluster.kt index 7f49fa4b98cdfb..478d89838c3120 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TimeSynchronizationCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TimeSynchronizationCluster.kt @@ -48,64 +48,58 @@ class TimeSynchronizationCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun setUTCTime(UTCTime: ULong, granularity: UInt, timeSource: UInt?) { - // Implementation needs to be added here - } - suspend fun setUTCTime( UTCTime: ULong, granularity: UInt, timeSource: UInt?, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here - } - - suspend fun setTrustedTimeSource( - trustedTimeSource: ChipStructs.TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct? - ) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun setTrustedTimeSource( trustedTimeSource: ChipStructs.TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct?, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here - } - - suspend fun setTimeZone( - timeZone: ArrayList - ): SetTimeZoneResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun setTimeZone( timeZone: ArrayList, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): SetTimeZoneResponse { - // Implementation needs to be added here - } - - suspend fun setDSTOffset( - DSTOffset: ArrayList - ) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun setDSTOffset( DSTOffset: ArrayList, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ) { - // Implementation needs to be added here - } - - suspend fun setDefaultNTP(defaultNTP: String?) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun setDefaultNTP(defaultNTP: String?, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here + suspend fun setDefaultNTP(defaultNTP: String?, timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun readUTCTimeAttribute(): UTCTimeAttribute { @@ -116,19 +110,19 @@ class TimeSynchronizationCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readGranularityAttribute(): Integer { + suspend fun readGranularityAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeGranularityAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeGranularityAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readTimeSourceAttribute(): Integer { + suspend fun readTimeSourceAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeTimeSourceAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeTimeSourceAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -178,11 +172,11 @@ class TimeSynchronizationCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readTimeZoneDatabaseAttribute(): Integer { + suspend fun readTimeZoneDatabaseAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeTimeZoneDatabaseAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeTimeZoneDatabaseAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -194,19 +188,19 @@ class TimeSynchronizationCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readTimeZoneListMaxSizeAttribute(): Integer { + suspend fun readTimeZoneListMaxSizeAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeTimeZoneListMaxSizeAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeTimeZoneListMaxSizeAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readDSTOffsetListMaxSizeAttribute(): Integer { + suspend fun readDSTOffsetListMaxSizeAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeDSTOffsetListMaxSizeAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeDSTOffsetListMaxSizeAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -259,19 +253,19 @@ class TimeSynchronizationCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TotalVolatileOrganicCompoundsConcentrationMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TotalVolatileOrganicCompoundsConcentrationMeasurementCluster.kt index 33fecf7e590537..948d6a51054a07 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TotalVolatileOrganicCompoundsConcentrationMeasurementCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TotalVolatileOrganicCompoundsConcentrationMeasurementCluster.kt @@ -82,11 +82,11 @@ class TotalVolatileOrganicCompoundsConcentrationMeasurementCluster(private val e // Implementation needs to be added here } - suspend fun readPeakMeasuredValueWindowAttribute(): Long { + suspend fun readPeakMeasuredValueWindowAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribePeakMeasuredValueWindowAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribePeakMeasuredValueWindowAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } @@ -101,14 +101,14 @@ class TotalVolatileOrganicCompoundsConcentrationMeasurementCluster(private val e // Implementation needs to be added here } - suspend fun readAverageMeasuredValueWindowAttribute(): Long { + suspend fun readAverageMeasuredValueWindowAttribute(): UInt { // Implementation needs to be added here } suspend fun subscribeAverageMeasuredValueWindowAttribute( minInterval: Int, maxInterval: Int - ): Long { + ): UInt { // Implementation needs to be added here } @@ -120,27 +120,27 @@ class TotalVolatileOrganicCompoundsConcentrationMeasurementCluster(private val e // Implementation needs to be added here } - suspend fun readMeasurementUnitAttribute(): Integer { + suspend fun readMeasurementUnitAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeMeasurementUnitAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeMeasurementUnitAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readMeasurementMediumAttribute(): Integer { + suspend fun readMeasurementMediumAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeMeasurementMediumAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeMeasurementMediumAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readLevelValueAttribute(): Integer { + suspend fun readLevelValueAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeLevelValueAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeLevelValueAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -185,19 +185,19 @@ class TotalVolatileOrganicCompoundsConcentrationMeasurementCluster(private val e // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UnitLocalizationCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UnitLocalizationCluster.kt index 5a621abdcd9189..515723d09d1391 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UnitLocalizationCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UnitLocalizationCluster.kt @@ -28,7 +28,7 @@ class UnitLocalizationCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun readTemperatureUnitAttribute(): Integer { + suspend fun readTemperatureUnitAttribute(): UByte { // Implementation needs to be added here } @@ -40,7 +40,7 @@ class UnitLocalizationCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeTemperatureUnitAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeTemperatureUnitAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -85,19 +85,19 @@ class UnitLocalizationCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UnitTestingCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UnitTestingCluster.kt index 918c3aa8fee80b..c66214714089f9 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UnitTestingCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UnitTestingCluster.kt @@ -179,70 +179,59 @@ class UnitTestingCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun test() { - // Implementation needs to be added here - } - - suspend fun test(timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } - - suspend fun testNotHandled() { - // Implementation needs to be added here - } - - suspend fun testNotHandled(timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } - - suspend fun testSpecific(): TestSpecificResponse { - // Implementation needs to be added here + suspend fun test(timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun testSpecific(timedInvokeTimeoutMs: Int): TestSpecificResponse { - // Implementation needs to be added here + suspend fun testNotHandled(timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun testUnknownCommand() { - // Implementation needs to be added here + suspend fun testSpecific(timedInvokeTimeoutMs: Int? = null): TestSpecificResponse { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun testUnknownCommand(timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } - - suspend fun testAddArguments(arg1: UByte, arg2: UByte): TestAddArgumentsResponse { - // Implementation needs to be added here + suspend fun testUnknownCommand(timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun testAddArguments( arg1: UByte, arg2: UByte, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): TestAddArgumentsResponse { - // Implementation needs to be added here - } - - suspend fun testSimpleArgumentRequest(arg1: Boolean): TestSimpleArgumentResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun testSimpleArgumentRequest( arg1: Boolean, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): TestSimpleArgumentResponse { - // Implementation needs to be added here - } - - suspend fun testStructArrayArgumentRequest( - arg1: ArrayList, - arg2: ArrayList, - arg3: ArrayList, - arg4: ArrayList, - arg5: UInt, - arg6: Boolean - ): TestStructArrayArgumentResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun testStructArrayArgumentRequest( @@ -252,136 +241,113 @@ class UnitTestingCluster(private val endpointId: UShort) { arg4: ArrayList, arg5: UInt, arg6: Boolean, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): TestStructArrayArgumentResponse { - // Implementation needs to be added here - } - - suspend fun testStructArgumentRequest( - arg1: ChipStructs.UnitTestingClusterSimpleStruct - ): BooleanResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun testStructArgumentRequest( arg1: ChipStructs.UnitTestingClusterSimpleStruct, - timedInvokeTimeoutMs: Int - ): BooleanResponse { - // Implementation needs to be added here - } - - suspend fun testNestedStructArgumentRequest( - arg1: ChipStructs.UnitTestingClusterNestedStruct + timedInvokeTimeoutMs: Int? = null ): BooleanResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun testNestedStructArgumentRequest( arg1: ChipStructs.UnitTestingClusterNestedStruct, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): BooleanResponse { - // Implementation needs to be added here - } - - suspend fun testListStructArgumentRequest( - arg1: ArrayList - ): BooleanResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun testListStructArgumentRequest( arg1: ArrayList, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): BooleanResponse { - // Implementation needs to be added here - } - - suspend fun testListInt8UArgumentRequest(arg1: ArrayList): BooleanResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun testListInt8UArgumentRequest( arg1: ArrayList, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): BooleanResponse { - // Implementation needs to be added here - } - - suspend fun testNestedStructListArgumentRequest( - arg1: ChipStructs.UnitTestingClusterNestedStructList - ): BooleanResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun testNestedStructListArgumentRequest( arg1: ChipStructs.UnitTestingClusterNestedStructList, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): BooleanResponse { - // Implementation needs to be added here - } - - suspend fun testListNestedStructListArgumentRequest( - arg1: ArrayList - ): BooleanResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun testListNestedStructListArgumentRequest( arg1: ArrayList, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): BooleanResponse { - // Implementation needs to be added here - } - - suspend fun testListInt8UReverseRequest(arg1: ArrayList): TestListInt8UReverseResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun testListInt8UReverseRequest( arg1: ArrayList, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): TestListInt8UReverseResponse { - // Implementation needs to be added here - } - - suspend fun testEnumsRequest(arg1: UShort, arg2: UInt): TestEnumsResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun testEnumsRequest( arg1: UShort, arg2: UInt, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): TestEnumsResponse { - // Implementation needs to be added here - } - - suspend fun testNullableOptionalRequest(arg1: UByte?): TestNullableOptionalResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun testNullableOptionalRequest( arg1: UByte?, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): TestNullableOptionalResponse { - // Implementation needs to be added here - } - - suspend fun testComplexNullableOptionalRequest( - nullableInt: UShort?, - optionalInt: UShort?, - nullableOptionalInt: UShort?, - nullableString: String?, - optionalString: String?, - nullableOptionalString: String?, - nullableStruct: ChipStructs.UnitTestingClusterSimpleStruct?, - optionalStruct: ChipStructs.UnitTestingClusterSimpleStruct?, - nullableOptionalStruct: ChipStructs.UnitTestingClusterSimpleStruct?, - nullableList: ArrayList?, - optionalList: ArrayList?, - nullableOptionalList: ArrayList? - ): TestComplexNullableOptionalResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun testComplexNullableOptionalRequest( @@ -397,64 +363,64 @@ class UnitTestingCluster(private val endpointId: UShort) { nullableList: ArrayList?, optionalList: ArrayList?, nullableOptionalList: ArrayList?, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): TestComplexNullableOptionalResponse { - // Implementation needs to be added here - } - - suspend fun simpleStructEchoRequest( - arg1: ChipStructs.UnitTestingClusterSimpleStruct - ): SimpleStructResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun simpleStructEchoRequest( arg1: ChipStructs.UnitTestingClusterSimpleStruct, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): SimpleStructResponse { - // Implementation needs to be added here - } - - suspend fun timedInvokeRequest(timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } - - suspend fun testSimpleOptionalArgumentRequest(arg1: Boolean?) { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun testSimpleOptionalArgumentRequest(arg1: Boolean?, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here + suspend fun timedInvokeRequest(timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun testEmitTestEventRequest( - arg1: UByte, - arg2: UInt, - arg3: Boolean - ): TestEmitTestEventResponse { - // Implementation needs to be added here + suspend fun testSimpleOptionalArgumentRequest(arg1: Boolean?, timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun testEmitTestEventRequest( arg1: UByte, arg2: UInt, arg3: Boolean, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): TestEmitTestEventResponse { - // Implementation needs to be added here - } - - suspend fun testEmitTestFabricScopedEventRequest( - arg1: UByte - ): TestEmitTestFabricScopedEventResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun testEmitTestFabricScopedEventRequest( arg1: UByte, - timedInvokeTimeoutMs: Int + timedInvokeTimeoutMs: Int? = null ): TestEmitTestFabricScopedEventResponse { - // Implementation needs to be added here + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun readBooleanAttribute(): Boolean { @@ -473,7 +439,7 @@ class UnitTestingCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readBitmap8Attribute(): Integer { + suspend fun readBitmap8Attribute(): UByte { // Implementation needs to be added here } @@ -485,11 +451,11 @@ class UnitTestingCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeBitmap8Attribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeBitmap8Attribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readBitmap16Attribute(): Integer { + suspend fun readBitmap16Attribute(): UShort { // Implementation needs to be added here } @@ -501,11 +467,11 @@ class UnitTestingCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeBitmap16Attribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeBitmap16Attribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readBitmap32Attribute(): Long { + suspend fun readBitmap32Attribute(): UInt { // Implementation needs to be added here } @@ -517,11 +483,11 @@ class UnitTestingCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeBitmap32Attribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeBitmap32Attribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readBitmap64Attribute(): Long { + suspend fun readBitmap64Attribute(): ULong { // Implementation needs to be added here } @@ -533,11 +499,11 @@ class UnitTestingCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeBitmap64Attribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeBitmap64Attribute(minInterval: Int, maxInterval: Int): ULong { // Implementation needs to be added here } - suspend fun readInt8uAttribute(): Integer { + suspend fun readInt8uAttribute(): UByte { // Implementation needs to be added here } @@ -549,11 +515,11 @@ class UnitTestingCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeInt8uAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeInt8uAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readInt16uAttribute(): Integer { + suspend fun readInt16uAttribute(): UShort { // Implementation needs to be added here } @@ -565,11 +531,11 @@ class UnitTestingCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeInt16uAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeInt16uAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readInt24uAttribute(): Long { + suspend fun readInt24uAttribute(): UInt { // Implementation needs to be added here } @@ -581,11 +547,11 @@ class UnitTestingCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeInt24uAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeInt24uAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readInt32uAttribute(): Long { + suspend fun readInt32uAttribute(): UInt { // Implementation needs to be added here } @@ -597,11 +563,11 @@ class UnitTestingCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeInt32uAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeInt32uAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readInt40uAttribute(): Long { + suspend fun readInt40uAttribute(): ULong { // Implementation needs to be added here } @@ -613,11 +579,11 @@ class UnitTestingCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeInt40uAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeInt40uAttribute(minInterval: Int, maxInterval: Int): ULong { // Implementation needs to be added here } - suspend fun readInt48uAttribute(): Long { + suspend fun readInt48uAttribute(): ULong { // Implementation needs to be added here } @@ -629,11 +595,11 @@ class UnitTestingCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeInt48uAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeInt48uAttribute(minInterval: Int, maxInterval: Int): ULong { // Implementation needs to be added here } - suspend fun readInt56uAttribute(): Long { + suspend fun readInt56uAttribute(): ULong { // Implementation needs to be added here } @@ -645,11 +611,11 @@ class UnitTestingCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeInt56uAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeInt56uAttribute(minInterval: Int, maxInterval: Int): ULong { // Implementation needs to be added here } - suspend fun readInt64uAttribute(): Long { + suspend fun readInt64uAttribute(): ULong { // Implementation needs to be added here } @@ -661,11 +627,11 @@ class UnitTestingCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeInt64uAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeInt64uAttribute(minInterval: Int, maxInterval: Int): ULong { // Implementation needs to be added here } - suspend fun readInt8sAttribute(): Integer { + suspend fun readInt8sAttribute(): Byte { // Implementation needs to be added here } @@ -677,11 +643,11 @@ class UnitTestingCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeInt8sAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeInt8sAttribute(minInterval: Int, maxInterval: Int): Byte { // Implementation needs to be added here } - suspend fun readInt16sAttribute(): Integer { + suspend fun readInt16sAttribute(): Short { // Implementation needs to be added here } @@ -693,11 +659,11 @@ class UnitTestingCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeInt16sAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeInt16sAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } - suspend fun readInt24sAttribute(): Long { + suspend fun readInt24sAttribute(): Int { // Implementation needs to be added here } @@ -709,11 +675,11 @@ class UnitTestingCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeInt24sAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeInt24sAttribute(minInterval: Int, maxInterval: Int): Int { // Implementation needs to be added here } - suspend fun readInt32sAttribute(): Long { + suspend fun readInt32sAttribute(): Int { // Implementation needs to be added here } @@ -725,7 +691,7 @@ class UnitTestingCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeInt32sAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeInt32sAttribute(minInterval: Int, maxInterval: Int): Int { // Implementation needs to be added here } @@ -793,7 +759,7 @@ class UnitTestingCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readEnum8Attribute(): Integer { + suspend fun readEnum8Attribute(): UByte { // Implementation needs to be added here } @@ -805,11 +771,11 @@ class UnitTestingCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeEnum8Attribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeEnum8Attribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readEnum16Attribute(): Integer { + suspend fun readEnum16Attribute(): UShort { // Implementation needs to be added here } @@ -821,7 +787,7 @@ class UnitTestingCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeEnum16Attribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeEnum16Attribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } @@ -980,7 +946,7 @@ class UnitTestingCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readEpochUsAttribute(): Long { + suspend fun readEpochUsAttribute(): ULong { // Implementation needs to be added here } @@ -992,11 +958,11 @@ class UnitTestingCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeEpochUsAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeEpochUsAttribute(minInterval: Int, maxInterval: Int): ULong { // Implementation needs to be added here } - suspend fun readEpochSAttribute(): Long { + suspend fun readEpochSAttribute(): UInt { // Implementation needs to be added here } @@ -1008,11 +974,11 @@ class UnitTestingCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeEpochSAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeEpochSAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readVendorIdAttribute(): Integer { + suspend fun readVendorIdAttribute(): UShort { // Implementation needs to be added here } @@ -1024,7 +990,7 @@ class UnitTestingCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeVendorIdAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeVendorIdAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } @@ -1053,7 +1019,7 @@ class UnitTestingCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readEnumAttrAttribute(): Integer { + suspend fun readEnumAttrAttribute(): UByte { // Implementation needs to be added here } @@ -1065,7 +1031,7 @@ class UnitTestingCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeEnumAttrAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeEnumAttrAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -1091,7 +1057,7 @@ class UnitTestingCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readRangeRestrictedInt8uAttribute(): Integer { + suspend fun readRangeRestrictedInt8uAttribute(): UByte { // Implementation needs to be added here } @@ -1103,11 +1069,11 @@ class UnitTestingCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeRangeRestrictedInt8uAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeRangeRestrictedInt8uAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readRangeRestrictedInt8sAttribute(): Integer { + suspend fun readRangeRestrictedInt8sAttribute(): Byte { // Implementation needs to be added here } @@ -1119,11 +1085,11 @@ class UnitTestingCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeRangeRestrictedInt8sAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeRangeRestrictedInt8sAttribute(minInterval: Int, maxInterval: Int): Byte { // Implementation needs to be added here } - suspend fun readRangeRestrictedInt16uAttribute(): Integer { + suspend fun readRangeRestrictedInt16uAttribute(): UShort { // Implementation needs to be added here } @@ -1135,11 +1101,11 @@ class UnitTestingCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeRangeRestrictedInt16uAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeRangeRestrictedInt16uAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readRangeRestrictedInt16sAttribute(): Integer { + suspend fun readRangeRestrictedInt16sAttribute(): Short { // Implementation needs to be added here } @@ -1151,7 +1117,7 @@ class UnitTestingCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeRangeRestrictedInt16sAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeRangeRestrictedInt16sAttribute(minInterval: Int, maxInterval: Int): Short { // Implementation needs to be added here } @@ -1897,7 +1863,7 @@ class UnitTestingCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readWriteOnlyInt8uAttribute(): Integer { + suspend fun readWriteOnlyInt8uAttribute(): UByte { // Implementation needs to be added here } @@ -1909,7 +1875,7 @@ class UnitTestingCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeWriteOnlyInt8uAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeWriteOnlyInt8uAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -1954,19 +1920,19 @@ class UnitTestingCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UserLabelCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UserLabelCluster.kt index 37f240160f798c..e15bdfef926b4f 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UserLabelCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UserLabelCluster.kt @@ -90,19 +90,19 @@ class UserLabelCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WakeOnLanCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WakeOnLanCluster.kt index 94a34ee6faab32..7cd24e24c08de1 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WakeOnLanCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WakeOnLanCluster.kt @@ -77,19 +77,19 @@ class WakeOnLanCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WiFiNetworkDiagnosticsCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WiFiNetworkDiagnosticsCluster.kt index d7a7f8bd1b4350..fa61490a6f8145 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WiFiNetworkDiagnosticsCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WiFiNetworkDiagnosticsCluster.kt @@ -54,12 +54,12 @@ class WiFiNetworkDiagnosticsCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun resetCounts() { - // Implementation needs to be added here - } - - suspend fun resetCounts(timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here + suspend fun resetCounts(timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } suspend fun readBssidAttribute(): BssidAttribute { @@ -240,19 +240,19 @@ class WiFiNetworkDiagnosticsCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WindowCoveringCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WindowCoveringCluster.kt index e90983f4f4a8d2..d8a5453d7ff335 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WindowCoveringCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WindowCoveringCluster.kt @@ -44,89 +44,95 @@ class WindowCoveringCluster(private val endpointId: UShort) { class AttributeListAttribute(val value: ArrayList) - suspend fun upOrOpen() { - // Implementation needs to be added here - } - - suspend fun upOrOpen(timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } - - suspend fun downOrClose() { - // Implementation needs to be added here - } - - suspend fun downOrClose(timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } - - suspend fun stopMotion() { - // Implementation needs to be added here - } - - suspend fun stopMotion(timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } - - suspend fun goToLiftValue(liftValue: UShort) { - // Implementation needs to be added here + suspend fun upOrOpen(timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun goToLiftValue(liftValue: UShort, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here + suspend fun downOrClose(timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun goToLiftPercentage(liftPercent100thsValue: UShort) { - // Implementation needs to be added here + suspend fun stopMotion(timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun goToLiftPercentage(liftPercent100thsValue: UShort, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here + suspend fun goToLiftValue(liftValue: UShort, timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun goToTiltValue(tiltValue: UShort) { - // Implementation needs to be added here + suspend fun goToLiftPercentage( + liftPercent100thsValue: UShort, + timedInvokeTimeoutMs: Int? = null + ) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun goToTiltValue(tiltValue: UShort, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here - } - - suspend fun goToTiltPercentage(tiltPercent100thsValue: UShort) { - // Implementation needs to be added here + suspend fun goToTiltValue(tiltValue: UShort, timedInvokeTimeoutMs: Int? = null) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun goToTiltPercentage(tiltPercent100thsValue: UShort, timedInvokeTimeoutMs: Int) { - // Implementation needs to be added here + suspend fun goToTiltPercentage( + tiltPercent100thsValue: UShort, + timedInvokeTimeoutMs: Int? = null + ) { + if (timedInvokeTimeoutMs != null) { + // Do the action with timedInvokeTimeoutMs + } else { + // Do the action without timedInvokeTimeoutMs + } } - suspend fun readTypeAttribute(): Integer { + suspend fun readTypeAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeTypeAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeTypeAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readPhysicalClosedLimitLiftAttribute(): Integer { + suspend fun readPhysicalClosedLimitLiftAttribute(): UShort { // Implementation needs to be added here } suspend fun subscribePhysicalClosedLimitLiftAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UShort { // Implementation needs to be added here } - suspend fun readPhysicalClosedLimitTiltAttribute(): Integer { + suspend fun readPhysicalClosedLimitTiltAttribute(): UShort { // Implementation needs to be added here } suspend fun subscribePhysicalClosedLimitTiltAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UShort { // Implementation needs to be added here } @@ -152,33 +158,27 @@ class WindowCoveringCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readNumberOfActuationsLiftAttribute(): Integer { + suspend fun readNumberOfActuationsLiftAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeNumberOfActuationsLiftAttribute( - minInterval: Int, - maxInterval: Int - ): Integer { + suspend fun subscribeNumberOfActuationsLiftAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readNumberOfActuationsTiltAttribute(): Integer { + suspend fun readNumberOfActuationsTiltAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeNumberOfActuationsTiltAttribute( - minInterval: Int, - maxInterval: Int - ): Integer { + suspend fun subscribeNumberOfActuationsTiltAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readConfigStatusAttribute(): Integer { + suspend fun readConfigStatusAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeConfigStatusAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeConfigStatusAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -204,11 +204,11 @@ class WindowCoveringCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readOperationalStatusAttribute(): Integer { + suspend fun readOperationalStatusAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeOperationalStatusAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeOperationalStatusAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -236,11 +236,11 @@ class WindowCoveringCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readEndProductTypeAttribute(): Integer { + suspend fun readEndProductTypeAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeEndProductTypeAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeEndProductTypeAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } @@ -268,51 +268,45 @@ class WindowCoveringCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readInstalledOpenLimitLiftAttribute(): Integer { + suspend fun readInstalledOpenLimitLiftAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeInstalledOpenLimitLiftAttribute( - minInterval: Int, - maxInterval: Int - ): Integer { + suspend fun subscribeInstalledOpenLimitLiftAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readInstalledClosedLimitLiftAttribute(): Integer { + suspend fun readInstalledClosedLimitLiftAttribute(): UShort { // Implementation needs to be added here } suspend fun subscribeInstalledClosedLimitLiftAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UShort { // Implementation needs to be added here } - suspend fun readInstalledOpenLimitTiltAttribute(): Integer { + suspend fun readInstalledOpenLimitTiltAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeInstalledOpenLimitTiltAttribute( - minInterval: Int, - maxInterval: Int - ): Integer { + suspend fun subscribeInstalledOpenLimitTiltAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } - suspend fun readInstalledClosedLimitTiltAttribute(): Integer { + suspend fun readInstalledClosedLimitTiltAttribute(): UShort { // Implementation needs to be added here } suspend fun subscribeInstalledClosedLimitTiltAttribute( minInterval: Int, maxInterval: Int - ): Integer { + ): UShort { // Implementation needs to be added here } - suspend fun readModeAttribute(): Integer { + suspend fun readModeAttribute(): UByte { // Implementation needs to be added here } @@ -324,15 +318,15 @@ class WindowCoveringCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun subscribeModeAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeModeAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } - suspend fun readSafetyStatusAttribute(): Integer { + suspend fun readSafetyStatusAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeSafetyStatusAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeSafetyStatusAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } @@ -377,19 +371,19 @@ class WindowCoveringCluster(private val endpointId: UShort) { // Implementation needs to be added here } - suspend fun readFeatureMapAttribute(): Long { + suspend fun readFeatureMapAttribute(): UInt { // Implementation needs to be added here } - suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): Long { + suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt { // Implementation needs to be added here } - suspend fun readClusterRevisionAttribute(): Integer { + suspend fun readClusterRevisionAttribute(): UShort { // Implementation needs to be added here } - suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): Integer { + suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort { // Implementation needs to be added here } From 7b0b5b77c9dff6402426d508d91f13d649fa200b Mon Sep 17 00:00:00 2001 From: Michael Spang Date: Mon, 30 Oct 2023 22:20:28 -0400 Subject: [PATCH 35/41] Fix potential -Wmacro-redefined warning in TestInetCommonOptions.cpp (#30100) Add a guard around force defining __STDC_FORMAT_MACROS, which may be defined centrally. --- src/inet/tests/TestInetCommonOptions.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/inet/tests/TestInetCommonOptions.cpp b/src/inet/tests/TestInetCommonOptions.cpp index b424f4b16577eb..727b6a107b28f1 100644 --- a/src/inet/tests/TestInetCommonOptions.cpp +++ b/src/inet/tests/TestInetCommonOptions.cpp @@ -26,7 +26,9 @@ #ifndef __STDC_LIMIT_MACROS #define __STDC_LIMIT_MACROS #endif +#ifndef __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS +#endif #include "TestInetCommonOptions.h" From a9769a8150d972c7150f857017dc2e0e170643cb Mon Sep 17 00:00:00 2001 From: Jaehoon-You <55170115+Jaehoon-You@users.noreply.github.com> Date: Tue, 31 Oct 2023 14:40:44 +0900 Subject: [PATCH 36/41] virtual-device-app: Add closure module and base code (#29941) Signed-off-by: Jaehoon You Signed-off-by: Charles Kim --- .../android/App/feature/closure/.gitignore | 0 .../App/feature/closure/build.gradle.kts | 70 +++++++++++++++++++ .../App/feature/closure/proguard-rules.pro | 21 ++++++ .../closure/ExampleInstrumentedTest.kt | 22 ++++++ .../closure/src/main/AndroidManifest.xml | 4 ++ .../app/feature/closure/DoorLockFragment.kt | 41 +++++++++++ .../app/feature/closure/DoorLockViewModel.kt | 17 +++++ .../main/res/layout/fragment_door_lock.xml | 20 ++++++ .../main/res/navigation/closure_nav_graph.xml | 16 +++++ .../app/feature/closure/ExampleUnitTest.kt | 16 +++++ .../android/App/settings.gradle.kts | 1 + 11 files changed, 228 insertions(+) create mode 100644 examples/virtual-device-app/android/App/feature/closure/.gitignore create mode 100644 examples/virtual-device-app/android/App/feature/closure/build.gradle.kts create mode 100644 examples/virtual-device-app/android/App/feature/closure/proguard-rules.pro create mode 100644 examples/virtual-device-app/android/App/feature/closure/src/androidTest/java/com/matter/virtual/device/app/feature/closure/ExampleInstrumentedTest.kt create mode 100644 examples/virtual-device-app/android/App/feature/closure/src/main/AndroidManifest.xml create mode 100644 examples/virtual-device-app/android/App/feature/closure/src/main/java/com/matter/virtual/device/app/feature/closure/DoorLockFragment.kt create mode 100644 examples/virtual-device-app/android/App/feature/closure/src/main/java/com/matter/virtual/device/app/feature/closure/DoorLockViewModel.kt create mode 100644 examples/virtual-device-app/android/App/feature/closure/src/main/res/layout/fragment_door_lock.xml create mode 100644 examples/virtual-device-app/android/App/feature/closure/src/main/res/navigation/closure_nav_graph.xml create mode 100644 examples/virtual-device-app/android/App/feature/closure/src/test/java/com/matter/virtual/device/app/feature/closure/ExampleUnitTest.kt diff --git a/examples/virtual-device-app/android/App/feature/closure/.gitignore b/examples/virtual-device-app/android/App/feature/closure/.gitignore new file mode 100644 index 00000000000000..e69de29bb2d1d6 diff --git a/examples/virtual-device-app/android/App/feature/closure/build.gradle.kts b/examples/virtual-device-app/android/App/feature/closure/build.gradle.kts new file mode 100644 index 00000000000000..455f2013f3935e --- /dev/null +++ b/examples/virtual-device-app/android/App/feature/closure/build.gradle.kts @@ -0,0 +1,70 @@ +import com.matter.buildsrc.Deps +import com.matter.buildsrc.Versions + +plugins { + id("com.android.library") + id("org.jetbrains.kotlin.android") + id("com.google.dagger.hilt.android") + id("androidx.navigation.safeargs.kotlin") + kotlin("kapt") +} + +android { + namespace = "com.matter.virtual.device.app.feature.closure" + compileSdk = Versions.compileSdkVersion + + defaultConfig { + minSdk = Versions.minSdkVersion + targetSdk = Versions.targetSdkVersion + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles("consumer-rules.pro") + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = "1.8" + } + buildFeatures { + viewBinding = true + dataBinding = true + } +} + +dependencies { + + implementation(project(":core:common")) + implementation(project(":core:domain")) + implementation(project(":core:ui")) + + implementation(Deps.AndroidX.core) + implementation(Deps.AndroidX.appcompat) + implementation(Deps.AndroidX.fragment) + implementation(Deps.AndroidX.Lifecycle.viewmodel) + + implementation(Deps.Kotlin.serialization) + + implementation(Deps.Navigation.fragment) + implementation(Deps.Navigation.ui) + + implementation(Deps.Dagger.hiltAndroid) + kapt(Deps.Dagger.hiltAndroidCompiler) + + implementation(Deps.timber) + + testImplementation(Deps.Test.junit) + androidTestImplementation(Deps.Test.junitExt) + androidTestImplementation(Deps.Test.espresso) +} \ No newline at end of file diff --git a/examples/virtual-device-app/android/App/feature/closure/proguard-rules.pro b/examples/virtual-device-app/android/App/feature/closure/proguard-rules.pro new file mode 100644 index 00000000000000..481bb434814107 --- /dev/null +++ b/examples/virtual-device-app/android/App/feature/closure/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/examples/virtual-device-app/android/App/feature/closure/src/androidTest/java/com/matter/virtual/device/app/feature/closure/ExampleInstrumentedTest.kt b/examples/virtual-device-app/android/App/feature/closure/src/androidTest/java/com/matter/virtual/device/app/feature/closure/ExampleInstrumentedTest.kt new file mode 100644 index 00000000000000..5e4178d42aa18b --- /dev/null +++ b/examples/virtual-device-app/android/App/feature/closure/src/androidTest/java/com/matter/virtual/device/app/feature/closure/ExampleInstrumentedTest.kt @@ -0,0 +1,22 @@ +package com.matter.virtual.device.app.feature.closure + +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.platform.app.InstrumentationRegistry +import org.junit.Assert.* +import org.junit.Test +import org.junit.runner.RunWith + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("com.matter.virtual.device.app.feature.closure.test", appContext.packageName) + } +} diff --git a/examples/virtual-device-app/android/App/feature/closure/src/main/AndroidManifest.xml b/examples/virtual-device-app/android/App/feature/closure/src/main/AndroidManifest.xml new file mode 100644 index 00000000000000..a5918e68abcdde --- /dev/null +++ b/examples/virtual-device-app/android/App/feature/closure/src/main/AndroidManifest.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/examples/virtual-device-app/android/App/feature/closure/src/main/java/com/matter/virtual/device/app/feature/closure/DoorLockFragment.kt b/examples/virtual-device-app/android/App/feature/closure/src/main/java/com/matter/virtual/device/app/feature/closure/DoorLockFragment.kt new file mode 100644 index 00000000000000..8cfe6a403f53ed --- /dev/null +++ b/examples/virtual-device-app/android/App/feature/closure/src/main/java/com/matter/virtual/device/app/feature/closure/DoorLockFragment.kt @@ -0,0 +1,41 @@ +package com.matter.virtual.device.app.feature.closure + +import androidx.fragment.app.viewModels +import androidx.navigation.fragment.navArgs +import com.matter.virtual.device.app.core.ui.BaseFragment +import com.matter.virtual.device.app.core.ui.databinding.LayoutAppbarBinding +import com.matter.virtual.device.app.feature.closure.databinding.FragmentDoorLockBinding +import dagger.hilt.android.AndroidEntryPoint +import kotlinx.serialization.ExperimentalSerializationApi +import kotlinx.serialization.decodeFromString +import kotlinx.serialization.json.Json +import timber.log.Timber + +@AndroidEntryPoint +class DoorLockFragment : + BaseFragment(R.layout.fragment_door_lock) { + + override val viewModel: DoorLockViewModel by viewModels() + + @OptIn(ExperimentalSerializationApi::class) + override fun setupNavArgs() { + val args: DoorLockFragmentArgs by navArgs() + matterSettings = Json.decodeFromString(args.setting) + } + + override fun setupAppbar(): LayoutAppbarBinding = binding.appbar + + override fun setupUi() {} + + override fun setupObservers() {} + + override fun onResume() { + Timber.d("onResume()") + super.onResume() + } + + override fun onDestroy() { + Timber.d("onDestroy()") + super.onDestroy() + } +} diff --git a/examples/virtual-device-app/android/App/feature/closure/src/main/java/com/matter/virtual/device/app/feature/closure/DoorLockViewModel.kt b/examples/virtual-device-app/android/App/feature/closure/src/main/java/com/matter/virtual/device/app/feature/closure/DoorLockViewModel.kt new file mode 100644 index 00000000000000..35a9a19ff634f4 --- /dev/null +++ b/examples/virtual-device-app/android/App/feature/closure/src/main/java/com/matter/virtual/device/app/feature/closure/DoorLockViewModel.kt @@ -0,0 +1,17 @@ +package com.matter.virtual.device.app.feature.closure + +import androidx.lifecycle.SavedStateHandle +import com.matter.virtual.device.app.core.ui.BaseViewModel +import dagger.hilt.android.lifecycle.HiltViewModel +import javax.inject.Inject +import timber.log.Timber + +@HiltViewModel +class DoorLockViewModel @Inject constructor(savedStateHandle: SavedStateHandle) : + BaseViewModel(savedStateHandle) { + + override fun onCleared() { + Timber.d("onCleared()") + super.onCleared() + } +} diff --git a/examples/virtual-device-app/android/App/feature/closure/src/main/res/layout/fragment_door_lock.xml b/examples/virtual-device-app/android/App/feature/closure/src/main/res/layout/fragment_door_lock.xml new file mode 100644 index 00000000000000..d726e82e616348 --- /dev/null +++ b/examples/virtual-device-app/android/App/feature/closure/src/main/res/layout/fragment_door_lock.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/virtual-device-app/android/App/feature/closure/src/main/res/navigation/closure_nav_graph.xml b/examples/virtual-device-app/android/App/feature/closure/src/main/res/navigation/closure_nav_graph.xml new file mode 100644 index 00000000000000..d56b030dc252a8 --- /dev/null +++ b/examples/virtual-device-app/android/App/feature/closure/src/main/res/navigation/closure_nav_graph.xml @@ -0,0 +1,16 @@ + + + + + + + \ No newline at end of file diff --git a/examples/virtual-device-app/android/App/feature/closure/src/test/java/com/matter/virtual/device/app/feature/closure/ExampleUnitTest.kt b/examples/virtual-device-app/android/App/feature/closure/src/test/java/com/matter/virtual/device/app/feature/closure/ExampleUnitTest.kt new file mode 100644 index 00000000000000..13c92b81c9b741 --- /dev/null +++ b/examples/virtual-device-app/android/App/feature/closure/src/test/java/com/matter/virtual/device/app/feature/closure/ExampleUnitTest.kt @@ -0,0 +1,16 @@ +package com.matter.virtual.device.app.feature.closure + +import org.junit.Assert.* +import org.junit.Test + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} diff --git a/examples/virtual-device-app/android/App/settings.gradle.kts b/examples/virtual-device-app/android/App/settings.gradle.kts index a1bded5ee3a6b0..5bdf9465c3abb8 100644 --- a/examples/virtual-device-app/android/App/settings.gradle.kts +++ b/examples/virtual-device-app/android/App/settings.gradle.kts @@ -21,6 +21,7 @@ include(":core:matter") include(":core:model") include(":core:ui") include(":feature:control") +include(":feature:closure") include(":feature:main") include(":feature:qrcode") include(":feature:setup") From 1890490c964fa2abe85e0ef6e677b1c8b3f6859c Mon Sep 17 00:00:00 2001 From: Yufeng Wang Date: Tue, 31 Oct 2023 00:32:44 -0700 Subject: [PATCH 37/41] Move the TlvReaderExternsion to TlvReader (#30117) --- src/controller/java/BUILD.gn | 4 +- .../cluster/TlvReaderExtension.kt | 44 ---------------- .../java/src/matter/tlv/TlvReader.kt | 51 +++++++++++++++++++ 3 files changed, 52 insertions(+), 47 deletions(-) delete mode 100644 src/controller/java/src/chip/devicecontroller/cluster/TlvReaderExtension.kt diff --git a/src/controller/java/BUILD.gn b/src/controller/java/BUILD.gn index ee5ead80b18b38..71c2a8b07bcbf5 100644 --- a/src/controller/java/BUILD.gn +++ b/src/controller/java/BUILD.gn @@ -328,9 +328,7 @@ kotlin_library("chipcluster") { deps = [ ":tlv" ] - sources = [ "src/chip/devicecontroller/cluster/TlvReaderExtension.kt" ] - - sources += structs_sources + sources = structs_sources sources += eventstructs_sources kotlinc_flags = [ "-Xlint:deprecation" ] diff --git a/src/controller/java/src/chip/devicecontroller/cluster/TlvReaderExtension.kt b/src/controller/java/src/chip/devicecontroller/cluster/TlvReaderExtension.kt deleted file mode 100644 index 136e64e4b555fd..00000000000000 --- a/src/controller/java/src/chip/devicecontroller/cluster/TlvReaderExtension.kt +++ /dev/null @@ -1,44 +0,0 @@ -/* - * - * Copyright (c) 2023 Project CHIP Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package chip.devicecontroller.cluster - -import matter.tlv.NullValue -import matter.tlv.Tag -import matter.tlv.TlvReader - -fun TlvReader.getBoolean(tag: Tag): Boolean { - return getBool(tag) -} - -fun TlvReader.getString(tag: Tag): String { - return getUtf8String(tag) -} - -fun TlvReader.getByteArray(tag: Tag): ByteArray { - return getByteString(tag) -} - -fun TlvReader.isNull(): Boolean { - val value = peekElement().value - return (value is NullValue) -} - -fun TlvReader.isNextTag(tag: Tag): Boolean { - val nextTag = peekElement().tag - return (nextTag == tag) -} diff --git a/src/controller/java/src/matter/tlv/TlvReader.kt b/src/controller/java/src/matter/tlv/TlvReader.kt index 94fefe0b07f5cf..d8ce4d187a08f8 100644 --- a/src/controller/java/src/matter/tlv/TlvReader.kt +++ b/src/controller/java/src/matter/tlv/TlvReader.kt @@ -265,6 +265,57 @@ class TlvReader(bytes: ByteArray) : Iterable { require(value is NullValue) { "Unexpected value $value at index $index (expected NullValue)" } } + /** + * Retrieves a Boolean value associated with the given tag. + * + * @param tag The Tag to query for. + * @return The Boolean value associated with the tag. + */ + fun getBoolean(tag: Tag): Boolean { + return getBool(tag) + } + + /** + * Retrieves a String value associated with the given tag. The returned string is in UTF-8 format. + * + * @param tag The Tag to query for. + * @return The String value associated with the tag. + */ + fun getString(tag: Tag): String { + return getUtf8String(tag) + } + + /** + * Retrieves a ByteArray value associated with the given tag. + * + * @param tag The Tag to query for. + * @return The ByteArray value associated with the tag. + */ + fun getByteArray(tag: Tag): ByteArray { + return getByteString(tag) + } + + /** + * Checks if the current element's value is of type NullValue. + * + * @return True if the current element's value is NullValue, otherwise false. + */ + fun isNull(): Boolean { + val value = peekElement().value + return (value is NullValue) + } + + /** + * Checks if the next tag in sequence matches the provided tag. + * + * @param tag The Tag to compare against the next tag. + * @return True if the next tag matches the provided tag, otherwise false. + */ + fun isNextTag(tag: Tag): Boolean { + val nextTag = peekElement().tag + return (nextTag == tag) + } + /** * Verifies that the current element is a start of a Structure and advances to the next element. * From 4e438d69c63d259dafdc3fc3bb1748d7de27e044 Mon Sep 17 00:00:00 2001 From: Yufeng Wang Date: Tue, 31 Oct 2023 07:45:48 -0700 Subject: [PATCH 38/41] Update Java8 Optional handling in JniReferences (#30071) --- src/lib/support/JniReferences.cpp | 108 ++++++++++++++++++++---------- src/lib/support/JniReferences.h | 4 ++ 2 files changed, 75 insertions(+), 37 deletions(-) diff --git a/src/lib/support/JniReferences.cpp b/src/lib/support/JniReferences.cpp index f07837ade467bd..b6919f8c076b4a 100644 --- a/src/lib/support/JniReferences.cpp +++ b/src/lib/support/JniReferences.cpp @@ -21,6 +21,7 @@ #include #include #include +#include namespace chip { @@ -35,7 +36,7 @@ void JniReferences::SetJavaVm(JavaVM * jvm, const char * clsType) JNIEnv * env = GetEnvForCurrentThread(); // Any chip.devicecontroller.* class will work here - just need something to call getClassLoader() on. jclass chipClass = env->FindClass(clsType); - VerifyOrReturn(chipClass != nullptr, ChipLogError(Support, "clsType can not found")); + VerifyOrReturn(chipClass != nullptr, ChipLogError(Support, "clsType can not be found")); jclass classClass = env->FindClass("java/lang/Class"); jclass classLoaderClass = env->FindClass("java/lang/ClassLoader"); @@ -47,6 +48,36 @@ void JniReferences::SetJavaVm(JavaVM * jvm, const char * clsType) chip::JniReferences::GetInstance().GetClassRef(env, "java/util/List", mListClass); chip::JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", mArrayListClass); chip::JniReferences::GetInstance().GetClassRef(env, "java/util/HashMap", mHashMapClass); + + // Determine if the Java code has proper Java 8 support or not. + // The class and method chosen here are arbitrary, all we care about is + // looking up any method that has an Optional parameter. + jclass controllerParamsClass = env->FindClass("chip/devicecontroller/ControllerParams"); + VerifyOrReturn(controllerParamsClass != nullptr, ChipLogError(Support, "controllerParamsClass is nullptr")); + + jmethodID getCountryCodeMethod = env->GetMethodID(controllerParamsClass, "getCountryCode", "()Ljava/util/Optional;"); + if (getCountryCodeMethod == nullptr) + { + // GetMethodID will have thrown an exception previously if it returned nullptr. + env->ExceptionClear(); + VerifyOrReturn(env->GetMethodID(controllerParamsClass, "getCountryCode", "()Lj$/util/Optional;") != nullptr, + ChipLogError(Support, "Method getCountryCode can not be found")); + use_java8_optional = false; + } + else + { + use_java8_optional = true; + } + + if (use_java8_optional) + { + chip::JniReferences::GetInstance().GetClassRef(env, "java/util/Optional", mOptionalClass); + } + else + { + chip::JniReferences::GetInstance().GetClassRef(env, "j$/util/Optional", mOptionalClass); + } + VerifyOrReturn(mOptionalClass != nullptr, ChipLogError(Support, "mOptionalClass is nullptr")); } JNIEnv * JniReferences::GetEnvForCurrentThread() @@ -90,11 +121,11 @@ CHIP_ERROR JniReferences::GetLocalClassRef(JNIEnv * env, const char * clsType, j { jclass cls = nullptr; - // Try `j$/util/Optional` when enabling Java8. - if (strcmp(clsType, "java/util/Optional") == 0) + // Try `j$/util/Optional` when enabling Java8. Check whether mOptionalClass + // is null because this method is used to originally set mOptionalClass. + if (mOptionalClass != nullptr && (strcmp(clsType, "java/util/Optional") == 0 || strcmp(clsType, "j$/util/Optional") == 0)) { - cls = env->FindClass("j$/util/Optional"); - env->ExceptionClear(); + cls = mOptionalClass; } if (cls == nullptr) @@ -129,6 +160,18 @@ CHIP_ERROR JniReferences::N2J_ByteArray(JNIEnv * env, const uint8_t * inArray, j return err; } +static std::string StrReplaceAll(const std::string & source, const std::string & from, const std::string & to) +{ + std::string newString = source; + size_t pos = 0; + while ((pos = newString.find(from, pos)) != std::string::npos) + { + newString.replace(pos, from.length(), to); + pos += to.length(); + } + return newString; +} + CHIP_ERROR JniReferences::FindMethod(JNIEnv * env, jobject object, const char * methodName, const char * methodSignature, jmethodID * methodId) { @@ -146,21 +189,14 @@ CHIP_ERROR JniReferences::FindMethod(JNIEnv * env, jobject object, const char * return CHIP_NO_ERROR; } - // Try `j$` when enabling Java8. - std::string methodSignature_java8_str(methodSignature); - size_t pos = methodSignature_java8_str.find("java/util/Optional"); - if (pos != std::string::npos) + std::string method_signature = methodSignature; + if (!use_java8_optional) { - // Replace all "java/util/Optional" with "j$/util/Optional". - while (pos != std::string::npos) - { - methodSignature_java8_str.replace(pos, strlen("java/util/Optional"), "j$/util/Optional"); - pos = methodSignature_java8_str.find("java/util/Optional"); - } - *methodId = env->GetMethodID(javaClass, methodName, methodSignature_java8_str.c_str()); - env->ExceptionClear(); + method_signature = StrReplaceAll(method_signature, "java/util/Optional", "j$/util/Optional"); } + *methodId = env->GetMethodID(javaClass, methodName, method_signature.data()); + VerifyOrReturnError(*methodId != nullptr, CHIP_JNI_ERROR_METHOD_NOT_FOUND); return CHIP_NO_ERROR; @@ -226,24 +262,23 @@ void JniReferences::ThrowError(JNIEnv * env, jclass exceptionCls, CHIP_ERROR err CHIP_ERROR JniReferences::CreateOptional(jobject objectToWrap, jobject & outOptional) { - JNIEnv * env = GetEnvForCurrentThread(); - jclass optionalCls; - chip::JniReferences::GetInstance().GetClassRef(env, "java/util/Optional", optionalCls); - VerifyOrReturnError(optionalCls != nullptr, CHIP_JNI_ERROR_TYPE_NOT_FOUND); - chip::JniClass jniClass(optionalCls); + VerifyOrReturnError(mOptionalClass != nullptr, CHIP_JNI_ERROR_TYPE_NOT_FOUND); - jmethodID ofMethod = env->GetStaticMethodID(optionalCls, "ofNullable", "(Ljava/lang/Object;)Ljava/util/Optional;"); - env->ExceptionClear(); + JNIEnv * const env = GetEnvForCurrentThread(); + VerifyOrReturnError(env != nullptr, CHIP_JNI_ERROR_NO_ENV); - // Try `Lj$/util/Optional;` when enabling Java8. - if (ofMethod == nullptr) + jmethodID ofMethod = nullptr; + if (use_java8_optional) { - ofMethod = env->GetStaticMethodID(optionalCls, "ofNullable", "(Ljava/lang/Object;)Lj$/util/Optional;"); - env->ExceptionClear(); + ofMethod = env->GetStaticMethodID(mOptionalClass, "ofNullable", "(Ljava/lang/Object;)Ljava/util/Optional;"); + } + else + { + ofMethod = env->GetStaticMethodID(mOptionalClass, "ofNullable", "(Ljava/lang/Object;)Lj$/util/Optional;"); } - VerifyOrReturnError(ofMethod != nullptr, CHIP_JNI_ERROR_METHOD_NOT_FOUND); - outOptional = env->CallStaticObjectMethod(optionalCls, ofMethod, objectToWrap); + + outOptional = env->CallStaticObjectMethod(mOptionalClass, ofMethod, objectToWrap); VerifyOrReturnError(!env->ExceptionCheck(), CHIP_JNI_ERROR_EXCEPTION_THROWN); @@ -252,13 +287,12 @@ CHIP_ERROR JniReferences::CreateOptional(jobject objectToWrap, jobject & outOpti CHIP_ERROR JniReferences::GetOptionalValue(jobject optionalObj, jobject & optionalValue) { - JNIEnv * env = GetEnvForCurrentThread(); - jclass optionalCls; - chip::JniReferences::GetInstance().GetClassRef(env, "java/util/Optional", optionalCls); - VerifyOrReturnError(optionalCls != nullptr, CHIP_JNI_ERROR_TYPE_NOT_FOUND); - chip::JniClass jniClass(optionalCls); + VerifyOrReturnError(mOptionalClass != nullptr, CHIP_JNI_ERROR_TYPE_NOT_FOUND); + + JNIEnv * const env = GetEnvForCurrentThread(); + VerifyOrReturnError(env != nullptr, CHIP_JNI_ERROR_NO_ENV); - jmethodID isPresentMethod = env->GetMethodID(optionalCls, "isPresent", "()Z"); + jmethodID isPresentMethod = env->GetMethodID(mOptionalClass, "isPresent", "()Z"); VerifyOrReturnError(isPresentMethod != nullptr, CHIP_JNI_ERROR_METHOD_NOT_FOUND); jboolean isPresent = optionalObj && env->CallBooleanMethod(optionalObj, isPresentMethod); @@ -268,7 +302,7 @@ CHIP_ERROR JniReferences::GetOptionalValue(jobject optionalObj, jobject & option return CHIP_NO_ERROR; } - jmethodID getMethod = env->GetMethodID(optionalCls, "get", "()Ljava/lang/Object;"); + jmethodID getMethod = env->GetMethodID(mOptionalClass, "get", "()Ljava/lang/Object;"); VerifyOrReturnError(getMethod != nullptr, CHIP_JNI_ERROR_METHOD_NOT_FOUND); optionalValue = env->CallObjectMethod(optionalObj, getMethod); return CHIP_NO_ERROR; diff --git a/src/lib/support/JniReferences.h b/src/lib/support/JniReferences.h index 9a0fea52019040..4abef990822b0c 100644 --- a/src/lib/support/JniReferences.h +++ b/src/lib/support/JniReferences.h @@ -190,8 +190,12 @@ class JniReferences jobject mClassLoader = nullptr; jmethodID mFindClassMethod = nullptr; + // These are global refs and therefore safe to persist. jclass mHashMapClass = nullptr; jclass mListClass = nullptr; jclass mArrayListClass = nullptr; + jclass mOptionalClass = nullptr; + + bool use_java8_optional = false; }; } // namespace chip From d165f6274a813ce7e471fd6822a5ad80dc7f3477 Mon Sep 17 00:00:00 2001 From: Tennessee Carmel-Veilleux Date: Tue, 31 Oct 2023 10:50:04 -0400 Subject: [PATCH 39/41] Add general diagnostics cluster Matter 1.3 XML changes (#30091) - Added TimeSnapshot command - Added necessary comments about other changes needed - Regenerated zap - Put necessary scaffolding for TimeSnapshot command - Updated TC-DGEN-1.1/TC-DGEN-2.1 tests to work with updated revision Issue #30096 --------- Co-authored-by: tennessee.carmelveilleux@gmail.com Co-authored-by: Restyled.io --- .../air-purifier-app.matter | 10 +- .../air-purifier-common/air-purifier-app.zap | 18 +- .../air-quality-sensor-app.matter | 10 +- .../air-quality-sensor-app.zap | 18 +- .../all-clusters-app.matter | 10 +- .../all-clusters-common/all-clusters-app.zap | 18 +- .../all-clusters-minimal-app.matter | 12 +- .../all-clusters-minimal-app.zap | 34 +++- .../bridge-common/bridge-app.matter | 10 +- .../bridge-app/bridge-common/bridge-app.zap | 18 +- ...p_rootnode_dimmablelight_bCwGYSDpoe.matter | 10 +- ...noip_rootnode_dimmablelight_bCwGYSDpoe.zap | 18 +- ...umiditysensor_thermostat_56de3d5f45.matter | 10 +- ...r_humiditysensor_thermostat_56de3d5f45.zap | 18 +- ...ootnode_airqualitysensor_e63187f6c9.matter | 10 +- .../rootnode_airqualitysensor_e63187f6c9.zap | 18 +- ...ootnode_basicvideoplayer_0ff86e943b.matter | 10 +- .../rootnode_basicvideoplayer_0ff86e943b.zap | 18 +- ...de_colortemperaturelight_hbUnzYVeyn.matter | 10 +- ...tnode_colortemperaturelight_hbUnzYVeyn.zap | 18 +- .../rootnode_contactsensor_lFAGG1bfRO.matter | 10 +- .../rootnode_contactsensor_lFAGG1bfRO.zap | 18 +- .../rootnode_dimmablelight_bCwGYSDpoe.matter | 10 +- .../rootnode_dimmablelight_bCwGYSDpoe.zap | 18 +- .../rootnode_dishwasher_cc105034fe.matter | 10 +- .../rootnode_dishwasher_cc105034fe.zap | 18 +- .../rootnode_doorlock_aNKYAreMXE.matter | 10 +- .../devices/rootnode_doorlock_aNKYAreMXE.zap | 18 +- ...tnode_extendedcolorlight_8lcaaYJVAa.matter | 10 +- ...rootnode_extendedcolorlight_8lcaaYJVAa.zap | 18 +- .../devices/rootnode_fan_7N2TobIlOX.matter | 10 +- .../chef/devices/rootnode_fan_7N2TobIlOX.zap | 18 +- .../rootnode_flowsensor_1zVxHedlaV.matter | 10 +- .../rootnode_flowsensor_1zVxHedlaV.zap | 18 +- .../rootnode_genericswitch_9866e35d0b.matter | 10 +- .../rootnode_genericswitch_9866e35d0b.zap | 18 +- ...tnode_heatingcoolingunit_ncdGai1E5a.matter | 10 +- ...rootnode_heatingcoolingunit_ncdGai1E5a.zap | 18 +- .../rootnode_humiditysensor_Xyj4gda6Hb.matter | 10 +- .../rootnode_humiditysensor_Xyj4gda6Hb.zap | 18 +- .../rootnode_laundrywasher_fb10d238c8.matter | 10 +- .../rootnode_laundrywasher_fb10d238c8.zap | 18 +- .../rootnode_lightsensor_lZQycTFcJK.matter | 10 +- .../rootnode_lightsensor_lZQycTFcJK.zap | 18 +- ...rootnode_occupancysensor_iHyVgifZuo.matter | 10 +- .../rootnode_occupancysensor_iHyVgifZuo.zap | 18 +- .../rootnode_onofflight_bbs1b7IaOV.matter | 10 +- .../rootnode_onofflight_bbs1b7IaOV.zap | 18 +- .../rootnode_onofflight_samplemei.matter | 10 +- .../devices/rootnode_onofflight_samplemei.zap | 18 +- ...ootnode_onofflightswitch_FsPlMr090Q.matter | 10 +- .../rootnode_onofflightswitch_FsPlMr090Q.zap | 18 +- ...rootnode_onoffpluginunit_Wtf8ss5EBY.matter | 10 +- .../rootnode_onoffpluginunit_Wtf8ss5EBY.zap | 18 +- .../rootnode_pressuresensor_s0qC9wLH4k.matter | 10 +- .../rootnode_pressuresensor_s0qC9wLH4k.zap | 18 +- .../devices/rootnode_pump_5f904818cc.matter | 12 +- .../chef/devices/rootnode_pump_5f904818cc.zap | 34 +++- .../devices/rootnode_pump_a811bb33a0.matter | 12 +- .../chef/devices/rootnode_pump_a811bb33a0.zap | 34 +++- ...eraturecontrolledcabinet_ffdb696680.matter | 10 +- ...emperaturecontrolledcabinet_ffdb696680.zap | 18 +- ...ode_roboticvacuumcleaner_1807ff0c49.matter | 10 +- ...otnode_roboticvacuumcleaner_1807ff0c49.zap | 18 +- ...tnode_roomairconditioner_9cf3607804.matter | 10 +- ...rootnode_roomairconditioner_9cf3607804.zap | 18 +- .../rootnode_smokecoalarm_686fe0dcb8.matter | 10 +- .../rootnode_smokecoalarm_686fe0dcb8.zap | 18 +- .../rootnode_speaker_RpzeXdimqA.matter | 10 +- .../devices/rootnode_speaker_RpzeXdimqA.zap | 18 +- ...otnode_temperaturesensor_Qy1zkNW7c3.matter | 10 +- .../rootnode_temperaturesensor_Qy1zkNW7c3.zap | 18 +- .../rootnode_thermostat_bm3fb8dhYi.matter | 10 +- .../rootnode_thermostat_bm3fb8dhYi.zap | 18 +- .../rootnode_windowcovering_RLCxaGi9Yx.matter | 10 +- .../rootnode_windowcovering_RLCxaGi9Yx.zap | 18 +- examples/chef/devices/template.zap | 18 +- .../test_files/sample_zap_file.zap | 2 +- .../contact-sensor-app.matter | 10 +- .../contact-sensor-app.zap | 18 +- .../dishwasher-common/dishwasher-app.matter | 10 +- .../dishwasher-common/dishwasher-app.zap | 18 +- .../light-switch-app.matter | 10 +- .../light-switch-common/light-switch-app.zap | 18 +- .../data_model/lighting-app-ethernet.matter | 10 +- .../data_model/lighting-app-ethernet.zap | 18 +- .../data_model/lighting-app-thread.matter | 10 +- .../data_model/lighting-app-thread.zap | 18 +- .../data_model/lighting-app-wifi.matter | 10 +- .../data_model/lighting-app-wifi.zap | 18 +- .../lighting-common/lighting-app.matter | 10 +- .../lighting-common/lighting-app.zap | 18 +- .../nxp/zap/lighting-on-off.matter | 12 +- .../lighting-app/nxp/zap/lighting-on-off.zap | 34 +++- examples/lighting-app/qpg/zap/light.matter | 10 +- examples/lighting-app/qpg/zap/light.zap | 18 +- .../data_model/lighting-thread-app.matter | 10 +- .../silabs/data_model/lighting-thread-app.zap | 18 +- .../data_model/lighting-wifi-app.matter | 10 +- .../silabs/data_model/lighting-wifi-app.zap | 18 +- examples/lock-app/lock-common/lock-app.matter | 10 +- examples/lock-app/lock-common/lock-app.zap | 18 +- examples/lock-app/nxp/zap/lock-app.matter | 12 +- examples/lock-app/nxp/zap/lock-app.zap | 34 +++- examples/lock-app/qpg/zap/lock.matter | 10 +- examples/lock-app/qpg/zap/lock.zap | 18 +- .../ota-provider-app.matter | 10 +- .../ota-provider-common/ota-provider-app.zap | 18 +- .../ota-requestor-app.matter | 10 +- .../ota-requestor-app.zap | 18 +- .../placeholder/linux/apps/app1/config.matter | 10 +- .../placeholder/linux/apps/app1/config.zap | 18 +- .../placeholder/linux/apps/app2/config.matter | 10 +- .../placeholder/linux/apps/app2/config.zap | 18 +- examples/pump-app/pump-common/pump-app.matter | 12 +- examples/pump-app/pump-common/pump-app.zap | 34 +++- .../silabs/data_model/pump-thread-app.matter | 12 +- .../silabs/data_model/pump-thread-app.zap | 34 +++- .../silabs/data_model/pump-wifi-app.matter | 12 +- .../silabs/data_model/pump-wifi-app.zap | 34 +++- .../pump-controller-app.matter | 12 +- .../pump-controller-app.zap | 34 +++- .../refrigerator-app.matter | 10 +- .../refrigerator-common/refrigerator-app.zap | 18 +- .../resource-monitoring-app.matter | 10 +- .../resource-monitoring-app.zap | 18 +- examples/rvc-app/rvc-common/rvc-app.matter | 10 +- examples/rvc-app/rvc-common/rvc-app.zap | 18 +- .../smoke-co-alarm-app.matter | 10 +- .../smoke-co-alarm-app.zap | 18 +- .../temperature-measurement.matter | 10 +- .../temperature-measurement.zap | 18 +- .../nxp/zap/thermostat_matter_thread.matter | 10 +- .../nxp/zap/thermostat_matter_thread.zap | 18 +- .../nxp/zap/thermostat_matter_wifi.matter | 10 +- .../nxp/zap/thermostat_matter_wifi.zap | 18 +- .../thermostat-common/thermostat.matter | 10 +- .../thermostat-common/thermostat.zap | 18 +- examples/tv-app/tv-common/tv-app.matter | 10 +- examples/tv-app/tv-common/tv-app.zap | 18 +- .../tv-casting-common/tv-casting-app.matter | 10 +- .../tv-casting-common/tv-casting-app.zap | 18 +- .../virtual-device-app.matter | 10 +- .../virtual-device-app.zap | 18 +- examples/window-app/common/window-app.matter | 10 +- examples/window-app/common/window-app.zap | 18 +- .../general-diagnostics-server.cpp | 9 + .../certification/Test_TC_DGGEN_1_1.yaml | 11 +- .../certification/Test_TC_DGGEN_2_1.yaml | 4 - .../chip/general-diagnostics-cluster.xml | 34 ++-- .../data_model/controller-clusters.matter | 7 + .../chip/devicecontroller/ChipClusters.java | 15 ++ .../devicecontroller/ClusterIDMapping.java | 3 +- .../devicecontroller/ClusterInfoMapping.java | 36 ++++ .../zap-generated/CHIPInvokeCallbacks.cpp | 75 ++++++++ .../java/zap-generated/CHIPInvokeCallbacks.h | 15 ++ .../python/chip/clusters/CHIPClusters.py | 6 + .../python/chip/clusters/Objects.py | 31 ++++ .../CHIP/zap-generated/MTRBaseClusters.h | 8 + .../CHIP/zap-generated/MTRBaseClusters.mm | 28 +++ .../CHIP/zap-generated/MTRClusterConstants.h | 2 + .../CHIP/zap-generated/MTRClusters.h | 3 + .../CHIP/zap-generated/MTRClusters.mm | 31 ++++ .../zap-generated/MTRCommandPayloadsObjc.h | 49 ++++++ .../zap-generated/MTRCommandPayloadsObjc.mm | 162 ++++++++++++++++++ .../MTRCommandPayloads_Internal.h | 12 ++ .../app-common/zap-generated/callback.h | 6 + .../zap-generated/cluster-objects.cpp | 59 +++++++ .../zap-generated/cluster-objects.h | 73 ++++++++ .../app-common/zap-generated/ids/Commands.h | 8 + .../zap-generated/cluster/Commands.h | 39 +++++ .../cluster/logging/DataModelLogger.cpp | 20 +++ .../cluster/logging/DataModelLogger.h | 2 + .../zap-generated/cluster/Commands.h | 52 ++++++ .../zap-generated/test/Commands.h | 18 +- 175 files changed, 2839 insertions(+), 177 deletions(-) diff --git a/examples/air-purifier-app/air-purifier-common/air-purifier-app.matter b/examples/air-purifier-app/air-purifier-common/air-purifier-app.matter index 1f912fcd64e643..d8eae9ae77ced3 100644 --- a/examples/air-purifier-app/air-purifier-common/air-purifier-app.matter +++ b/examples/air-purifier-app/air-purifier-common/air-purifier-app.matter @@ -739,7 +739,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** Commands to trigger a Node to allow a new Administrator to commission it. */ @@ -1883,9 +1889,11 @@ endpoint 0 { callback attribute activeNetworkFaults; callback attribute testEventTriggersEnabled default = false; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 0x0001; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster AdministratorCommissioning { diff --git a/examples/air-purifier-app/air-purifier-common/air-purifier-app.zap b/examples/air-purifier-app/air-purifier-common/air-purifier-app.zap index c1f47b4d162a51..cc96cb04983fc4 100644 --- a/examples/air-purifier-app/air-purifier-common/air-purifier-app.zap +++ b/examples/air-purifier-app/air-purifier-common/air-purifier-app.zap @@ -1379,6 +1379,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1552,7 +1568,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x0001", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter b/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter index 736803eaad9c70..ca74840f26cdd7 100644 --- a/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter +++ b/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter @@ -696,7 +696,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -1886,9 +1892,11 @@ endpoint 0 { callback attribute activeNetworkFaults; callback attribute testEventTriggersEnabled default = false; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster SoftwareDiagnostics { diff --git a/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.zap b/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.zap index 13bfc7a3777a90..f459cfa6521060 100644 --- a/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.zap +++ b/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.zap @@ -1327,6 +1327,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1500,7 +1516,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, 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 a27629bc4da66d..ca2f4ed0bda4ab 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 @@ -1669,7 +1669,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -5399,9 +5405,11 @@ endpoint 0 { callback attribute eventList; callback attribute attributeList; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster SoftwareDiagnostics { diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap index 24e0df516f1b12..c5045d193a6d82 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap @@ -2695,6 +2695,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -2932,7 +2948,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, 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 5a4a521d090db2..d80602ebfc5633 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 @@ -1475,6 +1475,7 @@ server cluster GeneralDiagnostics = 51 { readonly attribute NetworkInterface networkInterfaces[] = 0; readonly attribute int16u rebootCount = 1; + readonly attribute int64u upTime = 2; readonly attribute boolean testEventTriggersEnabled = 8; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -1488,7 +1489,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -4189,15 +4196,18 @@ endpoint 0 { server cluster GeneralDiagnostics { callback attribute networkInterfaces; callback attribute rebootCount default = 0x0000; + callback attribute upTime default = 0x0000000000000000; callback attribute testEventTriggersEnabled; callback attribute generatedCommandList; callback attribute acceptedCommandList; callback attribute eventList; callback attribute attributeList; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster SoftwareDiagnostics { diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap index b5931df6f9ca27..50ab55464e0526 100644 --- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap +++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap @@ -2368,6 +2368,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -2403,6 +2419,22 @@ "maxInterval": 65344, "reportableChange": 0 }, + { + "name": "UpTime", + "code": 2, + "mfgCode": null, + "side": "server", + "type": "int64u", + "included": 1, + "storageOption": "External", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x0000000000000000", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "TestEventTriggersEnabled", "code": 8, @@ -2509,7 +2541,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter index 63f5eb56aa9021..694b7de74c9f38 100644 --- a/examples/bridge-app/bridge-common/bridge-app.matter +++ b/examples/bridge-app/bridge-common/bridge-app.matter @@ -1006,7 +1006,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -1787,9 +1793,11 @@ endpoint 0 { callback attribute acceptedCommandList; callback attribute attributeList; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster SoftwareDiagnostics { diff --git a/examples/bridge-app/bridge-common/bridge-app.zap b/examples/bridge-app/bridge-common/bridge-app.zap index a317c4f078917e..9570644c62188a 100644 --- a/examples/bridge-app/bridge-common/bridge-app.zap +++ b/examples/bridge-app/bridge-common/bridge-app.zap @@ -1797,6 +1797,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -2018,7 +2034,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter index 35637f909cfcd7..8dfc00959b33d3 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter @@ -878,7 +878,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -1599,9 +1605,11 @@ endpoint 0 { callback attribute activeNetworkFaults; callback attribute testEventTriggersEnabled default = false; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 0x0001; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster SoftwareDiagnostics { diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap index 25ac5369207196..8a9d8d4e42c31d 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap @@ -1299,6 +1299,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1472,7 +1488,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x0001", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter b/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter index 7e202205baad3c..a44002cc3ca5e6 100644 --- a/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter +++ b/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter @@ -659,7 +659,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** Commands to trigger a Node to allow a new Administrator to commission it. */ @@ -1848,9 +1854,11 @@ endpoint 0 { callback attribute activeNetworkFaults; callback attribute testEventTriggersEnabled default = false; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 0x0001; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster AdministratorCommissioning { diff --git a/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.zap b/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.zap index 972a203fbb2822..8e8c9a404ce37c 100644 --- a/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.zap +++ b/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.zap @@ -1172,6 +1172,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1345,7 +1361,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x0001", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter b/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter index 25c89264dc5cc4..7ab39684ed63a8 100644 --- a/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter +++ b/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter @@ -788,7 +788,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -1823,9 +1829,11 @@ endpoint 0 { callback attribute activeNetworkFaults; callback attribute testEventTriggersEnabled default = false; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 0x0001; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster SoftwareDiagnostics { diff --git a/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.zap b/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.zap index 9bcbe3d733ef4d..8df2dae41dc7d8 100644 --- a/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.zap +++ b/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.zap @@ -1543,6 +1543,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1716,7 +1732,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x0001", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter index 552d72bad13b31..a9e79fa2f29573 100644 --- a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter +++ b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter @@ -793,7 +793,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -1593,9 +1599,11 @@ endpoint 0 { callback attribute activeNetworkFaults; callback attribute testEventTriggersEnabled default = false; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 0x0001; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster SoftwareDiagnostics { diff --git a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap index 5f7070767c1420..f9b6772b58d4f2 100644 --- a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap +++ b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap @@ -1543,6 +1543,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1716,7 +1732,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x0001", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter index f34d41305c3231..05203e0729239f 100644 --- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter +++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter @@ -970,7 +970,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -1644,9 +1650,11 @@ endpoint 0 { callback attribute activeNetworkFaults; callback attribute testEventTriggersEnabled default = false; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 0x0001; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster SoftwareDiagnostics { diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap index 54a5668ca54ea3..4c96f6708498f9 100644 --- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap +++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap @@ -1379,6 +1379,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1552,7 +1568,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x0001", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter index 1f48ef322092f0..39ac6b08dba8f3 100644 --- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter +++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter @@ -876,7 +876,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -1320,9 +1326,11 @@ endpoint 0 { callback attribute activeNetworkFaults; callback attribute testEventTriggersEnabled default = false; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 0x0001; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster SoftwareDiagnostics { diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap index 57d85478f48039..49c9fe342f96be 100644 --- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap +++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap @@ -1543,6 +1543,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1716,7 +1732,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x0001", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter index 590adf953259f3..f503073da064bb 100644 --- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter @@ -1026,7 +1026,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -1496,9 +1502,11 @@ endpoint 0 { callback attribute activeNetworkFaults; callback attribute testEventTriggersEnabled default = false; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 0x0001; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster SoftwareDiagnostics { diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap index b5d2ed8cfb1508..ae7f9833be6028 100644 --- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap +++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap @@ -1575,6 +1575,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1748,7 +1764,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x0001", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter b/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter index b3273daa5b68c6..45c904f19f693a 100644 --- a/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter +++ b/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter @@ -631,7 +631,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -1165,9 +1171,11 @@ endpoint 0 { callback attribute acceptedCommandList default = 0; callback attribute attributeList default = 0; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster WiFiNetworkDiagnostics { diff --git a/examples/chef/devices/rootnode_dishwasher_cc105034fe.zap b/examples/chef/devices/rootnode_dishwasher_cc105034fe.zap index e50c640463cb6d..25a0d0d1be222b 100644 --- a/examples/chef/devices/rootnode_dishwasher_cc105034fe.zap +++ b/examples/chef/devices/rootnode_dishwasher_cc105034fe.zap @@ -1786,6 +1786,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -2007,7 +2023,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter index db8fafe7e33ab9..ab0f572eb982ad 100644 --- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter +++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter @@ -876,7 +876,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -1792,9 +1798,11 @@ endpoint 0 { callback attribute activeNetworkFaults; callback attribute testEventTriggersEnabled default = false; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 0x0001; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster SoftwareDiagnostics { diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap index 6e55ee26b2f95c..fc97739ea6ec98 100644 --- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap +++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap @@ -1543,6 +1543,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1716,7 +1732,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x0001", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter index 4055d3f91948f7..5502974d07c632 100644 --- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter +++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter @@ -1026,7 +1026,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -1723,9 +1729,11 @@ endpoint 0 { callback attribute activeNetworkFaults; callback attribute testEventTriggersEnabled default = false; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 0x0001; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster SoftwareDiagnostics { diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap index 5d3000d8b3ab71..62689b778ce654 100644 --- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap +++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap @@ -1543,6 +1543,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1716,7 +1732,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x0001", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter index 37361893fd2449..bb154d3af5b762 100644 --- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter +++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter @@ -863,7 +863,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -1363,9 +1369,11 @@ endpoint 0 { callback attribute activeNetworkFaults; callback attribute testEventTriggersEnabled default = false; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 0x0001; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster SoftwareDiagnostics { diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap b/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap index 6d93d50076731c..f410f56974d928 100644 --- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap +++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap @@ -1559,6 +1559,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1732,7 +1748,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x0001", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter index 430af0dd820338..2ddd9204315b8e 100644 --- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter +++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter @@ -882,7 +882,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -1325,9 +1331,11 @@ endpoint 0 { callback attribute activeNetworkFaults; callback attribute testEventTriggersEnabled default = false; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 0x0001; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster SoftwareDiagnostics { diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap index 3ad57c090834ff..d193bb5d236e2b 100644 --- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap +++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap @@ -1543,6 +1543,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1716,7 +1732,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x0001", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/chef/devices/rootnode_genericswitch_9866e35d0b.matter b/examples/chef/devices/rootnode_genericswitch_9866e35d0b.matter index 3305b751649ce5..de09288e6eaf13 100644 --- a/examples/chef/devices/rootnode_genericswitch_9866e35d0b.matter +++ b/examples/chef/devices/rootnode_genericswitch_9866e35d0b.matter @@ -590,7 +590,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** This cluster exposes interactions with a switch device, for the purpose of using those interactions by other devices. @@ -990,9 +996,11 @@ endpoint 0 { callback attribute activeNetworkFaults; callback attribute testEventTriggersEnabled default = false; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 0x0001; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster AdministratorCommissioning { diff --git a/examples/chef/devices/rootnode_genericswitch_9866e35d0b.zap b/examples/chef/devices/rootnode_genericswitch_9866e35d0b.zap index 1f3613a429ed18..568708c64ea1ad 100644 --- a/examples/chef/devices/rootnode_genericswitch_9866e35d0b.zap +++ b/examples/chef/devices/rootnode_genericswitch_9866e35d0b.zap @@ -1172,6 +1172,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1345,7 +1361,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x0001", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter index 08aa21400773f2..03c9febba23c21 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter @@ -1020,7 +1020,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -1672,9 +1678,11 @@ endpoint 0 { callback attribute activeNetworkFaults; callback attribute testEventTriggersEnabled default = false; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 0x0001; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster SoftwareDiagnostics { diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap index 3995dfe9782e6a..40ea29e55ac961 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap @@ -1543,6 +1543,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1716,7 +1732,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x0001", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter index 3078ca5196ed87..a3c8e66c387718 100644 --- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter +++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter @@ -882,7 +882,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -1325,9 +1331,11 @@ endpoint 0 { callback attribute activeNetworkFaults; callback attribute testEventTriggersEnabled default = false; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 0x0001; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster SoftwareDiagnostics { diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap index 0e56fbaa2449b8..9837d64370ea7f 100644 --- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap +++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap @@ -1543,6 +1543,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1716,7 +1732,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x0001", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter b/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter index 2e9b45c1f90b23..9657c9b28e6909 100644 --- a/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter +++ b/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter @@ -631,7 +631,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -1163,9 +1169,11 @@ endpoint 0 { callback attribute acceptedCommandList default = 0; callback attribute attributeList default = 0; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster WiFiNetworkDiagnostics { diff --git a/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.zap b/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.zap index 798ae3307bd2e0..c33f7639fe02d9 100644 --- a/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.zap +++ b/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.zap @@ -1786,6 +1786,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -2007,7 +2023,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter index 6a9dd8678eaf30..3110d0f02c255d 100644 --- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter +++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter @@ -882,7 +882,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -1330,9 +1336,11 @@ endpoint 0 { callback attribute activeNetworkFaults; callback attribute testEventTriggersEnabled default = false; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 0x0001; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster SoftwareDiagnostics { diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap index a33119d44de291..4628663d2048eb 100644 --- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap +++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap @@ -1543,6 +1543,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1716,7 +1732,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x0001", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter index 14000155c0a0bc..17d359a6a8e4cc 100644 --- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter +++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter @@ -882,7 +882,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -1341,9 +1347,11 @@ endpoint 0 { callback attribute activeNetworkFaults; callback attribute testEventTriggersEnabled default = false; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 0x0001; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster SoftwareDiagnostics { diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap index 6646443a09e65b..e0a1133e2b10c7 100644 --- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap +++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap @@ -1543,6 +1543,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1716,7 +1732,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x0001", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter index ca7dd727790bcc..fb6bcf3d62788d 100644 --- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter +++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter @@ -1026,7 +1026,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -1455,9 +1461,11 @@ endpoint 0 { callback attribute activeNetworkFaults; callback attribute testEventTriggersEnabled default = false; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 0x0001; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster SoftwareDiagnostics { diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap index e89d7311babe0a..cce6ae448e774e 100644 --- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap +++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap @@ -1543,6 +1543,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1716,7 +1732,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x0001", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/chef/devices/rootnode_onofflight_samplemei.matter b/examples/chef/devices/rootnode_onofflight_samplemei.matter index 85933c93474d4b..69ee3097aba335 100644 --- a/examples/chef/devices/rootnode_onofflight_samplemei.matter +++ b/examples/chef/devices/rootnode_onofflight_samplemei.matter @@ -1026,7 +1026,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -1478,9 +1484,11 @@ endpoint 0 { callback attribute activeNetworkFaults; callback attribute testEventTriggersEnabled default = false; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 0x0001; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster SoftwareDiagnostics { diff --git a/examples/chef/devices/rootnode_onofflight_samplemei.zap b/examples/chef/devices/rootnode_onofflight_samplemei.zap index 5b983849ca4f2f..83f44eebd1907d 100644 --- a/examples/chef/devices/rootnode_onofflight_samplemei.zap +++ b/examples/chef/devices/rootnode_onofflight_samplemei.zap @@ -1543,6 +1543,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1716,7 +1732,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x0001", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter index e226808c56b944..da912ef77108a1 100644 --- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter +++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter @@ -990,7 +990,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -1419,9 +1425,11 @@ endpoint 0 { callback attribute activeNetworkFaults; callback attribute testEventTriggersEnabled default = false; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 0x0001; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster SoftwareDiagnostics { diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap index e2e1d77b241f90..801d9c4fd2de67 100644 --- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap +++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap @@ -1543,6 +1543,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1716,7 +1732,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x0001", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter index 0a7f8aabd6adc2..08003bcfe2384a 100644 --- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter +++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter @@ -925,7 +925,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -1354,9 +1360,11 @@ endpoint 0 { callback attribute activeNetworkFaults; callback attribute testEventTriggersEnabled default = false; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 0x0001; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster SoftwareDiagnostics { diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap index 24052570e77c22..66744fe2fc879e 100644 --- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap +++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap @@ -1543,6 +1543,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1716,7 +1732,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x0001", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter index dd1a2f16349f05..eb125b89e48971 100644 --- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter +++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter @@ -882,7 +882,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -1344,9 +1350,11 @@ endpoint 0 { callback attribute activeNetworkFaults; callback attribute testEventTriggersEnabled default = false; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 0x0001; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster SoftwareDiagnostics { diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap index 1b0028275e2b40..4ed304754c594f 100644 --- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap +++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap @@ -1543,6 +1543,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1716,7 +1732,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x0001", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/chef/devices/rootnode_pump_5f904818cc.matter b/examples/chef/devices/rootnode_pump_5f904818cc.matter index a5bd2bf03297bb..a28ab46f769944 100644 --- a/examples/chef/devices/rootnode_pump_5f904818cc.matter +++ b/examples/chef/devices/rootnode_pump_5f904818cc.matter @@ -648,6 +648,7 @@ server cluster GeneralDiagnostics = 51 { readonly attribute NetworkInterface networkInterfaces[] = 0; readonly attribute int16u rebootCount = 1; + readonly attribute int64u upTime = 2; readonly attribute boolean testEventTriggersEnabled = 8; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -661,7 +662,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** Commands to trigger a Node to allow a new Administrator to commission it. */ @@ -1176,14 +1183,17 @@ endpoint 0 { server cluster GeneralDiagnostics { callback attribute networkInterfaces; callback attribute rebootCount default = 0x0000; + callback attribute upTime default = 0x0000000000000000; callback attribute testEventTriggersEnabled default = false; callback attribute generatedCommandList; callback attribute acceptedCommandList; callback attribute attributeList; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster AdministratorCommissioning { diff --git a/examples/chef/devices/rootnode_pump_5f904818cc.zap b/examples/chef/devices/rootnode_pump_5f904818cc.zap index 131da70f467974..ca969c6222fabe 100644 --- a/examples/chef/devices/rootnode_pump_5f904818cc.zap +++ b/examples/chef/devices/rootnode_pump_5f904818cc.zap @@ -1511,6 +1511,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1546,6 +1562,22 @@ "maxInterval": 65344, "reportableChange": 0 }, + { + "name": "UpTime", + "code": 2, + "mfgCode": null, + "side": "server", + "type": "int64u", + "included": 1, + "storageOption": "External", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x0000000000000000", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "TestEventTriggersEnabled", "code": 8, @@ -1636,7 +1668,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/chef/devices/rootnode_pump_a811bb33a0.matter b/examples/chef/devices/rootnode_pump_a811bb33a0.matter index 44e81fb472dc0c..ed9c708770e43f 100644 --- a/examples/chef/devices/rootnode_pump_a811bb33a0.matter +++ b/examples/chef/devices/rootnode_pump_a811bb33a0.matter @@ -648,6 +648,7 @@ server cluster GeneralDiagnostics = 51 { readonly attribute NetworkInterface networkInterfaces[] = 0; readonly attribute int16u rebootCount = 1; + readonly attribute int64u upTime = 2; readonly attribute boolean testEventTriggersEnabled = 8; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -661,7 +662,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** Commands to trigger a Node to allow a new Administrator to commission it. */ @@ -1128,14 +1135,17 @@ endpoint 0 { server cluster GeneralDiagnostics { callback attribute networkInterfaces; callback attribute rebootCount default = 0x0000; + callback attribute upTime default = 0x0000000000000000; callback attribute testEventTriggersEnabled default = false; callback attribute generatedCommandList; callback attribute acceptedCommandList; callback attribute attributeList; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster AdministratorCommissioning { diff --git a/examples/chef/devices/rootnode_pump_a811bb33a0.zap b/examples/chef/devices/rootnode_pump_a811bb33a0.zap index 49a4e51fd9a20e..c4ce099577de7a 100644 --- a/examples/chef/devices/rootnode_pump_a811bb33a0.zap +++ b/examples/chef/devices/rootnode_pump_a811bb33a0.zap @@ -1511,6 +1511,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1546,6 +1562,22 @@ "maxInterval": 65344, "reportableChange": 0 }, + { + "name": "UpTime", + "code": 2, + "mfgCode": null, + "side": "server", + "type": "int64u", + "included": 1, + "storageOption": "External", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x0000000000000000", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "TestEventTriggersEnabled", "code": 8, @@ -1636,7 +1668,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter b/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter index 745eb917c8b8bd..789ab736372331 100644 --- a/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter +++ b/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter @@ -631,7 +631,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -1130,9 +1136,11 @@ endpoint 0 { callback attribute acceptedCommandList default = 0; callback attribute attributeList default = 0; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster WiFiNetworkDiagnostics { diff --git a/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.zap b/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.zap index 6d0189f25a769a..f63a0072d3fc7e 100644 --- a/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.zap +++ b/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.zap @@ -1786,6 +1786,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -2007,7 +2023,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter index a5a8b6afc1c7a0..b776749b7e2699 100644 --- a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter +++ b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter @@ -659,7 +659,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** Commands to trigger a Node to allow a new Administrator to commission it. */ @@ -1172,9 +1178,11 @@ endpoint 0 { callback attribute activeNetworkFaults; callback attribute testEventTriggersEnabled default = false; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 0x0001; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster AdministratorCommissioning { diff --git a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap index dad96cd186033a..b12960c0ad7c65 100644 --- a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap +++ b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap @@ -1172,6 +1172,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1345,7 +1361,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x0001", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter index 3f2fb5857276cc..6a2b4649a021c0 100644 --- a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter +++ b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter @@ -704,7 +704,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** Commands to trigger a Node to allow a new Administrator to commission it. */ @@ -1217,9 +1223,11 @@ endpoint 0 { callback attribute activeNetworkFaults; callback attribute testEventTriggersEnabled default = false; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 0x0001; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster AdministratorCommissioning { diff --git a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.zap b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.zap index 81b7dd94bb90f1..22078ba8f841f7 100644 --- a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.zap +++ b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.zap @@ -1172,6 +1172,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1345,7 +1361,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x0001", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter b/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter index 1c026bb8c31c30..2742d918b4aa9d 100644 --- a/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter +++ b/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter @@ -891,7 +891,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** Commands to trigger a Node to allow a new Administrator to commission it. */ @@ -1348,9 +1354,11 @@ endpoint 0 { callback attribute activeNetworkFaults; callback attribute testEventTriggersEnabled default = false; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 0x0001; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster AdministratorCommissioning { diff --git a/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.zap b/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.zap index ac52e9a00e295e..9fdb65c8035573 100644 --- a/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.zap +++ b/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.zap @@ -1172,6 +1172,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1345,7 +1361,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x0001", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter index 5fc393ff48f607..c2a65154372e18 100644 --- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter +++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter @@ -951,7 +951,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -1380,9 +1386,11 @@ endpoint 0 { callback attribute activeNetworkFaults; callback attribute testEventTriggersEnabled default = false; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 0x0001; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster SoftwareDiagnostics { diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap index dd5e63a06d5bfd..28f47070e93356 100644 --- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap +++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap @@ -1543,6 +1543,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1716,7 +1732,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x0001", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter index 8eb9c77b6fc45e..7c3771e7222915 100644 --- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter +++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter @@ -882,7 +882,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -1324,9 +1330,11 @@ endpoint 0 { callback attribute activeNetworkFaults; callback attribute testEventTriggersEnabled default = false; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 0x0001; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster SoftwareDiagnostics { diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap index 28e1691e0d9387..e16ee3fcca8420 100644 --- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap +++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap @@ -1543,6 +1543,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1716,7 +1732,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x0001", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter index 73d5d7df7262a2..5e63942dde6df5 100644 --- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter +++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter @@ -876,7 +876,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -1573,9 +1579,11 @@ endpoint 0 { callback attribute activeNetworkFaults; callback attribute testEventTriggersEnabled default = false; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 0x0001; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster SoftwareDiagnostics { diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap index fc6192274b30ac..fbe5c0f9c50a56 100644 --- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap +++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap @@ -1543,6 +1543,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1716,7 +1732,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x0001", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter index 7a1f5a750e1747..7b2e347b0ed662 100644 --- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter +++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter @@ -876,7 +876,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -1449,9 +1455,11 @@ endpoint 0 { callback attribute activeNetworkFaults; callback attribute testEventTriggersEnabled default = false; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 0x0001; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster SoftwareDiagnostics { diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap index 981a417a84f735..0d68f07eccb7a1 100644 --- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap +++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap @@ -1543,6 +1543,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1716,7 +1732,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x0001", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/chef/devices/template.zap b/examples/chef/devices/template.zap index 0f7cf1a1d63a13..bf77da05ea3d05 100644 --- a/examples/chef/devices/template.zap +++ b/examples/chef/devices/template.zap @@ -1172,6 +1172,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1345,7 +1361,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x0001", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/chef/sample_app_util/test_files/sample_zap_file.zap b/examples/chef/sample_app_util/test_files/sample_zap_file.zap index eff6a00671d5b0..1359eea30b9791 100644 --- a/examples/chef/sample_app_util/test_files/sample_zap_file.zap +++ b/examples/chef/sample_app_util/test_files/sample_zap_file.zap @@ -1830,7 +1830,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, 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 2d0308f0c81741..847c827d4fe086 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 @@ -863,7 +863,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -1646,9 +1652,11 @@ endpoint 0 { callback attribute activeNetworkFaults; callback attribute testEventTriggersEnabled default = false; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster SoftwareDiagnostics { diff --git a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap index 0fa6b11ed229eb..1a7ff846ae75a0 100644 --- a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap +++ b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap @@ -1683,6 +1683,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1856,7 +1872,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter b/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter index 1cac116c4efef6..fa10fd83dd7c77 100644 --- a/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter +++ b/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter @@ -719,7 +719,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -1270,9 +1276,11 @@ endpoint 0 { callback attribute acceptedCommandList default = 0; callback attribute attributeList default = 0; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster WiFiNetworkDiagnostics { diff --git a/examples/dishwasher-app/dishwasher-common/dishwasher-app.zap b/examples/dishwasher-app/dishwasher-common/dishwasher-app.zap index 35e670751458f5..be3add8ed70a6a 100644 --- a/examples/dishwasher-app/dishwasher-common/dishwasher-app.zap +++ b/examples/dishwasher-app/dishwasher-common/dishwasher-app.zap @@ -1926,6 +1926,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -2147,7 +2163,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, 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 f8962a2ac437d7..74028e4ef9f8ae 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 @@ -1177,7 +1177,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -2459,9 +2465,11 @@ endpoint 0 { callback attribute activeNetworkFaults; callback attribute testEventTriggersEnabled default = false; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster SoftwareDiagnostics { diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.zap b/examples/light-switch-app/light-switch-common/light-switch-app.zap index a92321ae63ca0c..0e3857c0ef3747 100644 --- a/examples/light-switch-app/light-switch-common/light-switch-app.zap +++ b/examples/light-switch-app/light-switch-common/light-switch-app.zap @@ -1601,6 +1601,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1774,7 +1790,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter index 8ab0257efa2b41..7a3be88505e300 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter @@ -1034,7 +1034,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -1797,9 +1803,11 @@ endpoint 0 { callback attribute activeNetworkFaults; callback attribute testEventTriggersEnabled default = false; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster SoftwareDiagnostics { diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.zap b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.zap index 3fbf144422e576..964c28d2394697 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.zap +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.zap @@ -1437,6 +1437,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1610,7 +1626,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, 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 f7bb7e5544d04e..3475808b741751 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter @@ -1034,7 +1034,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -1929,9 +1935,11 @@ endpoint 0 { callback attribute activeNetworkFaults; callback attribute testEventTriggersEnabled default = false; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster SoftwareDiagnostics { diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap index cb06c41a042700..01561c14d6dd33 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap @@ -1543,6 +1543,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1716,7 +1732,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, 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 98e9f875aebe99..c389aafb01efc5 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter @@ -1034,7 +1034,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -1839,9 +1845,11 @@ endpoint 0 { callback attribute activeNetworkFaults; callback attribute testEventTriggersEnabled default = false; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster SoftwareDiagnostics { diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap index c24ec8d3bc8eaf..b5a5f6165d0016 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap @@ -1543,6 +1543,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1716,7 +1732,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter index f39d6580d31f65..3ff6f8d4ede74f 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -1181,7 +1181,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -2255,9 +2261,11 @@ endpoint 0 { callback attribute activeNetworkFaults; callback attribute testEventTriggersEnabled default = false; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster SoftwareDiagnostics { diff --git a/examples/lighting-app/lighting-common/lighting-app.zap b/examples/lighting-app/lighting-common/lighting-app.zap index c4f3572ec96857..1eb4d7a701f432 100644 --- a/examples/lighting-app/lighting-common/lighting-app.zap +++ b/examples/lighting-app/lighting-common/lighting-app.zap @@ -1543,6 +1543,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1716,7 +1732,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.matter b/examples/lighting-app/nxp/zap/lighting-on-off.matter index 879cdadd19a22f..4ac1ee3eca2f63 100644 --- a/examples/lighting-app/nxp/zap/lighting-on-off.matter +++ b/examples/lighting-app/nxp/zap/lighting-on-off.matter @@ -901,6 +901,7 @@ server cluster GeneralDiagnostics = 51 { readonly attribute NetworkInterface networkInterfaces[] = 0; readonly attribute int16u rebootCount = 1; + readonly attribute int64u upTime = 2; readonly attribute boolean testEventTriggersEnabled = 8; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -914,7 +915,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -1442,11 +1449,14 @@ endpoint 0 { emits event BootReason; callback attribute networkInterfaces; callback attribute rebootCount default = 0x0000; + callback attribute upTime default = 0x0000000000000000; callback attribute testEventTriggersEnabled default = false; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster SoftwareDiagnostics { diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.zap b/examples/lighting-app/nxp/zap/lighting-on-off.zap index 4da6db3bf6d93b..908dfc6bc2ac66 100644 --- a/examples/lighting-app/nxp/zap/lighting-on-off.zap +++ b/examples/lighting-app/nxp/zap/lighting-on-off.zap @@ -1191,6 +1191,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1226,6 +1242,22 @@ "maxInterval": 65344, "reportableChange": 0 }, + { + "name": "UpTime", + "code": 2, + "mfgCode": null, + "side": "server", + "type": "int64u", + "included": 1, + "storageOption": "External", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x0000000000000000", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "TestEventTriggersEnabled", "code": 8, @@ -1268,7 +1300,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/lighting-app/qpg/zap/light.matter b/examples/lighting-app/qpg/zap/light.matter index 7c055058372faf..d0f37c17c22356 100644 --- a/examples/lighting-app/qpg/zap/light.matter +++ b/examples/lighting-app/qpg/zap/light.matter @@ -975,7 +975,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -1877,9 +1883,11 @@ endpoint 0 { callback attribute acceptedCommandList; callback attribute attributeList; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster SoftwareDiagnostics { diff --git a/examples/lighting-app/qpg/zap/light.zap b/examples/lighting-app/qpg/zap/light.zap index ffd306791f7f40..a3b56ebb02d1cb 100644 --- a/examples/lighting-app/qpg/zap/light.zap +++ b/examples/lighting-app/qpg/zap/light.zap @@ -1715,6 +1715,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1936,7 +1952,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, 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 31c6acf21d6c38..551342811a2428 100644 --- a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter +++ b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter @@ -1438,7 +1438,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -2308,9 +2314,11 @@ endpoint 0 { callback attribute activeNetworkFaults; callback attribute testEventTriggersEnabled default = false; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster SoftwareDiagnostics { diff --git a/examples/lighting-app/silabs/data_model/lighting-thread-app.zap b/examples/lighting-app/silabs/data_model/lighting-thread-app.zap index 00e4fc3dc68664..f9bedf8f98ceee 100644 --- a/examples/lighting-app/silabs/data_model/lighting-thread-app.zap +++ b/examples/lighting-app/silabs/data_model/lighting-thread-app.zap @@ -1497,6 +1497,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1670,7 +1686,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, 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 293faf071dbb16..404029c1978ca1 100644 --- a/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter +++ b/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter @@ -1417,7 +1417,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -2198,9 +2204,11 @@ endpoint 0 { callback attribute activeNetworkFaults; callback attribute testEventTriggersEnabled default = false; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster SoftwareDiagnostics { diff --git a/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap b/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap index 76f4fde26b1b09..9fdd90c26099db 100644 --- a/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap +++ b/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap @@ -1497,6 +1497,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1670,7 +1686,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter index b3f6f1c74593a3..ea7d73c4282cb2 100644 --- a/examples/lock-app/lock-common/lock-app.matter +++ b/examples/lock-app/lock-common/lock-app.matter @@ -1100,7 +1100,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -2516,9 +2522,11 @@ endpoint 0 { callback attribute eventList; callback attribute attributeList; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster SoftwareDiagnostics { diff --git a/examples/lock-app/lock-common/lock-app.zap b/examples/lock-app/lock-common/lock-app.zap index e079f41ed81adf..5dddf5b3075d14 100644 --- a/examples/lock-app/lock-common/lock-app.zap +++ b/examples/lock-app/lock-common/lock-app.zap @@ -2284,6 +2284,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -2521,7 +2537,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/lock-app/nxp/zap/lock-app.matter b/examples/lock-app/nxp/zap/lock-app.matter index 9b030c237fb074..9481cb27c858d3 100644 --- a/examples/lock-app/nxp/zap/lock-app.matter +++ b/examples/lock-app/nxp/zap/lock-app.matter @@ -519,6 +519,7 @@ server cluster GeneralDiagnostics = 51 { readonly attribute NetworkInterface networkInterfaces[] = 0; readonly attribute int16u rebootCount = 1; + readonly attribute int64u upTime = 2; readonly attribute boolean testEventTriggersEnabled = 8; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -532,7 +533,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -1515,11 +1522,14 @@ endpoint 0 { emits event BootReason; callback attribute networkInterfaces; callback attribute rebootCount default = 0x0000; + callback attribute upTime default = 0x0000000000000000; callback attribute testEventTriggersEnabled default = false; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster SoftwareDiagnostics { diff --git a/examples/lock-app/nxp/zap/lock-app.zap b/examples/lock-app/nxp/zap/lock-app.zap index 103c17087eccfd..8e015b083248cb 100644 --- a/examples/lock-app/nxp/zap/lock-app.zap +++ b/examples/lock-app/nxp/zap/lock-app.zap @@ -984,6 +984,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1019,6 +1035,22 @@ "maxInterval": 65344, "reportableChange": 0 }, + { + "name": "UpTime", + "code": 2, + "mfgCode": null, + "side": "server", + "type": "int64u", + "included": 1, + "storageOption": "External", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x0000000000000000", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "TestEventTriggersEnabled", "code": 8, @@ -1061,7 +1093,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/lock-app/qpg/zap/lock.matter b/examples/lock-app/qpg/zap/lock.matter index 5b67875cce9279..573fbe867361c6 100644 --- a/examples/lock-app/qpg/zap/lock.matter +++ b/examples/lock-app/qpg/zap/lock.matter @@ -808,7 +808,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -1911,9 +1917,11 @@ endpoint 0 { callback attribute acceptedCommandList; callback attribute attributeList; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster SoftwareDiagnostics { diff --git a/examples/lock-app/qpg/zap/lock.zap b/examples/lock-app/qpg/zap/lock.zap index e66ddc5a32eac5..c60d090151a3b7 100644 --- a/examples/lock-app/qpg/zap/lock.zap +++ b/examples/lock-app/qpg/zap/lock.zap @@ -1715,6 +1715,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1936,7 +1952,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, 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 e5187ffa74eefb..fe849962ec5103 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 @@ -706,7 +706,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** Commands to trigger a Node to allow a new Administrator to commission it. */ @@ -1110,9 +1116,11 @@ endpoint 0 { callback attribute activeNetworkFaults; callback attribute testEventTriggersEnabled default = false; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster AdministratorCommissioning { diff --git a/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap b/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap index 3776092d0b62dd..d445d8a2694769 100644 --- a/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap +++ b/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap @@ -1442,6 +1442,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1615,7 +1631,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, 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 583331cd2a86ee..8b95001f4e391b 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 @@ -889,7 +889,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** Commands to trigger a Node to allow a new Administrator to commission it. */ @@ -1293,9 +1299,11 @@ endpoint 0 { callback attribute activeNetworkFaults; callback attribute testEventTriggersEnabled default = false; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster AdministratorCommissioning { diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap index e36f3b95848231..f2eae5d5381cfc 100644 --- a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap +++ b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap @@ -1491,6 +1491,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1664,7 +1680,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index 1040513cc7c557..8daed1603f891c 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -1683,7 +1683,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -6734,9 +6740,11 @@ endpoint 0 { callback attribute eventList; callback attribute attributeList; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster SoftwareDiagnostics { diff --git a/examples/placeholder/linux/apps/app1/config.zap b/examples/placeholder/linux/apps/app1/config.zap index c1166d993338fd..6bb34d3306eac0 100644 --- a/examples/placeholder/linux/apps/app1/config.zap +++ b/examples/placeholder/linux/apps/app1/config.zap @@ -2599,6 +2599,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -2836,7 +2852,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index a2662b804165b9..654c6f2fec41de 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -1642,7 +1642,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -6694,9 +6700,11 @@ endpoint 0 { callback attribute eventList; callback attribute attributeList; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster SoftwareDiagnostics { diff --git a/examples/placeholder/linux/apps/app2/config.zap b/examples/placeholder/linux/apps/app2/config.zap index 88191b28ef9110..3f19bedb04a28a 100644 --- a/examples/placeholder/linux/apps/app2/config.zap +++ b/examples/placeholder/linux/apps/app2/config.zap @@ -2615,6 +2615,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -2852,7 +2868,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter index 97ece6ceda452c..b95b685b2b753e 100644 --- a/examples/pump-app/pump-common/pump-app.matter +++ b/examples/pump-app/pump-common/pump-app.matter @@ -831,6 +831,7 @@ server cluster GeneralDiagnostics = 51 { readonly attribute NetworkInterface networkInterfaces[] = 0; readonly attribute int16u rebootCount = 1; + readonly attribute int64u upTime = 2; readonly attribute boolean testEventTriggersEnabled = 8; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -844,7 +845,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */ @@ -1535,14 +1542,17 @@ endpoint 0 { emits event BootReason; callback attribute networkInterfaces; callback attribute rebootCount default = 0x0000; + callback attribute upTime default = 0x0000000000000000; callback attribute testEventTriggersEnabled default = false; callback attribute generatedCommandList; callback attribute acceptedCommandList; callback attribute attributeList; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster ThreadNetworkDiagnostics { diff --git a/examples/pump-app/pump-common/pump-app.zap b/examples/pump-app/pump-common/pump-app.zap index 6e21cc9d3de2cf..73b79af6674e30 100644 --- a/examples/pump-app/pump-common/pump-app.zap +++ b/examples/pump-app/pump-common/pump-app.zap @@ -1575,6 +1575,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1610,6 +1626,22 @@ "maxInterval": 65344, "reportableChange": 0 }, + { + "name": "UpTime", + "code": 2, + "mfgCode": null, + "side": "server", + "type": "int64u", + "included": 1, + "storageOption": "External", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x0000000000000000", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "TestEventTriggersEnabled", "code": 8, @@ -1700,7 +1732,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/pump-app/silabs/data_model/pump-thread-app.matter b/examples/pump-app/silabs/data_model/pump-thread-app.matter index 8112f63eebb16f..0bdb0955fef1bb 100644 --- a/examples/pump-app/silabs/data_model/pump-thread-app.matter +++ b/examples/pump-app/silabs/data_model/pump-thread-app.matter @@ -831,6 +831,7 @@ server cluster GeneralDiagnostics = 51 { readonly attribute NetworkInterface networkInterfaces[] = 0; readonly attribute int16u rebootCount = 1; + readonly attribute int64u upTime = 2; readonly attribute boolean testEventTriggersEnabled = 8; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -844,7 +845,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */ @@ -1535,14 +1542,17 @@ endpoint 0 { emits event BootReason; callback attribute networkInterfaces; callback attribute rebootCount default = 0x0000; + callback attribute upTime default = 0x0000000000000000; callback attribute testEventTriggersEnabled default = false; callback attribute generatedCommandList; callback attribute acceptedCommandList; callback attribute attributeList; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster ThreadNetworkDiagnostics { diff --git a/examples/pump-app/silabs/data_model/pump-thread-app.zap b/examples/pump-app/silabs/data_model/pump-thread-app.zap index 30e326a3bf068c..bd3569bc9c42f9 100644 --- a/examples/pump-app/silabs/data_model/pump-thread-app.zap +++ b/examples/pump-app/silabs/data_model/pump-thread-app.zap @@ -1575,6 +1575,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1610,6 +1626,22 @@ "maxInterval": 65344, "reportableChange": 0 }, + { + "name": "UpTime", + "code": 2, + "mfgCode": null, + "side": "server", + "type": "int64u", + "included": 1, + "storageOption": "External", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x0000000000000000", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "TestEventTriggersEnabled", "code": 8, @@ -1700,7 +1732,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/pump-app/silabs/data_model/pump-wifi-app.matter b/examples/pump-app/silabs/data_model/pump-wifi-app.matter index 8112f63eebb16f..0bdb0955fef1bb 100644 --- a/examples/pump-app/silabs/data_model/pump-wifi-app.matter +++ b/examples/pump-app/silabs/data_model/pump-wifi-app.matter @@ -831,6 +831,7 @@ server cluster GeneralDiagnostics = 51 { readonly attribute NetworkInterface networkInterfaces[] = 0; readonly attribute int16u rebootCount = 1; + readonly attribute int64u upTime = 2; readonly attribute boolean testEventTriggersEnabled = 8; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -844,7 +845,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */ @@ -1535,14 +1542,17 @@ endpoint 0 { emits event BootReason; callback attribute networkInterfaces; callback attribute rebootCount default = 0x0000; + callback attribute upTime default = 0x0000000000000000; callback attribute testEventTriggersEnabled default = false; callback attribute generatedCommandList; callback attribute acceptedCommandList; callback attribute attributeList; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster ThreadNetworkDiagnostics { diff --git a/examples/pump-app/silabs/data_model/pump-wifi-app.zap b/examples/pump-app/silabs/data_model/pump-wifi-app.zap index 30e326a3bf068c..bd3569bc9c42f9 100644 --- a/examples/pump-app/silabs/data_model/pump-wifi-app.zap +++ b/examples/pump-app/silabs/data_model/pump-wifi-app.zap @@ -1575,6 +1575,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1610,6 +1626,22 @@ "maxInterval": 65344, "reportableChange": 0 }, + { + "name": "UpTime", + "code": 2, + "mfgCode": null, + "side": "server", + "type": "int64u", + "included": 1, + "storageOption": "External", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x0000000000000000", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "TestEventTriggersEnabled", "code": 8, @@ -1700,7 +1732,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, 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 fd542a29b72f78..a5a9759bf9ae54 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 @@ -756,6 +756,7 @@ server cluster GeneralDiagnostics = 51 { readonly attribute NetworkInterface networkInterfaces[] = 0; readonly attribute int16u rebootCount = 1; + readonly attribute int64u upTime = 2; readonly attribute boolean testEventTriggersEnabled = 8; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -769,7 +770,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */ @@ -1421,14 +1428,17 @@ endpoint 0 { emits event BootReason; callback attribute networkInterfaces; callback attribute rebootCount default = 0x0000; + callback attribute upTime default = 0x0000000000000000; callback attribute testEventTriggersEnabled default = false; callback attribute generatedCommandList; callback attribute acceptedCommandList; callback attribute attributeList; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster ThreadNetworkDiagnostics { diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap b/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap index cb7f4b298c5fbb..0d687d1f4d446c 100644 --- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap +++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap @@ -1575,6 +1575,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1610,6 +1626,22 @@ "maxInterval": 65344, "reportableChange": 0 }, + { + "name": "UpTime", + "code": 2, + "mfgCode": null, + "side": "server", + "type": "int64u", + "included": 1, + "storageOption": "External", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x0000000000000000", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "TestEventTriggersEnabled", "code": 8, @@ -1700,7 +1732,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/refrigerator-app/refrigerator-common/refrigerator-app.matter b/examples/refrigerator-app/refrigerator-common/refrigerator-app.matter index d9bc12cf315e95..dbbe4fc7142fdc 100644 --- a/examples/refrigerator-app/refrigerator-common/refrigerator-app.matter +++ b/examples/refrigerator-app/refrigerator-common/refrigerator-app.matter @@ -586,7 +586,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -1075,9 +1081,11 @@ endpoint 0 { callback attribute acceptedCommandList default = 0; callback attribute attributeList default = 0; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster WiFiNetworkDiagnostics { diff --git a/examples/refrigerator-app/refrigerator-common/refrigerator-app.zap b/examples/refrigerator-app/refrigerator-common/refrigerator-app.zap index b772acad198770..3d554d6d8ca5ad 100644 --- a/examples/refrigerator-app/refrigerator-common/refrigerator-app.zap +++ b/examples/refrigerator-app/refrigerator-common/refrigerator-app.zap @@ -1694,6 +1694,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1915,7 +1931,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter b/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter index e8ad6f4689e6d9..4bf471ffc11107 100644 --- a/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter +++ b/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter @@ -863,7 +863,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -1815,9 +1821,11 @@ endpoint 0 { callback attribute activeNetworkFaults; callback attribute testEventTriggersEnabled default = false; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster SoftwareDiagnostics { diff --git a/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.zap b/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.zap index f9ec6ae993d322..a55f8b6f4abe87 100644 --- a/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.zap +++ b/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.zap @@ -1683,6 +1683,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1856,7 +1872,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/rvc-app/rvc-common/rvc-app.matter b/examples/rvc-app/rvc-common/rvc-app.matter index 4822febc1d0239..9be857b09ec61b 100644 --- a/examples/rvc-app/rvc-common/rvc-app.matter +++ b/examples/rvc-app/rvc-common/rvc-app.matter @@ -590,7 +590,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** Commands to trigger a Node to allow a new Administrator to commission it. */ @@ -1100,9 +1106,11 @@ endpoint 0 { callback attribute activeNetworkFaults; callback attribute testEventTriggersEnabled default = false; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 0x0001; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster AdministratorCommissioning { diff --git a/examples/rvc-app/rvc-common/rvc-app.zap b/examples/rvc-app/rvc-common/rvc-app.zap index a9f67c56bd7bc8..e5f9e297ad0b19 100644 --- a/examples/rvc-app/rvc-common/rvc-app.zap +++ b/examples/rvc-app/rvc-common/rvc-app.zap @@ -1172,6 +1172,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1345,7 +1361,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x0001", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, 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 48642e7abbf947..b8fcae541ac10c 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 @@ -1095,7 +1095,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -1871,9 +1877,11 @@ endpoint 0 { callback attribute activeNetworkFaults; callback attribute testEventTriggersEnabled default = false; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster SoftwareDiagnostics { diff --git a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.zap b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.zap index b5fe6c12387788..2507ad7cba4c4b 100644 --- a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.zap +++ b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.zap @@ -1481,6 +1481,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1654,7 +1670,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, 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 187f8d14112801..2f492c5c2b031d 100644 --- a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter +++ b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter @@ -617,7 +617,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -1171,9 +1177,11 @@ endpoint 0 { callback attribute activeNetworkFaults; callback attribute testEventTriggersEnabled default = false; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster SoftwareDiagnostics { diff --git a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.zap b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.zap index 7845ed393315aa..1b4d5b5e83b16f 100644 --- a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.zap +++ b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.zap @@ -1386,6 +1386,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1559,7 +1575,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/thermostat/nxp/zap/thermostat_matter_thread.matter b/examples/thermostat/nxp/zap/thermostat_matter_thread.matter index a581f1f70d285d..6c00996c41eaca 100644 --- a/examples/thermostat/nxp/zap/thermostat_matter_thread.matter +++ b/examples/thermostat/nxp/zap/thermostat_matter_thread.matter @@ -1264,7 +1264,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */ @@ -1941,9 +1947,11 @@ endpoint 0 { callback attribute activeNetworkFaults; callback attribute testEventTriggersEnabled default = false; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster ThreadNetworkDiagnostics { diff --git a/examples/thermostat/nxp/zap/thermostat_matter_thread.zap b/examples/thermostat/nxp/zap/thermostat_matter_thread.zap index ec8baf4d992228..1db8b2b288b77f 100644 --- a/examples/thermostat/nxp/zap/thermostat_matter_thread.zap +++ b/examples/thermostat/nxp/zap/thermostat_matter_thread.zap @@ -1626,6 +1626,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1799,7 +1815,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter b/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter index ede88c2f5677f3..7123a0dadf1874 100644 --- a/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter +++ b/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter @@ -1264,7 +1264,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -1850,9 +1856,11 @@ endpoint 0 { callback attribute activeNetworkFaults; callback attribute testEventTriggersEnabled default = false; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster WiFiNetworkDiagnostics { diff --git a/examples/thermostat/nxp/zap/thermostat_matter_wifi.zap b/examples/thermostat/nxp/zap/thermostat_matter_wifi.zap index fcc14df85255d3..7a3e1ffbb356ba 100644 --- a/examples/thermostat/nxp/zap/thermostat_matter_wifi.zap +++ b/examples/thermostat/nxp/zap/thermostat_matter_wifi.zap @@ -1626,6 +1626,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1799,7 +1815,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter index be2a7be5dacc50..d5ed36f49349b8 100644 --- a/examples/thermostat/thermostat-common/thermostat.matter +++ b/examples/thermostat/thermostat-common/thermostat.matter @@ -954,7 +954,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -1799,9 +1805,11 @@ endpoint 0 { callback attribute activeNetworkFaults; callback attribute testEventTriggersEnabled default = false; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster SoftwareDiagnostics { diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap index 74262e2093f6b1..d22c446eb23fac 100644 --- a/examples/thermostat/thermostat-common/thermostat.zap +++ b/examples/thermostat/thermostat-common/thermostat.zap @@ -1727,6 +1727,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1900,7 +1916,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter index 5d7764d71f36c8..f33bd7a4b364a1 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -1109,7 +1109,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -2601,9 +2607,11 @@ endpoint 0 { callback attribute activeNetworkFaults; callback attribute testEventTriggersEnabled default = false; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster SoftwareDiagnostics { diff --git a/examples/tv-app/tv-common/tv-app.zap b/examples/tv-app/tv-common/tv-app.zap index 58a0b469101460..08def3fad76094 100644 --- a/examples/tv-app/tv-common/tv-app.zap +++ b/examples/tv-app/tv-common/tv-app.zap @@ -1754,6 +1754,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1927,7 +1943,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, 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 a98c4dbf1b207e..88b8b3574f7f48 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 @@ -950,7 +950,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -2129,9 +2135,11 @@ endpoint 0 { callback attribute activeNetworkFaults; callback attribute testEventTriggersEnabled default = false; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster SoftwareDiagnostics { diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap index b231ccb0ec904f..d55da66fab0eba 100644 --- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap +++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap @@ -1400,6 +1400,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1573,7 +1589,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter b/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter index 0c56f79c581271..41a46c5c47d3ac 100644 --- a/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter +++ b/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter @@ -1244,7 +1244,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -2660,9 +2666,11 @@ endpoint 0 { callback attribute activeNetworkFaults; callback attribute testEventTriggersEnabled default = false; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster SoftwareDiagnostics { diff --git a/examples/virtual-device-app/virtual-device-common/virtual-device-app.zap b/examples/virtual-device-app/virtual-device-common/virtual-device-app.zap index ea5776de0b3587..d60d0e3de7f852 100644 --- a/examples/virtual-device-app/virtual-device-common/virtual-device-app.zap +++ b/examples/virtual-device-app/virtual-device-common/virtual-device-app.zap @@ -1552,6 +1552,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -1725,7 +1741,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter index f997baf66cfc98..6b5f06125fcf6e 100644 --- a/examples/window-app/common/window-app.matter +++ b/examples/window-app/common/window-app.matter @@ -1084,7 +1084,13 @@ server cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ @@ -2000,9 +2006,11 @@ endpoint 0 { callback attribute eventList; callback attribute attributeList; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 0x0002; handle command TestEventTrigger; + handle command TimeSnapshot; + handle command TimeSnapshotResponse; } server cluster SoftwareDiagnostics { diff --git a/examples/window-app/common/window-app.zap b/examples/window-app/common/window-app.zap index a5dcb3b1a3bc2e..3ac0170b1683e6 100644 --- a/examples/window-app/common/window-app.zap +++ b/examples/window-app/common/window-app.zap @@ -2303,6 +2303,22 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "TimeSnapshot", + "code": 1, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "TimeSnapshotResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -2540,7 +2556,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "0x0002", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/src/app/clusters/general-diagnostics-server/general-diagnostics-server.cpp b/src/app/clusters/general-diagnostics-server/general-diagnostics-server.cpp index 994104abf22a75..0ea54f2e2c96b6 100644 --- a/src/app/clusters/general-diagnostics-server/general-diagnostics-server.cpp +++ b/src/app/clusters/general-diagnostics-server/general-diagnostics-server.cpp @@ -384,6 +384,15 @@ bool emberAfGeneralDiagnosticsClusterTestEventTriggerCallback(CommandHandler * c return true; } +bool emberAfGeneralDiagnosticsClusterTimeSnapshotCallback(CommandHandler * commandObj, ConcreteCommandPath const & commandPath, + Commands::TimeSnapshot::DecodableType const & commandData) +{ + // TODO(#30096): Command needs to be implemented. + ChipLogError(Zcl, "TimeSnapshot not yet supported!"); + commandObj->AddStatus(commandPath, Status::InvalidCommand); + return true; +} + void MatterGeneralDiagnosticsPluginServerInitCallback() { BootReasonEnum bootReason; diff --git a/src/app/tests/suites/certification/Test_TC_DGGEN_1_1.yaml b/src/app/tests/suites/certification/Test_TC_DGGEN_1_1.yaml index 1fdcfce09d47ee..147242c5db841e 100644 --- a/src/app/tests/suites/certification/Test_TC_DGGEN_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_DGGEN_1_1.yaml @@ -35,7 +35,7 @@ tests: command: "readAttribute" attribute: "ClusterRevision" response: - value: 1 + value: 2 constraints: type: int16u @@ -65,8 +65,9 @@ tests: type: list contains: [0, 1, 8, 65528, 65529, 65531, 65532, 65533] - - label: "Step 4b: Read optional attribute(UpTime) in AttributeList" - PICS: DGGEN.S.A0002 + - label: + "Step 4b: Validate presence of mandatory attribute(UpTime) in + AttributeList" command: "readAttribute" attribute: "AttributeList" response: @@ -168,12 +169,12 @@ tests: response: constraints: type: list - contains: [0] + contains: [0, 1] - label: "Step 7: TH reads GeneratedCommandList from DUT" command: "readAttribute" attribute: "GeneratedCommandList" response: - value: [] + value: [2] constraints: type: list diff --git a/src/app/tests/suites/certification/Test_TC_DGGEN_2_1.yaml b/src/app/tests/suites/certification/Test_TC_DGGEN_2_1.yaml index 22a222055e689f..5b4e7a489a613f 100644 --- a/src/app/tests/suites/certification/Test_TC_DGGEN_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_DGGEN_2_1.yaml @@ -183,7 +183,6 @@ tests: - label: "Step 4a: TH reads the Uptime attribute value of DUT. Store the value in uptime1" - PICS: DGGEN.S.A0002 command: "readAttribute" attribute: "UpTime" response: @@ -192,7 +191,6 @@ tests: type: int64u - label: "Wait 10 seconds" - PICS: DGGEN.S.A0002 cluster: "DelayCommands" command: "WaitForMs" arguments: @@ -203,7 +201,6 @@ tests: - label: "Step 4b: TH reads a Uptime attribute value of DUT. Store the value in uptime2. Verify that uptime2 is greater than uptime1." - PICS: DGGEN.S.A0002 command: "readAttribute" attribute: "UpTime" response: @@ -241,7 +238,6 @@ tests: - label: "Step 4c: TH reads a Uptime attribute value of DUT. Store the value in uptime3. Verify that uptime3 is lesser than uptime2." - PICS: DGGEN.S.A0003 command: "readAttribute" attribute: "UpTime" response: diff --git a/src/app/zap-templates/zcl/data-model/chip/general-diagnostics-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/general-diagnostics-cluster.xml index 4e0e9b5cafdfe2..0a3c0f12ffd783 100644 --- a/src/app/zap-templates/zcl/data-model/chip/general-diagnostics-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/general-diagnostics-cluster.xml @@ -38,7 +38,7 @@ limitations under the License. - + @@ -56,7 +56,7 @@ limitations under the License. - + @@ -67,15 +67,15 @@ limitations under the License. - - - - + + + + - - - - + + + + General @@ -83,8 +83,9 @@ limitations under the License. 0x0033 GENERAL_DIAGNOSTICS_CLUSTER The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. - NetworkInterfaces + NetworkInterfaces RebootCount + UpTime TotalOperationalHours BootReason @@ -92,6 +93,7 @@ limitations under the License. ActiveRadioFaults ActiveNetworkFaults TestEventTriggersEnabled + AverageWearCount @@ -101,6 +103,16 @@ limitations under the License. + + Take a snapshot of system time and epoch time. + + + + Response for the TimeSnapshot command. + + + + Indicate a change in the set of hardware faults currently detected by the Node. diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index d5b1691dc9eb9f..41a318647f425d 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -1795,8 +1795,15 @@ client cluster GeneralDiagnostics = 51 { int64u eventTrigger = 1; } + response struct TimeSnapshotResponse = 2 { + systime_us systemTimeUs = 0; + nullable epoch_us UTCTimeUs = 1; + } + /** Provide a means for certification tests to trigger some test-plan-specific events */ command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; + /** Take a snapshot of system time and epoch time. */ + command TimeSnapshot(): TimeSnapshotResponse = 1; } /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */ diff --git a/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java b/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java index 62c12f62001130..006c23aaf1d582 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java @@ -6062,8 +6062,23 @@ public void testEventTrigger(DefaultClusterCallback callback, byte[] enableKey, testEventTrigger(chipClusterPtr, callback, enableKey, eventTrigger, timedInvokeTimeoutMs); } + public void timeSnapshot(TimeSnapshotResponseCallback callback) { + timeSnapshot(chipClusterPtr, callback, null); + } + + public void timeSnapshot(TimeSnapshotResponseCallback callback, int timedInvokeTimeoutMs) { + timeSnapshot(chipClusterPtr, callback, timedInvokeTimeoutMs); + } + private native void testEventTrigger(long chipClusterPtr, DefaultClusterCallback callback, byte[] enableKey, Long eventTrigger, @Nullable Integer timedInvokeTimeoutMs); + private native void timeSnapshot(long chipClusterPtr, TimeSnapshotResponseCallback callback, @Nullable Integer timedInvokeTimeoutMs); + + public interface TimeSnapshotResponseCallback { + void onSuccess(Long systemTimeUs, @Nullable Long UTCTimeUs); + void onError(Exception error); + } + public interface NetworkInterfacesAttributeCallback { void onSuccess(List value); void onError(Exception ex); diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java index 413541bdf799b4..99fa62cef2d0c1 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java @@ -3800,7 +3800,8 @@ public static Event value(long id) throws NoSuchFieldError { } public enum Command { - TestEventTrigger(0L),; + TestEventTrigger(0L), + TimeSnapshot(1L),; private final long id; Command(long id) { this.id = id; diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java index a051e4d5b071b8..78cce7dc99f04d 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java @@ -3638,6 +3638,30 @@ public void onError(Exception ex) { } } + + public static class DelegatedGeneralDiagnosticsClusterTimeSnapshotResponseCallback implements ChipClusters.GeneralDiagnosticsCluster.TimeSnapshotResponseCallback, DelegatedClusterCallback { + private ClusterCommandCallback callback; + @Override + public void setCallbackDelegate(ClusterCommandCallback callback) { + this.callback = callback; + } + + @Override + public void onSuccess(Long systemTimeUs, @Nullable Long UTCTimeUs) { + Map responseValues = new LinkedHashMap<>(); + + CommandResponseInfo systemTimeUsResponseValue = new CommandResponseInfo("systemTimeUs", "Long"); + responseValues.put(systemTimeUsResponseValue, systemTimeUs); + CommandResponseInfo UTCTimeUsResponseValue = new CommandResponseInfo("UTCTimeUs", "Long"); + responseValues.put(UTCTimeUsResponseValue, UTCTimeUs); + callback.onSuccess(responseValues); + } + + @Override + public void onError(Exception error) { + callback.onFailure(error); + } + } public static class DelegatedGeneralDiagnosticsClusterNetworkInterfacesAttributeCallback implements ChipClusters.GeneralDiagnosticsCluster.NetworkInterfacesAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @Override @@ -18933,6 +18957,18 @@ public Map> getCommandMap() { ); generalDiagnosticsClusterInteractionInfoMap.put("testEventTrigger", generalDiagnosticstestEventTriggerInteractionInfo); + Map generalDiagnosticstimeSnapshotCommandParams = new LinkedHashMap(); + InteractionInfo generalDiagnosticstimeSnapshotInteractionInfo = new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.GeneralDiagnosticsCluster) cluster) + .timeSnapshot((ChipClusters.GeneralDiagnosticsCluster.TimeSnapshotResponseCallback) callback + ); + }, + () -> new DelegatedGeneralDiagnosticsClusterTimeSnapshotResponseCallback(), + generalDiagnosticstimeSnapshotCommandParams + ); + generalDiagnosticsClusterInteractionInfoMap.put("timeSnapshot", generalDiagnosticstimeSnapshotInteractionInfo); + commandMap.put("generalDiagnostics", generalDiagnosticsClusterInteractionInfoMap); Map softwareDiagnosticsClusterInteractionInfoMap = new LinkedHashMap<>(); diff --git a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp index f2a81f98fc819b..6c7d8b46e8a37d 100644 --- a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp +++ b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp @@ -2202,6 +2202,81 @@ void CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback::CallbackFn( env->CallVoidMethod(javaCallbackRef, javaMethod, Status, LogContent, UTCTimeStamp, TimeSinceBoot); } +CHIPGeneralDiagnosticsClusterTimeSnapshotResponseCallback::CHIPGeneralDiagnosticsClusterTimeSnapshotResponseCallback( + 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"); + } +} + +CHIPGeneralDiagnosticsClusterTimeSnapshotResponseCallback::~CHIPGeneralDiagnosticsClusterTimeSnapshotResponseCallback() +{ + JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); + if (env == nullptr) + { + ChipLogError(Zcl, "Could not delete global reference for Java callback"); + return; + } + env->DeleteGlobalRef(javaCallbackRef); +}; + +void CHIPGeneralDiagnosticsClusterTimeSnapshotResponseCallback::CallbackFn( + void * context, const chip::app::Clusters::GeneralDiagnostics::Commands::TimeSnapshotResponse::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/Long;Ljava/lang/Long;)V", + &javaMethod); + VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err))); + + jobject SystemTimeUs; + std::string SystemTimeUsClassName = "java/lang/Long"; + std::string SystemTimeUsCtorSignature = "(J)V"; + jlong jniSystemTimeUs = static_cast(dataResponse.systemTimeUs); + chip::JniReferences::GetInstance().CreateBoxedObject(SystemTimeUsClassName.c_str(), SystemTimeUsCtorSignature.c_str(), + jniSystemTimeUs, SystemTimeUs); + jobject UTCTimeUs; + if (dataResponse.UTCTimeUs.IsNull()) + { + UTCTimeUs = nullptr; + } + else + { + std::string UTCTimeUsClassName = "java/lang/Long"; + std::string UTCTimeUsCtorSignature = "(J)V"; + jlong jniUTCTimeUs = static_cast(dataResponse.UTCTimeUs.Value()); + chip::JniReferences::GetInstance().CreateBoxedObject(UTCTimeUsClassName.c_str(), UTCTimeUsCtorSignature.c_str(), + jniUTCTimeUs, UTCTimeUs); + } + + env->CallVoidMethod(javaCallbackRef, javaMethod, SystemTimeUs, UTCTimeUs); +} CHIPTimeSynchronizationClusterSetTimeZoneResponseCallback::CHIPTimeSynchronizationClusterSetTimeZoneResponseCallback( jobject javaCallback) : Callback::Callback(CallbackFn, this) { diff --git a/src/controller/java/zap-generated/CHIPInvokeCallbacks.h b/src/controller/java/zap-generated/CHIPInvokeCallbacks.h index 4bb4afe2fe72ba..c6afa9916c41fa 100644 --- a/src/controller/java/zap-generated/CHIPInvokeCallbacks.h +++ b/src/controller/java/zap-generated/CHIPInvokeCallbacks.h @@ -342,6 +342,21 @@ class CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback jobject javaCallbackRef; }; +class CHIPGeneralDiagnosticsClusterTimeSnapshotResponseCallback + : public Callback::Callback +{ +public: + CHIPGeneralDiagnosticsClusterTimeSnapshotResponseCallback(jobject javaCallback); + + ~CHIPGeneralDiagnosticsClusterTimeSnapshotResponseCallback(); + + static void CallbackFn(void * context, + const chip::app::Clusters::GeneralDiagnostics::Commands::TimeSnapshotResponse::DecodableType & data); + +private: + jobject javaCallbackRef; +}; + class CHIPTimeSynchronizationClusterSetTimeZoneResponseCallback : public Callback::Callback { diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py index efa9adc53cfdab..ea04b2c6cf583d 100644 --- a/src/controller/python/chip/clusters/CHIPClusters.py +++ b/src/controller/python/chip/clusters/CHIPClusters.py @@ -2397,6 +2397,12 @@ class ChipClusters: "eventTrigger": "int", }, }, + 0x00000001: { + "commandId": 0x00000001, + "commandName": "TimeSnapshot", + "args": { + }, + }, }, "attributes": { 0x00000000: { diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 38c92ee15ed234..cffb2a70cb56a6 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -8346,6 +8346,37 @@ def descriptor(cls) -> ClusterObjectDescriptor: enableKey: 'bytes' = b"" eventTrigger: 'uint' = 0 + @dataclass + class TimeSnapshot(ClusterCommand): + cluster_id: typing.ClassVar[int] = 0x00000033 + command_id: typing.ClassVar[int] = 0x00000001 + is_client: typing.ClassVar[bool] = True + response_type: typing.ClassVar[str] = 'TimeSnapshotResponse' + + @ChipUtility.classproperty + def descriptor(cls) -> ClusterObjectDescriptor: + return ClusterObjectDescriptor( + Fields=[ + ]) + + @dataclass + class TimeSnapshotResponse(ClusterCommand): + cluster_id: typing.ClassVar[int] = 0x00000033 + 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="systemTimeUs", Tag=0, Type=uint), + ClusterObjectFieldDescriptor(Label="UTCTimeUs", Tag=1, Type=typing.Union[Nullable, uint]), + ]) + + systemTimeUs: 'uint' = 0 + UTCTimeUs: 'typing.Union[Nullable, uint]' = NullValue + class Attributes: @dataclass class NetworkInterfaces(ClusterAttributeDescriptor): diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index 7a6c820b64fc67..9a05da483a248f 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -2619,6 +2619,14 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) * Provide a means for certification tests to trigger some test-plan-specific events */ - (void)testEventTriggerWithParams:(MTRGeneralDiagnosticsClusterTestEventTriggerParams *)params completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)); +/** + * Command TimeSnapshot + * + * Take a snapshot of system time and epoch time. + */ +- (void)timeSnapshotWithParams:(MTRGeneralDiagnosticsClusterTimeSnapshotParams * _Nullable)params completion:(void (^)(MTRGeneralDiagnosticsClusterTimeSnapshotResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; +- (void)timeSnapshotWithCompletion:(void (^)(MTRGeneralDiagnosticsClusterTimeSnapshotResponseParams * _Nullable data, NSError * _Nullable error))completion + MTR_PROVISIONALLY_AVAILABLE; - (void)readAttributeNetworkInterfacesWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)); - (void)subscribeAttributeNetworkInterfacesWithParams:(MTRSubscribeParams *)params diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm index ec55b1beca255a..4e04fc5f85c6f5 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm @@ -22057,6 +22057,34 @@ - (void)testEventTriggerWithParams:(MTRGeneralDiagnosticsClusterTestEventTrigger queue:self.callbackQueue completion:responseHandler]; } +- (void)timeSnapshotWithCompletion:(void (^)(MTRGeneralDiagnosticsClusterTimeSnapshotResponseParams * _Nullable data, NSError * _Nullable error))completion +{ + [self timeSnapshotWithParams:nil completion:completion]; +} +- (void)timeSnapshotWithParams:(MTRGeneralDiagnosticsClusterTimeSnapshotParams * _Nullable)params completion:(void (^)(MTRGeneralDiagnosticsClusterTimeSnapshotResponseParams * _Nullable data, NSError * _Nullable error))completion +{ + if (params == nil) { + params = [[MTRGeneralDiagnosticsClusterTimeSnapshotParams + alloc] init]; + } + + auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) { + completion(response, error); + }; + + auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; + + using RequestType = GeneralDiagnostics::Commands::TimeSnapshot::Type; + [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint) + clusterID:@(RequestType::GetClusterId()) + commandID:@(RequestType::GetCommandId()) + commandPayload:params + timedInvokeTimeout:timedInvokeTimeoutMs + serverSideProcessingTimeout:params.serverSideProcessingTimeout + responseClass:MTRGeneralDiagnosticsClusterTimeSnapshotResponseParams.class + queue:self.callbackQueue + completion:responseHandler]; +} - (void)readAttributeNetworkInterfacesWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion { diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h index c42739771e0925..a0320b33fd3b36 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h @@ -5792,6 +5792,8 @@ typedef NS_ENUM(uint32_t, MTRCommandIDType) { // Cluster GeneralDiagnostics commands MTRCommandIDTypeClusterGeneralDiagnosticsCommandTestEventTriggerID MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00000000, + MTRCommandIDTypeClusterGeneralDiagnosticsCommandTimeSnapshotID MTR_PROVISIONALLY_AVAILABLE = 0x00000001, + MTRCommandIDTypeClusterGeneralDiagnosticsCommandTimeSnapshotResponseID MTR_PROVISIONALLY_AVAILABLE = 0x00000002, // Cluster SoftwareDiagnostics deprecated command id names MTRClusterSoftwareDiagnosticsCommandResetWatermarksID diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h index bbc0a86180ec83..c3c7c512f33813 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h @@ -1323,6 +1323,9 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE; - (void)testEventTriggerWithParams:(MTRGeneralDiagnosticsClusterTestEventTriggerParams *)params expectedValues:(NSArray *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)); +- (void)timeSnapshotWithParams:(MTRGeneralDiagnosticsClusterTimeSnapshotParams * _Nullable)params expectedValues:(NSArray *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRGeneralDiagnosticsClusterTimeSnapshotResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; +- (void)timeSnapshotWithExpectedValues:(NSArray *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRGeneralDiagnosticsClusterTimeSnapshotResponseParams * _Nullable data, NSError * _Nullable error))completion + MTR_PROVISIONALLY_AVAILABLE; - (NSDictionary * _Nullable)readAttributeNetworkInterfacesWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm index 9650aaf7d0e7a6..ae12459f547741 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm @@ -4440,6 +4440,37 @@ - (void)testEventTriggerWithParams:(MTRGeneralDiagnosticsClusterTestEventTrigger completion:responseHandler]; } +- (void)timeSnapshotWithExpectedValues:(NSArray *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(void (^)(MTRGeneralDiagnosticsClusterTimeSnapshotResponseParams * _Nullable data, NSError * _Nullable error))completion +{ + [self timeSnapshotWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion]; +} +- (void)timeSnapshotWithParams:(MTRGeneralDiagnosticsClusterTimeSnapshotParams * _Nullable)params expectedValues:(NSArray *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRGeneralDiagnosticsClusterTimeSnapshotResponseParams * _Nullable data, NSError * _Nullable error))completion +{ + if (params == nil) { + params = [[MTRGeneralDiagnosticsClusterTimeSnapshotParams + alloc] init]; + } + + auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) { + completion(response, error); + }; + + auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; + + using RequestType = GeneralDiagnostics::Commands::TimeSnapshot::Type; + [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint) + clusterID:@(RequestType::GetClusterId()) + commandID:@(RequestType::GetCommandId()) + commandPayload:params + expectedValues:expectedValues + expectedValueInterval:expectedValueIntervalMs + timedInvokeTimeout:timedInvokeTimeoutMs + serverSideProcessingTimeout:params.serverSideProcessingTimeout + responseClass:MTRGeneralDiagnosticsClusterTimeSnapshotResponseParams.class + queue:self.callbackQueue + completion:responseHandler]; +} + - (NSDictionary * _Nullable)readAttributeNetworkInterfacesWithParams:(MTRReadParams * _Nullable)params { return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeGeneralDiagnosticsID) attributeID:@(MTRAttributeIDTypeClusterGeneralDiagnosticsAttributeNetworkInterfacesID) params:params]; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h index 3f1e00bc19794b..6a2bb522b42aad 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h @@ -3250,6 +3250,55 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout; @end +MTR_PROVISIONALLY_AVAILABLE +@interface MTRGeneralDiagnosticsClusterTimeSnapshotParams : NSObject +/** + * Controls whether the command is a timed command (using Timed Invoke). + * + * If nil (the default value), a regular invoke is done for commands that do + * not require a timed invoke and a timed invoke with some default timed request + * timeout is done for commands that require a timed invoke. + * + * If not nil, a timed invoke is done, with the provided value used as the timed + * request timeout. The value should be chosen small enough to provide the + * desired security properties but large enough that it will allow a round-trip + * from the sever to the client (for the status response and actual invoke + * request) within the timeout window. + * + */ +@property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; + +/** + * Controls how much time, in seconds, we will allow for the server to process the command. + * + * The command will then time out if that much time, plus an allowance for retransmits due to network failures, passes. + * + * If nil, the framework will try to select an appropriate timeout value itself. + */ +@property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout; +@end + +MTR_PROVISIONALLY_AVAILABLE +@interface MTRGeneralDiagnosticsClusterTimeSnapshotResponseParams : NSObject + +@property (nonatomic, copy) NSNumber * _Nonnull systemTimeUs MTR_PROVISIONALLY_AVAILABLE; + +@property (nonatomic, copy) NSNumber * _Nullable utcTimeUs MTR_PROVISIONALLY_AVAILABLE; + +/** + * Initialize an MTRGeneralDiagnosticsClusterTimeSnapshotResponseParams with a response-value dictionary + * of the sort that MTRDeviceResponseHandler would receive. + * + * Will return nil and hand out an error if the response-value dictionary is not + * a command data response or is not the right command response. + * + * Will return nil and hand out an error if the data response does not match the known + * schema for this command. + */ +- (nullable instancetype)initWithResponseValue:(NSDictionary *)responseValue + error:(NSError * __autoreleasing *)error MTR_PROVISIONALLY_AVAILABLE; +@end + MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @interface MTRSoftwareDiagnosticsClusterResetWatermarksParams : NSObject /** diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm index 6ffbc9daaa07ae..386d6e02f5799d 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm @@ -8529,6 +8529,168 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader } @end +@implementation MTRGeneralDiagnosticsClusterTimeSnapshotParams +- (instancetype)init +{ + if (self = [super init]) { + _timedInvokeTimeoutMs = nil; + _serverSideProcessingTimeout = nil; + } + return self; +} + +- (id)copyWithZone:(NSZone * _Nullable)zone; +{ + auto other = [[MTRGeneralDiagnosticsClusterTimeSnapshotParams alloc] init]; + + other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs; + other.serverSideProcessingTimeout = self.serverSideProcessingTimeout; + + return other; +} + +- (NSString *)description +{ + NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])]; + return descriptionString; +} + +@end + +@implementation MTRGeneralDiagnosticsClusterTimeSnapshotParams (InternalMethods) + +- (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader +{ + chip::app::Clusters::GeneralDiagnostics::Commands::TimeSnapshot::Type encodableStruct; + ListFreer listFreer; + + auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0); + if (buffer.IsNull()) { + return CHIP_ERROR_NO_MEMORY; + } + + chip::System::PacketBufferTLVWriter writer; + // Commands never need chained buffers, since they cannot be chunked. + writer.Init(std::move(buffer), /* useChainedBuffers = */ false); + + ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::AnonymousTag(), encodableStruct)); + + ReturnErrorOnFailure(writer.Finalize(&buffer)); + + reader.Init(std::move(buffer)); + return reader.Next(chip::TLV::kTLVType_Structure, chip::TLV::AnonymousTag()); +} + +- (NSDictionary * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error +{ + chip::System::PacketBufferTLVReader reader; + CHIP_ERROR err = [self _encodeToTLVReader:reader]; + if (err != CHIP_NO_ERROR) { + if (error) { + *error = [MTRError errorForCHIPErrorCode:err]; + } + return nil; + } + + auto decodedObj = MTRDecodeDataValueDictionaryFromCHIPTLV(&reader); + if (decodedObj == nil) { + if (error) { + *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE]; + } + } + return decodedObj; +} +@end + +@implementation MTRGeneralDiagnosticsClusterTimeSnapshotResponseParams +- (instancetype)init +{ + if (self = [super init]) { + + _systemTimeUs = @(0); + + _utcTimeUs = nil; + } + return self; +} + +- (id)copyWithZone:(NSZone * _Nullable)zone; +{ + auto other = [[MTRGeneralDiagnosticsClusterTimeSnapshotResponseParams alloc] init]; + + other.systemTimeUs = self.systemTimeUs; + other.utcTimeUs = self.utcTimeUs; + + return other; +} + +- (NSString *)description +{ + NSString * descriptionString = [NSString stringWithFormat:@"<%@: systemTimeUs:%@; utcTimeUs:%@; >", NSStringFromClass([self class]), _systemTimeUs, _utcTimeUs]; + return descriptionString; +} + +- (nullable instancetype)initWithResponseValue:(NSDictionary *)responseValue + error:(NSError * __autoreleasing *)error +{ + if (!(self = [super init])) { + return nil; + } + + using DecodableType = chip::app::Clusters::GeneralDiagnostics::Commands::TimeSnapshotResponse::DecodableType; + chip::System::PacketBufferHandle buffer = [MTRBaseDevice _responseDataForCommand:responseValue + clusterID:DecodableType::GetClusterId() + commandID:DecodableType::GetCommandId() + error:error]; + if (buffer.IsNull()) { + return nil; + } + + chip::TLV::TLVReader reader; + reader.Init(buffer->Start(), buffer->DataLength()); + + CHIP_ERROR err = reader.Next(chip::TLV::AnonymousTag()); + if (err == CHIP_NO_ERROR) { + DecodableType decodedStruct; + err = chip::app::DataModel::Decode(reader, decodedStruct); + if (err == CHIP_NO_ERROR) { + err = [self _setFieldsFromDecodableStruct:decodedStruct]; + if (err == CHIP_NO_ERROR) { + return self; + } + } + } + + NSString * errorStr = [NSString stringWithFormat:@"Command payload decoding failed: %s", err.AsString()]; + MTR_LOG_ERROR("%s", errorStr.UTF8String); + if (error != nil) { + NSDictionary * userInfo = @{ NSLocalizedFailureReasonErrorKey : NSLocalizedString(errorStr, nil) }; + *error = [NSError errorWithDomain:MTRErrorDomain code:MTRErrorCodeSchemaMismatch userInfo:userInfo]; + } + return nil; +} + +@end + +@implementation MTRGeneralDiagnosticsClusterTimeSnapshotResponseParams (InternalMethods) + +- (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::GeneralDiagnostics::Commands::TimeSnapshotResponse::DecodableType &)decodableStruct +{ + { + self.systemTimeUs = [NSNumber numberWithUnsignedLongLong:decodableStruct.systemTimeUs]; + } + { + if (decodableStruct.UTCTimeUs.IsNull()) { + self.utcTimeUs = nil; + } else { + self.utcTimeUs = [NSNumber numberWithUnsignedLongLong:decodableStruct.UTCTimeUs.Value()]; + } + } + return CHIP_NO_ERROR; +} + +@end + @implementation MTRSoftwareDiagnosticsClusterResetWatermarksParams - (instancetype)init { diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloads_Internal.h b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloads_Internal.h index c00abea960dec0..cc23f560d8fee7 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloads_Internal.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloads_Internal.h @@ -514,6 +514,18 @@ NS_ASSUME_NONNULL_BEGIN @end +@interface MTRGeneralDiagnosticsClusterTimeSnapshotParams (InternalMethods) + +- (NSDictionary * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error; + +@end + +@interface MTRGeneralDiagnosticsClusterTimeSnapshotResponseParams (InternalMethods) + +- (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::GeneralDiagnostics::Commands::TimeSnapshotResponse::DecodableType &)decodableStruct; + +@end + @interface MTRSoftwareDiagnosticsClusterResetWatermarksParams (InternalMethods) - (NSDictionary * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error; diff --git a/zzz_generated/app-common/app-common/zap-generated/callback.h b/zzz_generated/app-common/app-common/zap-generated/callback.h index 9b692fb362815b..e684a60678084e 100644 --- a/zzz_generated/app-common/app-common/zap-generated/callback.h +++ b/zzz_generated/app-common/app-common/zap-generated/callback.h @@ -8659,6 +8659,12 @@ bool emberAfDiagnosticLogsClusterRetrieveLogsRequestCallback( bool emberAfGeneralDiagnosticsClusterTestEventTriggerCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, const chip::app::Clusters::GeneralDiagnostics::Commands::TestEventTrigger::DecodableType & commandData); +/** + * @brief General Diagnostics Cluster TimeSnapshot Command callback (from client) + */ +bool emberAfGeneralDiagnosticsClusterTimeSnapshotCallback( + chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, + const chip::app::Clusters::GeneralDiagnostics::Commands::TimeSnapshot::DecodableType & commandData); /** * @brief Software Diagnostics Cluster ResetWatermarks Command callback (from client) */ diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp index 139fc46ed756bf..c094c10b39790b 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 @@ -6457,6 +6457,65 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } } } // namespace TestEventTrigger. +namespace TimeSnapshot { +CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const +{ + DataModel::WrappedStructEncoder encoder{ aWriter, aTag }; + return encoder.Finalize(); +} + +CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) +{ + detail::StructDecodeIterator __iterator(reader); + while (true) + { + auto __element = __iterator.Next(); + if (std::holds_alternative(__element)) + { + return std::get(__element); + } + } +} +} // namespace TimeSnapshot. +namespace TimeSnapshotResponse { +CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const +{ + DataModel::WrappedStructEncoder encoder{ aWriter, aTag }; + encoder.Encode(to_underlying(Fields::kSystemTimeUs), systemTimeUs); + encoder.Encode(to_underlying(Fields::kUTCTimeUs), UTCTimeUs); + return encoder.Finalize(); +} + +CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) +{ + detail::StructDecodeIterator __iterator(reader); + while (true) + { + auto __element = __iterator.Next(); + if (std::holds_alternative(__element)) + { + return std::get(__element); + } + + CHIP_ERROR err = CHIP_NO_ERROR; + const uint8_t __context_tag = std::get(__element); + + if (__context_tag == to_underlying(Fields::kSystemTimeUs)) + { + err = DataModel::Decode(reader, systemTimeUs); + } + else if (__context_tag == to_underlying(Fields::kUTCTimeUs)) + { + err = DataModel::Decode(reader, UTCTimeUs); + } + else + { + } + + ReturnErrorOnFailure(err); + } +} +} // namespace TimeSnapshotResponse. } // namespace Commands namespace Attributes { 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 ca8a7867870c28..ae63fcf4a89d02 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 @@ -8176,6 +8176,16 @@ struct Type; struct DecodableType; } // namespace TestEventTrigger +namespace TimeSnapshot { +struct Type; +struct DecodableType; +} // namespace TimeSnapshot + +namespace TimeSnapshotResponse { +struct Type; +struct DecodableType; +} // namespace TimeSnapshotResponse + } // namespace Commands namespace Commands { @@ -8214,6 +8224,69 @@ struct DecodableType CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace TestEventTrigger +namespace TimeSnapshot { +enum class Fields : uint8_t +{ +}; + +struct Type +{ +public: + // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand + static constexpr CommandId GetCommandId() { return Commands::TimeSnapshot::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; } + + CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const; + + using ResponseType = Clusters::GeneralDiagnostics::Commands::TimeSnapshotResponse::DecodableType; + + static constexpr bool MustUseTimedInvoke() { return false; } +}; + +struct DecodableType +{ +public: + static constexpr CommandId GetCommandId() { return Commands::TimeSnapshot::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; } + + CHIP_ERROR Decode(TLV::TLVReader & reader); +}; +}; // namespace TimeSnapshot +namespace TimeSnapshotResponse { +enum class Fields : uint8_t +{ + kSystemTimeUs = 0, + kUTCTimeUs = 1, +}; + +struct Type +{ +public: + // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand + static constexpr CommandId GetCommandId() { return Commands::TimeSnapshotResponse::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; } + + uint64_t systemTimeUs = static_cast(0); + DataModel::Nullable UTCTimeUs; + + CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const; + + using ResponseType = DataModel::NullObjectType; + + static constexpr bool MustUseTimedInvoke() { return false; } +}; + +struct DecodableType +{ +public: + static constexpr CommandId GetCommandId() { return Commands::TimeSnapshotResponse::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; } + + uint64_t systemTimeUs = static_cast(0); + DataModel::Nullable UTCTimeUs; + CHIP_ERROR Decode(TLV::TLVReader & reader); +}; +}; // namespace TimeSnapshotResponse } // namespace Commands namespace Attributes { 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 2b957cf72375ed..299da9e744f32c 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 @@ -434,6 +434,14 @@ namespace TestEventTrigger { static constexpr CommandId Id = 0x00000000; } // namespace TestEventTrigger +namespace TimeSnapshot { +static constexpr CommandId Id = 0x00000001; +} // namespace TimeSnapshot + +namespace TimeSnapshotResponse { +static constexpr CommandId Id = 0x00000002; +} // namespace TimeSnapshotResponse + } // namespace Commands } // namespace GeneralDiagnostics diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index f65b3063fba7bd..ad1bbc556ee196 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -3053,6 +3053,7 @@ class DiagnosticLogsRetrieveLogsRequest : public ClusterCommand |------------------------------------------------------------------------------| | Commands: | | | * TestEventTrigger | 0x00 | +| * TimeSnapshot | 0x01 | |------------------------------------------------------------------------------| | Attributes: | | | * NetworkInterfaces | 0x0000 | @@ -3118,6 +3119,43 @@ class GeneralDiagnosticsTestEventTrigger : public ClusterCommand chip::app::Clusters::GeneralDiagnostics::Commands::TestEventTrigger::Type mRequest; }; +/* + * Command TimeSnapshot + */ +class GeneralDiagnosticsTimeSnapshot : public ClusterCommand +{ +public: + GeneralDiagnosticsTimeSnapshot(CredentialIssuerCommands * credsIssuerConfig) : + ClusterCommand("time-snapshot", credsIssuerConfig) + { + ClusterCommand::AddArguments(); + } + + CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector endpointIds) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::GeneralDiagnostics::Id; + constexpr chip::CommandId commandId = chip::app::Clusters::GeneralDiagnostics::Commands::TimeSnapshot::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, + commandId, endpointIds.at(0)); + return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest); + } + + CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::GeneralDiagnostics::Id; + constexpr chip::CommandId commandId = chip::app::Clusters::GeneralDiagnostics::Commands::TimeSnapshot::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId, + groupId); + + return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest); + } + +private: + chip::app::Clusters::GeneralDiagnostics::Commands::TimeSnapshot::Type mRequest; +}; + /*----------------------------------------------------------------------------*\ | Cluster SoftwareDiagnostics | 0x0034 | |------------------------------------------------------------------------------| @@ -13365,6 +13403,7 @@ void registerClusterGeneralDiagnostics(Commands & commands, CredentialIssuerComm // make_unique(Id, credsIssuerConfig), // make_unique(credsIssuerConfig), // + make_unique(credsIssuerConfig), // // // Attributes // diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp index f26ae6d1c32025..a97925574bf5ac 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -4625,6 +4625,15 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, DataModelLogger::LogString(indent, "}"); return CHIP_NO_ERROR; } +CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, + const GeneralDiagnostics::Commands::TimeSnapshotResponse::DecodableType & value) +{ + DataModelLogger::LogString(label, indent, "{"); + ReturnErrorOnFailure(DataModelLogger::LogValue("systemTimeUs", indent + 1, value.systemTimeUs)); + ReturnErrorOnFailure(DataModelLogger::LogValue("UTCTimeUs", indent + 1, value.UTCTimeUs)); + DataModelLogger::LogString(indent, "}"); + return CHIP_NO_ERROR; +} CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const TimeSynchronization::Commands::SetTimeZoneResponse::DecodableType & value) { @@ -13711,6 +13720,17 @@ CHIP_ERROR DataModelLogger::LogCommand(const chip::app::ConcreteCommandPath & pa } break; } + case GeneralDiagnostics::Id: { + switch (path.mCommandId) + { + case GeneralDiagnostics::Commands::TimeSnapshotResponse::Id: { + GeneralDiagnostics::Commands::TimeSnapshotResponse::DecodableType value; + ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); + return DataModelLogger::LogValue("TimeSnapshotResponse", 1, value); + } + } + break; + } case TimeSynchronization::Id: { switch (path.mCommandId) { diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h index 96f8b52b007164..6d2ccf1c0fbc68 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h @@ -460,6 +460,8 @@ LogValue(const char * label, size_t indent, const chip::app::Clusters::NetworkCommissioning::Commands::ConnectNetworkResponse::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::DiagnosticLogs::Commands::RetrieveLogsResponse::DecodableType & value); +static CHIP_ERROR LogValue(const char * label, size_t indent, + const chip::app::Clusters::GeneralDiagnostics::Commands::TimeSnapshotResponse::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::TimeSynchronization::Commands::SetTimeZoneResponse::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, diff --git a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h index 519a27da8c68ba..07f482a5ab89b7 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h @@ -27930,6 +27930,7 @@ class SubscribeAttributeDiagnosticLogsClusterRevision : public SubscribeAttribut |------------------------------------------------------------------------------| | Commands: | | | * TestEventTrigger | 0x00 | +| * TimeSnapshot | 0x01 | |------------------------------------------------------------------------------| | Attributes: | | | * NetworkInterfaces | 0x0000 | @@ -28005,6 +28006,56 @@ class GeneralDiagnosticsTestEventTrigger : public ClusterCommand { chip::app::Clusters::GeneralDiagnostics::Commands::TestEventTrigger::Type mRequest; }; +/* + * Command TimeSnapshot + */ +class GeneralDiagnosticsTimeSnapshot : public ClusterCommand { +public: + GeneralDiagnosticsTimeSnapshot() + : ClusterCommand("time-snapshot") + { + ClusterCommand::AddArguments(); + } + + CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::GeneralDiagnostics::Id; + constexpr chip::CommandId commandId = chip::app::Clusters::GeneralDiagnostics::Commands::TimeSnapshot::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId); + + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); + __auto_type * cluster = [[MTRBaseClusterGeneralDiagnostics alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * params = [[MTRGeneralDiagnosticsClusterTimeSnapshotParams alloc] init]; + params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; + uint16_t repeatCount = mRepeatCount.ValueOr(1); + uint16_t __block responsesNeeded = repeatCount; + while (repeatCount--) { + [cluster timeSnapshotWithParams:params completion: + ^(MTRGeneralDiagnosticsClusterTimeSnapshotResponseParams * _Nullable values, NSError * _Nullable error) { + NSLog(@"Values: %@", values); + if (error == nil) { + constexpr chip::CommandId responseId = chip::app::Clusters::GeneralDiagnostics::Commands::TimeSnapshotResponse::Id; + RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values); + } + responsesNeeded--; + if (error != nil) { + mError = error; + LogNSError("Error", error); + constexpr chip::CommandId responseId = chip::app::Clusters::GeneralDiagnostics::Commands::TimeSnapshotResponse::Id; + RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error); + } + if (responsesNeeded == 0) { + SetCommandExitStatus(mError); + } + }]; + } + return CHIP_NO_ERROR; + } + +private: +}; + /* * Attribute NetworkInterfaces */ @@ -154577,6 +154628,7 @@ void registerClusterGeneralDiagnostics(Commands & commands) commands_list clusterCommands = { make_unique(Id), // make_unique(), // + make_unique(), // make_unique(Id), // make_unique(Id), // make_unique(Id), // 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 fe9d1ee034da7c..3c845e5215856e 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h @@ -49324,12 +49324,8 @@ class Test_TC_DGGEN_1_1 : public TestCommandBridge { err = TestStep4aReadTheGlobalAttributeAttributeList_4(); break; case 5: - ChipLogProgress(chipTool, " ***** Test Step 5 : Step 4b: Read optional attribute(UpTime) in AttributeList\n"); - if (ShouldSkip("DGGEN.S.A0002")) { - NextTest(); - return; - } - err = TestStep4bReadOptionalAttributeUpTimeInAttributeList_5(); + ChipLogProgress(chipTool, " ***** Test Step 5 : Step 4b: Validate presence of mandatory attribute(UpTime) in AttributeList\n"); + err = TestStep4bValidatePresenceOfMandatoryAttributeUpTimeInAttributeList_5(); break; case 6: ChipLogProgress(chipTool, " ***** Test Step 6 : Step 4c: Read optional attribute(TotalOperationalHours) in AttributeList\n"); @@ -49512,7 +49508,7 @@ class Test_TC_DGGEN_1_1 : public TestCommandBridge { { id actualValue = value; - VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 1U)); + VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 2U)); } VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u")); @@ -49603,7 +49599,7 @@ class Test_TC_DGGEN_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestStep4bReadOptionalAttributeUpTimeInAttributeList_5() + CHIP_ERROR TestStep4bValidatePresenceOfMandatoryAttributeUpTimeInAttributeList_5() { MTRBaseDevice * device = GetDevice("alpha"); @@ -49611,7 +49607,7 @@ class Test_TC_DGGEN_1_1 : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) { - NSLog(@"Step 4b: Read optional attribute(UpTime) in AttributeList Error: %@", err); + NSLog(@"Step 4b: Validate presence of mandatory attribute(UpTime) in AttributeList Error: %@", err); VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); @@ -49743,6 +49739,7 @@ class Test_TC_DGGEN_1_1 : public TestCommandBridge { VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 0UL)); + VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 1UL)); NextTest(); }]; @@ -49764,7 +49761,8 @@ class Test_TC_DGGEN_1_1 : public TestCommandBridge { { id actualValue = value; - VerifyOrReturn(CheckValue("GeneratedCommandList", [actualValue count], static_cast(0))); + VerifyOrReturn(CheckValue("GeneratedCommandList", [actualValue count], static_cast(1))); + VerifyOrReturn(CheckValue("", actualValue[0], 2UL)); } VerifyOrReturn(CheckConstraintType("generatedCommandList", "list", "list")); From fe513bbf0d3624be3f7c1f86bee55210e5418196 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Tue, 31 Oct 2023 11:12:35 -0400 Subject: [PATCH 40/41] Update ZAP to fix handling of Darwin provisional availability. (#30101) * Update ZAP to fix handling of Darwin provisional availability. The template change is fixing a place where we checked for "provisional" even for things that are not supported at all, and they started coming back as "provisional" now. MIN_ZAP_VERSION is being set to the date the commit was merged (which is what we are getting in the reported ZAP version), not to the tag date, which is later. * Auto-update .zap files. * Regenerate generated code. --- .../air-purifier-common/air-purifier-app.zap | 11 +++++------ .../air-quality-sensor-app.zap | 9 ++++----- .../all-clusters-common/all-clusters-app.zap | 11 +++++------ .../all-clusters-minimal-app.zap | 9 ++++----- examples/bridge-app/bridge-common/bridge-app.zap | 9 ++++----- .../noip_rootnode_dimmablelight_bCwGYSDpoe.zap | 3 +-- ...nsor_humiditysensor_thermostat_56de3d5f45.zap | 9 ++++----- .../rootnode_airqualitysensor_e63187f6c9.zap | 11 +++++------ .../rootnode_basicvideoplayer_0ff86e943b.zap | 3 +-- ...rootnode_colortemperaturelight_hbUnzYVeyn.zap | 3 +-- .../rootnode_contactsensor_lFAGG1bfRO.zap | 3 +-- .../rootnode_dimmablelight_bCwGYSDpoe.zap | 3 +-- .../devices/rootnode_dishwasher_cc105034fe.zap | 3 +-- .../devices/rootnode_doorlock_aNKYAreMXE.zap | 3 +-- .../rootnode_extendedcolorlight_8lcaaYJVAa.zap | 3 +-- .../chef/devices/rootnode_fan_7N2TobIlOX.zap | 3 +-- .../devices/rootnode_flowsensor_1zVxHedlaV.zap | 3 +-- .../rootnode_genericswitch_9866e35d0b.zap | 3 +-- .../rootnode_heatingcoolingunit_ncdGai1E5a.zap | 3 +-- .../rootnode_humiditysensor_Xyj4gda6Hb.zap | 3 +-- .../rootnode_laundrywasher_fb10d238c8.zap | 3 +-- .../devices/rootnode_lightsensor_lZQycTFcJK.zap | 3 +-- .../rootnode_occupancysensor_iHyVgifZuo.zap | 3 +-- .../devices/rootnode_onofflight_bbs1b7IaOV.zap | 3 +-- .../devices/rootnode_onofflight_samplemei.zap | 3 +-- .../rootnode_onofflightswitch_FsPlMr090Q.zap | 3 +-- .../rootnode_onoffpluginunit_Wtf8ss5EBY.zap | 3 +-- .../rootnode_pressuresensor_s0qC9wLH4k.zap | 3 +-- .../chef/devices/rootnode_pump_5f904818cc.zap | 9 ++++----- .../chef/devices/rootnode_pump_a811bb33a0.zap | 3 +-- ...t_temperaturecontrolledcabinet_ffdb696680.zap | 3 +-- .../rootnode_roboticvacuumcleaner_1807ff0c49.zap | 3 +-- .../rootnode_roomairconditioner_9cf3607804.zap | 3 +-- .../devices/rootnode_smokecoalarm_686fe0dcb8.zap | 3 +-- .../chef/devices/rootnode_speaker_RpzeXdimqA.zap | 3 +-- .../rootnode_temperaturesensor_Qy1zkNW7c3.zap | 9 ++++----- .../devices/rootnode_thermostat_bm3fb8dhYi.zap | 3 +-- .../rootnode_windowcovering_RLCxaGi9Yx.zap | 3 +-- examples/chef/devices/template.zap | 3 +-- .../contact-sensor-common/contact-sensor-app.zap | 3 +-- .../templates/commands.zapt | 2 +- .../dishwasher-common/dishwasher-app.zap | 3 +-- .../light-switch-common/light-switch-app.zap | 3 +-- .../data_model/lighting-app-ethernet.zap | 3 +-- .../data_model/lighting-app-thread.zap | 3 +-- .../bouffalolab/data_model/lighting-app-wifi.zap | 3 +-- .../lighting-common/lighting-app.zap | 3 +-- .../lighting-app/nxp/zap/lighting-on-off.zap | 3 +-- examples/lighting-app/qpg/zap/light.zap | 3 +-- .../silabs/data_model/lighting-thread-app.zap | 3 +-- .../silabs/data_model/lighting-wifi-app.zap | 3 +-- examples/lock-app/lock-common/lock-app.zap | 3 +-- examples/lock-app/nxp/zap/lock-app.zap | 3 +-- examples/lock-app/qpg/zap/lock.zap | 3 +-- .../log-source-common/log-source-app.zap | 3 +-- .../ota-provider-common/ota-provider-app.zap | 3 +-- .../ota-requestor-common/ota-requestor-app.zap | 3 +-- examples/placeholder/linux/apps/app1/config.zap | 11 +++++------ examples/placeholder/linux/apps/app2/config.zap | 11 +++++------ examples/pump-app/pump-common/pump-app.zap | 11 +++++------ .../silabs/data_model/pump-thread-app.zap | 11 +++++------ .../pump-app/silabs/data_model/pump-wifi-app.zap | 11 +++++------ .../pump-controller-app.zap | 3 +-- .../refrigerator-common/refrigerator-app.zap | 3 +-- .../resource-monitoring-app.zap | 3 +-- examples/rvc-app/rvc-common/rvc-app.zap | 3 +-- .../smoke-co-alarm-common/smoke-co-alarm-app.zap | 3 +-- .../temperature-measurement.zap | 9 ++++----- .../nxp/zap/thermostat_matter_thread.zap | 3 +-- .../nxp/zap/thermostat_matter_wifi.zap | 3 +-- .../thermostat/thermostat-common/thermostat.zap | 3 +-- examples/tv-app/tv-common/tv-app.zap | 3 +-- .../tv-casting-common/tv-casting-app.zap | 3 +-- .../virtual-device-common/virtual-device-app.zap | 3 +-- examples/window-app/common/window-app.zap | 3 +-- scripts/setup/zap.json | 4 ++-- scripts/setup/zap.version | 2 +- .../tools/zap/tests/inputs/all-clusters-app.zap | 11 +++++------ scripts/tools/zap/tests/inputs/lighting-app.zap | 3 +-- scripts/tools/zap/zap_execution.py | 2 +- .../data_model/controller-clusters.zap | 3 +-- .../zap-generated/MTRAttributeTLVValueDecoder.mm | 6 ++++++ .../zap-generated/cluster/Commands.h | 16 ++++++++++++++++ 83 files changed, 161 insertions(+), 216 deletions(-) diff --git a/examples/air-purifier-app/air-purifier-common/air-purifier-app.zap b/examples/air-purifier-app/air-purifier-common/air-purifier-app.zap index cc96cb04983fc4..62293622ef43db 100644 --- a/examples/air-purifier-app/air-purifier-common/air-purifier-app.zap +++ b/examples/air-purifier-app/air-purifier-common/air-purifier-app.zap @@ -6838,7 +6838,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6854,7 +6854,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6870,7 +6870,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6886,7 +6886,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7559,6 +7559,5 @@ "endpointId": 4, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.zap b/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.zap index f459cfa6521060..23d2555a8ead16 100644 --- a/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.zap +++ b/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.zap @@ -4008,7 +4008,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4024,7 +4024,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4040,7 +4040,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5861,6 +5861,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap index c5045d193a6d82..f2272fbee91295 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap @@ -14808,7 +14808,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -14824,7 +14824,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -14840,7 +14840,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -14856,7 +14856,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -21901,6 +21901,5 @@ "endpointId": 65534, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap index 50ab55464e0526..4d7eeff57bcfc4 100644 --- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap +++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap @@ -7553,7 +7553,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7569,7 +7569,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7585,7 +7585,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -12348,6 +12348,5 @@ "endpointId": 65534, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/bridge-app/bridge-common/bridge-app.zap b/examples/bridge-app/bridge-common/bridge-app.zap index 9570644c62188a..90eed8842cbc4f 100644 --- a/examples/bridge-app/bridge-common/bridge-app.zap +++ b/examples/bridge-app/bridge-common/bridge-app.zap @@ -5571,7 +5571,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "External", "singleton": 0, @@ -5587,7 +5587,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "External", "singleton": 0, @@ -5603,7 +5603,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "External", "singleton": 0, @@ -5721,6 +5721,5 @@ "endpointId": 2, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap index 8a9d8d4e42c31d..37c35471f5c872 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap @@ -4795,6 +4795,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.zap b/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.zap index 8e8c9a404ce37c..ec3dcd931353d7 100644 --- a/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.zap +++ b/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.zap @@ -6581,7 +6581,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6597,7 +6597,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6613,7 +6613,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7844,6 +7844,5 @@ "endpointId": 5, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.zap b/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.zap index 8df2dae41dc7d8..8b9d43e1c969d5 100644 --- a/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.zap +++ b/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.zap @@ -2913,7 +2913,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "NVM", "singleton": 0, @@ -2929,7 +2929,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "NVM", "singleton": 0, @@ -2945,7 +2945,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "NVM", "singleton": 0, @@ -2961,7 +2961,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "temperature", "included": 1, "storageOption": "NVM", "singleton": 0, @@ -6078,6 +6078,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap index f9b6772b58d4f2..333dbf4d9fa34f 100644 --- a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap +++ b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap @@ -3938,6 +3938,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap index 4c96f6708498f9..2c06878eb0fd64 100644 --- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap +++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap @@ -3918,6 +3918,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap index 49c9fe342f96be..5d66b2b8710794 100644 --- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap +++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap @@ -3100,6 +3100,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap index ae7f9833be6028..a910fd9b245a2e 100644 --- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap +++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap @@ -3532,6 +3532,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_dishwasher_cc105034fe.zap b/examples/chef/devices/rootnode_dishwasher_cc105034fe.zap index 25a0d0d1be222b..ba944f48bbd683 100644 --- a/examples/chef/devices/rootnode_dishwasher_cc105034fe.zap +++ b/examples/chef/devices/rootnode_dishwasher_cc105034fe.zap @@ -3533,6 +3533,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap index fc97739ea6ec98..a759e3d7c11b16 100644 --- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap +++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap @@ -3429,6 +3429,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap index 62689b778ce654..ced7051c1f78ba 100644 --- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap +++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap @@ -4022,6 +4022,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap b/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap index f410f56974d928..c40b276cc84f5c 100644 --- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap +++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap @@ -3243,6 +3243,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap index d193bb5d236e2b..a88c76d6957e95 100644 --- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap +++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap @@ -3002,6 +3002,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_genericswitch_9866e35d0b.zap b/examples/chef/devices/rootnode_genericswitch_9866e35d0b.zap index 568708c64ea1ad..8e509727894bf5 100644 --- a/examples/chef/devices/rootnode_genericswitch_9866e35d0b.zap +++ b/examples/chef/devices/rootnode_genericswitch_9866e35d0b.zap @@ -2406,6 +2406,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap index 40ea29e55ac961..681fd3d7ba8fee 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap @@ -3607,6 +3607,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap index 9837d64370ea7f..4b66c78c1a73cc 100644 --- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap +++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap @@ -3002,6 +3002,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.zap b/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.zap index c33f7639fe02d9..d0766a02e2dec8 100644 --- a/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.zap +++ b/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.zap @@ -3369,6 +3369,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap index 4628663d2048eb..53edd8abd939df 100644 --- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap +++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap @@ -2970,6 +2970,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap index e0a1133e2b10c7..70dcd3fa601752 100644 --- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap +++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap @@ -2986,6 +2986,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap index cce6ae448e774e..0d48f3a2efe8bb 100644 --- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap +++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap @@ -3442,6 +3442,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_onofflight_samplemei.zap b/examples/chef/devices/rootnode_onofflight_samplemei.zap index 83f44eebd1907d..57669126a8386d 100644 --- a/examples/chef/devices/rootnode_onofflight_samplemei.zap +++ b/examples/chef/devices/rootnode_onofflight_samplemei.zap @@ -3574,6 +3574,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap index 801d9c4fd2de67..3d7196817f51fa 100644 --- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap +++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap @@ -3162,6 +3162,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap index 66744fe2fc879e..c000d81688d972 100644 --- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap +++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap @@ -3190,6 +3190,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap index 4ed304754c594f..c57e7287d9b850 100644 --- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap +++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap @@ -3012,6 +3012,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_pump_5f904818cc.zap b/examples/chef/devices/rootnode_pump_5f904818cc.zap index ca969c6222fabe..4d2ca2a38f6ea6 100644 --- a/examples/chef/devices/rootnode_pump_5f904818cc.zap +++ b/examples/chef/devices/rootnode_pump_5f904818cc.zap @@ -3078,7 +3078,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3094,7 +3094,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3110,7 +3110,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3545,6 +3545,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_pump_a811bb33a0.zap b/examples/chef/devices/rootnode_pump_a811bb33a0.zap index c4ce099577de7a..c6ed1ed214c31d 100644 --- a/examples/chef/devices/rootnode_pump_a811bb33a0.zap +++ b/examples/chef/devices/rootnode_pump_a811bb33a0.zap @@ -3003,6 +3003,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.zap b/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.zap index f63a0072d3fc7e..f90591eef0a0d6 100644 --- a/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.zap +++ b/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.zap @@ -3793,6 +3793,5 @@ "endpointId": 3, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap index b12960c0ad7c65..8d10ab99962f47 100644 --- a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap +++ b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap @@ -3051,6 +3051,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.zap b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.zap index 22078ba8f841f7..401800be09fd61 100644 --- a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.zap +++ b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.zap @@ -3148,6 +3148,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.zap b/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.zap index 9fdb65c8035573..bb3717d00bda33 100644 --- a/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.zap +++ b/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.zap @@ -3085,6 +3085,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap index 28f47070e93356..b5d0e9eeb514f5 100644 --- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap +++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap @@ -3174,6 +3174,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap index e16ee3fcca8420..0c4c5c17c371f9 100644 --- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap +++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap @@ -2843,7 +2843,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2859,7 +2859,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2875,7 +2875,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2986,6 +2986,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap index fbe5c0f9c50a56..42a23375c9ec67 100644 --- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap +++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap @@ -3817,6 +3817,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap index 0d68f07eccb7a1..992590ceb2d483 100644 --- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap +++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap @@ -3478,6 +3478,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/template.zap b/examples/chef/devices/template.zap index bf77da05ea3d05..87c7e61ab964d9 100644 --- a/examples/chef/devices/template.zap +++ b/examples/chef/devices/template.zap @@ -2788,6 +2788,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap index 1a7ff846ae75a0..5d739897104e04 100644 --- a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap +++ b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap @@ -4714,6 +4714,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/darwin-framework-tool/templates/commands.zapt b/examples/darwin-framework-tool/templates/commands.zapt index 9d1c98e1d1d06f..241a75bd33ecc6 100644 --- a/examples/darwin-framework-tool/templates/commands.zapt +++ b/examples/darwin-framework-tool/templates/commands.zapt @@ -312,10 +312,10 @@ public: {{/if}} {{/if}} {{/zcl_attributes_server}} -{{/if}} {{#if (isProvisional (asUpperCamelCase name preserveAcronyms=true))}} #endif // MTR_ENABLE_PROVISIONAL {{/if}} +{{/if}} {{/zcl_clusters}} /*----------------------------------------------------------------------------*\ diff --git a/examples/dishwasher-app/dishwasher-common/dishwasher-app.zap b/examples/dishwasher-app/dishwasher-common/dishwasher-app.zap index be3add8ed70a6a..6296916227604a 100644 --- a/examples/dishwasher-app/dishwasher-common/dishwasher-app.zap +++ b/examples/dishwasher-app/dishwasher-common/dishwasher-app.zap @@ -3919,6 +3919,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.zap b/examples/light-switch-app/light-switch-common/light-switch-app.zap index 0e3857c0ef3747..9d57c838c576ee 100644 --- a/examples/light-switch-app/light-switch-common/light-switch-app.zap +++ b/examples/light-switch-app/light-switch-common/light-switch-app.zap @@ -5848,6 +5848,5 @@ "endpointId": 2, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.zap b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.zap index 964c28d2394697..83336230621679 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.zap +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.zap @@ -4293,6 +4293,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap index 01561c14d6dd33..61d2547e67729e 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap @@ -5269,6 +5269,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap index b5a5f6165d0016..d0caac0d852db9 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap @@ -4476,6 +4476,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/lighting-app/lighting-common/lighting-app.zap b/examples/lighting-app/lighting-common/lighting-app.zap index 1eb4d7a701f432..cb6181d2277fd6 100644 --- a/examples/lighting-app/lighting-common/lighting-app.zap +++ b/examples/lighting-app/lighting-common/lighting-app.zap @@ -5992,6 +5992,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.zap b/examples/lighting-app/nxp/zap/lighting-on-off.zap index 908dfc6bc2ac66..fd414f8267f4c5 100644 --- a/examples/lighting-app/nxp/zap/lighting-on-off.zap +++ b/examples/lighting-app/nxp/zap/lighting-on-off.zap @@ -3962,6 +3962,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/lighting-app/qpg/zap/light.zap b/examples/lighting-app/qpg/zap/light.zap index a3b56ebb02d1cb..af746454e6158a 100644 --- a/examples/lighting-app/qpg/zap/light.zap +++ b/examples/lighting-app/qpg/zap/light.zap @@ -6223,6 +6223,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/lighting-app/silabs/data_model/lighting-thread-app.zap b/examples/lighting-app/silabs/data_model/lighting-thread-app.zap index f9bedf8f98ceee..ba891a5419f952 100644 --- a/examples/lighting-app/silabs/data_model/lighting-thread-app.zap +++ b/examples/lighting-app/silabs/data_model/lighting-thread-app.zap @@ -5932,6 +5932,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap b/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap index 9fdd90c26099db..2af72278d94d61 100644 --- a/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap +++ b/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap @@ -5108,6 +5108,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/lock-app/lock-common/lock-app.zap b/examples/lock-app/lock-common/lock-app.zap index 5dddf5b3075d14..82c7bbe7268baf 100644 --- a/examples/lock-app/lock-common/lock-app.zap +++ b/examples/lock-app/lock-common/lock-app.zap @@ -6660,6 +6660,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/lock-app/nxp/zap/lock-app.zap b/examples/lock-app/nxp/zap/lock-app.zap index 8e015b083248cb..b672e0c2b5a7ec 100644 --- a/examples/lock-app/nxp/zap/lock-app.zap +++ b/examples/lock-app/nxp/zap/lock-app.zap @@ -3425,6 +3425,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/lock-app/qpg/zap/lock.zap b/examples/lock-app/qpg/zap/lock.zap index c60d090151a3b7..fc0f478213e3be 100644 --- a/examples/lock-app/qpg/zap/lock.zap +++ b/examples/lock-app/qpg/zap/lock.zap @@ -5284,6 +5284,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/log-source-app/log-source-common/log-source-app.zap b/examples/log-source-app/log-source-common/log-source-app.zap index 4be1a514aea258..f24d8dc8c4c007 100644 --- a/examples/log-source-app/log-source-common/log-source-app.zap +++ b/examples/log-source-app/log-source-common/log-source-app.zap @@ -737,6 +737,5 @@ "endpointId": 0, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap b/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap index d445d8a2694769..534246e46c8c30 100644 --- a/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap +++ b/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap @@ -2283,6 +2283,5 @@ "endpointId": 0, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap index f2eae5d5381cfc..fb1913ba066f28 100644 --- a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap +++ b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap @@ -3440,6 +3440,5 @@ "endpointId": 65534, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/placeholder/linux/apps/app1/config.zap b/examples/placeholder/linux/apps/app1/config.zap index 6bb34d3306eac0..a4822b8fe9da04 100644 --- a/examples/placeholder/linux/apps/app1/config.zap +++ b/examples/placeholder/linux/apps/app1/config.zap @@ -9046,7 +9046,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -9062,7 +9062,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -9078,7 +9078,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -9094,7 +9094,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -15205,6 +15205,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/placeholder/linux/apps/app2/config.zap b/examples/placeholder/linux/apps/app2/config.zap index 3f19bedb04a28a..f65aa2068700bb 100644 --- a/examples/placeholder/linux/apps/app2/config.zap +++ b/examples/placeholder/linux/apps/app2/config.zap @@ -9120,7 +9120,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -9136,7 +9136,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -9152,7 +9152,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -9168,7 +9168,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -14997,6 +14997,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/pump-app/pump-common/pump-app.zap b/examples/pump-app/pump-common/pump-app.zap index 73b79af6674e30..b982bfd166c7f3 100644 --- a/examples/pump-app/pump-common/pump-app.zap +++ b/examples/pump-app/pump-common/pump-app.zap @@ -4033,7 +4033,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4049,7 +4049,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4065,7 +4065,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4081,7 +4081,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4622,6 +4622,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/pump-app/silabs/data_model/pump-thread-app.zap b/examples/pump-app/silabs/data_model/pump-thread-app.zap index bd3569bc9c42f9..ca953399539dc7 100644 --- a/examples/pump-app/silabs/data_model/pump-thread-app.zap +++ b/examples/pump-app/silabs/data_model/pump-thread-app.zap @@ -4033,7 +4033,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4049,7 +4049,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4065,7 +4065,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4081,7 +4081,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4622,6 +4622,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/pump-app/silabs/data_model/pump-wifi-app.zap b/examples/pump-app/silabs/data_model/pump-wifi-app.zap index bd3569bc9c42f9..ca953399539dc7 100644 --- a/examples/pump-app/silabs/data_model/pump-wifi-app.zap +++ b/examples/pump-app/silabs/data_model/pump-wifi-app.zap @@ -4033,7 +4033,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4049,7 +4049,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4065,7 +4065,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4081,7 +4081,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4622,6 +4622,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap b/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap index 0d687d1f4d446c..db4f39092d7d56 100644 --- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap +++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap @@ -3448,6 +3448,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/refrigerator-app/refrigerator-common/refrigerator-app.zap b/examples/refrigerator-app/refrigerator-common/refrigerator-app.zap index 3d554d6d8ca5ad..0d4058a623ed3b 100644 --- a/examples/refrigerator-app/refrigerator-common/refrigerator-app.zap +++ b/examples/refrigerator-app/refrigerator-common/refrigerator-app.zap @@ -3733,6 +3733,5 @@ "endpointId": 3, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.zap b/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.zap index a55f8b6f4abe87..316b31550d4dd1 100644 --- a/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.zap +++ b/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.zap @@ -5339,6 +5339,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/rvc-app/rvc-common/rvc-app.zap b/examples/rvc-app/rvc-common/rvc-app.zap index e5f9e297ad0b19..2a5e70c15e6899 100644 --- a/examples/rvc-app/rvc-common/rvc-app.zap +++ b/examples/rvc-app/rvc-common/rvc-app.zap @@ -2799,6 +2799,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.zap b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.zap index 2507ad7cba4c4b..9f908ddc467eb1 100644 --- a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.zap +++ b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.zap @@ -4849,6 +4849,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.zap b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.zap index 1b4d5b5e83b16f..d30f78430de90d 100644 --- a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.zap +++ b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.zap @@ -2891,7 +2891,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2907,7 +2907,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2923,7 +2923,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2986,6 +2986,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/thermostat/nxp/zap/thermostat_matter_thread.zap b/examples/thermostat/nxp/zap/thermostat_matter_thread.zap index 1db8b2b288b77f..fc4fcab08daeb0 100644 --- a/examples/thermostat/nxp/zap/thermostat_matter_thread.zap +++ b/examples/thermostat/nxp/zap/thermostat_matter_thread.zap @@ -4950,6 +4950,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/thermostat/nxp/zap/thermostat_matter_wifi.zap b/examples/thermostat/nxp/zap/thermostat_matter_wifi.zap index 7a3e1ffbb356ba..4f547325082971 100644 --- a/examples/thermostat/nxp/zap/thermostat_matter_wifi.zap +++ b/examples/thermostat/nxp/zap/thermostat_matter_wifi.zap @@ -4092,6 +4092,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap index d22c446eb23fac..15089b3ab63025 100644 --- a/examples/thermostat/thermostat-common/thermostat.zap +++ b/examples/thermostat/thermostat-common/thermostat.zap @@ -5059,6 +5059,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/tv-app/tv-common/tv-app.zap b/examples/tv-app/tv-common/tv-app.zap index 08def3fad76094..dfb855bbc4182f 100644 --- a/examples/tv-app/tv-common/tv-app.zap +++ b/examples/tv-app/tv-common/tv-app.zap @@ -7637,6 +7637,5 @@ "endpointId": 3, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap index d55da66fab0eba..fdcfe88813b957 100644 --- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap +++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap @@ -4382,6 +4382,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/virtual-device-app/virtual-device-common/virtual-device-app.zap b/examples/virtual-device-app/virtual-device-common/virtual-device-app.zap index d60d0e3de7f852..2de2594f69d319 100644 --- a/examples/virtual-device-app/virtual-device-common/virtual-device-app.zap +++ b/examples/virtual-device-app/virtual-device-common/virtual-device-app.zap @@ -6138,6 +6138,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/window-app/common/window-app.zap b/examples/window-app/common/window-app.zap index 3ac0170b1683e6..62335819c78496 100644 --- a/examples/window-app/common/window-app.zap +++ b/examples/window-app/common/window-app.zap @@ -7073,6 +7073,5 @@ "endpointId": 2, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/scripts/setup/zap.json b/scripts/setup/zap.json index b9e8e18016cd31..94d4799af8f241 100644 --- a/scripts/setup/zap.json +++ b/scripts/setup/zap.json @@ -8,13 +8,13 @@ "mac-amd64", "windows-amd64" ], - "tags": ["version:2@v2023.10.24-nightly.1"] + "tags": ["version:2@v2023.10.30-nightly.1"] }, { "_comment": "Always get the amd64 version on mac until usable arm64 zap build is available", "path": "fuchsia/third_party/zap/mac-amd64", "platforms": ["mac-arm64"], - "tags": ["version:2@v2023.10.24-nightly.1"] + "tags": ["version:2@v2023.10.30-nightly.1"] } ] } diff --git a/scripts/setup/zap.version b/scripts/setup/zap.version index c26dc3f85a55d8..7cea852e9c90f1 100644 --- a/scripts/setup/zap.version +++ b/scripts/setup/zap.version @@ -1 +1 @@ -v2023.10.24-nightly +v2023.10.30-nightly diff --git a/scripts/tools/zap/tests/inputs/all-clusters-app.zap b/scripts/tools/zap/tests/inputs/all-clusters-app.zap index 12d89a5da8d510..97bea16a06f3a2 100644 --- a/scripts/tools/zap/tests/inputs/all-clusters-app.zap +++ b/scripts/tools/zap/tests/inputs/all-clusters-app.zap @@ -11586,7 +11586,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -11602,7 +11602,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -11618,7 +11618,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -11634,7 +11634,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -16797,6 +16797,5 @@ "endpointId": 65534, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/scripts/tools/zap/tests/inputs/lighting-app.zap b/scripts/tools/zap/tests/inputs/lighting-app.zap index 7fbcb784bfd527..e2d343dc413e5f 100644 --- a/scripts/tools/zap/tests/inputs/lighting-app.zap +++ b/scripts/tools/zap/tests/inputs/lighting-app.zap @@ -5742,6 +5742,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/scripts/tools/zap/zap_execution.py b/scripts/tools/zap/zap_execution.py index 60e861d28cd926..4aa1eac29d4bed 100644 --- a/scripts/tools/zap/zap_execution.py +++ b/scripts/tools/zap/zap_execution.py @@ -23,7 +23,7 @@ # Use scripts/tools/zap/version_update.py to manage ZAP versioning as many # files may need updating for versions # -MIN_ZAP_VERSION = '2023.10.24' +MIN_ZAP_VERSION = '2023.10.28' class ZapTool: diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap index 69823c343442e1..fbec11f218ab8f 100644 --- a/src/controller/data_model/controller-clusters.zap +++ b/src/controller/data_model/controller-clusters.zap @@ -5081,6 +5081,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm index 4aaa93b2fc98c9..dbbd836fd32445 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm @@ -2518,6 +2518,7 @@ static id _Nullable DecodeAttributeValueForNetworkCommissioningCluster(Attribute } return value; } +#if MTR_ENABLE_PROVISIONAL case Attributes::SupportedWiFiBands::Id: { using TypeInfo = Attributes::SupportedWiFiBands::TypeInfo; TypeInfo::DecodableType cppValue; @@ -2544,6 +2545,8 @@ static id _Nullable DecodeAttributeValueForNetworkCommissioningCluster(Attribute } return value; } +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL case Attributes::SupportedThreadFeatures::Id: { using TypeInfo = Attributes::SupportedThreadFeatures::TypeInfo; TypeInfo::DecodableType cppValue; @@ -2555,6 +2558,8 @@ static id _Nullable DecodeAttributeValueForNetworkCommissioningCluster(Attribute value = [NSNumber numberWithUnsignedShort:cppValue.Raw()]; return value; } +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL case Attributes::ThreadVersion::Id: { using TypeInfo = Attributes::ThreadVersion::TypeInfo; TypeInfo::DecodableType cppValue; @@ -2566,6 +2571,7 @@ static id _Nullable DecodeAttributeValueForNetworkCommissioningCluster(Attribute value = [NSNumber numberWithUnsignedShort:cppValue]; return value; } +#endif // MTR_ENABLE_PROVISIONAL default: { break; } 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 07f482a5ab89b7..31c1d5a6e5bbb9 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h @@ -26609,6 +26609,8 @@ class SubscribeAttributeNetworkCommissioningLastConnectErrorValue : public Subsc } }; +#if MTR_ENABLE_PROVISIONAL + /* * Attribute SupportedWiFiBands */ @@ -26691,6 +26693,9 @@ class SubscribeAttributeNetworkCommissioningSupportedWiFiBands : public Subscrib } }; +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + /* * Attribute SupportedThreadFeatures */ @@ -26773,6 +26778,9 @@ class SubscribeAttributeNetworkCommissioningSupportedThreadFeatures : public Sub } }; +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + /* * Attribute ThreadVersion */ @@ -26855,6 +26863,8 @@ class SubscribeAttributeNetworkCommissioningThreadVersion : public SubscribeAttr } }; +#endif // MTR_ENABLE_PROVISIONAL + /* * Attribute GeneratedCommandList */ @@ -154565,12 +154575,18 @@ void registerClusterNetworkCommissioning(Commands & commands) make_unique(), // make_unique(), // make_unique(), // +#if MTR_ENABLE_PROVISIONAL make_unique(), // make_unique(), // +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL make_unique(), // make_unique(), // +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL make_unique(), // make_unique(), // +#endif // MTR_ENABLE_PROVISIONAL make_unique(), // make_unique(), // make_unique(), // From 5c9d8e8748a8c18bd0c62161704f007b481869b7 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Tue, 31 Oct 2023 13:05:59 -0400 Subject: [PATCH 41/41] Make dispatch of OperationalSessionSetup retry notifications safer. (#30103) --- src/app/OperationalSessionSetup.cpp | 37 +++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/src/app/OperationalSessionSetup.cpp b/src/app/OperationalSessionSetup.cpp index 7b5d70919f2a8a..0b68c12c96a7dd 100644 --- a/src/app/OperationalSessionSetup.cpp +++ b/src/app/OperationalSessionSetup.cpp @@ -702,10 +702,43 @@ void OperationalSessionSetup::NotifyRetryHandlers(CHIP_ERROR error, const Reliab void OperationalSessionSetup::NotifyRetryHandlers(CHIP_ERROR error, System::Clock::Seconds16 timeoutEstimate) { - for (auto * item = mConnectionRetry.First(); item && item != &mConnectionRetry; item = item->mNext) + // We have to be very careful here: Calling into these handlers might in + // theory destroy the Callback objects involved, but unlike the + // succcess/failure cases we don't want to just clear the handlers from our + // list when we are calling them, because we might need to call a given + // handler more than once. + // + // To handle this we: + // + // 1) Snapshot the list of handlers up front, so if any of the handlers + // triggers an AddRetryHandler with some other handler that does not + // affect the list we plan to notify here. + // + // 2) When planning to notify a handler move it to a new list that contains + // just that handler. This way if it gets canceled as part of the + // notification we can tell it has been canceled. + // + // 3) If notifying the handler does not cancel it, add it back to our list + // of handlers so we will notify it on future retries. + + Cancelable retryHandlerListSnapshot; + mConnectionRetry.DequeueAll(retryHandlerListSnapshot); + + while (retryHandlerListSnapshot.mNext != &retryHandlerListSnapshot) { - auto cb = Callback::Callback::FromCancelable(item); + auto * cb = Callback::Callback::FromCancelable(retryHandlerListSnapshot.mNext); + + Callback::CallbackDeque currentCallbackHolder; + currentCallbackHolder.Enqueue(cb->Cancel()); + cb->mCall(cb->mContext, mPeerId, error, timeoutEstimate); + + if (currentCallbackHolder.mNext != ¤tCallbackHolder) + { + // Callback has not been canceled as part of the call, so is still + // supposed to be registered with us. + AddRetryHandler(cb); + } } } #endif // CHIP_DEVICE_CONFIG_ENABLE_AUTOMATIC_CASE_RETRIES