From 6ed81117bce8f4563242f635413e8ab5c7a4e291 Mon Sep 17 00:00:00 2001 From: Amine Alami <43780877+Alami-Amine@users.noreply.github.com> Date: Wed, 14 Aug 2024 16:10:02 +0200 Subject: [PATCH 1/6] replacing "stringcase" python package with internal implementation + generated java and kotlin code (#34949) * changing matter_idl functions * changing yaml runner functions * removing stringcase from config and requirement files * restyle * improve string handling * fixing generated java and kotlin code * regenerate idl golden image for test_generators.py * adding unit test * restyle * adding unit test to build.GN --- .../stage-2/chip-build-efr32/requirements.txt | 1 - scripts/py_matter_idl/BUILD.gn | 1 + .../matter_idl/generators/filters.py | 83 +- .../matter_idl/generators/java/__init__.py | 14 +- .../matter_idl/generators/kotlin/__init__.py | 14 +- .../matter_idl/test_case_conversion.py | 61 ++ .../several_clusters/java/ChipStructs.java | 18 +- .../SecondClusterFabricDescriptorStruct.kt | 18 +- scripts/py_matter_idl/setup.cfg | 1 - scripts/setup/constraints.txt | 2 - scripts/setup/requirements.build.txt | 1 - .../chip/devicecontroller/ChipClusters.java | 798 +++++++++--------- .../devicecontroller/ChipEventStructs.java | 126 +-- .../chip/devicecontroller/ChipStructs.java | 270 +++--- ...olClusterAccessControlEntryChangedEvent.kt | 20 +- ...usterAccessControlExtensionChangedEvent.kt | 20 +- ...usterFabricRestrictionReviewUpdateEvent.kt | 10 +- .../ActionsClusterActionFailedEvent.kt | 12 +- .../ActionsClusterStateChangedEvent.kt | 12 +- ...lusterLoadControlEventStatusChangeEvent.kt | 6 +- .../EnergyEvseClusterEVConnectedEvent.kt | 6 +- .../EnergyEvseClusterEVNotDetectedEvent.kt | 6 +- ...gyEvseClusterEnergyTransferStartedEvent.kt | 6 +- ...gyEvseClusterEnergyTransferStoppedEvent.kt | 6 +- .../EnergyEvseClusterFaultEvent.kt | 10 +- .../MessagesClusterMessageCompleteEvent.kt | 18 +- .../MessagesClusterMessagePresentedEvent.kt | 6 +- .../MessagesClusterMessageQueuedEvent.kt | 6 +- ...dateRequestorClusterVersionAppliedEvent.kt | 6 +- ...imeSynchronizationClusterDSTStatusEvent.kt | 6 +- .../structs/ActionsClusterActionStruct.kt | 12 +- .../ActionsClusterEndpointListStruct.kt | 6 +- ...pplicationBasicClusterApplicationStruct.kt | 12 +- ...icationLauncherClusterApplicationStruct.kt | 12 +- .../structs/ChannelClusterProgramStruct.kt | 8 +- .../ContentLauncherClusterParameterStruct.kt | 8 +- ...ntLauncherClusterStyleInformationStruct.kt | 8 +- ...oadControlClusterLoadControlEventStruct.kt | 16 +- ...dControlClusterLoadControlProgramStruct.kt | 6 +- .../DescriptorClusterSemanticTagStruct.kt | 6 +- ...ceEnergyManagementClusterForecastStruct.kt | 6 +- ...DeviceEnergyManagementClusterSlotStruct.kt | 8 +- ...formationClusterEcosystemLocationStruct.kt | 6 +- ...upKeyManagementClusterGroupKeyMapStruct.kt | 6 +- ...upKeyManagementClusterGroupKeySetStruct.kt | 6 +- ...mentClusterMonitoringRegistrationStruct.kt | 6 +- ...sagesClusterMessageResponseOptionStruct.kt | 8 +- .../structs/MessagesClusterMessageStruct.kt | 6 +- ...rkCommissioningClusterNetworkInfoStruct.kt | 6 +- ...redentialsClusterFabricDescriptorStruct.kt | 18 +- ...OperationalStateClusterErrorStateStruct.kt | 6 +- ...ionalStateClusterOperationalStateStruct.kt | 6 +- ...eUpdateRequestorClusterProviderLocation.kt | 6 +- ...OperationalStateClusterErrorStateStruct.kt | 6 +- ...ionalStateClusterOperationalStateStruct.kt | 6 +- ...OperationalStateClusterErrorStateStruct.kt | 6 +- ...ionalStateClusterOperationalStateStruct.kt | 6 +- ...nagementClusterAttributeValuePairStruct.kt | 6 +- ...cenesManagementClusterExtensionFieldSet.kt | 6 +- .../structs/ServiceAreaClusterAreaStruct.kt | 16 +- .../structs/ServiceAreaClusterMapStruct.kt | 6 +- .../ServiceAreaClusterProgressStruct.kt | 6 +- ...ostatClusterAtomicAttributeStatusStruct.kt | 6 +- ...tworkDiagnosticsClusterRouteTableStruct.kt | 12 +- ...workDirectoryClusterThreadNetworkStruct.kt | 6 +- ...sterFabricScopedTrustedTimeSourceStruct.kt | 6 +- ...onizationClusterTrustedTimeSourceStruct.kt | 6 +- .../cluster/clusters/AccountLoginCluster.kt | 8 +- .../cluster/clusters/ActionsCluster.kt | 96 +-- .../AdministratorCommissioningCluster.kt | 4 +- .../cluster/clusters/ChannelCluster.kt | 12 +- .../clusters/CommissionerControlCluster.kt | 4 +- .../cluster/clusters/ContentControlCluster.kt | 16 +- .../clusters/ContentLauncherCluster.kt | 4 +- .../DemandResponseLoadControlCluster.kt | 8 +- .../clusters/DeviceEnergyManagementCluster.kt | 4 +- .../cluster/clusters/DiagnosticLogsCluster.kt | 4 +- .../cluster/clusters/DoorLockCluster.kt | 24 +- .../clusters/GeneralCommissioningCluster.kt | 8 +- .../clusters/GroupKeyManagementCluster.kt | 8 +- .../cluster/clusters/GroupsCluster.kt | 28 +- .../cluster/clusters/IcdManagementCluster.kt | 12 +- .../cluster/clusters/MediaPlaybackCluster.kt | 8 +- .../cluster/clusters/MessagesCluster.kt | 4 +- .../clusters/NetworkCommissioningCluster.kt | 12 +- .../clusters/OperationalCredentialsCluster.kt | 36 +- .../OtaSoftwareUpdateProviderCluster.kt | 12 +- .../OtaSoftwareUpdateRequestorCluster.kt | 8 +- .../clusters/ScenesManagementCluster.kt | 88 +- .../clusters/ThreadNetworkDirectoryCluster.kt | 8 +- .../clusters/TimeSynchronizationCluster.kt | 16 +- ...olClusterAccessControlEntryChangedEvent.kt | 20 +- ...usterAccessControlExtensionChangedEvent.kt | 20 +- ...usterFabricRestrictionReviewUpdateEvent.kt | 10 +- .../ActionsClusterActionFailedEvent.kt | 12 +- .../ActionsClusterStateChangedEvent.kt | 12 +- ...lusterLoadControlEventStatusChangeEvent.kt | 6 +- .../EnergyEvseClusterEVConnectedEvent.kt | 6 +- .../EnergyEvseClusterEVNotDetectedEvent.kt | 6 +- ...gyEvseClusterEnergyTransferStartedEvent.kt | 6 +- ...gyEvseClusterEnergyTransferStoppedEvent.kt | 6 +- .../EnergyEvseClusterFaultEvent.kt | 10 +- .../MessagesClusterMessageCompleteEvent.kt | 18 +- .../MessagesClusterMessagePresentedEvent.kt | 6 +- .../MessagesClusterMessageQueuedEvent.kt | 6 +- ...dateRequestorClusterVersionAppliedEvent.kt | 6 +- ...imeSynchronizationClusterDSTStatusEvent.kt | 6 +- .../structs/ActionsClusterActionStruct.kt | 12 +- .../ActionsClusterEndpointListStruct.kt | 6 +- ...pplicationBasicClusterApplicationStruct.kt | 12 +- ...icationLauncherClusterApplicationStruct.kt | 12 +- .../structs/ChannelClusterProgramStruct.kt | 8 +- .../ContentLauncherClusterParameterStruct.kt | 8 +- ...ntLauncherClusterStyleInformationStruct.kt | 8 +- ...oadControlClusterLoadControlEventStruct.kt | 16 +- ...dControlClusterLoadControlProgramStruct.kt | 6 +- .../DescriptorClusterSemanticTagStruct.kt | 6 +- ...ceEnergyManagementClusterForecastStruct.kt | 6 +- ...DeviceEnergyManagementClusterSlotStruct.kt | 8 +- ...formationClusterEcosystemLocationStruct.kt | 6 +- ...upKeyManagementClusterGroupKeyMapStruct.kt | 6 +- ...upKeyManagementClusterGroupKeySetStruct.kt | 6 +- ...mentClusterMonitoringRegistrationStruct.kt | 6 +- ...sagesClusterMessageResponseOptionStruct.kt | 8 +- .../structs/MessagesClusterMessageStruct.kt | 6 +- ...rkCommissioningClusterNetworkInfoStruct.kt | 6 +- ...redentialsClusterFabricDescriptorStruct.kt | 18 +- ...OperationalStateClusterErrorStateStruct.kt | 6 +- ...ionalStateClusterOperationalStateStruct.kt | 6 +- ...eUpdateRequestorClusterProviderLocation.kt | 6 +- ...OperationalStateClusterErrorStateStruct.kt | 6 +- ...ionalStateClusterOperationalStateStruct.kt | 6 +- ...OperationalStateClusterErrorStateStruct.kt | 6 +- ...ionalStateClusterOperationalStateStruct.kt | 6 +- ...nagementClusterAttributeValuePairStruct.kt | 6 +- ...cenesManagementClusterExtensionFieldSet.kt | 6 +- .../structs/ServiceAreaClusterAreaStruct.kt | 16 +- .../structs/ServiceAreaClusterMapStruct.kt | 6 +- .../ServiceAreaClusterProgressStruct.kt | 6 +- ...ostatClusterAtomicAttributeStatusStruct.kt | 6 +- ...tworkDiagnosticsClusterRouteTableStruct.kt | 12 +- ...workDirectoryClusterThreadNetworkStruct.kt | 6 +- ...sterFabricScopedTrustedTimeSourceStruct.kt | 6 +- ...onizationClusterTrustedTimeSourceStruct.kt | 6 +- src/controller/python/chip/yaml/runner.py | 20 +- 145 files changed, 1437 insertions(+), 1311 deletions(-) create mode 100644 scripts/py_matter_idl/matter_idl/test_case_conversion.py diff --git a/integrations/docker/images/stage-2/chip-build-efr32/requirements.txt b/integrations/docker/images/stage-2/chip-build-efr32/requirements.txt index dc05bcd6459526..5c9ae9889f5ef3 100644 --- a/integrations/docker/images/stage-2/chip-build-efr32/requirements.txt +++ b/integrations/docker/images/stage-2/chip-build-efr32/requirements.txt @@ -1,7 +1,6 @@ # codegen.py build requirements Jinja2==3.1.3 lark==1.1.7 -stringcase==1.2.0 # Sphinx dependencies (for slc-cli) linkify-it-py==2.0.2 myst-parser==2.0.0 diff --git a/scripts/py_matter_idl/BUILD.gn b/scripts/py_matter_idl/BUILD.gn index 29e6becb4eba77..c0493e8fb763c3 100644 --- a/scripts/py_matter_idl/BUILD.gn +++ b/scripts/py_matter_idl/BUILD.gn @@ -53,6 +53,7 @@ pw_python_package("matter_idl") { tests = [ "matter_idl/test_backwards_compatibility.py", + "matter_idl/test_case_conversion.py", "matter_idl/test_data_model_xml.py", "matter_idl/test_matter_idl_parser.py", "matter_idl/test_generators.py", diff --git a/scripts/py_matter_idl/matter_idl/generators/filters.py b/scripts/py_matter_idl/matter_idl/generators/filters.py index b1ea94a7cd36c6..8f81c2013c2226 100644 --- a/scripts/py_matter_idl/matter_idl/generators/filters.py +++ b/scripts/py_matter_idl/matter_idl/generators/filters.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import stringcase +import re def normalize_acronyms(s: str) -> str: @@ -49,6 +49,75 @@ def lowfirst_except_acronym(s: str) -> str: return lowfirst(s) +def to_snake_case(s: str) -> str: + """convert to snake case; all words are seperated by underscore and are lower case + examples: + FooBarBaz --> foo_bar_baz + foo BarBaz --> foo_bar_baz + FOOBarBaz --> foo_bar_baz + _fooBar_Baz_ --> foo_bar_baz + """ + s = "" if s is None else str(s) + + s = re.sub(r'([A-Z]+)([A-Z][a-z])', r'\1_\2', s) + s = re.sub(r'([a-z\d])([A-Z])', r'\1_\2', s) + s = re.sub(r'[\s\-]+', '_', s) + + snake_case = s.lower() + return snake_case.strip('_') + + +def to_constant_case(s: str) -> str: + """convert to constant case; all words are seperated by underscore and are upper case + similar to a snake case but with upper case + examples: + FooBarBaz --> FOO_BAR_BAZ + foo BarBaz --> FOO_BAR_BAZ + FOOBarBaz --> FOO_BAR_BAZ + """ + snake_case = to_snake_case(s) + constant_case = snake_case.upper() + return constant_case + + +def to_spinal_case(s: str) -> str: + """convert to spinal case; all words sperated by hypen and are lower case + similar to a snake case but with hyphen seperator instead of underscore + examples: + FooBarBaz --> foo-bar-baz + foo BarBaz --> foo-bar-baz + FOOBarBaz --> foo-bar-baz + """ + snake_case = to_snake_case(s) + return snake_case.replace('_', '-') + + +def to_pascal_case(s: str) -> str: + """convert to pascal case; with no spaces or underscore between words, first letter of all words is uppercase + examples: + fooBarBaz --> FooBarBaz + foo BarBaz --> FooBarBaz + FOOBar_Baz --> FooBarBaz + """ + + snake_case = to_snake_case(s) + snake_case_split = snake_case.split('_') + pascal_case = ''.join(word.capitalize() for word in snake_case_split) + + return pascal_case + + +def to_camel_case(s) -> str: + """convert to camel case; with no spaces or underscore between words, first word all lowercase and following words are uppercase + same as pascal case but first letter is lower case + examples: + FooBarBaz --> fooBarBaz + foo BarBaz --> fooBarBaz + FOOBarBaz --> fooBarBaz + """ + return lowfirst(to_pascal_case(s)) + + def RegisterCommonFilters(filtermap): """ Register filters that are NOT considered platform-generator specific. @@ -59,12 +128,12 @@ def RegisterCommonFilters(filtermap): """ # General casing for output naming - filtermap['camelcase'] = stringcase.camelcase - filtermap['capitalcase'] = stringcase.capitalcase - filtermap['constcase'] = stringcase.constcase - filtermap['pascalcase'] = stringcase.pascalcase - filtermap['snakecase'] = stringcase.snakecase - filtermap['spinalcase'] = stringcase.spinalcase + filtermap['camelcase'] = to_camel_case + filtermap['capitalcase'] = upfirst + filtermap['constcase'] = to_constant_case + filtermap['pascalcase'] = to_pascal_case + filtermap['snakecase'] = to_snake_case + filtermap['spinalcase'] = to_spinal_case filtermap['normalize_acronyms'] = normalize_acronyms filtermap['lowfirst'] = lowfirst diff --git a/scripts/py_matter_idl/matter_idl/generators/java/__init__.py b/scripts/py_matter_idl/matter_idl/generators/java/__init__.py index 96fa37c1a26445..d21107653dfb46 100644 --- a/scripts/py_matter_idl/matter_idl/generators/java/__init__.py +++ b/scripts/py_matter_idl/matter_idl/generators/java/__init__.py @@ -20,11 +20,11 @@ from typing import List, Optional, Set from matter_idl.generators import CodeGenerator, GeneratorStorage +from matter_idl.generators.filters import upfirst from matter_idl.generators.type_definitions import (BasicInteger, BasicString, FundamentalType, IdlBitmapType, IdlEnumType, IdlType, ParseDataType, TypeLookupContext) from matter_idl.matter_idl_types import (Attribute, Cluster, Command, DataType, Field, FieldQuality, Idl, Struct, StructQuality, StructTag) -from stringcase import capitalcase @dataclasses.dataclass @@ -199,7 +199,7 @@ def DelegatedCallbackName(attr: Attribute, context: TypeLookupContext) -> str: if global_name: return 'Delegated{}AttributeCallback'.format(GlobalNameToJavaName(global_name)) - return 'Delegated{}Cluster{}AttributeCallback'.format(context.cluster.name, capitalcase(attr.definition.name)) + return 'Delegated{}Cluster{}AttributeCallback'.format(context.cluster.name, upfirst(attr.definition.name)) def ChipClustersCallbackName(attr: Attribute, context: TypeLookupContext) -> str: @@ -212,7 +212,7 @@ def ChipClustersCallbackName(attr: Attribute, context: TypeLookupContext) -> str if global_name: return 'ChipClusters.{}AttributeCallback'.format(GlobalNameToJavaName(global_name)) - return 'ChipClusters.{}Cluster.{}AttributeCallback'.format(context.cluster.name, capitalcase(attr.definition.name)) + return 'ChipClusters.{}Cluster.{}AttributeCallback'.format(context.cluster.name, upfirst(attr.definition.name)) def CallbackName(attr: Attribute, context: TypeLookupContext) -> str: @@ -228,11 +228,11 @@ def CallbackName(attr: Attribute, context: TypeLookupContext) -> str: global_name = FieldToGlobalName(attr.definition, context) if global_name: - return 'CHIP{}AttributeCallback'.format(capitalcase(global_name)) + return 'CHIP{}AttributeCallback'.format(upfirst(global_name)) return 'CHIP{}{}AttributeCallback'.format( - capitalcase(context.cluster.name), - capitalcase(attr.definition.name) + upfirst(context.cluster.name), + upfirst(attr.definition.name) ) @@ -262,7 +262,7 @@ def JavaAttributeCallbackName(attr: Attribute, context: TypeLookupContext) -> st if global_name: return '{}AttributeCallback'.format(GlobalNameToJavaName(global_name)) - return '{}AttributeCallback'.format(capitalcase(attr.definition.name)) + return '{}AttributeCallback'.format(upfirst(attr.definition.name)) def IsFieldGlobalName(field: Field, context: TypeLookupContext) -> bool: 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 17e5136e169b6a..405f505a0980d3 100644 --- a/scripts/py_matter_idl/matter_idl/generators/kotlin/__init__.py +++ b/scripts/py_matter_idl/matter_idl/generators/kotlin/__init__.py @@ -20,11 +20,11 @@ from typing import List, Optional, Set from matter_idl.generators import CodeGenerator, GeneratorStorage +from matter_idl.generators.filters import upfirst from matter_idl.generators.type_definitions import (BasicInteger, BasicString, FundamentalType, IdlBitmapType, IdlEnumType, IdlType, ParseDataType, TypeLookupContext) from matter_idl.matter_idl_types import (Attribute, Cluster, Command, DataType, Field, FieldQuality, Idl, Struct, StructQuality, StructTag) -from stringcase import capitalcase @dataclasses.dataclass @@ -160,7 +160,7 @@ def DelegatedCallbackName(attr: Attribute, context: TypeLookupContext) -> str: if global_name: return 'Delegated{}AttributeCallback'.format(GlobalNameToJavaName(global_name)) - return 'Delegated{}Cluster{}AttributeCallback'.format(context.cluster.name, capitalcase(attr.definition.name)) + return 'Delegated{}Cluster{}AttributeCallback'.format(context.cluster.name, upfirst(attr.definition.name)) def ChipClustersCallbackName(attr: Attribute, context: TypeLookupContext) -> str: @@ -173,7 +173,7 @@ def ChipClustersCallbackName(attr: Attribute, context: TypeLookupContext) -> str if global_name: return 'ChipClusters.{}AttributeCallback'.format(GlobalNameToJavaName(global_name)) - return 'ChipClusters.{}Cluster.{}AttributeCallback'.format(context.cluster.name, capitalcase(attr.definition.name)) + return 'ChipClusters.{}Cluster.{}AttributeCallback'.format(context.cluster.name, upfirst(attr.definition.name)) def CallbackName(attr: Attribute, context: TypeLookupContext) -> str: @@ -189,11 +189,11 @@ def CallbackName(attr: Attribute, context: TypeLookupContext) -> str: global_name = FieldToGlobalName(attr.definition, context) if global_name: - return 'CHIP{}AttributeCallback'.format(capitalcase(global_name)) + return 'CHIP{}AttributeCallback'.format(upfirst(global_name)) return 'CHIP{}{}AttributeCallback'.format( - capitalcase(context.cluster.name), - capitalcase(attr.definition.name) + upfirst(context.cluster.name), + upfirst(attr.definition.name) ) @@ -223,7 +223,7 @@ def JavaAttributeCallbackName(attr: Attribute, context: TypeLookupContext) -> st if global_name: return '{}'.format(GlobalNameToJavaName(global_name)) - return '{}Attribute'.format(capitalcase(attr.definition.name)) + return '{}Attribute'.format(upfirst(attr.definition.name)) def IsFieldGlobalName(field: Field, context: TypeLookupContext) -> bool: diff --git a/scripts/py_matter_idl/matter_idl/test_case_conversion.py b/scripts/py_matter_idl/matter_idl/test_case_conversion.py new file mode 100644 index 00000000000000..7d8381530a1815 --- /dev/null +++ b/scripts/py_matter_idl/matter_idl/test_case_conversion.py @@ -0,0 +1,61 @@ + +import unittest + +import matter_idl.generators.filters as case_convert + +''' +This file contains tests for checking five of the case conversion functions, notably: snake_case, CONSTANT_CASE, spinal-case, PascalCase and camelCase. + + +''' +inputs = [ + "FooBarBaz", + "FOOBarBaz", + "FOOBarBAZ", + "fooBARBaz", + "fooBarBAZ", + "foo BarBaz", + " FooBarBaz ", + "foo_bar_baz", + "FOO-bar-baz", + "FOO_BAR_BAZ", + "__FooBarBaz__", + "_fooBar_Baz_", + "foo_Bar Baz" +] + + +class TestSnakeCase(unittest.TestCase): + def test_snake_case(self): + expected = "foo_bar_baz" + for input in inputs: + converted = case_convert.to_snake_case(input) + self.assertEqual(converted, expected, "they are not equal") + + def test_constant_case(self): + expected = "FOO_BAR_BAZ" + for input in inputs: + converted = case_convert.to_constant_case(input) + self.assertEqual(converted, expected, "they are not equal") + + def test_spinal_case(self): + expected = "foo-bar-baz" + for input in inputs: + converted = case_convert.to_spinal_case(input) + self.assertEqual(converted, expected, "they are not equal") + + def test_pascal_case(self): + expected = "FooBarBaz" + for input in inputs: + converted = case_convert.to_pascal_case(input) + self.assertEqual(converted, expected, "they are not equal") + + def test_camel_case(self): + expected = "fooBarBaz" + for input in inputs: + converted = case_convert.to_camel_case(input) + self.assertEqual(converted, expected, "they are not equal") + + +if __name__ == '__main__': + unittest.main() diff --git a/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/java/ChipStructs.java b/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/java/ChipStructs.java index d3cf1f0c7dae79..70c8bf0e646eee 100644 --- a/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/java/ChipStructs.java +++ b/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/java/ChipStructs.java @@ -32,9 +32,9 @@ public static class SecondClusterFabricDescriptorStruct { public String label; public Integer fabricIndex; private static final long ROOT_PUBLIC_KEY_ID = 1L; - private static final long VENDOR_I_D_ID = 2L; - private static final long FABRIC_I_D_ID = 3L; - private static final long NODE_I_D_ID = 4L; + private static final long VENDOR_ID_ID = 2L; + private static final long FABRIC_ID_ID = 3L; + private static final long NODE_ID_ID = 4L; private static final long LABEL_ID = 5L; private static final long FABRIC_INDEX_ID = 254L; @@ -57,9 +57,9 @@ public SecondClusterFabricDescriptorStruct( public StructType encodeTlv() { ArrayList values = new ArrayList<>(); values.add(new StructElement(ROOT_PUBLIC_KEY_ID, new ByteArrayType(rootPublicKey))); - values.add(new StructElement(VENDOR_I_D_ID, new UIntType(vendorID))); - values.add(new StructElement(FABRIC_I_D_ID, new UIntType(fabricID))); - values.add(new StructElement(NODE_I_D_ID, new UIntType(nodeID))); + values.add(new StructElement(VENDOR_ID_ID, new UIntType(vendorID))); + values.add(new StructElement(FABRIC_ID_ID, new UIntType(fabricID))); + values.add(new StructElement(NODE_ID_ID, new UIntType(nodeID))); values.add(new StructElement(LABEL_ID, new StringType(label))); values.add(new StructElement(FABRIC_INDEX_ID, new UIntType(fabricIndex))); @@ -82,17 +82,17 @@ public static SecondClusterFabricDescriptorStruct decodeTlv(BaseTLVType tlvValue ByteArrayType castingValue = element.value(ByteArrayType.class); rootPublicKey = castingValue.value(byte[].class); } - } else if (element.contextTagNum() == VENDOR_I_D_ID) { + } else if (element.contextTagNum() == VENDOR_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); vendorID = castingValue.value(Integer.class); } - } else if (element.contextTagNum() == FABRIC_I_D_ID) { + } else if (element.contextTagNum() == FABRIC_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); fabricID = castingValue.value(Long.class); } - } else if (element.contextTagNum() == NODE_I_D_ID) { + } else if (element.contextTagNum() == NODE_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); nodeID = castingValue.value(Long.class); diff --git a/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/java/SecondClusterFabricDescriptorStruct.kt b/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/java/SecondClusterFabricDescriptorStruct.kt index 52c46471ae8dc0..cb225d96fdeabf 100644 --- a/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/java/SecondClusterFabricDescriptorStruct.kt +++ b/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/java/SecondClusterFabricDescriptorStruct.kt @@ -48,9 +48,9 @@ class SecondClusterFabricDescriptorStruct ( tlvWriter.apply { startStructure(tlvTag) put(ContextSpecificTag(TAG_ROOT_PUBLIC_KEY), rootPublicKey) - put(ContextSpecificTag(TAG_VENDOR_I_D), vendorID) - put(ContextSpecificTag(TAG_FABRIC_I_D), fabricID) - put(ContextSpecificTag(TAG_NODE_I_D), nodeID) + put(ContextSpecificTag(TAG_VENDOR_ID), vendorID) + put(ContextSpecificTag(TAG_FABRIC_ID), fabricID) + put(ContextSpecificTag(TAG_NODE_ID), nodeID) put(ContextSpecificTag(TAG_LABEL), label) put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex) endStructure() @@ -59,18 +59,18 @@ class SecondClusterFabricDescriptorStruct ( companion object { private const val TAG_ROOT_PUBLIC_KEY = 1 - private const val TAG_VENDOR_I_D = 2 - private const val TAG_FABRIC_I_D = 3 - private const val TAG_NODE_I_D = 4 + private const val TAG_VENDOR_ID = 2 + private const val TAG_FABRIC_ID = 3 + private const val TAG_NODE_ID = 4 private const val TAG_LABEL = 5 private const val TAG_FABRIC_INDEX = 254 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader) : SecondClusterFabricDescriptorStruct { tlvReader.enterStructure(tlvTag) val rootPublicKey = tlvReader.getByteArray(ContextSpecificTag(TAG_ROOT_PUBLIC_KEY)) - val vendorID = tlvReader.getUInt(ContextSpecificTag(TAG_VENDOR_I_D)) - val fabricID = tlvReader.getULong(ContextSpecificTag(TAG_FABRIC_I_D)) - val nodeID = tlvReader.getULong(ContextSpecificTag(TAG_NODE_I_D)) + val vendorID = tlvReader.getUInt(ContextSpecificTag(TAG_VENDOR_ID)) + val fabricID = tlvReader.getULong(ContextSpecificTag(TAG_FABRIC_ID)) + val nodeID = tlvReader.getULong(ContextSpecificTag(TAG_NODE_ID)) val label = tlvReader.getString(ContextSpecificTag(TAG_LABEL)) val fabricIndex = tlvReader.getUInt(ContextSpecificTag(TAG_FABRIC_INDEX)) diff --git a/scripts/py_matter_idl/setup.cfg b/scripts/py_matter_idl/setup.cfg index 6fed9ed20f6523..25f7f6d3bff389 100644 --- a/scripts/py_matter_idl/setup.cfg +++ b/scripts/py_matter_idl/setup.cfg @@ -24,7 +24,6 @@ zip_safe = False install_requires= lark jinja2 - stringcase [options.package_data] matter_idl = diff --git a/scripts/setup/constraints.txt b/scripts/setup/constraints.txt index 3f396a83c7ac68..1b5244314196d6 100644 --- a/scripts/setup/constraints.txt +++ b/scripts/setup/constraints.txt @@ -245,8 +245,6 @@ six==1.16.0 # requests-file stack-data==0.6.2 # via ipython -stringcase==1.2.0 - # via -r requirements.build.txt tabulate==0.9.0 # via -r requirements.memory.txt tornado==6.2 diff --git a/scripts/setup/requirements.build.txt b/scripts/setup/requirements.build.txt index c9e8bad323bd85..e95c4587b9eea1 100644 --- a/scripts/setup/requirements.build.txt +++ b/scripts/setup/requirements.build.txt @@ -11,4 +11,3 @@ click # scripts/py_matter_idl/matter_idl jinja2 lark -stringcase diff --git a/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java b/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java index 8b112f53c6f36d..6f3e6f62d340e7 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java @@ -3963,7 +3963,7 @@ public static class AccessControlCluster extends BaseChipCluster { private static final long SUBJECTS_PER_ACCESS_CONTROL_ENTRY_ATTRIBUTE_ID = 2L; private static final long TARGETS_PER_ACCESS_CONTROL_ENTRY_ATTRIBUTE_ID = 3L; private static final long ACCESS_CONTROL_ENTRIES_PER_FABRIC_ATTRIBUTE_ID = 4L; - private static final long COMMISSIONING_A_R_L_ATTRIBUTE_ID = 5L; + private static final long COMMISSIONING_ARL_ATTRIBUTE_ID = 5L; private static final long ARL_ATTRIBUTE_ID = 6L; private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L; private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L; @@ -4194,7 +4194,7 @@ public void onSuccess(byte[] tlv) { public void readCommissioningARLAttribute( CommissioningARLAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COMMISSIONING_A_R_L_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COMMISSIONING_ARL_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -4202,12 +4202,12 @@ public void onSuccess(byte[] tlv) { List value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, COMMISSIONING_A_R_L_ATTRIBUTE_ID, true); + }, COMMISSIONING_ARL_ATTRIBUTE_ID, true); } public void subscribeCommissioningARLAttribute( CommissioningARLAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COMMISSIONING_A_R_L_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COMMISSIONING_ARL_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -4215,7 +4215,7 @@ public void onSuccess(byte[] tlv) { List value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, COMMISSIONING_A_R_L_ATTRIBUTE_ID, minInterval, maxInterval); + }, COMMISSIONING_ARL_ATTRIBUTE_ID, minInterval, maxInterval); } public void readArlAttribute( @@ -4411,7 +4411,7 @@ public static class ActionsCluster extends BaseChipCluster { private static final long ACTION_LIST_ATTRIBUTE_ID = 0L; private static final long ENDPOINT_LISTS_ATTRIBUTE_ID = 1L; - private static final long SETUP_U_R_L_ATTRIBUTE_ID = 2L; + private static final long SETUP_URL_ATTRIBUTE_ID = 2L; private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L; private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L; private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L; @@ -4815,7 +4815,7 @@ public void onSuccess(byte[] tlv) { public void readSetupURLAttribute( CharStringAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SETUP_U_R_L_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SETUP_URL_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -4823,12 +4823,12 @@ public void onSuccess(byte[] tlv) { String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, SETUP_U_R_L_ATTRIBUTE_ID, true); + }, SETUP_URL_ATTRIBUTE_ID, true); } public void subscribeSetupURLAttribute( CharStringAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SETUP_U_R_L_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SETUP_URL_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -4836,7 +4836,7 @@ public void onSuccess(byte[] tlv) { String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, SETUP_U_R_L_ATTRIBUTE_ID, minInterval, maxInterval); + }, SETUP_URL_ATTRIBUTE_ID, minInterval, maxInterval); } public void readGeneratedCommandListAttribute( @@ -5001,9 +5001,9 @@ public static class BasicInformationCluster extends BaseChipCluster { private static final long DATA_MODEL_REVISION_ATTRIBUTE_ID = 0L; private static final long VENDOR_NAME_ATTRIBUTE_ID = 1L; - private static final long VENDOR_I_D_ATTRIBUTE_ID = 2L; + private static final long VENDOR_ID_ATTRIBUTE_ID = 2L; private static final long PRODUCT_NAME_ATTRIBUTE_ID = 3L; - private static final long PRODUCT_I_D_ATTRIBUTE_ID = 4L; + private static final long PRODUCT_ID_ATTRIBUTE_ID = 4L; private static final long NODE_LABEL_ATTRIBUTE_ID = 5L; private static final long LOCATION_ATTRIBUTE_ID = 6L; private static final long HARDWARE_VERSION_ATTRIBUTE_ID = 7L; @@ -5012,12 +5012,12 @@ public static class BasicInformationCluster extends BaseChipCluster { private static final long SOFTWARE_VERSION_STRING_ATTRIBUTE_ID = 10L; private static final long MANUFACTURING_DATE_ATTRIBUTE_ID = 11L; private static final long PART_NUMBER_ATTRIBUTE_ID = 12L; - private static final long PRODUCT_U_R_L_ATTRIBUTE_ID = 13L; + private static final long PRODUCT_URL_ATTRIBUTE_ID = 13L; private static final long PRODUCT_LABEL_ATTRIBUTE_ID = 14L; private static final long SERIAL_NUMBER_ATTRIBUTE_ID = 15L; private static final long LOCAL_CONFIG_DISABLED_ATTRIBUTE_ID = 16L; private static final long REACHABLE_ATTRIBUTE_ID = 17L; - private static final long UNIQUE_I_D_ATTRIBUTE_ID = 18L; + private static final long UNIQUE_ID_ATTRIBUTE_ID = 18L; private static final long CAPABILITY_MINIMA_ATTRIBUTE_ID = 19L; private static final long PRODUCT_APPEARANCE_ATTRIBUTE_ID = 20L; private static final long SPECIFICATION_VERSION_ATTRIBUTE_ID = 21L; @@ -5133,7 +5133,7 @@ public void onSuccess(byte[] tlv) { public void readVendorIDAttribute( IntegerAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, VENDOR_I_D_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, VENDOR_ID_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -5141,12 +5141,12 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, VENDOR_I_D_ATTRIBUTE_ID, true); + }, VENDOR_ID_ATTRIBUTE_ID, true); } public void subscribeVendorIDAttribute( IntegerAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, VENDOR_I_D_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, VENDOR_ID_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -5154,7 +5154,7 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, VENDOR_I_D_ATTRIBUTE_ID, minInterval, maxInterval); + }, VENDOR_ID_ATTRIBUTE_ID, minInterval, maxInterval); } public void readProductNameAttribute( @@ -5185,7 +5185,7 @@ public void onSuccess(byte[] tlv) { public void readProductIDAttribute( IntegerAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRODUCT_I_D_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRODUCT_ID_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -5193,12 +5193,12 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, PRODUCT_I_D_ATTRIBUTE_ID, true); + }, PRODUCT_ID_ATTRIBUTE_ID, true); } public void subscribeProductIDAttribute( IntegerAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRODUCT_I_D_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRODUCT_ID_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -5206,7 +5206,7 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, PRODUCT_I_D_ATTRIBUTE_ID, minInterval, maxInterval); + }, PRODUCT_ID_ATTRIBUTE_ID, minInterval, maxInterval); } public void readNodeLabelAttribute( @@ -5437,7 +5437,7 @@ public void onSuccess(byte[] tlv) { public void readProductURLAttribute( CharStringAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRODUCT_U_R_L_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRODUCT_URL_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -5445,12 +5445,12 @@ public void onSuccess(byte[] tlv) { String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, PRODUCT_U_R_L_ATTRIBUTE_ID, true); + }, PRODUCT_URL_ATTRIBUTE_ID, true); } public void subscribeProductURLAttribute( CharStringAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRODUCT_U_R_L_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRODUCT_URL_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -5458,7 +5458,7 @@ public void onSuccess(byte[] tlv) { String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, PRODUCT_U_R_L_ATTRIBUTE_ID, minInterval, maxInterval); + }, PRODUCT_URL_ATTRIBUTE_ID, minInterval, maxInterval); } public void readProductLabelAttribute( @@ -5576,7 +5576,7 @@ public void onSuccess(byte[] tlv) { public void readUniqueIDAttribute( CharStringAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNIQUE_I_D_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNIQUE_ID_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -5584,12 +5584,12 @@ public void onSuccess(byte[] tlv) { String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, UNIQUE_I_D_ATTRIBUTE_ID, true); + }, UNIQUE_ID_ATTRIBUTE_ID, true); } public void subscribeUniqueIDAttribute( CharStringAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNIQUE_I_D_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNIQUE_ID_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -5597,7 +5597,7 @@ public void onSuccess(byte[] tlv) { String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, UNIQUE_I_D_ATTRIBUTE_ID, minInterval, maxInterval); + }, UNIQUE_ID_ATTRIBUTE_ID, minInterval, maxInterval); } public void readCapabilityMinimaAttribute( @@ -6237,7 +6237,7 @@ public void onSuccess(byte[] tlv) { public static class OtaSoftwareUpdateRequestorCluster extends BaseChipCluster { public static final long CLUSTER_ID = 42L; - private static final long DEFAULT_O_T_A_PROVIDERS_ATTRIBUTE_ID = 0L; + private static final long DEFAULT_OTA_PROVIDERS_ATTRIBUTE_ID = 0L; private static final long UPDATE_POSSIBLE_ATTRIBUTE_ID = 1L; private static final long UPDATE_STATE_ATTRIBUTE_ID = 2L; private static final long UPDATE_STATE_PROGRESS_ATTRIBUTE_ID = 3L; @@ -6325,7 +6325,7 @@ public void readDefaultOTAProvidersAttribute( public void readDefaultOTAProvidersAttributeWithFabricFilter( DefaultOTAProvidersAttributeCallback callback, boolean isFabricFiltered) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DEFAULT_O_T_A_PROVIDERS_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DEFAULT_OTA_PROVIDERS_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -6333,7 +6333,7 @@ public void onSuccess(byte[] tlv) { List value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, DEFAULT_O_T_A_PROVIDERS_ATTRIBUTE_ID, isFabricFiltered); + }, DEFAULT_OTA_PROVIDERS_ATTRIBUTE_ID, isFabricFiltered); } public void writeDefaultOTAProvidersAttribute(DefaultClusterCallback callback, ArrayList value) { @@ -6342,12 +6342,12 @@ public void writeDefaultOTAProvidersAttribute(DefaultClusterCallback callback, A public void writeDefaultOTAProvidersAttribute(DefaultClusterCallback callback, ArrayList value, int timedWriteTimeoutMs) { BaseTLVType tlvValue = ArrayType.generateArrayType(value, (elementvalue) -> elementvalue.encodeTlv()); - writeAttribute(new WriteAttributesCallbackImpl(callback), DEFAULT_O_T_A_PROVIDERS_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs); + writeAttribute(new WriteAttributesCallbackImpl(callback), DEFAULT_OTA_PROVIDERS_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs); } public void subscribeDefaultOTAProvidersAttribute( DefaultOTAProvidersAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DEFAULT_O_T_A_PROVIDERS_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DEFAULT_OTA_PROVIDERS_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -6355,7 +6355,7 @@ public void onSuccess(byte[] tlv) { List value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, DEFAULT_O_T_A_PROVIDERS_ATTRIBUTE_ID, minInterval, maxInterval); + }, DEFAULT_OTA_PROVIDERS_ATTRIBUTE_ID, minInterval, maxInterval); } public void readUpdatePossibleAttribute( @@ -7626,8 +7626,8 @@ public static class PowerSourceCluster extends BaseChipCluster { private static final long ACTIVE_BAT_FAULTS_ATTRIBUTE_ID = 18L; private static final long BAT_REPLACEMENT_DESCRIPTION_ATTRIBUTE_ID = 19L; private static final long BAT_COMMON_DESIGNATION_ATTRIBUTE_ID = 20L; - private static final long BAT_A_N_S_I_DESIGNATION_ATTRIBUTE_ID = 21L; - private static final long BAT_I_E_C_DESIGNATION_ATTRIBUTE_ID = 22L; + private static final long BAT_ANSI_DESIGNATION_ATTRIBUTE_ID = 21L; + private static final long BAT_IEC_DESIGNATION_ATTRIBUTE_ID = 22L; private static final long BAT_APPROVED_CHEMISTRY_ATTRIBUTE_ID = 23L; private static final long BAT_CAPACITY_ATTRIBUTE_ID = 24L; private static final long BAT_QUANTITY_ATTRIBUTE_ID = 25L; @@ -8266,7 +8266,7 @@ public void onSuccess(byte[] tlv) { public void readBatANSIDesignationAttribute( CharStringAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BAT_A_N_S_I_DESIGNATION_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BAT_ANSI_DESIGNATION_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -8274,12 +8274,12 @@ public void onSuccess(byte[] tlv) { String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, BAT_A_N_S_I_DESIGNATION_ATTRIBUTE_ID, true); + }, BAT_ANSI_DESIGNATION_ATTRIBUTE_ID, true); } public void subscribeBatANSIDesignationAttribute( CharStringAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BAT_A_N_S_I_DESIGNATION_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BAT_ANSI_DESIGNATION_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -8287,12 +8287,12 @@ public void onSuccess(byte[] tlv) { String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, BAT_A_N_S_I_DESIGNATION_ATTRIBUTE_ID, minInterval, maxInterval); + }, BAT_ANSI_DESIGNATION_ATTRIBUTE_ID, minInterval, maxInterval); } public void readBatIECDesignationAttribute( CharStringAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BAT_I_E_C_DESIGNATION_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BAT_IEC_DESIGNATION_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -8300,12 +8300,12 @@ public void onSuccess(byte[] tlv) { String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, BAT_I_E_C_DESIGNATION_ATTRIBUTE_ID, true); + }, BAT_IEC_DESIGNATION_ATTRIBUTE_ID, true); } public void subscribeBatIECDesignationAttribute( CharStringAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BAT_I_E_C_DESIGNATION_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BAT_IEC_DESIGNATION_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -8313,7 +8313,7 @@ public void onSuccess(byte[] tlv) { String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, BAT_I_E_C_DESIGNATION_ATTRIBUTE_ID, minInterval, maxInterval); + }, BAT_IEC_DESIGNATION_ATTRIBUTE_ID, minInterval, maxInterval); } public void readBatApprovedChemistryAttribute( @@ -8715,10 +8715,10 @@ public static class GeneralCommissioningCluster extends BaseChipCluster { private static final long REGULATORY_CONFIG_ATTRIBUTE_ID = 2L; private static final long LOCATION_CAPABILITY_ATTRIBUTE_ID = 3L; private static final long SUPPORTS_CONCURRENT_CONNECTION_ATTRIBUTE_ID = 4L; - private static final long T_C_ACCEPTED_VERSION_ATTRIBUTE_ID = 5L; - private static final long T_C_MIN_REQUIRED_VERSION_ATTRIBUTE_ID = 6L; - private static final long T_C_ACKNOWLEDGEMENTS_ATTRIBUTE_ID = 7L; - private static final long T_C_ACKNOWLEDGEMENTS_REQUIRED_ATTRIBUTE_ID = 8L; + private static final long TC_ACCEPTED_VERSION_ATTRIBUTE_ID = 5L; + private static final long TC_MIN_REQUIRED_VERSION_ATTRIBUTE_ID = 6L; + private static final long TC_ACKNOWLEDGEMENTS_ATTRIBUTE_ID = 7L; + private static final long TC_ACKNOWLEDGEMENTS_REQUIRED_ATTRIBUTE_ID = 8L; private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L; private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L; private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L; @@ -9066,7 +9066,7 @@ public void onSuccess(byte[] tlv) { public void readTCAcceptedVersionAttribute( IntegerAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, T_C_ACCEPTED_VERSION_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TC_ACCEPTED_VERSION_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -9074,12 +9074,12 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, T_C_ACCEPTED_VERSION_ATTRIBUTE_ID, true); + }, TC_ACCEPTED_VERSION_ATTRIBUTE_ID, true); } public void subscribeTCAcceptedVersionAttribute( IntegerAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, T_C_ACCEPTED_VERSION_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TC_ACCEPTED_VERSION_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -9087,12 +9087,12 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, T_C_ACCEPTED_VERSION_ATTRIBUTE_ID, minInterval, maxInterval); + }, TC_ACCEPTED_VERSION_ATTRIBUTE_ID, minInterval, maxInterval); } public void readTCMinRequiredVersionAttribute( IntegerAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, T_C_MIN_REQUIRED_VERSION_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TC_MIN_REQUIRED_VERSION_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -9100,12 +9100,12 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, T_C_MIN_REQUIRED_VERSION_ATTRIBUTE_ID, true); + }, TC_MIN_REQUIRED_VERSION_ATTRIBUTE_ID, true); } public void subscribeTCMinRequiredVersionAttribute( IntegerAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, T_C_MIN_REQUIRED_VERSION_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TC_MIN_REQUIRED_VERSION_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -9113,12 +9113,12 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, T_C_MIN_REQUIRED_VERSION_ATTRIBUTE_ID, minInterval, maxInterval); + }, TC_MIN_REQUIRED_VERSION_ATTRIBUTE_ID, minInterval, maxInterval); } public void readTCAcknowledgementsAttribute( IntegerAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, T_C_ACKNOWLEDGEMENTS_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TC_ACKNOWLEDGEMENTS_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -9126,12 +9126,12 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, T_C_ACKNOWLEDGEMENTS_ATTRIBUTE_ID, true); + }, TC_ACKNOWLEDGEMENTS_ATTRIBUTE_ID, true); } public void subscribeTCAcknowledgementsAttribute( IntegerAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, T_C_ACKNOWLEDGEMENTS_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TC_ACKNOWLEDGEMENTS_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -9139,12 +9139,12 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, T_C_ACKNOWLEDGEMENTS_ATTRIBUTE_ID, minInterval, maxInterval); + }, TC_ACKNOWLEDGEMENTS_ATTRIBUTE_ID, minInterval, maxInterval); } public void readTCAcknowledgementsRequiredAttribute( BooleanAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, T_C_ACKNOWLEDGEMENTS_REQUIRED_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TC_ACKNOWLEDGEMENTS_REQUIRED_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -9152,12 +9152,12 @@ public void onSuccess(byte[] tlv) { Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, T_C_ACKNOWLEDGEMENTS_REQUIRED_ATTRIBUTE_ID, true); + }, TC_ACKNOWLEDGEMENTS_REQUIRED_ATTRIBUTE_ID, true); } public void subscribeTCAcknowledgementsRequiredAttribute( BooleanAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, T_C_ACKNOWLEDGEMENTS_REQUIRED_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TC_ACKNOWLEDGEMENTS_REQUIRED_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -9165,7 +9165,7 @@ public void onSuccess(byte[] tlv) { Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, T_C_ACKNOWLEDGEMENTS_REQUIRED_ATTRIBUTE_ID, minInterval, maxInterval); + }, TC_ACKNOWLEDGEMENTS_REQUIRED_ATTRIBUTE_ID, minInterval, maxInterval); } public void readGeneratedCommandListAttribute( @@ -9334,7 +9334,7 @@ public static class NetworkCommissioningCluster extends BaseChipCluster { private static final long CONNECT_MAX_TIME_SECONDS_ATTRIBUTE_ID = 3L; private static final long INTERFACE_ENABLED_ATTRIBUTE_ID = 4L; private static final long LAST_NETWORKING_STATUS_ATTRIBUTE_ID = 5L; - private static final long LAST_NETWORK_I_D_ATTRIBUTE_ID = 6L; + private static final long LAST_NETWORK_ID_ATTRIBUTE_ID = 6L; private static final long LAST_CONNECT_ERROR_VALUE_ATTRIBUTE_ID = 7L; private static final long SUPPORTED_WI_FI_BANDS_ATTRIBUTE_ID = 8L; private static final long SUPPORTED_THREAD_FEATURES_ATTRIBUTE_ID = 9L; @@ -9987,7 +9987,7 @@ public void onSuccess(byte[] tlv) { public void readLastNetworkIDAttribute( LastNetworkIDAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LAST_NETWORK_I_D_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LAST_NETWORK_ID_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -9995,12 +9995,12 @@ public void onSuccess(byte[] tlv) { @Nullable byte[] value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, LAST_NETWORK_I_D_ATTRIBUTE_ID, true); + }, LAST_NETWORK_ID_ATTRIBUTE_ID, true); } public void subscribeLastNetworkIDAttribute( LastNetworkIDAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LAST_NETWORK_I_D_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LAST_NETWORK_ID_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -10008,7 +10008,7 @@ public void onSuccess(byte[] tlv) { @Nullable byte[] value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, LAST_NETWORK_I_D_ATTRIBUTE_ID, minInterval, maxInterval); + }, LAST_NETWORK_ID_ATTRIBUTE_ID, minInterval, maxInterval); } public void readLastConnectErrorValueAttribute( @@ -14009,7 +14009,7 @@ public void onSuccess(byte[] tlv) { public static class EthernetNetworkDiagnosticsCluster extends BaseChipCluster { public static final long CLUSTER_ID = 55L; - private static final long P_H_Y_RATE_ATTRIBUTE_ID = 0L; + private static final long PHY_RATE_ATTRIBUTE_ID = 0L; private static final long FULL_DUPLEX_ATTRIBUTE_ID = 1L; private static final long PACKET_RX_COUNT_ATTRIBUTE_ID = 2L; private static final long PACKET_TX_COUNT_ATTRIBUTE_ID = 3L; @@ -14081,7 +14081,7 @@ public interface AttributeListAttributeCallback extends BaseAttributeCallback { public void readPHYRateAttribute( PHYRateAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, P_H_Y_RATE_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PHY_RATE_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -14089,12 +14089,12 @@ public void onSuccess(byte[] tlv) { @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, P_H_Y_RATE_ATTRIBUTE_ID, true); + }, PHY_RATE_ATTRIBUTE_ID, true); } public void subscribePHYRateAttribute( PHYRateAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, P_H_Y_RATE_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PHY_RATE_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -14102,7 +14102,7 @@ public void onSuccess(byte[] tlv) { @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, P_H_Y_RATE_ATTRIBUTE_ID, minInterval, maxInterval); + }, PHY_RATE_ATTRIBUTE_ID, minInterval, maxInterval); } public void readFullDuplexAttribute( @@ -14473,19 +14473,19 @@ public void onSuccess(byte[] tlv) { public static class TimeSynchronizationCluster extends BaseChipCluster { public static final long CLUSTER_ID = 56L; - private static final long U_T_C_TIME_ATTRIBUTE_ID = 0L; + private static final long UTC_TIME_ATTRIBUTE_ID = 0L; private static final long GRANULARITY_ATTRIBUTE_ID = 1L; private static final long TIME_SOURCE_ATTRIBUTE_ID = 2L; private static final long TRUSTED_TIME_SOURCE_ATTRIBUTE_ID = 3L; - private static final long DEFAULT_N_T_P_ATTRIBUTE_ID = 4L; + private static final long DEFAULT_NTP_ATTRIBUTE_ID = 4L; private static final long TIME_ZONE_ATTRIBUTE_ID = 5L; - private static final long D_S_T_OFFSET_ATTRIBUTE_ID = 6L; + private static final long DST_OFFSET_ATTRIBUTE_ID = 6L; private static final long LOCAL_TIME_ATTRIBUTE_ID = 7L; private static final long TIME_ZONE_DATABASE_ATTRIBUTE_ID = 8L; - private static final long N_T_P_SERVER_AVAILABLE_ATTRIBUTE_ID = 9L; + private static final long NTP_SERVER_AVAILABLE_ATTRIBUTE_ID = 9L; private static final long TIME_ZONE_LIST_MAX_SIZE_ATTRIBUTE_ID = 10L; - private static final long D_S_T_OFFSET_LIST_MAX_SIZE_ATTRIBUTE_ID = 11L; - private static final long SUPPORTS_D_N_S_RESOLVE_ATTRIBUTE_ID = 12L; + private static final long DST_OFFSET_LIST_MAX_SIZE_ATTRIBUTE_ID = 11L; + private static final long SUPPORTS_DNS_RESOLVE_ATTRIBUTE_ID = 12L; private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L; private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L; private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L; @@ -14667,7 +14667,7 @@ public interface AttributeListAttributeCallback extends BaseAttributeCallback { public void readUTCTimeAttribute( UTCTimeAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, U_T_C_TIME_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UTC_TIME_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -14675,12 +14675,12 @@ public void onSuccess(byte[] tlv) { @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, U_T_C_TIME_ATTRIBUTE_ID, true); + }, UTC_TIME_ATTRIBUTE_ID, true); } public void subscribeUTCTimeAttribute( UTCTimeAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, U_T_C_TIME_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UTC_TIME_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -14688,7 +14688,7 @@ public void onSuccess(byte[] tlv) { @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, U_T_C_TIME_ATTRIBUTE_ID, minInterval, maxInterval); + }, UTC_TIME_ATTRIBUTE_ID, minInterval, maxInterval); } public void readGranularityAttribute( @@ -14771,7 +14771,7 @@ public void onSuccess(byte[] tlv) { public void readDefaultNTPAttribute( DefaultNTPAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DEFAULT_N_T_P_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DEFAULT_NTP_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -14779,12 +14779,12 @@ public void onSuccess(byte[] tlv) { @Nullable String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, DEFAULT_N_T_P_ATTRIBUTE_ID, true); + }, DEFAULT_NTP_ATTRIBUTE_ID, true); } public void subscribeDefaultNTPAttribute( DefaultNTPAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DEFAULT_N_T_P_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DEFAULT_NTP_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -14792,7 +14792,7 @@ public void onSuccess(byte[] tlv) { @Nullable String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, DEFAULT_N_T_P_ATTRIBUTE_ID, minInterval, maxInterval); + }, DEFAULT_NTP_ATTRIBUTE_ID, minInterval, maxInterval); } public void readTimeZoneAttribute( @@ -14823,7 +14823,7 @@ public void onSuccess(byte[] tlv) { public void readDSTOffsetAttribute( DSTOffsetAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, D_S_T_OFFSET_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DST_OFFSET_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -14831,12 +14831,12 @@ public void onSuccess(byte[] tlv) { List value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, D_S_T_OFFSET_ATTRIBUTE_ID, true); + }, DST_OFFSET_ATTRIBUTE_ID, true); } public void subscribeDSTOffsetAttribute( DSTOffsetAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, D_S_T_OFFSET_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DST_OFFSET_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -14844,7 +14844,7 @@ public void onSuccess(byte[] tlv) { List value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, D_S_T_OFFSET_ATTRIBUTE_ID, minInterval, maxInterval); + }, DST_OFFSET_ATTRIBUTE_ID, minInterval, maxInterval); } public void readLocalTimeAttribute( @@ -14901,7 +14901,7 @@ public void onSuccess(byte[] tlv) { public void readNTPServerAvailableAttribute( BooleanAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, N_T_P_SERVER_AVAILABLE_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NTP_SERVER_AVAILABLE_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -14909,12 +14909,12 @@ public void onSuccess(byte[] tlv) { Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, N_T_P_SERVER_AVAILABLE_ATTRIBUTE_ID, true); + }, NTP_SERVER_AVAILABLE_ATTRIBUTE_ID, true); } public void subscribeNTPServerAvailableAttribute( BooleanAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, N_T_P_SERVER_AVAILABLE_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NTP_SERVER_AVAILABLE_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -14922,7 +14922,7 @@ public void onSuccess(byte[] tlv) { Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, N_T_P_SERVER_AVAILABLE_ATTRIBUTE_ID, minInterval, maxInterval); + }, NTP_SERVER_AVAILABLE_ATTRIBUTE_ID, minInterval, maxInterval); } public void readTimeZoneListMaxSizeAttribute( @@ -14953,7 +14953,7 @@ public void onSuccess(byte[] tlv) { public void readDSTOffsetListMaxSizeAttribute( IntegerAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, D_S_T_OFFSET_LIST_MAX_SIZE_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DST_OFFSET_LIST_MAX_SIZE_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -14961,12 +14961,12 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, D_S_T_OFFSET_LIST_MAX_SIZE_ATTRIBUTE_ID, true); + }, DST_OFFSET_LIST_MAX_SIZE_ATTRIBUTE_ID, true); } public void subscribeDSTOffsetListMaxSizeAttribute( IntegerAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, D_S_T_OFFSET_LIST_MAX_SIZE_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DST_OFFSET_LIST_MAX_SIZE_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -14974,12 +14974,12 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, D_S_T_OFFSET_LIST_MAX_SIZE_ATTRIBUTE_ID, minInterval, maxInterval); + }, DST_OFFSET_LIST_MAX_SIZE_ATTRIBUTE_ID, minInterval, maxInterval); } public void readSupportsDNSResolveAttribute( BooleanAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTS_D_N_S_RESOLVE_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTS_DNS_RESOLVE_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -14987,12 +14987,12 @@ public void onSuccess(byte[] tlv) { Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, SUPPORTS_D_N_S_RESOLVE_ATTRIBUTE_ID, true); + }, SUPPORTS_DNS_RESOLVE_ATTRIBUTE_ID, true); } public void subscribeSupportsDNSResolveAttribute( BooleanAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTS_D_N_S_RESOLVE_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTS_DNS_RESOLVE_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -15000,7 +15000,7 @@ public void onSuccess(byte[] tlv) { Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, SUPPORTS_D_N_S_RESOLVE_ATTRIBUTE_ID, minInterval, maxInterval); + }, SUPPORTS_DNS_RESOLVE_ATTRIBUTE_ID, minInterval, maxInterval); } public void readGeneratedCommandListAttribute( @@ -15164,9 +15164,9 @@ public static class BridgedDeviceBasicInformationCluster extends BaseChipCluster public static final long CLUSTER_ID = 57L; private static final long VENDOR_NAME_ATTRIBUTE_ID = 1L; - private static final long VENDOR_I_D_ATTRIBUTE_ID = 2L; + private static final long VENDOR_ID_ATTRIBUTE_ID = 2L; private static final long PRODUCT_NAME_ATTRIBUTE_ID = 3L; - private static final long PRODUCT_I_D_ATTRIBUTE_ID = 4L; + private static final long PRODUCT_ID_ATTRIBUTE_ID = 4L; private static final long NODE_LABEL_ATTRIBUTE_ID = 5L; private static final long HARDWARE_VERSION_ATTRIBUTE_ID = 7L; private static final long HARDWARE_VERSION_STRING_ATTRIBUTE_ID = 8L; @@ -15174,11 +15174,11 @@ public static class BridgedDeviceBasicInformationCluster extends BaseChipCluster private static final long SOFTWARE_VERSION_STRING_ATTRIBUTE_ID = 10L; private static final long MANUFACTURING_DATE_ATTRIBUTE_ID = 11L; private static final long PART_NUMBER_ATTRIBUTE_ID = 12L; - private static final long PRODUCT_U_R_L_ATTRIBUTE_ID = 13L; + private static final long PRODUCT_URL_ATTRIBUTE_ID = 13L; private static final long PRODUCT_LABEL_ATTRIBUTE_ID = 14L; private static final long SERIAL_NUMBER_ATTRIBUTE_ID = 15L; private static final long REACHABLE_ATTRIBUTE_ID = 17L; - private static final long UNIQUE_I_D_ATTRIBUTE_ID = 18L; + private static final long UNIQUE_ID_ATTRIBUTE_ID = 18L; private static final long PRODUCT_APPEARANCE_ATTRIBUTE_ID = 20L; private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L; private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L; @@ -15265,7 +15265,7 @@ public void onSuccess(byte[] tlv) { public void readVendorIDAttribute( IntegerAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, VENDOR_I_D_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, VENDOR_ID_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -15273,12 +15273,12 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, VENDOR_I_D_ATTRIBUTE_ID, true); + }, VENDOR_ID_ATTRIBUTE_ID, true); } public void subscribeVendorIDAttribute( IntegerAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, VENDOR_I_D_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, VENDOR_ID_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -15286,7 +15286,7 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, VENDOR_I_D_ATTRIBUTE_ID, minInterval, maxInterval); + }, VENDOR_ID_ATTRIBUTE_ID, minInterval, maxInterval); } public void readProductNameAttribute( @@ -15317,7 +15317,7 @@ public void onSuccess(byte[] tlv) { public void readProductIDAttribute( IntegerAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRODUCT_I_D_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRODUCT_ID_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -15325,12 +15325,12 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, PRODUCT_I_D_ATTRIBUTE_ID, true); + }, PRODUCT_ID_ATTRIBUTE_ID, true); } public void subscribeProductIDAttribute( IntegerAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRODUCT_I_D_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRODUCT_ID_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -15338,7 +15338,7 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, PRODUCT_I_D_ATTRIBUTE_ID, minInterval, maxInterval); + }, PRODUCT_ID_ATTRIBUTE_ID, minInterval, maxInterval); } public void readNodeLabelAttribute( @@ -15534,7 +15534,7 @@ public void onSuccess(byte[] tlv) { public void readProductURLAttribute( CharStringAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRODUCT_U_R_L_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRODUCT_URL_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -15542,12 +15542,12 @@ public void onSuccess(byte[] tlv) { String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, PRODUCT_U_R_L_ATTRIBUTE_ID, true); + }, PRODUCT_URL_ATTRIBUTE_ID, true); } public void subscribeProductURLAttribute( CharStringAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRODUCT_U_R_L_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRODUCT_URL_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -15555,7 +15555,7 @@ public void onSuccess(byte[] tlv) { String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, PRODUCT_U_R_L_ATTRIBUTE_ID, minInterval, maxInterval); + }, PRODUCT_URL_ATTRIBUTE_ID, minInterval, maxInterval); } public void readProductLabelAttribute( @@ -15638,7 +15638,7 @@ public void onSuccess(byte[] tlv) { public void readUniqueIDAttribute( CharStringAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNIQUE_I_D_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNIQUE_ID_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -15646,12 +15646,12 @@ public void onSuccess(byte[] tlv) { String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, UNIQUE_I_D_ATTRIBUTE_ID, true); + }, UNIQUE_ID_ATTRIBUTE_ID, true); } public void subscribeUniqueIDAttribute( CharStringAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNIQUE_I_D_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNIQUE_ID_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -15659,7 +15659,7 @@ public void onSuccess(byte[] tlv) { String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, UNIQUE_I_D_ATTRIBUTE_ID, minInterval, maxInterval); + }, UNIQUE_ID_ATTRIBUTE_ID, minInterval, maxInterval); } public void readProductAppearanceAttribute( @@ -16467,7 +16467,7 @@ public void onSuccess(byte[] tlv) { public static class OperationalCredentialsCluster extends BaseChipCluster { public static final long CLUSTER_ID = 62L; - private static final long N_O_CS_ATTRIBUTE_ID = 0L; + private static final long NO_CS_ATTRIBUTE_ID = 0L; private static final long FABRICS_ATTRIBUTE_ID = 1L; private static final long SUPPORTED_FABRICS_ATTRIBUTE_ID = 2L; private static final long COMMISSIONED_FABRICS_ATTRIBUTE_ID = 3L; @@ -16865,7 +16865,7 @@ public void readNOCsAttribute( public void readNOCsAttributeWithFabricFilter( NOCsAttributeCallback callback, boolean isFabricFiltered) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, N_O_CS_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NO_CS_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -16873,12 +16873,12 @@ public void onSuccess(byte[] tlv) { List value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, N_O_CS_ATTRIBUTE_ID, isFabricFiltered); + }, NO_CS_ATTRIBUTE_ID, isFabricFiltered); } public void subscribeNOCsAttribute( NOCsAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, N_O_CS_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NO_CS_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -16886,7 +16886,7 @@ public void onSuccess(byte[] tlv) { List value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, N_O_CS_ATTRIBUTE_ID, minInterval, maxInterval); + }, NO_CS_ATTRIBUTE_ID, minInterval, maxInterval); } public void readFabricsAttribute( @@ -18876,7 +18876,7 @@ public static class IcdManagementCluster extends BaseChipCluster { private static final long ACTIVE_MODE_DURATION_ATTRIBUTE_ID = 1L; private static final long ACTIVE_MODE_THRESHOLD_ATTRIBUTE_ID = 2L; private static final long REGISTERED_CLIENTS_ATTRIBUTE_ID = 3L; - private static final long I_C_D_COUNTER_ATTRIBUTE_ID = 4L; + private static final long ICD_COUNTER_ATTRIBUTE_ID = 4L; private static final long CLIENTS_SUPPORTED_PER_FABRIC_ATTRIBUTE_ID = 5L; private static final long USER_ACTIVE_MODE_TRIGGER_HINT_ATTRIBUTE_ID = 6L; private static final long USER_ACTIVE_MODE_TRIGGER_INSTRUCTION_ATTRIBUTE_ID = 7L; @@ -19138,7 +19138,7 @@ public void onSuccess(byte[] tlv) { public void readICDCounterAttribute( LongAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, I_C_D_COUNTER_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ICD_COUNTER_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -19146,12 +19146,12 @@ public void onSuccess(byte[] tlv) { Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, I_C_D_COUNTER_ATTRIBUTE_ID, true); + }, ICD_COUNTER_ATTRIBUTE_ID, true); } public void subscribeICDCounterAttribute( LongAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, I_C_D_COUNTER_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ICD_COUNTER_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -19159,7 +19159,7 @@ public void onSuccess(byte[] tlv) { Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, I_C_D_COUNTER_ATTRIBUTE_ID, minInterval, maxInterval); + }, ICD_COUNTER_ATTRIBUTE_ID, minInterval, maxInterval); } public void readClientsSupportedPerFabricAttribute( @@ -24240,14 +24240,14 @@ public static class SmokeCoAlarmCluster extends BaseChipCluster { private static final long EXPRESSED_STATE_ATTRIBUTE_ID = 0L; private static final long SMOKE_STATE_ATTRIBUTE_ID = 1L; - private static final long C_O_STATE_ATTRIBUTE_ID = 2L; + private static final long CO_STATE_ATTRIBUTE_ID = 2L; private static final long BATTERY_ALERT_ATTRIBUTE_ID = 3L; private static final long DEVICE_MUTED_ATTRIBUTE_ID = 4L; private static final long TEST_IN_PROGRESS_ATTRIBUTE_ID = 5L; private static final long HARDWARE_FAULT_ALERT_ATTRIBUTE_ID = 6L; private static final long END_OF_SERVICE_ALERT_ATTRIBUTE_ID = 7L; private static final long INTERCONNECT_SMOKE_ALARM_ATTRIBUTE_ID = 8L; - private static final long INTERCONNECT_C_O_ALARM_ATTRIBUTE_ID = 9L; + private static final long INTERCONNECT_CO_ALARM_ATTRIBUTE_ID = 9L; private static final long CONTAMINATION_STATE_ATTRIBUTE_ID = 10L; private static final long SMOKE_SENSITIVITY_LEVEL_ATTRIBUTE_ID = 11L; private static final long EXPIRY_DATE_ATTRIBUTE_ID = 12L; @@ -24354,7 +24354,7 @@ public void onSuccess(byte[] tlv) { public void readCOStateAttribute( IntegerAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, C_O_STATE_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CO_STATE_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -24362,12 +24362,12 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, C_O_STATE_ATTRIBUTE_ID, true); + }, CO_STATE_ATTRIBUTE_ID, true); } public void subscribeCOStateAttribute( IntegerAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, C_O_STATE_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CO_STATE_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -24375,7 +24375,7 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, C_O_STATE_ATTRIBUTE_ID, minInterval, maxInterval); + }, CO_STATE_ATTRIBUTE_ID, minInterval, maxInterval); } public void readBatteryAlertAttribute( @@ -24536,7 +24536,7 @@ public void onSuccess(byte[] tlv) { public void readInterconnectCOAlarmAttribute( IntegerAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INTERCONNECT_C_O_ALARM_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INTERCONNECT_CO_ALARM_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -24544,12 +24544,12 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, INTERCONNECT_C_O_ALARM_ATTRIBUTE_ID, true); + }, INTERCONNECT_CO_ALARM_ATTRIBUTE_ID, true); } public void subscribeInterconnectCOAlarmAttribute( IntegerAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INTERCONNECT_C_O_ALARM_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INTERCONNECT_CO_ALARM_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -24557,7 +24557,7 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, INTERCONNECT_C_O_ALARM_ATTRIBUTE_ID, minInterval, maxInterval); + }, INTERCONNECT_CO_ALARM_ATTRIBUTE_ID, minInterval, maxInterval); } public void readContaminationStateAttribute( @@ -29376,9 +29376,9 @@ public static class ElectricalPowerMeasurementCluster extends BaseChipCluster { private static final long ACTIVE_POWER_ATTRIBUTE_ID = 8L; private static final long REACTIVE_POWER_ATTRIBUTE_ID = 9L; private static final long APPARENT_POWER_ATTRIBUTE_ID = 10L; - private static final long R_M_S_VOLTAGE_ATTRIBUTE_ID = 11L; - private static final long R_M_S_CURRENT_ATTRIBUTE_ID = 12L; - private static final long R_M_S_POWER_ATTRIBUTE_ID = 13L; + private static final long RMS_VOLTAGE_ATTRIBUTE_ID = 11L; + private static final long RMS_CURRENT_ATTRIBUTE_ID = 12L; + private static final long RMS_POWER_ATTRIBUTE_ID = 13L; private static final long FREQUENCY_ATTRIBUTE_ID = 14L; private static final long HARMONIC_CURRENTS_ATTRIBUTE_ID = 15L; private static final long HARMONIC_PHASES_ATTRIBUTE_ID = 16L; @@ -29773,7 +29773,7 @@ public void onSuccess(byte[] tlv) { public void readRMSVoltageAttribute( RMSVoltageAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, R_M_S_VOLTAGE_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_VOLTAGE_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -29781,12 +29781,12 @@ public void onSuccess(byte[] tlv) { @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, R_M_S_VOLTAGE_ATTRIBUTE_ID, true); + }, RMS_VOLTAGE_ATTRIBUTE_ID, true); } public void subscribeRMSVoltageAttribute( RMSVoltageAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, R_M_S_VOLTAGE_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_VOLTAGE_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -29794,12 +29794,12 @@ public void onSuccess(byte[] tlv) { @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, R_M_S_VOLTAGE_ATTRIBUTE_ID, minInterval, maxInterval); + }, RMS_VOLTAGE_ATTRIBUTE_ID, minInterval, maxInterval); } public void readRMSCurrentAttribute( RMSCurrentAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, R_M_S_CURRENT_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_CURRENT_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -29807,12 +29807,12 @@ public void onSuccess(byte[] tlv) { @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, R_M_S_CURRENT_ATTRIBUTE_ID, true); + }, RMS_CURRENT_ATTRIBUTE_ID, true); } public void subscribeRMSCurrentAttribute( RMSCurrentAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, R_M_S_CURRENT_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_CURRENT_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -29820,12 +29820,12 @@ public void onSuccess(byte[] tlv) { @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, R_M_S_CURRENT_ATTRIBUTE_ID, minInterval, maxInterval); + }, RMS_CURRENT_ATTRIBUTE_ID, minInterval, maxInterval); } public void readRMSPowerAttribute( RMSPowerAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, R_M_S_POWER_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_POWER_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -29833,12 +29833,12 @@ public void onSuccess(byte[] tlv) { @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, R_M_S_POWER_ATTRIBUTE_ID, true); + }, RMS_POWER_ATTRIBUTE_ID, true); } public void subscribeRMSPowerAttribute( RMSPowerAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, R_M_S_POWER_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RMS_POWER_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -29846,7 +29846,7 @@ public void onSuccess(byte[] tlv) { @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, R_M_S_POWER_ATTRIBUTE_ID, minInterval, maxInterval); + }, RMS_POWER_ATTRIBUTE_ID, minInterval, maxInterval); } public void readFrequencyAttribute( @@ -31767,9 +31767,9 @@ public void onSuccess(byte[] tlv) { public static class DeviceEnergyManagementCluster extends BaseChipCluster { public static final long CLUSTER_ID = 152L; - private static final long E_S_A_TYPE_ATTRIBUTE_ID = 0L; - private static final long E_S_A_CAN_GENERATE_ATTRIBUTE_ID = 1L; - private static final long E_S_A_STATE_ATTRIBUTE_ID = 2L; + private static final long ESA_TYPE_ATTRIBUTE_ID = 0L; + private static final long ESA_CAN_GENERATE_ATTRIBUTE_ID = 1L; + private static final long ESA_STATE_ATTRIBUTE_ID = 2L; private static final long ABS_MIN_POWER_ATTRIBUTE_ID = 3L; private static final long ABS_MAX_POWER_ATTRIBUTE_ID = 4L; private static final long POWER_ADJUSTMENT_CAPABILITY_ATTRIBUTE_ID = 5L; @@ -31994,7 +31994,7 @@ public interface AttributeListAttributeCallback extends BaseAttributeCallback { public void readESATypeAttribute( IntegerAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, E_S_A_TYPE_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ESA_TYPE_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -32002,12 +32002,12 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, E_S_A_TYPE_ATTRIBUTE_ID, true); + }, ESA_TYPE_ATTRIBUTE_ID, true); } public void subscribeESATypeAttribute( IntegerAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, E_S_A_TYPE_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ESA_TYPE_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -32015,12 +32015,12 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, E_S_A_TYPE_ATTRIBUTE_ID, minInterval, maxInterval); + }, ESA_TYPE_ATTRIBUTE_ID, minInterval, maxInterval); } public void readESACanGenerateAttribute( BooleanAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, E_S_A_CAN_GENERATE_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ESA_CAN_GENERATE_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -32028,12 +32028,12 @@ public void onSuccess(byte[] tlv) { Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, E_S_A_CAN_GENERATE_ATTRIBUTE_ID, true); + }, ESA_CAN_GENERATE_ATTRIBUTE_ID, true); } public void subscribeESACanGenerateAttribute( BooleanAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, E_S_A_CAN_GENERATE_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ESA_CAN_GENERATE_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -32041,12 +32041,12 @@ public void onSuccess(byte[] tlv) { Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, E_S_A_CAN_GENERATE_ATTRIBUTE_ID, minInterval, maxInterval); + }, ESA_CAN_GENERATE_ATTRIBUTE_ID, minInterval, maxInterval); } public void readESAStateAttribute( IntegerAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, E_S_A_STATE_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ESA_STATE_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -32054,12 +32054,12 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, E_S_A_STATE_ATTRIBUTE_ID, true); + }, ESA_STATE_ATTRIBUTE_ID, true); } public void subscribeESAStateAttribute( IntegerAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, E_S_A_STATE_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ESA_STATE_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -32067,7 +32067,7 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, E_S_A_STATE_ATTRIBUTE_ID, minInterval, maxInterval); + }, ESA_STATE_ATTRIBUTE_ID, minInterval, maxInterval); } public void readAbsMinPowerAttribute( @@ -32375,11 +32375,11 @@ public static class EnergyEvseCluster extends BaseChipCluster { private static final long NEXT_CHARGE_TARGET_TIME_ATTRIBUTE_ID = 36L; private static final long NEXT_CHARGE_REQUIRED_ENERGY_ATTRIBUTE_ID = 37L; private static final long NEXT_CHARGE_TARGET_SO_C_ATTRIBUTE_ID = 38L; - private static final long APPROXIMATE_E_V_EFFICIENCY_ATTRIBUTE_ID = 39L; + private static final long APPROXIMATE_EV_EFFICIENCY_ATTRIBUTE_ID = 39L; private static final long STATE_OF_CHARGE_ATTRIBUTE_ID = 48L; private static final long BATTERY_CAPACITY_ATTRIBUTE_ID = 49L; - private static final long VEHICLE_I_D_ATTRIBUTE_ID = 50L; - private static final long SESSION_I_D_ATTRIBUTE_ID = 64L; + private static final long VEHICLE_ID_ATTRIBUTE_ID = 50L; + private static final long SESSION_ID_ATTRIBUTE_ID = 64L; private static final long SESSION_DURATION_ATTRIBUTE_ID = 65L; private static final long SESSION_ENERGY_CHARGED_ATTRIBUTE_ID = 66L; private static final long SESSION_ENERGY_DISCHARGED_ATTRIBUTE_ID = 67L; @@ -33015,7 +33015,7 @@ public void onSuccess(byte[] tlv) { public void readApproximateEVEfficiencyAttribute( ApproximateEVEfficiencyAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, APPROXIMATE_E_V_EFFICIENCY_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, APPROXIMATE_EV_EFFICIENCY_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -33023,7 +33023,7 @@ public void onSuccess(byte[] tlv) { @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, APPROXIMATE_E_V_EFFICIENCY_ATTRIBUTE_ID, true); + }, APPROXIMATE_EV_EFFICIENCY_ATTRIBUTE_ID, true); } public void writeApproximateEVEfficiencyAttribute(DefaultClusterCallback callback, Integer value) { @@ -33032,12 +33032,12 @@ public void writeApproximateEVEfficiencyAttribute(DefaultClusterCallback callbac public void writeApproximateEVEfficiencyAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) { BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType(); - writeAttribute(new WriteAttributesCallbackImpl(callback), APPROXIMATE_E_V_EFFICIENCY_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs); + writeAttribute(new WriteAttributesCallbackImpl(callback), APPROXIMATE_EV_EFFICIENCY_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs); } public void subscribeApproximateEVEfficiencyAttribute( ApproximateEVEfficiencyAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, APPROXIMATE_E_V_EFFICIENCY_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, APPROXIMATE_EV_EFFICIENCY_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -33045,7 +33045,7 @@ public void onSuccess(byte[] tlv) { @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, APPROXIMATE_E_V_EFFICIENCY_ATTRIBUTE_ID, minInterval, maxInterval); + }, APPROXIMATE_EV_EFFICIENCY_ATTRIBUTE_ID, minInterval, maxInterval); } public void readStateOfChargeAttribute( @@ -33102,7 +33102,7 @@ public void onSuccess(byte[] tlv) { public void readVehicleIDAttribute( VehicleIDAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, VEHICLE_I_D_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, VEHICLE_ID_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -33110,12 +33110,12 @@ public void onSuccess(byte[] tlv) { @Nullable String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, VEHICLE_I_D_ATTRIBUTE_ID, true); + }, VEHICLE_ID_ATTRIBUTE_ID, true); } public void subscribeVehicleIDAttribute( VehicleIDAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, VEHICLE_I_D_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, VEHICLE_ID_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -33123,12 +33123,12 @@ public void onSuccess(byte[] tlv) { @Nullable String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, VEHICLE_I_D_ATTRIBUTE_ID, minInterval, maxInterval); + }, VEHICLE_ID_ATTRIBUTE_ID, minInterval, maxInterval); } public void readSessionIDAttribute( SessionIDAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SESSION_I_D_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SESSION_ID_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -33136,12 +33136,12 @@ public void onSuccess(byte[] tlv) { @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, SESSION_I_D_ATTRIBUTE_ID, true); + }, SESSION_ID_ATTRIBUTE_ID, true); } public void subscribeSessionIDAttribute( SessionIDAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SESSION_I_D_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SESSION_ID_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -33149,7 +33149,7 @@ public void onSuccess(byte[] tlv) { @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, SESSION_I_D_ATTRIBUTE_ID, minInterval, maxInterval); + }, SESSION_ID_ATTRIBUTE_ID, minInterval, maxInterval); } public void readSessionDurationAttribute( @@ -35127,19 +35127,19 @@ public static class DoorLockCluster extends BaseChipCluster { private static final long DOOR_CLOSED_EVENTS_ATTRIBUTE_ID = 5L; private static final long OPEN_PERIOD_ATTRIBUTE_ID = 6L; private static final long NUMBER_OF_TOTAL_USERS_SUPPORTED_ATTRIBUTE_ID = 17L; - private static final long NUMBER_OF_P_I_N_USERS_SUPPORTED_ATTRIBUTE_ID = 18L; - private static final long NUMBER_OF_R_F_I_D_USERS_SUPPORTED_ATTRIBUTE_ID = 19L; + private static final long NUMBER_OF_PIN_USERS_SUPPORTED_ATTRIBUTE_ID = 18L; + private static final long NUMBER_OF_RFID_USERS_SUPPORTED_ATTRIBUTE_ID = 19L; private static final long NUMBER_OF_WEEK_DAY_SCHEDULES_SUPPORTED_PER_USER_ATTRIBUTE_ID = 20L; private static final long NUMBER_OF_YEAR_DAY_SCHEDULES_SUPPORTED_PER_USER_ATTRIBUTE_ID = 21L; private static final long NUMBER_OF_HOLIDAY_SCHEDULES_SUPPORTED_ATTRIBUTE_ID = 22L; - private static final long MAX_P_I_N_CODE_LENGTH_ATTRIBUTE_ID = 23L; - private static final long MIN_P_I_N_CODE_LENGTH_ATTRIBUTE_ID = 24L; - private static final long MAX_R_F_I_D_CODE_LENGTH_ATTRIBUTE_ID = 25L; - private static final long MIN_R_F_I_D_CODE_LENGTH_ATTRIBUTE_ID = 26L; + private static final long MAX_PIN_CODE_LENGTH_ATTRIBUTE_ID = 23L; + private static final long MIN_PIN_CODE_LENGTH_ATTRIBUTE_ID = 24L; + private static final long MAX_RFID_CODE_LENGTH_ATTRIBUTE_ID = 25L; + private static final long MIN_RFID_CODE_LENGTH_ATTRIBUTE_ID = 26L; private static final long CREDENTIAL_RULES_SUPPORT_ATTRIBUTE_ID = 27L; private static final long NUMBER_OF_CREDENTIALS_SUPPORTED_PER_USER_ATTRIBUTE_ID = 28L; private static final long LANGUAGE_ATTRIBUTE_ID = 33L; - private static final long L_E_D_SETTINGS_ATTRIBUTE_ID = 34L; + private static final long LED_SETTINGS_ATTRIBUTE_ID = 34L; private static final long AUTO_RELOCK_TIME_ATTRIBUTE_ID = 35L; private static final long SOUND_VOLUME_ATTRIBUTE_ID = 36L; private static final long OPERATING_MODE_ATTRIBUTE_ID = 37L; @@ -35147,21 +35147,21 @@ public static class DoorLockCluster extends BaseChipCluster { private static final long DEFAULT_CONFIGURATION_REGISTER_ATTRIBUTE_ID = 39L; private static final long ENABLE_LOCAL_PROGRAMMING_ATTRIBUTE_ID = 40L; private static final long ENABLE_ONE_TOUCH_LOCKING_ATTRIBUTE_ID = 41L; - private static final long ENABLE_INSIDE_STATUS_L_E_D_ATTRIBUTE_ID = 42L; + private static final long ENABLE_INSIDE_STATUS_LED_ATTRIBUTE_ID = 42L; private static final long ENABLE_PRIVACY_MODE_BUTTON_ATTRIBUTE_ID = 43L; private static final long LOCAL_PROGRAMMING_FEATURES_ATTRIBUTE_ID = 44L; private static final long WRONG_CODE_ENTRY_LIMIT_ATTRIBUTE_ID = 48L; private static final long USER_CODE_TEMPORARY_DISABLE_TIME_ATTRIBUTE_ID = 49L; - private static final long SEND_P_I_N_OVER_THE_AIR_ATTRIBUTE_ID = 50L; - private static final long REQUIRE_P_I_NFOR_REMOTE_OPERATION_ATTRIBUTE_ID = 51L; + private static final long SEND_PIN_OVER_THE_AIR_ATTRIBUTE_ID = 50L; + private static final long REQUIRE_PI_NFOR_REMOTE_OPERATION_ATTRIBUTE_ID = 51L; private static final long EXPIRING_USER_TIMEOUT_ATTRIBUTE_ID = 53L; private static final long ALIRO_READER_VERIFICATION_KEY_ATTRIBUTE_ID = 128L; private static final long ALIRO_READER_GROUP_IDENTIFIER_ATTRIBUTE_ID = 129L; private static final long ALIRO_READER_GROUP_SUB_IDENTIFIER_ATTRIBUTE_ID = 130L; private static final long ALIRO_EXPEDITED_TRANSACTION_SUPPORTED_PROTOCOL_VERSIONS_ATTRIBUTE_ID = 131L; private static final long ALIRO_GROUP_RESOLVING_KEY_ATTRIBUTE_ID = 132L; - private static final long ALIRO_SUPPORTED_B_L_E_U_W_B_PROTOCOL_VERSIONS_ATTRIBUTE_ID = 133L; - private static final long ALIRO_B_L_E_ADVERTISING_VERSION_ATTRIBUTE_ID = 134L; + private static final long ALIRO_SUPPORTED_BLEUWB_PROTOCOL_VERSIONS_ATTRIBUTE_ID = 133L; + private static final long ALIRO_BLE_ADVERTISING_VERSION_ATTRIBUTE_ID = 134L; private static final long NUMBER_OF_ALIRO_CREDENTIAL_ISSUER_KEYS_SUPPORTED_ATTRIBUTE_ID = 135L; private static final long NUMBER_OF_ALIRO_ENDPOINT_KEYS_SUPPORTED_ATTRIBUTE_ID = 136L; private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L; @@ -36266,7 +36266,7 @@ public void onSuccess(byte[] tlv) { public void readNumberOfPINUsersSupportedAttribute( IntegerAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_P_I_N_USERS_SUPPORTED_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_PIN_USERS_SUPPORTED_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -36274,12 +36274,12 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, NUMBER_OF_P_I_N_USERS_SUPPORTED_ATTRIBUTE_ID, true); + }, NUMBER_OF_PIN_USERS_SUPPORTED_ATTRIBUTE_ID, true); } public void subscribeNumberOfPINUsersSupportedAttribute( IntegerAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_P_I_N_USERS_SUPPORTED_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_PIN_USERS_SUPPORTED_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -36287,12 +36287,12 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, NUMBER_OF_P_I_N_USERS_SUPPORTED_ATTRIBUTE_ID, minInterval, maxInterval); + }, NUMBER_OF_PIN_USERS_SUPPORTED_ATTRIBUTE_ID, minInterval, maxInterval); } public void readNumberOfRFIDUsersSupportedAttribute( IntegerAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_R_F_I_D_USERS_SUPPORTED_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_RFID_USERS_SUPPORTED_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -36300,12 +36300,12 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, NUMBER_OF_R_F_I_D_USERS_SUPPORTED_ATTRIBUTE_ID, true); + }, NUMBER_OF_RFID_USERS_SUPPORTED_ATTRIBUTE_ID, true); } public void subscribeNumberOfRFIDUsersSupportedAttribute( IntegerAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_R_F_I_D_USERS_SUPPORTED_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_RFID_USERS_SUPPORTED_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -36313,7 +36313,7 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, NUMBER_OF_R_F_I_D_USERS_SUPPORTED_ATTRIBUTE_ID, minInterval, maxInterval); + }, NUMBER_OF_RFID_USERS_SUPPORTED_ATTRIBUTE_ID, minInterval, maxInterval); } public void readNumberOfWeekDaySchedulesSupportedPerUserAttribute( @@ -36396,7 +36396,7 @@ public void onSuccess(byte[] tlv) { public void readMaxPINCodeLengthAttribute( IntegerAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_P_I_N_CODE_LENGTH_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_PIN_CODE_LENGTH_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -36404,12 +36404,12 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, MAX_P_I_N_CODE_LENGTH_ATTRIBUTE_ID, true); + }, MAX_PIN_CODE_LENGTH_ATTRIBUTE_ID, true); } public void subscribeMaxPINCodeLengthAttribute( IntegerAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_P_I_N_CODE_LENGTH_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_PIN_CODE_LENGTH_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -36417,12 +36417,12 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, MAX_P_I_N_CODE_LENGTH_ATTRIBUTE_ID, minInterval, maxInterval); + }, MAX_PIN_CODE_LENGTH_ATTRIBUTE_ID, minInterval, maxInterval); } public void readMinPINCodeLengthAttribute( IntegerAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_P_I_N_CODE_LENGTH_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_PIN_CODE_LENGTH_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -36430,12 +36430,12 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, MIN_P_I_N_CODE_LENGTH_ATTRIBUTE_ID, true); + }, MIN_PIN_CODE_LENGTH_ATTRIBUTE_ID, true); } public void subscribeMinPINCodeLengthAttribute( IntegerAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_P_I_N_CODE_LENGTH_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_PIN_CODE_LENGTH_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -36443,12 +36443,12 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, MIN_P_I_N_CODE_LENGTH_ATTRIBUTE_ID, minInterval, maxInterval); + }, MIN_PIN_CODE_LENGTH_ATTRIBUTE_ID, minInterval, maxInterval); } public void readMaxRFIDCodeLengthAttribute( IntegerAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_R_F_I_D_CODE_LENGTH_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_RFID_CODE_LENGTH_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -36456,12 +36456,12 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, MAX_R_F_I_D_CODE_LENGTH_ATTRIBUTE_ID, true); + }, MAX_RFID_CODE_LENGTH_ATTRIBUTE_ID, true); } public void subscribeMaxRFIDCodeLengthAttribute( IntegerAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_R_F_I_D_CODE_LENGTH_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_RFID_CODE_LENGTH_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -36469,12 +36469,12 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, MAX_R_F_I_D_CODE_LENGTH_ATTRIBUTE_ID, minInterval, maxInterval); + }, MAX_RFID_CODE_LENGTH_ATTRIBUTE_ID, minInterval, maxInterval); } public void readMinRFIDCodeLengthAttribute( IntegerAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_R_F_I_D_CODE_LENGTH_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_RFID_CODE_LENGTH_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -36482,12 +36482,12 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, MIN_R_F_I_D_CODE_LENGTH_ATTRIBUTE_ID, true); + }, MIN_RFID_CODE_LENGTH_ATTRIBUTE_ID, true); } public void subscribeMinRFIDCodeLengthAttribute( IntegerAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_R_F_I_D_CODE_LENGTH_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_RFID_CODE_LENGTH_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -36495,7 +36495,7 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, MIN_R_F_I_D_CODE_LENGTH_ATTRIBUTE_ID, minInterval, maxInterval); + }, MIN_RFID_CODE_LENGTH_ATTRIBUTE_ID, minInterval, maxInterval); } public void readCredentialRulesSupportAttribute( @@ -36587,7 +36587,7 @@ public void onSuccess(byte[] tlv) { public void readLEDSettingsAttribute( IntegerAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, L_E_D_SETTINGS_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LED_SETTINGS_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -36595,7 +36595,7 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, L_E_D_SETTINGS_ATTRIBUTE_ID, true); + }, LED_SETTINGS_ATTRIBUTE_ID, true); } public void writeLEDSettingsAttribute(DefaultClusterCallback callback, Integer value) { @@ -36604,12 +36604,12 @@ public void writeLEDSettingsAttribute(DefaultClusterCallback callback, Integer v public void writeLEDSettingsAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) { BaseTLVType tlvValue = new UIntType(value); - writeAttribute(new WriteAttributesCallbackImpl(callback), L_E_D_SETTINGS_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs); + writeAttribute(new WriteAttributesCallbackImpl(callback), LED_SETTINGS_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs); } public void subscribeLEDSettingsAttribute( IntegerAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, L_E_D_SETTINGS_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LED_SETTINGS_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -36617,7 +36617,7 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, L_E_D_SETTINGS_ATTRIBUTE_ID, minInterval, maxInterval); + }, LED_SETTINGS_ATTRIBUTE_ID, minInterval, maxInterval); } public void readAutoRelockTimeAttribute( @@ -36849,7 +36849,7 @@ public void onSuccess(byte[] tlv) { public void readEnableInsideStatusLEDAttribute( BooleanAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ENABLE_INSIDE_STATUS_L_E_D_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ENABLE_INSIDE_STATUS_LED_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -36857,7 +36857,7 @@ public void onSuccess(byte[] tlv) { Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, ENABLE_INSIDE_STATUS_L_E_D_ATTRIBUTE_ID, true); + }, ENABLE_INSIDE_STATUS_LED_ATTRIBUTE_ID, true); } public void writeEnableInsideStatusLEDAttribute(DefaultClusterCallback callback, Boolean value) { @@ -36866,12 +36866,12 @@ public void writeEnableInsideStatusLEDAttribute(DefaultClusterCallback callback, public void writeEnableInsideStatusLEDAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) { BaseTLVType tlvValue = new BooleanType(value); - writeAttribute(new WriteAttributesCallbackImpl(callback), ENABLE_INSIDE_STATUS_L_E_D_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs); + writeAttribute(new WriteAttributesCallbackImpl(callback), ENABLE_INSIDE_STATUS_LED_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs); } public void subscribeEnableInsideStatusLEDAttribute( BooleanAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ENABLE_INSIDE_STATUS_L_E_D_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ENABLE_INSIDE_STATUS_LED_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -36879,7 +36879,7 @@ public void onSuccess(byte[] tlv) { Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, ENABLE_INSIDE_STATUS_L_E_D_ATTRIBUTE_ID, minInterval, maxInterval); + }, ENABLE_INSIDE_STATUS_LED_ATTRIBUTE_ID, minInterval, maxInterval); } public void readEnablePrivacyModeButtonAttribute( @@ -37024,7 +37024,7 @@ public void onSuccess(byte[] tlv) { public void readSendPINOverTheAirAttribute( BooleanAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SEND_P_I_N_OVER_THE_AIR_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SEND_PIN_OVER_THE_AIR_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -37032,7 +37032,7 @@ public void onSuccess(byte[] tlv) { Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, SEND_P_I_N_OVER_THE_AIR_ATTRIBUTE_ID, true); + }, SEND_PIN_OVER_THE_AIR_ATTRIBUTE_ID, true); } public void writeSendPINOverTheAirAttribute(DefaultClusterCallback callback, Boolean value) { @@ -37041,12 +37041,12 @@ public void writeSendPINOverTheAirAttribute(DefaultClusterCallback callback, Boo public void writeSendPINOverTheAirAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) { BaseTLVType tlvValue = new BooleanType(value); - writeAttribute(new WriteAttributesCallbackImpl(callback), SEND_P_I_N_OVER_THE_AIR_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs); + writeAttribute(new WriteAttributesCallbackImpl(callback), SEND_PIN_OVER_THE_AIR_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs); } public void subscribeSendPINOverTheAirAttribute( BooleanAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SEND_P_I_N_OVER_THE_AIR_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SEND_PIN_OVER_THE_AIR_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -37054,12 +37054,12 @@ public void onSuccess(byte[] tlv) { Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, SEND_P_I_N_OVER_THE_AIR_ATTRIBUTE_ID, minInterval, maxInterval); + }, SEND_PIN_OVER_THE_AIR_ATTRIBUTE_ID, minInterval, maxInterval); } public void readRequirePINforRemoteOperationAttribute( BooleanAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, REQUIRE_P_I_NFOR_REMOTE_OPERATION_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, REQUIRE_PI_NFOR_REMOTE_OPERATION_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -37067,7 +37067,7 @@ public void onSuccess(byte[] tlv) { Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, REQUIRE_P_I_NFOR_REMOTE_OPERATION_ATTRIBUTE_ID, true); + }, REQUIRE_PI_NFOR_REMOTE_OPERATION_ATTRIBUTE_ID, true); } public void writeRequirePINforRemoteOperationAttribute(DefaultClusterCallback callback, Boolean value) { @@ -37076,12 +37076,12 @@ public void writeRequirePINforRemoteOperationAttribute(DefaultClusterCallback ca public void writeRequirePINforRemoteOperationAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) { BaseTLVType tlvValue = new BooleanType(value); - writeAttribute(new WriteAttributesCallbackImpl(callback), REQUIRE_P_I_NFOR_REMOTE_OPERATION_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs); + writeAttribute(new WriteAttributesCallbackImpl(callback), REQUIRE_PI_NFOR_REMOTE_OPERATION_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs); } public void subscribeRequirePINforRemoteOperationAttribute( BooleanAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, REQUIRE_P_I_NFOR_REMOTE_OPERATION_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, REQUIRE_PI_NFOR_REMOTE_OPERATION_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -37089,7 +37089,7 @@ public void onSuccess(byte[] tlv) { Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, REQUIRE_P_I_NFOR_REMOTE_OPERATION_ATTRIBUTE_ID, minInterval, maxInterval); + }, REQUIRE_PI_NFOR_REMOTE_OPERATION_ATTRIBUTE_ID, minInterval, maxInterval); } public void readExpiringUserTimeoutAttribute( @@ -37259,7 +37259,7 @@ public void onSuccess(byte[] tlv) { public void readAliroSupportedBLEUWBProtocolVersionsAttribute( AliroSupportedBLEUWBProtocolVersionsAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ALIRO_SUPPORTED_B_L_E_U_W_B_PROTOCOL_VERSIONS_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ALIRO_SUPPORTED_BLEUWB_PROTOCOL_VERSIONS_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -37267,12 +37267,12 @@ public void onSuccess(byte[] tlv) { List value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, ALIRO_SUPPORTED_B_L_E_U_W_B_PROTOCOL_VERSIONS_ATTRIBUTE_ID, true); + }, ALIRO_SUPPORTED_BLEUWB_PROTOCOL_VERSIONS_ATTRIBUTE_ID, true); } public void subscribeAliroSupportedBLEUWBProtocolVersionsAttribute( AliroSupportedBLEUWBProtocolVersionsAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ALIRO_SUPPORTED_B_L_E_U_W_B_PROTOCOL_VERSIONS_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ALIRO_SUPPORTED_BLEUWB_PROTOCOL_VERSIONS_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -37280,12 +37280,12 @@ public void onSuccess(byte[] tlv) { List value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, ALIRO_SUPPORTED_B_L_E_U_W_B_PROTOCOL_VERSIONS_ATTRIBUTE_ID, minInterval, maxInterval); + }, ALIRO_SUPPORTED_BLEUWB_PROTOCOL_VERSIONS_ATTRIBUTE_ID, minInterval, maxInterval); } public void readAliroBLEAdvertisingVersionAttribute( IntegerAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ALIRO_B_L_E_ADVERTISING_VERSION_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ALIRO_BLE_ADVERTISING_VERSION_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -37293,12 +37293,12 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, ALIRO_B_L_E_ADVERTISING_VERSION_ATTRIBUTE_ID, true); + }, ALIRO_BLE_ADVERTISING_VERSION_ATTRIBUTE_ID, true); } public void subscribeAliroBLEAdvertisingVersionAttribute( IntegerAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ALIRO_B_L_E_ADVERTISING_VERSION_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ALIRO_BLE_ADVERTISING_VERSION_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -37306,7 +37306,7 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, ALIRO_B_L_E_ADVERTISING_VERSION_ATTRIBUTE_ID, minInterval, maxInterval); + }, ALIRO_BLE_ADVERTISING_VERSION_ATTRIBUTE_ID, minInterval, maxInterval); } public void readNumberOfAliroCredentialIssuerKeysSupportedAttribute( @@ -40420,9 +40420,9 @@ public static class ThermostatCluster extends BaseChipCluster { private static final long ABS_MAX_HEAT_SETPOINT_LIMIT_ATTRIBUTE_ID = 4L; private static final long ABS_MIN_COOL_SETPOINT_LIMIT_ATTRIBUTE_ID = 5L; private static final long ABS_MAX_COOL_SETPOINT_LIMIT_ATTRIBUTE_ID = 6L; - private static final long P_I_COOLING_DEMAND_ATTRIBUTE_ID = 7L; - private static final long P_I_HEATING_DEMAND_ATTRIBUTE_ID = 8L; - private static final long H_V_A_C_SYSTEM_TYPE_CONFIGURATION_ATTRIBUTE_ID = 9L; + private static final long PI_COOLING_DEMAND_ATTRIBUTE_ID = 7L; + private static final long PI_HEATING_DEMAND_ATTRIBUTE_ID = 8L; + private static final long HVAC_SYSTEM_TYPE_CONFIGURATION_ATTRIBUTE_ID = 9L; private static final long LOCAL_TEMPERATURE_CALIBRATION_ATTRIBUTE_ID = 16L; private static final long OCCUPIED_COOLING_SETPOINT_ATTRIBUTE_ID = 17L; private static final long OCCUPIED_HEATING_SETPOINT_ATTRIBUTE_ID = 18L; @@ -40454,14 +40454,14 @@ public static class ThermostatCluster extends BaseChipCluster { private static final long UNOCCUPIED_SETBACK_MIN_ATTRIBUTE_ID = 56L; private static final long UNOCCUPIED_SETBACK_MAX_ATTRIBUTE_ID = 57L; private static final long EMERGENCY_HEAT_DELTA_ATTRIBUTE_ID = 58L; - private static final long A_C_TYPE_ATTRIBUTE_ID = 64L; - private static final long A_C_CAPACITY_ATTRIBUTE_ID = 65L; - private static final long A_C_REFRIGERANT_TYPE_ATTRIBUTE_ID = 66L; - private static final long A_C_COMPRESSOR_TYPE_ATTRIBUTE_ID = 67L; - private static final long A_C_ERROR_CODE_ATTRIBUTE_ID = 68L; - private static final long A_C_LOUVER_POSITION_ATTRIBUTE_ID = 69L; - private static final long A_C_COIL_TEMPERATURE_ATTRIBUTE_ID = 70L; - private static final long A_C_CAPACITYFORMAT_ATTRIBUTE_ID = 71L; + private static final long AC_TYPE_ATTRIBUTE_ID = 64L; + private static final long AC_CAPACITY_ATTRIBUTE_ID = 65L; + private static final long AC_REFRIGERANT_TYPE_ATTRIBUTE_ID = 66L; + private static final long AC_COMPRESSOR_TYPE_ATTRIBUTE_ID = 67L; + private static final long AC_ERROR_CODE_ATTRIBUTE_ID = 68L; + private static final long AC_LOUVER_POSITION_ATTRIBUTE_ID = 69L; + private static final long AC_COIL_TEMPERATURE_ATTRIBUTE_ID = 70L; + private static final long AC_CAPACITYFORMAT_ATTRIBUTE_ID = 71L; private static final long PRESET_TYPES_ATTRIBUTE_ID = 72L; private static final long SCHEDULE_TYPES_ATTRIBUTE_ID = 73L; private static final long NUMBER_OF_PRESETS_ATTRIBUTE_ID = 74L; @@ -40993,7 +40993,7 @@ public void onSuccess(byte[] tlv) { public void readPICoolingDemandAttribute( IntegerAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, P_I_COOLING_DEMAND_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PI_COOLING_DEMAND_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -41001,12 +41001,12 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, P_I_COOLING_DEMAND_ATTRIBUTE_ID, true); + }, PI_COOLING_DEMAND_ATTRIBUTE_ID, true); } public void subscribePICoolingDemandAttribute( IntegerAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, P_I_COOLING_DEMAND_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PI_COOLING_DEMAND_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -41014,12 +41014,12 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, P_I_COOLING_DEMAND_ATTRIBUTE_ID, minInterval, maxInterval); + }, PI_COOLING_DEMAND_ATTRIBUTE_ID, minInterval, maxInterval); } public void readPIHeatingDemandAttribute( IntegerAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, P_I_HEATING_DEMAND_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PI_HEATING_DEMAND_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -41027,12 +41027,12 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, P_I_HEATING_DEMAND_ATTRIBUTE_ID, true); + }, PI_HEATING_DEMAND_ATTRIBUTE_ID, true); } public void subscribePIHeatingDemandAttribute( IntegerAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, P_I_HEATING_DEMAND_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PI_HEATING_DEMAND_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -41040,12 +41040,12 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, P_I_HEATING_DEMAND_ATTRIBUTE_ID, minInterval, maxInterval); + }, PI_HEATING_DEMAND_ATTRIBUTE_ID, minInterval, maxInterval); } public void readHVACSystemTypeConfigurationAttribute( IntegerAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, H_V_A_C_SYSTEM_TYPE_CONFIGURATION_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, HVAC_SYSTEM_TYPE_CONFIGURATION_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -41053,7 +41053,7 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, H_V_A_C_SYSTEM_TYPE_CONFIGURATION_ATTRIBUTE_ID, true); + }, HVAC_SYSTEM_TYPE_CONFIGURATION_ATTRIBUTE_ID, true); } public void writeHVACSystemTypeConfigurationAttribute(DefaultClusterCallback callback, Integer value) { @@ -41062,12 +41062,12 @@ public void writeHVACSystemTypeConfigurationAttribute(DefaultClusterCallback cal public void writeHVACSystemTypeConfigurationAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) { BaseTLVType tlvValue = new UIntType(value); - writeAttribute(new WriteAttributesCallbackImpl(callback), H_V_A_C_SYSTEM_TYPE_CONFIGURATION_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs); + writeAttribute(new WriteAttributesCallbackImpl(callback), HVAC_SYSTEM_TYPE_CONFIGURATION_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs); } public void subscribeHVACSystemTypeConfigurationAttribute( IntegerAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, H_V_A_C_SYSTEM_TYPE_CONFIGURATION_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, HVAC_SYSTEM_TYPE_CONFIGURATION_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -41075,7 +41075,7 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, H_V_A_C_SYSTEM_TYPE_CONFIGURATION_ATTRIBUTE_ID, minInterval, maxInterval); + }, HVAC_SYSTEM_TYPE_CONFIGURATION_ATTRIBUTE_ID, minInterval, maxInterval); } public void readLocalTemperatureCalibrationAttribute( @@ -42057,7 +42057,7 @@ public void onSuccess(byte[] tlv) { public void readACTypeAttribute( IntegerAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, A_C_TYPE_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AC_TYPE_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -42065,7 +42065,7 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, A_C_TYPE_ATTRIBUTE_ID, true); + }, AC_TYPE_ATTRIBUTE_ID, true); } public void writeACTypeAttribute(DefaultClusterCallback callback, Integer value) { @@ -42074,12 +42074,12 @@ public void writeACTypeAttribute(DefaultClusterCallback callback, Integer value) public void writeACTypeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) { BaseTLVType tlvValue = new UIntType(value); - writeAttribute(new WriteAttributesCallbackImpl(callback), A_C_TYPE_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs); + writeAttribute(new WriteAttributesCallbackImpl(callback), AC_TYPE_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs); } public void subscribeACTypeAttribute( IntegerAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, A_C_TYPE_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AC_TYPE_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -42087,12 +42087,12 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, A_C_TYPE_ATTRIBUTE_ID, minInterval, maxInterval); + }, AC_TYPE_ATTRIBUTE_ID, minInterval, maxInterval); } public void readACCapacityAttribute( IntegerAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, A_C_CAPACITY_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AC_CAPACITY_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -42100,7 +42100,7 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, A_C_CAPACITY_ATTRIBUTE_ID, true); + }, AC_CAPACITY_ATTRIBUTE_ID, true); } public void writeACCapacityAttribute(DefaultClusterCallback callback, Integer value) { @@ -42109,12 +42109,12 @@ public void writeACCapacityAttribute(DefaultClusterCallback callback, Integer va public void writeACCapacityAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) { BaseTLVType tlvValue = new UIntType(value); - writeAttribute(new WriteAttributesCallbackImpl(callback), A_C_CAPACITY_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs); + writeAttribute(new WriteAttributesCallbackImpl(callback), AC_CAPACITY_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs); } public void subscribeACCapacityAttribute( IntegerAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, A_C_CAPACITY_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AC_CAPACITY_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -42122,12 +42122,12 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, A_C_CAPACITY_ATTRIBUTE_ID, minInterval, maxInterval); + }, AC_CAPACITY_ATTRIBUTE_ID, minInterval, maxInterval); } public void readACRefrigerantTypeAttribute( IntegerAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, A_C_REFRIGERANT_TYPE_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AC_REFRIGERANT_TYPE_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -42135,7 +42135,7 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, A_C_REFRIGERANT_TYPE_ATTRIBUTE_ID, true); + }, AC_REFRIGERANT_TYPE_ATTRIBUTE_ID, true); } public void writeACRefrigerantTypeAttribute(DefaultClusterCallback callback, Integer value) { @@ -42144,12 +42144,12 @@ public void writeACRefrigerantTypeAttribute(DefaultClusterCallback callback, Int public void writeACRefrigerantTypeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) { BaseTLVType tlvValue = new UIntType(value); - writeAttribute(new WriteAttributesCallbackImpl(callback), A_C_REFRIGERANT_TYPE_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs); + writeAttribute(new WriteAttributesCallbackImpl(callback), AC_REFRIGERANT_TYPE_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs); } public void subscribeACRefrigerantTypeAttribute( IntegerAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, A_C_REFRIGERANT_TYPE_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AC_REFRIGERANT_TYPE_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -42157,12 +42157,12 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, A_C_REFRIGERANT_TYPE_ATTRIBUTE_ID, minInterval, maxInterval); + }, AC_REFRIGERANT_TYPE_ATTRIBUTE_ID, minInterval, maxInterval); } public void readACCompressorTypeAttribute( IntegerAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, A_C_COMPRESSOR_TYPE_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AC_COMPRESSOR_TYPE_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -42170,7 +42170,7 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, A_C_COMPRESSOR_TYPE_ATTRIBUTE_ID, true); + }, AC_COMPRESSOR_TYPE_ATTRIBUTE_ID, true); } public void writeACCompressorTypeAttribute(DefaultClusterCallback callback, Integer value) { @@ -42179,12 +42179,12 @@ public void writeACCompressorTypeAttribute(DefaultClusterCallback callback, Inte public void writeACCompressorTypeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) { BaseTLVType tlvValue = new UIntType(value); - writeAttribute(new WriteAttributesCallbackImpl(callback), A_C_COMPRESSOR_TYPE_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs); + writeAttribute(new WriteAttributesCallbackImpl(callback), AC_COMPRESSOR_TYPE_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs); } public void subscribeACCompressorTypeAttribute( IntegerAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, A_C_COMPRESSOR_TYPE_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AC_COMPRESSOR_TYPE_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -42192,12 +42192,12 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, A_C_COMPRESSOR_TYPE_ATTRIBUTE_ID, minInterval, maxInterval); + }, AC_COMPRESSOR_TYPE_ATTRIBUTE_ID, minInterval, maxInterval); } public void readACErrorCodeAttribute( LongAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, A_C_ERROR_CODE_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AC_ERROR_CODE_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -42205,7 +42205,7 @@ public void onSuccess(byte[] tlv) { Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, A_C_ERROR_CODE_ATTRIBUTE_ID, true); + }, AC_ERROR_CODE_ATTRIBUTE_ID, true); } public void writeACErrorCodeAttribute(DefaultClusterCallback callback, Long value) { @@ -42214,12 +42214,12 @@ public void writeACErrorCodeAttribute(DefaultClusterCallback callback, Long valu public void writeACErrorCodeAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) { BaseTLVType tlvValue = new UIntType(value); - writeAttribute(new WriteAttributesCallbackImpl(callback), A_C_ERROR_CODE_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs); + writeAttribute(new WriteAttributesCallbackImpl(callback), AC_ERROR_CODE_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs); } public void subscribeACErrorCodeAttribute( LongAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, A_C_ERROR_CODE_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AC_ERROR_CODE_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -42227,12 +42227,12 @@ public void onSuccess(byte[] tlv) { Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, A_C_ERROR_CODE_ATTRIBUTE_ID, minInterval, maxInterval); + }, AC_ERROR_CODE_ATTRIBUTE_ID, minInterval, maxInterval); } public void readACLouverPositionAttribute( IntegerAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, A_C_LOUVER_POSITION_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AC_LOUVER_POSITION_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -42240,7 +42240,7 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, A_C_LOUVER_POSITION_ATTRIBUTE_ID, true); + }, AC_LOUVER_POSITION_ATTRIBUTE_ID, true); } public void writeACLouverPositionAttribute(DefaultClusterCallback callback, Integer value) { @@ -42249,12 +42249,12 @@ public void writeACLouverPositionAttribute(DefaultClusterCallback callback, Inte public void writeACLouverPositionAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) { BaseTLVType tlvValue = new UIntType(value); - writeAttribute(new WriteAttributesCallbackImpl(callback), A_C_LOUVER_POSITION_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs); + writeAttribute(new WriteAttributesCallbackImpl(callback), AC_LOUVER_POSITION_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs); } public void subscribeACLouverPositionAttribute( IntegerAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, A_C_LOUVER_POSITION_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AC_LOUVER_POSITION_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -42262,12 +42262,12 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, A_C_LOUVER_POSITION_ATTRIBUTE_ID, minInterval, maxInterval); + }, AC_LOUVER_POSITION_ATTRIBUTE_ID, minInterval, maxInterval); } public void readACCoilTemperatureAttribute( ACCoilTemperatureAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, A_C_COIL_TEMPERATURE_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AC_COIL_TEMPERATURE_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -42275,12 +42275,12 @@ public void onSuccess(byte[] tlv) { @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, A_C_COIL_TEMPERATURE_ATTRIBUTE_ID, true); + }, AC_COIL_TEMPERATURE_ATTRIBUTE_ID, true); } public void subscribeACCoilTemperatureAttribute( ACCoilTemperatureAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, A_C_COIL_TEMPERATURE_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AC_COIL_TEMPERATURE_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -42288,12 +42288,12 @@ public void onSuccess(byte[] tlv) { @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, A_C_COIL_TEMPERATURE_ATTRIBUTE_ID, minInterval, maxInterval); + }, AC_COIL_TEMPERATURE_ATTRIBUTE_ID, minInterval, maxInterval); } public void readACCapacityformatAttribute( IntegerAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, A_C_CAPACITYFORMAT_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AC_CAPACITYFORMAT_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -42301,7 +42301,7 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, A_C_CAPACITYFORMAT_ATTRIBUTE_ID, true); + }, AC_CAPACITYFORMAT_ATTRIBUTE_ID, true); } public void writeACCapacityformatAttribute(DefaultClusterCallback callback, Integer value) { @@ -42310,12 +42310,12 @@ public void writeACCapacityformatAttribute(DefaultClusterCallback callback, Inte public void writeACCapacityformatAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) { BaseTLVType tlvValue = new UIntType(value); - writeAttribute(new WriteAttributesCallbackImpl(callback), A_C_CAPACITYFORMAT_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs); + writeAttribute(new WriteAttributesCallbackImpl(callback), AC_CAPACITYFORMAT_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs); } public void subscribeACCapacityformatAttribute( IntegerAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, A_C_CAPACITYFORMAT_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AC_CAPACITYFORMAT_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -42323,7 +42323,7 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, A_C_CAPACITYFORMAT_ATTRIBUTE_ID, minInterval, maxInterval); + }, AC_CAPACITYFORMAT_ATTRIBUTE_ID, minInterval, maxInterval); } public void readPresetTypesAttribute( @@ -43729,14 +43729,14 @@ public static class ColorControlCluster extends BaseChipCluster { private static final long PRIMARY6_INTENSITY_ATTRIBUTE_ID = 42L; private static final long WHITE_POINT_X_ATTRIBUTE_ID = 48L; private static final long WHITE_POINT_Y_ATTRIBUTE_ID = 49L; - private static final long COLOR_POINT_R_X_ATTRIBUTE_ID = 50L; - private static final long COLOR_POINT_R_Y_ATTRIBUTE_ID = 51L; + private static final long COLOR_POINT_RX_ATTRIBUTE_ID = 50L; + private static final long COLOR_POINT_RY_ATTRIBUTE_ID = 51L; private static final long COLOR_POINT_R_INTENSITY_ATTRIBUTE_ID = 52L; - private static final long COLOR_POINT_G_X_ATTRIBUTE_ID = 54L; - private static final long COLOR_POINT_G_Y_ATTRIBUTE_ID = 55L; + private static final long COLOR_POINT_GX_ATTRIBUTE_ID = 54L; + private static final long COLOR_POINT_GY_ATTRIBUTE_ID = 55L; private static final long COLOR_POINT_G_INTENSITY_ATTRIBUTE_ID = 56L; - private static final long COLOR_POINT_B_X_ATTRIBUTE_ID = 58L; - private static final long COLOR_POINT_B_Y_ATTRIBUTE_ID = 59L; + private static final long COLOR_POINT_BX_ATTRIBUTE_ID = 58L; + private static final long COLOR_POINT_BY_ATTRIBUTE_ID = 59L; private static final long COLOR_POINT_B_INTENSITY_ATTRIBUTE_ID = 60L; private static final long ENHANCED_CURRENT_HUE_ATTRIBUTE_ID = 16384L; private static final long ENHANCED_COLOR_MODE_ATTRIBUTE_ID = 16385L; @@ -45330,7 +45330,7 @@ public void onSuccess(byte[] tlv) { public void readColorPointRXAttribute( IntegerAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_R_X_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_RX_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -45338,7 +45338,7 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, COLOR_POINT_R_X_ATTRIBUTE_ID, true); + }, COLOR_POINT_RX_ATTRIBUTE_ID, true); } public void writeColorPointRXAttribute(DefaultClusterCallback callback, Integer value) { @@ -45347,12 +45347,12 @@ public void writeColorPointRXAttribute(DefaultClusterCallback callback, Integer public void writeColorPointRXAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) { BaseTLVType tlvValue = new UIntType(value); - writeAttribute(new WriteAttributesCallbackImpl(callback), COLOR_POINT_R_X_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs); + writeAttribute(new WriteAttributesCallbackImpl(callback), COLOR_POINT_RX_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs); } public void subscribeColorPointRXAttribute( IntegerAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_R_X_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_RX_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -45360,12 +45360,12 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, COLOR_POINT_R_X_ATTRIBUTE_ID, minInterval, maxInterval); + }, COLOR_POINT_RX_ATTRIBUTE_ID, minInterval, maxInterval); } public void readColorPointRYAttribute( IntegerAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_R_Y_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_RY_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -45373,7 +45373,7 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, COLOR_POINT_R_Y_ATTRIBUTE_ID, true); + }, COLOR_POINT_RY_ATTRIBUTE_ID, true); } public void writeColorPointRYAttribute(DefaultClusterCallback callback, Integer value) { @@ -45382,12 +45382,12 @@ public void writeColorPointRYAttribute(DefaultClusterCallback callback, Integer public void writeColorPointRYAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) { BaseTLVType tlvValue = new UIntType(value); - writeAttribute(new WriteAttributesCallbackImpl(callback), COLOR_POINT_R_Y_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs); + writeAttribute(new WriteAttributesCallbackImpl(callback), COLOR_POINT_RY_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs); } public void subscribeColorPointRYAttribute( IntegerAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_R_Y_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_RY_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -45395,7 +45395,7 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, COLOR_POINT_R_Y_ATTRIBUTE_ID, minInterval, maxInterval); + }, COLOR_POINT_RY_ATTRIBUTE_ID, minInterval, maxInterval); } public void readColorPointRIntensityAttribute( @@ -45435,7 +45435,7 @@ public void onSuccess(byte[] tlv) { public void readColorPointGXAttribute( IntegerAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_G_X_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_GX_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -45443,7 +45443,7 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, COLOR_POINT_G_X_ATTRIBUTE_ID, true); + }, COLOR_POINT_GX_ATTRIBUTE_ID, true); } public void writeColorPointGXAttribute(DefaultClusterCallback callback, Integer value) { @@ -45452,12 +45452,12 @@ public void writeColorPointGXAttribute(DefaultClusterCallback callback, Integer public void writeColorPointGXAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) { BaseTLVType tlvValue = new UIntType(value); - writeAttribute(new WriteAttributesCallbackImpl(callback), COLOR_POINT_G_X_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs); + writeAttribute(new WriteAttributesCallbackImpl(callback), COLOR_POINT_GX_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs); } public void subscribeColorPointGXAttribute( IntegerAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_G_X_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_GX_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -45465,12 +45465,12 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, COLOR_POINT_G_X_ATTRIBUTE_ID, minInterval, maxInterval); + }, COLOR_POINT_GX_ATTRIBUTE_ID, minInterval, maxInterval); } public void readColorPointGYAttribute( IntegerAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_G_Y_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_GY_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -45478,7 +45478,7 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, COLOR_POINT_G_Y_ATTRIBUTE_ID, true); + }, COLOR_POINT_GY_ATTRIBUTE_ID, true); } public void writeColorPointGYAttribute(DefaultClusterCallback callback, Integer value) { @@ -45487,12 +45487,12 @@ public void writeColorPointGYAttribute(DefaultClusterCallback callback, Integer public void writeColorPointGYAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) { BaseTLVType tlvValue = new UIntType(value); - writeAttribute(new WriteAttributesCallbackImpl(callback), COLOR_POINT_G_Y_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs); + writeAttribute(new WriteAttributesCallbackImpl(callback), COLOR_POINT_GY_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs); } public void subscribeColorPointGYAttribute( IntegerAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_G_Y_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_GY_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -45500,7 +45500,7 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, COLOR_POINT_G_Y_ATTRIBUTE_ID, minInterval, maxInterval); + }, COLOR_POINT_GY_ATTRIBUTE_ID, minInterval, maxInterval); } public void readColorPointGIntensityAttribute( @@ -45540,7 +45540,7 @@ public void onSuccess(byte[] tlv) { public void readColorPointBXAttribute( IntegerAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_B_X_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_BX_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -45548,7 +45548,7 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, COLOR_POINT_B_X_ATTRIBUTE_ID, true); + }, COLOR_POINT_BX_ATTRIBUTE_ID, true); } public void writeColorPointBXAttribute(DefaultClusterCallback callback, Integer value) { @@ -45557,12 +45557,12 @@ public void writeColorPointBXAttribute(DefaultClusterCallback callback, Integer public void writeColorPointBXAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) { BaseTLVType tlvValue = new UIntType(value); - writeAttribute(new WriteAttributesCallbackImpl(callback), COLOR_POINT_B_X_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs); + writeAttribute(new WriteAttributesCallbackImpl(callback), COLOR_POINT_BX_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs); } public void subscribeColorPointBXAttribute( IntegerAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_B_X_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_BX_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -45570,12 +45570,12 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, COLOR_POINT_B_X_ATTRIBUTE_ID, minInterval, maxInterval); + }, COLOR_POINT_BX_ATTRIBUTE_ID, minInterval, maxInterval); } public void readColorPointBYAttribute( IntegerAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_B_Y_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_BY_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -45583,7 +45583,7 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, COLOR_POINT_B_Y_ATTRIBUTE_ID, true); + }, COLOR_POINT_BY_ATTRIBUTE_ID, true); } public void writeColorPointBYAttribute(DefaultClusterCallback callback, Integer value) { @@ -45592,12 +45592,12 @@ public void writeColorPointBYAttribute(DefaultClusterCallback callback, Integer public void writeColorPointBYAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) { BaseTLVType tlvValue = new UIntType(value); - writeAttribute(new WriteAttributesCallbackImpl(callback), COLOR_POINT_B_Y_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs); + writeAttribute(new WriteAttributesCallbackImpl(callback), COLOR_POINT_BY_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs); } public void subscribeColorPointBYAttribute( IntegerAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_B_Y_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_BY_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -45605,7 +45605,7 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, COLOR_POINT_B_Y_ATTRIBUTE_ID, minInterval, maxInterval); + }, COLOR_POINT_BY_ATTRIBUTE_ID, minInterval, maxInterval); } public void readColorPointBIntensityAttribute( @@ -48553,9 +48553,9 @@ public static class OccupancySensingCluster extends BaseChipCluster { private static final long OCCUPANCY_SENSOR_TYPE_BITMAP_ATTRIBUTE_ID = 2L; private static final long HOLD_TIME_ATTRIBUTE_ID = 3L; private static final long HOLD_TIME_LIMITS_ATTRIBUTE_ID = 4L; - private static final long P_I_R_OCCUPIED_TO_UNOCCUPIED_DELAY_ATTRIBUTE_ID = 16L; - private static final long P_I_R_UNOCCUPIED_TO_OCCUPIED_DELAY_ATTRIBUTE_ID = 17L; - private static final long P_I_R_UNOCCUPIED_TO_OCCUPIED_THRESHOLD_ATTRIBUTE_ID = 18L; + private static final long PIR_OCCUPIED_TO_UNOCCUPIED_DELAY_ATTRIBUTE_ID = 16L; + private static final long PIR_UNOCCUPIED_TO_OCCUPIED_DELAY_ATTRIBUTE_ID = 17L; + private static final long PIR_UNOCCUPIED_TO_OCCUPIED_THRESHOLD_ATTRIBUTE_ID = 18L; private static final long ULTRASONIC_OCCUPIED_TO_UNOCCUPIED_DELAY_ATTRIBUTE_ID = 32L; private static final long ULTRASONIC_UNOCCUPIED_TO_OCCUPIED_DELAY_ATTRIBUTE_ID = 33L; private static final long ULTRASONIC_UNOCCUPIED_TO_OCCUPIED_THRESHOLD_ATTRIBUTE_ID = 34L; @@ -48740,7 +48740,7 @@ public void onSuccess(byte[] tlv) { public void readPIROccupiedToUnoccupiedDelayAttribute( IntegerAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, P_I_R_OCCUPIED_TO_UNOCCUPIED_DELAY_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PIR_OCCUPIED_TO_UNOCCUPIED_DELAY_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -48748,7 +48748,7 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, P_I_R_OCCUPIED_TO_UNOCCUPIED_DELAY_ATTRIBUTE_ID, true); + }, PIR_OCCUPIED_TO_UNOCCUPIED_DELAY_ATTRIBUTE_ID, true); } public void writePIROccupiedToUnoccupiedDelayAttribute(DefaultClusterCallback callback, Integer value) { @@ -48757,12 +48757,12 @@ public void writePIROccupiedToUnoccupiedDelayAttribute(DefaultClusterCallback ca public void writePIROccupiedToUnoccupiedDelayAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) { BaseTLVType tlvValue = new UIntType(value); - writeAttribute(new WriteAttributesCallbackImpl(callback), P_I_R_OCCUPIED_TO_UNOCCUPIED_DELAY_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs); + writeAttribute(new WriteAttributesCallbackImpl(callback), PIR_OCCUPIED_TO_UNOCCUPIED_DELAY_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs); } public void subscribePIROccupiedToUnoccupiedDelayAttribute( IntegerAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, P_I_R_OCCUPIED_TO_UNOCCUPIED_DELAY_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PIR_OCCUPIED_TO_UNOCCUPIED_DELAY_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -48770,12 +48770,12 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, P_I_R_OCCUPIED_TO_UNOCCUPIED_DELAY_ATTRIBUTE_ID, minInterval, maxInterval); + }, PIR_OCCUPIED_TO_UNOCCUPIED_DELAY_ATTRIBUTE_ID, minInterval, maxInterval); } public void readPIRUnoccupiedToOccupiedDelayAttribute( IntegerAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, P_I_R_UNOCCUPIED_TO_OCCUPIED_DELAY_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PIR_UNOCCUPIED_TO_OCCUPIED_DELAY_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -48783,7 +48783,7 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, P_I_R_UNOCCUPIED_TO_OCCUPIED_DELAY_ATTRIBUTE_ID, true); + }, PIR_UNOCCUPIED_TO_OCCUPIED_DELAY_ATTRIBUTE_ID, true); } public void writePIRUnoccupiedToOccupiedDelayAttribute(DefaultClusterCallback callback, Integer value) { @@ -48792,12 +48792,12 @@ public void writePIRUnoccupiedToOccupiedDelayAttribute(DefaultClusterCallback ca public void writePIRUnoccupiedToOccupiedDelayAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) { BaseTLVType tlvValue = new UIntType(value); - writeAttribute(new WriteAttributesCallbackImpl(callback), P_I_R_UNOCCUPIED_TO_OCCUPIED_DELAY_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs); + writeAttribute(new WriteAttributesCallbackImpl(callback), PIR_UNOCCUPIED_TO_OCCUPIED_DELAY_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs); } public void subscribePIRUnoccupiedToOccupiedDelayAttribute( IntegerAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, P_I_R_UNOCCUPIED_TO_OCCUPIED_DELAY_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PIR_UNOCCUPIED_TO_OCCUPIED_DELAY_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -48805,12 +48805,12 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, P_I_R_UNOCCUPIED_TO_OCCUPIED_DELAY_ATTRIBUTE_ID, minInterval, maxInterval); + }, PIR_UNOCCUPIED_TO_OCCUPIED_DELAY_ATTRIBUTE_ID, minInterval, maxInterval); } public void readPIRUnoccupiedToOccupiedThresholdAttribute( IntegerAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, P_I_R_UNOCCUPIED_TO_OCCUPIED_THRESHOLD_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PIR_UNOCCUPIED_TO_OCCUPIED_THRESHOLD_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -48818,7 +48818,7 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, P_I_R_UNOCCUPIED_TO_OCCUPIED_THRESHOLD_ATTRIBUTE_ID, true); + }, PIR_UNOCCUPIED_TO_OCCUPIED_THRESHOLD_ATTRIBUTE_ID, true); } public void writePIRUnoccupiedToOccupiedThresholdAttribute(DefaultClusterCallback callback, Integer value) { @@ -48827,12 +48827,12 @@ public void writePIRUnoccupiedToOccupiedThresholdAttribute(DefaultClusterCallbac public void writePIRUnoccupiedToOccupiedThresholdAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) { BaseTLVType tlvValue = new UIntType(value); - writeAttribute(new WriteAttributesCallbackImpl(callback), P_I_R_UNOCCUPIED_TO_OCCUPIED_THRESHOLD_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs); + writeAttribute(new WriteAttributesCallbackImpl(callback), PIR_UNOCCUPIED_TO_OCCUPIED_THRESHOLD_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs); } public void subscribePIRUnoccupiedToOccupiedThresholdAttribute( IntegerAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, P_I_R_UNOCCUPIED_TO_OCCUPIED_THRESHOLD_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PIR_UNOCCUPIED_TO_OCCUPIED_THRESHOLD_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -48840,7 +48840,7 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, P_I_R_UNOCCUPIED_TO_OCCUPIED_THRESHOLD_ATTRIBUTE_ID, minInterval, maxInterval); + }, PIR_UNOCCUPIED_TO_OCCUPIED_THRESHOLD_ATTRIBUTE_ID, minInterval, maxInterval); } public void readUltrasonicOccupiedToUnoccupiedDelayAttribute( @@ -54599,7 +54599,7 @@ public static class ThreadBorderRouterManagementCluster extends BaseChipCluster public static final long CLUSTER_ID = 1106L; private static final long BORDER_ROUTER_NAME_ATTRIBUTE_ID = 0L; - private static final long BORDER_AGENT_I_D_ATTRIBUTE_ID = 1L; + private static final long BORDER_AGENT_ID_ATTRIBUTE_ID = 1L; private static final long THREAD_VERSION_ATTRIBUTE_ID = 2L; private static final long INTERFACE_ENABLED_ATTRIBUTE_ID = 3L; private static final long ACTIVE_DATASET_TIMESTAMP_ATTRIBUTE_ID = 4L; @@ -54773,7 +54773,7 @@ public void onSuccess(byte[] tlv) { public void readBorderAgentIDAttribute( OctetStringAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BORDER_AGENT_I_D_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BORDER_AGENT_ID_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -54781,12 +54781,12 @@ public void onSuccess(byte[] tlv) { byte[] value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, BORDER_AGENT_I_D_ATTRIBUTE_ID, true); + }, BORDER_AGENT_ID_ATTRIBUTE_ID, true); } public void subscribeBorderAgentIDAttribute( OctetStringAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BORDER_AGENT_I_D_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BORDER_AGENT_ID_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -54794,7 +54794,7 @@ public void onSuccess(byte[] tlv) { byte[] value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, BORDER_AGENT_I_D_ATTRIBUTE_ID, minInterval, maxInterval); + }, BORDER_AGENT_ID_ATTRIBUTE_ID, minInterval, maxInterval); } public void readThreadVersionAttribute( @@ -55061,7 +55061,7 @@ public void onSuccess(byte[] tlv) { public static class ThreadNetworkDirectoryCluster extends BaseChipCluster { public static final long CLUSTER_ID = 1107L; - private static final long PREFERRED_EXTENDED_PAN_I_D_ATTRIBUTE_ID = 0L; + private static final long PREFERRED_EXTENDED_PAN_ID_ATTRIBUTE_ID = 0L; private static final long THREAD_NETWORKS_ATTRIBUTE_ID = 1L; private static final long THREAD_NETWORK_TABLE_SIZE_ATTRIBUTE_ID = 2L; private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L; @@ -55175,7 +55175,7 @@ public interface AttributeListAttributeCallback extends BaseAttributeCallback { public void readPreferredExtendedPanIDAttribute( PreferredExtendedPanIDAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PREFERRED_EXTENDED_PAN_I_D_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PREFERRED_EXTENDED_PAN_ID_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -55183,7 +55183,7 @@ public void onSuccess(byte[] tlv) { @Nullable byte[] value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, PREFERRED_EXTENDED_PAN_I_D_ATTRIBUTE_ID, true); + }, PREFERRED_EXTENDED_PAN_ID_ATTRIBUTE_ID, true); } public void writePreferredExtendedPanIDAttribute(DefaultClusterCallback callback, byte[] value) { @@ -55192,12 +55192,12 @@ public void writePreferredExtendedPanIDAttribute(DefaultClusterCallback callback public void writePreferredExtendedPanIDAttribute(DefaultClusterCallback callback, byte[] value, int timedWriteTimeoutMs) { BaseTLVType tlvValue = value != null ? new ByteArrayType(value) : new NullType(); - writeAttribute(new WriteAttributesCallbackImpl(callback), PREFERRED_EXTENDED_PAN_I_D_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs); + writeAttribute(new WriteAttributesCallbackImpl(callback), PREFERRED_EXTENDED_PAN_ID_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs); } public void subscribePreferredExtendedPanIDAttribute( PreferredExtendedPanIDAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PREFERRED_EXTENDED_PAN_I_D_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PREFERRED_EXTENDED_PAN_ID_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -55205,7 +55205,7 @@ public void onSuccess(byte[] tlv) { @Nullable byte[] value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, PREFERRED_EXTENDED_PAN_I_D_ATTRIBUTE_ID, minInterval, maxInterval); + }, PREFERRED_EXTENDED_PAN_ID_ATTRIBUTE_ID, minInterval, maxInterval); } public void readThreadNetworksAttribute( @@ -55420,7 +55420,7 @@ public void onSuccess(byte[] tlv) { public static class WakeOnLanCluster extends BaseChipCluster { public static final long CLUSTER_ID = 1283L; - private static final long M_A_C_ADDRESS_ATTRIBUTE_ID = 0L; + private static final long MAC_ADDRESS_ATTRIBUTE_ID = 0L; private static final long LINK_LOCAL_ADDRESS_ATTRIBUTE_ID = 1L; private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L; private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L; @@ -55457,7 +55457,7 @@ public interface AttributeListAttributeCallback extends BaseAttributeCallback { public void readMACAddressAttribute( CharStringAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, M_A_C_ADDRESS_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAC_ADDRESS_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -55465,12 +55465,12 @@ public void onSuccess(byte[] tlv) { String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, M_A_C_ADDRESS_ATTRIBUTE_ID, true); + }, MAC_ADDRESS_ATTRIBUTE_ID, true); } public void subscribeMACAddressAttribute( CharStringAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, M_A_C_ADDRESS_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAC_ADDRESS_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -55478,7 +55478,7 @@ public void onSuccess(byte[] tlv) { String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, M_A_C_ADDRESS_ATTRIBUTE_ID, minInterval, maxInterval); + }, MAC_ADDRESS_ATTRIBUTE_ID, minInterval, maxInterval); } public void readLinkLocalAddressAttribute( @@ -59222,9 +59222,9 @@ public static class ApplicationBasicCluster extends BaseChipCluster { public static final long CLUSTER_ID = 1293L; private static final long VENDOR_NAME_ATTRIBUTE_ID = 0L; - private static final long VENDOR_I_D_ATTRIBUTE_ID = 1L; + private static final long VENDOR_ID_ATTRIBUTE_ID = 1L; private static final long APPLICATION_NAME_ATTRIBUTE_ID = 2L; - private static final long PRODUCT_I_D_ATTRIBUTE_ID = 3L; + private static final long PRODUCT_ID_ATTRIBUTE_ID = 3L; private static final long APPLICATION_ATTRIBUTE_ID = 4L; private static final long STATUS_ATTRIBUTE_ID = 5L; private static final long APPLICATION_VERSION_ATTRIBUTE_ID = 6L; @@ -59298,7 +59298,7 @@ public void onSuccess(byte[] tlv) { public void readVendorIDAttribute( IntegerAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, VENDOR_I_D_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, VENDOR_ID_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -59306,12 +59306,12 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, VENDOR_I_D_ATTRIBUTE_ID, true); + }, VENDOR_ID_ATTRIBUTE_ID, true); } public void subscribeVendorIDAttribute( IntegerAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, VENDOR_I_D_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, VENDOR_ID_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -59319,7 +59319,7 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, VENDOR_I_D_ATTRIBUTE_ID, minInterval, maxInterval); + }, VENDOR_ID_ATTRIBUTE_ID, minInterval, maxInterval); } public void readApplicationNameAttribute( @@ -59350,7 +59350,7 @@ public void onSuccess(byte[] tlv) { public void readProductIDAttribute( IntegerAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRODUCT_I_D_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRODUCT_ID_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -59358,12 +59358,12 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, PRODUCT_I_D_ATTRIBUTE_ID, true); + }, PRODUCT_ID_ATTRIBUTE_ID, true); } public void subscribeProductIDAttribute( IntegerAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRODUCT_I_D_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRODUCT_ID_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -59371,7 +59371,7 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, PRODUCT_I_D_ATTRIBUTE_ID, minInterval, maxInterval); + }, PRODUCT_ID_ATTRIBUTE_ID, minInterval, maxInterval); } public void readApplicationAttribute( diff --git a/src/controller/java/generated/java/chip/devicecontroller/ChipEventStructs.java b/src/controller/java/generated/java/chip/devicecontroller/ChipEventStructs.java index 4e3c6ce296c7b7..160f29d2cf8344 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ChipEventStructs.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ChipEventStructs.java @@ -30,8 +30,8 @@ public static class AccessControlClusterAccessControlEntryChangedEvent { public Integer changeType; public @Nullable ChipStructs.AccessControlClusterAccessControlEntryStruct latestValue; public Integer fabricIndex; - private static final long ADMIN_NODE_I_D_ID = 1L; - private static final long ADMIN_PASSCODE_I_D_ID = 2L; + private static final long ADMIN_NODE_ID_ID = 1L; + private static final long ADMIN_PASSCODE_ID_ID = 2L; private static final long CHANGE_TYPE_ID = 3L; private static final long LATEST_VALUE_ID = 4L; private static final long FABRIC_INDEX_ID = 254L; @@ -52,8 +52,8 @@ public AccessControlClusterAccessControlEntryChangedEvent( public StructType encodeTlv() { ArrayList values = new ArrayList<>(); - values.add(new StructElement(ADMIN_NODE_I_D_ID, adminNodeID != null ? new UIntType(adminNodeID) : new NullType())); - values.add(new StructElement(ADMIN_PASSCODE_I_D_ID, adminPasscodeID != null ? new UIntType(adminPasscodeID) : new NullType())); + values.add(new StructElement(ADMIN_NODE_ID_ID, adminNodeID != null ? new UIntType(adminNodeID) : new NullType())); + values.add(new StructElement(ADMIN_PASSCODE_ID_ID, adminPasscodeID != null ? new UIntType(adminPasscodeID) : new NullType())); values.add(new StructElement(CHANGE_TYPE_ID, new UIntType(changeType))); values.add(new StructElement(LATEST_VALUE_ID, latestValue != null ? latestValue.encodeTlv() : new NullType())); values.add(new StructElement(FABRIC_INDEX_ID, new UIntType(fabricIndex))); @@ -71,12 +71,12 @@ public static AccessControlClusterAccessControlEntryChangedEvent decodeTlv(BaseT @Nullable ChipStructs.AccessControlClusterAccessControlEntryStruct latestValue = null; Integer fabricIndex = null; for (StructElement element: ((StructType)tlvValue).value()) { - if (element.contextTagNum() == ADMIN_NODE_I_D_ID) { + if (element.contextTagNum() == ADMIN_NODE_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); adminNodeID = castingValue.value(Long.class); } - } else if (element.contextTagNum() == ADMIN_PASSCODE_I_D_ID) { + } else if (element.contextTagNum() == ADMIN_PASSCODE_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); adminPasscodeID = castingValue.value(Integer.class); @@ -136,8 +136,8 @@ public static class AccessControlClusterAccessControlExtensionChangedEvent { public Integer changeType; public @Nullable ChipStructs.AccessControlClusterAccessControlExtensionStruct latestValue; public Integer fabricIndex; - private static final long ADMIN_NODE_I_D_ID = 1L; - private static final long ADMIN_PASSCODE_I_D_ID = 2L; + private static final long ADMIN_NODE_ID_ID = 1L; + private static final long ADMIN_PASSCODE_ID_ID = 2L; private static final long CHANGE_TYPE_ID = 3L; private static final long LATEST_VALUE_ID = 4L; private static final long FABRIC_INDEX_ID = 254L; @@ -158,8 +158,8 @@ public AccessControlClusterAccessControlExtensionChangedEvent( public StructType encodeTlv() { ArrayList values = new ArrayList<>(); - values.add(new StructElement(ADMIN_NODE_I_D_ID, adminNodeID != null ? new UIntType(adminNodeID) : new NullType())); - values.add(new StructElement(ADMIN_PASSCODE_I_D_ID, adminPasscodeID != null ? new UIntType(adminPasscodeID) : new NullType())); + values.add(new StructElement(ADMIN_NODE_ID_ID, adminNodeID != null ? new UIntType(adminNodeID) : new NullType())); + values.add(new StructElement(ADMIN_PASSCODE_ID_ID, adminPasscodeID != null ? new UIntType(adminPasscodeID) : new NullType())); values.add(new StructElement(CHANGE_TYPE_ID, new UIntType(changeType))); values.add(new StructElement(LATEST_VALUE_ID, latestValue != null ? latestValue.encodeTlv() : new NullType())); values.add(new StructElement(FABRIC_INDEX_ID, new UIntType(fabricIndex))); @@ -177,12 +177,12 @@ public static AccessControlClusterAccessControlExtensionChangedEvent decodeTlv(B @Nullable ChipStructs.AccessControlClusterAccessControlExtensionStruct latestValue = null; Integer fabricIndex = null; for (StructElement element: ((StructType)tlvValue).value()) { - if (element.contextTagNum() == ADMIN_NODE_I_D_ID) { + if (element.contextTagNum() == ADMIN_NODE_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); adminNodeID = castingValue.value(Long.class); } - } else if (element.contextTagNum() == ADMIN_PASSCODE_I_D_ID) { + } else if (element.contextTagNum() == ADMIN_PASSCODE_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); adminPasscodeID = castingValue.value(Integer.class); @@ -289,7 +289,7 @@ public static class AccessControlClusterFabricRestrictionReviewUpdateEvent { public Integer fabricIndex; private static final long TOKEN_ID = 0L; private static final long INSTRUCTION_ID = 1L; - private static final long REDIRECT_U_R_L_ID = 2L; + private static final long REDIRECT_URL_ID = 2L; private static final long FABRIC_INDEX_ID = 254L; public AccessControlClusterFabricRestrictionReviewUpdateEvent( @@ -308,7 +308,7 @@ public StructType encodeTlv() { ArrayList values = new ArrayList<>(); values.add(new StructElement(TOKEN_ID, new UIntType(token))); values.add(new StructElement(INSTRUCTION_ID, instruction != null ? new StringType(instruction) : new NullType())); - values.add(new StructElement(REDIRECT_U_R_L_ID, redirectURL != null ? new StringType(redirectURL) : new NullType())); + values.add(new StructElement(REDIRECT_URL_ID, redirectURL != null ? new StringType(redirectURL) : new NullType())); values.add(new StructElement(FABRIC_INDEX_ID, new UIntType(fabricIndex))); return new StructType(values); @@ -333,7 +333,7 @@ public static AccessControlClusterFabricRestrictionReviewUpdateEvent decodeTlv(B StringType castingValue = element.value(StringType.class); instruction = castingValue.value(String.class); } - } else if (element.contextTagNum() == REDIRECT_U_R_L_ID) { + } else if (element.contextTagNum() == REDIRECT_URL_ID) { if (element.value(BaseTLVType.class).type() == TLVType.String) { StringType castingValue = element.value(StringType.class); redirectURL = castingValue.value(String.class); @@ -377,8 +377,8 @@ public static class ActionsClusterStateChangedEvent { public Integer actionID; public Long invokeID; public Integer newState; - private static final long ACTION_I_D_ID = 0L; - private static final long INVOKE_I_D_ID = 1L; + private static final long ACTION_ID_ID = 0L; + private static final long INVOKE_ID_ID = 1L; private static final long NEW_STATE_ID = 2L; public ActionsClusterStateChangedEvent( @@ -393,8 +393,8 @@ public ActionsClusterStateChangedEvent( public StructType encodeTlv() { ArrayList values = new ArrayList<>(); - values.add(new StructElement(ACTION_I_D_ID, new UIntType(actionID))); - values.add(new StructElement(INVOKE_I_D_ID, new UIntType(invokeID))); + values.add(new StructElement(ACTION_ID_ID, new UIntType(actionID))); + values.add(new StructElement(INVOKE_ID_ID, new UIntType(invokeID))); values.add(new StructElement(NEW_STATE_ID, new UIntType(newState))); return new StructType(values); @@ -408,12 +408,12 @@ public static ActionsClusterStateChangedEvent decodeTlv(BaseTLVType tlvValue) { Long invokeID = null; Integer newState = null; for (StructElement element: ((StructType)tlvValue).value()) { - if (element.contextTagNum() == ACTION_I_D_ID) { + if (element.contextTagNum() == ACTION_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); actionID = castingValue.value(Integer.class); } - } else if (element.contextTagNum() == INVOKE_I_D_ID) { + } else if (element.contextTagNum() == INVOKE_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); invokeID = castingValue.value(Long.class); @@ -454,8 +454,8 @@ public static class ActionsClusterActionFailedEvent { public Long invokeID; public Integer newState; public Integer error; - private static final long ACTION_I_D_ID = 0L; - private static final long INVOKE_I_D_ID = 1L; + private static final long ACTION_ID_ID = 0L; + private static final long INVOKE_ID_ID = 1L; private static final long NEW_STATE_ID = 2L; private static final long ERROR_ID = 3L; @@ -473,8 +473,8 @@ public ActionsClusterActionFailedEvent( public StructType encodeTlv() { ArrayList values = new ArrayList<>(); - values.add(new StructElement(ACTION_I_D_ID, new UIntType(actionID))); - values.add(new StructElement(INVOKE_I_D_ID, new UIntType(invokeID))); + values.add(new StructElement(ACTION_ID_ID, new UIntType(actionID))); + values.add(new StructElement(INVOKE_ID_ID, new UIntType(invokeID))); values.add(new StructElement(NEW_STATE_ID, new UIntType(newState))); values.add(new StructElement(ERROR_ID, new UIntType(error))); @@ -490,12 +490,12 @@ public static ActionsClusterActionFailedEvent decodeTlv(BaseTLVType tlvValue) { Integer newState = null; Integer error = null; for (StructElement element: ((StructType)tlvValue).value()) { - if (element.contextTagNum() == ACTION_I_D_ID) { + if (element.contextTagNum() == ACTION_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); actionID = castingValue.value(Integer.class); } - } else if (element.contextTagNum() == INVOKE_I_D_ID) { + } else if (element.contextTagNum() == INVOKE_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); invokeID = castingValue.value(Long.class); @@ -801,7 +801,7 @@ public static class OtaSoftwareUpdateRequestorClusterVersionAppliedEvent { public Long softwareVersion; public Integer productID; private static final long SOFTWARE_VERSION_ID = 0L; - private static final long PRODUCT_I_D_ID = 1L; + private static final long PRODUCT_ID_ID = 1L; public OtaSoftwareUpdateRequestorClusterVersionAppliedEvent( Long softwareVersion, @@ -814,7 +814,7 @@ public OtaSoftwareUpdateRequestorClusterVersionAppliedEvent( public StructType encodeTlv() { ArrayList values = new ArrayList<>(); values.add(new StructElement(SOFTWARE_VERSION_ID, new UIntType(softwareVersion))); - values.add(new StructElement(PRODUCT_I_D_ID, new UIntType(productID))); + values.add(new StructElement(PRODUCT_ID_ID, new UIntType(productID))); return new StructType(values); } @@ -831,7 +831,7 @@ public static OtaSoftwareUpdateRequestorClusterVersionAppliedEvent decodeTlv(Bas UIntType castingValue = element.value(UIntType.class); softwareVersion = castingValue.value(Long.class); } - } else if (element.contextTagNum() == PRODUCT_I_D_ID) { + } else if (element.contextTagNum() == PRODUCT_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); productID = castingValue.value(Integer.class); @@ -1727,7 +1727,7 @@ public String toString() { } public static class TimeSynchronizationClusterDSTStatusEvent { public Boolean DSTOffsetActive; - private static final long D_S_T_OFFSET_ACTIVE_ID = 0L; + private static final long DST_OFFSET_ACTIVE_ID = 0L; public TimeSynchronizationClusterDSTStatusEvent( Boolean DSTOffsetActive @@ -1737,7 +1737,7 @@ public TimeSynchronizationClusterDSTStatusEvent( public StructType encodeTlv() { ArrayList values = new ArrayList<>(); - values.add(new StructElement(D_S_T_OFFSET_ACTIVE_ID, new BooleanType(DSTOffsetActive))); + values.add(new StructElement(DST_OFFSET_ACTIVE_ID, new BooleanType(DSTOffsetActive))); return new StructType(values); } @@ -1748,7 +1748,7 @@ public static TimeSynchronizationClusterDSTStatusEvent decodeTlv(BaseTLVType tlv } Boolean DSTOffsetActive = null; for (StructElement element: ((StructType)tlvValue).value()) { - if (element.contextTagNum() == D_S_T_OFFSET_ACTIVE_ID) { + if (element.contextTagNum() == DST_OFFSET_ACTIVE_ID) { if (element.value(BaseTLVType.class).type() == TLVType.Boolean) { BooleanType castingValue = element.value(BooleanType.class); DSTOffsetActive = castingValue.value(Boolean.class); @@ -3893,7 +3893,7 @@ public static class DemandResponseLoadControlClusterLoadControlEventStatusChange public @Nullable Optional dutyCycleControl; public @Nullable Optional powerSavingsControl; public @Nullable Optional heatingSourceControl; - private static final long EVENT_I_D_ID = 0L; + private static final long EVENT_ID_ID = 0L; private static final long TRANSITION_INDEX_ID = 1L; private static final long STATUS_ID = 2L; private static final long CRITICALITY_ID = 3L; @@ -3930,7 +3930,7 @@ public DemandResponseLoadControlClusterLoadControlEventStatusChangeEvent( public StructType encodeTlv() { ArrayList values = new ArrayList<>(); - values.add(new StructElement(EVENT_I_D_ID, new ByteArrayType(eventID))); + values.add(new StructElement(EVENT_ID_ID, new ByteArrayType(eventID))); values.add(new StructElement(TRANSITION_INDEX_ID, transitionIndex != null ? new UIntType(transitionIndex) : new NullType())); values.add(new StructElement(STATUS_ID, new UIntType(status))); values.add(new StructElement(CRITICALITY_ID, new UIntType(criticality))); @@ -3959,7 +3959,7 @@ public static DemandResponseLoadControlClusterLoadControlEventStatusChangeEvent @Nullable Optional powerSavingsControl = null; @Nullable Optional heatingSourceControl = null; for (StructElement element: ((StructType)tlvValue).value()) { - if (element.contextTagNum() == EVENT_I_D_ID) { + if (element.contextTagNum() == EVENT_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) { ByteArrayType castingValue = element.value(ByteArrayType.class); eventID = castingValue.value(byte[].class); @@ -4065,7 +4065,7 @@ public String toString() { } public static class MessagesClusterMessageQueuedEvent { public byte[] messageID; - private static final long MESSAGE_I_D_ID = 0L; + private static final long MESSAGE_ID_ID = 0L; public MessagesClusterMessageQueuedEvent( byte[] messageID @@ -4075,7 +4075,7 @@ public MessagesClusterMessageQueuedEvent( public StructType encodeTlv() { ArrayList values = new ArrayList<>(); - values.add(new StructElement(MESSAGE_I_D_ID, new ByteArrayType(messageID))); + values.add(new StructElement(MESSAGE_ID_ID, new ByteArrayType(messageID))); return new StructType(values); } @@ -4086,7 +4086,7 @@ public static MessagesClusterMessageQueuedEvent decodeTlv(BaseTLVType tlvValue) } byte[] messageID = null; for (StructElement element: ((StructType)tlvValue).value()) { - if (element.contextTagNum() == MESSAGE_I_D_ID) { + if (element.contextTagNum() == MESSAGE_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) { ByteArrayType castingValue = element.value(ByteArrayType.class); messageID = castingValue.value(byte[].class); @@ -4111,7 +4111,7 @@ public String toString() { } public static class MessagesClusterMessagePresentedEvent { public byte[] messageID; - private static final long MESSAGE_I_D_ID = 0L; + private static final long MESSAGE_ID_ID = 0L; public MessagesClusterMessagePresentedEvent( byte[] messageID @@ -4121,7 +4121,7 @@ public MessagesClusterMessagePresentedEvent( public StructType encodeTlv() { ArrayList values = new ArrayList<>(); - values.add(new StructElement(MESSAGE_I_D_ID, new ByteArrayType(messageID))); + values.add(new StructElement(MESSAGE_ID_ID, new ByteArrayType(messageID))); return new StructType(values); } @@ -4132,7 +4132,7 @@ public static MessagesClusterMessagePresentedEvent decodeTlv(BaseTLVType tlvValu } byte[] messageID = null; for (StructElement element: ((StructType)tlvValue).value()) { - if (element.contextTagNum() == MESSAGE_I_D_ID) { + if (element.contextTagNum() == MESSAGE_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) { ByteArrayType castingValue = element.value(ByteArrayType.class); messageID = castingValue.value(byte[].class); @@ -4160,8 +4160,8 @@ public static class MessagesClusterMessageCompleteEvent { public @Nullable Optional responseID; public @Nullable Optional reply; public @Nullable Integer futureMessagesPreference; - private static final long MESSAGE_I_D_ID = 0L; - private static final long RESPONSE_I_D_ID = 1L; + private static final long MESSAGE_ID_ID = 0L; + private static final long RESPONSE_ID_ID = 1L; private static final long REPLY_ID = 2L; private static final long FUTURE_MESSAGES_PREFERENCE_ID = 3L; @@ -4179,8 +4179,8 @@ public MessagesClusterMessageCompleteEvent( public StructType encodeTlv() { ArrayList values = new ArrayList<>(); - values.add(new StructElement(MESSAGE_I_D_ID, new ByteArrayType(messageID))); - values.add(new StructElement(RESPONSE_I_D_ID, responseID != null ? responseID.map((nonOptionalresponseID) -> new UIntType(nonOptionalresponseID)).orElse(new EmptyType()) : new NullType())); + values.add(new StructElement(MESSAGE_ID_ID, new ByteArrayType(messageID))); + values.add(new StructElement(RESPONSE_ID_ID, responseID != null ? responseID.map((nonOptionalresponseID) -> new UIntType(nonOptionalresponseID)).orElse(new EmptyType()) : new NullType())); values.add(new StructElement(REPLY_ID, reply != null ? reply.map((nonOptionalreply) -> new StringType(nonOptionalreply)).orElse(new EmptyType()) : new NullType())); values.add(new StructElement(FUTURE_MESSAGES_PREFERENCE_ID, futureMessagesPreference != null ? new UIntType(futureMessagesPreference) : new NullType())); @@ -4196,12 +4196,12 @@ public static MessagesClusterMessageCompleteEvent decodeTlv(BaseTLVType tlvValue @Nullable Optional reply = null; @Nullable Integer futureMessagesPreference = null; for (StructElement element: ((StructType)tlvValue).value()) { - if (element.contextTagNum() == MESSAGE_I_D_ID) { + if (element.contextTagNum() == MESSAGE_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) { ByteArrayType castingValue = element.value(ByteArrayType.class); messageID = castingValue.value(byte[].class); } - } else if (element.contextTagNum() == RESPONSE_I_D_ID) { + } else if (element.contextTagNum() == RESPONSE_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); responseID = Optional.of(castingValue.value(Long.class)); @@ -4426,7 +4426,7 @@ public String toString() { } public static class EnergyEvseClusterEVConnectedEvent { public Long sessionID; - private static final long SESSION_I_D_ID = 0L; + private static final long SESSION_ID_ID = 0L; public EnergyEvseClusterEVConnectedEvent( Long sessionID @@ -4436,7 +4436,7 @@ public EnergyEvseClusterEVConnectedEvent( public StructType encodeTlv() { ArrayList values = new ArrayList<>(); - values.add(new StructElement(SESSION_I_D_ID, new UIntType(sessionID))); + values.add(new StructElement(SESSION_ID_ID, new UIntType(sessionID))); return new StructType(values); } @@ -4447,7 +4447,7 @@ public static EnergyEvseClusterEVConnectedEvent decodeTlv(BaseTLVType tlvValue) } Long sessionID = null; for (StructElement element: ((StructType)tlvValue).value()) { - if (element.contextTagNum() == SESSION_I_D_ID) { + if (element.contextTagNum() == SESSION_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); sessionID = castingValue.value(Long.class); @@ -4476,7 +4476,7 @@ public static class EnergyEvseClusterEVNotDetectedEvent { public Long sessionDuration; public Long sessionEnergyCharged; public Optional sessionEnergyDischarged; - private static final long SESSION_I_D_ID = 0L; + private static final long SESSION_ID_ID = 0L; private static final long STATE_ID = 1L; private static final long SESSION_DURATION_ID = 2L; private static final long SESSION_ENERGY_CHARGED_ID = 3L; @@ -4498,7 +4498,7 @@ public EnergyEvseClusterEVNotDetectedEvent( public StructType encodeTlv() { ArrayList values = new ArrayList<>(); - values.add(new StructElement(SESSION_I_D_ID, new UIntType(sessionID))); + values.add(new StructElement(SESSION_ID_ID, new UIntType(sessionID))); values.add(new StructElement(STATE_ID, new UIntType(state))); values.add(new StructElement(SESSION_DURATION_ID, new UIntType(sessionDuration))); values.add(new StructElement(SESSION_ENERGY_CHARGED_ID, new IntType(sessionEnergyCharged))); @@ -4517,7 +4517,7 @@ public static EnergyEvseClusterEVNotDetectedEvent decodeTlv(BaseTLVType tlvValue Long sessionEnergyCharged = null; Optional sessionEnergyDischarged = Optional.empty(); for (StructElement element: ((StructType)tlvValue).value()) { - if (element.contextTagNum() == SESSION_I_D_ID) { + if (element.contextTagNum() == SESSION_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); sessionID = castingValue.value(Long.class); @@ -4581,7 +4581,7 @@ public static class EnergyEvseClusterEnergyTransferStartedEvent { public Integer state; public Long maximumCurrent; public Optional maximumDischargeCurrent; - private static final long SESSION_I_D_ID = 0L; + private static final long SESSION_ID_ID = 0L; private static final long STATE_ID = 1L; private static final long MAXIMUM_CURRENT_ID = 2L; private static final long MAXIMUM_DISCHARGE_CURRENT_ID = 3L; @@ -4600,7 +4600,7 @@ public EnergyEvseClusterEnergyTransferStartedEvent( public StructType encodeTlv() { ArrayList values = new ArrayList<>(); - values.add(new StructElement(SESSION_I_D_ID, new UIntType(sessionID))); + values.add(new StructElement(SESSION_ID_ID, new UIntType(sessionID))); values.add(new StructElement(STATE_ID, new UIntType(state))); values.add(new StructElement(MAXIMUM_CURRENT_ID, new IntType(maximumCurrent))); values.add(new StructElement(MAXIMUM_DISCHARGE_CURRENT_ID, maximumDischargeCurrent.map((nonOptionalmaximumDischargeCurrent) -> new IntType(nonOptionalmaximumDischargeCurrent)).orElse(new EmptyType()))); @@ -4617,7 +4617,7 @@ public static EnergyEvseClusterEnergyTransferStartedEvent decodeTlv(BaseTLVType Long maximumCurrent = null; Optional maximumDischargeCurrent = Optional.empty(); for (StructElement element: ((StructType)tlvValue).value()) { - if (element.contextTagNum() == SESSION_I_D_ID) { + if (element.contextTagNum() == SESSION_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); sessionID = castingValue.value(Long.class); @@ -4673,7 +4673,7 @@ public static class EnergyEvseClusterEnergyTransferStoppedEvent { public Integer reason; public Long energyTransferred; public Optional energyDischarged; - private static final long SESSION_I_D_ID = 0L; + private static final long SESSION_ID_ID = 0L; private static final long STATE_ID = 1L; private static final long REASON_ID = 2L; private static final long ENERGY_TRANSFERRED_ID = 4L; @@ -4695,7 +4695,7 @@ public EnergyEvseClusterEnergyTransferStoppedEvent( public StructType encodeTlv() { ArrayList values = new ArrayList<>(); - values.add(new StructElement(SESSION_I_D_ID, new UIntType(sessionID))); + values.add(new StructElement(SESSION_ID_ID, new UIntType(sessionID))); values.add(new StructElement(STATE_ID, new UIntType(state))); values.add(new StructElement(REASON_ID, new UIntType(reason))); values.add(new StructElement(ENERGY_TRANSFERRED_ID, new IntType(energyTransferred))); @@ -4714,7 +4714,7 @@ public static EnergyEvseClusterEnergyTransferStoppedEvent decodeTlv(BaseTLVType Long energyTransferred = null; Optional energyDischarged = Optional.empty(); for (StructElement element: ((StructType)tlvValue).value()) { - if (element.contextTagNum() == SESSION_I_D_ID) { + if (element.contextTagNum() == SESSION_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); sessionID = castingValue.value(Long.class); @@ -4778,7 +4778,7 @@ public static class EnergyEvseClusterFaultEvent { public Integer state; public Integer faultStatePreviousState; public Integer faultStateCurrentState; - private static final long SESSION_I_D_ID = 0L; + private static final long SESSION_ID_ID = 0L; private static final long STATE_ID = 1L; private static final long FAULT_STATE_PREVIOUS_STATE_ID = 2L; private static final long FAULT_STATE_CURRENT_STATE_ID = 4L; @@ -4797,7 +4797,7 @@ public EnergyEvseClusterFaultEvent( public StructType encodeTlv() { ArrayList values = new ArrayList<>(); - values.add(new StructElement(SESSION_I_D_ID, sessionID != null ? new UIntType(sessionID) : new NullType())); + values.add(new StructElement(SESSION_ID_ID, sessionID != null ? new UIntType(sessionID) : new NullType())); values.add(new StructElement(STATE_ID, new UIntType(state))); values.add(new StructElement(FAULT_STATE_PREVIOUS_STATE_ID, new UIntType(faultStatePreviousState))); values.add(new StructElement(FAULT_STATE_CURRENT_STATE_ID, new UIntType(faultStateCurrentState))); @@ -4814,7 +4814,7 @@ public static EnergyEvseClusterFaultEvent decodeTlv(BaseTLVType tlvValue) { Integer faultStatePreviousState = null; Integer faultStateCurrentState = null; for (StructElement element: ((StructType)tlvValue).value()) { - if (element.contextTagNum() == SESSION_I_D_ID) { + if (element.contextTagNum() == SESSION_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); sessionID = castingValue.value(Long.class); diff --git a/src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java b/src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java index 2871071475fe69..70e9ba6b1c6ef9 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java @@ -91,7 +91,7 @@ public static class DescriptorClusterSemanticTagStruct { public Integer tag; public @Nullable Optional label; private static final long MFG_CODE_ID = 0L; - private static final long NAMESPACE_I_D_ID = 1L; + private static final long NAMESPACE_ID_ID = 1L; private static final long TAG_ID = 2L; private static final long LABEL_ID = 3L; @@ -110,7 +110,7 @@ public DescriptorClusterSemanticTagStruct( public StructType encodeTlv() { ArrayList values = new ArrayList<>(); values.add(new StructElement(MFG_CODE_ID, mfgCode != null ? new UIntType(mfgCode) : new NullType())); - values.add(new StructElement(NAMESPACE_I_D_ID, new UIntType(namespaceID))); + values.add(new StructElement(NAMESPACE_ID_ID, new UIntType(namespaceID))); values.add(new StructElement(TAG_ID, new UIntType(tag))); values.add(new StructElement(LABEL_ID, label != null ? label.map((nonOptionallabel) -> new StringType(nonOptionallabel)).orElse(new EmptyType()) : new NullType())); @@ -131,7 +131,7 @@ public static DescriptorClusterSemanticTagStruct decodeTlv(BaseTLVType tlvValue) UIntType castingValue = element.value(UIntType.class); mfgCode = castingValue.value(Integer.class); } - } else if (element.contextTagNum() == NAMESPACE_I_D_ID) { + } else if (element.contextTagNum() == NAMESPACE_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); namespaceID = castingValue.value(Integer.class); @@ -760,10 +760,10 @@ public static class ActionsClusterActionStruct { public Integer endpointListID; public Integer supportedCommands; public Integer state; - private static final long ACTION_I_D_ID = 0L; + private static final long ACTION_ID_ID = 0L; private static final long NAME_ID = 1L; private static final long TYPE_ID = 2L; - private static final long ENDPOINT_LIST_I_D_ID = 3L; + private static final long ENDPOINT_LIST_ID_ID = 3L; private static final long SUPPORTED_COMMANDS_ID = 4L; private static final long STATE_ID = 5L; @@ -785,10 +785,10 @@ public ActionsClusterActionStruct( public StructType encodeTlv() { ArrayList values = new ArrayList<>(); - values.add(new StructElement(ACTION_I_D_ID, new UIntType(actionID))); + values.add(new StructElement(ACTION_ID_ID, new UIntType(actionID))); values.add(new StructElement(NAME_ID, new StringType(name))); values.add(new StructElement(TYPE_ID, new UIntType(type))); - values.add(new StructElement(ENDPOINT_LIST_I_D_ID, new UIntType(endpointListID))); + values.add(new StructElement(ENDPOINT_LIST_ID_ID, new UIntType(endpointListID))); values.add(new StructElement(SUPPORTED_COMMANDS_ID, new UIntType(supportedCommands))); values.add(new StructElement(STATE_ID, new UIntType(state))); @@ -806,7 +806,7 @@ public static ActionsClusterActionStruct decodeTlv(BaseTLVType tlvValue) { Integer supportedCommands = null; Integer state = null; for (StructElement element: ((StructType)tlvValue).value()) { - if (element.contextTagNum() == ACTION_I_D_ID) { + if (element.contextTagNum() == ACTION_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); actionID = castingValue.value(Integer.class); @@ -821,7 +821,7 @@ public static ActionsClusterActionStruct decodeTlv(BaseTLVType tlvValue) { UIntType castingValue = element.value(UIntType.class); type = castingValue.value(Integer.class); } - } else if (element.contextTagNum() == ENDPOINT_LIST_I_D_ID) { + } else if (element.contextTagNum() == ENDPOINT_LIST_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); endpointListID = castingValue.value(Integer.class); @@ -879,7 +879,7 @@ public static class ActionsClusterEndpointListStruct { public String name; public Integer type; public ArrayList endpoints; - private static final long ENDPOINT_LIST_I_D_ID = 0L; + private static final long ENDPOINT_LIST_ID_ID = 0L; private static final long NAME_ID = 1L; private static final long TYPE_ID = 2L; private static final long ENDPOINTS_ID = 3L; @@ -898,7 +898,7 @@ public ActionsClusterEndpointListStruct( public StructType encodeTlv() { ArrayList values = new ArrayList<>(); - values.add(new StructElement(ENDPOINT_LIST_I_D_ID, new UIntType(endpointListID))); + values.add(new StructElement(ENDPOINT_LIST_ID_ID, new UIntType(endpointListID))); values.add(new StructElement(NAME_ID, new StringType(name))); values.add(new StructElement(TYPE_ID, new UIntType(type))); values.add(new StructElement(ENDPOINTS_ID, ArrayType.generateArrayType(endpoints, (elementendpoints) -> new UIntType(elementendpoints)))); @@ -915,7 +915,7 @@ public static ActionsClusterEndpointListStruct decodeTlv(BaseTLVType tlvValue) { Integer type = null; ArrayList endpoints = null; for (StructElement element: ((StructType)tlvValue).value()) { - if (element.contextTagNum() == ENDPOINT_LIST_I_D_ID) { + if (element.contextTagNum() == ENDPOINT_LIST_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); endpointListID = castingValue.value(Integer.class); @@ -1091,7 +1091,7 @@ public static class OtaSoftwareUpdateRequestorClusterProviderLocation { public Long providerNodeID; public Integer endpoint; public Integer fabricIndex; - private static final long PROVIDER_NODE_I_D_ID = 1L; + private static final long PROVIDER_NODE_ID_ID = 1L; private static final long ENDPOINT_ID = 2L; private static final long FABRIC_INDEX_ID = 254L; @@ -1107,7 +1107,7 @@ public OtaSoftwareUpdateRequestorClusterProviderLocation( public StructType encodeTlv() { ArrayList values = new ArrayList<>(); - values.add(new StructElement(PROVIDER_NODE_I_D_ID, new UIntType(providerNodeID))); + values.add(new StructElement(PROVIDER_NODE_ID_ID, new UIntType(providerNodeID))); values.add(new StructElement(ENDPOINT_ID, new UIntType(endpoint))); values.add(new StructElement(FABRIC_INDEX_ID, new UIntType(fabricIndex))); @@ -1122,7 +1122,7 @@ public static OtaSoftwareUpdateRequestorClusterProviderLocation decodeTlv(BaseTL Integer endpoint = null; Integer fabricIndex = null; for (StructElement element: ((StructType)tlvValue).value()) { - if (element.contextTagNum() == PROVIDER_NODE_I_D_ID) { + if (element.contextTagNum() == PROVIDER_NODE_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); providerNodeID = castingValue.value(Long.class); @@ -1412,7 +1412,7 @@ public static class NetworkCommissioningClusterNetworkInfoStruct { public Boolean connected; public @Nullable Optional networkIdentifier; public @Nullable Optional clientIdentifier; - private static final long NETWORK_I_D_ID = 0L; + private static final long NETWORK_ID_ID = 0L; private static final long CONNECTED_ID = 1L; private static final long NETWORK_IDENTIFIER_ID = 2L; private static final long CLIENT_IDENTIFIER_ID = 3L; @@ -1431,7 +1431,7 @@ public NetworkCommissioningClusterNetworkInfoStruct( public StructType encodeTlv() { ArrayList values = new ArrayList<>(); - values.add(new StructElement(NETWORK_I_D_ID, new ByteArrayType(networkID))); + values.add(new StructElement(NETWORK_ID_ID, new ByteArrayType(networkID))); values.add(new StructElement(CONNECTED_ID, new BooleanType(connected))); values.add(new StructElement(NETWORK_IDENTIFIER_ID, networkIdentifier != null ? networkIdentifier.map((nonOptionalnetworkIdentifier) -> new ByteArrayType(nonOptionalnetworkIdentifier)).orElse(new EmptyType()) : new NullType())); values.add(new StructElement(CLIENT_IDENTIFIER_ID, clientIdentifier != null ? clientIdentifier.map((nonOptionalclientIdentifier) -> new ByteArrayType(nonOptionalclientIdentifier)).orElse(new EmptyType()) : new NullType())); @@ -1448,7 +1448,7 @@ public static NetworkCommissioningClusterNetworkInfoStruct decodeTlv(BaseTLVType @Nullable Optional networkIdentifier = null; @Nullable Optional clientIdentifier = null; for (StructElement element: ((StructType)tlvValue).value()) { - if (element.contextTagNum() == NETWORK_I_D_ID) { + if (element.contextTagNum() == NETWORK_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) { ByteArrayType castingValue = element.value(ByteArrayType.class); networkID = castingValue.value(byte[].class); @@ -2495,8 +2495,8 @@ public static class ThreadNetworkDiagnosticsClusterRouteTableStruct { private static final long ROUTER_ID_ID = 2L; private static final long NEXT_HOP_ID = 3L; private static final long PATH_COST_ID = 4L; - private static final long L_Q_I_IN_ID = 5L; - private static final long L_Q_I_OUT_ID = 6L; + private static final long LQI_IN_ID = 5L; + private static final long LQI_OUT_ID = 6L; private static final long AGE_ID = 7L; private static final long ALLOCATED_ID = 8L; private static final long LINK_ESTABLISHED_ID = 9L; @@ -2532,8 +2532,8 @@ public StructType encodeTlv() { values.add(new StructElement(ROUTER_ID_ID, new UIntType(routerId))); values.add(new StructElement(NEXT_HOP_ID, new UIntType(nextHop))); values.add(new StructElement(PATH_COST_ID, new UIntType(pathCost))); - values.add(new StructElement(L_Q_I_IN_ID, new UIntType(LQIIn))); - values.add(new StructElement(L_Q_I_OUT_ID, new UIntType(LQIOut))); + values.add(new StructElement(LQI_IN_ID, new UIntType(LQIIn))); + values.add(new StructElement(LQI_OUT_ID, new UIntType(LQIOut))); values.add(new StructElement(AGE_ID, new UIntType(age))); values.add(new StructElement(ALLOCATED_ID, new BooleanType(allocated))); values.add(new StructElement(LINK_ESTABLISHED_ID, new BooleanType(linkEstablished))); @@ -2581,12 +2581,12 @@ public static ThreadNetworkDiagnosticsClusterRouteTableStruct decodeTlv(BaseTLVT UIntType castingValue = element.value(UIntType.class); pathCost = castingValue.value(Integer.class); } - } else if (element.contextTagNum() == L_Q_I_IN_ID) { + } else if (element.contextTagNum() == LQI_IN_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); LQIIn = castingValue.value(Integer.class); } - } else if (element.contextTagNum() == L_Q_I_OUT_ID) { + } else if (element.contextTagNum() == LQI_OUT_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); LQIOut = castingValue.value(Integer.class); @@ -2800,7 +2800,7 @@ public String toString() { public static class TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct { public Long nodeID; public Integer endpoint; - private static final long NODE_I_D_ID = 0L; + private static final long NODE_ID_ID = 0L; private static final long ENDPOINT_ID = 1L; public TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct( @@ -2813,7 +2813,7 @@ public TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct( public StructType encodeTlv() { ArrayList values = new ArrayList<>(); - values.add(new StructElement(NODE_I_D_ID, new UIntType(nodeID))); + values.add(new StructElement(NODE_ID_ID, new UIntType(nodeID))); values.add(new StructElement(ENDPOINT_ID, new UIntType(endpoint))); return new StructType(values); @@ -2826,7 +2826,7 @@ public static TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct deco Long nodeID = null; Integer endpoint = null; for (StructElement element: ((StructType)tlvValue).value()) { - if (element.contextTagNum() == NODE_I_D_ID) { + if (element.contextTagNum() == NODE_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); nodeID = castingValue.value(Long.class); @@ -2939,7 +2939,7 @@ public static class TimeSynchronizationClusterTrustedTimeSourceStruct { public Long nodeID; public Integer endpoint; private static final long FABRIC_INDEX_ID = 0L; - private static final long NODE_I_D_ID = 1L; + private static final long NODE_ID_ID = 1L; private static final long ENDPOINT_ID = 2L; public TimeSynchronizationClusterTrustedTimeSourceStruct( @@ -2955,7 +2955,7 @@ public TimeSynchronizationClusterTrustedTimeSourceStruct( public StructType encodeTlv() { ArrayList values = new ArrayList<>(); values.add(new StructElement(FABRIC_INDEX_ID, new UIntType(fabricIndex))); - values.add(new StructElement(NODE_I_D_ID, new UIntType(nodeID))); + values.add(new StructElement(NODE_ID_ID, new UIntType(nodeID))); values.add(new StructElement(ENDPOINT_ID, new UIntType(endpoint))); return new StructType(values); @@ -2974,7 +2974,7 @@ public static TimeSynchronizationClusterTrustedTimeSourceStruct decodeTlv(BaseTL UIntType castingValue = element.value(UIntType.class); fabricIndex = castingValue.value(Integer.class); } - } else if (element.contextTagNum() == NODE_I_D_ID) { + } else if (element.contextTagNum() == NODE_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); nodeID = castingValue.value(Long.class); @@ -3079,9 +3079,9 @@ public static class OperationalCredentialsClusterFabricDescriptorStruct { public String label; public Integer fabricIndex; private static final long ROOT_PUBLIC_KEY_ID = 1L; - private static final long VENDOR_I_D_ID = 2L; - private static final long FABRIC_I_D_ID = 3L; - private static final long NODE_I_D_ID = 4L; + private static final long VENDOR_ID_ID = 2L; + private static final long FABRIC_ID_ID = 3L; + private static final long NODE_ID_ID = 4L; private static final long LABEL_ID = 5L; private static final long FABRIC_INDEX_ID = 254L; @@ -3104,9 +3104,9 @@ public OperationalCredentialsClusterFabricDescriptorStruct( public StructType encodeTlv() { ArrayList values = new ArrayList<>(); values.add(new StructElement(ROOT_PUBLIC_KEY_ID, new ByteArrayType(rootPublicKey))); - values.add(new StructElement(VENDOR_I_D_ID, new UIntType(vendorID))); - values.add(new StructElement(FABRIC_I_D_ID, new UIntType(fabricID))); - values.add(new StructElement(NODE_I_D_ID, new UIntType(nodeID))); + values.add(new StructElement(VENDOR_ID_ID, new UIntType(vendorID))); + values.add(new StructElement(FABRIC_ID_ID, new UIntType(fabricID))); + values.add(new StructElement(NODE_ID_ID, new UIntType(nodeID))); values.add(new StructElement(LABEL_ID, new StringType(label))); values.add(new StructElement(FABRIC_INDEX_ID, new UIntType(fabricIndex))); @@ -3129,17 +3129,17 @@ public static OperationalCredentialsClusterFabricDescriptorStruct decodeTlv(Base ByteArrayType castingValue = element.value(ByteArrayType.class); rootPublicKey = castingValue.value(byte[].class); } - } else if (element.contextTagNum() == VENDOR_I_D_ID) { + } else if (element.contextTagNum() == VENDOR_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); vendorID = castingValue.value(Integer.class); } - } else if (element.contextTagNum() == FABRIC_I_D_ID) { + } else if (element.contextTagNum() == FABRIC_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); fabricID = castingValue.value(Long.class); } - } else if (element.contextTagNum() == NODE_I_D_ID) { + } else if (element.contextTagNum() == NODE_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); nodeID = castingValue.value(Long.class); @@ -3364,7 +3364,7 @@ public static class GroupKeyManagementClusterGroupKeyMapStruct { public Integer groupKeySetID; public Integer fabricIndex; private static final long GROUP_ID_ID = 1L; - private static final long GROUP_KEY_SET_I_D_ID = 2L; + private static final long GROUP_KEY_SET_ID_ID = 2L; private static final long FABRIC_INDEX_ID = 254L; public GroupKeyManagementClusterGroupKeyMapStruct( @@ -3380,7 +3380,7 @@ public GroupKeyManagementClusterGroupKeyMapStruct( public StructType encodeTlv() { ArrayList values = new ArrayList<>(); values.add(new StructElement(GROUP_ID_ID, new UIntType(groupId))); - values.add(new StructElement(GROUP_KEY_SET_I_D_ID, new UIntType(groupKeySetID))); + values.add(new StructElement(GROUP_KEY_SET_ID_ID, new UIntType(groupKeySetID))); values.add(new StructElement(FABRIC_INDEX_ID, new UIntType(fabricIndex))); return new StructType(values); @@ -3399,7 +3399,7 @@ public static GroupKeyManagementClusterGroupKeyMapStruct decodeTlv(BaseTLVType t UIntType castingValue = element.value(UIntType.class); groupId = castingValue.value(Integer.class); } - } else if (element.contextTagNum() == GROUP_KEY_SET_I_D_ID) { + } else if (element.contextTagNum() == GROUP_KEY_SET_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); groupKeySetID = castingValue.value(Integer.class); @@ -3444,7 +3444,7 @@ public static class GroupKeyManagementClusterGroupKeySetStruct { public @Nullable Long epochStartTime1; public @Nullable byte[] epochKey2; public @Nullable Long epochStartTime2; - private static final long GROUP_KEY_SET_I_D_ID = 0L; + private static final long GROUP_KEY_SET_ID_ID = 0L; private static final long GROUP_KEY_SECURITY_POLICY_ID = 1L; private static final long EPOCH_KEY0_ID = 2L; private static final long EPOCH_START_TIME0_ID = 3L; @@ -3475,7 +3475,7 @@ public GroupKeyManagementClusterGroupKeySetStruct( public StructType encodeTlv() { ArrayList values = new ArrayList<>(); - values.add(new StructElement(GROUP_KEY_SET_I_D_ID, new UIntType(groupKeySetID))); + values.add(new StructElement(GROUP_KEY_SET_ID_ID, new UIntType(groupKeySetID))); values.add(new StructElement(GROUP_KEY_SECURITY_POLICY_ID, new UIntType(groupKeySecurityPolicy))); values.add(new StructElement(EPOCH_KEY0_ID, epochKey0 != null ? new ByteArrayType(epochKey0) : new NullType())); values.add(new StructElement(EPOCH_START_TIME0_ID, epochStartTime0 != null ? new UIntType(epochStartTime0) : new NullType())); @@ -3500,7 +3500,7 @@ public static GroupKeyManagementClusterGroupKeySetStruct decodeTlv(BaseTLVType t @Nullable byte[] epochKey2 = null; @Nullable Long epochStartTime2 = null; for (StructElement element: ((StructType)tlvValue).value()) { - if (element.contextTagNum() == GROUP_KEY_SET_I_D_ID) { + if (element.contextTagNum() == GROUP_KEY_SET_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); groupKeySetID = castingValue.value(Integer.class); @@ -3713,7 +3713,7 @@ public static class IcdManagementClusterMonitoringRegistrationStruct { public Long monitoredSubject; public Integer clientType; public Integer fabricIndex; - private static final long CHECK_IN_NODE_I_D_ID = 1L; + private static final long CHECK_IN_NODE_ID_ID = 1L; private static final long MONITORED_SUBJECT_ID = 2L; private static final long CLIENT_TYPE_ID = 4L; private static final long FABRIC_INDEX_ID = 254L; @@ -3732,7 +3732,7 @@ public IcdManagementClusterMonitoringRegistrationStruct( public StructType encodeTlv() { ArrayList values = new ArrayList<>(); - values.add(new StructElement(CHECK_IN_NODE_I_D_ID, new UIntType(checkInNodeID))); + values.add(new StructElement(CHECK_IN_NODE_ID_ID, new UIntType(checkInNodeID))); values.add(new StructElement(MONITORED_SUBJECT_ID, new UIntType(monitoredSubject))); values.add(new StructElement(CLIENT_TYPE_ID, new UIntType(clientType))); values.add(new StructElement(FABRIC_INDEX_ID, new UIntType(fabricIndex))); @@ -3749,7 +3749,7 @@ public static IcdManagementClusterMonitoringRegistrationStruct decodeTlv(BaseTLV Integer clientType = null; Integer fabricIndex = null; for (StructElement element: ((StructType)tlvValue).value()) { - if (element.contextTagNum() == CHECK_IN_NODE_I_D_ID) { + if (element.contextTagNum() == CHECK_IN_NODE_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); checkInNodeID = castingValue.value(Long.class); @@ -3803,7 +3803,7 @@ public static class OvenCavityOperationalStateClusterErrorStateStruct { public Integer errorStateID; public Optional errorStateLabel; public Optional errorStateDetails; - private static final long ERROR_STATE_I_D_ID = 0L; + private static final long ERROR_STATE_ID_ID = 0L; private static final long ERROR_STATE_LABEL_ID = 1L; private static final long ERROR_STATE_DETAILS_ID = 2L; @@ -3819,7 +3819,7 @@ public OvenCavityOperationalStateClusterErrorStateStruct( public StructType encodeTlv() { ArrayList values = new ArrayList<>(); - values.add(new StructElement(ERROR_STATE_I_D_ID, new UIntType(errorStateID))); + values.add(new StructElement(ERROR_STATE_ID_ID, new UIntType(errorStateID))); values.add(new StructElement(ERROR_STATE_LABEL_ID, errorStateLabel.map((nonOptionalerrorStateLabel) -> new StringType(nonOptionalerrorStateLabel)).orElse(new EmptyType()))); values.add(new StructElement(ERROR_STATE_DETAILS_ID, errorStateDetails.map((nonOptionalerrorStateDetails) -> new StringType(nonOptionalerrorStateDetails)).orElse(new EmptyType()))); @@ -3834,7 +3834,7 @@ public static OvenCavityOperationalStateClusterErrorStateStruct decodeTlv(BaseTL Optional errorStateLabel = Optional.empty(); Optional errorStateDetails = Optional.empty(); for (StructElement element: ((StructType)tlvValue).value()) { - if (element.contextTagNum() == ERROR_STATE_I_D_ID) { + if (element.contextTagNum() == ERROR_STATE_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); errorStateID = castingValue.value(Integer.class); @@ -3878,7 +3878,7 @@ public String toString() { public static class OvenCavityOperationalStateClusterOperationalStateStruct { public Integer operationalStateID; public Optional operationalStateLabel; - private static final long OPERATIONAL_STATE_I_D_ID = 0L; + private static final long OPERATIONAL_STATE_ID_ID = 0L; private static final long OPERATIONAL_STATE_LABEL_ID = 1L; public OvenCavityOperationalStateClusterOperationalStateStruct( @@ -3891,7 +3891,7 @@ public OvenCavityOperationalStateClusterOperationalStateStruct( public StructType encodeTlv() { ArrayList values = new ArrayList<>(); - values.add(new StructElement(OPERATIONAL_STATE_I_D_ID, new UIntType(operationalStateID))); + values.add(new StructElement(OPERATIONAL_STATE_ID_ID, new UIntType(operationalStateID))); values.add(new StructElement(OPERATIONAL_STATE_LABEL_ID, operationalStateLabel.map((nonOptionaloperationalStateLabel) -> new StringType(nonOptionaloperationalStateLabel)).orElse(new EmptyType()))); return new StructType(values); @@ -3904,7 +3904,7 @@ public static OvenCavityOperationalStateClusterOperationalStateStruct decodeTlv( Integer operationalStateID = null; Optional operationalStateLabel = Optional.empty(); for (StructElement element: ((StructType)tlvValue).value()) { - if (element.contextTagNum() == OPERATIONAL_STATE_I_D_ID) { + if (element.contextTagNum() == OPERATIONAL_STATE_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); operationalStateID = castingValue.value(Integer.class); @@ -5036,7 +5036,7 @@ public static class OperationalStateClusterErrorStateStruct { public Integer errorStateID; public Optional errorStateLabel; public Optional errorStateDetails; - private static final long ERROR_STATE_I_D_ID = 0L; + private static final long ERROR_STATE_ID_ID = 0L; private static final long ERROR_STATE_LABEL_ID = 1L; private static final long ERROR_STATE_DETAILS_ID = 2L; @@ -5052,7 +5052,7 @@ public OperationalStateClusterErrorStateStruct( public StructType encodeTlv() { ArrayList values = new ArrayList<>(); - values.add(new StructElement(ERROR_STATE_I_D_ID, new UIntType(errorStateID))); + values.add(new StructElement(ERROR_STATE_ID_ID, new UIntType(errorStateID))); values.add(new StructElement(ERROR_STATE_LABEL_ID, errorStateLabel.map((nonOptionalerrorStateLabel) -> new StringType(nonOptionalerrorStateLabel)).orElse(new EmptyType()))); values.add(new StructElement(ERROR_STATE_DETAILS_ID, errorStateDetails.map((nonOptionalerrorStateDetails) -> new StringType(nonOptionalerrorStateDetails)).orElse(new EmptyType()))); @@ -5067,7 +5067,7 @@ public static OperationalStateClusterErrorStateStruct decodeTlv(BaseTLVType tlvV Optional errorStateLabel = Optional.empty(); Optional errorStateDetails = Optional.empty(); for (StructElement element: ((StructType)tlvValue).value()) { - if (element.contextTagNum() == ERROR_STATE_I_D_ID) { + if (element.contextTagNum() == ERROR_STATE_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); errorStateID = castingValue.value(Integer.class); @@ -5111,7 +5111,7 @@ public String toString() { public static class OperationalStateClusterOperationalStateStruct { public Integer operationalStateID; public Optional operationalStateLabel; - private static final long OPERATIONAL_STATE_I_D_ID = 0L; + private static final long OPERATIONAL_STATE_ID_ID = 0L; private static final long OPERATIONAL_STATE_LABEL_ID = 1L; public OperationalStateClusterOperationalStateStruct( @@ -5124,7 +5124,7 @@ public OperationalStateClusterOperationalStateStruct( public StructType encodeTlv() { ArrayList values = new ArrayList<>(); - values.add(new StructElement(OPERATIONAL_STATE_I_D_ID, new UIntType(operationalStateID))); + values.add(new StructElement(OPERATIONAL_STATE_ID_ID, new UIntType(operationalStateID))); values.add(new StructElement(OPERATIONAL_STATE_LABEL_ID, operationalStateLabel.map((nonOptionaloperationalStateLabel) -> new StringType(nonOptionaloperationalStateLabel)).orElse(new EmptyType()))); return new StructType(values); @@ -5137,7 +5137,7 @@ public static OperationalStateClusterOperationalStateStruct decodeTlv(BaseTLVTyp Integer operationalStateID = null; Optional operationalStateLabel = Optional.empty(); for (StructElement element: ((StructType)tlvValue).value()) { - if (element.contextTagNum() == OPERATIONAL_STATE_I_D_ID) { + if (element.contextTagNum() == OPERATIONAL_STATE_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); operationalStateID = castingValue.value(Integer.class); @@ -5173,7 +5173,7 @@ public static class RvcOperationalStateClusterErrorStateStruct { public Integer errorStateID; public Optional errorStateLabel; public Optional errorStateDetails; - private static final long ERROR_STATE_I_D_ID = 0L; + private static final long ERROR_STATE_ID_ID = 0L; private static final long ERROR_STATE_LABEL_ID = 1L; private static final long ERROR_STATE_DETAILS_ID = 2L; @@ -5189,7 +5189,7 @@ public RvcOperationalStateClusterErrorStateStruct( public StructType encodeTlv() { ArrayList values = new ArrayList<>(); - values.add(new StructElement(ERROR_STATE_I_D_ID, new UIntType(errorStateID))); + values.add(new StructElement(ERROR_STATE_ID_ID, new UIntType(errorStateID))); values.add(new StructElement(ERROR_STATE_LABEL_ID, errorStateLabel.map((nonOptionalerrorStateLabel) -> new StringType(nonOptionalerrorStateLabel)).orElse(new EmptyType()))); values.add(new StructElement(ERROR_STATE_DETAILS_ID, errorStateDetails.map((nonOptionalerrorStateDetails) -> new StringType(nonOptionalerrorStateDetails)).orElse(new EmptyType()))); @@ -5204,7 +5204,7 @@ public static RvcOperationalStateClusterErrorStateStruct decodeTlv(BaseTLVType t Optional errorStateLabel = Optional.empty(); Optional errorStateDetails = Optional.empty(); for (StructElement element: ((StructType)tlvValue).value()) { - if (element.contextTagNum() == ERROR_STATE_I_D_ID) { + if (element.contextTagNum() == ERROR_STATE_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); errorStateID = castingValue.value(Integer.class); @@ -5248,7 +5248,7 @@ public String toString() { public static class RvcOperationalStateClusterOperationalStateStruct { public Integer operationalStateID; public Optional operationalStateLabel; - private static final long OPERATIONAL_STATE_I_D_ID = 0L; + private static final long OPERATIONAL_STATE_ID_ID = 0L; private static final long OPERATIONAL_STATE_LABEL_ID = 1L; public RvcOperationalStateClusterOperationalStateStruct( @@ -5261,7 +5261,7 @@ public RvcOperationalStateClusterOperationalStateStruct( public StructType encodeTlv() { ArrayList values = new ArrayList<>(); - values.add(new StructElement(OPERATIONAL_STATE_I_D_ID, new UIntType(operationalStateID))); + values.add(new StructElement(OPERATIONAL_STATE_ID_ID, new UIntType(operationalStateID))); values.add(new StructElement(OPERATIONAL_STATE_LABEL_ID, operationalStateLabel.map((nonOptionaloperationalStateLabel) -> new StringType(nonOptionaloperationalStateLabel)).orElse(new EmptyType()))); return new StructType(values); @@ -5274,7 +5274,7 @@ public static RvcOperationalStateClusterOperationalStateStruct decodeTlv(BaseTLV Integer operationalStateID = null; Optional operationalStateLabel = Optional.empty(); for (StructElement element: ((StructType)tlvValue).value()) { - if (element.contextTagNum() == OPERATIONAL_STATE_I_D_ID) { + if (element.contextTagNum() == OPERATIONAL_STATE_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); operationalStateID = castingValue.value(Integer.class); @@ -5316,7 +5316,7 @@ public static class ScenesManagementClusterAttributeValuePairStruct { public Optional valueSigned32; public Optional valueUnsigned64; public Optional valueSigned64; - private static final long ATTRIBUTE_I_D_ID = 0L; + private static final long ATTRIBUTE_ID_ID = 0L; private static final long VALUE_UNSIGNED8_ID = 1L; private static final long VALUE_SIGNED8_ID = 2L; private static final long VALUE_UNSIGNED16_ID = 3L; @@ -5350,7 +5350,7 @@ public ScenesManagementClusterAttributeValuePairStruct( public StructType encodeTlv() { ArrayList values = new ArrayList<>(); - values.add(new StructElement(ATTRIBUTE_I_D_ID, new UIntType(attributeID))); + values.add(new StructElement(ATTRIBUTE_ID_ID, new UIntType(attributeID))); values.add(new StructElement(VALUE_UNSIGNED8_ID, valueUnsigned8.map((nonOptionalvalueUnsigned8) -> new UIntType(nonOptionalvalueUnsigned8)).orElse(new EmptyType()))); values.add(new StructElement(VALUE_SIGNED8_ID, valueSigned8.map((nonOptionalvalueSigned8) -> new IntType(nonOptionalvalueSigned8)).orElse(new EmptyType()))); values.add(new StructElement(VALUE_UNSIGNED16_ID, valueUnsigned16.map((nonOptionalvalueUnsigned16) -> new UIntType(nonOptionalvalueUnsigned16)).orElse(new EmptyType()))); @@ -5377,7 +5377,7 @@ public static ScenesManagementClusterAttributeValuePairStruct decodeTlv(BaseTLVT Optional valueUnsigned64 = Optional.empty(); Optional valueSigned64 = Optional.empty(); for (StructElement element: ((StructType)tlvValue).value()) { - if (element.contextTagNum() == ATTRIBUTE_I_D_ID) { + if (element.contextTagNum() == ATTRIBUTE_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); attributeID = castingValue.value(Long.class); @@ -5475,7 +5475,7 @@ public String toString() { public static class ScenesManagementClusterExtensionFieldSet { public Long clusterID; public ArrayList attributeValueList; - private static final long CLUSTER_I_D_ID = 0L; + private static final long CLUSTER_ID_ID = 0L; private static final long ATTRIBUTE_VALUE_LIST_ID = 1L; public ScenesManagementClusterExtensionFieldSet( @@ -5488,7 +5488,7 @@ public ScenesManagementClusterExtensionFieldSet( public StructType encodeTlv() { ArrayList values = new ArrayList<>(); - values.add(new StructElement(CLUSTER_I_D_ID, new UIntType(clusterID))); + values.add(new StructElement(CLUSTER_ID_ID, new UIntType(clusterID))); values.add(new StructElement(ATTRIBUTE_VALUE_LIST_ID, ArrayType.generateArrayType(attributeValueList, (elementattributeValueList) -> elementattributeValueList.encodeTlv()))); return new StructType(values); @@ -5501,7 +5501,7 @@ public static ScenesManagementClusterExtensionFieldSet decodeTlv(BaseTLVType tlv Long clusterID = null; ArrayList attributeValueList = null; for (StructElement element: ((StructType)tlvValue).value()) { - if (element.contextTagNum() == CLUSTER_I_D_ID) { + if (element.contextTagNum() == CLUSTER_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); clusterID = castingValue.value(Long.class); @@ -7285,8 +7285,8 @@ public static class DemandResponseLoadControlClusterLoadControlEventStruct { public Integer criticality; public @Nullable Long startTime; public ArrayList transitions; - private static final long EVENT_I_D_ID = 0L; - private static final long PROGRAM_I_D_ID = 1L; + private static final long EVENT_ID_ID = 0L; + private static final long PROGRAM_ID_ID = 1L; private static final long CONTROL_ID = 2L; private static final long DEVICE_CLASS_ID = 3L; private static final long ENROLLMENT_GROUP_ID = 4L; @@ -7316,8 +7316,8 @@ public DemandResponseLoadControlClusterLoadControlEventStruct( public StructType encodeTlv() { ArrayList values = new ArrayList<>(); - values.add(new StructElement(EVENT_I_D_ID, new ByteArrayType(eventID))); - values.add(new StructElement(PROGRAM_I_D_ID, programID != null ? new ByteArrayType(programID) : new NullType())); + values.add(new StructElement(EVENT_ID_ID, new ByteArrayType(eventID))); + values.add(new StructElement(PROGRAM_ID_ID, programID != null ? new ByteArrayType(programID) : new NullType())); values.add(new StructElement(CONTROL_ID, new UIntType(control))); values.add(new StructElement(DEVICE_CLASS_ID, new UIntType(deviceClass))); values.add(new StructElement(ENROLLMENT_GROUP_ID, enrollmentGroup.map((nonOptionalenrollmentGroup) -> new UIntType(nonOptionalenrollmentGroup)).orElse(new EmptyType()))); @@ -7341,12 +7341,12 @@ public static DemandResponseLoadControlClusterLoadControlEventStruct decodeTlv(B @Nullable Long startTime = null; ArrayList transitions = null; for (StructElement element: ((StructType)tlvValue).value()) { - if (element.contextTagNum() == EVENT_I_D_ID) { + if (element.contextTagNum() == EVENT_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) { ByteArrayType castingValue = element.value(ByteArrayType.class); eventID = castingValue.value(byte[].class); } - } else if (element.contextTagNum() == PROGRAM_I_D_ID) { + } else if (element.contextTagNum() == PROGRAM_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) { ByteArrayType castingValue = element.value(ByteArrayType.class); programID = castingValue.value(byte[].class); @@ -7433,7 +7433,7 @@ public static class DemandResponseLoadControlClusterLoadControlProgramStruct { public @Nullable Integer enrollmentGroup; public @Nullable Integer randomStartMinutes; public @Nullable Integer randomDurationMinutes; - private static final long PROGRAM_I_D_ID = 0L; + private static final long PROGRAM_ID_ID = 0L; private static final long NAME_ID = 1L; private static final long ENROLLMENT_GROUP_ID = 2L; private static final long RANDOM_START_MINUTES_ID = 3L; @@ -7455,7 +7455,7 @@ public DemandResponseLoadControlClusterLoadControlProgramStruct( public StructType encodeTlv() { ArrayList values = new ArrayList<>(); - values.add(new StructElement(PROGRAM_I_D_ID, new ByteArrayType(programID))); + values.add(new StructElement(PROGRAM_ID_ID, new ByteArrayType(programID))); values.add(new StructElement(NAME_ID, new StringType(name))); values.add(new StructElement(ENROLLMENT_GROUP_ID, enrollmentGroup != null ? new UIntType(enrollmentGroup) : new NullType())); values.add(new StructElement(RANDOM_START_MINUTES_ID, randomStartMinutes != null ? new UIntType(randomStartMinutes) : new NullType())); @@ -7474,7 +7474,7 @@ public static DemandResponseLoadControlClusterLoadControlProgramStruct decodeTlv @Nullable Integer randomStartMinutes = null; @Nullable Integer randomDurationMinutes = null; for (StructElement element: ((StructType)tlvValue).value()) { - if (element.contextTagNum() == PROGRAM_I_D_ID) { + if (element.contextTagNum() == PROGRAM_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) { ByteArrayType castingValue = element.value(ByteArrayType.class); programID = castingValue.value(byte[].class); @@ -7536,7 +7536,7 @@ public String toString() { public static class MessagesClusterMessageResponseOptionStruct { public Optional messageResponseID; public Optional label; - private static final long MESSAGE_RESPONSE_I_D_ID = 0L; + private static final long MESSAGE_RESPONSE_ID_ID = 0L; private static final long LABEL_ID = 1L; public MessagesClusterMessageResponseOptionStruct( @@ -7549,7 +7549,7 @@ public MessagesClusterMessageResponseOptionStruct( public StructType encodeTlv() { ArrayList values = new ArrayList<>(); - values.add(new StructElement(MESSAGE_RESPONSE_I_D_ID, messageResponseID.map((nonOptionalmessageResponseID) -> new UIntType(nonOptionalmessageResponseID)).orElse(new EmptyType()))); + values.add(new StructElement(MESSAGE_RESPONSE_ID_ID, messageResponseID.map((nonOptionalmessageResponseID) -> new UIntType(nonOptionalmessageResponseID)).orElse(new EmptyType()))); values.add(new StructElement(LABEL_ID, label.map((nonOptionallabel) -> new StringType(nonOptionallabel)).orElse(new EmptyType()))); return new StructType(values); @@ -7562,7 +7562,7 @@ public static MessagesClusterMessageResponseOptionStruct decodeTlv(BaseTLVType t Optional messageResponseID = Optional.empty(); Optional label = Optional.empty(); for (StructElement element: ((StructType)tlvValue).value()) { - if (element.contextTagNum() == MESSAGE_RESPONSE_I_D_ID) { + if (element.contextTagNum() == MESSAGE_RESPONSE_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); messageResponseID = Optional.of(castingValue.value(Long.class)); @@ -7602,7 +7602,7 @@ public static class MessagesClusterMessageStruct { public @Nullable Long duration; public String messageText; public Optional> responses; - private static final long MESSAGE_I_D_ID = 0L; + private static final long MESSAGE_ID_ID = 0L; private static final long PRIORITY_ID = 1L; private static final long MESSAGE_CONTROL_ID = 2L; private static final long START_TIME_ID = 3L; @@ -7630,7 +7630,7 @@ public MessagesClusterMessageStruct( public StructType encodeTlv() { ArrayList values = new ArrayList<>(); - values.add(new StructElement(MESSAGE_I_D_ID, new ByteArrayType(messageID))); + values.add(new StructElement(MESSAGE_ID_ID, new ByteArrayType(messageID))); values.add(new StructElement(PRIORITY_ID, new UIntType(priority))); values.add(new StructElement(MESSAGE_CONTROL_ID, new UIntType(messageControl))); values.add(new StructElement(START_TIME_ID, startTime != null ? new UIntType(startTime) : new NullType())); @@ -7653,7 +7653,7 @@ public static MessagesClusterMessageStruct decodeTlv(BaseTLVType tlvValue) { String messageText = null; Optional> responses = Optional.empty(); for (StructElement element: ((StructType)tlvValue).value()) { - if (element.contextTagNum() == MESSAGE_I_D_ID) { + if (element.contextTagNum() == MESSAGE_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) { ByteArrayType castingValue = element.value(ByteArrayType.class); messageID = castingValue.value(byte[].class); @@ -8000,7 +8000,7 @@ public static class DeviceEnergyManagementClusterSlotStruct { private static final long SLOT_IS_PAUSABLE_ID = 5L; private static final long MIN_PAUSE_DURATION_ID = 6L; private static final long MAX_PAUSE_DURATION_ID = 7L; - private static final long MANUFACTURER_E_S_A_STATE_ID = 8L; + private static final long MANUFACTURER_ESA_STATE_ID = 8L; private static final long NOMINAL_POWER_ID = 9L; private static final long MIN_POWER_ID = 10L; private static final long MAX_POWER_ID = 11L; @@ -8061,7 +8061,7 @@ public StructType encodeTlv() { values.add(new StructElement(SLOT_IS_PAUSABLE_ID, slotIsPausable.map((nonOptionalslotIsPausable) -> new BooleanType(nonOptionalslotIsPausable)).orElse(new EmptyType()))); values.add(new StructElement(MIN_PAUSE_DURATION_ID, minPauseDuration.map((nonOptionalminPauseDuration) -> new UIntType(nonOptionalminPauseDuration)).orElse(new EmptyType()))); values.add(new StructElement(MAX_PAUSE_DURATION_ID, maxPauseDuration.map((nonOptionalmaxPauseDuration) -> new UIntType(nonOptionalmaxPauseDuration)).orElse(new EmptyType()))); - values.add(new StructElement(MANUFACTURER_E_S_A_STATE_ID, manufacturerESAState.map((nonOptionalmanufacturerESAState) -> new UIntType(nonOptionalmanufacturerESAState)).orElse(new EmptyType()))); + values.add(new StructElement(MANUFACTURER_ESA_STATE_ID, manufacturerESAState.map((nonOptionalmanufacturerESAState) -> new UIntType(nonOptionalmanufacturerESAState)).orElse(new EmptyType()))); values.add(new StructElement(NOMINAL_POWER_ID, nominalPower.map((nonOptionalnominalPower) -> new IntType(nonOptionalnominalPower)).orElse(new EmptyType()))); values.add(new StructElement(MIN_POWER_ID, minPower.map((nonOptionalminPower) -> new IntType(nonOptionalminPower)).orElse(new EmptyType()))); values.add(new StructElement(MAX_POWER_ID, maxPower.map((nonOptionalmaxPower) -> new IntType(nonOptionalmaxPower)).orElse(new EmptyType()))); @@ -8138,7 +8138,7 @@ public static DeviceEnergyManagementClusterSlotStruct decodeTlv(BaseTLVType tlvV UIntType castingValue = element.value(UIntType.class); maxPauseDuration = Optional.of(castingValue.value(Long.class)); } - } else if (element.contextTagNum() == MANUFACTURER_E_S_A_STATE_ID) { + } else if (element.contextTagNum() == MANUFACTURER_ESA_STATE_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); manufacturerESAState = Optional.of(castingValue.value(Integer.class)); @@ -8284,7 +8284,7 @@ public static class DeviceEnergyManagementClusterForecastStruct { public Boolean isPausable; public ArrayList slots; public Integer forecastUpdateReason; - private static final long FORECAST_I_D_ID = 0L; + private static final long FORECAST_ID_ID = 0L; private static final long ACTIVE_SLOT_NUMBER_ID = 1L; private static final long START_TIME_ID = 2L; private static final long END_TIME_ID = 3L; @@ -8318,7 +8318,7 @@ public DeviceEnergyManagementClusterForecastStruct( public StructType encodeTlv() { ArrayList values = new ArrayList<>(); - values.add(new StructElement(FORECAST_I_D_ID, new UIntType(forecastID))); + values.add(new StructElement(FORECAST_ID_ID, new UIntType(forecastID))); values.add(new StructElement(ACTIVE_SLOT_NUMBER_ID, activeSlotNumber != null ? new UIntType(activeSlotNumber) : new NullType())); values.add(new StructElement(START_TIME_ID, new UIntType(startTime))); values.add(new StructElement(END_TIME_ID, new UIntType(endTime))); @@ -8345,7 +8345,7 @@ public static DeviceEnergyManagementClusterForecastStruct decodeTlv(BaseTLVType ArrayList slots = null; Integer forecastUpdateReason = null; for (StructElement element: ((StructType)tlvValue).value()) { - if (element.contextTagNum() == FORECAST_I_D_ID) { + if (element.contextTagNum() == FORECAST_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); forecastID = castingValue.value(Long.class); @@ -9418,8 +9418,8 @@ public static class ServiceAreaClusterAreaStruct { public Long areaID; public @Nullable Long mapID; public ChipStructs.ServiceAreaClusterAreaInfoStruct areaDesc; - private static final long AREA_I_D_ID = 0L; - private static final long MAP_I_D_ID = 1L; + private static final long AREA_ID_ID = 0L; + private static final long MAP_ID_ID = 1L; private static final long AREA_DESC_ID = 2L; public ServiceAreaClusterAreaStruct( @@ -9434,8 +9434,8 @@ public ServiceAreaClusterAreaStruct( public StructType encodeTlv() { ArrayList values = new ArrayList<>(); - values.add(new StructElement(AREA_I_D_ID, new UIntType(areaID))); - values.add(new StructElement(MAP_I_D_ID, mapID != null ? new UIntType(mapID) : new NullType())); + values.add(new StructElement(AREA_ID_ID, new UIntType(areaID))); + values.add(new StructElement(MAP_ID_ID, mapID != null ? new UIntType(mapID) : new NullType())); values.add(new StructElement(AREA_DESC_ID, areaDesc.encodeTlv())); return new StructType(values); @@ -9449,12 +9449,12 @@ public static ServiceAreaClusterAreaStruct decodeTlv(BaseTLVType tlvValue) { @Nullable Long mapID = null; ChipStructs.ServiceAreaClusterAreaInfoStruct areaDesc = null; for (StructElement element: ((StructType)tlvValue).value()) { - if (element.contextTagNum() == AREA_I_D_ID) { + if (element.contextTagNum() == AREA_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); areaID = castingValue.value(Long.class); } - } else if (element.contextTagNum() == MAP_I_D_ID) { + } else if (element.contextTagNum() == MAP_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); mapID = castingValue.value(Long.class); @@ -9493,7 +9493,7 @@ public String toString() { public static class ServiceAreaClusterMapStruct { public Long mapID; public String name; - private static final long MAP_I_D_ID = 0L; + private static final long MAP_ID_ID = 0L; private static final long NAME_ID = 1L; public ServiceAreaClusterMapStruct( @@ -9506,7 +9506,7 @@ public ServiceAreaClusterMapStruct( public StructType encodeTlv() { ArrayList values = new ArrayList<>(); - values.add(new StructElement(MAP_I_D_ID, new UIntType(mapID))); + values.add(new StructElement(MAP_ID_ID, new UIntType(mapID))); values.add(new StructElement(NAME_ID, new StringType(name))); return new StructType(values); @@ -9519,7 +9519,7 @@ public static ServiceAreaClusterMapStruct decodeTlv(BaseTLVType tlvValue) { Long mapID = null; String name = null; for (StructElement element: ((StructType)tlvValue).value()) { - if (element.contextTagNum() == MAP_I_D_ID) { + if (element.contextTagNum() == MAP_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); mapID = castingValue.value(Long.class); @@ -9556,7 +9556,7 @@ public static class ServiceAreaClusterProgressStruct { public Integer status; public @Nullable Optional totalOperationalTime; public @Nullable Optional estimatedTime; - private static final long AREA_I_D_ID = 0L; + private static final long AREA_ID_ID = 0L; private static final long STATUS_ID = 1L; private static final long TOTAL_OPERATIONAL_TIME_ID = 2L; private static final long ESTIMATED_TIME_ID = 3L; @@ -9575,7 +9575,7 @@ public ServiceAreaClusterProgressStruct( public StructType encodeTlv() { ArrayList values = new ArrayList<>(); - values.add(new StructElement(AREA_I_D_ID, new UIntType(areaID))); + values.add(new StructElement(AREA_ID_ID, new UIntType(areaID))); values.add(new StructElement(STATUS_ID, new UIntType(status))); values.add(new StructElement(TOTAL_OPERATIONAL_TIME_ID, totalOperationalTime != null ? totalOperationalTime.map((nonOptionaltotalOperationalTime) -> new UIntType(nonOptionaltotalOperationalTime)).orElse(new EmptyType()) : new NullType())); values.add(new StructElement(ESTIMATED_TIME_ID, estimatedTime != null ? estimatedTime.map((nonOptionalestimatedTime) -> new UIntType(nonOptionalestimatedTime)).orElse(new EmptyType()) : new NullType())); @@ -9592,7 +9592,7 @@ public static ServiceAreaClusterProgressStruct decodeTlv(BaseTLVType tlvValue) { @Nullable Optional totalOperationalTime = null; @Nullable Optional estimatedTime = null; for (StructElement element: ((StructType)tlvValue).value()) { - if (element.contextTagNum() == AREA_I_D_ID) { + if (element.contextTagNum() == AREA_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); areaID = castingValue.value(Long.class); @@ -10312,7 +10312,7 @@ public String toString() { public static class ThermostatClusterAtomicAttributeStatusStruct { public Long attributeID; public Integer statusCode; - private static final long ATTRIBUTE_I_D_ID = 0L; + private static final long ATTRIBUTE_ID_ID = 0L; private static final long STATUS_CODE_ID = 1L; public ThermostatClusterAtomicAttributeStatusStruct( @@ -10325,7 +10325,7 @@ public ThermostatClusterAtomicAttributeStatusStruct( public StructType encodeTlv() { ArrayList values = new ArrayList<>(); - values.add(new StructElement(ATTRIBUTE_I_D_ID, new UIntType(attributeID))); + values.add(new StructElement(ATTRIBUTE_ID_ID, new UIntType(attributeID))); values.add(new StructElement(STATUS_CODE_ID, new UIntType(statusCode))); return new StructType(values); @@ -10338,7 +10338,7 @@ public static ThermostatClusterAtomicAttributeStatusStruct decodeTlv(BaseTLVType Long attributeID = null; Integer statusCode = null; for (StructElement element: ((StructType)tlvValue).value()) { - if (element.contextTagNum() == ATTRIBUTE_I_D_ID) { + if (element.contextTagNum() == ATTRIBUTE_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); attributeID = castingValue.value(Long.class); @@ -10451,7 +10451,7 @@ public static class ThreadNetworkDirectoryClusterThreadNetworkStruct { public String networkName; public Integer channel; public Long activeTimestamp; - private static final long EXTENDED_PAN_I_D_ID = 0L; + private static final long EXTENDED_PAN_ID_ID = 0L; private static final long NETWORK_NAME_ID = 1L; private static final long CHANNEL_ID = 2L; private static final long ACTIVE_TIMESTAMP_ID = 3L; @@ -10470,7 +10470,7 @@ public ThreadNetworkDirectoryClusterThreadNetworkStruct( public StructType encodeTlv() { ArrayList values = new ArrayList<>(); - values.add(new StructElement(EXTENDED_PAN_I_D_ID, new ByteArrayType(extendedPanID))); + values.add(new StructElement(EXTENDED_PAN_ID_ID, new ByteArrayType(extendedPanID))); values.add(new StructElement(NETWORK_NAME_ID, new StringType(networkName))); values.add(new StructElement(CHANNEL_ID, new UIntType(channel))); values.add(new StructElement(ACTIVE_TIMESTAMP_ID, new UIntType(activeTimestamp))); @@ -10487,7 +10487,7 @@ public static ThreadNetworkDirectoryClusterThreadNetworkStruct decodeTlv(BaseTLV Integer channel = null; Long activeTimestamp = null; for (StructElement element: ((StructType)tlvValue).value()) { - if (element.contextTagNum() == EXTENDED_PAN_I_D_ID) { + if (element.contextTagNum() == EXTENDED_PAN_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) { ByteArrayType castingValue = element.value(ByteArrayType.class); extendedPanID = castingValue.value(byte[].class); @@ -10894,7 +10894,7 @@ public static class ChannelClusterProgramStruct { private static final long SERIES_INFO_ID = 15L; private static final long CATEGORY_LIST_ID = 16L; private static final long CAST_LIST_ID = 17L; - private static final long EXTERNAL_I_D_LIST_ID = 18L; + private static final long EXTERNAL_ID_LIST_ID = 18L; public ChannelClusterProgramStruct( String identifier, @@ -10958,7 +10958,7 @@ public StructType encodeTlv() { values.add(new StructElement(SERIES_INFO_ID, seriesInfo != null ? seriesInfo.map((nonOptionalseriesInfo) -> nonOptionalseriesInfo.encodeTlv()).orElse(new EmptyType()) : new NullType())); values.add(new StructElement(CATEGORY_LIST_ID, categoryList.map((nonOptionalcategoryList) -> ArrayType.generateArrayType(nonOptionalcategoryList, (elementnonOptionalcategoryList) -> elementnonOptionalcategoryList.encodeTlv())).orElse(new EmptyType()))); values.add(new StructElement(CAST_LIST_ID, castList.map((nonOptionalcastList) -> ArrayType.generateArrayType(nonOptionalcastList, (elementnonOptionalcastList) -> elementnonOptionalcastList.encodeTlv())).orElse(new EmptyType()))); - values.add(new StructElement(EXTERNAL_I_D_LIST_ID, externalIDList.map((nonOptionalexternalIDList) -> ArrayType.generateArrayType(nonOptionalexternalIDList, (elementnonOptionalexternalIDList) -> elementnonOptionalexternalIDList.encodeTlv())).orElse(new EmptyType()))); + values.add(new StructElement(EXTERNAL_ID_LIST_ID, externalIDList.map((nonOptionalexternalIDList) -> ArrayType.generateArrayType(nonOptionalexternalIDList, (elementnonOptionalexternalIDList) -> elementnonOptionalexternalIDList.encodeTlv())).orElse(new EmptyType()))); return new StructType(values); } @@ -11077,7 +11077,7 @@ public static ChannelClusterProgramStruct decodeTlv(BaseTLVType tlvValue) { ArrayType castingValue = element.value(ArrayType.class); castList = Optional.of(castingValue.map((elementcastingValue) -> ChipStructs.ChannelClusterProgramCastStruct.decodeTlv(elementcastingValue))); } - } else if (element.contextTagNum() == EXTERNAL_I_D_LIST_ID) { + } else if (element.contextTagNum() == EXTERNAL_ID_LIST_ID) { if (element.value(BaseTLVType.class).type() == TLVType.Array) { ArrayType castingValue = element.value(ArrayType.class); externalIDList = Optional.of(castingValue.map((elementcastingValue) -> ChipStructs.ChannelClusterProgramCastStruct.decodeTlv(elementcastingValue))); @@ -12091,7 +12091,7 @@ public static class ContentLauncherClusterParameterStruct { public Optional> externalIDList; private static final long TYPE_ID = 0L; private static final long VALUE_ID = 1L; - private static final long EXTERNAL_I_D_LIST_ID = 2L; + private static final long EXTERNAL_ID_LIST_ID = 2L; public ContentLauncherClusterParameterStruct( Integer type, @@ -12107,7 +12107,7 @@ public StructType encodeTlv() { ArrayList values = new ArrayList<>(); values.add(new StructElement(TYPE_ID, new UIntType(type))); values.add(new StructElement(VALUE_ID, new StringType(value))); - values.add(new StructElement(EXTERNAL_I_D_LIST_ID, externalIDList.map((nonOptionalexternalIDList) -> ArrayType.generateArrayType(nonOptionalexternalIDList, (elementnonOptionalexternalIDList) -> elementnonOptionalexternalIDList.encodeTlv())).orElse(new EmptyType()))); + values.add(new StructElement(EXTERNAL_ID_LIST_ID, externalIDList.map((nonOptionalexternalIDList) -> ArrayType.generateArrayType(nonOptionalexternalIDList, (elementnonOptionalexternalIDList) -> elementnonOptionalexternalIDList.encodeTlv())).orElse(new EmptyType()))); return new StructType(values); } @@ -12130,7 +12130,7 @@ public static ContentLauncherClusterParameterStruct decodeTlv(BaseTLVType tlvVal StringType castingValue = element.value(StringType.class); value = castingValue.value(String.class); } - } else if (element.contextTagNum() == EXTERNAL_I_D_LIST_ID) { + } else if (element.contextTagNum() == EXTERNAL_ID_LIST_ID) { if (element.value(BaseTLVType.class).type() == TLVType.Array) { ArrayType castingValue = element.value(ArrayType.class); externalIDList = Optional.of(castingValue.map((elementcastingValue) -> ChipStructs.ContentLauncherClusterAdditionalInfoStruct.decodeTlv(elementcastingValue))); @@ -12211,7 +12211,7 @@ public static class ContentLauncherClusterStyleInformationStruct { public Optional imageURL; public Optional color; public Optional size; - private static final long IMAGE_U_R_L_ID = 0L; + private static final long IMAGE_URL_ID = 0L; private static final long COLOR_ID = 1L; private static final long SIZE_ID = 2L; @@ -12227,7 +12227,7 @@ public ContentLauncherClusterStyleInformationStruct( public StructType encodeTlv() { ArrayList values = new ArrayList<>(); - values.add(new StructElement(IMAGE_U_R_L_ID, imageURL.map((nonOptionalimageURL) -> new StringType(nonOptionalimageURL)).orElse(new EmptyType()))); + values.add(new StructElement(IMAGE_URL_ID, imageURL.map((nonOptionalimageURL) -> new StringType(nonOptionalimageURL)).orElse(new EmptyType()))); values.add(new StructElement(COLOR_ID, color.map((nonOptionalcolor) -> new StringType(nonOptionalcolor)).orElse(new EmptyType()))); values.add(new StructElement(SIZE_ID, size.map((nonOptionalsize) -> nonOptionalsize.encodeTlv()).orElse(new EmptyType()))); @@ -12242,7 +12242,7 @@ public static ContentLauncherClusterStyleInformationStruct decodeTlv(BaseTLVType Optional color = Optional.empty(); Optional size = Optional.empty(); for (StructElement element: ((StructType)tlvValue).value()) { - if (element.contextTagNum() == IMAGE_U_R_L_ID) { + if (element.contextTagNum() == IMAGE_URL_ID) { if (element.value(BaseTLVType.class).type() == TLVType.String) { StringType castingValue = element.value(StringType.class); imageURL = Optional.of(castingValue.value(String.class)); @@ -12483,8 +12483,8 @@ public String toString() { public static class ApplicationLauncherClusterApplicationStruct { public Integer catalogVendorID; public String applicationID; - private static final long CATALOG_VENDOR_I_D_ID = 0L; - private static final long APPLICATION_I_D_ID = 1L; + private static final long CATALOG_VENDOR_ID_ID = 0L; + private static final long APPLICATION_ID_ID = 1L; public ApplicationLauncherClusterApplicationStruct( Integer catalogVendorID, @@ -12496,8 +12496,8 @@ public ApplicationLauncherClusterApplicationStruct( public StructType encodeTlv() { ArrayList values = new ArrayList<>(); - values.add(new StructElement(CATALOG_VENDOR_I_D_ID, new UIntType(catalogVendorID))); - values.add(new StructElement(APPLICATION_I_D_ID, new StringType(applicationID))); + values.add(new StructElement(CATALOG_VENDOR_ID_ID, new UIntType(catalogVendorID))); + values.add(new StructElement(APPLICATION_ID_ID, new StringType(applicationID))); return new StructType(values); } @@ -12509,12 +12509,12 @@ public static ApplicationLauncherClusterApplicationStruct decodeTlv(BaseTLVType Integer catalogVendorID = null; String applicationID = null; for (StructElement element: ((StructType)tlvValue).value()) { - if (element.contextTagNum() == CATALOG_VENDOR_I_D_ID) { + if (element.contextTagNum() == CATALOG_VENDOR_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); catalogVendorID = castingValue.value(Integer.class); } - } else if (element.contextTagNum() == APPLICATION_I_D_ID) { + } else if (element.contextTagNum() == APPLICATION_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.String) { StringType castingValue = element.value(StringType.class); applicationID = castingValue.value(String.class); @@ -12605,8 +12605,8 @@ public String toString() { public static class ApplicationBasicClusterApplicationStruct { public Integer catalogVendorID; public String applicationID; - private static final long CATALOG_VENDOR_I_D_ID = 0L; - private static final long APPLICATION_I_D_ID = 1L; + private static final long CATALOG_VENDOR_ID_ID = 0L; + private static final long APPLICATION_ID_ID = 1L; public ApplicationBasicClusterApplicationStruct( Integer catalogVendorID, @@ -12618,8 +12618,8 @@ public ApplicationBasicClusterApplicationStruct( public StructType encodeTlv() { ArrayList values = new ArrayList<>(); - values.add(new StructElement(CATALOG_VENDOR_I_D_ID, new UIntType(catalogVendorID))); - values.add(new StructElement(APPLICATION_I_D_ID, new StringType(applicationID))); + values.add(new StructElement(CATALOG_VENDOR_ID_ID, new UIntType(catalogVendorID))); + values.add(new StructElement(APPLICATION_ID_ID, new StringType(applicationID))); return new StructType(values); } @@ -12631,12 +12631,12 @@ public static ApplicationBasicClusterApplicationStruct decodeTlv(BaseTLVType tlv Integer catalogVendorID = null; String applicationID = null; for (StructElement element: ((StructType)tlvValue).value()) { - if (element.contextTagNum() == CATALOG_VENDOR_I_D_ID) { + if (element.contextTagNum() == CATALOG_VENDOR_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); catalogVendorID = castingValue.value(Integer.class); } - } else if (element.contextTagNum() == APPLICATION_I_D_ID) { + } else if (element.contextTagNum() == APPLICATION_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.String) { StringType castingValue = element.value(StringType.class); applicationID = castingValue.value(String.class); @@ -12941,7 +12941,7 @@ public static class EcosystemInformationClusterEcosystemLocationStruct { public ChipStructs.EcosystemInformationClusterLocationDescriptorStruct locationDescriptor; public Long locationDescriptorLastEdit; public Integer fabricIndex; - private static final long UNIQUE_LOCATION_I_D_ID = 0L; + private static final long UNIQUE_LOCATION_ID_ID = 0L; private static final long LOCATION_DESCRIPTOR_ID = 1L; private static final long LOCATION_DESCRIPTOR_LAST_EDIT_ID = 2L; private static final long FABRIC_INDEX_ID = 254L; @@ -12960,7 +12960,7 @@ public EcosystemInformationClusterEcosystemLocationStruct( public StructType encodeTlv() { ArrayList values = new ArrayList<>(); - values.add(new StructElement(UNIQUE_LOCATION_I_D_ID, new StringType(uniqueLocationID))); + values.add(new StructElement(UNIQUE_LOCATION_ID_ID, new StringType(uniqueLocationID))); values.add(new StructElement(LOCATION_DESCRIPTOR_ID, locationDescriptor.encodeTlv())); values.add(new StructElement(LOCATION_DESCRIPTOR_LAST_EDIT_ID, new UIntType(locationDescriptorLastEdit))); values.add(new StructElement(FABRIC_INDEX_ID, new UIntType(fabricIndex))); @@ -12977,7 +12977,7 @@ public static EcosystemInformationClusterEcosystemLocationStruct decodeTlv(BaseT Long locationDescriptorLastEdit = null; Integer fabricIndex = null; for (StructElement element: ((StructType)tlvValue).value()) { - if (element.contextTagNum() == UNIQUE_LOCATION_I_D_ID) { + if (element.contextTagNum() == UNIQUE_LOCATION_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.String) { StringType castingValue = element.value(StringType.class); uniqueLocationID = castingValue.value(String.class); diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/AccessControlClusterAccessControlEntryChangedEvent.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/AccessControlClusterAccessControlEntryChangedEvent.kt index 2fb1d2221393f9..7deb482b8bfb1e 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/AccessControlClusterAccessControlEntryChangedEvent.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/AccessControlClusterAccessControlEntryChangedEvent.kt @@ -44,14 +44,14 @@ class AccessControlClusterAccessControlEntryChangedEvent( tlvWriter.apply { startStructure(tlvTag) if (adminNodeID != null) { - put(ContextSpecificTag(TAG_ADMIN_NODE_I_D), adminNodeID) + put(ContextSpecificTag(TAG_ADMIN_NODE_ID), adminNodeID) } else { - putNull(ContextSpecificTag(TAG_ADMIN_NODE_I_D)) + putNull(ContextSpecificTag(TAG_ADMIN_NODE_ID)) } if (adminPasscodeID != null) { - put(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D), adminPasscodeID) + put(ContextSpecificTag(TAG_ADMIN_PASSCODE_ID), adminPasscodeID) } else { - putNull(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D)) + putNull(ContextSpecificTag(TAG_ADMIN_PASSCODE_ID)) } put(ContextSpecificTag(TAG_CHANGE_TYPE), changeType) if (latestValue != null) { @@ -65,8 +65,8 @@ class AccessControlClusterAccessControlEntryChangedEvent( } companion object { - private const val TAG_ADMIN_NODE_I_D = 1 - private const val TAG_ADMIN_PASSCODE_I_D = 2 + private const val TAG_ADMIN_NODE_ID = 1 + private const val TAG_ADMIN_PASSCODE_ID = 2 private const val TAG_CHANGE_TYPE = 3 private const val TAG_LATEST_VALUE = 4 private const val TAG_FABRIC_INDEX = 254 @@ -78,16 +78,16 @@ class AccessControlClusterAccessControlEntryChangedEvent( tlvReader.enterStructure(tlvTag) val adminNodeID = if (!tlvReader.isNull()) { - tlvReader.getULong(ContextSpecificTag(TAG_ADMIN_NODE_I_D)) + tlvReader.getULong(ContextSpecificTag(TAG_ADMIN_NODE_ID)) } else { - tlvReader.getNull(ContextSpecificTag(TAG_ADMIN_NODE_I_D)) + tlvReader.getNull(ContextSpecificTag(TAG_ADMIN_NODE_ID)) null } val adminPasscodeID = if (!tlvReader.isNull()) { - tlvReader.getUInt(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D)) + tlvReader.getUInt(ContextSpecificTag(TAG_ADMIN_PASSCODE_ID)) } else { - tlvReader.getNull(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D)) + tlvReader.getNull(ContextSpecificTag(TAG_ADMIN_PASSCODE_ID)) null } val changeType = tlvReader.getUInt(ContextSpecificTag(TAG_CHANGE_TYPE)) diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/AccessControlClusterAccessControlExtensionChangedEvent.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/AccessControlClusterAccessControlExtensionChangedEvent.kt index 66a3ec9dd07d0e..719690e3053dd5 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/AccessControlClusterAccessControlExtensionChangedEvent.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/AccessControlClusterAccessControlExtensionChangedEvent.kt @@ -44,14 +44,14 @@ class AccessControlClusterAccessControlExtensionChangedEvent( tlvWriter.apply { startStructure(tlvTag) if (adminNodeID != null) { - put(ContextSpecificTag(TAG_ADMIN_NODE_I_D), adminNodeID) + put(ContextSpecificTag(TAG_ADMIN_NODE_ID), adminNodeID) } else { - putNull(ContextSpecificTag(TAG_ADMIN_NODE_I_D)) + putNull(ContextSpecificTag(TAG_ADMIN_NODE_ID)) } if (adminPasscodeID != null) { - put(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D), adminPasscodeID) + put(ContextSpecificTag(TAG_ADMIN_PASSCODE_ID), adminPasscodeID) } else { - putNull(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D)) + putNull(ContextSpecificTag(TAG_ADMIN_PASSCODE_ID)) } put(ContextSpecificTag(TAG_CHANGE_TYPE), changeType) if (latestValue != null) { @@ -65,8 +65,8 @@ class AccessControlClusterAccessControlExtensionChangedEvent( } companion object { - private const val TAG_ADMIN_NODE_I_D = 1 - private const val TAG_ADMIN_PASSCODE_I_D = 2 + private const val TAG_ADMIN_NODE_ID = 1 + private const val TAG_ADMIN_PASSCODE_ID = 2 private const val TAG_CHANGE_TYPE = 3 private const val TAG_LATEST_VALUE = 4 private const val TAG_FABRIC_INDEX = 254 @@ -78,16 +78,16 @@ class AccessControlClusterAccessControlExtensionChangedEvent( tlvReader.enterStructure(tlvTag) val adminNodeID = if (!tlvReader.isNull()) { - tlvReader.getULong(ContextSpecificTag(TAG_ADMIN_NODE_I_D)) + tlvReader.getULong(ContextSpecificTag(TAG_ADMIN_NODE_ID)) } else { - tlvReader.getNull(ContextSpecificTag(TAG_ADMIN_NODE_I_D)) + tlvReader.getNull(ContextSpecificTag(TAG_ADMIN_NODE_ID)) null } val adminPasscodeID = if (!tlvReader.isNull()) { - tlvReader.getUInt(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D)) + tlvReader.getUInt(ContextSpecificTag(TAG_ADMIN_PASSCODE_ID)) } else { - tlvReader.getNull(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D)) + tlvReader.getNull(ContextSpecificTag(TAG_ADMIN_PASSCODE_ID)) null } val changeType = tlvReader.getUInt(ContextSpecificTag(TAG_CHANGE_TYPE)) diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/AccessControlClusterFabricRestrictionReviewUpdateEvent.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/AccessControlClusterFabricRestrictionReviewUpdateEvent.kt index 92934af0a1b4e1..7ea3d3fe02707d 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/AccessControlClusterFabricRestrictionReviewUpdateEvent.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/AccessControlClusterFabricRestrictionReviewUpdateEvent.kt @@ -47,9 +47,9 @@ class AccessControlClusterFabricRestrictionReviewUpdateEvent( putNull(ContextSpecificTag(TAG_INSTRUCTION)) } if (redirectURL != null) { - put(ContextSpecificTag(TAG_REDIRECT_U_R_L), redirectURL) + put(ContextSpecificTag(TAG_REDIRECT_URL), redirectURL) } else { - putNull(ContextSpecificTag(TAG_REDIRECT_U_R_L)) + putNull(ContextSpecificTag(TAG_REDIRECT_URL)) } put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex) endStructure() @@ -59,7 +59,7 @@ class AccessControlClusterFabricRestrictionReviewUpdateEvent( companion object { private const val TAG_TOKEN = 0 private const val TAG_INSTRUCTION = 1 - private const val TAG_REDIRECT_U_R_L = 2 + private const val TAG_REDIRECT_URL = 2 private const val TAG_FABRIC_INDEX = 254 fun fromTlv( @@ -77,9 +77,9 @@ class AccessControlClusterFabricRestrictionReviewUpdateEvent( } val redirectURL = if (!tlvReader.isNull()) { - tlvReader.getString(ContextSpecificTag(TAG_REDIRECT_U_R_L)) + tlvReader.getString(ContextSpecificTag(TAG_REDIRECT_URL)) } else { - tlvReader.getNull(ContextSpecificTag(TAG_REDIRECT_U_R_L)) + tlvReader.getNull(ContextSpecificTag(TAG_REDIRECT_URL)) null } val fabricIndex = tlvReader.getUInt(ContextSpecificTag(TAG_FABRIC_INDEX)) diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/ActionsClusterActionFailedEvent.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/ActionsClusterActionFailedEvent.kt index ac1929f9697af5..16c1a67c5cfca9 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/ActionsClusterActionFailedEvent.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/ActionsClusterActionFailedEvent.kt @@ -40,8 +40,8 @@ class ActionsClusterActionFailedEvent( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_ACTION_I_D), actionID) - put(ContextSpecificTag(TAG_INVOKE_I_D), invokeID) + put(ContextSpecificTag(TAG_ACTION_ID), actionID) + put(ContextSpecificTag(TAG_INVOKE_ID), invokeID) put(ContextSpecificTag(TAG_NEW_STATE), newState) put(ContextSpecificTag(TAG_ERROR), error) endStructure() @@ -49,15 +49,15 @@ class ActionsClusterActionFailedEvent( } companion object { - private const val TAG_ACTION_I_D = 0 - private const val TAG_INVOKE_I_D = 1 + private const val TAG_ACTION_ID = 0 + private const val TAG_INVOKE_ID = 1 private const val TAG_NEW_STATE = 2 private const val TAG_ERROR = 3 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ActionsClusterActionFailedEvent { tlvReader.enterStructure(tlvTag) - val actionID = tlvReader.getUInt(ContextSpecificTag(TAG_ACTION_I_D)) - val invokeID = tlvReader.getULong(ContextSpecificTag(TAG_INVOKE_I_D)) + val actionID = tlvReader.getUInt(ContextSpecificTag(TAG_ACTION_ID)) + val invokeID = tlvReader.getULong(ContextSpecificTag(TAG_INVOKE_ID)) val newState = tlvReader.getUInt(ContextSpecificTag(TAG_NEW_STATE)) val error = tlvReader.getUInt(ContextSpecificTag(TAG_ERROR)) diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/ActionsClusterStateChangedEvent.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/ActionsClusterStateChangedEvent.kt index d95c5e9d66480b..cba68b0ed4f468 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/ActionsClusterStateChangedEvent.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/ActionsClusterStateChangedEvent.kt @@ -34,22 +34,22 @@ class ActionsClusterStateChangedEvent(val actionID: UInt, val invokeID: ULong, v fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_ACTION_I_D), actionID) - put(ContextSpecificTag(TAG_INVOKE_I_D), invokeID) + put(ContextSpecificTag(TAG_ACTION_ID), actionID) + put(ContextSpecificTag(TAG_INVOKE_ID), invokeID) put(ContextSpecificTag(TAG_NEW_STATE), newState) endStructure() } } companion object { - private const val TAG_ACTION_I_D = 0 - private const val TAG_INVOKE_I_D = 1 + private const val TAG_ACTION_ID = 0 + private const val TAG_INVOKE_ID = 1 private const val TAG_NEW_STATE = 2 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ActionsClusterStateChangedEvent { tlvReader.enterStructure(tlvTag) - val actionID = tlvReader.getUInt(ContextSpecificTag(TAG_ACTION_I_D)) - val invokeID = tlvReader.getULong(ContextSpecificTag(TAG_INVOKE_I_D)) + val actionID = tlvReader.getUInt(ContextSpecificTag(TAG_ACTION_ID)) + val invokeID = tlvReader.getULong(ContextSpecificTag(TAG_INVOKE_ID)) val newState = tlvReader.getUInt(ContextSpecificTag(TAG_NEW_STATE)) tlvReader.exitContainer() diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/DemandResponseLoadControlClusterLoadControlEventStatusChangeEvent.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/DemandResponseLoadControlClusterLoadControlEventStatusChangeEvent.kt index 7c277de07bd584..1c24da6a705cf7 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/DemandResponseLoadControlClusterLoadControlEventStatusChangeEvent.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/DemandResponseLoadControlClusterLoadControlEventStatusChangeEvent.kt @@ -68,7 +68,7 @@ class DemandResponseLoadControlClusterLoadControlEventStatusChangeEvent( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_EVENT_I_D), eventID) + put(ContextSpecificTag(TAG_EVENT_ID), eventID) if (transitionIndex != null) { put(ContextSpecificTag(TAG_TRANSITION_INDEX), transitionIndex) } else { @@ -122,7 +122,7 @@ class DemandResponseLoadControlClusterLoadControlEventStatusChangeEvent( } companion object { - private const val TAG_EVENT_I_D = 0 + private const val TAG_EVENT_ID = 0 private const val TAG_TRANSITION_INDEX = 1 private const val TAG_STATUS = 2 private const val TAG_CRITICALITY = 3 @@ -138,7 +138,7 @@ class DemandResponseLoadControlClusterLoadControlEventStatusChangeEvent( tlvReader: TlvReader, ): DemandResponseLoadControlClusterLoadControlEventStatusChangeEvent { tlvReader.enterStructure(tlvTag) - val eventID = tlvReader.getByteArray(ContextSpecificTag(TAG_EVENT_I_D)) + val eventID = tlvReader.getByteArray(ContextSpecificTag(TAG_EVENT_ID)) val transitionIndex = if (!tlvReader.isNull()) { tlvReader.getUInt(ContextSpecificTag(TAG_TRANSITION_INDEX)) diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/EnergyEvseClusterEVConnectedEvent.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/EnergyEvseClusterEVConnectedEvent.kt index 37d91a3291a9f2..a17f03a6ef2ab2 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/EnergyEvseClusterEVConnectedEvent.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/EnergyEvseClusterEVConnectedEvent.kt @@ -32,17 +32,17 @@ class EnergyEvseClusterEVConnectedEvent(val sessionID: ULong) { fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_SESSION_I_D), sessionID) + put(ContextSpecificTag(TAG_SESSION_ID), sessionID) endStructure() } } companion object { - private const val TAG_SESSION_I_D = 0 + private const val TAG_SESSION_ID = 0 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): EnergyEvseClusterEVConnectedEvent { tlvReader.enterStructure(tlvTag) - val sessionID = tlvReader.getULong(ContextSpecificTag(TAG_SESSION_I_D)) + val sessionID = tlvReader.getULong(ContextSpecificTag(TAG_SESSION_ID)) tlvReader.exitContainer() diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/EnergyEvseClusterEVNotDetectedEvent.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/EnergyEvseClusterEVNotDetectedEvent.kt index 17654efa1b8956..a55f0578676d4d 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/EnergyEvseClusterEVNotDetectedEvent.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/EnergyEvseClusterEVNotDetectedEvent.kt @@ -43,7 +43,7 @@ class EnergyEvseClusterEVNotDetectedEvent( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_SESSION_I_D), sessionID) + put(ContextSpecificTag(TAG_SESSION_ID), sessionID) put(ContextSpecificTag(TAG_STATE), state) put(ContextSpecificTag(TAG_SESSION_DURATION), sessionDuration) put(ContextSpecificTag(TAG_SESSION_ENERGY_CHARGED), sessionEnergyCharged) @@ -56,7 +56,7 @@ class EnergyEvseClusterEVNotDetectedEvent( } companion object { - private const val TAG_SESSION_I_D = 0 + private const val TAG_SESSION_ID = 0 private const val TAG_STATE = 1 private const val TAG_SESSION_DURATION = 2 private const val TAG_SESSION_ENERGY_CHARGED = 3 @@ -64,7 +64,7 @@ class EnergyEvseClusterEVNotDetectedEvent( fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): EnergyEvseClusterEVNotDetectedEvent { tlvReader.enterStructure(tlvTag) - val sessionID = tlvReader.getULong(ContextSpecificTag(TAG_SESSION_I_D)) + val sessionID = tlvReader.getULong(ContextSpecificTag(TAG_SESSION_ID)) val state = tlvReader.getUInt(ContextSpecificTag(TAG_STATE)) val sessionDuration = tlvReader.getULong(ContextSpecificTag(TAG_SESSION_DURATION)) val sessionEnergyCharged = tlvReader.getLong(ContextSpecificTag(TAG_SESSION_ENERGY_CHARGED)) diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/EnergyEvseClusterEnergyTransferStartedEvent.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/EnergyEvseClusterEnergyTransferStartedEvent.kt index 345a0aef9f870e..6e951b49f6b296 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/EnergyEvseClusterEnergyTransferStartedEvent.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/EnergyEvseClusterEnergyTransferStartedEvent.kt @@ -41,7 +41,7 @@ class EnergyEvseClusterEnergyTransferStartedEvent( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_SESSION_I_D), sessionID) + put(ContextSpecificTag(TAG_SESSION_ID), sessionID) put(ContextSpecificTag(TAG_STATE), state) put(ContextSpecificTag(TAG_MAXIMUM_CURRENT), maximumCurrent) if (maximumDischargeCurrent.isPresent) { @@ -53,14 +53,14 @@ class EnergyEvseClusterEnergyTransferStartedEvent( } companion object { - private const val TAG_SESSION_I_D = 0 + private const val TAG_SESSION_ID = 0 private const val TAG_STATE = 1 private const val TAG_MAXIMUM_CURRENT = 2 private const val TAG_MAXIMUM_DISCHARGE_CURRENT = 3 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): EnergyEvseClusterEnergyTransferStartedEvent { tlvReader.enterStructure(tlvTag) - val sessionID = tlvReader.getULong(ContextSpecificTag(TAG_SESSION_I_D)) + val sessionID = tlvReader.getULong(ContextSpecificTag(TAG_SESSION_ID)) val state = tlvReader.getUInt(ContextSpecificTag(TAG_STATE)) val maximumCurrent = tlvReader.getLong(ContextSpecificTag(TAG_MAXIMUM_CURRENT)) val maximumDischargeCurrent = diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/EnergyEvseClusterEnergyTransferStoppedEvent.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/EnergyEvseClusterEnergyTransferStoppedEvent.kt index b6c3f8cc88f71b..a069eafd10bbc8 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/EnergyEvseClusterEnergyTransferStoppedEvent.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/EnergyEvseClusterEnergyTransferStoppedEvent.kt @@ -43,7 +43,7 @@ class EnergyEvseClusterEnergyTransferStoppedEvent( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_SESSION_I_D), sessionID) + put(ContextSpecificTag(TAG_SESSION_ID), sessionID) put(ContextSpecificTag(TAG_STATE), state) put(ContextSpecificTag(TAG_REASON), reason) put(ContextSpecificTag(TAG_ENERGY_TRANSFERRED), energyTransferred) @@ -56,7 +56,7 @@ class EnergyEvseClusterEnergyTransferStoppedEvent( } companion object { - private const val TAG_SESSION_I_D = 0 + private const val TAG_SESSION_ID = 0 private const val TAG_STATE = 1 private const val TAG_REASON = 2 private const val TAG_ENERGY_TRANSFERRED = 4 @@ -64,7 +64,7 @@ class EnergyEvseClusterEnergyTransferStoppedEvent( fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): EnergyEvseClusterEnergyTransferStoppedEvent { tlvReader.enterStructure(tlvTag) - val sessionID = tlvReader.getULong(ContextSpecificTag(TAG_SESSION_I_D)) + val sessionID = tlvReader.getULong(ContextSpecificTag(TAG_SESSION_ID)) val state = tlvReader.getUInt(ContextSpecificTag(TAG_STATE)) val reason = tlvReader.getUInt(ContextSpecificTag(TAG_REASON)) val energyTransferred = tlvReader.getLong(ContextSpecificTag(TAG_ENERGY_TRANSFERRED)) diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/EnergyEvseClusterFaultEvent.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/EnergyEvseClusterFaultEvent.kt index e3c2019af5693d..cc694c8760ae5b 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/EnergyEvseClusterFaultEvent.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/EnergyEvseClusterFaultEvent.kt @@ -41,9 +41,9 @@ class EnergyEvseClusterFaultEvent( tlvWriter.apply { startStructure(tlvTag) if (sessionID != null) { - put(ContextSpecificTag(TAG_SESSION_I_D), sessionID) + put(ContextSpecificTag(TAG_SESSION_ID), sessionID) } else { - putNull(ContextSpecificTag(TAG_SESSION_I_D)) + putNull(ContextSpecificTag(TAG_SESSION_ID)) } put(ContextSpecificTag(TAG_STATE), state) put(ContextSpecificTag(TAG_FAULT_STATE_PREVIOUS_STATE), faultStatePreviousState) @@ -53,7 +53,7 @@ class EnergyEvseClusterFaultEvent( } companion object { - private const val TAG_SESSION_I_D = 0 + private const val TAG_SESSION_ID = 0 private const val TAG_STATE = 1 private const val TAG_FAULT_STATE_PREVIOUS_STATE = 2 private const val TAG_FAULT_STATE_CURRENT_STATE = 4 @@ -62,9 +62,9 @@ class EnergyEvseClusterFaultEvent( tlvReader.enterStructure(tlvTag) val sessionID = if (!tlvReader.isNull()) { - tlvReader.getULong(ContextSpecificTag(TAG_SESSION_I_D)) + tlvReader.getULong(ContextSpecificTag(TAG_SESSION_ID)) } else { - tlvReader.getNull(ContextSpecificTag(TAG_SESSION_I_D)) + tlvReader.getNull(ContextSpecificTag(TAG_SESSION_ID)) null } val state = tlvReader.getUInt(ContextSpecificTag(TAG_STATE)) diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/MessagesClusterMessageCompleteEvent.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/MessagesClusterMessageCompleteEvent.kt index b8524b20183e67..35b5ca1c1138b5 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/MessagesClusterMessageCompleteEvent.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/MessagesClusterMessageCompleteEvent.kt @@ -41,14 +41,14 @@ class MessagesClusterMessageCompleteEvent( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_MESSAGE_I_D), messageID) + put(ContextSpecificTag(TAG_MESSAGE_ID), messageID) if (responseID != null) { if (responseID.isPresent) { val optresponseID = responseID.get() - put(ContextSpecificTag(TAG_RESPONSE_I_D), optresponseID) + put(ContextSpecificTag(TAG_RESPONSE_ID), optresponseID) } } else { - putNull(ContextSpecificTag(TAG_RESPONSE_I_D)) + putNull(ContextSpecificTag(TAG_RESPONSE_ID)) } if (reply != null) { if (reply.isPresent) { @@ -68,23 +68,23 @@ class MessagesClusterMessageCompleteEvent( } companion object { - private const val TAG_MESSAGE_I_D = 0 - private const val TAG_RESPONSE_I_D = 1 + private const val TAG_MESSAGE_ID = 0 + private const val TAG_RESPONSE_ID = 1 private const val TAG_REPLY = 2 private const val TAG_FUTURE_MESSAGES_PREFERENCE = 3 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): MessagesClusterMessageCompleteEvent { tlvReader.enterStructure(tlvTag) - val messageID = tlvReader.getByteArray(ContextSpecificTag(TAG_MESSAGE_I_D)) + val messageID = tlvReader.getByteArray(ContextSpecificTag(TAG_MESSAGE_ID)) val responseID = if (!tlvReader.isNull()) { - if (tlvReader.isNextTag(ContextSpecificTag(TAG_RESPONSE_I_D))) { - Optional.of(tlvReader.getULong(ContextSpecificTag(TAG_RESPONSE_I_D))) + if (tlvReader.isNextTag(ContextSpecificTag(TAG_RESPONSE_ID))) { + Optional.of(tlvReader.getULong(ContextSpecificTag(TAG_RESPONSE_ID))) } else { Optional.empty() } } else { - tlvReader.getNull(ContextSpecificTag(TAG_RESPONSE_I_D)) + tlvReader.getNull(ContextSpecificTag(TAG_RESPONSE_ID)) null } val reply = diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/MessagesClusterMessagePresentedEvent.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/MessagesClusterMessagePresentedEvent.kt index a2e39882f9ab4a..257a121dcc3d4c 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/MessagesClusterMessagePresentedEvent.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/MessagesClusterMessagePresentedEvent.kt @@ -32,17 +32,17 @@ class MessagesClusterMessagePresentedEvent(val messageID: ByteArray) { fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_MESSAGE_I_D), messageID) + put(ContextSpecificTag(TAG_MESSAGE_ID), messageID) endStructure() } } companion object { - private const val TAG_MESSAGE_I_D = 0 + private const val TAG_MESSAGE_ID = 0 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): MessagesClusterMessagePresentedEvent { tlvReader.enterStructure(tlvTag) - val messageID = tlvReader.getByteArray(ContextSpecificTag(TAG_MESSAGE_I_D)) + val messageID = tlvReader.getByteArray(ContextSpecificTag(TAG_MESSAGE_ID)) tlvReader.exitContainer() diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/MessagesClusterMessageQueuedEvent.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/MessagesClusterMessageQueuedEvent.kt index db5ed28fae6de0..47b80942b65984 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/MessagesClusterMessageQueuedEvent.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/MessagesClusterMessageQueuedEvent.kt @@ -32,17 +32,17 @@ class MessagesClusterMessageQueuedEvent(val messageID: ByteArray) { fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_MESSAGE_I_D), messageID) + put(ContextSpecificTag(TAG_MESSAGE_ID), messageID) endStructure() } } companion object { - private const val TAG_MESSAGE_I_D = 0 + private const val TAG_MESSAGE_ID = 0 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): MessagesClusterMessageQueuedEvent { tlvReader.enterStructure(tlvTag) - val messageID = tlvReader.getByteArray(ContextSpecificTag(TAG_MESSAGE_I_D)) + val messageID = tlvReader.getByteArray(ContextSpecificTag(TAG_MESSAGE_ID)) tlvReader.exitContainer() diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/OtaSoftwareUpdateRequestorClusterVersionAppliedEvent.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/OtaSoftwareUpdateRequestorClusterVersionAppliedEvent.kt index 17cf46b96d68af..70f0975a0afa0a 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/OtaSoftwareUpdateRequestorClusterVersionAppliedEvent.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/OtaSoftwareUpdateRequestorClusterVersionAppliedEvent.kt @@ -37,14 +37,14 @@ class OtaSoftwareUpdateRequestorClusterVersionAppliedEvent( tlvWriter.apply { startStructure(tlvTag) put(ContextSpecificTag(TAG_SOFTWARE_VERSION), softwareVersion) - put(ContextSpecificTag(TAG_PRODUCT_I_D), productID) + put(ContextSpecificTag(TAG_PRODUCT_ID), productID) endStructure() } } companion object { private const val TAG_SOFTWARE_VERSION = 0 - private const val TAG_PRODUCT_I_D = 1 + private const val TAG_PRODUCT_ID = 1 fun fromTlv( tlvTag: Tag, @@ -52,7 +52,7 @@ class OtaSoftwareUpdateRequestorClusterVersionAppliedEvent( ): OtaSoftwareUpdateRequestorClusterVersionAppliedEvent { tlvReader.enterStructure(tlvTag) val softwareVersion = tlvReader.getULong(ContextSpecificTag(TAG_SOFTWARE_VERSION)) - val productID = tlvReader.getUInt(ContextSpecificTag(TAG_PRODUCT_I_D)) + val productID = tlvReader.getUInt(ContextSpecificTag(TAG_PRODUCT_ID)) tlvReader.exitContainer() diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/TimeSynchronizationClusterDSTStatusEvent.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/TimeSynchronizationClusterDSTStatusEvent.kt index 7564293e97be61..493128994ba52e 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/TimeSynchronizationClusterDSTStatusEvent.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/TimeSynchronizationClusterDSTStatusEvent.kt @@ -32,17 +32,17 @@ class TimeSynchronizationClusterDSTStatusEvent(val DSTOffsetActive: Boolean) { fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_D_S_T_OFFSET_ACTIVE), DSTOffsetActive) + put(ContextSpecificTag(TAG_DST_OFFSET_ACTIVE), DSTOffsetActive) endStructure() } } companion object { - private const val TAG_D_S_T_OFFSET_ACTIVE = 0 + private const val TAG_DST_OFFSET_ACTIVE = 0 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): TimeSynchronizationClusterDSTStatusEvent { tlvReader.enterStructure(tlvTag) - val DSTOffsetActive = tlvReader.getBoolean(ContextSpecificTag(TAG_D_S_T_OFFSET_ACTIVE)) + val DSTOffsetActive = tlvReader.getBoolean(ContextSpecificTag(TAG_DST_OFFSET_ACTIVE)) tlvReader.exitContainer() diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ActionsClusterActionStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ActionsClusterActionStruct.kt index a20404bb1e0d90..d464c189e40808 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ActionsClusterActionStruct.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ActionsClusterActionStruct.kt @@ -44,10 +44,10 @@ class ActionsClusterActionStruct( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_ACTION_I_D), actionID) + put(ContextSpecificTag(TAG_ACTION_ID), actionID) put(ContextSpecificTag(TAG_NAME), name) put(ContextSpecificTag(TAG_TYPE), type) - put(ContextSpecificTag(TAG_ENDPOINT_LIST_I_D), endpointListID) + put(ContextSpecificTag(TAG_ENDPOINT_LIST_ID), endpointListID) put(ContextSpecificTag(TAG_SUPPORTED_COMMANDS), supportedCommands) put(ContextSpecificTag(TAG_STATE), state) endStructure() @@ -55,19 +55,19 @@ class ActionsClusterActionStruct( } companion object { - private const val TAG_ACTION_I_D = 0 + private const val TAG_ACTION_ID = 0 private const val TAG_NAME = 1 private const val TAG_TYPE = 2 - private const val TAG_ENDPOINT_LIST_I_D = 3 + private const val TAG_ENDPOINT_LIST_ID = 3 private const val TAG_SUPPORTED_COMMANDS = 4 private const val TAG_STATE = 5 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ActionsClusterActionStruct { tlvReader.enterStructure(tlvTag) - val actionID = tlvReader.getUInt(ContextSpecificTag(TAG_ACTION_I_D)) + val actionID = tlvReader.getUInt(ContextSpecificTag(TAG_ACTION_ID)) val name = tlvReader.getString(ContextSpecificTag(TAG_NAME)) val type = tlvReader.getUInt(ContextSpecificTag(TAG_TYPE)) - val endpointListID = tlvReader.getUInt(ContextSpecificTag(TAG_ENDPOINT_LIST_I_D)) + val endpointListID = tlvReader.getUInt(ContextSpecificTag(TAG_ENDPOINT_LIST_ID)) val supportedCommands = tlvReader.getUInt(ContextSpecificTag(TAG_SUPPORTED_COMMANDS)) val state = tlvReader.getUInt(ContextSpecificTag(TAG_STATE)) diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ActionsClusterEndpointListStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ActionsClusterEndpointListStruct.kt index 831224d12cff88..4f505fcc2fdcb6 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ActionsClusterEndpointListStruct.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ActionsClusterEndpointListStruct.kt @@ -41,7 +41,7 @@ class ActionsClusterEndpointListStruct( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_ENDPOINT_LIST_I_D), endpointListID) + put(ContextSpecificTag(TAG_ENDPOINT_LIST_ID), endpointListID) put(ContextSpecificTag(TAG_NAME), name) put(ContextSpecificTag(TAG_TYPE), type) startArray(ContextSpecificTag(TAG_ENDPOINTS)) @@ -54,14 +54,14 @@ class ActionsClusterEndpointListStruct( } companion object { - private const val TAG_ENDPOINT_LIST_I_D = 0 + private const val TAG_ENDPOINT_LIST_ID = 0 private const val TAG_NAME = 1 private const val TAG_TYPE = 2 private const val TAG_ENDPOINTS = 3 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ActionsClusterEndpointListStruct { tlvReader.enterStructure(tlvTag) - val endpointListID = tlvReader.getUInt(ContextSpecificTag(TAG_ENDPOINT_LIST_I_D)) + val endpointListID = tlvReader.getUInt(ContextSpecificTag(TAG_ENDPOINT_LIST_ID)) val name = tlvReader.getString(ContextSpecificTag(TAG_NAME)) val type = tlvReader.getUInt(ContextSpecificTag(TAG_TYPE)) val endpoints = diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ApplicationBasicClusterApplicationStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ApplicationBasicClusterApplicationStruct.kt index 566b2efdf3b66b..0438c54949c213 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ApplicationBasicClusterApplicationStruct.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ApplicationBasicClusterApplicationStruct.kt @@ -36,20 +36,20 @@ class ApplicationBasicClusterApplicationStruct( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_CATALOG_VENDOR_I_D), catalogVendorID) - put(ContextSpecificTag(TAG_APPLICATION_I_D), applicationID) + put(ContextSpecificTag(TAG_CATALOG_VENDOR_ID), catalogVendorID) + put(ContextSpecificTag(TAG_APPLICATION_ID), applicationID) endStructure() } } companion object { - private const val TAG_CATALOG_VENDOR_I_D = 0 - private const val TAG_APPLICATION_I_D = 1 + private const val TAG_CATALOG_VENDOR_ID = 0 + private const val TAG_APPLICATION_ID = 1 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ApplicationBasicClusterApplicationStruct { tlvReader.enterStructure(tlvTag) - val catalogVendorID = tlvReader.getUInt(ContextSpecificTag(TAG_CATALOG_VENDOR_I_D)) - val applicationID = tlvReader.getString(ContextSpecificTag(TAG_APPLICATION_I_D)) + val catalogVendorID = tlvReader.getUInt(ContextSpecificTag(TAG_CATALOG_VENDOR_ID)) + val applicationID = tlvReader.getString(ContextSpecificTag(TAG_APPLICATION_ID)) tlvReader.exitContainer() diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ApplicationLauncherClusterApplicationStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ApplicationLauncherClusterApplicationStruct.kt index 26e76b3c699590..33feca6b60ec82 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ApplicationLauncherClusterApplicationStruct.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ApplicationLauncherClusterApplicationStruct.kt @@ -36,20 +36,20 @@ class ApplicationLauncherClusterApplicationStruct( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_CATALOG_VENDOR_I_D), catalogVendorID) - put(ContextSpecificTag(TAG_APPLICATION_I_D), applicationID) + put(ContextSpecificTag(TAG_CATALOG_VENDOR_ID), catalogVendorID) + put(ContextSpecificTag(TAG_APPLICATION_ID), applicationID) endStructure() } } companion object { - private const val TAG_CATALOG_VENDOR_I_D = 0 - private const val TAG_APPLICATION_I_D = 1 + private const val TAG_CATALOG_VENDOR_ID = 0 + private const val TAG_APPLICATION_ID = 1 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ApplicationLauncherClusterApplicationStruct { tlvReader.enterStructure(tlvTag) - val catalogVendorID = tlvReader.getUInt(ContextSpecificTag(TAG_CATALOG_VENDOR_I_D)) - val applicationID = tlvReader.getString(ContextSpecificTag(TAG_APPLICATION_I_D)) + val catalogVendorID = tlvReader.getUInt(ContextSpecificTag(TAG_CATALOG_VENDOR_ID)) + val applicationID = tlvReader.getString(ContextSpecificTag(TAG_APPLICATION_ID)) tlvReader.exitContainer() diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ChannelClusterProgramStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ChannelClusterProgramStruct.kt index e7e00d9518aa83..10ef68db6a61bc 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ChannelClusterProgramStruct.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ChannelClusterProgramStruct.kt @@ -151,7 +151,7 @@ class ChannelClusterProgramStruct( } if (externalIDList.isPresent) { val optexternalIDList = externalIDList.get() - startArray(ContextSpecificTag(TAG_EXTERNAL_I_D_LIST)) + startArray(ContextSpecificTag(TAG_EXTERNAL_ID_LIST)) for (item in optexternalIDList.iterator()) { item.toTlv(AnonymousTag, this) } @@ -180,7 +180,7 @@ class ChannelClusterProgramStruct( private const val TAG_SERIES_INFO = 15 private const val TAG_CATEGORY_LIST = 16 private const val TAG_CAST_LIST = 17 - private const val TAG_EXTERNAL_I_D_LIST = 18 + private const val TAG_EXTERNAL_ID_LIST = 18 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ChannelClusterProgramStruct { tlvReader.enterStructure(tlvTag) @@ -308,10 +308,10 @@ class ChannelClusterProgramStruct( Optional.empty() } val externalIDList = - if (tlvReader.isNextTag(ContextSpecificTag(TAG_EXTERNAL_I_D_LIST))) { + if (tlvReader.isNextTag(ContextSpecificTag(TAG_EXTERNAL_ID_LIST))) { Optional.of( buildList { - tlvReader.enterArray(ContextSpecificTag(TAG_EXTERNAL_I_D_LIST)) + tlvReader.enterArray(ContextSpecificTag(TAG_EXTERNAL_ID_LIST)) while (!tlvReader.isEndOfContainer()) { add(ChannelClusterProgramCastStruct.fromTlv(AnonymousTag, tlvReader)) } diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ContentLauncherClusterParameterStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ContentLauncherClusterParameterStruct.kt index 96e28a1c12b28f..2c6df6ee7123ad 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ContentLauncherClusterParameterStruct.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ContentLauncherClusterParameterStruct.kt @@ -44,7 +44,7 @@ class ContentLauncherClusterParameterStruct( put(ContextSpecificTag(TAG_VALUE), value) if (externalIDList.isPresent) { val optexternalIDList = externalIDList.get() - startArray(ContextSpecificTag(TAG_EXTERNAL_I_D_LIST)) + startArray(ContextSpecificTag(TAG_EXTERNAL_ID_LIST)) for (item in optexternalIDList.iterator()) { item.toTlv(AnonymousTag, this) } @@ -57,17 +57,17 @@ class ContentLauncherClusterParameterStruct( companion object { private const val TAG_TYPE = 0 private const val TAG_VALUE = 1 - private const val TAG_EXTERNAL_I_D_LIST = 2 + private const val TAG_EXTERNAL_ID_LIST = 2 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ContentLauncherClusterParameterStruct { tlvReader.enterStructure(tlvTag) val type = tlvReader.getUInt(ContextSpecificTag(TAG_TYPE)) val value = tlvReader.getString(ContextSpecificTag(TAG_VALUE)) val externalIDList = - if (tlvReader.isNextTag(ContextSpecificTag(TAG_EXTERNAL_I_D_LIST))) { + if (tlvReader.isNextTag(ContextSpecificTag(TAG_EXTERNAL_ID_LIST))) { Optional.of( buildList { - tlvReader.enterArray(ContextSpecificTag(TAG_EXTERNAL_I_D_LIST)) + tlvReader.enterArray(ContextSpecificTag(TAG_EXTERNAL_ID_LIST)) while (!tlvReader.isEndOfContainer()) { add(ContentLauncherClusterAdditionalInfoStruct.fromTlv(AnonymousTag, tlvReader)) } diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ContentLauncherClusterStyleInformationStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ContentLauncherClusterStyleInformationStruct.kt index 9c9da395d51915..41ef65feadd9f0 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ContentLauncherClusterStyleInformationStruct.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ContentLauncherClusterStyleInformationStruct.kt @@ -41,7 +41,7 @@ class ContentLauncherClusterStyleInformationStruct( startStructure(tlvTag) if (imageURL.isPresent) { val optimageURL = imageURL.get() - put(ContextSpecificTag(TAG_IMAGE_U_R_L), optimageURL) + put(ContextSpecificTag(TAG_IMAGE_URL), optimageURL) } if (color.isPresent) { val optcolor = color.get() @@ -56,15 +56,15 @@ class ContentLauncherClusterStyleInformationStruct( } companion object { - private const val TAG_IMAGE_U_R_L = 0 + private const val TAG_IMAGE_URL = 0 private const val TAG_COLOR = 1 private const val TAG_SIZE = 2 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ContentLauncherClusterStyleInformationStruct { tlvReader.enterStructure(tlvTag) val imageURL = - if (tlvReader.isNextTag(ContextSpecificTag(TAG_IMAGE_U_R_L))) { - Optional.of(tlvReader.getString(ContextSpecificTag(TAG_IMAGE_U_R_L))) + if (tlvReader.isNextTag(ContextSpecificTag(TAG_IMAGE_URL))) { + Optional.of(tlvReader.getString(ContextSpecificTag(TAG_IMAGE_URL))) } else { Optional.empty() } diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DemandResponseLoadControlClusterLoadControlEventStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DemandResponseLoadControlClusterLoadControlEventStruct.kt index 91a2071e0b3474..5b7a2e7f62773a 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DemandResponseLoadControlClusterLoadControlEventStruct.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DemandResponseLoadControlClusterLoadControlEventStruct.kt @@ -50,11 +50,11 @@ class DemandResponseLoadControlClusterLoadControlEventStruct( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_EVENT_I_D), eventID) + put(ContextSpecificTag(TAG_EVENT_ID), eventID) if (programID != null) { - put(ContextSpecificTag(TAG_PROGRAM_I_D), programID) + put(ContextSpecificTag(TAG_PROGRAM_ID), programID) } else { - putNull(ContextSpecificTag(TAG_PROGRAM_I_D)) + putNull(ContextSpecificTag(TAG_PROGRAM_ID)) } put(ContextSpecificTag(TAG_CONTROL), control) put(ContextSpecificTag(TAG_DEVICE_CLASS), deviceClass) @@ -78,8 +78,8 @@ class DemandResponseLoadControlClusterLoadControlEventStruct( } companion object { - private const val TAG_EVENT_I_D = 0 - private const val TAG_PROGRAM_I_D = 1 + private const val TAG_EVENT_ID = 0 + private const val TAG_PROGRAM_ID = 1 private const val TAG_CONTROL = 2 private const val TAG_DEVICE_CLASS = 3 private const val TAG_ENROLLMENT_GROUP = 4 @@ -92,12 +92,12 @@ class DemandResponseLoadControlClusterLoadControlEventStruct( tlvReader: TlvReader, ): DemandResponseLoadControlClusterLoadControlEventStruct { tlvReader.enterStructure(tlvTag) - val eventID = tlvReader.getByteArray(ContextSpecificTag(TAG_EVENT_I_D)) + val eventID = tlvReader.getByteArray(ContextSpecificTag(TAG_EVENT_ID)) val programID = if (!tlvReader.isNull()) { - tlvReader.getByteArray(ContextSpecificTag(TAG_PROGRAM_I_D)) + tlvReader.getByteArray(ContextSpecificTag(TAG_PROGRAM_ID)) } else { - tlvReader.getNull(ContextSpecificTag(TAG_PROGRAM_I_D)) + tlvReader.getNull(ContextSpecificTag(TAG_PROGRAM_ID)) null } val control = tlvReader.getUInt(ContextSpecificTag(TAG_CONTROL)) diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DemandResponseLoadControlClusterLoadControlProgramStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DemandResponseLoadControlClusterLoadControlProgramStruct.kt index 3a71f11aedee40..766287fcc6dd62 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DemandResponseLoadControlClusterLoadControlProgramStruct.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DemandResponseLoadControlClusterLoadControlProgramStruct.kt @@ -42,7 +42,7 @@ class DemandResponseLoadControlClusterLoadControlProgramStruct( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_PROGRAM_I_D), programID) + put(ContextSpecificTag(TAG_PROGRAM_ID), programID) put(ContextSpecificTag(TAG_NAME), name) if (enrollmentGroup != null) { put(ContextSpecificTag(TAG_ENROLLMENT_GROUP), enrollmentGroup) @@ -64,7 +64,7 @@ class DemandResponseLoadControlClusterLoadControlProgramStruct( } companion object { - private const val TAG_PROGRAM_I_D = 0 + private const val TAG_PROGRAM_ID = 0 private const val TAG_NAME = 1 private const val TAG_ENROLLMENT_GROUP = 2 private const val TAG_RANDOM_START_MINUTES = 3 @@ -75,7 +75,7 @@ class DemandResponseLoadControlClusterLoadControlProgramStruct( tlvReader: TlvReader, ): DemandResponseLoadControlClusterLoadControlProgramStruct { tlvReader.enterStructure(tlvTag) - val programID = tlvReader.getByteArray(ContextSpecificTag(TAG_PROGRAM_I_D)) + val programID = tlvReader.getByteArray(ContextSpecificTag(TAG_PROGRAM_ID)) val name = tlvReader.getString(ContextSpecificTag(TAG_NAME)) val enrollmentGroup = if (!tlvReader.isNull()) { diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DescriptorClusterSemanticTagStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DescriptorClusterSemanticTagStruct.kt index a3da0980b30450..6c13fcab833591 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DescriptorClusterSemanticTagStruct.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DescriptorClusterSemanticTagStruct.kt @@ -46,7 +46,7 @@ class DescriptorClusterSemanticTagStruct( } else { putNull(ContextSpecificTag(TAG_MFG_CODE)) } - put(ContextSpecificTag(TAG_NAMESPACE_I_D), namespaceID) + put(ContextSpecificTag(TAG_NAMESPACE_ID), namespaceID) put(ContextSpecificTag(TAG_TAG), tag) if (label != null) { if (label.isPresent) { @@ -62,7 +62,7 @@ class DescriptorClusterSemanticTagStruct( companion object { private const val TAG_MFG_CODE = 0 - private const val TAG_NAMESPACE_I_D = 1 + private const val TAG_NAMESPACE_ID = 1 private const val TAG_TAG = 2 private const val TAG_LABEL = 3 @@ -75,7 +75,7 @@ class DescriptorClusterSemanticTagStruct( tlvReader.getNull(ContextSpecificTag(TAG_MFG_CODE)) null } - val namespaceID = tlvReader.getUInt(ContextSpecificTag(TAG_NAMESPACE_I_D)) + val namespaceID = tlvReader.getUInt(ContextSpecificTag(TAG_NAMESPACE_ID)) val tag = tlvReader.getUInt(ContextSpecificTag(TAG_TAG)) val label = if (!tlvReader.isNull()) { diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DeviceEnergyManagementClusterForecastStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DeviceEnergyManagementClusterForecastStruct.kt index 2f3b23fc592020..c554c72fb89dd2 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DeviceEnergyManagementClusterForecastStruct.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DeviceEnergyManagementClusterForecastStruct.kt @@ -52,7 +52,7 @@ class DeviceEnergyManagementClusterForecastStruct( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_FORECAST_I_D), forecastID) + put(ContextSpecificTag(TAG_FORECAST_ID), forecastID) if (activeSlotNumber != null) { put(ContextSpecificTag(TAG_ACTIVE_SLOT_NUMBER), activeSlotNumber) } else { @@ -84,7 +84,7 @@ class DeviceEnergyManagementClusterForecastStruct( } companion object { - private const val TAG_FORECAST_I_D = 0 + private const val TAG_FORECAST_ID = 0 private const val TAG_ACTIVE_SLOT_NUMBER = 1 private const val TAG_START_TIME = 2 private const val TAG_END_TIME = 3 @@ -96,7 +96,7 @@ class DeviceEnergyManagementClusterForecastStruct( fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): DeviceEnergyManagementClusterForecastStruct { tlvReader.enterStructure(tlvTag) - val forecastID = tlvReader.getULong(ContextSpecificTag(TAG_FORECAST_I_D)) + val forecastID = tlvReader.getULong(ContextSpecificTag(TAG_FORECAST_ID)) val activeSlotNumber = if (!tlvReader.isNull()) { tlvReader.getUInt(ContextSpecificTag(TAG_ACTIVE_SLOT_NUMBER)) diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DeviceEnergyManagementClusterSlotStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DeviceEnergyManagementClusterSlotStruct.kt index f966446dda469d..e33cd10f7514d1 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DeviceEnergyManagementClusterSlotStruct.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/DeviceEnergyManagementClusterSlotStruct.kt @@ -89,7 +89,7 @@ class DeviceEnergyManagementClusterSlotStruct( } if (manufacturerESAState.isPresent) { val optmanufacturerESAState = manufacturerESAState.get() - put(ContextSpecificTag(TAG_MANUFACTURER_E_S_A_STATE), optmanufacturerESAState) + put(ContextSpecificTag(TAG_MANUFACTURER_ESA_STATE), optmanufacturerESAState) } if (nominalPower.isPresent) { val optnominalPower = nominalPower.get() @@ -144,7 +144,7 @@ class DeviceEnergyManagementClusterSlotStruct( private const val TAG_SLOT_IS_PAUSABLE = 5 private const val TAG_MIN_PAUSE_DURATION = 6 private const val TAG_MAX_PAUSE_DURATION = 7 - private const val TAG_MANUFACTURER_E_S_A_STATE = 8 + private const val TAG_MANUFACTURER_ESA_STATE = 8 private const val TAG_NOMINAL_POWER = 9 private const val TAG_MIN_POWER = 10 private const val TAG_MAX_POWER = 11 @@ -181,8 +181,8 @@ class DeviceEnergyManagementClusterSlotStruct( Optional.empty() } val manufacturerESAState = - if (tlvReader.isNextTag(ContextSpecificTag(TAG_MANUFACTURER_E_S_A_STATE))) { - Optional.of(tlvReader.getUInt(ContextSpecificTag(TAG_MANUFACTURER_E_S_A_STATE))) + if (tlvReader.isNextTag(ContextSpecificTag(TAG_MANUFACTURER_ESA_STATE))) { + Optional.of(tlvReader.getUInt(ContextSpecificTag(TAG_MANUFACTURER_ESA_STATE))) } else { Optional.empty() } diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/EcosystemInformationClusterEcosystemLocationStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/EcosystemInformationClusterEcosystemLocationStruct.kt index 5b1b7103aaed67..bb84dcffef2b40 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/EcosystemInformationClusterEcosystemLocationStruct.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/EcosystemInformationClusterEcosystemLocationStruct.kt @@ -40,7 +40,7 @@ class EcosystemInformationClusterEcosystemLocationStruct( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_UNIQUE_LOCATION_I_D), uniqueLocationID) + put(ContextSpecificTag(TAG_UNIQUE_LOCATION_ID), uniqueLocationID) locationDescriptor.toTlv(ContextSpecificTag(TAG_LOCATION_DESCRIPTOR), this) put(ContextSpecificTag(TAG_LOCATION_DESCRIPTOR_LAST_EDIT), locationDescriptorLastEdit) put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex) @@ -49,7 +49,7 @@ class EcosystemInformationClusterEcosystemLocationStruct( } companion object { - private const val TAG_UNIQUE_LOCATION_I_D = 0 + private const val TAG_UNIQUE_LOCATION_ID = 0 private const val TAG_LOCATION_DESCRIPTOR = 1 private const val TAG_LOCATION_DESCRIPTOR_LAST_EDIT = 2 private const val TAG_FABRIC_INDEX = 254 @@ -59,7 +59,7 @@ class EcosystemInformationClusterEcosystemLocationStruct( tlvReader: TlvReader, ): EcosystemInformationClusterEcosystemLocationStruct { tlvReader.enterStructure(tlvTag) - val uniqueLocationID = tlvReader.getString(ContextSpecificTag(TAG_UNIQUE_LOCATION_I_D)) + val uniqueLocationID = tlvReader.getString(ContextSpecificTag(TAG_UNIQUE_LOCATION_ID)) val locationDescriptor = EcosystemInformationClusterLocationDescriptorStruct.fromTlv( ContextSpecificTag(TAG_LOCATION_DESCRIPTOR), diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/GroupKeyManagementClusterGroupKeyMapStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/GroupKeyManagementClusterGroupKeyMapStruct.kt index ec1ba8a3efcda2..ddcab454a36fa2 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/GroupKeyManagementClusterGroupKeyMapStruct.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/GroupKeyManagementClusterGroupKeyMapStruct.kt @@ -39,7 +39,7 @@ class GroupKeyManagementClusterGroupKeyMapStruct( tlvWriter.apply { startStructure(tlvTag) put(ContextSpecificTag(TAG_GROUP_ID), groupId) - put(ContextSpecificTag(TAG_GROUP_KEY_SET_I_D), groupKeySetID) + put(ContextSpecificTag(TAG_GROUP_KEY_SET_ID), groupKeySetID) put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex) endStructure() } @@ -47,13 +47,13 @@ class GroupKeyManagementClusterGroupKeyMapStruct( companion object { private const val TAG_GROUP_ID = 1 - private const val TAG_GROUP_KEY_SET_I_D = 2 + private const val TAG_GROUP_KEY_SET_ID = 2 private const val TAG_FABRIC_INDEX = 254 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): GroupKeyManagementClusterGroupKeyMapStruct { tlvReader.enterStructure(tlvTag) val groupId = tlvReader.getUInt(ContextSpecificTag(TAG_GROUP_ID)) - val groupKeySetID = tlvReader.getUInt(ContextSpecificTag(TAG_GROUP_KEY_SET_I_D)) + val groupKeySetID = tlvReader.getUInt(ContextSpecificTag(TAG_GROUP_KEY_SET_ID)) val fabricIndex = tlvReader.getUInt(ContextSpecificTag(TAG_FABRIC_INDEX)) tlvReader.exitContainer() diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/GroupKeyManagementClusterGroupKeySetStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/GroupKeyManagementClusterGroupKeySetStruct.kt index e59269a8823c94..5dd1291b0d1f25 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/GroupKeyManagementClusterGroupKeySetStruct.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/GroupKeyManagementClusterGroupKeySetStruct.kt @@ -48,7 +48,7 @@ class GroupKeyManagementClusterGroupKeySetStruct( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_GROUP_KEY_SET_I_D), groupKeySetID) + put(ContextSpecificTag(TAG_GROUP_KEY_SET_ID), groupKeySetID) put(ContextSpecificTag(TAG_GROUP_KEY_SECURITY_POLICY), groupKeySecurityPolicy) if (epochKey0 != null) { put(ContextSpecificTag(TAG_EPOCH_KEY0), epochKey0) @@ -85,7 +85,7 @@ class GroupKeyManagementClusterGroupKeySetStruct( } companion object { - private const val TAG_GROUP_KEY_SET_I_D = 0 + private const val TAG_GROUP_KEY_SET_ID = 0 private const val TAG_GROUP_KEY_SECURITY_POLICY = 1 private const val TAG_EPOCH_KEY0 = 2 private const val TAG_EPOCH_START_TIME0 = 3 @@ -96,7 +96,7 @@ class GroupKeyManagementClusterGroupKeySetStruct( fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): GroupKeyManagementClusterGroupKeySetStruct { tlvReader.enterStructure(tlvTag) - val groupKeySetID = tlvReader.getUInt(ContextSpecificTag(TAG_GROUP_KEY_SET_I_D)) + val groupKeySetID = tlvReader.getUInt(ContextSpecificTag(TAG_GROUP_KEY_SET_ID)) val groupKeySecurityPolicy = tlvReader.getUInt(ContextSpecificTag(TAG_GROUP_KEY_SECURITY_POLICY)) val epochKey0 = diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/IcdManagementClusterMonitoringRegistrationStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/IcdManagementClusterMonitoringRegistrationStruct.kt index fd60e6d6da4328..acdcc1643a7ba6 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/IcdManagementClusterMonitoringRegistrationStruct.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/IcdManagementClusterMonitoringRegistrationStruct.kt @@ -40,7 +40,7 @@ class IcdManagementClusterMonitoringRegistrationStruct( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_CHECK_IN_NODE_I_D), checkInNodeID) + put(ContextSpecificTag(TAG_CHECK_IN_NODE_ID), checkInNodeID) put(ContextSpecificTag(TAG_MONITORED_SUBJECT), monitoredSubject) put(ContextSpecificTag(TAG_CLIENT_TYPE), clientType) put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex) @@ -49,7 +49,7 @@ class IcdManagementClusterMonitoringRegistrationStruct( } companion object { - private const val TAG_CHECK_IN_NODE_I_D = 1 + private const val TAG_CHECK_IN_NODE_ID = 1 private const val TAG_MONITORED_SUBJECT = 2 private const val TAG_CLIENT_TYPE = 4 private const val TAG_FABRIC_INDEX = 254 @@ -59,7 +59,7 @@ class IcdManagementClusterMonitoringRegistrationStruct( tlvReader: TlvReader, ): IcdManagementClusterMonitoringRegistrationStruct { tlvReader.enterStructure(tlvTag) - val checkInNodeID = tlvReader.getULong(ContextSpecificTag(TAG_CHECK_IN_NODE_I_D)) + val checkInNodeID = tlvReader.getULong(ContextSpecificTag(TAG_CHECK_IN_NODE_ID)) val monitoredSubject = tlvReader.getULong(ContextSpecificTag(TAG_MONITORED_SUBJECT)) val clientType = tlvReader.getUInt(ContextSpecificTag(TAG_CLIENT_TYPE)) val fabricIndex = tlvReader.getUInt(ContextSpecificTag(TAG_FABRIC_INDEX)) diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/MessagesClusterMessageResponseOptionStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/MessagesClusterMessageResponseOptionStruct.kt index b8707df67125c1..0f582c0e9c5130 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/MessagesClusterMessageResponseOptionStruct.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/MessagesClusterMessageResponseOptionStruct.kt @@ -39,7 +39,7 @@ class MessagesClusterMessageResponseOptionStruct( startStructure(tlvTag) if (messageResponseID.isPresent) { val optmessageResponseID = messageResponseID.get() - put(ContextSpecificTag(TAG_MESSAGE_RESPONSE_I_D), optmessageResponseID) + put(ContextSpecificTag(TAG_MESSAGE_RESPONSE_ID), optmessageResponseID) } if (label.isPresent) { val optlabel = label.get() @@ -50,14 +50,14 @@ class MessagesClusterMessageResponseOptionStruct( } companion object { - private const val TAG_MESSAGE_RESPONSE_I_D = 0 + private const val TAG_MESSAGE_RESPONSE_ID = 0 private const val TAG_LABEL = 1 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): MessagesClusterMessageResponseOptionStruct { tlvReader.enterStructure(tlvTag) val messageResponseID = - if (tlvReader.isNextTag(ContextSpecificTag(TAG_MESSAGE_RESPONSE_I_D))) { - Optional.of(tlvReader.getULong(ContextSpecificTag(TAG_MESSAGE_RESPONSE_I_D))) + if (tlvReader.isNextTag(ContextSpecificTag(TAG_MESSAGE_RESPONSE_ID))) { + Optional.of(tlvReader.getULong(ContextSpecificTag(TAG_MESSAGE_RESPONSE_ID))) } else { Optional.empty() } diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/MessagesClusterMessageStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/MessagesClusterMessageStruct.kt index 6ad4f41ee313b2..89657c60fd97f2 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/MessagesClusterMessageStruct.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/MessagesClusterMessageStruct.kt @@ -48,7 +48,7 @@ class MessagesClusterMessageStruct( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_MESSAGE_I_D), messageID) + put(ContextSpecificTag(TAG_MESSAGE_ID), messageID) put(ContextSpecificTag(TAG_PRIORITY), priority) put(ContextSpecificTag(TAG_MESSAGE_CONTROL), messageControl) if (startTime != null) { @@ -75,7 +75,7 @@ class MessagesClusterMessageStruct( } companion object { - private const val TAG_MESSAGE_I_D = 0 + private const val TAG_MESSAGE_ID = 0 private const val TAG_PRIORITY = 1 private const val TAG_MESSAGE_CONTROL = 2 private const val TAG_START_TIME = 3 @@ -85,7 +85,7 @@ class MessagesClusterMessageStruct( fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): MessagesClusterMessageStruct { tlvReader.enterStructure(tlvTag) - val messageID = tlvReader.getByteArray(ContextSpecificTag(TAG_MESSAGE_I_D)) + val messageID = tlvReader.getByteArray(ContextSpecificTag(TAG_MESSAGE_ID)) val priority = tlvReader.getUInt(ContextSpecificTag(TAG_PRIORITY)) val messageControl = tlvReader.getUInt(ContextSpecificTag(TAG_MESSAGE_CONTROL)) val startTime = diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/NetworkCommissioningClusterNetworkInfoStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/NetworkCommissioningClusterNetworkInfoStruct.kt index 6d120b2c6e9215..54bfcc1315ca62 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/NetworkCommissioningClusterNetworkInfoStruct.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/NetworkCommissioningClusterNetworkInfoStruct.kt @@ -41,7 +41,7 @@ class NetworkCommissioningClusterNetworkInfoStruct( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_NETWORK_I_D), networkID) + put(ContextSpecificTag(TAG_NETWORK_ID), networkID) put(ContextSpecificTag(TAG_CONNECTED), connected) if (networkIdentifier != null) { if (networkIdentifier.isPresent) { @@ -64,14 +64,14 @@ class NetworkCommissioningClusterNetworkInfoStruct( } companion object { - private const val TAG_NETWORK_I_D = 0 + private const val TAG_NETWORK_ID = 0 private const val TAG_CONNECTED = 1 private const val TAG_NETWORK_IDENTIFIER = 2 private const val TAG_CLIENT_IDENTIFIER = 3 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): NetworkCommissioningClusterNetworkInfoStruct { tlvReader.enterStructure(tlvTag) - val networkID = tlvReader.getByteArray(ContextSpecificTag(TAG_NETWORK_I_D)) + val networkID = tlvReader.getByteArray(ContextSpecificTag(TAG_NETWORK_ID)) val connected = tlvReader.getBoolean(ContextSpecificTag(TAG_CONNECTED)) val networkIdentifier = if (!tlvReader.isNull()) { diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/OperationalCredentialsClusterFabricDescriptorStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/OperationalCredentialsClusterFabricDescriptorStruct.kt index 5d2af6b6862ffa..938092f700fc2a 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/OperationalCredentialsClusterFabricDescriptorStruct.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/OperationalCredentialsClusterFabricDescriptorStruct.kt @@ -45,9 +45,9 @@ class OperationalCredentialsClusterFabricDescriptorStruct( tlvWriter.apply { startStructure(tlvTag) put(ContextSpecificTag(TAG_ROOT_PUBLIC_KEY), rootPublicKey) - put(ContextSpecificTag(TAG_VENDOR_I_D), vendorID) - put(ContextSpecificTag(TAG_FABRIC_I_D), fabricID) - put(ContextSpecificTag(TAG_NODE_I_D), nodeID) + put(ContextSpecificTag(TAG_VENDOR_ID), vendorID) + put(ContextSpecificTag(TAG_FABRIC_ID), fabricID) + put(ContextSpecificTag(TAG_NODE_ID), nodeID) put(ContextSpecificTag(TAG_LABEL), label) put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex) endStructure() @@ -56,9 +56,9 @@ class OperationalCredentialsClusterFabricDescriptorStruct( companion object { private const val TAG_ROOT_PUBLIC_KEY = 1 - private const val TAG_VENDOR_I_D = 2 - private const val TAG_FABRIC_I_D = 3 - private const val TAG_NODE_I_D = 4 + private const val TAG_VENDOR_ID = 2 + private const val TAG_FABRIC_ID = 3 + private const val TAG_NODE_ID = 4 private const val TAG_LABEL = 5 private const val TAG_FABRIC_INDEX = 254 @@ -68,9 +68,9 @@ class OperationalCredentialsClusterFabricDescriptorStruct( ): OperationalCredentialsClusterFabricDescriptorStruct { tlvReader.enterStructure(tlvTag) val rootPublicKey = tlvReader.getByteArray(ContextSpecificTag(TAG_ROOT_PUBLIC_KEY)) - val vendorID = tlvReader.getUInt(ContextSpecificTag(TAG_VENDOR_I_D)) - val fabricID = tlvReader.getULong(ContextSpecificTag(TAG_FABRIC_I_D)) - val nodeID = tlvReader.getULong(ContextSpecificTag(TAG_NODE_I_D)) + val vendorID = tlvReader.getUInt(ContextSpecificTag(TAG_VENDOR_ID)) + val fabricID = tlvReader.getULong(ContextSpecificTag(TAG_FABRIC_ID)) + val nodeID = tlvReader.getULong(ContextSpecificTag(TAG_NODE_ID)) val label = tlvReader.getString(ContextSpecificTag(TAG_LABEL)) val fabricIndex = tlvReader.getUInt(ContextSpecificTag(TAG_FABRIC_INDEX)) diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/OperationalStateClusterErrorStateStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/OperationalStateClusterErrorStateStruct.kt index c2a0b9a58dc85d..7f2f4b04d2a46b 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/OperationalStateClusterErrorStateStruct.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/OperationalStateClusterErrorStateStruct.kt @@ -39,7 +39,7 @@ class OperationalStateClusterErrorStateStruct( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_ERROR_STATE_I_D), errorStateID) + put(ContextSpecificTag(TAG_ERROR_STATE_ID), errorStateID) if (errorStateLabel.isPresent) { val opterrorStateLabel = errorStateLabel.get() put(ContextSpecificTag(TAG_ERROR_STATE_LABEL), opterrorStateLabel) @@ -53,13 +53,13 @@ class OperationalStateClusterErrorStateStruct( } companion object { - private const val TAG_ERROR_STATE_I_D = 0 + private const val TAG_ERROR_STATE_ID = 0 private const val TAG_ERROR_STATE_LABEL = 1 private const val TAG_ERROR_STATE_DETAILS = 2 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): OperationalStateClusterErrorStateStruct { tlvReader.enterStructure(tlvTag) - val errorStateID = tlvReader.getUInt(ContextSpecificTag(TAG_ERROR_STATE_I_D)) + val errorStateID = tlvReader.getUInt(ContextSpecificTag(TAG_ERROR_STATE_ID)) val errorStateLabel = if (tlvReader.isNextTag(ContextSpecificTag(TAG_ERROR_STATE_LABEL))) { Optional.of(tlvReader.getString(ContextSpecificTag(TAG_ERROR_STATE_LABEL))) diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/OperationalStateClusterOperationalStateStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/OperationalStateClusterOperationalStateStruct.kt index 558446e0811069..f07d7ec323b8ac 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/OperationalStateClusterOperationalStateStruct.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/OperationalStateClusterOperationalStateStruct.kt @@ -37,7 +37,7 @@ class OperationalStateClusterOperationalStateStruct( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_OPERATIONAL_STATE_I_D), operationalStateID) + put(ContextSpecificTag(TAG_OPERATIONAL_STATE_ID), operationalStateID) if (operationalStateLabel.isPresent) { val optoperationalStateLabel = operationalStateLabel.get() put(ContextSpecificTag(TAG_OPERATIONAL_STATE_LABEL), optoperationalStateLabel) @@ -47,12 +47,12 @@ class OperationalStateClusterOperationalStateStruct( } companion object { - private const val TAG_OPERATIONAL_STATE_I_D = 0 + private const val TAG_OPERATIONAL_STATE_ID = 0 private const val TAG_OPERATIONAL_STATE_LABEL = 1 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): OperationalStateClusterOperationalStateStruct { tlvReader.enterStructure(tlvTag) - val operationalStateID = tlvReader.getUInt(ContextSpecificTag(TAG_OPERATIONAL_STATE_I_D)) + val operationalStateID = tlvReader.getUInt(ContextSpecificTag(TAG_OPERATIONAL_STATE_ID)) val operationalStateLabel = if (tlvReader.isNextTag(ContextSpecificTag(TAG_OPERATIONAL_STATE_LABEL))) { Optional.of(tlvReader.getString(ContextSpecificTag(TAG_OPERATIONAL_STATE_LABEL))) diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/OtaSoftwareUpdateRequestorClusterProviderLocation.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/OtaSoftwareUpdateRequestorClusterProviderLocation.kt index 25e6467fff7370..a5f1882a6e1f88 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/OtaSoftwareUpdateRequestorClusterProviderLocation.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/OtaSoftwareUpdateRequestorClusterProviderLocation.kt @@ -38,7 +38,7 @@ class OtaSoftwareUpdateRequestorClusterProviderLocation( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_PROVIDER_NODE_I_D), providerNodeID) + put(ContextSpecificTag(TAG_PROVIDER_NODE_ID), providerNodeID) put(ContextSpecificTag(TAG_ENDPOINT), endpoint) put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex) endStructure() @@ -46,7 +46,7 @@ class OtaSoftwareUpdateRequestorClusterProviderLocation( } companion object { - private const val TAG_PROVIDER_NODE_I_D = 1 + private const val TAG_PROVIDER_NODE_ID = 1 private const val TAG_ENDPOINT = 2 private const val TAG_FABRIC_INDEX = 254 @@ -55,7 +55,7 @@ class OtaSoftwareUpdateRequestorClusterProviderLocation( tlvReader: TlvReader, ): OtaSoftwareUpdateRequestorClusterProviderLocation { tlvReader.enterStructure(tlvTag) - val providerNodeID = tlvReader.getULong(ContextSpecificTag(TAG_PROVIDER_NODE_I_D)) + val providerNodeID = tlvReader.getULong(ContextSpecificTag(TAG_PROVIDER_NODE_ID)) val endpoint = tlvReader.getUInt(ContextSpecificTag(TAG_ENDPOINT)) val fabricIndex = tlvReader.getUInt(ContextSpecificTag(TAG_FABRIC_INDEX)) diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/OvenCavityOperationalStateClusterErrorStateStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/OvenCavityOperationalStateClusterErrorStateStruct.kt index 741be20fc83f17..dbaea8f76bd553 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/OvenCavityOperationalStateClusterErrorStateStruct.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/OvenCavityOperationalStateClusterErrorStateStruct.kt @@ -39,7 +39,7 @@ class OvenCavityOperationalStateClusterErrorStateStruct( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_ERROR_STATE_I_D), errorStateID) + put(ContextSpecificTag(TAG_ERROR_STATE_ID), errorStateID) if (errorStateLabel.isPresent) { val opterrorStateLabel = errorStateLabel.get() put(ContextSpecificTag(TAG_ERROR_STATE_LABEL), opterrorStateLabel) @@ -53,7 +53,7 @@ class OvenCavityOperationalStateClusterErrorStateStruct( } companion object { - private const val TAG_ERROR_STATE_I_D = 0 + private const val TAG_ERROR_STATE_ID = 0 private const val TAG_ERROR_STATE_LABEL = 1 private const val TAG_ERROR_STATE_DETAILS = 2 @@ -62,7 +62,7 @@ class OvenCavityOperationalStateClusterErrorStateStruct( tlvReader: TlvReader, ): OvenCavityOperationalStateClusterErrorStateStruct { tlvReader.enterStructure(tlvTag) - val errorStateID = tlvReader.getUInt(ContextSpecificTag(TAG_ERROR_STATE_I_D)) + val errorStateID = tlvReader.getUInt(ContextSpecificTag(TAG_ERROR_STATE_ID)) val errorStateLabel = if (tlvReader.isNextTag(ContextSpecificTag(TAG_ERROR_STATE_LABEL))) { Optional.of(tlvReader.getString(ContextSpecificTag(TAG_ERROR_STATE_LABEL))) diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/OvenCavityOperationalStateClusterOperationalStateStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/OvenCavityOperationalStateClusterOperationalStateStruct.kt index b8cc6c5082de96..7665b08f051440 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/OvenCavityOperationalStateClusterOperationalStateStruct.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/OvenCavityOperationalStateClusterOperationalStateStruct.kt @@ -37,7 +37,7 @@ class OvenCavityOperationalStateClusterOperationalStateStruct( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_OPERATIONAL_STATE_I_D), operationalStateID) + put(ContextSpecificTag(TAG_OPERATIONAL_STATE_ID), operationalStateID) if (operationalStateLabel.isPresent) { val optoperationalStateLabel = operationalStateLabel.get() put(ContextSpecificTag(TAG_OPERATIONAL_STATE_LABEL), optoperationalStateLabel) @@ -47,7 +47,7 @@ class OvenCavityOperationalStateClusterOperationalStateStruct( } companion object { - private const val TAG_OPERATIONAL_STATE_I_D = 0 + private const val TAG_OPERATIONAL_STATE_ID = 0 private const val TAG_OPERATIONAL_STATE_LABEL = 1 fun fromTlv( @@ -55,7 +55,7 @@ class OvenCavityOperationalStateClusterOperationalStateStruct( tlvReader: TlvReader, ): OvenCavityOperationalStateClusterOperationalStateStruct { tlvReader.enterStructure(tlvTag) - val operationalStateID = tlvReader.getUInt(ContextSpecificTag(TAG_OPERATIONAL_STATE_I_D)) + val operationalStateID = tlvReader.getUInt(ContextSpecificTag(TAG_OPERATIONAL_STATE_ID)) val operationalStateLabel = if (tlvReader.isNextTag(ContextSpecificTag(TAG_OPERATIONAL_STATE_LABEL))) { Optional.of(tlvReader.getString(ContextSpecificTag(TAG_OPERATIONAL_STATE_LABEL))) diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/RvcOperationalStateClusterErrorStateStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/RvcOperationalStateClusterErrorStateStruct.kt index c9cbcef3190287..b3d4b1b3719d86 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/RvcOperationalStateClusterErrorStateStruct.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/RvcOperationalStateClusterErrorStateStruct.kt @@ -39,7 +39,7 @@ class RvcOperationalStateClusterErrorStateStruct( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_ERROR_STATE_I_D), errorStateID) + put(ContextSpecificTag(TAG_ERROR_STATE_ID), errorStateID) if (errorStateLabel.isPresent) { val opterrorStateLabel = errorStateLabel.get() put(ContextSpecificTag(TAG_ERROR_STATE_LABEL), opterrorStateLabel) @@ -53,13 +53,13 @@ class RvcOperationalStateClusterErrorStateStruct( } companion object { - private const val TAG_ERROR_STATE_I_D = 0 + private const val TAG_ERROR_STATE_ID = 0 private const val TAG_ERROR_STATE_LABEL = 1 private const val TAG_ERROR_STATE_DETAILS = 2 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): RvcOperationalStateClusterErrorStateStruct { tlvReader.enterStructure(tlvTag) - val errorStateID = tlvReader.getUInt(ContextSpecificTag(TAG_ERROR_STATE_I_D)) + val errorStateID = tlvReader.getUInt(ContextSpecificTag(TAG_ERROR_STATE_ID)) val errorStateLabel = if (tlvReader.isNextTag(ContextSpecificTag(TAG_ERROR_STATE_LABEL))) { Optional.of(tlvReader.getString(ContextSpecificTag(TAG_ERROR_STATE_LABEL))) diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/RvcOperationalStateClusterOperationalStateStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/RvcOperationalStateClusterOperationalStateStruct.kt index d91e485a254c7e..742857e296377c 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/RvcOperationalStateClusterOperationalStateStruct.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/RvcOperationalStateClusterOperationalStateStruct.kt @@ -37,7 +37,7 @@ class RvcOperationalStateClusterOperationalStateStruct( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_OPERATIONAL_STATE_I_D), operationalStateID) + put(ContextSpecificTag(TAG_OPERATIONAL_STATE_ID), operationalStateID) if (operationalStateLabel.isPresent) { val optoperationalStateLabel = operationalStateLabel.get() put(ContextSpecificTag(TAG_OPERATIONAL_STATE_LABEL), optoperationalStateLabel) @@ -47,7 +47,7 @@ class RvcOperationalStateClusterOperationalStateStruct( } companion object { - private const val TAG_OPERATIONAL_STATE_I_D = 0 + private const val TAG_OPERATIONAL_STATE_ID = 0 private const val TAG_OPERATIONAL_STATE_LABEL = 1 fun fromTlv( @@ -55,7 +55,7 @@ class RvcOperationalStateClusterOperationalStateStruct( tlvReader: TlvReader, ): RvcOperationalStateClusterOperationalStateStruct { tlvReader.enterStructure(tlvTag) - val operationalStateID = tlvReader.getUInt(ContextSpecificTag(TAG_OPERATIONAL_STATE_I_D)) + val operationalStateID = tlvReader.getUInt(ContextSpecificTag(TAG_OPERATIONAL_STATE_ID)) val operationalStateLabel = if (tlvReader.isNextTag(ContextSpecificTag(TAG_OPERATIONAL_STATE_LABEL))) { Optional.of(tlvReader.getString(ContextSpecificTag(TAG_OPERATIONAL_STATE_LABEL))) diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ScenesManagementClusterAttributeValuePairStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ScenesManagementClusterAttributeValuePairStruct.kt index f8526c71f933a5..80cafb38427a27 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ScenesManagementClusterAttributeValuePairStruct.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ScenesManagementClusterAttributeValuePairStruct.kt @@ -51,7 +51,7 @@ class ScenesManagementClusterAttributeValuePairStruct( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_ATTRIBUTE_I_D), attributeID) + put(ContextSpecificTag(TAG_ATTRIBUTE_ID), attributeID) if (valueUnsigned8.isPresent) { val optvalueUnsigned8 = valueUnsigned8.get() put(ContextSpecificTag(TAG_VALUE_UNSIGNED8), optvalueUnsigned8) @@ -89,7 +89,7 @@ class ScenesManagementClusterAttributeValuePairStruct( } companion object { - private const val TAG_ATTRIBUTE_I_D = 0 + private const val TAG_ATTRIBUTE_ID = 0 private const val TAG_VALUE_UNSIGNED8 = 1 private const val TAG_VALUE_SIGNED8 = 2 private const val TAG_VALUE_UNSIGNED16 = 3 @@ -104,7 +104,7 @@ class ScenesManagementClusterAttributeValuePairStruct( tlvReader: TlvReader, ): ScenesManagementClusterAttributeValuePairStruct { tlvReader.enterStructure(tlvTag) - val attributeID = tlvReader.getULong(ContextSpecificTag(TAG_ATTRIBUTE_I_D)) + val attributeID = tlvReader.getULong(ContextSpecificTag(TAG_ATTRIBUTE_ID)) val valueUnsigned8 = if (tlvReader.isNextTag(ContextSpecificTag(TAG_VALUE_UNSIGNED8))) { Optional.of(tlvReader.getUInt(ContextSpecificTag(TAG_VALUE_UNSIGNED8))) diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ScenesManagementClusterExtensionFieldSet.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ScenesManagementClusterExtensionFieldSet.kt index a2add794802904..31759e0aaaf091 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ScenesManagementClusterExtensionFieldSet.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ScenesManagementClusterExtensionFieldSet.kt @@ -37,7 +37,7 @@ class ScenesManagementClusterExtensionFieldSet( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_CLUSTER_I_D), clusterID) + put(ContextSpecificTag(TAG_CLUSTER_ID), clusterID) startArray(ContextSpecificTag(TAG_ATTRIBUTE_VALUE_LIST)) for (item in attributeValueList.iterator()) { item.toTlv(AnonymousTag, this) @@ -48,12 +48,12 @@ class ScenesManagementClusterExtensionFieldSet( } companion object { - private const val TAG_CLUSTER_I_D = 0 + private const val TAG_CLUSTER_ID = 0 private const val TAG_ATTRIBUTE_VALUE_LIST = 1 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ScenesManagementClusterExtensionFieldSet { tlvReader.enterStructure(tlvTag) - val clusterID = tlvReader.getULong(ContextSpecificTag(TAG_CLUSTER_I_D)) + val clusterID = tlvReader.getULong(ContextSpecificTag(TAG_CLUSTER_ID)) val attributeValueList = buildList { tlvReader.enterArray(ContextSpecificTag(TAG_ATTRIBUTE_VALUE_LIST)) diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ServiceAreaClusterAreaStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ServiceAreaClusterAreaStruct.kt index 3f8365d49b3b78..fc6405a96c2f7c 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ServiceAreaClusterAreaStruct.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ServiceAreaClusterAreaStruct.kt @@ -38,11 +38,11 @@ class ServiceAreaClusterAreaStruct( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_AREA_I_D), areaID) + put(ContextSpecificTag(TAG_AREA_ID), areaID) if (mapID != null) { - put(ContextSpecificTag(TAG_MAP_I_D), mapID) + put(ContextSpecificTag(TAG_MAP_ID), mapID) } else { - putNull(ContextSpecificTag(TAG_MAP_I_D)) + putNull(ContextSpecificTag(TAG_MAP_ID)) } areaDesc.toTlv(ContextSpecificTag(TAG_AREA_DESC), this) endStructure() @@ -50,18 +50,18 @@ class ServiceAreaClusterAreaStruct( } companion object { - private const val TAG_AREA_I_D = 0 - private const val TAG_MAP_I_D = 1 + private const val TAG_AREA_ID = 0 + private const val TAG_MAP_ID = 1 private const val TAG_AREA_DESC = 2 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ServiceAreaClusterAreaStruct { tlvReader.enterStructure(tlvTag) - val areaID = tlvReader.getULong(ContextSpecificTag(TAG_AREA_I_D)) + val areaID = tlvReader.getULong(ContextSpecificTag(TAG_AREA_ID)) val mapID = if (!tlvReader.isNull()) { - tlvReader.getULong(ContextSpecificTag(TAG_MAP_I_D)) + tlvReader.getULong(ContextSpecificTag(TAG_MAP_ID)) } else { - tlvReader.getNull(ContextSpecificTag(TAG_MAP_I_D)) + tlvReader.getNull(ContextSpecificTag(TAG_MAP_ID)) null } val areaDesc = diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ServiceAreaClusterMapStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ServiceAreaClusterMapStruct.kt index f00877354d1506..a245321b6bfa1a 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ServiceAreaClusterMapStruct.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ServiceAreaClusterMapStruct.kt @@ -33,19 +33,19 @@ class ServiceAreaClusterMapStruct(val mapID: ULong, val name: String) { fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_MAP_I_D), mapID) + put(ContextSpecificTag(TAG_MAP_ID), mapID) put(ContextSpecificTag(TAG_NAME), name) endStructure() } } companion object { - private const val TAG_MAP_I_D = 0 + private const val TAG_MAP_ID = 0 private const val TAG_NAME = 1 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ServiceAreaClusterMapStruct { tlvReader.enterStructure(tlvTag) - val mapID = tlvReader.getULong(ContextSpecificTag(TAG_MAP_I_D)) + val mapID = tlvReader.getULong(ContextSpecificTag(TAG_MAP_ID)) val name = tlvReader.getString(ContextSpecificTag(TAG_NAME)) tlvReader.exitContainer() diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ServiceAreaClusterProgressStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ServiceAreaClusterProgressStruct.kt index ddc8238168981d..684f18805830ae 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ServiceAreaClusterProgressStruct.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ServiceAreaClusterProgressStruct.kt @@ -41,7 +41,7 @@ class ServiceAreaClusterProgressStruct( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_AREA_I_D), areaID) + put(ContextSpecificTag(TAG_AREA_ID), areaID) put(ContextSpecificTag(TAG_STATUS), status) if (totalOperationalTime != null) { if (totalOperationalTime.isPresent) { @@ -64,14 +64,14 @@ class ServiceAreaClusterProgressStruct( } companion object { - private const val TAG_AREA_I_D = 0 + private const val TAG_AREA_ID = 0 private const val TAG_STATUS = 1 private const val TAG_TOTAL_OPERATIONAL_TIME = 2 private const val TAG_ESTIMATED_TIME = 3 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ServiceAreaClusterProgressStruct { tlvReader.enterStructure(tlvTag) - val areaID = tlvReader.getULong(ContextSpecificTag(TAG_AREA_I_D)) + val areaID = tlvReader.getULong(ContextSpecificTag(TAG_AREA_ID)) val status = tlvReader.getUInt(ContextSpecificTag(TAG_STATUS)) val totalOperationalTime = if (!tlvReader.isNull()) { diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ThermostatClusterAtomicAttributeStatusStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ThermostatClusterAtomicAttributeStatusStruct.kt index 7500a9619d6973..6073c7c9151733 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ThermostatClusterAtomicAttributeStatusStruct.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ThermostatClusterAtomicAttributeStatusStruct.kt @@ -33,19 +33,19 @@ class ThermostatClusterAtomicAttributeStatusStruct(val attributeID: ULong, val s fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_ATTRIBUTE_I_D), attributeID) + put(ContextSpecificTag(TAG_ATTRIBUTE_ID), attributeID) put(ContextSpecificTag(TAG_STATUS_CODE), statusCode) endStructure() } } companion object { - private const val TAG_ATTRIBUTE_I_D = 0 + private const val TAG_ATTRIBUTE_ID = 0 private const val TAG_STATUS_CODE = 1 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ThermostatClusterAtomicAttributeStatusStruct { tlvReader.enterStructure(tlvTag) - val attributeID = tlvReader.getULong(ContextSpecificTag(TAG_ATTRIBUTE_I_D)) + val attributeID = tlvReader.getULong(ContextSpecificTag(TAG_ATTRIBUTE_ID)) val statusCode = tlvReader.getUInt(ContextSpecificTag(TAG_STATUS_CODE)) tlvReader.exitContainer() diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ThreadNetworkDiagnosticsClusterRouteTableStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ThreadNetworkDiagnosticsClusterRouteTableStruct.kt index a5b201c7e11877..9ec7421f26e426 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ThreadNetworkDiagnosticsClusterRouteTableStruct.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ThreadNetworkDiagnosticsClusterRouteTableStruct.kt @@ -57,8 +57,8 @@ class ThreadNetworkDiagnosticsClusterRouteTableStruct( put(ContextSpecificTag(TAG_ROUTER_ID), routerId) put(ContextSpecificTag(TAG_NEXT_HOP), nextHop) put(ContextSpecificTag(TAG_PATH_COST), pathCost) - put(ContextSpecificTag(TAG_L_Q_I_IN), LQIIn) - put(ContextSpecificTag(TAG_L_Q_I_OUT), LQIOut) + put(ContextSpecificTag(TAG_LQI_IN), LQIIn) + put(ContextSpecificTag(TAG_LQI_OUT), LQIOut) put(ContextSpecificTag(TAG_AGE), age) put(ContextSpecificTag(TAG_ALLOCATED), allocated) put(ContextSpecificTag(TAG_LINK_ESTABLISHED), linkEstablished) @@ -72,8 +72,8 @@ class ThreadNetworkDiagnosticsClusterRouteTableStruct( private const val TAG_ROUTER_ID = 2 private const val TAG_NEXT_HOP = 3 private const val TAG_PATH_COST = 4 - private const val TAG_L_Q_I_IN = 5 - private const val TAG_L_Q_I_OUT = 6 + private const val TAG_LQI_IN = 5 + private const val TAG_LQI_OUT = 6 private const val TAG_AGE = 7 private const val TAG_ALLOCATED = 8 private const val TAG_LINK_ESTABLISHED = 9 @@ -88,8 +88,8 @@ class ThreadNetworkDiagnosticsClusterRouteTableStruct( val routerId = tlvReader.getUInt(ContextSpecificTag(TAG_ROUTER_ID)) val nextHop = tlvReader.getUInt(ContextSpecificTag(TAG_NEXT_HOP)) val pathCost = tlvReader.getUInt(ContextSpecificTag(TAG_PATH_COST)) - val LQIIn = tlvReader.getUInt(ContextSpecificTag(TAG_L_Q_I_IN)) - val LQIOut = tlvReader.getUInt(ContextSpecificTag(TAG_L_Q_I_OUT)) + val LQIIn = tlvReader.getUInt(ContextSpecificTag(TAG_LQI_IN)) + val LQIOut = tlvReader.getUInt(ContextSpecificTag(TAG_LQI_OUT)) val age = tlvReader.getUInt(ContextSpecificTag(TAG_AGE)) val allocated = tlvReader.getBoolean(ContextSpecificTag(TAG_ALLOCATED)) val linkEstablished = tlvReader.getBoolean(ContextSpecificTag(TAG_LINK_ESTABLISHED)) diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ThreadNetworkDirectoryClusterThreadNetworkStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ThreadNetworkDirectoryClusterThreadNetworkStruct.kt index ae988738b7be34..f71764e02878c9 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ThreadNetworkDirectoryClusterThreadNetworkStruct.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ThreadNetworkDirectoryClusterThreadNetworkStruct.kt @@ -40,7 +40,7 @@ class ThreadNetworkDirectoryClusterThreadNetworkStruct( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_EXTENDED_PAN_I_D), extendedPanID) + put(ContextSpecificTag(TAG_EXTENDED_PAN_ID), extendedPanID) put(ContextSpecificTag(TAG_NETWORK_NAME), networkName) put(ContextSpecificTag(TAG_CHANNEL), channel) put(ContextSpecificTag(TAG_ACTIVE_TIMESTAMP), activeTimestamp) @@ -49,7 +49,7 @@ class ThreadNetworkDirectoryClusterThreadNetworkStruct( } companion object { - private const val TAG_EXTENDED_PAN_I_D = 0 + private const val TAG_EXTENDED_PAN_ID = 0 private const val TAG_NETWORK_NAME = 1 private const val TAG_CHANNEL = 2 private const val TAG_ACTIVE_TIMESTAMP = 3 @@ -59,7 +59,7 @@ class ThreadNetworkDirectoryClusterThreadNetworkStruct( tlvReader: TlvReader, ): ThreadNetworkDirectoryClusterThreadNetworkStruct { tlvReader.enterStructure(tlvTag) - val extendedPanID = tlvReader.getByteArray(ContextSpecificTag(TAG_EXTENDED_PAN_I_D)) + val extendedPanID = tlvReader.getByteArray(ContextSpecificTag(TAG_EXTENDED_PAN_ID)) val networkName = tlvReader.getString(ContextSpecificTag(TAG_NETWORK_NAME)) val channel = tlvReader.getUInt(ContextSpecificTag(TAG_CHANNEL)) val activeTimestamp = tlvReader.getULong(ContextSpecificTag(TAG_ACTIVE_TIMESTAMP)) diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct.kt index f9eb70cd134fc5..49458e2b72b493 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct.kt @@ -36,14 +36,14 @@ class TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_NODE_I_D), nodeID) + put(ContextSpecificTag(TAG_NODE_ID), nodeID) put(ContextSpecificTag(TAG_ENDPOINT), endpoint) endStructure() } } companion object { - private const val TAG_NODE_I_D = 0 + private const val TAG_NODE_ID = 0 private const val TAG_ENDPOINT = 1 fun fromTlv( @@ -51,7 +51,7 @@ class TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct( tlvReader: TlvReader, ): TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct { tlvReader.enterStructure(tlvTag) - val nodeID = tlvReader.getULong(ContextSpecificTag(TAG_NODE_I_D)) + val nodeID = tlvReader.getULong(ContextSpecificTag(TAG_NODE_ID)) val endpoint = tlvReader.getUInt(ContextSpecificTag(TAG_ENDPOINT)) tlvReader.exitContainer() diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/TimeSynchronizationClusterTrustedTimeSourceStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/TimeSynchronizationClusterTrustedTimeSourceStruct.kt index 6b55677ffd6417..12dd09376ac729 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/TimeSynchronizationClusterTrustedTimeSourceStruct.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/TimeSynchronizationClusterTrustedTimeSourceStruct.kt @@ -39,7 +39,7 @@ class TimeSynchronizationClusterTrustedTimeSourceStruct( tlvWriter.apply { startStructure(tlvTag) put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex) - put(ContextSpecificTag(TAG_NODE_I_D), nodeID) + put(ContextSpecificTag(TAG_NODE_ID), nodeID) put(ContextSpecificTag(TAG_ENDPOINT), endpoint) endStructure() } @@ -47,7 +47,7 @@ class TimeSynchronizationClusterTrustedTimeSourceStruct( companion object { private const val TAG_FABRIC_INDEX = 0 - private const val TAG_NODE_I_D = 1 + private const val TAG_NODE_ID = 1 private const val TAG_ENDPOINT = 2 fun fromTlv( @@ -56,7 +56,7 @@ class TimeSynchronizationClusterTrustedTimeSourceStruct( ): TimeSynchronizationClusterTrustedTimeSourceStruct { tlvReader.enterStructure(tlvTag) val fabricIndex = tlvReader.getUInt(ContextSpecificTag(TAG_FABRIC_INDEX)) - val nodeID = tlvReader.getULong(ContextSpecificTag(TAG_NODE_I_D)) + val nodeID = tlvReader.getULong(ContextSpecificTag(TAG_NODE_ID)) val endpoint = tlvReader.getUInt(ContextSpecificTag(TAG_ENDPOINT)) tlvReader.exitContainer() diff --git a/src/controller/java/generated/java/matter/controller/cluster/clusters/AccountLoginCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/AccountLoginCluster.kt index 2d95215a32cb6d..3357ffff9b5b1a 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/clusters/AccountLoginCluster.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/AccountLoginCluster.kt @@ -110,13 +110,13 @@ class AccountLoginCluster( val tlvReader = TlvReader(response.payload) tlvReader.enterStructure(AnonymousTag) - val TAG_SETUP_P_I_N: Int = 0 + val TAG_SETUP_PIN: Int = 0 var setupPIN_decoded: String? = null while (!tlvReader.isEndOfContainer()) { val tag = tlvReader.peekElement().tag - if (tag == ContextSpecificTag(TAG_SETUP_P_I_N)) { + if (tag == ContextSpecificTag(TAG_SETUP_PIN)) { setupPIN_decoded = tlvReader.getString(tag) } else { tlvReader.skipElement() @@ -146,8 +146,8 @@ class AccountLoginCluster( val TAG_TEMP_ACCOUNT_IDENTIFIER_REQ: Int = 0 tlvWriter.put(ContextSpecificTag(TAG_TEMP_ACCOUNT_IDENTIFIER_REQ), tempAccountIdentifier) - val TAG_SETUP_P_I_N_REQ: Int = 1 - tlvWriter.put(ContextSpecificTag(TAG_SETUP_P_I_N_REQ), setupPIN) + val TAG_SETUP_PIN_REQ: Int = 1 + tlvWriter.put(ContextSpecificTag(TAG_SETUP_PIN_REQ), setupPIN) val TAG_NODE_REQ: Int = 2 node?.let { tlvWriter.put(ContextSpecificTag(TAG_NODE_REQ), node) } diff --git a/src/controller/java/generated/java/matter/controller/cluster/clusters/ActionsCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/ActionsCluster.kt index 2246c4663cc386..79245c8dc8657b 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/clusters/ActionsCluster.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/ActionsCluster.kt @@ -113,11 +113,11 @@ class ActionsCluster(private val controller: MatterController, private val endpo val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_ACTION_I_D_REQ: Int = 0 - tlvWriter.put(ContextSpecificTag(TAG_ACTION_I_D_REQ), actionID) + val TAG_ACTION_ID_REQ: Int = 0 + tlvWriter.put(ContextSpecificTag(TAG_ACTION_ID_REQ), actionID) - val TAG_INVOKE_I_D_REQ: Int = 1 - invokeID?.let { tlvWriter.put(ContextSpecificTag(TAG_INVOKE_I_D_REQ), invokeID) } + val TAG_INVOKE_ID_REQ: Int = 1 + invokeID?.let { tlvWriter.put(ContextSpecificTag(TAG_INVOKE_ID_REQ), invokeID) } tlvWriter.endStructure() val request: InvokeRequest = @@ -142,11 +142,11 @@ class ActionsCluster(private val controller: MatterController, private val endpo val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_ACTION_I_D_REQ: Int = 0 - tlvWriter.put(ContextSpecificTag(TAG_ACTION_I_D_REQ), actionID) + val TAG_ACTION_ID_REQ: Int = 0 + tlvWriter.put(ContextSpecificTag(TAG_ACTION_ID_REQ), actionID) - val TAG_INVOKE_I_D_REQ: Int = 1 - invokeID?.let { tlvWriter.put(ContextSpecificTag(TAG_INVOKE_I_D_REQ), invokeID) } + val TAG_INVOKE_ID_REQ: Int = 1 + invokeID?.let { tlvWriter.put(ContextSpecificTag(TAG_INVOKE_ID_REQ), invokeID) } val TAG_TRANSITION_TIME_REQ: Int = 2 tlvWriter.put(ContextSpecificTag(TAG_TRANSITION_TIME_REQ), transitionTime) @@ -169,11 +169,11 @@ class ActionsCluster(private val controller: MatterController, private val endpo val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_ACTION_I_D_REQ: Int = 0 - tlvWriter.put(ContextSpecificTag(TAG_ACTION_I_D_REQ), actionID) + val TAG_ACTION_ID_REQ: Int = 0 + tlvWriter.put(ContextSpecificTag(TAG_ACTION_ID_REQ), actionID) - val TAG_INVOKE_I_D_REQ: Int = 1 - invokeID?.let { tlvWriter.put(ContextSpecificTag(TAG_INVOKE_I_D_REQ), invokeID) } + val TAG_INVOKE_ID_REQ: Int = 1 + invokeID?.let { tlvWriter.put(ContextSpecificTag(TAG_INVOKE_ID_REQ), invokeID) } tlvWriter.endStructure() val request: InvokeRequest = @@ -198,11 +198,11 @@ class ActionsCluster(private val controller: MatterController, private val endpo val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_ACTION_I_D_REQ: Int = 0 - tlvWriter.put(ContextSpecificTag(TAG_ACTION_I_D_REQ), actionID) + val TAG_ACTION_ID_REQ: Int = 0 + tlvWriter.put(ContextSpecificTag(TAG_ACTION_ID_REQ), actionID) - val TAG_INVOKE_I_D_REQ: Int = 1 - invokeID?.let { tlvWriter.put(ContextSpecificTag(TAG_INVOKE_I_D_REQ), invokeID) } + val TAG_INVOKE_ID_REQ: Int = 1 + invokeID?.let { tlvWriter.put(ContextSpecificTag(TAG_INVOKE_ID_REQ), invokeID) } val TAG_DURATION_REQ: Int = 2 tlvWriter.put(ContextSpecificTag(TAG_DURATION_REQ), duration) @@ -225,11 +225,11 @@ class ActionsCluster(private val controller: MatterController, private val endpo val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_ACTION_I_D_REQ: Int = 0 - tlvWriter.put(ContextSpecificTag(TAG_ACTION_I_D_REQ), actionID) + val TAG_ACTION_ID_REQ: Int = 0 + tlvWriter.put(ContextSpecificTag(TAG_ACTION_ID_REQ), actionID) - val TAG_INVOKE_I_D_REQ: Int = 1 - invokeID?.let { tlvWriter.put(ContextSpecificTag(TAG_INVOKE_I_D_REQ), invokeID) } + val TAG_INVOKE_ID_REQ: Int = 1 + invokeID?.let { tlvWriter.put(ContextSpecificTag(TAG_INVOKE_ID_REQ), invokeID) } tlvWriter.endStructure() val request: InvokeRequest = @@ -249,11 +249,11 @@ class ActionsCluster(private val controller: MatterController, private val endpo val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_ACTION_I_D_REQ: Int = 0 - tlvWriter.put(ContextSpecificTag(TAG_ACTION_I_D_REQ), actionID) + val TAG_ACTION_ID_REQ: Int = 0 + tlvWriter.put(ContextSpecificTag(TAG_ACTION_ID_REQ), actionID) - val TAG_INVOKE_I_D_REQ: Int = 1 - invokeID?.let { tlvWriter.put(ContextSpecificTag(TAG_INVOKE_I_D_REQ), invokeID) } + val TAG_INVOKE_ID_REQ: Int = 1 + invokeID?.let { tlvWriter.put(ContextSpecificTag(TAG_INVOKE_ID_REQ), invokeID) } tlvWriter.endStructure() val request: InvokeRequest = @@ -278,11 +278,11 @@ class ActionsCluster(private val controller: MatterController, private val endpo val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_ACTION_I_D_REQ: Int = 0 - tlvWriter.put(ContextSpecificTag(TAG_ACTION_I_D_REQ), actionID) + val TAG_ACTION_ID_REQ: Int = 0 + tlvWriter.put(ContextSpecificTag(TAG_ACTION_ID_REQ), actionID) - val TAG_INVOKE_I_D_REQ: Int = 1 - invokeID?.let { tlvWriter.put(ContextSpecificTag(TAG_INVOKE_I_D_REQ), invokeID) } + val TAG_INVOKE_ID_REQ: Int = 1 + invokeID?.let { tlvWriter.put(ContextSpecificTag(TAG_INVOKE_ID_REQ), invokeID) } val TAG_DURATION_REQ: Int = 2 tlvWriter.put(ContextSpecificTag(TAG_DURATION_REQ), duration) @@ -309,11 +309,11 @@ class ActionsCluster(private val controller: MatterController, private val endpo val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_ACTION_I_D_REQ: Int = 0 - tlvWriter.put(ContextSpecificTag(TAG_ACTION_I_D_REQ), actionID) + val TAG_ACTION_ID_REQ: Int = 0 + tlvWriter.put(ContextSpecificTag(TAG_ACTION_ID_REQ), actionID) - val TAG_INVOKE_I_D_REQ: Int = 1 - invokeID?.let { tlvWriter.put(ContextSpecificTag(TAG_INVOKE_I_D_REQ), invokeID) } + val TAG_INVOKE_ID_REQ: Int = 1 + invokeID?.let { tlvWriter.put(ContextSpecificTag(TAG_INVOKE_ID_REQ), invokeID) } tlvWriter.endStructure() val request: InvokeRequest = @@ -337,11 +337,11 @@ class ActionsCluster(private val controller: MatterController, private val endpo val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_ACTION_I_D_REQ: Int = 0 - tlvWriter.put(ContextSpecificTag(TAG_ACTION_I_D_REQ), actionID) + val TAG_ACTION_ID_REQ: Int = 0 + tlvWriter.put(ContextSpecificTag(TAG_ACTION_ID_REQ), actionID) - val TAG_INVOKE_I_D_REQ: Int = 1 - invokeID?.let { tlvWriter.put(ContextSpecificTag(TAG_INVOKE_I_D_REQ), invokeID) } + val TAG_INVOKE_ID_REQ: Int = 1 + invokeID?.let { tlvWriter.put(ContextSpecificTag(TAG_INVOKE_ID_REQ), invokeID) } tlvWriter.endStructure() val request: InvokeRequest = @@ -366,11 +366,11 @@ class ActionsCluster(private val controller: MatterController, private val endpo val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_ACTION_I_D_REQ: Int = 0 - tlvWriter.put(ContextSpecificTag(TAG_ACTION_I_D_REQ), actionID) + val TAG_ACTION_ID_REQ: Int = 0 + tlvWriter.put(ContextSpecificTag(TAG_ACTION_ID_REQ), actionID) - val TAG_INVOKE_I_D_REQ: Int = 1 - invokeID?.let { tlvWriter.put(ContextSpecificTag(TAG_INVOKE_I_D_REQ), invokeID) } + val TAG_INVOKE_ID_REQ: Int = 1 + invokeID?.let { tlvWriter.put(ContextSpecificTag(TAG_INVOKE_ID_REQ), invokeID) } val TAG_DURATION_REQ: Int = 2 tlvWriter.put(ContextSpecificTag(TAG_DURATION_REQ), duration) @@ -397,11 +397,11 @@ class ActionsCluster(private val controller: MatterController, private val endpo val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_ACTION_I_D_REQ: Int = 0 - tlvWriter.put(ContextSpecificTag(TAG_ACTION_I_D_REQ), actionID) + val TAG_ACTION_ID_REQ: Int = 0 + tlvWriter.put(ContextSpecificTag(TAG_ACTION_ID_REQ), actionID) - val TAG_INVOKE_I_D_REQ: Int = 1 - invokeID?.let { tlvWriter.put(ContextSpecificTag(TAG_INVOKE_I_D_REQ), invokeID) } + val TAG_INVOKE_ID_REQ: Int = 1 + invokeID?.let { tlvWriter.put(ContextSpecificTag(TAG_INVOKE_ID_REQ), invokeID) } tlvWriter.endStructure() val request: InvokeRequest = @@ -426,11 +426,11 @@ class ActionsCluster(private val controller: MatterController, private val endpo val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_ACTION_I_D_REQ: Int = 0 - tlvWriter.put(ContextSpecificTag(TAG_ACTION_I_D_REQ), actionID) + val TAG_ACTION_ID_REQ: Int = 0 + tlvWriter.put(ContextSpecificTag(TAG_ACTION_ID_REQ), actionID) - val TAG_INVOKE_I_D_REQ: Int = 1 - invokeID?.let { tlvWriter.put(ContextSpecificTag(TAG_INVOKE_I_D_REQ), invokeID) } + val TAG_INVOKE_ID_REQ: Int = 1 + invokeID?.let { tlvWriter.put(ContextSpecificTag(TAG_INVOKE_ID_REQ), invokeID) } val TAG_DURATION_REQ: Int = 2 tlvWriter.put(ContextSpecificTag(TAG_DURATION_REQ), duration) diff --git a/src/controller/java/generated/java/matter/controller/cluster/clusters/AdministratorCommissioningCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/AdministratorCommissioningCluster.kt index a9ea4c35f04602..5ac1e18a200d19 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/clusters/AdministratorCommissioningCluster.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/AdministratorCommissioningCluster.kt @@ -120,8 +120,8 @@ class AdministratorCommissioningCluster( val TAG_COMMISSIONING_TIMEOUT_REQ: Int = 0 tlvWriter.put(ContextSpecificTag(TAG_COMMISSIONING_TIMEOUT_REQ), commissioningTimeout) - val TAG_P_A_K_E_PASSCODE_VERIFIER_REQ: Int = 1 - tlvWriter.put(ContextSpecificTag(TAG_P_A_K_E_PASSCODE_VERIFIER_REQ), PAKEPasscodeVerifier) + val TAG_PAKE_PASSCODE_VERIFIER_REQ: Int = 1 + tlvWriter.put(ContextSpecificTag(TAG_PAKE_PASSCODE_VERIFIER_REQ), PAKEPasscodeVerifier) val TAG_DISCRIMINATOR_REQ: Int = 2 tlvWriter.put(ContextSpecificTag(TAG_DISCRIMINATOR_REQ), discriminator) diff --git a/src/controller/java/generated/java/matter/controller/cluster/clusters/ChannelCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/ChannelCluster.kt index 3bbf5997d1e3ec..67eccfdb2126b3 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/clusters/ChannelCluster.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/ChannelCluster.kt @@ -269,9 +269,9 @@ class ChannelCluster(private val controller: MatterController, private val endpo val TAG_RECORDING_FLAG_REQ: Int = 4 recordingFlag?.let { tlvWriter.put(ContextSpecificTag(TAG_RECORDING_FLAG_REQ), recordingFlag) } - val TAG_EXTERNAL_I_D_LIST_REQ: Int = 5 + val TAG_EXTERNAL_ID_LIST_REQ: Int = 5 externalIDList?.let { - tlvWriter.startArray(ContextSpecificTag(TAG_EXTERNAL_I_D_LIST_REQ)) + tlvWriter.startArray(ContextSpecificTag(TAG_EXTERNAL_ID_LIST_REQ)) for (item in externalIDList.iterator()) { item.toTlv(AnonymousTag, tlvWriter) } @@ -352,8 +352,8 @@ class ChannelCluster(private val controller: MatterController, private val endpo val TAG_SHOULD_RECORD_SERIES_REQ: Int = 1 tlvWriter.put(ContextSpecificTag(TAG_SHOULD_RECORD_SERIES_REQ), shouldRecordSeries) - val TAG_EXTERNAL_I_D_LIST_REQ: Int = 2 - tlvWriter.startArray(ContextSpecificTag(TAG_EXTERNAL_I_D_LIST_REQ)) + val TAG_EXTERNAL_ID_LIST_REQ: Int = 2 + tlvWriter.startArray(ContextSpecificTag(TAG_EXTERNAL_ID_LIST_REQ)) for (item in externalIDList.iterator()) { item.toTlv(AnonymousTag, tlvWriter) } @@ -392,8 +392,8 @@ class ChannelCluster(private val controller: MatterController, private val endpo val TAG_SHOULD_RECORD_SERIES_REQ: Int = 1 tlvWriter.put(ContextSpecificTag(TAG_SHOULD_RECORD_SERIES_REQ), shouldRecordSeries) - val TAG_EXTERNAL_I_D_LIST_REQ: Int = 2 - tlvWriter.startArray(ContextSpecificTag(TAG_EXTERNAL_I_D_LIST_REQ)) + val TAG_EXTERNAL_ID_LIST_REQ: Int = 2 + tlvWriter.startArray(ContextSpecificTag(TAG_EXTERNAL_ID_LIST_REQ)) for (item in externalIDList.iterator()) { item.toTlv(AnonymousTag, tlvWriter) } diff --git a/src/controller/java/generated/java/matter/controller/cluster/clusters/CommissionerControlCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/CommissionerControlCluster.kt index 6a3d288d56e49c..2daf2b464e948f 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/clusters/CommissionerControlCluster.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/CommissionerControlCluster.kt @@ -167,7 +167,7 @@ class CommissionerControlCluster( val TAG_COMMISSIONING_TIMEOUT: Int = 0 var commissioningTimeout_decoded: UShort? = null - val TAG_P_A_K_E_PASSCODE_VERIFIER: Int = 1 + val TAG_PAKE_PASSCODE_VERIFIER: Int = 1 var PAKEPasscodeVerifier_decoded: ByteArray? = null val TAG_DISCRIMINATOR: Int = 2 @@ -186,7 +186,7 @@ class CommissionerControlCluster( commissioningTimeout_decoded = tlvReader.getUShort(tag) } - if (tag == ContextSpecificTag(TAG_P_A_K_E_PASSCODE_VERIFIER)) { + if (tag == ContextSpecificTag(TAG_PAKE_PASSCODE_VERIFIER)) { PAKEPasscodeVerifier_decoded = tlvReader.getByteArray(tag) } diff --git a/src/controller/java/generated/java/matter/controller/cluster/clusters/ContentControlCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/ContentControlCluster.kt index 9997c5eb2035a9..c2a44834d09481 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/clusters/ContentControlCluster.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/ContentControlCluster.kt @@ -116,11 +116,11 @@ class ContentControlCluster( val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_OLD_P_I_N_REQ: Int = 0 - oldPIN?.let { tlvWriter.put(ContextSpecificTag(TAG_OLD_P_I_N_REQ), oldPIN) } + val TAG_OLD_PIN_REQ: Int = 0 + oldPIN?.let { tlvWriter.put(ContextSpecificTag(TAG_OLD_PIN_REQ), oldPIN) } - val TAG_NEW_P_I_N_REQ: Int = 1 - tlvWriter.put(ContextSpecificTag(TAG_NEW_P_I_N_REQ), newPIN) + val TAG_NEW_PIN_REQ: Int = 1 + tlvWriter.put(ContextSpecificTag(TAG_NEW_PIN_REQ), newPIN) tlvWriter.endStructure() val request: InvokeRequest = @@ -153,13 +153,13 @@ class ContentControlCluster( val tlvReader = TlvReader(response.payload) tlvReader.enterStructure(AnonymousTag) - val TAG_P_I_N_CODE: Int = 0 + val TAG_PIN_CODE: Int = 0 var PINCode_decoded: String? = null while (!tlvReader.isEndOfContainer()) { val tag = tlvReader.peekElement().tag - if (tag == ContextSpecificTag(TAG_P_I_N_CODE)) { + if (tag == ContextSpecificTag(TAG_PIN_CODE)) { PINCode_decoded = tlvReader.getString(tag) } else { tlvReader.skipElement() @@ -221,8 +221,8 @@ class ContentControlCluster( val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_P_I_N_CODE_REQ: Int = 0 - PINCode?.let { tlvWriter.put(ContextSpecificTag(TAG_P_I_N_CODE_REQ), PINCode) } + val TAG_PIN_CODE_REQ: Int = 0 + PINCode?.let { tlvWriter.put(ContextSpecificTag(TAG_PIN_CODE_REQ), PINCode) } val TAG_BONUS_TIME_REQ: Int = 1 bonusTime?.let { tlvWriter.put(ContextSpecificTag(TAG_BONUS_TIME_REQ), bonusTime) } diff --git a/src/controller/java/generated/java/matter/controller/cluster/clusters/ContentLauncherCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/ContentLauncherCluster.kt index 67bc46c79b3bbe..ae0b6d4935427f 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/clusters/ContentLauncherCluster.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/ContentLauncherCluster.kt @@ -190,8 +190,8 @@ class ContentLauncherCluster( val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_CONTENT_U_R_L_REQ: Int = 0 - tlvWriter.put(ContextSpecificTag(TAG_CONTENT_U_R_L_REQ), contentURL) + val TAG_CONTENT_URL_REQ: Int = 0 + tlvWriter.put(ContextSpecificTag(TAG_CONTENT_URL_REQ), contentURL) val TAG_DISPLAY_STRING_REQ: Int = 1 displayString?.let { tlvWriter.put(ContextSpecificTag(TAG_DISPLAY_STRING_REQ), displayString) } diff --git a/src/controller/java/generated/java/matter/controller/cluster/clusters/DemandResponseLoadControlCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/DemandResponseLoadControlCluster.kt index f9d0eaf448b2c4..ea72cd4cd78068 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/clusters/DemandResponseLoadControlCluster.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/DemandResponseLoadControlCluster.kt @@ -157,8 +157,8 @@ class DemandResponseLoadControlCluster( val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_LOAD_CONTROL_PROGRAM_I_D_REQ: Int = 0 - tlvWriter.put(ContextSpecificTag(TAG_LOAD_CONTROL_PROGRAM_I_D_REQ), loadControlProgramID) + val TAG_LOAD_CONTROL_PROGRAM_ID_REQ: Int = 0 + tlvWriter.put(ContextSpecificTag(TAG_LOAD_CONTROL_PROGRAM_ID_REQ), loadControlProgramID) tlvWriter.endStructure() val request: InvokeRequest = @@ -206,8 +206,8 @@ class DemandResponseLoadControlCluster( val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_EVENT_I_D_REQ: Int = 0 - tlvWriter.put(ContextSpecificTag(TAG_EVENT_I_D_REQ), eventID) + val TAG_EVENT_ID_REQ: Int = 0 + tlvWriter.put(ContextSpecificTag(TAG_EVENT_ID_REQ), eventID) val TAG_CANCEL_CONTROL_REQ: Int = 1 tlvWriter.put(ContextSpecificTag(TAG_CANCEL_CONTROL_REQ), cancelControl) diff --git a/src/controller/java/generated/java/matter/controller/cluster/clusters/DeviceEnergyManagementCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/DeviceEnergyManagementCluster.kt index b0c1a5f3200107..455b52d4d0853b 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/clusters/DeviceEnergyManagementCluster.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/DeviceEnergyManagementCluster.kt @@ -242,8 +242,8 @@ class DeviceEnergyManagementCluster( val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_FORECAST_I_D_REQ: Int = 0 - tlvWriter.put(ContextSpecificTag(TAG_FORECAST_I_D_REQ), forecastID) + val TAG_FORECAST_ID_REQ: Int = 0 + tlvWriter.put(ContextSpecificTag(TAG_FORECAST_ID_REQ), forecastID) val TAG_SLOT_ADJUSTMENTS_REQ: Int = 1 tlvWriter.startArray(ContextSpecificTag(TAG_SLOT_ADJUSTMENTS_REQ)) diff --git a/src/controller/java/generated/java/matter/controller/cluster/clusters/DiagnosticLogsCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/DiagnosticLogsCluster.kt index bc49bc27cdd316..fb4d455810d966 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/clusters/DiagnosticLogsCluster.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/DiagnosticLogsCluster.kt @@ -131,7 +131,7 @@ class DiagnosticLogsCluster( val TAG_LOG_CONTENT: Int = 1 var logContent_decoded: ByteArray? = null - val TAG_U_T_C_TIME_STAMP: Int = 2 + val TAG_UTC_TIME_STAMP: Int = 2 var UTCTimeStamp_decoded: ULong? = null val TAG_TIME_SINCE_BOOT: Int = 3 @@ -148,7 +148,7 @@ class DiagnosticLogsCluster( logContent_decoded = tlvReader.getByteArray(tag) } - if (tag == ContextSpecificTag(TAG_U_T_C_TIME_STAMP)) { + if (tag == ContextSpecificTag(TAG_UTC_TIME_STAMP)) { UTCTimeStamp_decoded = if (tlvReader.isNull()) { tlvReader.getNull(tag) diff --git a/src/controller/java/generated/java/matter/controller/cluster/clusters/DoorLockCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/DoorLockCluster.kt index 79acaad63e1e48..ff0525a58d8c27 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/clusters/DoorLockCluster.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/DoorLockCluster.kt @@ -227,8 +227,8 @@ class DoorLockCluster(private val controller: MatterController, private val endp val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_P_I_N_CODE_REQ: Int = 0 - PINCode?.let { tlvWriter.put(ContextSpecificTag(TAG_P_I_N_CODE_REQ), PINCode) } + val TAG_PIN_CODE_REQ: Int = 0 + PINCode?.let { tlvWriter.put(ContextSpecificTag(TAG_PIN_CODE_REQ), PINCode) } tlvWriter.endStructure() val request: InvokeRequest = @@ -248,8 +248,8 @@ class DoorLockCluster(private val controller: MatterController, private val endp val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_P_I_N_CODE_REQ: Int = 0 - PINCode?.let { tlvWriter.put(ContextSpecificTag(TAG_P_I_N_CODE_REQ), PINCode) } + val TAG_PIN_CODE_REQ: Int = 0 + PINCode?.let { tlvWriter.put(ContextSpecificTag(TAG_PIN_CODE_REQ), PINCode) } tlvWriter.endStructure() val request: InvokeRequest = @@ -276,8 +276,8 @@ class DoorLockCluster(private val controller: MatterController, private val endp val TAG_TIMEOUT_REQ: Int = 0 tlvWriter.put(ContextSpecificTag(TAG_TIMEOUT_REQ), timeout) - val TAG_P_I_N_CODE_REQ: Int = 1 - PINCode?.let { tlvWriter.put(ContextSpecificTag(TAG_P_I_N_CODE_REQ), PINCode) } + val TAG_PIN_CODE_REQ: Int = 1 + PINCode?.let { tlvWriter.put(ContextSpecificTag(TAG_PIN_CODE_REQ), PINCode) } tlvWriter.endStructure() val request: InvokeRequest = @@ -907,8 +907,8 @@ class DoorLockCluster(private val controller: MatterController, private val endp val TAG_USER_NAME_REQ: Int = 2 userName?.let { tlvWriter.put(ContextSpecificTag(TAG_USER_NAME_REQ), userName) } - val TAG_USER_UNIQUE_I_D_REQ: Int = 3 - userUniqueID?.let { tlvWriter.put(ContextSpecificTag(TAG_USER_UNIQUE_I_D_REQ), userUniqueID) } + val TAG_USER_UNIQUE_ID_REQ: Int = 3 + userUniqueID?.let { tlvWriter.put(ContextSpecificTag(TAG_USER_UNIQUE_ID_REQ), userUniqueID) } val TAG_USER_STATUS_REQ: Int = 4 userStatus?.let { tlvWriter.put(ContextSpecificTag(TAG_USER_STATUS_REQ), userStatus) } @@ -961,7 +961,7 @@ class DoorLockCluster(private val controller: MatterController, private val endp val TAG_USER_NAME: Int = 1 var userName_decoded: String? = null - val TAG_USER_UNIQUE_I_D: Int = 2 + val TAG_USER_UNIQUE_ID: Int = 2 var userUniqueID_decoded: UInt? = null val TAG_USER_STATUS: Int = 3 @@ -1007,7 +1007,7 @@ class DoorLockCluster(private val controller: MatterController, private val endp } } - if (tag == ContextSpecificTag(TAG_USER_UNIQUE_I_D)) { + if (tag == ContextSpecificTag(TAG_USER_UNIQUE_ID)) { userUniqueID_decoded = if (tlvReader.isNull()) { tlvReader.getNull(tag) @@ -1435,8 +1435,8 @@ class DoorLockCluster(private val controller: MatterController, private val endp val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_P_I_N_CODE_REQ: Int = 0 - PINCode?.let { tlvWriter.put(ContextSpecificTag(TAG_P_I_N_CODE_REQ), PINCode) } + val TAG_PIN_CODE_REQ: Int = 0 + PINCode?.let { tlvWriter.put(ContextSpecificTag(TAG_PIN_CODE_REQ), PINCode) } tlvWriter.endStructure() val request: InvokeRequest = diff --git a/src/controller/java/generated/java/matter/controller/cluster/clusters/GeneralCommissioningCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/GeneralCommissioningCluster.kt index 559a466d01924f..92e76e250f0eca 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/clusters/GeneralCommissioningCluster.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/GeneralCommissioningCluster.kt @@ -302,11 +302,11 @@ class GeneralCommissioningCluster( val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_T_C_VERSION_REQ: Int = 0 - tlvWriter.put(ContextSpecificTag(TAG_T_C_VERSION_REQ), TCVersion) + val TAG_TC_VERSION_REQ: Int = 0 + tlvWriter.put(ContextSpecificTag(TAG_TC_VERSION_REQ), TCVersion) - val TAG_T_C_USER_RESPONSE_REQ: Int = 1 - tlvWriter.put(ContextSpecificTag(TAG_T_C_USER_RESPONSE_REQ), TCUserResponse) + val TAG_TC_USER_RESPONSE_REQ: Int = 1 + tlvWriter.put(ContextSpecificTag(TAG_TC_USER_RESPONSE_REQ), TCUserResponse) tlvWriter.endStructure() val request: InvokeRequest = diff --git a/src/controller/java/generated/java/matter/controller/cluster/clusters/GroupKeyManagementCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/GroupKeyManagementCluster.kt index 4ca4541acd23df..a693149fedc58e 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/clusters/GroupKeyManagementCluster.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/GroupKeyManagementCluster.kt @@ -145,8 +145,8 @@ class GroupKeyManagementCluster( val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_GROUP_KEY_SET_I_D_REQ: Int = 0 - tlvWriter.put(ContextSpecificTag(TAG_GROUP_KEY_SET_I_D_REQ), groupKeySetID) + val TAG_GROUP_KEY_SET_ID_REQ: Int = 0 + tlvWriter.put(ContextSpecificTag(TAG_GROUP_KEY_SET_ID_REQ), groupKeySetID) tlvWriter.endStructure() val request: InvokeRequest = @@ -189,8 +189,8 @@ class GroupKeyManagementCluster( val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_GROUP_KEY_SET_I_D_REQ: Int = 0 - tlvWriter.put(ContextSpecificTag(TAG_GROUP_KEY_SET_I_D_REQ), groupKeySetID) + val TAG_GROUP_KEY_SET_ID_REQ: Int = 0 + tlvWriter.put(ContextSpecificTag(TAG_GROUP_KEY_SET_ID_REQ), groupKeySetID) tlvWriter.endStructure() val request: InvokeRequest = diff --git a/src/controller/java/generated/java/matter/controller/cluster/clusters/GroupsCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/GroupsCluster.kt index 7fe81f72933311..6af48037daf4f7 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/clusters/GroupsCluster.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/GroupsCluster.kt @@ -99,8 +99,8 @@ class GroupsCluster(private val controller: MatterController, private val endpoi val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_GROUP_I_D_REQ: Int = 0 - tlvWriter.put(ContextSpecificTag(TAG_GROUP_I_D_REQ), groupID) + val TAG_GROUP_ID_REQ: Int = 0 + tlvWriter.put(ContextSpecificTag(TAG_GROUP_ID_REQ), groupID) val TAG_GROUP_NAME_REQ: Int = 1 tlvWriter.put(ContextSpecificTag(TAG_GROUP_NAME_REQ), groupName) @@ -121,7 +121,7 @@ class GroupsCluster(private val controller: MatterController, private val endpoi val TAG_STATUS: Int = 0 var status_decoded: UByte? = null - val TAG_GROUP_I_D: Int = 1 + val TAG_GROUP_ID: Int = 1 var groupID_decoded: UShort? = null while (!tlvReader.isEndOfContainer()) { @@ -131,7 +131,7 @@ class GroupsCluster(private val controller: MatterController, private val endpoi status_decoded = tlvReader.getUByte(tag) } - if (tag == ContextSpecificTag(TAG_GROUP_I_D)) { + if (tag == ContextSpecificTag(TAG_GROUP_ID)) { groupID_decoded = tlvReader.getUShort(tag) } else { tlvReader.skipElement() @@ -157,8 +157,8 @@ class GroupsCluster(private val controller: MatterController, private val endpoi val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_GROUP_I_D_REQ: Int = 0 - tlvWriter.put(ContextSpecificTag(TAG_GROUP_I_D_REQ), groupID) + val TAG_GROUP_ID_REQ: Int = 0 + tlvWriter.put(ContextSpecificTag(TAG_GROUP_ID_REQ), groupID) tlvWriter.endStructure() val request: InvokeRequest = @@ -176,7 +176,7 @@ class GroupsCluster(private val controller: MatterController, private val endpoi val TAG_STATUS: Int = 0 var status_decoded: UByte? = null - val TAG_GROUP_I_D: Int = 1 + val TAG_GROUP_ID: Int = 1 var groupID_decoded: UShort? = null val TAG_GROUP_NAME: Int = 2 @@ -189,7 +189,7 @@ class GroupsCluster(private val controller: MatterController, private val endpoi status_decoded = tlvReader.getUByte(tag) } - if (tag == ContextSpecificTag(TAG_GROUP_I_D)) { + if (tag == ContextSpecificTag(TAG_GROUP_ID)) { groupID_decoded = tlvReader.getUShort(tag) } @@ -302,8 +302,8 @@ class GroupsCluster(private val controller: MatterController, private val endpoi val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_GROUP_I_D_REQ: Int = 0 - tlvWriter.put(ContextSpecificTag(TAG_GROUP_I_D_REQ), groupID) + val TAG_GROUP_ID_REQ: Int = 0 + tlvWriter.put(ContextSpecificTag(TAG_GROUP_ID_REQ), groupID) tlvWriter.endStructure() val request: InvokeRequest = @@ -321,7 +321,7 @@ class GroupsCluster(private val controller: MatterController, private val endpoi val TAG_STATUS: Int = 0 var status_decoded: UByte? = null - val TAG_GROUP_I_D: Int = 1 + val TAG_GROUP_ID: Int = 1 var groupID_decoded: UShort? = null while (!tlvReader.isEndOfContainer()) { @@ -331,7 +331,7 @@ class GroupsCluster(private val controller: MatterController, private val endpoi status_decoded = tlvReader.getUByte(tag) } - if (tag == ContextSpecificTag(TAG_GROUP_I_D)) { + if (tag == ContextSpecificTag(TAG_GROUP_ID)) { groupID_decoded = tlvReader.getUShort(tag) } else { tlvReader.skipElement() @@ -379,8 +379,8 @@ class GroupsCluster(private val controller: MatterController, private val endpoi val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_GROUP_I_D_REQ: Int = 0 - tlvWriter.put(ContextSpecificTag(TAG_GROUP_I_D_REQ), groupID) + val TAG_GROUP_ID_REQ: Int = 0 + tlvWriter.put(ContextSpecificTag(TAG_GROUP_ID_REQ), groupID) val TAG_GROUP_NAME_REQ: Int = 1 tlvWriter.put(ContextSpecificTag(TAG_GROUP_NAME_REQ), groupName) diff --git a/src/controller/java/generated/java/matter/controller/cluster/clusters/IcdManagementCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/IcdManagementCluster.kt index 68f206d72e71f4..414e38d360a803 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/clusters/IcdManagementCluster.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/IcdManagementCluster.kt @@ -115,8 +115,8 @@ class IcdManagementCluster( val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_CHECK_IN_NODE_I_D_REQ: Int = 0 - tlvWriter.put(ContextSpecificTag(TAG_CHECK_IN_NODE_I_D_REQ), checkInNodeID) + val TAG_CHECK_IN_NODE_ID_REQ: Int = 0 + tlvWriter.put(ContextSpecificTag(TAG_CHECK_IN_NODE_ID_REQ), checkInNodeID) val TAG_MONITORED_SUBJECT_REQ: Int = 1 tlvWriter.put(ContextSpecificTag(TAG_MONITORED_SUBJECT_REQ), monitoredSubject) @@ -145,13 +145,13 @@ class IcdManagementCluster( val tlvReader = TlvReader(response.payload) tlvReader.enterStructure(AnonymousTag) - val TAG_I_C_D_COUNTER: Int = 0 + val TAG_ICD_COUNTER: Int = 0 var ICDCounter_decoded: UInt? = null while (!tlvReader.isEndOfContainer()) { val tag = tlvReader.peekElement().tag - if (tag == ContextSpecificTag(TAG_I_C_D_COUNTER)) { + if (tag == ContextSpecificTag(TAG_ICD_COUNTER)) { ICDCounter_decoded = tlvReader.getUInt(tag) } else { tlvReader.skipElement() @@ -177,8 +177,8 @@ class IcdManagementCluster( val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_CHECK_IN_NODE_I_D_REQ: Int = 0 - tlvWriter.put(ContextSpecificTag(TAG_CHECK_IN_NODE_I_D_REQ), checkInNodeID) + val TAG_CHECK_IN_NODE_ID_REQ: Int = 0 + tlvWriter.put(ContextSpecificTag(TAG_CHECK_IN_NODE_ID_REQ), checkInNodeID) val TAG_VERIFICATION_KEY_REQ: Int = 1 verificationKey?.let { diff --git a/src/controller/java/generated/java/matter/controller/cluster/clusters/MediaPlaybackCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/MediaPlaybackCluster.kt index 305eb38b66b221..53a4847c134590 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/clusters/MediaPlaybackCluster.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/MediaPlaybackCluster.kt @@ -867,8 +867,8 @@ class MediaPlaybackCluster( val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_TRACK_I_D_REQ: Int = 0 - tlvWriter.put(ContextSpecificTag(TAG_TRACK_I_D_REQ), trackID) + val TAG_TRACK_ID_REQ: Int = 0 + tlvWriter.put(ContextSpecificTag(TAG_TRACK_ID_REQ), trackID) val TAG_AUDIO_OUTPUT_INDEX_REQ: Int = 1 tlvWriter.put(ContextSpecificTag(TAG_AUDIO_OUTPUT_INDEX_REQ), audioOutputIndex) @@ -891,8 +891,8 @@ class MediaPlaybackCluster( val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_TRACK_I_D_REQ: Int = 0 - tlvWriter.put(ContextSpecificTag(TAG_TRACK_I_D_REQ), trackID) + val TAG_TRACK_ID_REQ: Int = 0 + tlvWriter.put(ContextSpecificTag(TAG_TRACK_ID_REQ), trackID) tlvWriter.endStructure() val request: InvokeRequest = diff --git a/src/controller/java/generated/java/matter/controller/cluster/clusters/MessagesCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/MessagesCluster.kt index 12d6830ad3f6bd..e832c5cefe49b3 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/clusters/MessagesCluster.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/MessagesCluster.kt @@ -116,8 +116,8 @@ class MessagesCluster(private val controller: MatterController, private val endp val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_MESSAGE_I_D_REQ: Int = 0 - tlvWriter.put(ContextSpecificTag(TAG_MESSAGE_I_D_REQ), messageID) + val TAG_MESSAGE_ID_REQ: Int = 0 + tlvWriter.put(ContextSpecificTag(TAG_MESSAGE_ID_REQ), messageID) val TAG_PRIORITY_REQ: Int = 1 tlvWriter.put(ContextSpecificTag(TAG_PRIORITY_REQ), priority) diff --git a/src/controller/java/generated/java/matter/controller/cluster/clusters/NetworkCommissioningCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/NetworkCommissioningCluster.kt index 29ff013692c6d5..2a144baed4f8fd 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/clusters/NetworkCommissioningCluster.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/NetworkCommissioningCluster.kt @@ -576,8 +576,8 @@ class NetworkCommissioningCluster( val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_NETWORK_I_D_REQ: Int = 0 - tlvWriter.put(ContextSpecificTag(TAG_NETWORK_I_D_REQ), networkID) + val TAG_NETWORK_ID_REQ: Int = 0 + tlvWriter.put(ContextSpecificTag(TAG_NETWORK_ID_REQ), networkID) val TAG_BREADCRUMB_REQ: Int = 1 breadcrumb?.let { tlvWriter.put(ContextSpecificTag(TAG_BREADCRUMB_REQ), breadcrumb) } @@ -701,8 +701,8 @@ class NetworkCommissioningCluster( val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_NETWORK_I_D_REQ: Int = 0 - tlvWriter.put(ContextSpecificTag(TAG_NETWORK_I_D_REQ), networkID) + val TAG_NETWORK_ID_REQ: Int = 0 + tlvWriter.put(ContextSpecificTag(TAG_NETWORK_ID_REQ), networkID) val TAG_BREADCRUMB_REQ: Int = 1 breadcrumb?.let { tlvWriter.put(ContextSpecificTag(TAG_BREADCRUMB_REQ), breadcrumb) } @@ -788,8 +788,8 @@ class NetworkCommissioningCluster( val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_NETWORK_I_D_REQ: Int = 0 - tlvWriter.put(ContextSpecificTag(TAG_NETWORK_I_D_REQ), networkID) + val TAG_NETWORK_ID_REQ: Int = 0 + tlvWriter.put(ContextSpecificTag(TAG_NETWORK_ID_REQ), networkID) val TAG_NETWORK_INDEX_REQ: Int = 1 tlvWriter.put(ContextSpecificTag(TAG_NETWORK_INDEX_REQ), networkIndex) diff --git a/src/controller/java/generated/java/matter/controller/cluster/clusters/OperationalCredentialsCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/OperationalCredentialsCluster.kt index bf066e2c0bfd8c..d96efd654fe092 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/clusters/OperationalCredentialsCluster.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/OperationalCredentialsCluster.kt @@ -244,12 +244,12 @@ class OperationalCredentialsCluster( val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_C_S_R_NONCE_REQ: Int = 0 - tlvWriter.put(ContextSpecificTag(TAG_C_S_R_NONCE_REQ), CSRNonce) + val TAG_CSR_NONCE_REQ: Int = 0 + tlvWriter.put(ContextSpecificTag(TAG_CSR_NONCE_REQ), CSRNonce) - val TAG_IS_FOR_UPDATE_N_O_C_REQ: Int = 1 + val TAG_IS_FOR_UPDATE_NOC_REQ: Int = 1 isForUpdateNOC?.let { - tlvWriter.put(ContextSpecificTag(TAG_IS_FOR_UPDATE_N_O_C_REQ), isForUpdateNOC) + tlvWriter.put(ContextSpecificTag(TAG_IS_FOR_UPDATE_NOC_REQ), isForUpdateNOC) } tlvWriter.endStructure() @@ -265,7 +265,7 @@ class OperationalCredentialsCluster( val tlvReader = TlvReader(response.payload) tlvReader.enterStructure(AnonymousTag) - val TAG_N_O_C_S_R_ELEMENTS: Int = 0 + val TAG_NOCSR_ELEMENTS: Int = 0 var NOCSRElements_decoded: ByteArray? = null val TAG_ATTESTATION_SIGNATURE: Int = 1 @@ -274,7 +274,7 @@ class OperationalCredentialsCluster( while (!tlvReader.isEndOfContainer()) { val tag = tlvReader.peekElement().tag - if (tag == ContextSpecificTag(TAG_N_O_C_S_R_ELEMENTS)) { + if (tag == ContextSpecificTag(TAG_NOCSR_ELEMENTS)) { NOCSRElements_decoded = tlvReader.getByteArray(tag) } @@ -311,14 +311,14 @@ class OperationalCredentialsCluster( val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_N_O_C_VALUE_REQ: Int = 0 - tlvWriter.put(ContextSpecificTag(TAG_N_O_C_VALUE_REQ), NOCValue) + val TAG_NOC_VALUE_REQ: Int = 0 + tlvWriter.put(ContextSpecificTag(TAG_NOC_VALUE_REQ), NOCValue) - val TAG_I_C_A_C_VALUE_REQ: Int = 1 - ICACValue?.let { tlvWriter.put(ContextSpecificTag(TAG_I_C_A_C_VALUE_REQ), ICACValue) } + val TAG_ICAC_VALUE_REQ: Int = 1 + ICACValue?.let { tlvWriter.put(ContextSpecificTag(TAG_ICAC_VALUE_REQ), ICACValue) } - val TAG_I_P_K_VALUE_REQ: Int = 2 - tlvWriter.put(ContextSpecificTag(TAG_I_P_K_VALUE_REQ), IPKValue) + val TAG_IPK_VALUE_REQ: Int = 2 + tlvWriter.put(ContextSpecificTag(TAG_IPK_VALUE_REQ), IPKValue) val TAG_CASE_ADMIN_SUBJECT_REQ: Int = 3 tlvWriter.put(ContextSpecificTag(TAG_CASE_ADMIN_SUBJECT_REQ), caseAdminSubject) @@ -405,11 +405,11 @@ class OperationalCredentialsCluster( val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_N_O_C_VALUE_REQ: Int = 0 - tlvWriter.put(ContextSpecificTag(TAG_N_O_C_VALUE_REQ), NOCValue) + val TAG_NOC_VALUE_REQ: Int = 0 + tlvWriter.put(ContextSpecificTag(TAG_NOC_VALUE_REQ), NOCValue) - val TAG_I_C_A_C_VALUE_REQ: Int = 1 - ICACValue?.let { tlvWriter.put(ContextSpecificTag(TAG_I_C_A_C_VALUE_REQ), ICACValue) } + val TAG_ICAC_VALUE_REQ: Int = 1 + ICACValue?.let { tlvWriter.put(ContextSpecificTag(TAG_ICAC_VALUE_REQ), ICACValue) } tlvWriter.endStructure() val request: InvokeRequest = @@ -645,8 +645,8 @@ class OperationalCredentialsCluster( val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_ROOT_C_A_CERTIFICATE_REQ: Int = 0 - tlvWriter.put(ContextSpecificTag(TAG_ROOT_C_A_CERTIFICATE_REQ), rootCACertificate) + val TAG_ROOT_CA_CERTIFICATE_REQ: Int = 0 + tlvWriter.put(ContextSpecificTag(TAG_ROOT_CA_CERTIFICATE_REQ), rootCACertificate) tlvWriter.endStructure() val request: InvokeRequest = diff --git a/src/controller/java/generated/java/matter/controller/cluster/clusters/OtaSoftwareUpdateProviderCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/OtaSoftwareUpdateProviderCluster.kt index cfcedb7a1c563e..cf8525ed7f2ad7 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/clusters/OtaSoftwareUpdateProviderCluster.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/OtaSoftwareUpdateProviderCluster.kt @@ -112,11 +112,11 @@ class OtaSoftwareUpdateProviderCluster( val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_VENDOR_I_D_REQ: Int = 0 - tlvWriter.put(ContextSpecificTag(TAG_VENDOR_I_D_REQ), vendorID) + val TAG_VENDOR_ID_REQ: Int = 0 + tlvWriter.put(ContextSpecificTag(TAG_VENDOR_ID_REQ), vendorID) - val TAG_PRODUCT_I_D_REQ: Int = 1 - tlvWriter.put(ContextSpecificTag(TAG_PRODUCT_I_D_REQ), productID) + val TAG_PRODUCT_ID_REQ: Int = 1 + tlvWriter.put(ContextSpecificTag(TAG_PRODUCT_ID_REQ), productID) val TAG_SOFTWARE_VERSION_REQ: Int = 2 tlvWriter.put(ContextSpecificTag(TAG_SOFTWARE_VERSION_REQ), softwareVersion) @@ -165,7 +165,7 @@ class OtaSoftwareUpdateProviderCluster( val TAG_DELAYED_ACTION_TIME: Int = 1 var delayedActionTime_decoded: UInt? = null - val TAG_IMAGE_U_R_I: Int = 2 + val TAG_IMAGE_URI: Int = 2 var imageURI_decoded: String? = null val TAG_SOFTWARE_VERSION: Int = 3 @@ -204,7 +204,7 @@ class OtaSoftwareUpdateProviderCluster( } } - if (tag == ContextSpecificTag(TAG_IMAGE_U_R_I)) { + if (tag == ContextSpecificTag(TAG_IMAGE_URI)) { imageURI_decoded = if (tlvReader.isNull()) { tlvReader.getNull(tag) diff --git a/src/controller/java/generated/java/matter/controller/cluster/clusters/OtaSoftwareUpdateRequestorCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/OtaSoftwareUpdateRequestorCluster.kt index 56a8444d796431..21ca7bd092ed56 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/clusters/OtaSoftwareUpdateRequestorCluster.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/OtaSoftwareUpdateRequestorCluster.kt @@ -124,11 +124,11 @@ class OtaSoftwareUpdateRequestorCluster( val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_PROVIDER_NODE_I_D_REQ: Int = 0 - tlvWriter.put(ContextSpecificTag(TAG_PROVIDER_NODE_I_D_REQ), providerNodeID) + val TAG_PROVIDER_NODE_ID_REQ: Int = 0 + tlvWriter.put(ContextSpecificTag(TAG_PROVIDER_NODE_ID_REQ), providerNodeID) - val TAG_VENDOR_I_D_REQ: Int = 1 - tlvWriter.put(ContextSpecificTag(TAG_VENDOR_I_D_REQ), vendorID) + val TAG_VENDOR_ID_REQ: Int = 1 + tlvWriter.put(ContextSpecificTag(TAG_VENDOR_ID_REQ), vendorID) val TAG_ANNOUNCEMENT_REASON_REQ: Int = 2 tlvWriter.put(ContextSpecificTag(TAG_ANNOUNCEMENT_REASON_REQ), announcementReason) diff --git a/src/controller/java/generated/java/matter/controller/cluster/clusters/ScenesManagementCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/ScenesManagementCluster.kt index f3f1927f553668..e363f8c88f37f3 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/clusters/ScenesManagementCluster.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/ScenesManagementCluster.kt @@ -147,11 +147,11 @@ class ScenesManagementCluster( val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_GROUP_I_D_REQ: Int = 0 - tlvWriter.put(ContextSpecificTag(TAG_GROUP_I_D_REQ), groupID) + val TAG_GROUP_ID_REQ: Int = 0 + tlvWriter.put(ContextSpecificTag(TAG_GROUP_ID_REQ), groupID) - val TAG_SCENE_I_D_REQ: Int = 1 - tlvWriter.put(ContextSpecificTag(TAG_SCENE_I_D_REQ), sceneID) + val TAG_SCENE_ID_REQ: Int = 1 + tlvWriter.put(ContextSpecificTag(TAG_SCENE_ID_REQ), sceneID) val TAG_TRANSITION_TIME_REQ: Int = 2 tlvWriter.put(ContextSpecificTag(TAG_TRANSITION_TIME_REQ), transitionTime) @@ -182,10 +182,10 @@ class ScenesManagementCluster( val TAG_STATUS: Int = 0 var status_decoded: UByte? = null - val TAG_GROUP_I_D: Int = 1 + val TAG_GROUP_ID: Int = 1 var groupID_decoded: UShort? = null - val TAG_SCENE_I_D: Int = 2 + val TAG_SCENE_ID: Int = 2 var sceneID_decoded: UByte? = null while (!tlvReader.isEndOfContainer()) { @@ -195,11 +195,11 @@ class ScenesManagementCluster( status_decoded = tlvReader.getUByte(tag) } - if (tag == ContextSpecificTag(TAG_GROUP_I_D)) { + if (tag == ContextSpecificTag(TAG_GROUP_ID)) { groupID_decoded = tlvReader.getUShort(tag) } - if (tag == ContextSpecificTag(TAG_SCENE_I_D)) { + if (tag == ContextSpecificTag(TAG_SCENE_ID)) { sceneID_decoded = tlvReader.getUByte(tag) } else { tlvReader.skipElement() @@ -233,11 +233,11 @@ class ScenesManagementCluster( val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_GROUP_I_D_REQ: Int = 0 - tlvWriter.put(ContextSpecificTag(TAG_GROUP_I_D_REQ), groupID) + val TAG_GROUP_ID_REQ: Int = 0 + tlvWriter.put(ContextSpecificTag(TAG_GROUP_ID_REQ), groupID) - val TAG_SCENE_I_D_REQ: Int = 1 - tlvWriter.put(ContextSpecificTag(TAG_SCENE_I_D_REQ), sceneID) + val TAG_SCENE_ID_REQ: Int = 1 + tlvWriter.put(ContextSpecificTag(TAG_SCENE_ID_REQ), sceneID) tlvWriter.endStructure() val request: InvokeRequest = @@ -255,10 +255,10 @@ class ScenesManagementCluster( val TAG_STATUS: Int = 0 var status_decoded: UByte? = null - val TAG_GROUP_I_D: Int = 1 + val TAG_GROUP_ID: Int = 1 var groupID_decoded: UShort? = null - val TAG_SCENE_I_D: Int = 2 + val TAG_SCENE_ID: Int = 2 var sceneID_decoded: UByte? = null val TAG_TRANSITION_TIME: Int = 3 @@ -277,11 +277,11 @@ class ScenesManagementCluster( status_decoded = tlvReader.getUByte(tag) } - if (tag == ContextSpecificTag(TAG_GROUP_I_D)) { + if (tag == ContextSpecificTag(TAG_GROUP_ID)) { groupID_decoded = tlvReader.getUShort(tag) } - if (tag == ContextSpecificTag(TAG_SCENE_I_D)) { + if (tag == ContextSpecificTag(TAG_SCENE_ID)) { sceneID_decoded = tlvReader.getUByte(tag) } @@ -370,11 +370,11 @@ class ScenesManagementCluster( val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_GROUP_I_D_REQ: Int = 0 - tlvWriter.put(ContextSpecificTag(TAG_GROUP_I_D_REQ), groupID) + val TAG_GROUP_ID_REQ: Int = 0 + tlvWriter.put(ContextSpecificTag(TAG_GROUP_ID_REQ), groupID) - val TAG_SCENE_I_D_REQ: Int = 1 - tlvWriter.put(ContextSpecificTag(TAG_SCENE_I_D_REQ), sceneID) + val TAG_SCENE_ID_REQ: Int = 1 + tlvWriter.put(ContextSpecificTag(TAG_SCENE_ID_REQ), sceneID) tlvWriter.endStructure() val request: InvokeRequest = @@ -392,10 +392,10 @@ class ScenesManagementCluster( val TAG_STATUS: Int = 0 var status_decoded: UByte? = null - val TAG_GROUP_I_D: Int = 1 + val TAG_GROUP_ID: Int = 1 var groupID_decoded: UShort? = null - val TAG_SCENE_I_D: Int = 2 + val TAG_SCENE_ID: Int = 2 var sceneID_decoded: UByte? = null while (!tlvReader.isEndOfContainer()) { @@ -405,11 +405,11 @@ class ScenesManagementCluster( status_decoded = tlvReader.getUByte(tag) } - if (tag == ContextSpecificTag(TAG_GROUP_I_D)) { + if (tag == ContextSpecificTag(TAG_GROUP_ID)) { groupID_decoded = tlvReader.getUShort(tag) } - if (tag == ContextSpecificTag(TAG_SCENE_I_D)) { + if (tag == ContextSpecificTag(TAG_SCENE_ID)) { sceneID_decoded = tlvReader.getUByte(tag) } else { tlvReader.skipElement() @@ -442,8 +442,8 @@ class ScenesManagementCluster( val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_GROUP_I_D_REQ: Int = 0 - tlvWriter.put(ContextSpecificTag(TAG_GROUP_I_D_REQ), groupID) + val TAG_GROUP_ID_REQ: Int = 0 + tlvWriter.put(ContextSpecificTag(TAG_GROUP_ID_REQ), groupID) tlvWriter.endStructure() val request: InvokeRequest = @@ -461,7 +461,7 @@ class ScenesManagementCluster( val TAG_STATUS: Int = 0 var status_decoded: UByte? = null - val TAG_GROUP_I_D: Int = 1 + val TAG_GROUP_ID: Int = 1 var groupID_decoded: UShort? = null while (!tlvReader.isEndOfContainer()) { @@ -471,7 +471,7 @@ class ScenesManagementCluster( status_decoded = tlvReader.getUByte(tag) } - if (tag == ContextSpecificTag(TAG_GROUP_I_D)) { + if (tag == ContextSpecificTag(TAG_GROUP_ID)) { groupID_decoded = tlvReader.getUShort(tag) } else { tlvReader.skipElement() @@ -501,11 +501,11 @@ class ScenesManagementCluster( val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_GROUP_I_D_REQ: Int = 0 - tlvWriter.put(ContextSpecificTag(TAG_GROUP_I_D_REQ), groupID) + val TAG_GROUP_ID_REQ: Int = 0 + tlvWriter.put(ContextSpecificTag(TAG_GROUP_ID_REQ), groupID) - val TAG_SCENE_I_D_REQ: Int = 1 - tlvWriter.put(ContextSpecificTag(TAG_SCENE_I_D_REQ), sceneID) + val TAG_SCENE_ID_REQ: Int = 1 + tlvWriter.put(ContextSpecificTag(TAG_SCENE_ID_REQ), sceneID) tlvWriter.endStructure() val request: InvokeRequest = @@ -523,10 +523,10 @@ class ScenesManagementCluster( val TAG_STATUS: Int = 0 var status_decoded: UByte? = null - val TAG_GROUP_I_D: Int = 1 + val TAG_GROUP_ID: Int = 1 var groupID_decoded: UShort? = null - val TAG_SCENE_I_D: Int = 2 + val TAG_SCENE_ID: Int = 2 var sceneID_decoded: UByte? = null while (!tlvReader.isEndOfContainer()) { @@ -536,11 +536,11 @@ class ScenesManagementCluster( status_decoded = tlvReader.getUByte(tag) } - if (tag == ContextSpecificTag(TAG_GROUP_I_D)) { + if (tag == ContextSpecificTag(TAG_GROUP_ID)) { groupID_decoded = tlvReader.getUShort(tag) } - if (tag == ContextSpecificTag(TAG_SCENE_I_D)) { + if (tag == ContextSpecificTag(TAG_SCENE_ID)) { sceneID_decoded = tlvReader.getUByte(tag) } else { tlvReader.skipElement() @@ -575,11 +575,11 @@ class ScenesManagementCluster( val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_GROUP_I_D_REQ: Int = 0 - tlvWriter.put(ContextSpecificTag(TAG_GROUP_I_D_REQ), groupID) + val TAG_GROUP_ID_REQ: Int = 0 + tlvWriter.put(ContextSpecificTag(TAG_GROUP_ID_REQ), groupID) - val TAG_SCENE_I_D_REQ: Int = 1 - tlvWriter.put(ContextSpecificTag(TAG_SCENE_I_D_REQ), sceneID) + val TAG_SCENE_ID_REQ: Int = 1 + tlvWriter.put(ContextSpecificTag(TAG_SCENE_ID_REQ), sceneID) val TAG_TRANSITION_TIME_REQ: Int = 2 transitionTime?.let { @@ -607,8 +607,8 @@ class ScenesManagementCluster( val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_GROUP_I_D_REQ: Int = 0 - tlvWriter.put(ContextSpecificTag(TAG_GROUP_I_D_REQ), groupID) + val TAG_GROUP_ID_REQ: Int = 0 + tlvWriter.put(ContextSpecificTag(TAG_GROUP_ID_REQ), groupID) tlvWriter.endStructure() val request: InvokeRequest = @@ -629,7 +629,7 @@ class ScenesManagementCluster( val TAG_CAPACITY: Int = 1 var capacity_decoded: UByte? = null - val TAG_GROUP_I_D: Int = 2 + val TAG_GROUP_ID: Int = 2 var groupID_decoded: UShort? = null val TAG_SCENE_LIST: Int = 3 @@ -657,7 +657,7 @@ class ScenesManagementCluster( } } - if (tag == ContextSpecificTag(TAG_GROUP_I_D)) { + if (tag == ContextSpecificTag(TAG_GROUP_ID)) { groupID_decoded = tlvReader.getUShort(tag) } diff --git a/src/controller/java/generated/java/matter/controller/cluster/clusters/ThreadNetworkDirectoryCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/ThreadNetworkDirectoryCluster.kt index b5af2b1db2895a..ee5b2e9aea94ec 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/clusters/ThreadNetworkDirectoryCluster.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/ThreadNetworkDirectoryCluster.kt @@ -137,8 +137,8 @@ class ThreadNetworkDirectoryCluster( val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_EXTENDED_PAN_I_D_REQ: Int = 0 - tlvWriter.put(ContextSpecificTag(TAG_EXTENDED_PAN_I_D_REQ), extendedPanID) + val TAG_EXTENDED_PAN_ID_REQ: Int = 0 + tlvWriter.put(ContextSpecificTag(TAG_EXTENDED_PAN_ID_REQ), extendedPanID) tlvWriter.endStructure() val request: InvokeRequest = @@ -161,8 +161,8 @@ class ThreadNetworkDirectoryCluster( val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_EXTENDED_PAN_I_D_REQ: Int = 0 - tlvWriter.put(ContextSpecificTag(TAG_EXTENDED_PAN_I_D_REQ), extendedPanID) + val TAG_EXTENDED_PAN_ID_REQ: Int = 0 + tlvWriter.put(ContextSpecificTag(TAG_EXTENDED_PAN_ID_REQ), extendedPanID) tlvWriter.endStructure() val request: InvokeRequest = diff --git a/src/controller/java/generated/java/matter/controller/cluster/clusters/TimeSynchronizationCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/TimeSynchronizationCluster.kt index 74305abcccf194..c968311230c6cb 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/clusters/TimeSynchronizationCluster.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/TimeSynchronizationCluster.kt @@ -161,8 +161,8 @@ class TimeSynchronizationCluster( val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_U_T_C_TIME_REQ: Int = 0 - tlvWriter.put(ContextSpecificTag(TAG_U_T_C_TIME_REQ), UTCTime) + val TAG_UTC_TIME_REQ: Int = 0 + tlvWriter.put(ContextSpecificTag(TAG_UTC_TIME_REQ), UTCTime) val TAG_GRANULARITY_REQ: Int = 1 tlvWriter.put(ContextSpecificTag(TAG_GRANULARITY_REQ), granularity) @@ -237,13 +237,13 @@ class TimeSynchronizationCluster( val tlvReader = TlvReader(response.payload) tlvReader.enterStructure(AnonymousTag) - val TAG_D_S_T_OFFSET_REQUIRED: Int = 0 + val TAG_DST_OFFSET_REQUIRED: Int = 0 var DSTOffsetRequired_decoded: Boolean? = null while (!tlvReader.isEndOfContainer()) { val tag = tlvReader.peekElement().tag - if (tag == ContextSpecificTag(TAG_D_S_T_OFFSET_REQUIRED)) { + if (tag == ContextSpecificTag(TAG_DST_OFFSET_REQUIRED)) { DSTOffsetRequired_decoded = tlvReader.getBoolean(tag) } else { tlvReader.skipElement() @@ -268,8 +268,8 @@ class TimeSynchronizationCluster( val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_D_S_T_OFFSET_REQ: Int = 0 - tlvWriter.startArray(ContextSpecificTag(TAG_D_S_T_OFFSET_REQ)) + val TAG_DST_OFFSET_REQ: Int = 0 + tlvWriter.startArray(ContextSpecificTag(TAG_DST_OFFSET_REQ)) for (item in DSTOffset.iterator()) { item.toTlv(AnonymousTag, tlvWriter) } @@ -293,8 +293,8 @@ class TimeSynchronizationCluster( val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_DEFAULT_N_T_P_REQ: Int = 0 - defaultNTP?.let { tlvWriter.put(ContextSpecificTag(TAG_DEFAULT_N_T_P_REQ), defaultNTP) } + val TAG_DEFAULT_NTP_REQ: Int = 0 + defaultNTP?.let { tlvWriter.put(ContextSpecificTag(TAG_DEFAULT_NTP_REQ), defaultNTP) } tlvWriter.endStructure() val request: InvokeRequest = diff --git a/src/controller/java/generated/java/matter/controller/cluster/eventstructs/AccessControlClusterAccessControlEntryChangedEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/AccessControlClusterAccessControlEntryChangedEvent.kt index c4fb86f66ea95e..2ac4b28ebebcb9 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/eventstructs/AccessControlClusterAccessControlEntryChangedEvent.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/AccessControlClusterAccessControlEntryChangedEvent.kt @@ -43,14 +43,14 @@ class AccessControlClusterAccessControlEntryChangedEvent( tlvWriter.apply { startStructure(tlvTag) if (adminNodeID != null) { - put(ContextSpecificTag(TAG_ADMIN_NODE_I_D), adminNodeID) + put(ContextSpecificTag(TAG_ADMIN_NODE_ID), adminNodeID) } else { - putNull(ContextSpecificTag(TAG_ADMIN_NODE_I_D)) + putNull(ContextSpecificTag(TAG_ADMIN_NODE_ID)) } if (adminPasscodeID != null) { - put(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D), adminPasscodeID) + put(ContextSpecificTag(TAG_ADMIN_PASSCODE_ID), adminPasscodeID) } else { - putNull(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D)) + putNull(ContextSpecificTag(TAG_ADMIN_PASSCODE_ID)) } put(ContextSpecificTag(TAG_CHANGE_TYPE), changeType) if (latestValue != null) { @@ -64,8 +64,8 @@ class AccessControlClusterAccessControlEntryChangedEvent( } companion object { - private const val TAG_ADMIN_NODE_I_D = 1 - private const val TAG_ADMIN_PASSCODE_I_D = 2 + private const val TAG_ADMIN_NODE_ID = 1 + private const val TAG_ADMIN_PASSCODE_ID = 2 private const val TAG_CHANGE_TYPE = 3 private const val TAG_LATEST_VALUE = 4 private const val TAG_FABRIC_INDEX = 254 @@ -77,16 +77,16 @@ class AccessControlClusterAccessControlEntryChangedEvent( tlvReader.enterStructure(tlvTag) val adminNodeID = if (!tlvReader.isNull()) { - tlvReader.getULong(ContextSpecificTag(TAG_ADMIN_NODE_I_D)) + tlvReader.getULong(ContextSpecificTag(TAG_ADMIN_NODE_ID)) } else { - tlvReader.getNull(ContextSpecificTag(TAG_ADMIN_NODE_I_D)) + tlvReader.getNull(ContextSpecificTag(TAG_ADMIN_NODE_ID)) null } val adminPasscodeID = if (!tlvReader.isNull()) { - tlvReader.getUShort(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D)) + tlvReader.getUShort(ContextSpecificTag(TAG_ADMIN_PASSCODE_ID)) } else { - tlvReader.getNull(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D)) + tlvReader.getNull(ContextSpecificTag(TAG_ADMIN_PASSCODE_ID)) null } val changeType = tlvReader.getUByte(ContextSpecificTag(TAG_CHANGE_TYPE)) diff --git a/src/controller/java/generated/java/matter/controller/cluster/eventstructs/AccessControlClusterAccessControlExtensionChangedEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/AccessControlClusterAccessControlExtensionChangedEvent.kt index eefb09a6b6286a..668ee86be2e380 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/eventstructs/AccessControlClusterAccessControlExtensionChangedEvent.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/AccessControlClusterAccessControlExtensionChangedEvent.kt @@ -44,14 +44,14 @@ class AccessControlClusterAccessControlExtensionChangedEvent( tlvWriter.apply { startStructure(tlvTag) if (adminNodeID != null) { - put(ContextSpecificTag(TAG_ADMIN_NODE_I_D), adminNodeID) + put(ContextSpecificTag(TAG_ADMIN_NODE_ID), adminNodeID) } else { - putNull(ContextSpecificTag(TAG_ADMIN_NODE_I_D)) + putNull(ContextSpecificTag(TAG_ADMIN_NODE_ID)) } if (adminPasscodeID != null) { - put(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D), adminPasscodeID) + put(ContextSpecificTag(TAG_ADMIN_PASSCODE_ID), adminPasscodeID) } else { - putNull(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D)) + putNull(ContextSpecificTag(TAG_ADMIN_PASSCODE_ID)) } put(ContextSpecificTag(TAG_CHANGE_TYPE), changeType) if (latestValue != null) { @@ -65,8 +65,8 @@ class AccessControlClusterAccessControlExtensionChangedEvent( } companion object { - private const val TAG_ADMIN_NODE_I_D = 1 - private const val TAG_ADMIN_PASSCODE_I_D = 2 + private const val TAG_ADMIN_NODE_ID = 1 + private const val TAG_ADMIN_PASSCODE_ID = 2 private const val TAG_CHANGE_TYPE = 3 private const val TAG_LATEST_VALUE = 4 private const val TAG_FABRIC_INDEX = 254 @@ -78,16 +78,16 @@ class AccessControlClusterAccessControlExtensionChangedEvent( tlvReader.enterStructure(tlvTag) val adminNodeID = if (!tlvReader.isNull()) { - tlvReader.getULong(ContextSpecificTag(TAG_ADMIN_NODE_I_D)) + tlvReader.getULong(ContextSpecificTag(TAG_ADMIN_NODE_ID)) } else { - tlvReader.getNull(ContextSpecificTag(TAG_ADMIN_NODE_I_D)) + tlvReader.getNull(ContextSpecificTag(TAG_ADMIN_NODE_ID)) null } val adminPasscodeID = if (!tlvReader.isNull()) { - tlvReader.getUShort(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D)) + tlvReader.getUShort(ContextSpecificTag(TAG_ADMIN_PASSCODE_ID)) } else { - tlvReader.getNull(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D)) + tlvReader.getNull(ContextSpecificTag(TAG_ADMIN_PASSCODE_ID)) null } val changeType = tlvReader.getUByte(ContextSpecificTag(TAG_CHANGE_TYPE)) diff --git a/src/controller/java/generated/java/matter/controller/cluster/eventstructs/AccessControlClusterFabricRestrictionReviewUpdateEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/AccessControlClusterFabricRestrictionReviewUpdateEvent.kt index 2dca6ad48fbbe1..6bf03e6afc8c13 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/eventstructs/AccessControlClusterFabricRestrictionReviewUpdateEvent.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/AccessControlClusterFabricRestrictionReviewUpdateEvent.kt @@ -47,9 +47,9 @@ class AccessControlClusterFabricRestrictionReviewUpdateEvent( putNull(ContextSpecificTag(TAG_INSTRUCTION)) } if (redirectURL != null) { - put(ContextSpecificTag(TAG_REDIRECT_U_R_L), redirectURL) + put(ContextSpecificTag(TAG_REDIRECT_URL), redirectURL) } else { - putNull(ContextSpecificTag(TAG_REDIRECT_U_R_L)) + putNull(ContextSpecificTag(TAG_REDIRECT_URL)) } put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex) endStructure() @@ -59,7 +59,7 @@ class AccessControlClusterFabricRestrictionReviewUpdateEvent( companion object { private const val TAG_TOKEN = 0 private const val TAG_INSTRUCTION = 1 - private const val TAG_REDIRECT_U_R_L = 2 + private const val TAG_REDIRECT_URL = 2 private const val TAG_FABRIC_INDEX = 254 fun fromTlv( @@ -77,9 +77,9 @@ class AccessControlClusterFabricRestrictionReviewUpdateEvent( } val redirectURL = if (!tlvReader.isNull()) { - tlvReader.getString(ContextSpecificTag(TAG_REDIRECT_U_R_L)) + tlvReader.getString(ContextSpecificTag(TAG_REDIRECT_URL)) } else { - tlvReader.getNull(ContextSpecificTag(TAG_REDIRECT_U_R_L)) + tlvReader.getNull(ContextSpecificTag(TAG_REDIRECT_URL)) null } val fabricIndex = tlvReader.getUByte(ContextSpecificTag(TAG_FABRIC_INDEX)) diff --git a/src/controller/java/generated/java/matter/controller/cluster/eventstructs/ActionsClusterActionFailedEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/ActionsClusterActionFailedEvent.kt index d41926f85961f3..a1fe90125f5e61 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/eventstructs/ActionsClusterActionFailedEvent.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/ActionsClusterActionFailedEvent.kt @@ -40,8 +40,8 @@ class ActionsClusterActionFailedEvent( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_ACTION_I_D), actionID) - put(ContextSpecificTag(TAG_INVOKE_I_D), invokeID) + put(ContextSpecificTag(TAG_ACTION_ID), actionID) + put(ContextSpecificTag(TAG_INVOKE_ID), invokeID) put(ContextSpecificTag(TAG_NEW_STATE), newState) put(ContextSpecificTag(TAG_ERROR), error) endStructure() @@ -49,15 +49,15 @@ class ActionsClusterActionFailedEvent( } companion object { - private const val TAG_ACTION_I_D = 0 - private const val TAG_INVOKE_I_D = 1 + private const val TAG_ACTION_ID = 0 + private const val TAG_INVOKE_ID = 1 private const val TAG_NEW_STATE = 2 private const val TAG_ERROR = 3 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ActionsClusterActionFailedEvent { tlvReader.enterStructure(tlvTag) - val actionID = tlvReader.getUShort(ContextSpecificTag(TAG_ACTION_I_D)) - val invokeID = tlvReader.getUInt(ContextSpecificTag(TAG_INVOKE_I_D)) + val actionID = tlvReader.getUShort(ContextSpecificTag(TAG_ACTION_ID)) + val invokeID = tlvReader.getUInt(ContextSpecificTag(TAG_INVOKE_ID)) val newState = tlvReader.getUByte(ContextSpecificTag(TAG_NEW_STATE)) val error = tlvReader.getUByte(ContextSpecificTag(TAG_ERROR)) diff --git a/src/controller/java/generated/java/matter/controller/cluster/eventstructs/ActionsClusterStateChangedEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/ActionsClusterStateChangedEvent.kt index f4c4d26bbad39c..8fdefb84b1b3ba 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/eventstructs/ActionsClusterStateChangedEvent.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/ActionsClusterStateChangedEvent.kt @@ -38,22 +38,22 @@ class ActionsClusterStateChangedEvent( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_ACTION_I_D), actionID) - put(ContextSpecificTag(TAG_INVOKE_I_D), invokeID) + put(ContextSpecificTag(TAG_ACTION_ID), actionID) + put(ContextSpecificTag(TAG_INVOKE_ID), invokeID) put(ContextSpecificTag(TAG_NEW_STATE), newState) endStructure() } } companion object { - private const val TAG_ACTION_I_D = 0 - private const val TAG_INVOKE_I_D = 1 + private const val TAG_ACTION_ID = 0 + private const val TAG_INVOKE_ID = 1 private const val TAG_NEW_STATE = 2 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ActionsClusterStateChangedEvent { tlvReader.enterStructure(tlvTag) - val actionID = tlvReader.getUShort(ContextSpecificTag(TAG_ACTION_I_D)) - val invokeID = tlvReader.getUInt(ContextSpecificTag(TAG_INVOKE_I_D)) + val actionID = tlvReader.getUShort(ContextSpecificTag(TAG_ACTION_ID)) + val invokeID = tlvReader.getUInt(ContextSpecificTag(TAG_INVOKE_ID)) val newState = tlvReader.getUByte(ContextSpecificTag(TAG_NEW_STATE)) tlvReader.exitContainer() diff --git a/src/controller/java/generated/java/matter/controller/cluster/eventstructs/DemandResponseLoadControlClusterLoadControlEventStatusChangeEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/DemandResponseLoadControlClusterLoadControlEventStatusChangeEvent.kt index a5e1a7f60ed084..d5e263249bd4c4 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/eventstructs/DemandResponseLoadControlClusterLoadControlEventStatusChangeEvent.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/DemandResponseLoadControlClusterLoadControlEventStatusChangeEvent.kt @@ -68,7 +68,7 @@ class DemandResponseLoadControlClusterLoadControlEventStatusChangeEvent( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_EVENT_I_D), eventID) + put(ContextSpecificTag(TAG_EVENT_ID), eventID) if (transitionIndex != null) { put(ContextSpecificTag(TAG_TRANSITION_INDEX), transitionIndex) } else { @@ -122,7 +122,7 @@ class DemandResponseLoadControlClusterLoadControlEventStatusChangeEvent( } companion object { - private const val TAG_EVENT_I_D = 0 + private const val TAG_EVENT_ID = 0 private const val TAG_TRANSITION_INDEX = 1 private const val TAG_STATUS = 2 private const val TAG_CRITICALITY = 3 @@ -138,7 +138,7 @@ class DemandResponseLoadControlClusterLoadControlEventStatusChangeEvent( tlvReader: TlvReader, ): DemandResponseLoadControlClusterLoadControlEventStatusChangeEvent { tlvReader.enterStructure(tlvTag) - val eventID = tlvReader.getByteArray(ContextSpecificTag(TAG_EVENT_I_D)) + val eventID = tlvReader.getByteArray(ContextSpecificTag(TAG_EVENT_ID)) val transitionIndex = if (!tlvReader.isNull()) { tlvReader.getUByte(ContextSpecificTag(TAG_TRANSITION_INDEX)) diff --git a/src/controller/java/generated/java/matter/controller/cluster/eventstructs/EnergyEvseClusterEVConnectedEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/EnergyEvseClusterEVConnectedEvent.kt index a0770e7e82af07..672690fcdac70f 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/eventstructs/EnergyEvseClusterEVConnectedEvent.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/EnergyEvseClusterEVConnectedEvent.kt @@ -32,17 +32,17 @@ class EnergyEvseClusterEVConnectedEvent(val sessionID: UInt) { fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_SESSION_I_D), sessionID) + put(ContextSpecificTag(TAG_SESSION_ID), sessionID) endStructure() } } companion object { - private const val TAG_SESSION_I_D = 0 + private const val TAG_SESSION_ID = 0 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): EnergyEvseClusterEVConnectedEvent { tlvReader.enterStructure(tlvTag) - val sessionID = tlvReader.getUInt(ContextSpecificTag(TAG_SESSION_I_D)) + val sessionID = tlvReader.getUInt(ContextSpecificTag(TAG_SESSION_ID)) tlvReader.exitContainer() diff --git a/src/controller/java/generated/java/matter/controller/cluster/eventstructs/EnergyEvseClusterEVNotDetectedEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/EnergyEvseClusterEVNotDetectedEvent.kt index 7af6ae3d0842fb..7f033f40a6c888 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/eventstructs/EnergyEvseClusterEVNotDetectedEvent.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/EnergyEvseClusterEVNotDetectedEvent.kt @@ -43,7 +43,7 @@ class EnergyEvseClusterEVNotDetectedEvent( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_SESSION_I_D), sessionID) + put(ContextSpecificTag(TAG_SESSION_ID), sessionID) put(ContextSpecificTag(TAG_STATE), state) put(ContextSpecificTag(TAG_SESSION_DURATION), sessionDuration) put(ContextSpecificTag(TAG_SESSION_ENERGY_CHARGED), sessionEnergyCharged) @@ -56,7 +56,7 @@ class EnergyEvseClusterEVNotDetectedEvent( } companion object { - private const val TAG_SESSION_I_D = 0 + private const val TAG_SESSION_ID = 0 private const val TAG_STATE = 1 private const val TAG_SESSION_DURATION = 2 private const val TAG_SESSION_ENERGY_CHARGED = 3 @@ -64,7 +64,7 @@ class EnergyEvseClusterEVNotDetectedEvent( fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): EnergyEvseClusterEVNotDetectedEvent { tlvReader.enterStructure(tlvTag) - val sessionID = tlvReader.getUInt(ContextSpecificTag(TAG_SESSION_I_D)) + val sessionID = tlvReader.getUInt(ContextSpecificTag(TAG_SESSION_ID)) val state = tlvReader.getUByte(ContextSpecificTag(TAG_STATE)) val sessionDuration = tlvReader.getUInt(ContextSpecificTag(TAG_SESSION_DURATION)) val sessionEnergyCharged = tlvReader.getLong(ContextSpecificTag(TAG_SESSION_ENERGY_CHARGED)) diff --git a/src/controller/java/generated/java/matter/controller/cluster/eventstructs/EnergyEvseClusterEnergyTransferStartedEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/EnergyEvseClusterEnergyTransferStartedEvent.kt index 17459394a0bfef..d6ca275c22f47a 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/eventstructs/EnergyEvseClusterEnergyTransferStartedEvent.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/EnergyEvseClusterEnergyTransferStartedEvent.kt @@ -41,7 +41,7 @@ class EnergyEvseClusterEnergyTransferStartedEvent( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_SESSION_I_D), sessionID) + put(ContextSpecificTag(TAG_SESSION_ID), sessionID) put(ContextSpecificTag(TAG_STATE), state) put(ContextSpecificTag(TAG_MAXIMUM_CURRENT), maximumCurrent) if (maximumDischargeCurrent.isPresent) { @@ -53,14 +53,14 @@ class EnergyEvseClusterEnergyTransferStartedEvent( } companion object { - private const val TAG_SESSION_I_D = 0 + private const val TAG_SESSION_ID = 0 private const val TAG_STATE = 1 private const val TAG_MAXIMUM_CURRENT = 2 private const val TAG_MAXIMUM_DISCHARGE_CURRENT = 3 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): EnergyEvseClusterEnergyTransferStartedEvent { tlvReader.enterStructure(tlvTag) - val sessionID = tlvReader.getUInt(ContextSpecificTag(TAG_SESSION_I_D)) + val sessionID = tlvReader.getUInt(ContextSpecificTag(TAG_SESSION_ID)) val state = tlvReader.getUByte(ContextSpecificTag(TAG_STATE)) val maximumCurrent = tlvReader.getLong(ContextSpecificTag(TAG_MAXIMUM_CURRENT)) val maximumDischargeCurrent = diff --git a/src/controller/java/generated/java/matter/controller/cluster/eventstructs/EnergyEvseClusterEnergyTransferStoppedEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/EnergyEvseClusterEnergyTransferStoppedEvent.kt index 56c91b5c1beb71..1dea5f56e6e64d 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/eventstructs/EnergyEvseClusterEnergyTransferStoppedEvent.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/EnergyEvseClusterEnergyTransferStoppedEvent.kt @@ -43,7 +43,7 @@ class EnergyEvseClusterEnergyTransferStoppedEvent( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_SESSION_I_D), sessionID) + put(ContextSpecificTag(TAG_SESSION_ID), sessionID) put(ContextSpecificTag(TAG_STATE), state) put(ContextSpecificTag(TAG_REASON), reason) put(ContextSpecificTag(TAG_ENERGY_TRANSFERRED), energyTransferred) @@ -56,7 +56,7 @@ class EnergyEvseClusterEnergyTransferStoppedEvent( } companion object { - private const val TAG_SESSION_I_D = 0 + private const val TAG_SESSION_ID = 0 private const val TAG_STATE = 1 private const val TAG_REASON = 2 private const val TAG_ENERGY_TRANSFERRED = 4 @@ -64,7 +64,7 @@ class EnergyEvseClusterEnergyTransferStoppedEvent( fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): EnergyEvseClusterEnergyTransferStoppedEvent { tlvReader.enterStructure(tlvTag) - val sessionID = tlvReader.getUInt(ContextSpecificTag(TAG_SESSION_I_D)) + val sessionID = tlvReader.getUInt(ContextSpecificTag(TAG_SESSION_ID)) val state = tlvReader.getUByte(ContextSpecificTag(TAG_STATE)) val reason = tlvReader.getUByte(ContextSpecificTag(TAG_REASON)) val energyTransferred = tlvReader.getLong(ContextSpecificTag(TAG_ENERGY_TRANSFERRED)) diff --git a/src/controller/java/generated/java/matter/controller/cluster/eventstructs/EnergyEvseClusterFaultEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/EnergyEvseClusterFaultEvent.kt index 534afc36af6d91..02800fa6ed6733 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/eventstructs/EnergyEvseClusterFaultEvent.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/EnergyEvseClusterFaultEvent.kt @@ -41,9 +41,9 @@ class EnergyEvseClusterFaultEvent( tlvWriter.apply { startStructure(tlvTag) if (sessionID != null) { - put(ContextSpecificTag(TAG_SESSION_I_D), sessionID) + put(ContextSpecificTag(TAG_SESSION_ID), sessionID) } else { - putNull(ContextSpecificTag(TAG_SESSION_I_D)) + putNull(ContextSpecificTag(TAG_SESSION_ID)) } put(ContextSpecificTag(TAG_STATE), state) put(ContextSpecificTag(TAG_FAULT_STATE_PREVIOUS_STATE), faultStatePreviousState) @@ -53,7 +53,7 @@ class EnergyEvseClusterFaultEvent( } companion object { - private const val TAG_SESSION_I_D = 0 + private const val TAG_SESSION_ID = 0 private const val TAG_STATE = 1 private const val TAG_FAULT_STATE_PREVIOUS_STATE = 2 private const val TAG_FAULT_STATE_CURRENT_STATE = 4 @@ -62,9 +62,9 @@ class EnergyEvseClusterFaultEvent( tlvReader.enterStructure(tlvTag) val sessionID = if (!tlvReader.isNull()) { - tlvReader.getUInt(ContextSpecificTag(TAG_SESSION_I_D)) + tlvReader.getUInt(ContextSpecificTag(TAG_SESSION_ID)) } else { - tlvReader.getNull(ContextSpecificTag(TAG_SESSION_I_D)) + tlvReader.getNull(ContextSpecificTag(TAG_SESSION_ID)) null } val state = tlvReader.getUByte(ContextSpecificTag(TAG_STATE)) diff --git a/src/controller/java/generated/java/matter/controller/cluster/eventstructs/MessagesClusterMessageCompleteEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/MessagesClusterMessageCompleteEvent.kt index b47a0919d5e5aa..9255c6a84b3e93 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/eventstructs/MessagesClusterMessageCompleteEvent.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/MessagesClusterMessageCompleteEvent.kt @@ -41,14 +41,14 @@ class MessagesClusterMessageCompleteEvent( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_MESSAGE_I_D), messageID) + put(ContextSpecificTag(TAG_MESSAGE_ID), messageID) if (responseID != null) { if (responseID.isPresent) { val optresponseID = responseID.get() - put(ContextSpecificTag(TAG_RESPONSE_I_D), optresponseID) + put(ContextSpecificTag(TAG_RESPONSE_ID), optresponseID) } } else { - putNull(ContextSpecificTag(TAG_RESPONSE_I_D)) + putNull(ContextSpecificTag(TAG_RESPONSE_ID)) } if (reply != null) { if (reply.isPresent) { @@ -68,23 +68,23 @@ class MessagesClusterMessageCompleteEvent( } companion object { - private const val TAG_MESSAGE_I_D = 0 - private const val TAG_RESPONSE_I_D = 1 + private const val TAG_MESSAGE_ID = 0 + private const val TAG_RESPONSE_ID = 1 private const val TAG_REPLY = 2 private const val TAG_FUTURE_MESSAGES_PREFERENCE = 3 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): MessagesClusterMessageCompleteEvent { tlvReader.enterStructure(tlvTag) - val messageID = tlvReader.getByteArray(ContextSpecificTag(TAG_MESSAGE_I_D)) + val messageID = tlvReader.getByteArray(ContextSpecificTag(TAG_MESSAGE_ID)) val responseID = if (!tlvReader.isNull()) { - if (tlvReader.isNextTag(ContextSpecificTag(TAG_RESPONSE_I_D))) { - Optional.of(tlvReader.getUInt(ContextSpecificTag(TAG_RESPONSE_I_D))) + if (tlvReader.isNextTag(ContextSpecificTag(TAG_RESPONSE_ID))) { + Optional.of(tlvReader.getUInt(ContextSpecificTag(TAG_RESPONSE_ID))) } else { Optional.empty() } } else { - tlvReader.getNull(ContextSpecificTag(TAG_RESPONSE_I_D)) + tlvReader.getNull(ContextSpecificTag(TAG_RESPONSE_ID)) null } val reply = diff --git a/src/controller/java/generated/java/matter/controller/cluster/eventstructs/MessagesClusterMessagePresentedEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/MessagesClusterMessagePresentedEvent.kt index 7ca3f028ab4b99..eb92978ebc2d27 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/eventstructs/MessagesClusterMessagePresentedEvent.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/MessagesClusterMessagePresentedEvent.kt @@ -32,17 +32,17 @@ class MessagesClusterMessagePresentedEvent(val messageID: ByteArray) { fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_MESSAGE_I_D), messageID) + put(ContextSpecificTag(TAG_MESSAGE_ID), messageID) endStructure() } } companion object { - private const val TAG_MESSAGE_I_D = 0 + private const val TAG_MESSAGE_ID = 0 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): MessagesClusterMessagePresentedEvent { tlvReader.enterStructure(tlvTag) - val messageID = tlvReader.getByteArray(ContextSpecificTag(TAG_MESSAGE_I_D)) + val messageID = tlvReader.getByteArray(ContextSpecificTag(TAG_MESSAGE_ID)) tlvReader.exitContainer() diff --git a/src/controller/java/generated/java/matter/controller/cluster/eventstructs/MessagesClusterMessageQueuedEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/MessagesClusterMessageQueuedEvent.kt index 6292136f5419a8..5f0e2b0b3c46fe 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/eventstructs/MessagesClusterMessageQueuedEvent.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/MessagesClusterMessageQueuedEvent.kt @@ -32,17 +32,17 @@ class MessagesClusterMessageQueuedEvent(val messageID: ByteArray) { fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_MESSAGE_I_D), messageID) + put(ContextSpecificTag(TAG_MESSAGE_ID), messageID) endStructure() } } companion object { - private const val TAG_MESSAGE_I_D = 0 + private const val TAG_MESSAGE_ID = 0 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): MessagesClusterMessageQueuedEvent { tlvReader.enterStructure(tlvTag) - val messageID = tlvReader.getByteArray(ContextSpecificTag(TAG_MESSAGE_I_D)) + val messageID = tlvReader.getByteArray(ContextSpecificTag(TAG_MESSAGE_ID)) tlvReader.exitContainer() diff --git a/src/controller/java/generated/java/matter/controller/cluster/eventstructs/OtaSoftwareUpdateRequestorClusterVersionAppliedEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/OtaSoftwareUpdateRequestorClusterVersionAppliedEvent.kt index 42e62ce0b2bb27..bc361f53a5b2a3 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/eventstructs/OtaSoftwareUpdateRequestorClusterVersionAppliedEvent.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/OtaSoftwareUpdateRequestorClusterVersionAppliedEvent.kt @@ -37,14 +37,14 @@ class OtaSoftwareUpdateRequestorClusterVersionAppliedEvent( tlvWriter.apply { startStructure(tlvTag) put(ContextSpecificTag(TAG_SOFTWARE_VERSION), softwareVersion) - put(ContextSpecificTag(TAG_PRODUCT_I_D), productID) + put(ContextSpecificTag(TAG_PRODUCT_ID), productID) endStructure() } } companion object { private const val TAG_SOFTWARE_VERSION = 0 - private const val TAG_PRODUCT_I_D = 1 + private const val TAG_PRODUCT_ID = 1 fun fromTlv( tlvTag: Tag, @@ -52,7 +52,7 @@ class OtaSoftwareUpdateRequestorClusterVersionAppliedEvent( ): OtaSoftwareUpdateRequestorClusterVersionAppliedEvent { tlvReader.enterStructure(tlvTag) val softwareVersion = tlvReader.getUInt(ContextSpecificTag(TAG_SOFTWARE_VERSION)) - val productID = tlvReader.getUShort(ContextSpecificTag(TAG_PRODUCT_I_D)) + val productID = tlvReader.getUShort(ContextSpecificTag(TAG_PRODUCT_ID)) tlvReader.exitContainer() diff --git a/src/controller/java/generated/java/matter/controller/cluster/eventstructs/TimeSynchronizationClusterDSTStatusEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/TimeSynchronizationClusterDSTStatusEvent.kt index 1f92e4003e280a..53a976552ca1a1 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/eventstructs/TimeSynchronizationClusterDSTStatusEvent.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/TimeSynchronizationClusterDSTStatusEvent.kt @@ -32,17 +32,17 @@ class TimeSynchronizationClusterDSTStatusEvent(val DSTOffsetActive: Boolean) { fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_D_S_T_OFFSET_ACTIVE), DSTOffsetActive) + put(ContextSpecificTag(TAG_DST_OFFSET_ACTIVE), DSTOffsetActive) endStructure() } } companion object { - private const val TAG_D_S_T_OFFSET_ACTIVE = 0 + private const val TAG_DST_OFFSET_ACTIVE = 0 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): TimeSynchronizationClusterDSTStatusEvent { tlvReader.enterStructure(tlvTag) - val DSTOffsetActive = tlvReader.getBoolean(ContextSpecificTag(TAG_D_S_T_OFFSET_ACTIVE)) + val DSTOffsetActive = tlvReader.getBoolean(ContextSpecificTag(TAG_DST_OFFSET_ACTIVE)) tlvReader.exitContainer() diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/ActionsClusterActionStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ActionsClusterActionStruct.kt index bf3650489d0cd4..080da76540c4a6 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/structs/ActionsClusterActionStruct.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ActionsClusterActionStruct.kt @@ -44,10 +44,10 @@ class ActionsClusterActionStruct( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_ACTION_I_D), actionID) + put(ContextSpecificTag(TAG_ACTION_ID), actionID) put(ContextSpecificTag(TAG_NAME), name) put(ContextSpecificTag(TAG_TYPE), type) - put(ContextSpecificTag(TAG_ENDPOINT_LIST_I_D), endpointListID) + put(ContextSpecificTag(TAG_ENDPOINT_LIST_ID), endpointListID) put(ContextSpecificTag(TAG_SUPPORTED_COMMANDS), supportedCommands) put(ContextSpecificTag(TAG_STATE), state) endStructure() @@ -55,19 +55,19 @@ class ActionsClusterActionStruct( } companion object { - private const val TAG_ACTION_I_D = 0 + private const val TAG_ACTION_ID = 0 private const val TAG_NAME = 1 private const val TAG_TYPE = 2 - private const val TAG_ENDPOINT_LIST_I_D = 3 + private const val TAG_ENDPOINT_LIST_ID = 3 private const val TAG_SUPPORTED_COMMANDS = 4 private const val TAG_STATE = 5 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ActionsClusterActionStruct { tlvReader.enterStructure(tlvTag) - val actionID = tlvReader.getUShort(ContextSpecificTag(TAG_ACTION_I_D)) + val actionID = tlvReader.getUShort(ContextSpecificTag(TAG_ACTION_ID)) val name = tlvReader.getString(ContextSpecificTag(TAG_NAME)) val type = tlvReader.getUByte(ContextSpecificTag(TAG_TYPE)) - val endpointListID = tlvReader.getUShort(ContextSpecificTag(TAG_ENDPOINT_LIST_I_D)) + val endpointListID = tlvReader.getUShort(ContextSpecificTag(TAG_ENDPOINT_LIST_ID)) val supportedCommands = tlvReader.getUShort(ContextSpecificTag(TAG_SUPPORTED_COMMANDS)) val state = tlvReader.getUByte(ContextSpecificTag(TAG_STATE)) diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/ActionsClusterEndpointListStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ActionsClusterEndpointListStruct.kt index ce70c5b1ea7878..3c4603e164076d 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/structs/ActionsClusterEndpointListStruct.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ActionsClusterEndpointListStruct.kt @@ -41,7 +41,7 @@ class ActionsClusterEndpointListStruct( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_ENDPOINT_LIST_I_D), endpointListID) + put(ContextSpecificTag(TAG_ENDPOINT_LIST_ID), endpointListID) put(ContextSpecificTag(TAG_NAME), name) put(ContextSpecificTag(TAG_TYPE), type) startArray(ContextSpecificTag(TAG_ENDPOINTS)) @@ -54,14 +54,14 @@ class ActionsClusterEndpointListStruct( } companion object { - private const val TAG_ENDPOINT_LIST_I_D = 0 + private const val TAG_ENDPOINT_LIST_ID = 0 private const val TAG_NAME = 1 private const val TAG_TYPE = 2 private const val TAG_ENDPOINTS = 3 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ActionsClusterEndpointListStruct { tlvReader.enterStructure(tlvTag) - val endpointListID = tlvReader.getUShort(ContextSpecificTag(TAG_ENDPOINT_LIST_I_D)) + val endpointListID = tlvReader.getUShort(ContextSpecificTag(TAG_ENDPOINT_LIST_ID)) val name = tlvReader.getString(ContextSpecificTag(TAG_NAME)) val type = tlvReader.getUByte(ContextSpecificTag(TAG_TYPE)) val endpoints = diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/ApplicationBasicClusterApplicationStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ApplicationBasicClusterApplicationStruct.kt index 603c99e96d754e..be4a1e7984e307 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/structs/ApplicationBasicClusterApplicationStruct.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ApplicationBasicClusterApplicationStruct.kt @@ -36,20 +36,20 @@ class ApplicationBasicClusterApplicationStruct( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_CATALOG_VENDOR_I_D), catalogVendorID) - put(ContextSpecificTag(TAG_APPLICATION_I_D), applicationID) + put(ContextSpecificTag(TAG_CATALOG_VENDOR_ID), catalogVendorID) + put(ContextSpecificTag(TAG_APPLICATION_ID), applicationID) endStructure() } } companion object { - private const val TAG_CATALOG_VENDOR_I_D = 0 - private const val TAG_APPLICATION_I_D = 1 + private const val TAG_CATALOG_VENDOR_ID = 0 + private const val TAG_APPLICATION_ID = 1 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ApplicationBasicClusterApplicationStruct { tlvReader.enterStructure(tlvTag) - val catalogVendorID = tlvReader.getUShort(ContextSpecificTag(TAG_CATALOG_VENDOR_I_D)) - val applicationID = tlvReader.getString(ContextSpecificTag(TAG_APPLICATION_I_D)) + val catalogVendorID = tlvReader.getUShort(ContextSpecificTag(TAG_CATALOG_VENDOR_ID)) + val applicationID = tlvReader.getString(ContextSpecificTag(TAG_APPLICATION_ID)) tlvReader.exitContainer() diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/ApplicationLauncherClusterApplicationStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ApplicationLauncherClusterApplicationStruct.kt index 8827b46c04e4bb..ea921ee690d16c 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/structs/ApplicationLauncherClusterApplicationStruct.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ApplicationLauncherClusterApplicationStruct.kt @@ -36,20 +36,20 @@ class ApplicationLauncherClusterApplicationStruct( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_CATALOG_VENDOR_I_D), catalogVendorID) - put(ContextSpecificTag(TAG_APPLICATION_I_D), applicationID) + put(ContextSpecificTag(TAG_CATALOG_VENDOR_ID), catalogVendorID) + put(ContextSpecificTag(TAG_APPLICATION_ID), applicationID) endStructure() } } companion object { - private const val TAG_CATALOG_VENDOR_I_D = 0 - private const val TAG_APPLICATION_I_D = 1 + private const val TAG_CATALOG_VENDOR_ID = 0 + private const val TAG_APPLICATION_ID = 1 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ApplicationLauncherClusterApplicationStruct { tlvReader.enterStructure(tlvTag) - val catalogVendorID = tlvReader.getUShort(ContextSpecificTag(TAG_CATALOG_VENDOR_I_D)) - val applicationID = tlvReader.getString(ContextSpecificTag(TAG_APPLICATION_I_D)) + val catalogVendorID = tlvReader.getUShort(ContextSpecificTag(TAG_CATALOG_VENDOR_ID)) + val applicationID = tlvReader.getString(ContextSpecificTag(TAG_APPLICATION_ID)) tlvReader.exitContainer() diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/ChannelClusterProgramStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ChannelClusterProgramStruct.kt index 243e78b0a56087..c8dfd42de67a1c 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/structs/ChannelClusterProgramStruct.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ChannelClusterProgramStruct.kt @@ -151,7 +151,7 @@ class ChannelClusterProgramStruct( } if (externalIDList.isPresent) { val optexternalIDList = externalIDList.get() - startArray(ContextSpecificTag(TAG_EXTERNAL_I_D_LIST)) + startArray(ContextSpecificTag(TAG_EXTERNAL_ID_LIST)) for (item in optexternalIDList.iterator()) { item.toTlv(AnonymousTag, this) } @@ -180,7 +180,7 @@ class ChannelClusterProgramStruct( private const val TAG_SERIES_INFO = 15 private const val TAG_CATEGORY_LIST = 16 private const val TAG_CAST_LIST = 17 - private const val TAG_EXTERNAL_I_D_LIST = 18 + private const val TAG_EXTERNAL_ID_LIST = 18 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ChannelClusterProgramStruct { tlvReader.enterStructure(tlvTag) @@ -308,10 +308,10 @@ class ChannelClusterProgramStruct( Optional.empty() } val externalIDList = - if (tlvReader.isNextTag(ContextSpecificTag(TAG_EXTERNAL_I_D_LIST))) { + if (tlvReader.isNextTag(ContextSpecificTag(TAG_EXTERNAL_ID_LIST))) { Optional.of( buildList { - tlvReader.enterArray(ContextSpecificTag(TAG_EXTERNAL_I_D_LIST)) + tlvReader.enterArray(ContextSpecificTag(TAG_EXTERNAL_ID_LIST)) while (!tlvReader.isEndOfContainer()) { add(ChannelClusterProgramCastStruct.fromTlv(AnonymousTag, tlvReader)) } diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/ContentLauncherClusterParameterStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ContentLauncherClusterParameterStruct.kt index 6d94bd649275bb..1785ef89c54840 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/structs/ContentLauncherClusterParameterStruct.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ContentLauncherClusterParameterStruct.kt @@ -44,7 +44,7 @@ class ContentLauncherClusterParameterStruct( put(ContextSpecificTag(TAG_VALUE), value) if (externalIDList.isPresent) { val optexternalIDList = externalIDList.get() - startArray(ContextSpecificTag(TAG_EXTERNAL_I_D_LIST)) + startArray(ContextSpecificTag(TAG_EXTERNAL_ID_LIST)) for (item in optexternalIDList.iterator()) { item.toTlv(AnonymousTag, this) } @@ -57,17 +57,17 @@ class ContentLauncherClusterParameterStruct( companion object { private const val TAG_TYPE = 0 private const val TAG_VALUE = 1 - private const val TAG_EXTERNAL_I_D_LIST = 2 + private const val TAG_EXTERNAL_ID_LIST = 2 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ContentLauncherClusterParameterStruct { tlvReader.enterStructure(tlvTag) val type = tlvReader.getUByte(ContextSpecificTag(TAG_TYPE)) val value = tlvReader.getString(ContextSpecificTag(TAG_VALUE)) val externalIDList = - if (tlvReader.isNextTag(ContextSpecificTag(TAG_EXTERNAL_I_D_LIST))) { + if (tlvReader.isNextTag(ContextSpecificTag(TAG_EXTERNAL_ID_LIST))) { Optional.of( buildList { - tlvReader.enterArray(ContextSpecificTag(TAG_EXTERNAL_I_D_LIST)) + tlvReader.enterArray(ContextSpecificTag(TAG_EXTERNAL_ID_LIST)) while (!tlvReader.isEndOfContainer()) { add(ContentLauncherClusterAdditionalInfoStruct.fromTlv(AnonymousTag, tlvReader)) } diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/ContentLauncherClusterStyleInformationStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ContentLauncherClusterStyleInformationStruct.kt index be5d5dd35f25b9..b1a5ea8bfe0a70 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/structs/ContentLauncherClusterStyleInformationStruct.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ContentLauncherClusterStyleInformationStruct.kt @@ -41,7 +41,7 @@ class ContentLauncherClusterStyleInformationStruct( startStructure(tlvTag) if (imageURL.isPresent) { val optimageURL = imageURL.get() - put(ContextSpecificTag(TAG_IMAGE_U_R_L), optimageURL) + put(ContextSpecificTag(TAG_IMAGE_URL), optimageURL) } if (color.isPresent) { val optcolor = color.get() @@ -56,15 +56,15 @@ class ContentLauncherClusterStyleInformationStruct( } companion object { - private const val TAG_IMAGE_U_R_L = 0 + private const val TAG_IMAGE_URL = 0 private const val TAG_COLOR = 1 private const val TAG_SIZE = 2 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ContentLauncherClusterStyleInformationStruct { tlvReader.enterStructure(tlvTag) val imageURL = - if (tlvReader.isNextTag(ContextSpecificTag(TAG_IMAGE_U_R_L))) { - Optional.of(tlvReader.getString(ContextSpecificTag(TAG_IMAGE_U_R_L))) + if (tlvReader.isNextTag(ContextSpecificTag(TAG_IMAGE_URL))) { + Optional.of(tlvReader.getString(ContextSpecificTag(TAG_IMAGE_URL))) } else { Optional.empty() } diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/DemandResponseLoadControlClusterLoadControlEventStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/DemandResponseLoadControlClusterLoadControlEventStruct.kt index 83fb56f785729e..e17da92ffddf7e 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/structs/DemandResponseLoadControlClusterLoadControlEventStruct.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/DemandResponseLoadControlClusterLoadControlEventStruct.kt @@ -50,11 +50,11 @@ class DemandResponseLoadControlClusterLoadControlEventStruct( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_EVENT_I_D), eventID) + put(ContextSpecificTag(TAG_EVENT_ID), eventID) if (programID != null) { - put(ContextSpecificTag(TAG_PROGRAM_I_D), programID) + put(ContextSpecificTag(TAG_PROGRAM_ID), programID) } else { - putNull(ContextSpecificTag(TAG_PROGRAM_I_D)) + putNull(ContextSpecificTag(TAG_PROGRAM_ID)) } put(ContextSpecificTag(TAG_CONTROL), control) put(ContextSpecificTag(TAG_DEVICE_CLASS), deviceClass) @@ -78,8 +78,8 @@ class DemandResponseLoadControlClusterLoadControlEventStruct( } companion object { - private const val TAG_EVENT_I_D = 0 - private const val TAG_PROGRAM_I_D = 1 + private const val TAG_EVENT_ID = 0 + private const val TAG_PROGRAM_ID = 1 private const val TAG_CONTROL = 2 private const val TAG_DEVICE_CLASS = 3 private const val TAG_ENROLLMENT_GROUP = 4 @@ -92,12 +92,12 @@ class DemandResponseLoadControlClusterLoadControlEventStruct( tlvReader: TlvReader, ): DemandResponseLoadControlClusterLoadControlEventStruct { tlvReader.enterStructure(tlvTag) - val eventID = tlvReader.getByteArray(ContextSpecificTag(TAG_EVENT_I_D)) + val eventID = tlvReader.getByteArray(ContextSpecificTag(TAG_EVENT_ID)) val programID = if (!tlvReader.isNull()) { - tlvReader.getByteArray(ContextSpecificTag(TAG_PROGRAM_I_D)) + tlvReader.getByteArray(ContextSpecificTag(TAG_PROGRAM_ID)) } else { - tlvReader.getNull(ContextSpecificTag(TAG_PROGRAM_I_D)) + tlvReader.getNull(ContextSpecificTag(TAG_PROGRAM_ID)) null } val control = tlvReader.getUShort(ContextSpecificTag(TAG_CONTROL)) diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/DemandResponseLoadControlClusterLoadControlProgramStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/DemandResponseLoadControlClusterLoadControlProgramStruct.kt index 7e73951b402727..e22ed84158307e 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/structs/DemandResponseLoadControlClusterLoadControlProgramStruct.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/DemandResponseLoadControlClusterLoadControlProgramStruct.kt @@ -42,7 +42,7 @@ class DemandResponseLoadControlClusterLoadControlProgramStruct( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_PROGRAM_I_D), programID) + put(ContextSpecificTag(TAG_PROGRAM_ID), programID) put(ContextSpecificTag(TAG_NAME), name) if (enrollmentGroup != null) { put(ContextSpecificTag(TAG_ENROLLMENT_GROUP), enrollmentGroup) @@ -64,7 +64,7 @@ class DemandResponseLoadControlClusterLoadControlProgramStruct( } companion object { - private const val TAG_PROGRAM_I_D = 0 + private const val TAG_PROGRAM_ID = 0 private const val TAG_NAME = 1 private const val TAG_ENROLLMENT_GROUP = 2 private const val TAG_RANDOM_START_MINUTES = 3 @@ -75,7 +75,7 @@ class DemandResponseLoadControlClusterLoadControlProgramStruct( tlvReader: TlvReader, ): DemandResponseLoadControlClusterLoadControlProgramStruct { tlvReader.enterStructure(tlvTag) - val programID = tlvReader.getByteArray(ContextSpecificTag(TAG_PROGRAM_I_D)) + val programID = tlvReader.getByteArray(ContextSpecificTag(TAG_PROGRAM_ID)) val name = tlvReader.getString(ContextSpecificTag(TAG_NAME)) val enrollmentGroup = if (!tlvReader.isNull()) { diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/DescriptorClusterSemanticTagStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/DescriptorClusterSemanticTagStruct.kt index 358cf48bbbbb13..f0206f14fa26cc 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/structs/DescriptorClusterSemanticTagStruct.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/DescriptorClusterSemanticTagStruct.kt @@ -46,7 +46,7 @@ class DescriptorClusterSemanticTagStruct( } else { putNull(ContextSpecificTag(TAG_MFG_CODE)) } - put(ContextSpecificTag(TAG_NAMESPACE_I_D), namespaceID) + put(ContextSpecificTag(TAG_NAMESPACE_ID), namespaceID) put(ContextSpecificTag(TAG_TAG), tag) if (label != null) { if (label.isPresent) { @@ -62,7 +62,7 @@ class DescriptorClusterSemanticTagStruct( companion object { private const val TAG_MFG_CODE = 0 - private const val TAG_NAMESPACE_I_D = 1 + private const val TAG_NAMESPACE_ID = 1 private const val TAG_TAG = 2 private const val TAG_LABEL = 3 @@ -75,7 +75,7 @@ class DescriptorClusterSemanticTagStruct( tlvReader.getNull(ContextSpecificTag(TAG_MFG_CODE)) null } - val namespaceID = tlvReader.getUByte(ContextSpecificTag(TAG_NAMESPACE_I_D)) + val namespaceID = tlvReader.getUByte(ContextSpecificTag(TAG_NAMESPACE_ID)) val tag = tlvReader.getUByte(ContextSpecificTag(TAG_TAG)) val label = if (!tlvReader.isNull()) { diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/DeviceEnergyManagementClusterForecastStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/DeviceEnergyManagementClusterForecastStruct.kt index f58179f523f7bd..d10b032374dade 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/structs/DeviceEnergyManagementClusterForecastStruct.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/DeviceEnergyManagementClusterForecastStruct.kt @@ -52,7 +52,7 @@ class DeviceEnergyManagementClusterForecastStruct( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_FORECAST_I_D), forecastID) + put(ContextSpecificTag(TAG_FORECAST_ID), forecastID) if (activeSlotNumber != null) { put(ContextSpecificTag(TAG_ACTIVE_SLOT_NUMBER), activeSlotNumber) } else { @@ -84,7 +84,7 @@ class DeviceEnergyManagementClusterForecastStruct( } companion object { - private const val TAG_FORECAST_I_D = 0 + private const val TAG_FORECAST_ID = 0 private const val TAG_ACTIVE_SLOT_NUMBER = 1 private const val TAG_START_TIME = 2 private const val TAG_END_TIME = 3 @@ -96,7 +96,7 @@ class DeviceEnergyManagementClusterForecastStruct( fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): DeviceEnergyManagementClusterForecastStruct { tlvReader.enterStructure(tlvTag) - val forecastID = tlvReader.getUInt(ContextSpecificTag(TAG_FORECAST_I_D)) + val forecastID = tlvReader.getUInt(ContextSpecificTag(TAG_FORECAST_ID)) val activeSlotNumber = if (!tlvReader.isNull()) { tlvReader.getUShort(ContextSpecificTag(TAG_ACTIVE_SLOT_NUMBER)) diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/DeviceEnergyManagementClusterSlotStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/DeviceEnergyManagementClusterSlotStruct.kt index 794aef83e5158e..d1babaf255c322 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/structs/DeviceEnergyManagementClusterSlotStruct.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/DeviceEnergyManagementClusterSlotStruct.kt @@ -89,7 +89,7 @@ class DeviceEnergyManagementClusterSlotStruct( } if (manufacturerESAState.isPresent) { val optmanufacturerESAState = manufacturerESAState.get() - put(ContextSpecificTag(TAG_MANUFACTURER_E_S_A_STATE), optmanufacturerESAState) + put(ContextSpecificTag(TAG_MANUFACTURER_ESA_STATE), optmanufacturerESAState) } if (nominalPower.isPresent) { val optnominalPower = nominalPower.get() @@ -144,7 +144,7 @@ class DeviceEnergyManagementClusterSlotStruct( private const val TAG_SLOT_IS_PAUSABLE = 5 private const val TAG_MIN_PAUSE_DURATION = 6 private const val TAG_MAX_PAUSE_DURATION = 7 - private const val TAG_MANUFACTURER_E_S_A_STATE = 8 + private const val TAG_MANUFACTURER_ESA_STATE = 8 private const val TAG_NOMINAL_POWER = 9 private const val TAG_MIN_POWER = 10 private const val TAG_MAX_POWER = 11 @@ -181,8 +181,8 @@ class DeviceEnergyManagementClusterSlotStruct( Optional.empty() } val manufacturerESAState = - if (tlvReader.isNextTag(ContextSpecificTag(TAG_MANUFACTURER_E_S_A_STATE))) { - Optional.of(tlvReader.getUShort(ContextSpecificTag(TAG_MANUFACTURER_E_S_A_STATE))) + if (tlvReader.isNextTag(ContextSpecificTag(TAG_MANUFACTURER_ESA_STATE))) { + Optional.of(tlvReader.getUShort(ContextSpecificTag(TAG_MANUFACTURER_ESA_STATE))) } else { Optional.empty() } diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/EcosystemInformationClusterEcosystemLocationStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/EcosystemInformationClusterEcosystemLocationStruct.kt index 5d44434897197d..f59492e6195cfd 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/structs/EcosystemInformationClusterEcosystemLocationStruct.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/EcosystemInformationClusterEcosystemLocationStruct.kt @@ -40,7 +40,7 @@ class EcosystemInformationClusterEcosystemLocationStruct( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_UNIQUE_LOCATION_I_D), uniqueLocationID) + put(ContextSpecificTag(TAG_UNIQUE_LOCATION_ID), uniqueLocationID) locationDescriptor.toTlv(ContextSpecificTag(TAG_LOCATION_DESCRIPTOR), this) put(ContextSpecificTag(TAG_LOCATION_DESCRIPTOR_LAST_EDIT), locationDescriptorLastEdit) put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex) @@ -49,7 +49,7 @@ class EcosystemInformationClusterEcosystemLocationStruct( } companion object { - private const val TAG_UNIQUE_LOCATION_I_D = 0 + private const val TAG_UNIQUE_LOCATION_ID = 0 private const val TAG_LOCATION_DESCRIPTOR = 1 private const val TAG_LOCATION_DESCRIPTOR_LAST_EDIT = 2 private const val TAG_FABRIC_INDEX = 254 @@ -59,7 +59,7 @@ class EcosystemInformationClusterEcosystemLocationStruct( tlvReader: TlvReader, ): EcosystemInformationClusterEcosystemLocationStruct { tlvReader.enterStructure(tlvTag) - val uniqueLocationID = tlvReader.getString(ContextSpecificTag(TAG_UNIQUE_LOCATION_I_D)) + val uniqueLocationID = tlvReader.getString(ContextSpecificTag(TAG_UNIQUE_LOCATION_ID)) val locationDescriptor = EcosystemInformationClusterLocationDescriptorStruct.fromTlv( ContextSpecificTag(TAG_LOCATION_DESCRIPTOR), diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/GroupKeyManagementClusterGroupKeyMapStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/GroupKeyManagementClusterGroupKeyMapStruct.kt index fae021994f551c..ad1823e569c56e 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/structs/GroupKeyManagementClusterGroupKeyMapStruct.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/GroupKeyManagementClusterGroupKeyMapStruct.kt @@ -39,7 +39,7 @@ class GroupKeyManagementClusterGroupKeyMapStruct( tlvWriter.apply { startStructure(tlvTag) put(ContextSpecificTag(TAG_GROUP_ID), groupId) - put(ContextSpecificTag(TAG_GROUP_KEY_SET_I_D), groupKeySetID) + put(ContextSpecificTag(TAG_GROUP_KEY_SET_ID), groupKeySetID) put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex) endStructure() } @@ -47,13 +47,13 @@ class GroupKeyManagementClusterGroupKeyMapStruct( companion object { private const val TAG_GROUP_ID = 1 - private const val TAG_GROUP_KEY_SET_I_D = 2 + private const val TAG_GROUP_KEY_SET_ID = 2 private const val TAG_FABRIC_INDEX = 254 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): GroupKeyManagementClusterGroupKeyMapStruct { tlvReader.enterStructure(tlvTag) val groupId = tlvReader.getUShort(ContextSpecificTag(TAG_GROUP_ID)) - val groupKeySetID = tlvReader.getUShort(ContextSpecificTag(TAG_GROUP_KEY_SET_I_D)) + val groupKeySetID = tlvReader.getUShort(ContextSpecificTag(TAG_GROUP_KEY_SET_ID)) val fabricIndex = tlvReader.getUByte(ContextSpecificTag(TAG_FABRIC_INDEX)) tlvReader.exitContainer() diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/GroupKeyManagementClusterGroupKeySetStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/GroupKeyManagementClusterGroupKeySetStruct.kt index 9443c0f6f80abb..1419d29377c27a 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/structs/GroupKeyManagementClusterGroupKeySetStruct.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/GroupKeyManagementClusterGroupKeySetStruct.kt @@ -48,7 +48,7 @@ class GroupKeyManagementClusterGroupKeySetStruct( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_GROUP_KEY_SET_I_D), groupKeySetID) + put(ContextSpecificTag(TAG_GROUP_KEY_SET_ID), groupKeySetID) put(ContextSpecificTag(TAG_GROUP_KEY_SECURITY_POLICY), groupKeySecurityPolicy) if (epochKey0 != null) { put(ContextSpecificTag(TAG_EPOCH_KEY0), epochKey0) @@ -85,7 +85,7 @@ class GroupKeyManagementClusterGroupKeySetStruct( } companion object { - private const val TAG_GROUP_KEY_SET_I_D = 0 + private const val TAG_GROUP_KEY_SET_ID = 0 private const val TAG_GROUP_KEY_SECURITY_POLICY = 1 private const val TAG_EPOCH_KEY0 = 2 private const val TAG_EPOCH_START_TIME0 = 3 @@ -96,7 +96,7 @@ class GroupKeyManagementClusterGroupKeySetStruct( fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): GroupKeyManagementClusterGroupKeySetStruct { tlvReader.enterStructure(tlvTag) - val groupKeySetID = tlvReader.getUShort(ContextSpecificTag(TAG_GROUP_KEY_SET_I_D)) + val groupKeySetID = tlvReader.getUShort(ContextSpecificTag(TAG_GROUP_KEY_SET_ID)) val groupKeySecurityPolicy = tlvReader.getUByte(ContextSpecificTag(TAG_GROUP_KEY_SECURITY_POLICY)) val epochKey0 = diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/IcdManagementClusterMonitoringRegistrationStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/IcdManagementClusterMonitoringRegistrationStruct.kt index fbf95fd9f40918..478ce9f25c4cd6 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/structs/IcdManagementClusterMonitoringRegistrationStruct.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/IcdManagementClusterMonitoringRegistrationStruct.kt @@ -40,7 +40,7 @@ class IcdManagementClusterMonitoringRegistrationStruct( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_CHECK_IN_NODE_I_D), checkInNodeID) + put(ContextSpecificTag(TAG_CHECK_IN_NODE_ID), checkInNodeID) put(ContextSpecificTag(TAG_MONITORED_SUBJECT), monitoredSubject) put(ContextSpecificTag(TAG_CLIENT_TYPE), clientType) put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex) @@ -49,7 +49,7 @@ class IcdManagementClusterMonitoringRegistrationStruct( } companion object { - private const val TAG_CHECK_IN_NODE_I_D = 1 + private const val TAG_CHECK_IN_NODE_ID = 1 private const val TAG_MONITORED_SUBJECT = 2 private const val TAG_CLIENT_TYPE = 4 private const val TAG_FABRIC_INDEX = 254 @@ -59,7 +59,7 @@ class IcdManagementClusterMonitoringRegistrationStruct( tlvReader: TlvReader, ): IcdManagementClusterMonitoringRegistrationStruct { tlvReader.enterStructure(tlvTag) - val checkInNodeID = tlvReader.getULong(ContextSpecificTag(TAG_CHECK_IN_NODE_I_D)) + val checkInNodeID = tlvReader.getULong(ContextSpecificTag(TAG_CHECK_IN_NODE_ID)) val monitoredSubject = tlvReader.getULong(ContextSpecificTag(TAG_MONITORED_SUBJECT)) val clientType = tlvReader.getUByte(ContextSpecificTag(TAG_CLIENT_TYPE)) val fabricIndex = tlvReader.getUByte(ContextSpecificTag(TAG_FABRIC_INDEX)) diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/MessagesClusterMessageResponseOptionStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/MessagesClusterMessageResponseOptionStruct.kt index ed263ece2ddd42..7240826c29fe10 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/structs/MessagesClusterMessageResponseOptionStruct.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/MessagesClusterMessageResponseOptionStruct.kt @@ -39,7 +39,7 @@ class MessagesClusterMessageResponseOptionStruct( startStructure(tlvTag) if (messageResponseID.isPresent) { val optmessageResponseID = messageResponseID.get() - put(ContextSpecificTag(TAG_MESSAGE_RESPONSE_I_D), optmessageResponseID) + put(ContextSpecificTag(TAG_MESSAGE_RESPONSE_ID), optmessageResponseID) } if (label.isPresent) { val optlabel = label.get() @@ -50,14 +50,14 @@ class MessagesClusterMessageResponseOptionStruct( } companion object { - private const val TAG_MESSAGE_RESPONSE_I_D = 0 + private const val TAG_MESSAGE_RESPONSE_ID = 0 private const val TAG_LABEL = 1 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): MessagesClusterMessageResponseOptionStruct { tlvReader.enterStructure(tlvTag) val messageResponseID = - if (tlvReader.isNextTag(ContextSpecificTag(TAG_MESSAGE_RESPONSE_I_D))) { - Optional.of(tlvReader.getUInt(ContextSpecificTag(TAG_MESSAGE_RESPONSE_I_D))) + if (tlvReader.isNextTag(ContextSpecificTag(TAG_MESSAGE_RESPONSE_ID))) { + Optional.of(tlvReader.getUInt(ContextSpecificTag(TAG_MESSAGE_RESPONSE_ID))) } else { Optional.empty() } diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/MessagesClusterMessageStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/MessagesClusterMessageStruct.kt index 90990310f0ff9d..ff033fa133550b 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/structs/MessagesClusterMessageStruct.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/MessagesClusterMessageStruct.kt @@ -48,7 +48,7 @@ class MessagesClusterMessageStruct( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_MESSAGE_I_D), messageID) + put(ContextSpecificTag(TAG_MESSAGE_ID), messageID) put(ContextSpecificTag(TAG_PRIORITY), priority) put(ContextSpecificTag(TAG_MESSAGE_CONTROL), messageControl) if (startTime != null) { @@ -75,7 +75,7 @@ class MessagesClusterMessageStruct( } companion object { - private const val TAG_MESSAGE_I_D = 0 + private const val TAG_MESSAGE_ID = 0 private const val TAG_PRIORITY = 1 private const val TAG_MESSAGE_CONTROL = 2 private const val TAG_START_TIME = 3 @@ -85,7 +85,7 @@ class MessagesClusterMessageStruct( fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): MessagesClusterMessageStruct { tlvReader.enterStructure(tlvTag) - val messageID = tlvReader.getByteArray(ContextSpecificTag(TAG_MESSAGE_I_D)) + val messageID = tlvReader.getByteArray(ContextSpecificTag(TAG_MESSAGE_ID)) val priority = tlvReader.getUByte(ContextSpecificTag(TAG_PRIORITY)) val messageControl = tlvReader.getUByte(ContextSpecificTag(TAG_MESSAGE_CONTROL)) val startTime = diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/NetworkCommissioningClusterNetworkInfoStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/NetworkCommissioningClusterNetworkInfoStruct.kt index 7a8718ff52de5e..e7503f37514dc7 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/structs/NetworkCommissioningClusterNetworkInfoStruct.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/NetworkCommissioningClusterNetworkInfoStruct.kt @@ -41,7 +41,7 @@ class NetworkCommissioningClusterNetworkInfoStruct( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_NETWORK_I_D), networkID) + put(ContextSpecificTag(TAG_NETWORK_ID), networkID) put(ContextSpecificTag(TAG_CONNECTED), connected) if (networkIdentifier != null) { if (networkIdentifier.isPresent) { @@ -64,14 +64,14 @@ class NetworkCommissioningClusterNetworkInfoStruct( } companion object { - private const val TAG_NETWORK_I_D = 0 + private const val TAG_NETWORK_ID = 0 private const val TAG_CONNECTED = 1 private const val TAG_NETWORK_IDENTIFIER = 2 private const val TAG_CLIENT_IDENTIFIER = 3 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): NetworkCommissioningClusterNetworkInfoStruct { tlvReader.enterStructure(tlvTag) - val networkID = tlvReader.getByteArray(ContextSpecificTag(TAG_NETWORK_I_D)) + val networkID = tlvReader.getByteArray(ContextSpecificTag(TAG_NETWORK_ID)) val connected = tlvReader.getBoolean(ContextSpecificTag(TAG_CONNECTED)) val networkIdentifier = if (!tlvReader.isNull()) { diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/OperationalCredentialsClusterFabricDescriptorStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/OperationalCredentialsClusterFabricDescriptorStruct.kt index 66c28dc3e1752c..6fad97097ca764 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/structs/OperationalCredentialsClusterFabricDescriptorStruct.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/OperationalCredentialsClusterFabricDescriptorStruct.kt @@ -45,9 +45,9 @@ class OperationalCredentialsClusterFabricDescriptorStruct( tlvWriter.apply { startStructure(tlvTag) put(ContextSpecificTag(TAG_ROOT_PUBLIC_KEY), rootPublicKey) - put(ContextSpecificTag(TAG_VENDOR_I_D), vendorID) - put(ContextSpecificTag(TAG_FABRIC_I_D), fabricID) - put(ContextSpecificTag(TAG_NODE_I_D), nodeID) + put(ContextSpecificTag(TAG_VENDOR_ID), vendorID) + put(ContextSpecificTag(TAG_FABRIC_ID), fabricID) + put(ContextSpecificTag(TAG_NODE_ID), nodeID) put(ContextSpecificTag(TAG_LABEL), label) put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex) endStructure() @@ -56,9 +56,9 @@ class OperationalCredentialsClusterFabricDescriptorStruct( companion object { private const val TAG_ROOT_PUBLIC_KEY = 1 - private const val TAG_VENDOR_I_D = 2 - private const val TAG_FABRIC_I_D = 3 - private const val TAG_NODE_I_D = 4 + private const val TAG_VENDOR_ID = 2 + private const val TAG_FABRIC_ID = 3 + private const val TAG_NODE_ID = 4 private const val TAG_LABEL = 5 private const val TAG_FABRIC_INDEX = 254 @@ -68,9 +68,9 @@ class OperationalCredentialsClusterFabricDescriptorStruct( ): OperationalCredentialsClusterFabricDescriptorStruct { tlvReader.enterStructure(tlvTag) val rootPublicKey = tlvReader.getByteArray(ContextSpecificTag(TAG_ROOT_PUBLIC_KEY)) - val vendorID = tlvReader.getUShort(ContextSpecificTag(TAG_VENDOR_I_D)) - val fabricID = tlvReader.getULong(ContextSpecificTag(TAG_FABRIC_I_D)) - val nodeID = tlvReader.getULong(ContextSpecificTag(TAG_NODE_I_D)) + val vendorID = tlvReader.getUShort(ContextSpecificTag(TAG_VENDOR_ID)) + val fabricID = tlvReader.getULong(ContextSpecificTag(TAG_FABRIC_ID)) + val nodeID = tlvReader.getULong(ContextSpecificTag(TAG_NODE_ID)) val label = tlvReader.getString(ContextSpecificTag(TAG_LABEL)) val fabricIndex = tlvReader.getUByte(ContextSpecificTag(TAG_FABRIC_INDEX)) diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/OperationalStateClusterErrorStateStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/OperationalStateClusterErrorStateStruct.kt index 94eb1ac4612a23..bea86d884fdc49 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/structs/OperationalStateClusterErrorStateStruct.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/OperationalStateClusterErrorStateStruct.kt @@ -39,7 +39,7 @@ class OperationalStateClusterErrorStateStruct( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_ERROR_STATE_I_D), errorStateID) + put(ContextSpecificTag(TAG_ERROR_STATE_ID), errorStateID) if (errorStateLabel.isPresent) { val opterrorStateLabel = errorStateLabel.get() put(ContextSpecificTag(TAG_ERROR_STATE_LABEL), opterrorStateLabel) @@ -53,13 +53,13 @@ class OperationalStateClusterErrorStateStruct( } companion object { - private const val TAG_ERROR_STATE_I_D = 0 + private const val TAG_ERROR_STATE_ID = 0 private const val TAG_ERROR_STATE_LABEL = 1 private const val TAG_ERROR_STATE_DETAILS = 2 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): OperationalStateClusterErrorStateStruct { tlvReader.enterStructure(tlvTag) - val errorStateID = tlvReader.getUByte(ContextSpecificTag(TAG_ERROR_STATE_I_D)) + val errorStateID = tlvReader.getUByte(ContextSpecificTag(TAG_ERROR_STATE_ID)) val errorStateLabel = if (tlvReader.isNextTag(ContextSpecificTag(TAG_ERROR_STATE_LABEL))) { Optional.of(tlvReader.getString(ContextSpecificTag(TAG_ERROR_STATE_LABEL))) diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/OperationalStateClusterOperationalStateStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/OperationalStateClusterOperationalStateStruct.kt index 22ba9ba6e8afdf..7626d4a76910f8 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/structs/OperationalStateClusterOperationalStateStruct.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/OperationalStateClusterOperationalStateStruct.kt @@ -37,7 +37,7 @@ class OperationalStateClusterOperationalStateStruct( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_OPERATIONAL_STATE_I_D), operationalStateID) + put(ContextSpecificTag(TAG_OPERATIONAL_STATE_ID), operationalStateID) if (operationalStateLabel.isPresent) { val optoperationalStateLabel = operationalStateLabel.get() put(ContextSpecificTag(TAG_OPERATIONAL_STATE_LABEL), optoperationalStateLabel) @@ -47,12 +47,12 @@ class OperationalStateClusterOperationalStateStruct( } companion object { - private const val TAG_OPERATIONAL_STATE_I_D = 0 + private const val TAG_OPERATIONAL_STATE_ID = 0 private const val TAG_OPERATIONAL_STATE_LABEL = 1 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): OperationalStateClusterOperationalStateStruct { tlvReader.enterStructure(tlvTag) - val operationalStateID = tlvReader.getUByte(ContextSpecificTag(TAG_OPERATIONAL_STATE_I_D)) + val operationalStateID = tlvReader.getUByte(ContextSpecificTag(TAG_OPERATIONAL_STATE_ID)) val operationalStateLabel = if (tlvReader.isNextTag(ContextSpecificTag(TAG_OPERATIONAL_STATE_LABEL))) { Optional.of(tlvReader.getString(ContextSpecificTag(TAG_OPERATIONAL_STATE_LABEL))) diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/OtaSoftwareUpdateRequestorClusterProviderLocation.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/OtaSoftwareUpdateRequestorClusterProviderLocation.kt index 5708a4006e50cb..209c1580f35df2 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/structs/OtaSoftwareUpdateRequestorClusterProviderLocation.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/OtaSoftwareUpdateRequestorClusterProviderLocation.kt @@ -38,7 +38,7 @@ class OtaSoftwareUpdateRequestorClusterProviderLocation( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_PROVIDER_NODE_I_D), providerNodeID) + put(ContextSpecificTag(TAG_PROVIDER_NODE_ID), providerNodeID) put(ContextSpecificTag(TAG_ENDPOINT), endpoint) put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex) endStructure() @@ -46,7 +46,7 @@ class OtaSoftwareUpdateRequestorClusterProviderLocation( } companion object { - private const val TAG_PROVIDER_NODE_I_D = 1 + private const val TAG_PROVIDER_NODE_ID = 1 private const val TAG_ENDPOINT = 2 private const val TAG_FABRIC_INDEX = 254 @@ -55,7 +55,7 @@ class OtaSoftwareUpdateRequestorClusterProviderLocation( tlvReader: TlvReader, ): OtaSoftwareUpdateRequestorClusterProviderLocation { tlvReader.enterStructure(tlvTag) - val providerNodeID = tlvReader.getULong(ContextSpecificTag(TAG_PROVIDER_NODE_I_D)) + val providerNodeID = tlvReader.getULong(ContextSpecificTag(TAG_PROVIDER_NODE_ID)) val endpoint = tlvReader.getUShort(ContextSpecificTag(TAG_ENDPOINT)) val fabricIndex = tlvReader.getUByte(ContextSpecificTag(TAG_FABRIC_INDEX)) diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/OvenCavityOperationalStateClusterErrorStateStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/OvenCavityOperationalStateClusterErrorStateStruct.kt index cbb84396c25805..442c55ea088e3d 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/structs/OvenCavityOperationalStateClusterErrorStateStruct.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/OvenCavityOperationalStateClusterErrorStateStruct.kt @@ -39,7 +39,7 @@ class OvenCavityOperationalStateClusterErrorStateStruct( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_ERROR_STATE_I_D), errorStateID) + put(ContextSpecificTag(TAG_ERROR_STATE_ID), errorStateID) if (errorStateLabel.isPresent) { val opterrorStateLabel = errorStateLabel.get() put(ContextSpecificTag(TAG_ERROR_STATE_LABEL), opterrorStateLabel) @@ -53,7 +53,7 @@ class OvenCavityOperationalStateClusterErrorStateStruct( } companion object { - private const val TAG_ERROR_STATE_I_D = 0 + private const val TAG_ERROR_STATE_ID = 0 private const val TAG_ERROR_STATE_LABEL = 1 private const val TAG_ERROR_STATE_DETAILS = 2 @@ -62,7 +62,7 @@ class OvenCavityOperationalStateClusterErrorStateStruct( tlvReader: TlvReader, ): OvenCavityOperationalStateClusterErrorStateStruct { tlvReader.enterStructure(tlvTag) - val errorStateID = tlvReader.getUByte(ContextSpecificTag(TAG_ERROR_STATE_I_D)) + val errorStateID = tlvReader.getUByte(ContextSpecificTag(TAG_ERROR_STATE_ID)) val errorStateLabel = if (tlvReader.isNextTag(ContextSpecificTag(TAG_ERROR_STATE_LABEL))) { Optional.of(tlvReader.getString(ContextSpecificTag(TAG_ERROR_STATE_LABEL))) diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/OvenCavityOperationalStateClusterOperationalStateStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/OvenCavityOperationalStateClusterOperationalStateStruct.kt index b7d604467bd9bc..ef6a876dcef05f 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/structs/OvenCavityOperationalStateClusterOperationalStateStruct.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/OvenCavityOperationalStateClusterOperationalStateStruct.kt @@ -37,7 +37,7 @@ class OvenCavityOperationalStateClusterOperationalStateStruct( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_OPERATIONAL_STATE_I_D), operationalStateID) + put(ContextSpecificTag(TAG_OPERATIONAL_STATE_ID), operationalStateID) if (operationalStateLabel.isPresent) { val optoperationalStateLabel = operationalStateLabel.get() put(ContextSpecificTag(TAG_OPERATIONAL_STATE_LABEL), optoperationalStateLabel) @@ -47,7 +47,7 @@ class OvenCavityOperationalStateClusterOperationalStateStruct( } companion object { - private const val TAG_OPERATIONAL_STATE_I_D = 0 + private const val TAG_OPERATIONAL_STATE_ID = 0 private const val TAG_OPERATIONAL_STATE_LABEL = 1 fun fromTlv( @@ -55,7 +55,7 @@ class OvenCavityOperationalStateClusterOperationalStateStruct( tlvReader: TlvReader, ): OvenCavityOperationalStateClusterOperationalStateStruct { tlvReader.enterStructure(tlvTag) - val operationalStateID = tlvReader.getUByte(ContextSpecificTag(TAG_OPERATIONAL_STATE_I_D)) + val operationalStateID = tlvReader.getUByte(ContextSpecificTag(TAG_OPERATIONAL_STATE_ID)) val operationalStateLabel = if (tlvReader.isNextTag(ContextSpecificTag(TAG_OPERATIONAL_STATE_LABEL))) { Optional.of(tlvReader.getString(ContextSpecificTag(TAG_OPERATIONAL_STATE_LABEL))) diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/RvcOperationalStateClusterErrorStateStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/RvcOperationalStateClusterErrorStateStruct.kt index 1ccfa0c395aad5..e60738d973b0c5 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/structs/RvcOperationalStateClusterErrorStateStruct.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/RvcOperationalStateClusterErrorStateStruct.kt @@ -39,7 +39,7 @@ class RvcOperationalStateClusterErrorStateStruct( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_ERROR_STATE_I_D), errorStateID) + put(ContextSpecificTag(TAG_ERROR_STATE_ID), errorStateID) if (errorStateLabel.isPresent) { val opterrorStateLabel = errorStateLabel.get() put(ContextSpecificTag(TAG_ERROR_STATE_LABEL), opterrorStateLabel) @@ -53,13 +53,13 @@ class RvcOperationalStateClusterErrorStateStruct( } companion object { - private const val TAG_ERROR_STATE_I_D = 0 + private const val TAG_ERROR_STATE_ID = 0 private const val TAG_ERROR_STATE_LABEL = 1 private const val TAG_ERROR_STATE_DETAILS = 2 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): RvcOperationalStateClusterErrorStateStruct { tlvReader.enterStructure(tlvTag) - val errorStateID = tlvReader.getUByte(ContextSpecificTag(TAG_ERROR_STATE_I_D)) + val errorStateID = tlvReader.getUByte(ContextSpecificTag(TAG_ERROR_STATE_ID)) val errorStateLabel = if (tlvReader.isNextTag(ContextSpecificTag(TAG_ERROR_STATE_LABEL))) { Optional.of(tlvReader.getString(ContextSpecificTag(TAG_ERROR_STATE_LABEL))) diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/RvcOperationalStateClusterOperationalStateStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/RvcOperationalStateClusterOperationalStateStruct.kt index 3ab7c3ab3bf63c..00680b85bb0c7b 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/structs/RvcOperationalStateClusterOperationalStateStruct.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/RvcOperationalStateClusterOperationalStateStruct.kt @@ -37,7 +37,7 @@ class RvcOperationalStateClusterOperationalStateStruct( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_OPERATIONAL_STATE_I_D), operationalStateID) + put(ContextSpecificTag(TAG_OPERATIONAL_STATE_ID), operationalStateID) if (operationalStateLabel.isPresent) { val optoperationalStateLabel = operationalStateLabel.get() put(ContextSpecificTag(TAG_OPERATIONAL_STATE_LABEL), optoperationalStateLabel) @@ -47,7 +47,7 @@ class RvcOperationalStateClusterOperationalStateStruct( } companion object { - private const val TAG_OPERATIONAL_STATE_I_D = 0 + private const val TAG_OPERATIONAL_STATE_ID = 0 private const val TAG_OPERATIONAL_STATE_LABEL = 1 fun fromTlv( @@ -55,7 +55,7 @@ class RvcOperationalStateClusterOperationalStateStruct( tlvReader: TlvReader, ): RvcOperationalStateClusterOperationalStateStruct { tlvReader.enterStructure(tlvTag) - val operationalStateID = tlvReader.getUByte(ContextSpecificTag(TAG_OPERATIONAL_STATE_I_D)) + val operationalStateID = tlvReader.getUByte(ContextSpecificTag(TAG_OPERATIONAL_STATE_ID)) val operationalStateLabel = if (tlvReader.isNextTag(ContextSpecificTag(TAG_OPERATIONAL_STATE_LABEL))) { Optional.of(tlvReader.getString(ContextSpecificTag(TAG_OPERATIONAL_STATE_LABEL))) diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/ScenesManagementClusterAttributeValuePairStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ScenesManagementClusterAttributeValuePairStruct.kt index 9f142d41b3da4f..232bfea8c1e5a7 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/structs/ScenesManagementClusterAttributeValuePairStruct.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ScenesManagementClusterAttributeValuePairStruct.kt @@ -51,7 +51,7 @@ class ScenesManagementClusterAttributeValuePairStruct( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_ATTRIBUTE_I_D), attributeID) + put(ContextSpecificTag(TAG_ATTRIBUTE_ID), attributeID) if (valueUnsigned8.isPresent) { val optvalueUnsigned8 = valueUnsigned8.get() put(ContextSpecificTag(TAG_VALUE_UNSIGNED8), optvalueUnsigned8) @@ -89,7 +89,7 @@ class ScenesManagementClusterAttributeValuePairStruct( } companion object { - private const val TAG_ATTRIBUTE_I_D = 0 + private const val TAG_ATTRIBUTE_ID = 0 private const val TAG_VALUE_UNSIGNED8 = 1 private const val TAG_VALUE_SIGNED8 = 2 private const val TAG_VALUE_UNSIGNED16 = 3 @@ -104,7 +104,7 @@ class ScenesManagementClusterAttributeValuePairStruct( tlvReader: TlvReader, ): ScenesManagementClusterAttributeValuePairStruct { tlvReader.enterStructure(tlvTag) - val attributeID = tlvReader.getUInt(ContextSpecificTag(TAG_ATTRIBUTE_I_D)) + val attributeID = tlvReader.getUInt(ContextSpecificTag(TAG_ATTRIBUTE_ID)) val valueUnsigned8 = if (tlvReader.isNextTag(ContextSpecificTag(TAG_VALUE_UNSIGNED8))) { Optional.of(tlvReader.getUByte(ContextSpecificTag(TAG_VALUE_UNSIGNED8))) diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/ScenesManagementClusterExtensionFieldSet.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ScenesManagementClusterExtensionFieldSet.kt index bd219e98d152fd..4fcc98ecaf5921 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/structs/ScenesManagementClusterExtensionFieldSet.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ScenesManagementClusterExtensionFieldSet.kt @@ -37,7 +37,7 @@ class ScenesManagementClusterExtensionFieldSet( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_CLUSTER_I_D), clusterID) + put(ContextSpecificTag(TAG_CLUSTER_ID), clusterID) startArray(ContextSpecificTag(TAG_ATTRIBUTE_VALUE_LIST)) for (item in attributeValueList.iterator()) { item.toTlv(AnonymousTag, this) @@ -48,12 +48,12 @@ class ScenesManagementClusterExtensionFieldSet( } companion object { - private const val TAG_CLUSTER_I_D = 0 + private const val TAG_CLUSTER_ID = 0 private const val TAG_ATTRIBUTE_VALUE_LIST = 1 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ScenesManagementClusterExtensionFieldSet { tlvReader.enterStructure(tlvTag) - val clusterID = tlvReader.getUInt(ContextSpecificTag(TAG_CLUSTER_I_D)) + val clusterID = tlvReader.getUInt(ContextSpecificTag(TAG_CLUSTER_ID)) val attributeValueList = buildList { tlvReader.enterArray(ContextSpecificTag(TAG_ATTRIBUTE_VALUE_LIST)) diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/ServiceAreaClusterAreaStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ServiceAreaClusterAreaStruct.kt index adfe228d332c39..d310fe5c315bf8 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/structs/ServiceAreaClusterAreaStruct.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ServiceAreaClusterAreaStruct.kt @@ -38,11 +38,11 @@ class ServiceAreaClusterAreaStruct( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_AREA_I_D), areaID) + put(ContextSpecificTag(TAG_AREA_ID), areaID) if (mapID != null) { - put(ContextSpecificTag(TAG_MAP_I_D), mapID) + put(ContextSpecificTag(TAG_MAP_ID), mapID) } else { - putNull(ContextSpecificTag(TAG_MAP_I_D)) + putNull(ContextSpecificTag(TAG_MAP_ID)) } areaDesc.toTlv(ContextSpecificTag(TAG_AREA_DESC), this) endStructure() @@ -50,18 +50,18 @@ class ServiceAreaClusterAreaStruct( } companion object { - private const val TAG_AREA_I_D = 0 - private const val TAG_MAP_I_D = 1 + private const val TAG_AREA_ID = 0 + private const val TAG_MAP_ID = 1 private const val TAG_AREA_DESC = 2 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ServiceAreaClusterAreaStruct { tlvReader.enterStructure(tlvTag) - val areaID = tlvReader.getUInt(ContextSpecificTag(TAG_AREA_I_D)) + val areaID = tlvReader.getUInt(ContextSpecificTag(TAG_AREA_ID)) val mapID = if (!tlvReader.isNull()) { - tlvReader.getUInt(ContextSpecificTag(TAG_MAP_I_D)) + tlvReader.getUInt(ContextSpecificTag(TAG_MAP_ID)) } else { - tlvReader.getNull(ContextSpecificTag(TAG_MAP_I_D)) + tlvReader.getNull(ContextSpecificTag(TAG_MAP_ID)) null } val areaDesc = diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/ServiceAreaClusterMapStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ServiceAreaClusterMapStruct.kt index 528888247d791b..19df0938c57b93 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/structs/ServiceAreaClusterMapStruct.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ServiceAreaClusterMapStruct.kt @@ -33,19 +33,19 @@ class ServiceAreaClusterMapStruct(val mapID: UInt, val name: String) { fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_MAP_I_D), mapID) + put(ContextSpecificTag(TAG_MAP_ID), mapID) put(ContextSpecificTag(TAG_NAME), name) endStructure() } } companion object { - private const val TAG_MAP_I_D = 0 + private const val TAG_MAP_ID = 0 private const val TAG_NAME = 1 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ServiceAreaClusterMapStruct { tlvReader.enterStructure(tlvTag) - val mapID = tlvReader.getUInt(ContextSpecificTag(TAG_MAP_I_D)) + val mapID = tlvReader.getUInt(ContextSpecificTag(TAG_MAP_ID)) val name = tlvReader.getString(ContextSpecificTag(TAG_NAME)) tlvReader.exitContainer() diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/ServiceAreaClusterProgressStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ServiceAreaClusterProgressStruct.kt index 4421bb606a7466..02b16f17cd101d 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/structs/ServiceAreaClusterProgressStruct.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ServiceAreaClusterProgressStruct.kt @@ -41,7 +41,7 @@ class ServiceAreaClusterProgressStruct( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_AREA_I_D), areaID) + put(ContextSpecificTag(TAG_AREA_ID), areaID) put(ContextSpecificTag(TAG_STATUS), status) if (totalOperationalTime != null) { if (totalOperationalTime.isPresent) { @@ -64,14 +64,14 @@ class ServiceAreaClusterProgressStruct( } companion object { - private const val TAG_AREA_I_D = 0 + private const val TAG_AREA_ID = 0 private const val TAG_STATUS = 1 private const val TAG_TOTAL_OPERATIONAL_TIME = 2 private const val TAG_ESTIMATED_TIME = 3 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ServiceAreaClusterProgressStruct { tlvReader.enterStructure(tlvTag) - val areaID = tlvReader.getUInt(ContextSpecificTag(TAG_AREA_I_D)) + val areaID = tlvReader.getUInt(ContextSpecificTag(TAG_AREA_ID)) val status = tlvReader.getUByte(ContextSpecificTag(TAG_STATUS)) val totalOperationalTime = if (!tlvReader.isNull()) { diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/ThermostatClusterAtomicAttributeStatusStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ThermostatClusterAtomicAttributeStatusStruct.kt index 2a67c0cccb8688..42fc80b898b3b8 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/structs/ThermostatClusterAtomicAttributeStatusStruct.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ThermostatClusterAtomicAttributeStatusStruct.kt @@ -33,19 +33,19 @@ class ThermostatClusterAtomicAttributeStatusStruct(val attributeID: UInt, val st fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_ATTRIBUTE_I_D), attributeID) + put(ContextSpecificTag(TAG_ATTRIBUTE_ID), attributeID) put(ContextSpecificTag(TAG_STATUS_CODE), statusCode) endStructure() } } companion object { - private const val TAG_ATTRIBUTE_I_D = 0 + private const val TAG_ATTRIBUTE_ID = 0 private const val TAG_STATUS_CODE = 1 fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ThermostatClusterAtomicAttributeStatusStruct { tlvReader.enterStructure(tlvTag) - val attributeID = tlvReader.getUInt(ContextSpecificTag(TAG_ATTRIBUTE_I_D)) + val attributeID = tlvReader.getUInt(ContextSpecificTag(TAG_ATTRIBUTE_ID)) val statusCode = tlvReader.getUByte(ContextSpecificTag(TAG_STATUS_CODE)) tlvReader.exitContainer() diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/ThreadNetworkDiagnosticsClusterRouteTableStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ThreadNetworkDiagnosticsClusterRouteTableStruct.kt index 797bd6aa66e11d..86860ea6803c82 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/structs/ThreadNetworkDiagnosticsClusterRouteTableStruct.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ThreadNetworkDiagnosticsClusterRouteTableStruct.kt @@ -57,8 +57,8 @@ class ThreadNetworkDiagnosticsClusterRouteTableStruct( put(ContextSpecificTag(TAG_ROUTER_ID), routerId) put(ContextSpecificTag(TAG_NEXT_HOP), nextHop) put(ContextSpecificTag(TAG_PATH_COST), pathCost) - put(ContextSpecificTag(TAG_L_Q_I_IN), LQIIn) - put(ContextSpecificTag(TAG_L_Q_I_OUT), LQIOut) + put(ContextSpecificTag(TAG_LQI_IN), LQIIn) + put(ContextSpecificTag(TAG_LQI_OUT), LQIOut) put(ContextSpecificTag(TAG_AGE), age) put(ContextSpecificTag(TAG_ALLOCATED), allocated) put(ContextSpecificTag(TAG_LINK_ESTABLISHED), linkEstablished) @@ -72,8 +72,8 @@ class ThreadNetworkDiagnosticsClusterRouteTableStruct( private const val TAG_ROUTER_ID = 2 private const val TAG_NEXT_HOP = 3 private const val TAG_PATH_COST = 4 - private const val TAG_L_Q_I_IN = 5 - private const val TAG_L_Q_I_OUT = 6 + private const val TAG_LQI_IN = 5 + private const val TAG_LQI_OUT = 6 private const val TAG_AGE = 7 private const val TAG_ALLOCATED = 8 private const val TAG_LINK_ESTABLISHED = 9 @@ -88,8 +88,8 @@ class ThreadNetworkDiagnosticsClusterRouteTableStruct( val routerId = tlvReader.getUByte(ContextSpecificTag(TAG_ROUTER_ID)) val nextHop = tlvReader.getUByte(ContextSpecificTag(TAG_NEXT_HOP)) val pathCost = tlvReader.getUByte(ContextSpecificTag(TAG_PATH_COST)) - val LQIIn = tlvReader.getUByte(ContextSpecificTag(TAG_L_Q_I_IN)) - val LQIOut = tlvReader.getUByte(ContextSpecificTag(TAG_L_Q_I_OUT)) + val LQIIn = tlvReader.getUByte(ContextSpecificTag(TAG_LQI_IN)) + val LQIOut = tlvReader.getUByte(ContextSpecificTag(TAG_LQI_OUT)) val age = tlvReader.getUByte(ContextSpecificTag(TAG_AGE)) val allocated = tlvReader.getBoolean(ContextSpecificTag(TAG_ALLOCATED)) val linkEstablished = tlvReader.getBoolean(ContextSpecificTag(TAG_LINK_ESTABLISHED)) diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/ThreadNetworkDirectoryClusterThreadNetworkStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ThreadNetworkDirectoryClusterThreadNetworkStruct.kt index bacfb457534ddd..04f8c6abcd3ba8 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/structs/ThreadNetworkDirectoryClusterThreadNetworkStruct.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ThreadNetworkDirectoryClusterThreadNetworkStruct.kt @@ -40,7 +40,7 @@ class ThreadNetworkDirectoryClusterThreadNetworkStruct( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_EXTENDED_PAN_I_D), extendedPanID) + put(ContextSpecificTag(TAG_EXTENDED_PAN_ID), extendedPanID) put(ContextSpecificTag(TAG_NETWORK_NAME), networkName) put(ContextSpecificTag(TAG_CHANNEL), channel) put(ContextSpecificTag(TAG_ACTIVE_TIMESTAMP), activeTimestamp) @@ -49,7 +49,7 @@ class ThreadNetworkDirectoryClusterThreadNetworkStruct( } companion object { - private const val TAG_EXTENDED_PAN_I_D = 0 + private const val TAG_EXTENDED_PAN_ID = 0 private const val TAG_NETWORK_NAME = 1 private const val TAG_CHANNEL = 2 private const val TAG_ACTIVE_TIMESTAMP = 3 @@ -59,7 +59,7 @@ class ThreadNetworkDirectoryClusterThreadNetworkStruct( tlvReader: TlvReader, ): ThreadNetworkDirectoryClusterThreadNetworkStruct { tlvReader.enterStructure(tlvTag) - val extendedPanID = tlvReader.getByteArray(ContextSpecificTag(TAG_EXTENDED_PAN_I_D)) + val extendedPanID = tlvReader.getByteArray(ContextSpecificTag(TAG_EXTENDED_PAN_ID)) val networkName = tlvReader.getString(ContextSpecificTag(TAG_NETWORK_NAME)) val channel = tlvReader.getUShort(ContextSpecificTag(TAG_CHANNEL)) val activeTimestamp = tlvReader.getULong(ContextSpecificTag(TAG_ACTIVE_TIMESTAMP)) diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct.kt index b90c3a65207937..f294cfbe427ee1 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/structs/TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct.kt @@ -36,14 +36,14 @@ class TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_NODE_I_D), nodeID) + put(ContextSpecificTag(TAG_NODE_ID), nodeID) put(ContextSpecificTag(TAG_ENDPOINT), endpoint) endStructure() } } companion object { - private const val TAG_NODE_I_D = 0 + private const val TAG_NODE_ID = 0 private const val TAG_ENDPOINT = 1 fun fromTlv( @@ -51,7 +51,7 @@ class TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct( tlvReader: TlvReader, ): TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct { tlvReader.enterStructure(tlvTag) - val nodeID = tlvReader.getULong(ContextSpecificTag(TAG_NODE_I_D)) + val nodeID = tlvReader.getULong(ContextSpecificTag(TAG_NODE_ID)) val endpoint = tlvReader.getUShort(ContextSpecificTag(TAG_ENDPOINT)) tlvReader.exitContainer() diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/TimeSynchronizationClusterTrustedTimeSourceStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/TimeSynchronizationClusterTrustedTimeSourceStruct.kt index 4e1df456a93348..215bb8c35d2e57 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/structs/TimeSynchronizationClusterTrustedTimeSourceStruct.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/TimeSynchronizationClusterTrustedTimeSourceStruct.kt @@ -39,7 +39,7 @@ class TimeSynchronizationClusterTrustedTimeSourceStruct( tlvWriter.apply { startStructure(tlvTag) put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex) - put(ContextSpecificTag(TAG_NODE_I_D), nodeID) + put(ContextSpecificTag(TAG_NODE_ID), nodeID) put(ContextSpecificTag(TAG_ENDPOINT), endpoint) endStructure() } @@ -47,7 +47,7 @@ class TimeSynchronizationClusterTrustedTimeSourceStruct( companion object { private const val TAG_FABRIC_INDEX = 0 - private const val TAG_NODE_I_D = 1 + private const val TAG_NODE_ID = 1 private const val TAG_ENDPOINT = 2 fun fromTlv( @@ -56,7 +56,7 @@ class TimeSynchronizationClusterTrustedTimeSourceStruct( ): TimeSynchronizationClusterTrustedTimeSourceStruct { tlvReader.enterStructure(tlvTag) val fabricIndex = tlvReader.getUByte(ContextSpecificTag(TAG_FABRIC_INDEX)) - val nodeID = tlvReader.getULong(ContextSpecificTag(TAG_NODE_I_D)) + val nodeID = tlvReader.getULong(ContextSpecificTag(TAG_NODE_ID)) val endpoint = tlvReader.getUShort(ContextSpecificTag(TAG_ENDPOINT)) tlvReader.exitContainer() diff --git a/src/controller/python/chip/yaml/runner.py b/src/controller/python/chip/yaml/runner.py index 84f0e06ff7fddf..00e0de2154e5ec 100644 --- a/src/controller/python/chip/yaml/runner.py +++ b/src/controller/python/chip/yaml/runner.py @@ -24,7 +24,6 @@ import chip.interaction_model import chip.yaml.format_converter as Converter -import stringcase # type: ignore from chip.ChipDeviceCtrl import ChipDeviceController, discovery from chip.clusters import ClusterObjects from chip.clusters.Attribute import (AttributeStatus, EventReadResult, SubscriptionTransaction, TypedAttributePath, @@ -32,6 +31,7 @@ from chip.exceptions import ChipStackError from chip.yaml.data_model_lookup import DataModelLookup from chip.yaml.errors import ActionCreationError, UnexpectedActionCreationError +from matter_idl.generators.filters import to_pascal_case, to_snake_case from matter_yamltests.pseudo_clusters.pseudo_clusters import get_default_pseudo_clusters from .data_model_lookup import PreDefinedDataModelLookup @@ -150,7 +150,7 @@ def __init__(self, test_step, cluster: str, context: _ExecutionContext): ''' super().__init__(test_step) self._busy_wait_ms = test_step.busy_wait_ms - self._command_name = stringcase.pascalcase(test_step.command) + self._command_name = to_pascal_case(test_step.command) self._cluster = cluster self._interation_timeout_ms = test_step.timed_interaction_timeout_ms self._request_object = None @@ -217,7 +217,7 @@ def __init__(self, test_step, cluster: str, context: _ExecutionContext): UnexpectedActionCreationError: Raised if there is an unexpected parsing error. ''' super().__init__(test_step) - self._attribute_name = stringcase.pascalcase(test_step.attribute) + self._attribute_name = to_pascal_case(test_step.attribute) self._cluster = cluster self._endpoint = test_step.endpoint self._node_id = test_step.node_id @@ -294,7 +294,7 @@ def __init__(self, test_step, cluster: str, context: _ExecutionContext): UnexpectedActionCreationError: Raised if there is an unexpected parsing error. ''' super().__init__(test_step) - self._event_name = stringcase.pascalcase(test_step.event) + self._event_name = to_pascal_case(test_step.event) self._cluster = cluster self._endpoint = test_step.endpoint self._node_id = test_step.node_id @@ -531,7 +531,7 @@ def __init__(self, test_step, cluster: str, context: _ExecutionContext): UnexpectedActionCreationError: Raised if there is an unexpected parsing error. ''' super().__init__(test_step) - self._attribute_name = stringcase.pascalcase(test_step.attribute) + self._attribute_name = to_pascal_case(test_step.attribute) self._busy_wait_ms = test_step.busy_wait_ms self._cluster = cluster self._endpoint = test_step.endpoint @@ -609,9 +609,9 @@ def __init__(self, test_step, context: _ExecutionContext): ''' super().__init__(test_step) if test_step.attribute is not None: - queue_name = stringcase.pascalcase(test_step.attribute) + queue_name = to_pascal_case(test_step.attribute) elif test_step.event is not None: - queue_name = stringcase.pascalcase(test_step.event) + queue_name = to_pascal_case(test_step.event) else: raise UnexpectedActionCreationError( 'WaitForReport needs to wait on either attribute or event, neither were provided') @@ -886,12 +886,12 @@ def decode(self, result: _ActionResult): return response if isinstance(response, chip.interaction_model.InteractionModelError): - decoded_response['error'] = stringcase.snakecase(response.status.name).upper() + decoded_response['error'] = to_snake_case(response.status.name).upper() decoded_response['clusterError'] = response.clusterStatus return decoded_response if isinstance(response, chip.interaction_model.Status): - decoded_response['error'] = stringcase.snakecase(response.name).upper() + decoded_response['error'] = to_snake_case(response.name).upper() return decoded_response if isinstance(response, _GetCommissionerNodeIdResult): @@ -936,7 +936,7 @@ def decode(self, result: _ActionResult): decoded_response = [] for event in response.event_result_list: if event.Status != chip.interaction_model.Status.Success: - error_message = stringcase.snakecase(event.Status.name).upper() + error_message = to_snake_case(event.Status.name).upper() decoded_response.append({'error': error_message}) continue cluster_id = event.Header.ClusterId From 859ee35fc6a8a3efa5cdf940578f799065414e77 Mon Sep 17 00:00:00 2001 From: Jakub Latusek Date: Wed, 14 Aug 2024 16:12:13 +0200 Subject: [PATCH 2/6] [Tizen] Update Tizen SDK to 8.0 (#34171) * Update tizen to 8.0 * Install platform certificate * Reverse restyle diff * Review fix - version update * Add information about used 7.0 tizen package --------- Co-authored-by: Arkadiusz Bokowy --- .../docker/images/base/chip-build/version | 2 +- .../stage-2/chip-build-tizen/Dockerfile | 4 ++-- .../tizen-sdk-installer/install.sh | 20 ++++++++++--------- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/integrations/docker/images/base/chip-build/version b/integrations/docker/images/base/chip-build/version index 5b9870bc97994b..18dcb8d04c629c 100644 --- a/integrations/docker/images/base/chip-build/version +++ b/integrations/docker/images/base/chip-build/version @@ -1 +1 @@ -71 : [NXP] Update k32w1 SDK as it will use common NXP SDK +72 : Update Tizen version to 8.0 diff --git a/integrations/docker/images/stage-2/chip-build-tizen/Dockerfile b/integrations/docker/images/stage-2/chip-build-tizen/Dockerfile index 4d907b1d6e48f4..c127296bac04f3 100644 --- a/integrations/docker/images/stage-2/chip-build-tizen/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-tizen/Dockerfile @@ -20,7 +20,7 @@ RUN set -x \ # ------------------------------------------------------------------------------ # Install tizen -ENV TIZEN_VERSION 7.0 +ENV TIZEN_VERSION 8.0 ENV TIZEN_SDK_ROOT /opt/tizen-sdk COPY tizen-sdk-installer $TIZEN_SDK_ROOT/files/installer @@ -35,7 +35,7 @@ RUN set -x \ # ------------------------------------------------------------------------------ # Set environment ENV TIZEN_SDK_TOOLCHAIN $TIZEN_SDK_ROOT/tools/arm-linux-gnueabi-gcc-9.2 -ENV TIZEN_SDK_SYSROOT $TIZEN_SDK_ROOT/platforms/tizen-$TIZEN_VERSION/mobile/rootstraps/mobile-$TIZEN_VERSION-device.core +ENV TIZEN_SDK_SYSROOT $TIZEN_SDK_ROOT/platforms/tizen-$TIZEN_VERSION/tizen/rootstraps/tizen-$TIZEN_VERSION-device.core ENV PATH="$TIZEN_SDK_TOOLCHAIN/bin:$TIZEN_SDK_ROOT/tools/ide/bin:$TIZEN_SDK_ROOT/tools:$PATH" # ------------------------------------------------------------------------------ diff --git a/integrations/docker/images/stage-2/chip-build-tizen/tizen-sdk-installer/install.sh b/integrations/docker/images/stage-2/chip-build-tizen/tizen-sdk-installer/install.sh index e206e71c19a3a6..59843f99ba9573 100755 --- a/integrations/docker/images/stage-2/chip-build-tizen/tizen-sdk-installer/install.sh +++ b/integrations/docker/images/stage-2/chip-build-tizen/tizen-sdk-installer/install.sh @@ -21,7 +21,7 @@ set -e # Default settings options TIZEN_SDK_ROOT=/opt/tizen-sdk TIZEN_SDK_DATA_PATH=$HOME/tizen-sdk-data -TIZEN_VERSION=7.0 +TIZEN_VERSION=8.0 SECRET_TOOL=false SCRIPT_NAME=$(basename -- "$(readlink -f "${BASH_SOURCE:?}")") @@ -133,7 +133,7 @@ function install_tizen_sdk() { info "Tizen SDK installation directory: $TIZEN_SDK_ROOT" - TIZEN_SDK_SYSROOT="$TIZEN_SDK_ROOT/platforms/tizen-$TIZEN_VERSION/mobile/rootstraps/mobile-$TIZEN_VERSION-device.core" + TIZEN_SDK_SYSROOT="$TIZEN_SDK_ROOT/platforms/tizen-$TIZEN_VERSION/tizen/rootstraps/tizen-$TIZEN_VERSION-device.core" cd "$TMP_DIR" || return @@ -144,7 +144,7 @@ function install_tizen_sdk() { URL="http://download.tizen.org/sdk/tizenstudio/official/binary/" PKG_ARR=( 'certificate-encryptor_1.0.10_ubuntu-64.zip' - 'certificate-generator_0.1.3_ubuntu-64.zip' + 'certificate-generator_0.1.4_ubuntu-64.zip' 'new-common-cli_2.5.64_ubuntu-64.zip' 'new-native-cli_2.5.64_ubuntu-64.zip' 'sdb_4.2.23_ubuntu-64.zip') @@ -167,8 +167,8 @@ function install_tizen_sdk() { # Different versions of Tizen have different rootstrap versions URL="http://download.tizen.org/sdk/tizenstudio/official/binary/" PKG_ARR=( - "mobile-$TIZEN_VERSION-core-add-ons_*_ubuntu-64.zip" - "mobile-$TIZEN_VERSION-rs-device.core_*_ubuntu-64.zip") + "tizen-$TIZEN_VERSION-core-add-ons_*_ubuntu-64.zip" + "tizen-$TIZEN_VERSION-rs-device.core_*_ubuntu-64.zip") download "$URL" "${PKG_ARR[@]}" # Base packages @@ -232,13 +232,15 @@ function install_tizen_sdk() { 'capi-system-peripheral-io-*.armv7l.rpm' 'capi-system-peripheral-io-devel-*.armv7l.rpm' 'capi-system-resource-1*.armv7l.rpm' - 'libnsd-dns-sd-*.armv7l.rpm') + 'libnsd-dns-sd-*.armv7l.rpm' + 'sensord-*.armv7l.rpm') download "$URL" "${PKG_ARR[@]}" # Tizen Developer Platform Certificate URL="http://download.tizen.org/sdk/extensions/Tizen_IoT_Headless/binary/" + # Tizen site do not has this package available in version 8.0. Certificates are the same for 7.0 and 8.0. PKG_ARR=( - "$TIZEN_VERSION-iot-things-add-ons_*_ubuntu-64.zip") + "7.0-iot-things-add-ons_*_ubuntu-64.zip") download "$URL" "${PKG_ARR[@]}" # Install all @@ -271,7 +273,7 @@ function install_tizen_sdk() { ln -sf "$(basename "$(readlink "$LNK")")" "$LNK" done ln -sf ../../lib/libcap.so.2 "$TIZEN_SDK_SYSROOT/usr/lib/libcap.so" - ln -sf openssl1.1.pc "$TIZEN_SDK_SYSROOT/usr/lib/pkgconfig/openssl.pc" + ln -sf openssl3.pc "$TIZEN_SDK_SYSROOT/usr/lib/pkgconfig/openssl.pc" info "Done." echo @@ -282,7 +284,7 @@ function install_tizen_sdk() { echo "export TIZEN_VERSION=\"$TIZEN_VERSION\"" echo "export TIZEN_SDK_ROOT=\"$(realpath "$TIZEN_SDK_ROOT")\"" echo "export TIZEN_SDK_TOOLCHAIN=\"\$TIZEN_SDK_ROOT/tools/arm-linux-gnueabi-gcc-9.2\"" - echo "export TIZEN_SDK_SYSROOT=\"\$TIZEN_SDK_ROOT/platforms/tizen-$TIZEN_VERSION/mobile/rootstraps/mobile-$TIZEN_VERSION-device.core\"" + echo "export TIZEN_SDK_SYSROOT=\"\$TIZEN_SDK_ROOT/platforms/tizen-$TIZEN_VERSION/tizen/rootstraps/tizen-$TIZEN_VERSION-device.core\"" echo "export PATH=\"\$TIZEN_SDK_TOOLCHAIN/bin:\$TIZEN_SDK_ROOT/tools/ide/bin:\$TIZEN_SDK_ROOT/tools:\$PATH\"" echo -n "$COLOR_NONE" } From 350b13f76c0ad630081c4e50d608f6d62477ac1a Mon Sep 17 00:00:00 2001 From: fesseha-eve <88329315+fessehaeve@users.noreply.github.com> Date: Wed, 14 Aug 2024 16:24:47 +0200 Subject: [PATCH 3/6] updated list of AcceptedCommands list for Thermostat cluster with Preset feature enabled (#34981) --- src/app/tests/suites/certification/Test_TC_TSTAT_1_1.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/tests/suites/certification/Test_TC_TSTAT_1_1.yaml b/src/app/tests/suites/certification/Test_TC_TSTAT_1_1.yaml index 194babe282315b..35da0e04be380f 100644 --- a/src/app/tests/suites/certification/Test_TC_TSTAT_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_TSTAT_1_1.yaml @@ -624,7 +624,7 @@ tests: response: constraints: type: list - contains: [254] + contains: [6, 254] - label: "Step 7a: TH reads from the DUT the GeneratedCommandList attribute." From 5ffe9ec641deeb64edd03ddf60788bc06e4652e5 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Wed, 14 Aug 2024 11:05:20 -0400 Subject: [PATCH 4/6] Update CCTRL 2.2 to not potentially use uninitialized variables in the class on teardown (#34955) * Do not use uninitialized bits in teardown * Extra guard for file remove * Fix a few more instances of app_process --------- Co-authored-by: Andrei Litvin --- src/python_testing/TC_BRBINFO_4_1.py | 15 +++++++++++---- src/python_testing/TC_CCTRL_2_2.py | 14 ++++++++++---- src/python_testing/TC_MCORE_FS_1_1.py | 15 ++++++++++----- 3 files changed, 31 insertions(+), 13 deletions(-) diff --git a/src/python_testing/TC_BRBINFO_4_1.py b/src/python_testing/TC_BRBINFO_4_1.py index 6c65f634bb6a7b..18e478c872fe2f 100644 --- a/src/python_testing/TC_BRBINFO_4_1.py +++ b/src/python_testing/TC_BRBINFO_4_1.py @@ -107,6 +107,7 @@ async def setup_class(self): self.set_of_dut_endpoints_before_adding_device = set(root_part_list) super().setup_class() + self.app_process = None app = self.user_params.get("th_server_app_path", None) if not app: asserts.fail('This test requires a TH_SERVER app. Specify app path with --string-arg th_server_app_path:') @@ -135,10 +136,16 @@ async def setup_class(self): params.commissioningParameters.setupManualCode, params.commissioningParameters.setupQRCode) def teardown_class(self): - logging.warning("Stopping app with SIGTERM") - self.app_process.send_signal(signal.SIGTERM.value) - self.app_process.wait() - os.remove(self.kvs) + # In case the th_server_app_path does not exist, then we failed the test + # and there is nothing to remove + if self.app_process is not None: + logging.warning("Stopping app with SIGTERM") + self.app_process.send_signal(signal.SIGTERM.value) + self.app_process.wait() + + if os.path.exists(self.kvs): + os.remove(self.kvs) + super().teardown_class() # diff --git a/src/python_testing/TC_CCTRL_2_2.py b/src/python_testing/TC_CCTRL_2_2.py index a2d209f0545400..6fd6b9764abac2 100644 --- a/src/python_testing/TC_CCTRL_2_2.py +++ b/src/python_testing/TC_CCTRL_2_2.py @@ -45,6 +45,7 @@ class TC_CCTRL_2_2(MatterBaseTest): async def setup_class(self): super().setup_class() # TODO: confirm whether we can open processes like this on the TH + self.app_process = None app = self.user_params.get("th_server_app_path", None) if not app: asserts.fail('This test requires a TH_SERVER app. Specify app path with --string-arg th_server_app_path:') @@ -73,11 +74,16 @@ async def setup_class(self): logging.info("Commissioning TH_SERVER complete") def teardown_class(self): - logging.warning("Stopping app with SIGTERM") - self.app_process.send_signal(signal.SIGTERM.value) - self.app_process.wait() + # In case the th_server_app_path does not exist, then we failed the test + # and there is nothing to remove + if self.app_process is not None: + logging.warning("Stopping app with SIGTERM") + self.app_process.send_signal(signal.SIGTERM.value) + self.app_process.wait() + + if os.path.exists(self.kvs): + os.remove(self.kvs) - os.remove(self.kvs) super().teardown_class() def steps_TC_CCTRL_2_2(self) -> list[TestStep]: diff --git a/src/python_testing/TC_MCORE_FS_1_1.py b/src/python_testing/TC_MCORE_FS_1_1.py index 50f4dc55c7399b..0680210babd191 100755 --- a/src/python_testing/TC_MCORE_FS_1_1.py +++ b/src/python_testing/TC_MCORE_FS_1_1.py @@ -37,6 +37,7 @@ class TC_MCORE_FS_1_1(MatterBaseTest): async def setup_class(self): super().setup_class() # TODO: confirm whether we can open processes like this on the TH + self.app_process = None app = self.user_params.get("th_server_app_path", None) if not app: asserts.fail('This test requires a TH_SERVER app. Specify app path with --string-arg th_server_app_path:') @@ -64,11 +65,15 @@ async def setup_class(self): logging.info("Commissioning TH_SERVER complete") def teardown_class(self): - logging.warning("Stopping app with SIGTERM") - self.app_process.send_signal(signal.SIGTERM.value) - self.app_process.wait() - - os.remove(self.kvs) + # In case the th_server_app_path does not exist, then we failed the test + # and there is nothing to remove + if self.app_process is not None: + logging.warning("Stopping app with SIGTERM") + self.app_process.send_signal(signal.SIGTERM.value) + self.app_process.wait() + + if os.path.exists(self.kvs): + os.remove(self.kvs) super().teardown_class() def steps_TC_MCORE_FS_1_1(self) -> list[TestStep]: From e1f29bdeddc89e73753406a9400c370ed81b1b02 Mon Sep 17 00:00:00 2001 From: Arkadiusz Bokowy Date: Wed, 14 Aug 2024 17:36:31 +0200 Subject: [PATCH 5/6] [Python] Auto-import all clusters into the chip.clusters namespace (#34928) * Auto-import all clusters into the chip.clusters namespace * Fix __all__ lists * ZAP-generate __all__ with all clusters --- .../py_matter_idl/matter_idl/lint/__init__.py | 2 +- scripts/tools/memory/memdf/__init__.py | 5 +- .../python/chip/clusters/Objects.py | 132 ++++++++++++++++++ .../python/chip/clusters/__init__.py | 58 +------- src/controller/python/chip/yaml/__init__.py | 2 +- .../templates/python-cluster-Objects-py.zapt | 9 ++ 6 files changed, 149 insertions(+), 59 deletions(-) diff --git a/scripts/py_matter_idl/matter_idl/lint/__init__.py b/scripts/py_matter_idl/matter_idl/lint/__init__.py index 3ab2b9f7badd25..6c7b1373f7a95e 100644 --- a/scripts/py_matter_idl/matter_idl/lint/__init__.py +++ b/scripts/py_matter_idl/matter_idl/lint/__init__.py @@ -14,4 +14,4 @@ from .lint_rules_parser import CreateParser -__all__ = [CreateParser] +__all__ = ['CreateParser'] diff --git a/scripts/tools/memory/memdf/__init__.py b/scripts/tools/memory/memdf/__init__.py index fa0e1070112ae4..0a523fbb29bbcb 100644 --- a/scripts/tools/memory/memdf/__init__.py +++ b/scripts/tools/memory/memdf/__init__.py @@ -18,4 +18,7 @@ from memdf.df import DF, DFs, ExtentDF, SectionDF, SegmentDF, SymbolDF from memdf.util.config import Config, ConfigDescription -__all__ = [DF, SymbolDF, SectionDF, SegmentDF, ExtentDF, DFs, Config, ConfigDescription] +__all__ = [ + 'DF', 'SymbolDF', 'SectionDF', 'SegmentDF', 'ExtentDF', + 'DFs', 'Config', 'ConfigDescription', +] diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index cff7adf4ae6fbb..eff056a243e54a 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -36,6 +36,138 @@ ClusterObjectDescriptor, ClusterObjectFieldDescriptor) from .Types import Nullable, NullValue + +__all__ = [ + "Globals", + "Identify", + "Groups", + "OnOff", + "OnOffSwitchConfiguration", + "LevelControl", + "BinaryInputBasic", + "PulseWidthModulation", + "Descriptor", + "Binding", + "AccessControl", + "Actions", + "BasicInformation", + "OtaSoftwareUpdateProvider", + "OtaSoftwareUpdateRequestor", + "LocalizationConfiguration", + "TimeFormatLocalization", + "UnitLocalization", + "PowerSourceConfiguration", + "PowerSource", + "GeneralCommissioning", + "NetworkCommissioning", + "DiagnosticLogs", + "GeneralDiagnostics", + "SoftwareDiagnostics", + "ThreadNetworkDiagnostics", + "WiFiNetworkDiagnostics", + "EthernetNetworkDiagnostics", + "TimeSynchronization", + "BridgedDeviceBasicInformation", + "Switch", + "AdministratorCommissioning", + "OperationalCredentials", + "GroupKeyManagement", + "FixedLabel", + "UserLabel", + "ProxyConfiguration", + "ProxyDiscovery", + "ProxyValid", + "BooleanState", + "IcdManagement", + "Timer", + "OvenCavityOperationalState", + "OvenMode", + "LaundryDryerControls", + "ModeSelect", + "LaundryWasherMode", + "RefrigeratorAndTemperatureControlledCabinetMode", + "LaundryWasherControls", + "RvcRunMode", + "RvcCleanMode", + "TemperatureControl", + "RefrigeratorAlarm", + "DishwasherMode", + "AirQuality", + "SmokeCoAlarm", + "DishwasherAlarm", + "MicrowaveOvenMode", + "MicrowaveOvenControl", + "OperationalState", + "RvcOperationalState", + "ScenesManagement", + "HepaFilterMonitoring", + "ActivatedCarbonFilterMonitoring", + "BooleanStateConfiguration", + "ValveConfigurationAndControl", + "ElectricalPowerMeasurement", + "ElectricalEnergyMeasurement", + "WaterHeaterManagement", + "DemandResponseLoadControl", + "Messages", + "DeviceEnergyManagement", + "EnergyEvse", + "EnergyPreference", + "PowerTopology", + "EnergyEvseMode", + "WaterHeaterMode", + "DeviceEnergyManagementMode", + "DoorLock", + "WindowCovering", + "BarrierControl", + "ServiceArea", + "PumpConfigurationAndControl", + "Thermostat", + "FanControl", + "ThermostatUserInterfaceConfiguration", + "ColorControl", + "BallastConfiguration", + "IlluminanceMeasurement", + "TemperatureMeasurement", + "PressureMeasurement", + "FlowMeasurement", + "RelativeHumidityMeasurement", + "OccupancySensing", + "CarbonMonoxideConcentrationMeasurement", + "CarbonDioxideConcentrationMeasurement", + "NitrogenDioxideConcentrationMeasurement", + "OzoneConcentrationMeasurement", + "Pm25ConcentrationMeasurement", + "FormaldehydeConcentrationMeasurement", + "Pm1ConcentrationMeasurement", + "Pm10ConcentrationMeasurement", + "TotalVolatileOrganicCompoundsConcentrationMeasurement", + "RadonConcentrationMeasurement", + "WiFiNetworkManagement", + "ThreadBorderRouterManagement", + "ThreadNetworkDirectory", + "WakeOnLan", + "Channel", + "TargetNavigator", + "MediaPlayback", + "MediaInput", + "LowPower", + "KeypadInput", + "ContentLauncher", + "AudioOutput", + "ApplicationLauncher", + "ApplicationBasic", + "AccountLogin", + "ContentControl", + "ContentAppObserver", + "EcosystemInformation", + "CommissionerControl", + "ElectricalMeasurement", + "UnitTesting", + "FaultInjection", + "SampleMei", +] + + class Globals: class Enums: class AreaTypeTag(MatterIntEnum): diff --git a/src/controller/python/chip/clusters/__init__.py b/src/controller/python/chip/clusters/__init__.py index b135345e9657de..14dc6f3e1d4185 100644 --- a/src/controller/python/chip/clusters/__init__.py +++ b/src/controller/python/chip/clusters/__init__.py @@ -15,59 +15,5 @@ # limitations under the License. # -# -# @file -# Provides Python APIs for CHIP. -# - -"""Provides Python APIs for CHIP.""" - -from . import Attribute, CHIPClusters, Command -from .Objects import (AccessControl, AccountLogin, Actions, ActivatedCarbonFilterMonitoring, AdministratorCommissioning, AirQuality, - ApplicationBasic, ApplicationLauncher, AudioOutput, BallastConfiguration, BarrierControl, BasicInformation, - BinaryInputBasic, Binding, BooleanState, BooleanStateConfiguration, BridgedDeviceBasicInformation, - CarbonDioxideConcentrationMeasurement, CarbonMonoxideConcentrationMeasurement, Channel, ColorControl, - CommissionerControl, ContentControl, ContentLauncher, DemandResponseLoadControl, Descriptor, - DeviceEnergyManagement, DeviceEnergyManagementMode, DiagnosticLogs, DishwasherAlarm, DishwasherMode, DoorLock, - EcosystemInformation, ElectricalEnergyMeasurement, ElectricalMeasurement, ElectricalPowerMeasurement, - EnergyEvse, EnergyEvseMode, EnergyPreference, EthernetNetworkDiagnostics, FanControl, FaultInjection, - FixedLabel, FlowMeasurement, FormaldehydeConcentrationMeasurement, GeneralCommissioning, GeneralDiagnostics, - Globals, GroupKeyManagement, Groups, HepaFilterMonitoring, IcdManagement, Identify, IlluminanceMeasurement, - KeypadInput, LaundryDryerControls, LaundryWasherControls, LaundryWasherMode, LevelControl, - LocalizationConfiguration, LowPower, MediaInput, MediaPlayback, MicrowaveOvenControl, MicrowaveOvenMode, - ModeSelect, NetworkCommissioning, NitrogenDioxideConcentrationMeasurement, OccupancySensing, OnOff, - OnOffSwitchConfiguration, OperationalCredentials, OperationalState, OtaSoftwareUpdateProvider, - OtaSoftwareUpdateRequestor, OvenCavityOperationalState, OvenMode, OzoneConcentrationMeasurement, - Pm1ConcentrationMeasurement, Pm10ConcentrationMeasurement, Pm25ConcentrationMeasurement, PowerSource, - PowerSourceConfiguration, PowerTopology, PressureMeasurement, ProxyConfiguration, ProxyDiscovery, ProxyValid, - PulseWidthModulation, PumpConfigurationAndControl, RadonConcentrationMeasurement, RefrigeratorAlarm, - RefrigeratorAndTemperatureControlledCabinetMode, RelativeHumidityMeasurement, RvcCleanMode, - RvcOperationalState, RvcRunMode, ScenesManagement, ServiceArea, SmokeCoAlarm, SoftwareDiagnostics, Switch, - TargetNavigator, TemperatureControl, TemperatureMeasurement, Thermostat, ThermostatUserInterfaceConfiguration, - ThreadBorderRouterManagement, ThreadNetworkDiagnostics, ThreadNetworkDirectory, TimeFormatLocalization, - TimeSynchronization, TotalVolatileOrganicCompoundsConcentrationMeasurement, UnitLocalization, UnitTesting, - UserLabel, ValveConfigurationAndControl, WakeOnLan, WaterHeaterManagement, WaterHeaterMode, - WiFiNetworkDiagnostics, WindowCovering) - -__all__ = [Attribute, CHIPClusters, Command, AccessControl, AccountLogin, Actions, ActivatedCarbonFilterMonitoring, AdministratorCommissioning, AirQuality, - ApplicationBasic, ApplicationLauncher, AudioOutput, BallastConfiguration, BarrierControl, BasicInformation, - BinaryInputBasic, Binding, BooleanState, BooleanStateConfiguration, BridgedDeviceBasicInformation, CarbonDioxideConcentrationMeasurement, - CarbonMonoxideConcentrationMeasurement, Channel, ColorControl, CommissionerControl, - ContentControl, ContentLauncher, DemandResponseLoadControl, Descriptor, DeviceEnergyManagementMode, DeviceEnergyManagement, DeviceEnergyManagementMode, DiagnosticLogs, DishwasherAlarm, DishwasherMode, - DoorLock, EcosystemInformation, ElectricalEnergyMeasurement, ElectricalMeasurement, ElectricalPowerMeasurement, EnergyEvse, EnergyEvseMode, EnergyPreference, - EthernetNetworkDiagnostics, FanControl, FaultInjection, FixedLabel, FlowMeasurement, - FormaldehydeConcentrationMeasurement, GeneralCommissioning, GeneralDiagnostics, Globals, GroupKeyManagement, Groups, - HepaFilterMonitoring, IcdManagement, Identify, IlluminanceMeasurement, KeypadInput, LaundryDryerControls, - LaundryWasherControls, LaundryWasherMode, LevelControl, LocalizationConfiguration, LowPower, MediaInput, MediaPlayback, MicrowaveOvenControl, - MicrowaveOvenMode, ModeSelect, NetworkCommissioning, NitrogenDioxideConcentrationMeasurement, - OccupancySensing, OnOff, OnOffSwitchConfiguration, OperationalCredentials, OperationalState, - OtaSoftwareUpdateProvider, OtaSoftwareUpdateRequestor, OvenCavityOperationalState, OvenMode, - OzoneConcentrationMeasurement, Pm1ConcentrationMeasurement, Pm10ConcentrationMeasurement, - Pm25ConcentrationMeasurement, PowerSource, PowerSourceConfiguration, PowerTopology, PressureMeasurement, ProxyConfiguration, - ProxyDiscovery, ProxyValid, PulseWidthModulation, PumpConfigurationAndControl, RadonConcentrationMeasurement, - RefrigeratorAlarm, RefrigeratorAndTemperatureControlledCabinetMode, RelativeHumidityMeasurement, RvcCleanMode, - RvcOperationalState, RvcRunMode, ScenesManagement, ServiceArea, SmokeCoAlarm, SoftwareDiagnostics, - Switch, TargetNavigator, TemperatureControl, TemperatureMeasurement, Thermostat, ThermostatUserInterfaceConfiguration, - ThreadBorderRouterManagement, ThreadNetworkDiagnostics, ThreadNetworkDirectory, TimeFormatLocalization, TimeSynchronization, - TotalVolatileOrganicCompoundsConcentrationMeasurement, UnitLocalization, - UnitTesting, UserLabel, ValveConfigurationAndControl, WakeOnLan, WaterHeaterManagement, WaterHeaterMode, WiFiNetworkDiagnostics, WindowCovering] +from . import Attribute, CHIPClusters, Command, Objects # noqa: F401 +from .Objects import * # noqa: F401, F403 diff --git a/src/controller/python/chip/yaml/__init__.py b/src/controller/python/chip/yaml/__init__.py index 7f312912b6664a..db829e97647a16 100644 --- a/src/controller/python/chip/yaml/__init__.py +++ b/src/controller/python/chip/yaml/__init__.py @@ -23,4 +23,4 @@ from . import runner -__all__ = [runner] +__all__ = ['runner'] diff --git a/src/controller/python/templates/python-cluster-Objects-py.zapt b/src/controller/python/templates/python-cluster-Objects-py.zapt index 0aa05721e69a16..3cb973d86dd356 100644 --- a/src/controller/python/templates/python-cluster-Objects-py.zapt +++ b/src/controller/python/templates/python-cluster-Objects-py.zapt @@ -19,6 +19,15 @@ from .ClusterObjects import (Cluster, ClusterAttributeDescriptor, ClusterCommand ClusterObjectDescriptor, ClusterObjectFieldDescriptor) from .Types import Nullable, NullValue + +__all__ = [ + "Globals", +{{#zcl_clusters}} + "{{asUpperCamelCase name}}", +{{/zcl_clusters}} +] + + class Globals: class Enums: {{#zcl_enums}} From 51dbf0ace51ba44f1c7512158aec3be864c6b097 Mon Sep 17 00:00:00 2001 From: Kiel Oleson Date: Wed, 14 Aug 2024 10:37:18 -0700 Subject: [PATCH 6/6] fix unused variable issue on non-macOS testing (#34970) --- .../Framework/CHIPTests/TestHelpers/MTRTestServerAppRunner.m | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/darwin/Framework/CHIPTests/TestHelpers/MTRTestServerAppRunner.m b/src/darwin/Framework/CHIPTests/TestHelpers/MTRTestServerAppRunner.m index 18424ed332a6af..077cd494045f4c 100644 --- a/src/darwin/Framework/CHIPTests/TestHelpers/MTRTestServerAppRunner.m +++ b/src/darwin/Framework/CHIPTests/TestHelpers/MTRTestServerAppRunner.m @@ -21,11 +21,13 @@ static unsigned sAppRunnerIndex = 1; +#if HAVE_NSTASK // kBasePort gets the discriminator added to it to figure out the port the app // should be using. This ensures that apps with distinct discriminators use // distinct ports. static const uint16_t kMinDiscriminator = 1111; static const uint16_t kBasePort = 5542 - kMinDiscriminator; +#endif // HAVE_NSTASK @implementation MTRTestServerAppRunner { unsigned _uniqueIndex;