From 10912741d1bfc6b0bbff92b3c045ee4f9b641475 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Tue, 30 May 2023 08:49:49 -0400 Subject: [PATCH] Align Thread Network Diagnostics XML to the spec. (#26860) * Align Thread Network Diagnostics XML to the spec. Spec changes happened in https://github.com/CHIP-Specifications/connectedhomeip-spec/pull/6169 and https://github.com/CHIP-Specifications/connectedhomeip-spec/pull/6338 Fixes https://github.com/project-chip/connectedhomeip/issues/25339 * Auto-update ZAP files. * Regenerate generated code. --- .../all-clusters-app.matter | 20 +- .../all-clusters-common/all-clusters-app.zap | 5 +- .../linux/AllClustersCommandDelegate.cpp | 10 +- .../all-clusters-minimal-app.matter | 20 +- .../all-clusters-minimal-app.zap | 2 +- .../bridge-common/bridge-app.matter | 20 +- .../bridge-app/bridge-common/bridge-app.zap | 2 +- ...p_rootnode_dimmablelight_bCwGYSDpoe.matter | 20 +- ...noip_rootnode_dimmablelight_bCwGYSDpoe.zap | 2 +- ...tnode_colortemperaturelight_hbUnzYVeyn.zap | 2 +- .../rootnode_contactsensor_lFAGG1bfRO.zap | 2 +- .../rootnode_dimmablelight_bCwGYSDpoe.zap | 2 +- .../devices/rootnode_doorlock_aNKYAreMXE.zap | 2 +- ...rootnode_extendedcolorlight_8lcaaYJVAa.zap | 2 +- .../chef/devices/rootnode_fan_7N2TobIlOX.zap | 2 +- .../rootnode_flowsensor_1zVxHedlaV.zap | 2 +- ...rootnode_heatingcoolingunit_ncdGai1E5a.zap | 2 +- .../rootnode_humiditysensor_Xyj4gda6Hb.zap | 2 +- .../rootnode_lightsensor_lZQycTFcJK.zap | 2 +- .../rootnode_occupancysensor_iHyVgifZuo.zap | 2 +- .../rootnode_onofflight_bbs1b7IaOV.zap | 2 +- .../rootnode_onofflightswitch_FsPlMr090Q.zap | 2 +- .../rootnode_onoffpluginunit_Wtf8ss5EBY.zap | 2 +- .../rootnode_pressuresensor_s0qC9wLH4k.zap | 2 +- .../chef/devices/rootnode_pump_a811bb33a0.zap | 2 +- .../devices/rootnode_speaker_RpzeXdimqA.zap | 2 +- .../rootnode_temperaturesensor_Qy1zkNW7c3.zap | 2 +- .../rootnode_thermostat_bm3fb8dhYi.zap | 2 +- .../rootnode_windowcovering_RLCxaGi9Yx.zap | 2 +- .../contact-sensor-app.matter | 20 +- .../contact-sensor-app.zap | 2 +- .../bridge-common/bridge-app.matter | 20 +- .../bridge-common/bridge-app.zap | 2 +- .../light-switch-app.matter | 20 +- .../light-switch-common/light-switch-app.zap | 2 +- .../data_model/lighting-app-thread.matter | 20 +- .../data_model/lighting-app-thread.zap | 2 +- .../data_model/lighting-app-wifi.zap | 2 +- .../lighting-common/lighting-app.matter | 20 +- .../lighting-common/lighting-app.zap | 17 +- .../nxp/zap/lighting-on-off.matter | 20 +- .../lighting-app/nxp/zap/lighting-on-off.zap | 2 +- examples/lighting-app/qpg/zap/light.matter | 20 +- examples/lighting-app/qpg/zap/light.zap | 2 +- .../data_model/lighting-thread-app.matter | 20 +- .../silabs/data_model/lighting-thread-app.zap | 2 +- .../silabs/data_model/lighting-wifi-app.zap | 2 +- examples/lock-app/lock-common/lock-app.matter | 20 +- examples/lock-app/lock-common/lock-app.zap | 2 +- examples/lock-app/nxp/zap/lock-app.matter | 20 +- examples/lock-app/nxp/zap/lock-app.zap | 2 +- examples/lock-app/qpg/zap/lock.matter | 20 +- examples/lock-app/qpg/zap/lock.zap | 2 +- .../placeholder/linux/apps/app1/config.matter | 40 +- .../placeholder/linux/apps/app1/config.zap | 2134 +++++++---------- .../placeholder/linux/apps/app2/config.matter | 40 +- .../placeholder/linux/apps/app2/config.zap | 2088 +++++++--------- examples/pump-app/pump-common/pump-app.matter | 20 +- examples/pump-app/pump-common/pump-app.zap | 2 +- .../pump-controller-app.matter | 20 +- .../pump-controller-app.zap | 2 +- .../thermostat-common/thermostat.matter | 20 +- .../thermostat-common/thermostat.zap | 2 +- examples/tv-app/tv-common/tv-app.matter | 20 +- examples/tv-app/tv-common/tv-app.zap | 2 +- .../tv-casting-common/tv-casting-app.zap | 2 +- examples/window-app/common/window-app.matter | 20 +- examples/window-app/common/window-app.zap | 2 +- .../zap/tests/inputs/all-clusters-app.zap | 2 +- .../tools/zap/tests/inputs/lighting-app.zap | 2 +- .../GenericFaultTestEventTriggerDelegate.cpp | 11 +- src/app/common/templates/config-data.yaml | 2 - .../thread-network-diagnostics-cluster.xml | 20 +- .../data_model/controller-clusters.matter | 20 +- .../data_model/controller-clusters.zap | 2 +- .../CHIPAttributeTLVValueDecoder.cpp | 41 +- .../java/zap-generated/CHIPReadCallbacks.cpp | 56 +- .../chip/devicecontroller/ChipClusters.java | 5 +- .../chip/devicecontroller/ChipStructs.java | 12 +- .../devicecontroller/ClusterInfoMapping.java | 9 +- .../python/chip/clusters/Objects.py | 48 +- .../CHIP/templates/availability.yaml | 50 +- .../MTRAttributeTLVValueDecoder.mm | 8 +- .../CHIP/zap-generated/MTRBaseClusters.mm | 8 +- .../CHIP/zap-generated/MTRCallbackBridge.h | 156 +- .../CHIP/zap-generated/MTRCallbackBridge.mm | 42 +- .../CHIP/zap-generated/MTRStructsObjc.h | 64 +- .../CHIP/zap-generated/MTRStructsObjc.mm | 14 +- .../Linux/DiagnosticDataProviderImpl.cpp | 6 +- ...nericThreadStackManagerImpl_OpenThread.hpp | 26 +- .../BL702/DiagnosticDataProviderImpl.cpp | 6 +- .../DiagnosticDataProviderImpl.cpp | 8 +- .../mt793x/DiagnosticDataProviderImpl.cpp | 6 +- .../qpg/DiagnosticDataProviderImpl.cpp | 8 +- .../silabs/DiagnosticDataProviderImpl.cpp | 6 +- .../webos/DiagnosticDataProviderImpl.cpp | 6 +- .../zap-generated/cluster-enums-check.h | 29 +- .../app-common/zap-generated/cluster-enums.h | 22 +- .../zap-generated/cluster-objects.cpp | 8 +- .../zap-generated/cluster-objects.h | 45 +- .../app-common/zap-generated/enums.h | 21 - .../zap-generated/cluster/Commands.h | 10 +- .../cluster/ComplexArgumentParser.cpp | 63 +- .../cluster/ComplexArgumentParser.h | 10 +- .../cluster/logging/DataModelLogger.cpp | 13 +- .../cluster/logging/DataModelLogger.h | 7 +- .../chip-tool/zap-generated/test/Commands.h | 4 +- 107 files changed, 2537 insertions(+), 3155 deletions(-) diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter index 913d86d67dbfbf..95e20cb968be24 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter @@ -1648,14 +1648,14 @@ server cluster ThreadNetworkDiagnostics = 53 { kNotConnected = 1; } - enum NetworkFault : ENUM8 { + enum NetworkFaultEnum : ENUM8 { kUnspecified = 0; kLinkDown = 1; kHardwareFailure = 2; kNetworkJammed = 3; } - enum RoutingRole : ENUM8 { + enum RoutingRoleEnum : ENUM8 { kUnspecified = 0; kUnassigned = 1; kSleepyEndDevice = 2; @@ -1672,7 +1672,7 @@ server cluster ThreadNetworkDiagnostics = 53 { kMACCounts = 0x8; } - struct NeighborTable { + struct NeighborTableStruct { int64u extAddress = 0; int32u age = 1; int16u rloc16 = 2; @@ -1704,7 +1704,7 @@ server cluster ThreadNetworkDiagnostics = 53 { boolean channelMaskPresent = 11; } - struct RouteTable { + struct RouteTableStruct { int64u extAddress = 0; int16u rloc16 = 1; int8u routerId = 2; @@ -1727,19 +1727,19 @@ server cluster ThreadNetworkDiagnostics = 53 { } info event NetworkFaultChange = 1 { - NetworkFault current[] = 0; - NetworkFault previous[] = 1; + NetworkFaultEnum current[] = 0; + NetworkFaultEnum previous[] = 1; } readonly attribute nullable int16u channel = 0; - readonly attribute nullable RoutingRole routingRole = 1; + readonly attribute nullable RoutingRoleEnum routingRole = 1; readonly attribute nullable char_string<16> networkName = 2; readonly attribute nullable int16u panId = 3; readonly attribute nullable int64u extendedPanId = 4; readonly attribute nullable octet_string<17> meshLocalPrefix = 5; readonly attribute int64u overrunCount = 6; - readonly attribute NeighborTable neighborTable[] = 7; - readonly attribute RouteTable routeTable[] = 8; + readonly attribute NeighborTableStruct neighborTable[] = 7; + readonly attribute RouteTableStruct routeTable[] = 8; readonly attribute nullable int32u partitionId = 9; readonly attribute nullable int8u weighting = 10; readonly attribute nullable int8u dataVersion = 11; @@ -1793,7 +1793,7 @@ server cluster ThreadNetworkDiagnostics = 53 { readonly attribute nullable SecurityPolicy securityPolicy = 59; readonly attribute nullable octet_string<4> channelPage0Mask = 60; readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61; - readonly attribute NetworkFault activeNetworkFaultsList[] = 62; + readonly attribute NetworkFaultEnum activeNetworkFaultsList[] = 62; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap index a0b8b9b9c95682..c87250960da3ec 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap @@ -3882,7 +3882,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "RoutingRole", + "type": "RoutingRoleEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -25792,6 +25792,5 @@ "endpointVersion": 1, "deviceIdentifier": 61442 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/all-clusters-app/linux/AllClustersCommandDelegate.cpp b/examples/all-clusters-app/linux/AllClustersCommandDelegate.cpp index 503bab4f001066..e3118377d51772 100644 --- a/examples/all-clusters-app/linux/AllClustersCommandDelegate.cpp +++ b/examples/all-clusters-app/linux/AllClustersCommandDelegate.cpp @@ -214,12 +214,12 @@ void AllClustersAppCommandHandler::OnGeneralFaultEventHandler(uint32_t eventId) GeneralFaults current; // On Linux Simulation, set following radio faults statically. - ReturnOnFailure(previous.add(EMBER_ZCL_NETWORK_FAULT_ENUM_HARDWARE_FAILURE)); - ReturnOnFailure(previous.add(EMBER_ZCL_NETWORK_FAULT_ENUM_NETWORK_JAMMED)); + ReturnOnFailure(previous.add(to_underlying(Clusters::GeneralDiagnostics::NetworkFaultEnum::kHardwareFailure))); + ReturnOnFailure(previous.add(to_underlying(Clusters::GeneralDiagnostics::NetworkFaultEnum::kNetworkJammed))); - ReturnOnFailure(current.add(EMBER_ZCL_NETWORK_FAULT_ENUM_HARDWARE_FAILURE)); - ReturnOnFailure(current.add(EMBER_ZCL_NETWORK_FAULT_ENUM_NETWORK_JAMMED)); - ReturnOnFailure(current.add(EMBER_ZCL_NETWORK_FAULT_ENUM_CONNECTION_FAILED)); + ReturnOnFailure(current.add(to_underlying(Clusters::GeneralDiagnostics::NetworkFaultEnum::kHardwareFailure))); + ReturnOnFailure(current.add(to_underlying(Clusters::GeneralDiagnostics::NetworkFaultEnum::kNetworkJammed))); + ReturnOnFailure(current.add(to_underlying(Clusters::GeneralDiagnostics::NetworkFaultEnum::kConnectionFailed))); Clusters::GeneralDiagnosticsServer::Instance().OnNetworkFaultsDetect(previous, current); } else diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter index 07f74cdb9e7b77..1193a78f0bb220 100644 --- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter +++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter @@ -1492,14 +1492,14 @@ server cluster ThreadNetworkDiagnostics = 53 { kNotConnected = 1; } - enum NetworkFault : ENUM8 { + enum NetworkFaultEnum : ENUM8 { kUnspecified = 0; kLinkDown = 1; kHardwareFailure = 2; kNetworkJammed = 3; } - enum RoutingRole : ENUM8 { + enum RoutingRoleEnum : ENUM8 { kUnspecified = 0; kUnassigned = 1; kSleepyEndDevice = 2; @@ -1516,7 +1516,7 @@ server cluster ThreadNetworkDiagnostics = 53 { kMACCounts = 0x8; } - struct NeighborTable { + struct NeighborTableStruct { int64u extAddress = 0; int32u age = 1; int16u rloc16 = 2; @@ -1548,7 +1548,7 @@ server cluster ThreadNetworkDiagnostics = 53 { boolean channelMaskPresent = 11; } - struct RouteTable { + struct RouteTableStruct { int64u extAddress = 0; int16u rloc16 = 1; int8u routerId = 2; @@ -1571,18 +1571,18 @@ server cluster ThreadNetworkDiagnostics = 53 { } info event NetworkFaultChange = 1 { - NetworkFault current[] = 0; - NetworkFault previous[] = 1; + NetworkFaultEnum current[] = 0; + NetworkFaultEnum previous[] = 1; } readonly attribute nullable int16u channel = 0; - readonly attribute nullable RoutingRole routingRole = 1; + readonly attribute nullable RoutingRoleEnum routingRole = 1; readonly attribute nullable char_string<16> networkName = 2; readonly attribute nullable int16u panId = 3; readonly attribute nullable int64u extendedPanId = 4; readonly attribute nullable octet_string<17> meshLocalPrefix = 5; - readonly attribute NeighborTable neighborTable[] = 7; - readonly attribute RouteTable routeTable[] = 8; + readonly attribute NeighborTableStruct neighborTable[] = 7; + readonly attribute RouteTableStruct routeTable[] = 8; readonly attribute nullable int32u partitionId = 9; readonly attribute nullable int8u weighting = 10; readonly attribute nullable int8u dataVersion = 11; @@ -1591,7 +1591,7 @@ server cluster ThreadNetworkDiagnostics = 53 { readonly attribute nullable SecurityPolicy securityPolicy = 59; readonly attribute nullable octet_string<4> channelPage0Mask = 60; readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61; - readonly attribute NetworkFault activeNetworkFaultsList[] = 62; + readonly attribute NetworkFaultEnum activeNetworkFaultsList[] = 62; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap index b02e910590df29..42d53565aa5d27 100644 --- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap +++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap @@ -3806,7 +3806,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "RoutingRole", + "type": "RoutingRoleEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter index 32b8d2ebc54668..e953b467ed77ac 100644 --- a/examples/bridge-app/bridge-common/bridge-app.matter +++ b/examples/bridge-app/bridge-common/bridge-app.matter @@ -1034,14 +1034,14 @@ server cluster ThreadNetworkDiagnostics = 53 { kNotConnected = 1; } - enum NetworkFault : ENUM8 { + enum NetworkFaultEnum : ENUM8 { kUnspecified = 0; kLinkDown = 1; kHardwareFailure = 2; kNetworkJammed = 3; } - enum RoutingRole : ENUM8 { + enum RoutingRoleEnum : ENUM8 { kUnspecified = 0; kUnassigned = 1; kSleepyEndDevice = 2; @@ -1058,7 +1058,7 @@ server cluster ThreadNetworkDiagnostics = 53 { kMACCounts = 0x8; } - struct NeighborTable { + struct NeighborTableStruct { int64u extAddress = 0; int32u age = 1; int16u rloc16 = 2; @@ -1090,7 +1090,7 @@ server cluster ThreadNetworkDiagnostics = 53 { boolean channelMaskPresent = 11; } - struct RouteTable { + struct RouteTableStruct { int64u extAddress = 0; int16u rloc16 = 1; int8u routerId = 2; @@ -1113,19 +1113,19 @@ server cluster ThreadNetworkDiagnostics = 53 { } info event NetworkFaultChange = 1 { - NetworkFault current[] = 0; - NetworkFault previous[] = 1; + NetworkFaultEnum current[] = 0; + NetworkFaultEnum previous[] = 1; } readonly attribute nullable int16u channel = 0; - readonly attribute nullable RoutingRole routingRole = 1; + readonly attribute nullable RoutingRoleEnum routingRole = 1; readonly attribute nullable char_string<16> networkName = 2; readonly attribute nullable int16u panId = 3; readonly attribute nullable int64u extendedPanId = 4; readonly attribute nullable octet_string<17> meshLocalPrefix = 5; readonly attribute int64u overrunCount = 6; - readonly attribute NeighborTable neighborTable[] = 7; - readonly attribute RouteTable routeTable[] = 8; + readonly attribute NeighborTableStruct neighborTable[] = 7; + readonly attribute RouteTableStruct routeTable[] = 8; readonly attribute nullable int32u partitionId = 9; readonly attribute nullable int8u weighting = 10; readonly attribute nullable int8u dataVersion = 11; @@ -1179,7 +1179,7 @@ server cluster ThreadNetworkDiagnostics = 53 { readonly attribute nullable SecurityPolicy securityPolicy = 59; readonly attribute nullable octet_string<4> channelPage0Mask = 60; readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61; - readonly attribute NetworkFault activeNetworkFaultsList[] = 62; + readonly attribute NetworkFaultEnum activeNetworkFaultsList[] = 62; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; diff --git a/examples/bridge-app/bridge-common/bridge-app.zap b/examples/bridge-app/bridge-common/bridge-app.zap index 920ea1722e4c65..5911b5466b9ee9 100644 --- a/examples/bridge-app/bridge-common/bridge-app.zap +++ b/examples/bridge-app/bridge-common/bridge-app.zap @@ -2559,7 +2559,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "RoutingRole", + "type": "RoutingRoleEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter index 87a82162e811a4..641130d29f6ded 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter @@ -916,14 +916,14 @@ server cluster ThreadNetworkDiagnostics = 53 { kNotConnected = 1; } - enum NetworkFault : ENUM8 { + enum NetworkFaultEnum : ENUM8 { kUnspecified = 0; kLinkDown = 1; kHardwareFailure = 2; kNetworkJammed = 3; } - enum RoutingRole : ENUM8 { + enum RoutingRoleEnum : ENUM8 { kUnspecified = 0; kUnassigned = 1; kSleepyEndDevice = 2; @@ -940,7 +940,7 @@ server cluster ThreadNetworkDiagnostics = 53 { kMACCounts = 0x8; } - struct NeighborTable { + struct NeighborTableStruct { int64u extAddress = 0; int32u age = 1; int16u rloc16 = 2; @@ -972,7 +972,7 @@ server cluster ThreadNetworkDiagnostics = 53 { boolean channelMaskPresent = 11; } - struct RouteTable { + struct RouteTableStruct { int64u extAddress = 0; int16u rloc16 = 1; int8u routerId = 2; @@ -995,19 +995,19 @@ server cluster ThreadNetworkDiagnostics = 53 { } info event NetworkFaultChange = 1 { - NetworkFault current[] = 0; - NetworkFault previous[] = 1; + NetworkFaultEnum current[] = 0; + NetworkFaultEnum previous[] = 1; } readonly attribute nullable int16u channel = 0; - readonly attribute nullable RoutingRole routingRole = 1; + readonly attribute nullable RoutingRoleEnum routingRole = 1; readonly attribute nullable char_string<16> networkName = 2; readonly attribute nullable int16u panId = 3; readonly attribute nullable int64u extendedPanId = 4; readonly attribute nullable octet_string<17> meshLocalPrefix = 5; readonly attribute int64u overrunCount = 6; - readonly attribute NeighborTable neighborTable[] = 7; - readonly attribute RouteTable routeTable[] = 8; + readonly attribute NeighborTableStruct neighborTable[] = 7; + readonly attribute RouteTableStruct routeTable[] = 8; readonly attribute nullable int32u partitionId = 9; readonly attribute nullable int8u weighting = 10; readonly attribute nullable int8u dataVersion = 11; @@ -1061,7 +1061,7 @@ server cluster ThreadNetworkDiagnostics = 53 { readonly attribute nullable SecurityPolicy securityPolicy = 59; readonly attribute nullable octet_string<4> channelPage0Mask = 60; readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61; - readonly attribute NetworkFault activeNetworkFaultsList[] = 62; + readonly attribute NetworkFaultEnum activeNetworkFaultsList[] = 62; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap index f031d3d9433850..583a90f240395d 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap @@ -3076,7 +3076,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "RoutingRole", + "type": "RoutingRoleEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap index 3443a88d64a262..b2e59932566bad 100644 --- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap +++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap @@ -3076,7 +3076,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "RoutingRole", + "type": "RoutingRoleEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap index 1a347ec67f7d14..1588271f0e1ac1 100644 --- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap +++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap @@ -3076,7 +3076,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "RoutingRole", + "type": "RoutingRoleEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap index 771cfe79ea257c..a12503c6280a59 100644 --- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap +++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap @@ -3124,7 +3124,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "RoutingRole", + "type": "RoutingRoleEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap index a398cfeb508adf..3fdaa2166a91b0 100644 --- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap +++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap @@ -3076,7 +3076,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "RoutingRole", + "type": "RoutingRoleEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap index a6df9196a26fe8..e72d130045e838 100644 --- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap +++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap @@ -3076,7 +3076,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "RoutingRole", + "type": "RoutingRoleEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap b/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap index 0e21ca5c62cd29..051d00c59c122e 100644 --- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap +++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap @@ -3124,7 +3124,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "RoutingRole", + "type": "RoutingRoleEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap index ff13ace51cf8cb..9cafe222aa5d7f 100644 --- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap +++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap @@ -3076,7 +3076,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "RoutingRole", + "type": "RoutingRoleEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap index 8f9676e852e8ca..fc8a1d59ee3659 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap @@ -3076,7 +3076,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "RoutingRole", + "type": "RoutingRoleEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap index aac331b52eeb5b..54a810ea92bde4 100644 --- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap +++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap @@ -3076,7 +3076,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "RoutingRole", + "type": "RoutingRoleEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap index a321d2b57dfc8d..f74319cc59434f 100644 --- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap +++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap @@ -3076,7 +3076,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "RoutingRole", + "type": "RoutingRoleEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap index c19b17b01fe861..7efab7fc93c264 100644 --- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap +++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap @@ -3076,7 +3076,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "RoutingRole", + "type": "RoutingRoleEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap index 6f557a2971aad9..ab2c7a1b66d617 100644 --- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap +++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap @@ -3076,7 +3076,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "RoutingRole", + "type": "RoutingRoleEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap index a351b6a168e6d2..17e5f453deff26 100644 --- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap +++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap @@ -3076,7 +3076,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "RoutingRole", + "type": "RoutingRoleEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap index 2d1328ac9ee5cd..6a6ba106743e11 100644 --- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap +++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap @@ -3076,7 +3076,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "RoutingRole", + "type": "RoutingRoleEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap index 45d9a0226eaded..5cbfd18334cb33 100644 --- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap +++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap @@ -3076,7 +3076,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "RoutingRole", + "type": "RoutingRoleEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_pump_a811bb33a0.zap b/examples/chef/devices/rootnode_pump_a811bb33a0.zap index af6d2602a5281a..fdc261853dc520 100644 --- a/examples/chef/devices/rootnode_pump_a811bb33a0.zap +++ b/examples/chef/devices/rootnode_pump_a811bb33a0.zap @@ -3705,7 +3705,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "RoutingRole", + "type": "RoutingRoleEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap index 6e54444375e979..09cb5eac3019cf 100644 --- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap +++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap @@ -3076,7 +3076,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "RoutingRole", + "type": "RoutingRoleEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap index c205b1d68d4574..80bbbb2a262228 100644 --- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap +++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap @@ -3076,7 +3076,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "RoutingRole", + "type": "RoutingRoleEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap index 32bc098ba3d18d..99a099dc505d9f 100644 --- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap +++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap @@ -3124,7 +3124,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "RoutingRole", + "type": "RoutingRoleEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap index fac7b92e7d549b..2cca7b2455d9e5 100644 --- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap +++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap @@ -3076,7 +3076,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "RoutingRole", + "type": "RoutingRoleEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter index f917642c646937..cd86ce684438e7 100644 --- a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter +++ b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter @@ -894,14 +894,14 @@ server cluster ThreadNetworkDiagnostics = 53 { kNotConnected = 1; } - enum NetworkFault : ENUM8 { + enum NetworkFaultEnum : ENUM8 { kUnspecified = 0; kLinkDown = 1; kHardwareFailure = 2; kNetworkJammed = 3; } - enum RoutingRole : ENUM8 { + enum RoutingRoleEnum : ENUM8 { kUnspecified = 0; kUnassigned = 1; kSleepyEndDevice = 2; @@ -918,7 +918,7 @@ server cluster ThreadNetworkDiagnostics = 53 { kMACCounts = 0x8; } - struct NeighborTable { + struct NeighborTableStruct { int64u extAddress = 0; int32u age = 1; int16u rloc16 = 2; @@ -950,7 +950,7 @@ server cluster ThreadNetworkDiagnostics = 53 { boolean channelMaskPresent = 11; } - struct RouteTable { + struct RouteTableStruct { int64u extAddress = 0; int16u rloc16 = 1; int8u routerId = 2; @@ -973,19 +973,19 @@ server cluster ThreadNetworkDiagnostics = 53 { } info event NetworkFaultChange = 1 { - NetworkFault current[] = 0; - NetworkFault previous[] = 1; + NetworkFaultEnum current[] = 0; + NetworkFaultEnum previous[] = 1; } readonly attribute nullable int16u channel = 0; - readonly attribute nullable RoutingRole routingRole = 1; + readonly attribute nullable RoutingRoleEnum routingRole = 1; readonly attribute nullable char_string<16> networkName = 2; readonly attribute nullable int16u panId = 3; readonly attribute nullable int64u extendedPanId = 4; readonly attribute nullable octet_string<17> meshLocalPrefix = 5; readonly attribute int64u overrunCount = 6; - readonly attribute NeighborTable neighborTable[] = 7; - readonly attribute RouteTable routeTable[] = 8; + readonly attribute NeighborTableStruct neighborTable[] = 7; + readonly attribute RouteTableStruct routeTable[] = 8; readonly attribute nullable int32u partitionId = 9; readonly attribute nullable int8u weighting = 10; readonly attribute nullable int8u dataVersion = 11; @@ -1039,7 +1039,7 @@ server cluster ThreadNetworkDiagnostics = 53 { readonly attribute nullable SecurityPolicy securityPolicy = 59; readonly attribute nullable octet_string<4> channelPage0Mask = 60; readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61; - readonly attribute NetworkFault activeNetworkFaultsList[] = 62; + readonly attribute NetworkFaultEnum activeNetworkFaultsList[] = 62; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; diff --git a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap index 990672ee1d0346..33ae14795f50a3 100644 --- a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap +++ b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap @@ -3076,7 +3076,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "RoutingRole", + "type": "RoutingRoleEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/dynamic-bridge-app/bridge-common/bridge-app.matter b/examples/dynamic-bridge-app/bridge-common/bridge-app.matter index b10efb5b7ddf62..47b4d0c3df0a3e 100644 --- a/examples/dynamic-bridge-app/bridge-common/bridge-app.matter +++ b/examples/dynamic-bridge-app/bridge-common/bridge-app.matter @@ -1034,14 +1034,14 @@ server cluster ThreadNetworkDiagnostics = 53 { kNotConnected = 1; } - enum NetworkFault : ENUM8 { + enum NetworkFaultEnum : ENUM8 { kUnspecified = 0; kLinkDown = 1; kHardwareFailure = 2; kNetworkJammed = 3; } - enum RoutingRole : ENUM8 { + enum RoutingRoleEnum : ENUM8 { kUnspecified = 0; kUnassigned = 1; kSleepyEndDevice = 2; @@ -1058,7 +1058,7 @@ server cluster ThreadNetworkDiagnostics = 53 { kMACCounts = 0x8; } - struct NeighborTable { + struct NeighborTableStruct { int64u extAddress = 0; int32u age = 1; int16u rloc16 = 2; @@ -1090,7 +1090,7 @@ server cluster ThreadNetworkDiagnostics = 53 { boolean channelMaskPresent = 11; } - struct RouteTable { + struct RouteTableStruct { int64u extAddress = 0; int16u rloc16 = 1; int8u routerId = 2; @@ -1113,19 +1113,19 @@ server cluster ThreadNetworkDiagnostics = 53 { } info event NetworkFaultChange = 1 { - NetworkFault current[] = 0; - NetworkFault previous[] = 1; + NetworkFaultEnum current[] = 0; + NetworkFaultEnum previous[] = 1; } readonly attribute nullable int16u channel = 0; - readonly attribute nullable RoutingRole routingRole = 1; + readonly attribute nullable RoutingRoleEnum routingRole = 1; readonly attribute nullable char_string<16> networkName = 2; readonly attribute nullable int16u panId = 3; readonly attribute nullable int64u extendedPanId = 4; readonly attribute nullable octet_string<17> meshLocalPrefix = 5; readonly attribute int64u overrunCount = 6; - readonly attribute NeighborTable neighborTable[] = 7; - readonly attribute RouteTable routeTable[] = 8; + readonly attribute NeighborTableStruct neighborTable[] = 7; + readonly attribute RouteTableStruct routeTable[] = 8; readonly attribute nullable int32u partitionId = 9; readonly attribute nullable int8u weighting = 10; readonly attribute nullable int8u dataVersion = 11; @@ -1179,7 +1179,7 @@ server cluster ThreadNetworkDiagnostics = 53 { readonly attribute nullable SecurityPolicy securityPolicy = 59; readonly attribute nullable octet_string<4> channelPage0Mask = 60; readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61; - readonly attribute NetworkFault activeNetworkFaultsList[] = 62; + readonly attribute NetworkFaultEnum activeNetworkFaultsList[] = 62; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; diff --git a/examples/dynamic-bridge-app/bridge-common/bridge-app.zap b/examples/dynamic-bridge-app/bridge-common/bridge-app.zap index 4b3a07cd0c4618..3efd440348afb4 100644 --- a/examples/dynamic-bridge-app/bridge-common/bridge-app.zap +++ b/examples/dynamic-bridge-app/bridge-common/bridge-app.zap @@ -2557,7 +2557,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "RoutingRole", + "type": "RoutingRoleEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.matter b/examples/light-switch-app/light-switch-common/light-switch-app.matter index 5159a1b6b2f60d..d3c365b65e19c3 100644 --- a/examples/light-switch-app/light-switch-common/light-switch-app.matter +++ b/examples/light-switch-app/light-switch-common/light-switch-app.matter @@ -1204,14 +1204,14 @@ server cluster ThreadNetworkDiagnostics = 53 { kNotConnected = 1; } - enum NetworkFault : ENUM8 { + enum NetworkFaultEnum : ENUM8 { kUnspecified = 0; kLinkDown = 1; kHardwareFailure = 2; kNetworkJammed = 3; } - enum RoutingRole : ENUM8 { + enum RoutingRoleEnum : ENUM8 { kUnspecified = 0; kUnassigned = 1; kSleepyEndDevice = 2; @@ -1228,7 +1228,7 @@ server cluster ThreadNetworkDiagnostics = 53 { kMACCounts = 0x8; } - struct NeighborTable { + struct NeighborTableStruct { int64u extAddress = 0; int32u age = 1; int16u rloc16 = 2; @@ -1260,7 +1260,7 @@ server cluster ThreadNetworkDiagnostics = 53 { boolean channelMaskPresent = 11; } - struct RouteTable { + struct RouteTableStruct { int64u extAddress = 0; int16u rloc16 = 1; int8u routerId = 2; @@ -1283,19 +1283,19 @@ server cluster ThreadNetworkDiagnostics = 53 { } info event NetworkFaultChange = 1 { - NetworkFault current[] = 0; - NetworkFault previous[] = 1; + NetworkFaultEnum current[] = 0; + NetworkFaultEnum previous[] = 1; } readonly attribute nullable int16u channel = 0; - readonly attribute nullable RoutingRole routingRole = 1; + readonly attribute nullable RoutingRoleEnum routingRole = 1; readonly attribute nullable char_string<16> networkName = 2; readonly attribute nullable int16u panId = 3; readonly attribute nullable int64u extendedPanId = 4; readonly attribute nullable octet_string<17> meshLocalPrefix = 5; readonly attribute int64u overrunCount = 6; - readonly attribute NeighborTable neighborTable[] = 7; - readonly attribute RouteTable routeTable[] = 8; + readonly attribute NeighborTableStruct neighborTable[] = 7; + readonly attribute RouteTableStruct routeTable[] = 8; readonly attribute nullable int32u partitionId = 9; readonly attribute nullable int8u weighting = 10; readonly attribute nullable int8u dataVersion = 11; @@ -1349,7 +1349,7 @@ server cluster ThreadNetworkDiagnostics = 53 { readonly attribute nullable SecurityPolicy securityPolicy = 59; readonly attribute nullable octet_string<4> channelPage0Mask = 60; readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61; - readonly attribute NetworkFault activeNetworkFaultsList[] = 62; + readonly attribute NetworkFaultEnum activeNetworkFaultsList[] = 62; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.zap b/examples/light-switch-app/light-switch-common/light-switch-app.zap index 674a2b2b610f66..fe827432b4ad43 100644 --- a/examples/light-switch-app/light-switch-common/light-switch-app.zap +++ b/examples/light-switch-app/light-switch-common/light-switch-app.zap @@ -3058,7 +3058,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "RoutingRole", + "type": "RoutingRoleEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter index 976e85afbb1f97..4430a35d729033 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter @@ -1064,14 +1064,14 @@ server cluster ThreadNetworkDiagnostics = 53 { kNotConnected = 1; } - enum NetworkFault : ENUM8 { + enum NetworkFaultEnum : ENUM8 { kUnspecified = 0; kLinkDown = 1; kHardwareFailure = 2; kNetworkJammed = 3; } - enum RoutingRole : ENUM8 { + enum RoutingRoleEnum : ENUM8 { kUnspecified = 0; kUnassigned = 1; kSleepyEndDevice = 2; @@ -1088,7 +1088,7 @@ server cluster ThreadNetworkDiagnostics = 53 { kMACCounts = 0x8; } - struct NeighborTable { + struct NeighborTableStruct { int64u extAddress = 0; int32u age = 1; int16u rloc16 = 2; @@ -1120,7 +1120,7 @@ server cluster ThreadNetworkDiagnostics = 53 { boolean channelMaskPresent = 11; } - struct RouteTable { + struct RouteTableStruct { int64u extAddress = 0; int16u rloc16 = 1; int8u routerId = 2; @@ -1143,19 +1143,19 @@ server cluster ThreadNetworkDiagnostics = 53 { } info event NetworkFaultChange = 1 { - NetworkFault current[] = 0; - NetworkFault previous[] = 1; + NetworkFaultEnum current[] = 0; + NetworkFaultEnum previous[] = 1; } readonly attribute nullable int16u channel = 0; - readonly attribute nullable RoutingRole routingRole = 1; + readonly attribute nullable RoutingRoleEnum routingRole = 1; readonly attribute nullable char_string<16> networkName = 2; readonly attribute nullable int16u panId = 3; readonly attribute nullable int64u extendedPanId = 4; readonly attribute nullable octet_string<17> meshLocalPrefix = 5; readonly attribute int64u overrunCount = 6; - readonly attribute NeighborTable neighborTable[] = 7; - readonly attribute RouteTable routeTable[] = 8; + readonly attribute NeighborTableStruct neighborTable[] = 7; + readonly attribute RouteTableStruct routeTable[] = 8; readonly attribute nullable int32u partitionId = 9; readonly attribute nullable int8u weighting = 10; readonly attribute nullable int8u dataVersion = 11; @@ -1209,7 +1209,7 @@ server cluster ThreadNetworkDiagnostics = 53 { readonly attribute nullable SecurityPolicy securityPolicy = 59; readonly attribute nullable octet_string<4> channelPage0Mask = 60; readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61; - readonly attribute NetworkFault activeNetworkFaultsList[] = 62; + readonly attribute NetworkFaultEnum activeNetworkFaultsList[] = 62; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap index dbf0663ffb543a..ae1990d056a28c 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap @@ -3097,7 +3097,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "RoutingRole", + "type": "RoutingRoleEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap index 819a1096f730d4..b1ac849930fbb0 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap @@ -3097,7 +3097,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "RoutingRole", + "type": "RoutingRoleEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter index 580e84183ff551..d16211088b2605 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -1064,14 +1064,14 @@ server cluster ThreadNetworkDiagnostics = 53 { kNotConnected = 1; } - enum NetworkFault : ENUM8 { + enum NetworkFaultEnum : ENUM8 { kUnspecified = 0; kLinkDown = 1; kHardwareFailure = 2; kNetworkJammed = 3; } - enum RoutingRole : ENUM8 { + enum RoutingRoleEnum : ENUM8 { kUnspecified = 0; kUnassigned = 1; kSleepyEndDevice = 2; @@ -1088,7 +1088,7 @@ server cluster ThreadNetworkDiagnostics = 53 { kMACCounts = 0x8; } - struct NeighborTable { + struct NeighborTableStruct { int64u extAddress = 0; int32u age = 1; int16u rloc16 = 2; @@ -1120,7 +1120,7 @@ server cluster ThreadNetworkDiagnostics = 53 { boolean channelMaskPresent = 11; } - struct RouteTable { + struct RouteTableStruct { int64u extAddress = 0; int16u rloc16 = 1; int8u routerId = 2; @@ -1143,19 +1143,19 @@ server cluster ThreadNetworkDiagnostics = 53 { } info event NetworkFaultChange = 1 { - NetworkFault current[] = 0; - NetworkFault previous[] = 1; + NetworkFaultEnum current[] = 0; + NetworkFaultEnum previous[] = 1; } readonly attribute nullable int16u channel = 0; - readonly attribute nullable RoutingRole routingRole = 1; + readonly attribute nullable RoutingRoleEnum routingRole = 1; readonly attribute nullable char_string<16> networkName = 2; readonly attribute nullable int16u panId = 3; readonly attribute nullable int64u extendedPanId = 4; readonly attribute nullable octet_string<17> meshLocalPrefix = 5; readonly attribute int64u overrunCount = 6; - readonly attribute NeighborTable neighborTable[] = 7; - readonly attribute RouteTable routeTable[] = 8; + readonly attribute NeighborTableStruct neighborTable[] = 7; + readonly attribute RouteTableStruct routeTable[] = 8; readonly attribute nullable int32u partitionId = 9; readonly attribute nullable int8u weighting = 10; readonly attribute nullable int8u dataVersion = 11; @@ -1209,7 +1209,7 @@ server cluster ThreadNetworkDiagnostics = 53 { readonly attribute nullable SecurityPolicy securityPolicy = 59; readonly attribute nullable octet_string<4> channelPage0Mask = 60; readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61; - readonly attribute NetworkFault activeNetworkFaultsList[] = 62; + readonly attribute NetworkFaultEnum activeNetworkFaultsList[] = 62; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; diff --git a/examples/lighting-app/lighting-common/lighting-app.zap b/examples/lighting-app/lighting-common/lighting-app.zap index d799c8d0bb3d13..f2529981be20d3 100644 --- a/examples/lighting-app/lighting-common/lighting-app.zap +++ b/examples/lighting-app/lighting-common/lighting-app.zap @@ -16,12 +16,6 @@ } ], "package": [ - { - "pathRelativity": "relativeToZap", - "path": "../../../src/app/zap-templates/app-templates.json", - "type": "gen-templates-json", - "version": "chip-v1" - }, { "pathRelativity": "relativeToZap", "path": "../../../src/app/zap-templates/zcl/zcl.json", @@ -29,6 +23,12 @@ "category": "matter", "version": 1, "description": "Matter SDK ZCL data" + }, + { + "pathRelativity": "relativeToZap", + "path": "../../../src/app/zap-templates/app-templates.json", + "type": "gen-templates-json", + "version": "chip-v1" } ], "endpointTypes": [ @@ -3097,7 +3097,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "RoutingRole", + "type": "RoutingRoleEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -8341,6 +8341,5 @@ "endpointVersion": 1, "deviceIdentifier": 257 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.matter b/examples/lighting-app/nxp/zap/lighting-on-off.matter index 5d2e33735e97d8..685fac309473ba 100644 --- a/examples/lighting-app/nxp/zap/lighting-on-off.matter +++ b/examples/lighting-app/nxp/zap/lighting-on-off.matter @@ -948,14 +948,14 @@ server cluster ThreadNetworkDiagnostics = 53 { kNotConnected = 1; } - enum NetworkFault : ENUM8 { + enum NetworkFaultEnum : ENUM8 { kUnspecified = 0; kLinkDown = 1; kHardwareFailure = 2; kNetworkJammed = 3; } - enum RoutingRole : ENUM8 { + enum RoutingRoleEnum : ENUM8 { kUnspecified = 0; kUnassigned = 1; kSleepyEndDevice = 2; @@ -972,7 +972,7 @@ server cluster ThreadNetworkDiagnostics = 53 { kMACCounts = 0x8; } - struct NeighborTable { + struct NeighborTableStruct { int64u extAddress = 0; int32u age = 1; int16u rloc16 = 2; @@ -1004,7 +1004,7 @@ server cluster ThreadNetworkDiagnostics = 53 { boolean channelMaskPresent = 11; } - struct RouteTable { + struct RouteTableStruct { int64u extAddress = 0; int16u rloc16 = 1; int8u routerId = 2; @@ -1027,19 +1027,19 @@ server cluster ThreadNetworkDiagnostics = 53 { } info event NetworkFaultChange = 1 { - NetworkFault current[] = 0; - NetworkFault previous[] = 1; + NetworkFaultEnum current[] = 0; + NetworkFaultEnum previous[] = 1; } readonly attribute nullable int16u channel = 0; - readonly attribute nullable RoutingRole routingRole = 1; + readonly attribute nullable RoutingRoleEnum routingRole = 1; readonly attribute nullable char_string<16> networkName = 2; readonly attribute nullable int16u panId = 3; readonly attribute nullable int64u extendedPanId = 4; readonly attribute nullable octet_string<17> meshLocalPrefix = 5; readonly attribute int64u overrunCount = 6; - readonly attribute NeighborTable neighborTable[] = 7; - readonly attribute RouteTable routeTable[] = 8; + readonly attribute NeighborTableStruct neighborTable[] = 7; + readonly attribute RouteTableStruct routeTable[] = 8; readonly attribute nullable int32u partitionId = 9; readonly attribute nullable int8u weighting = 10; readonly attribute nullable int8u dataVersion = 11; @@ -1090,7 +1090,7 @@ server cluster ThreadNetworkDiagnostics = 53 { readonly attribute nullable SecurityPolicy securityPolicy = 59; readonly attribute nullable octet_string<4> channelPage0Mask = 60; readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61; - readonly attribute NetworkFault activeNetworkFaultsList[] = 62; + readonly attribute NetworkFaultEnum activeNetworkFaultsList[] = 62; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.zap b/examples/lighting-app/nxp/zap/lighting-on-off.zap index 0706d84dc0ba7d..1bd0a98a1d5a55 100644 --- a/examples/lighting-app/nxp/zap/lighting-on-off.zap +++ b/examples/lighting-app/nxp/zap/lighting-on-off.zap @@ -3200,7 +3200,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "RoutingRole", + "type": "RoutingRoleEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/lighting-app/qpg/zap/light.matter b/examples/lighting-app/qpg/zap/light.matter index ff264ca31c0942..a35c1e768cc3a7 100644 --- a/examples/lighting-app/qpg/zap/light.matter +++ b/examples/lighting-app/qpg/zap/light.matter @@ -1008,14 +1008,14 @@ server cluster ThreadNetworkDiagnostics = 53 { kNotConnected = 1; } - enum NetworkFault : ENUM8 { + enum NetworkFaultEnum : ENUM8 { kUnspecified = 0; kLinkDown = 1; kHardwareFailure = 2; kNetworkJammed = 3; } - enum RoutingRole : ENUM8 { + enum RoutingRoleEnum : ENUM8 { kUnspecified = 0; kUnassigned = 1; kSleepyEndDevice = 2; @@ -1032,7 +1032,7 @@ server cluster ThreadNetworkDiagnostics = 53 { kMACCounts = 0x8; } - struct NeighborTable { + struct NeighborTableStruct { int64u extAddress = 0; int32u age = 1; int16u rloc16 = 2; @@ -1064,7 +1064,7 @@ server cluster ThreadNetworkDiagnostics = 53 { boolean channelMaskPresent = 11; } - struct RouteTable { + struct RouteTableStruct { int64u extAddress = 0; int16u rloc16 = 1; int8u routerId = 2; @@ -1087,19 +1087,19 @@ server cluster ThreadNetworkDiagnostics = 53 { } info event NetworkFaultChange = 1 { - NetworkFault current[] = 0; - NetworkFault previous[] = 1; + NetworkFaultEnum current[] = 0; + NetworkFaultEnum previous[] = 1; } readonly attribute nullable int16u channel = 0; - readonly attribute nullable RoutingRole routingRole = 1; + readonly attribute nullable RoutingRoleEnum routingRole = 1; readonly attribute nullable char_string<16> networkName = 2; readonly attribute nullable int16u panId = 3; readonly attribute nullable int64u extendedPanId = 4; readonly attribute nullable octet_string<17> meshLocalPrefix = 5; readonly attribute int64u overrunCount = 6; - readonly attribute NeighborTable neighborTable[] = 7; - readonly attribute RouteTable routeTable[] = 8; + readonly attribute NeighborTableStruct neighborTable[] = 7; + readonly attribute RouteTableStruct routeTable[] = 8; readonly attribute nullable int32u partitionId = 9; readonly attribute nullable int8u weighting = 10; readonly attribute nullable int8u dataVersion = 11; @@ -1150,7 +1150,7 @@ server cluster ThreadNetworkDiagnostics = 53 { readonly attribute nullable SecurityPolicy securityPolicy = 59; readonly attribute nullable octet_string<4> channelPage0Mask = 60; readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61; - readonly attribute NetworkFault activeNetworkFaultsList[] = 62; + readonly attribute NetworkFaultEnum activeNetworkFaultsList[] = 62; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; diff --git a/examples/lighting-app/qpg/zap/light.zap b/examples/lighting-app/qpg/zap/light.zap index 55f8020de42f72..5354dd69d623fb 100644 --- a/examples/lighting-app/qpg/zap/light.zap +++ b/examples/lighting-app/qpg/zap/light.zap @@ -3665,7 +3665,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "RoutingRole", + "type": "RoutingRoleEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter index e761595d1b69b4..9cb04a62b385d9 100644 --- a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter +++ b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter @@ -1064,14 +1064,14 @@ server cluster ThreadNetworkDiagnostics = 53 { kNotConnected = 1; } - enum NetworkFault : ENUM8 { + enum NetworkFaultEnum : ENUM8 { kUnspecified = 0; kLinkDown = 1; kHardwareFailure = 2; kNetworkJammed = 3; } - enum RoutingRole : ENUM8 { + enum RoutingRoleEnum : ENUM8 { kUnspecified = 0; kUnassigned = 1; kSleepyEndDevice = 2; @@ -1088,7 +1088,7 @@ server cluster ThreadNetworkDiagnostics = 53 { kMACCounts = 0x8; } - struct NeighborTable { + struct NeighborTableStruct { int64u extAddress = 0; int32u age = 1; int16u rloc16 = 2; @@ -1120,7 +1120,7 @@ server cluster ThreadNetworkDiagnostics = 53 { boolean channelMaskPresent = 11; } - struct RouteTable { + struct RouteTableStruct { int64u extAddress = 0; int16u rloc16 = 1; int8u routerId = 2; @@ -1143,19 +1143,19 @@ server cluster ThreadNetworkDiagnostics = 53 { } info event NetworkFaultChange = 1 { - NetworkFault current[] = 0; - NetworkFault previous[] = 1; + NetworkFaultEnum current[] = 0; + NetworkFaultEnum previous[] = 1; } readonly attribute nullable int16u channel = 0; - readonly attribute nullable RoutingRole routingRole = 1; + readonly attribute nullable RoutingRoleEnum routingRole = 1; readonly attribute nullable char_string<16> networkName = 2; readonly attribute nullable int16u panId = 3; readonly attribute nullable int64u extendedPanId = 4; readonly attribute nullable octet_string<17> meshLocalPrefix = 5; readonly attribute int64u overrunCount = 6; - readonly attribute NeighborTable neighborTable[] = 7; - readonly attribute RouteTable routeTable[] = 8; + readonly attribute NeighborTableStruct neighborTable[] = 7; + readonly attribute RouteTableStruct routeTable[] = 8; readonly attribute nullable int32u partitionId = 9; readonly attribute nullable int8u weighting = 10; readonly attribute nullable int8u dataVersion = 11; @@ -1209,7 +1209,7 @@ server cluster ThreadNetworkDiagnostics = 53 { readonly attribute nullable SecurityPolicy securityPolicy = 59; readonly attribute nullable octet_string<4> channelPage0Mask = 60; readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61; - readonly attribute NetworkFault activeNetworkFaultsList[] = 62; + readonly attribute NetworkFaultEnum activeNetworkFaultsList[] = 62; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; diff --git a/examples/lighting-app/silabs/data_model/lighting-thread-app.zap b/examples/lighting-app/silabs/data_model/lighting-thread-app.zap index 8b08a3f5f18bb0..ab56bfdc47aab7 100644 --- a/examples/lighting-app/silabs/data_model/lighting-thread-app.zap +++ b/examples/lighting-app/silabs/data_model/lighting-thread-app.zap @@ -2979,7 +2979,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "RoutingRole", + "type": "RoutingRoleEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap b/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap index 808f47d5f92916..db1814e9758af8 100644 --- a/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap +++ b/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap @@ -3005,7 +3005,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "RoutingRole", + "type": "RoutingRoleEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter index 1dff883478c1fd..83f5d0bb709e85 100644 --- a/examples/lock-app/lock-common/lock-app.matter +++ b/examples/lock-app/lock-common/lock-app.matter @@ -1111,14 +1111,14 @@ server cluster ThreadNetworkDiagnostics = 53 { kNotConnected = 1; } - enum NetworkFault : ENUM8 { + enum NetworkFaultEnum : ENUM8 { kUnspecified = 0; kLinkDown = 1; kHardwareFailure = 2; kNetworkJammed = 3; } - enum RoutingRole : ENUM8 { + enum RoutingRoleEnum : ENUM8 { kUnspecified = 0; kUnassigned = 1; kSleepyEndDevice = 2; @@ -1135,7 +1135,7 @@ server cluster ThreadNetworkDiagnostics = 53 { kMACCounts = 0x8; } - struct NeighborTable { + struct NeighborTableStruct { int64u extAddress = 0; int32u age = 1; int16u rloc16 = 2; @@ -1167,7 +1167,7 @@ server cluster ThreadNetworkDiagnostics = 53 { boolean channelMaskPresent = 11; } - struct RouteTable { + struct RouteTableStruct { int64u extAddress = 0; int16u rloc16 = 1; int8u routerId = 2; @@ -1190,19 +1190,19 @@ server cluster ThreadNetworkDiagnostics = 53 { } info event NetworkFaultChange = 1 { - NetworkFault current[] = 0; - NetworkFault previous[] = 1; + NetworkFaultEnum current[] = 0; + NetworkFaultEnum previous[] = 1; } readonly attribute nullable int16u channel = 0; - readonly attribute nullable RoutingRole routingRole = 1; + readonly attribute nullable RoutingRoleEnum routingRole = 1; readonly attribute nullable char_string<16> networkName = 2; readonly attribute nullable int16u panId = 3; readonly attribute nullable int64u extendedPanId = 4; readonly attribute nullable octet_string<17> meshLocalPrefix = 5; readonly attribute int64u overrunCount = 6; - readonly attribute NeighborTable neighborTable[] = 7; - readonly attribute RouteTable routeTable[] = 8; + readonly attribute NeighborTableStruct neighborTable[] = 7; + readonly attribute RouteTableStruct routeTable[] = 8; readonly attribute nullable int32u partitionId = 9; readonly attribute nullable int8u weighting = 10; readonly attribute nullable int8u dataVersion = 11; @@ -1256,7 +1256,7 @@ server cluster ThreadNetworkDiagnostics = 53 { readonly attribute nullable SecurityPolicy securityPolicy = 59; readonly attribute nullable octet_string<4> channelPage0Mask = 60; readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61; - readonly attribute NetworkFault activeNetworkFaultsList[] = 62; + readonly attribute NetworkFaultEnum activeNetworkFaultsList[] = 62; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; diff --git a/examples/lock-app/lock-common/lock-app.zap b/examples/lock-app/lock-common/lock-app.zap index 74a1d270b6307b..f35e6abf2103f9 100644 --- a/examples/lock-app/lock-common/lock-app.zap +++ b/examples/lock-app/lock-common/lock-app.zap @@ -3034,7 +3034,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "RoutingRole", + "type": "RoutingRoleEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/lock-app/nxp/zap/lock-app.matter b/examples/lock-app/nxp/zap/lock-app.matter index 7b739d821da1aa..4c3ae95812698a 100644 --- a/examples/lock-app/nxp/zap/lock-app.matter +++ b/examples/lock-app/nxp/zap/lock-app.matter @@ -567,14 +567,14 @@ server cluster ThreadNetworkDiagnostics = 53 { kNotConnected = 1; } - enum NetworkFault : ENUM8 { + enum NetworkFaultEnum : ENUM8 { kUnspecified = 0; kLinkDown = 1; kHardwareFailure = 2; kNetworkJammed = 3; } - enum RoutingRole : ENUM8 { + enum RoutingRoleEnum : ENUM8 { kUnspecified = 0; kUnassigned = 1; kSleepyEndDevice = 2; @@ -591,7 +591,7 @@ server cluster ThreadNetworkDiagnostics = 53 { kMACCounts = 0x8; } - struct NeighborTable { + struct NeighborTableStruct { int64u extAddress = 0; int32u age = 1; int16u rloc16 = 2; @@ -623,7 +623,7 @@ server cluster ThreadNetworkDiagnostics = 53 { boolean channelMaskPresent = 11; } - struct RouteTable { + struct RouteTableStruct { int64u extAddress = 0; int16u rloc16 = 1; int8u routerId = 2; @@ -646,19 +646,19 @@ server cluster ThreadNetworkDiagnostics = 53 { } info event NetworkFaultChange = 1 { - NetworkFault current[] = 0; - NetworkFault previous[] = 1; + NetworkFaultEnum current[] = 0; + NetworkFaultEnum previous[] = 1; } readonly attribute nullable int16u channel = 0; - readonly attribute nullable RoutingRole routingRole = 1; + readonly attribute nullable RoutingRoleEnum routingRole = 1; readonly attribute nullable char_string<16> networkName = 2; readonly attribute nullable int16u panId = 3; readonly attribute nullable int64u extendedPanId = 4; readonly attribute nullable octet_string<17> meshLocalPrefix = 5; readonly attribute int64u overrunCount = 6; - readonly attribute NeighborTable neighborTable[] = 7; - readonly attribute RouteTable routeTable[] = 8; + readonly attribute NeighborTableStruct neighborTable[] = 7; + readonly attribute RouteTableStruct routeTable[] = 8; readonly attribute nullable int32u partitionId = 9; readonly attribute nullable int8u weighting = 10; readonly attribute nullable int8u dataVersion = 11; @@ -709,7 +709,7 @@ server cluster ThreadNetworkDiagnostics = 53 { readonly attribute nullable SecurityPolicy securityPolicy = 59; readonly attribute nullable octet_string<4> channelPage0Mask = 60; readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61; - readonly attribute NetworkFault activeNetworkFaultsList[] = 62; + readonly attribute NetworkFaultEnum activeNetworkFaultsList[] = 62; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; diff --git a/examples/lock-app/nxp/zap/lock-app.zap b/examples/lock-app/nxp/zap/lock-app.zap index e136bca373d466..bf5b89eb64c0aa 100644 --- a/examples/lock-app/nxp/zap/lock-app.zap +++ b/examples/lock-app/nxp/zap/lock-app.zap @@ -3200,7 +3200,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "RoutingRole", + "type": "RoutingRoleEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/lock-app/qpg/zap/lock.matter b/examples/lock-app/qpg/zap/lock.matter index 1e11358706766c..a4ade38fb2501e 100644 --- a/examples/lock-app/qpg/zap/lock.matter +++ b/examples/lock-app/qpg/zap/lock.matter @@ -842,14 +842,14 @@ server cluster ThreadNetworkDiagnostics = 53 { kNotConnected = 1; } - enum NetworkFault : ENUM8 { + enum NetworkFaultEnum : ENUM8 { kUnspecified = 0; kLinkDown = 1; kHardwareFailure = 2; kNetworkJammed = 3; } - enum RoutingRole : ENUM8 { + enum RoutingRoleEnum : ENUM8 { kUnspecified = 0; kUnassigned = 1; kSleepyEndDevice = 2; @@ -866,7 +866,7 @@ server cluster ThreadNetworkDiagnostics = 53 { kMACCounts = 0x8; } - struct NeighborTable { + struct NeighborTableStruct { int64u extAddress = 0; int32u age = 1; int16u rloc16 = 2; @@ -898,7 +898,7 @@ server cluster ThreadNetworkDiagnostics = 53 { boolean channelMaskPresent = 11; } - struct RouteTable { + struct RouteTableStruct { int64u extAddress = 0; int16u rloc16 = 1; int8u routerId = 2; @@ -921,19 +921,19 @@ server cluster ThreadNetworkDiagnostics = 53 { } info event NetworkFaultChange = 1 { - NetworkFault current[] = 0; - NetworkFault previous[] = 1; + NetworkFaultEnum current[] = 0; + NetworkFaultEnum previous[] = 1; } readonly attribute nullable int16u channel = 0; - readonly attribute nullable RoutingRole routingRole = 1; + readonly attribute nullable RoutingRoleEnum routingRole = 1; readonly attribute nullable char_string<16> networkName = 2; readonly attribute nullable int16u panId = 3; readonly attribute nullable int64u extendedPanId = 4; readonly attribute nullable octet_string<17> meshLocalPrefix = 5; readonly attribute int64u overrunCount = 6; - readonly attribute NeighborTable neighborTable[] = 7; - readonly attribute RouteTable routeTable[] = 8; + readonly attribute NeighborTableStruct neighborTable[] = 7; + readonly attribute RouteTableStruct routeTable[] = 8; readonly attribute nullable int32u partitionId = 9; readonly attribute nullable int8u weighting = 10; readonly attribute nullable int8u dataVersion = 11; @@ -984,7 +984,7 @@ server cluster ThreadNetworkDiagnostics = 53 { readonly attribute nullable SecurityPolicy securityPolicy = 59; readonly attribute nullable octet_string<4> channelPage0Mask = 60; readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61; - readonly attribute NetworkFault activeNetworkFaultsList[] = 62; + readonly attribute NetworkFaultEnum activeNetworkFaultsList[] = 62; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; diff --git a/examples/lock-app/qpg/zap/lock.zap b/examples/lock-app/qpg/zap/lock.zap index d12fbedf01ad1a..d77964ec0079cc 100644 --- a/examples/lock-app/qpg/zap/lock.zap +++ b/examples/lock-app/qpg/zap/lock.zap @@ -3602,7 +3602,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "RoutingRole", + "type": "RoutingRoleEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index bffde23c79ead7..351a34c255320d 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -1668,14 +1668,14 @@ client cluster ThreadNetworkDiagnostics = 53 { kNotConnected = 1; } - enum NetworkFault : ENUM8 { + enum NetworkFaultEnum : ENUM8 { kUnspecified = 0; kLinkDown = 1; kHardwareFailure = 2; kNetworkJammed = 3; } - enum RoutingRole : ENUM8 { + enum RoutingRoleEnum : ENUM8 { kUnspecified = 0; kUnassigned = 1; kSleepyEndDevice = 2; @@ -1692,7 +1692,7 @@ client cluster ThreadNetworkDiagnostics = 53 { kMACCounts = 0x8; } - struct NeighborTable { + struct NeighborTableStruct { int64u extAddress = 0; int32u age = 1; int16u rloc16 = 2; @@ -1724,7 +1724,7 @@ client cluster ThreadNetworkDiagnostics = 53 { boolean channelMaskPresent = 11; } - struct RouteTable { + struct RouteTableStruct { int64u extAddress = 0; int16u rloc16 = 1; int8u routerId = 2; @@ -1747,19 +1747,19 @@ client cluster ThreadNetworkDiagnostics = 53 { } info event NetworkFaultChange = 1 { - NetworkFault current[] = 0; - NetworkFault previous[] = 1; + NetworkFaultEnum current[] = 0; + NetworkFaultEnum previous[] = 1; } readonly attribute nullable int16u channel = 0; - readonly attribute nullable RoutingRole routingRole = 1; + readonly attribute nullable RoutingRoleEnum routingRole = 1; readonly attribute nullable char_string<16> networkName = 2; readonly attribute nullable int16u panId = 3; readonly attribute nullable int64u extendedPanId = 4; readonly attribute nullable octet_string<17> meshLocalPrefix = 5; readonly attribute optional int64u overrunCount = 6; - readonly attribute NeighborTable neighborTable[] = 7; - readonly attribute RouteTable routeTable[] = 8; + readonly attribute NeighborTableStruct neighborTable[] = 7; + readonly attribute RouteTableStruct routeTable[] = 8; readonly attribute nullable int32u partitionId = 9; readonly attribute nullable int8u weighting = 10; readonly attribute nullable int8u dataVersion = 11; @@ -1813,7 +1813,7 @@ client cluster ThreadNetworkDiagnostics = 53 { readonly attribute nullable SecurityPolicy securityPolicy = 59; readonly attribute nullable octet_string<4> channelPage0Mask = 60; readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61; - readonly attribute NetworkFault activeNetworkFaultsList[] = 62; + readonly attribute NetworkFaultEnum activeNetworkFaultsList[] = 62; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; @@ -1832,14 +1832,14 @@ server cluster ThreadNetworkDiagnostics = 53 { kNotConnected = 1; } - enum NetworkFault : ENUM8 { + enum NetworkFaultEnum : ENUM8 { kUnspecified = 0; kLinkDown = 1; kHardwareFailure = 2; kNetworkJammed = 3; } - enum RoutingRole : ENUM8 { + enum RoutingRoleEnum : ENUM8 { kUnspecified = 0; kUnassigned = 1; kSleepyEndDevice = 2; @@ -1856,7 +1856,7 @@ server cluster ThreadNetworkDiagnostics = 53 { kMACCounts = 0x8; } - struct NeighborTable { + struct NeighborTableStruct { int64u extAddress = 0; int32u age = 1; int16u rloc16 = 2; @@ -1888,7 +1888,7 @@ server cluster ThreadNetworkDiagnostics = 53 { boolean channelMaskPresent = 11; } - struct RouteTable { + struct RouteTableStruct { int64u extAddress = 0; int16u rloc16 = 1; int8u routerId = 2; @@ -1911,19 +1911,19 @@ server cluster ThreadNetworkDiagnostics = 53 { } info event NetworkFaultChange = 1 { - NetworkFault current[] = 0; - NetworkFault previous[] = 1; + NetworkFaultEnum current[] = 0; + NetworkFaultEnum previous[] = 1; } readonly attribute nullable int16u channel = 0; - readonly attribute nullable RoutingRole routingRole = 1; + readonly attribute nullable RoutingRoleEnum routingRole = 1; readonly attribute nullable char_string<16> networkName = 2; readonly attribute nullable int16u panId = 3; readonly attribute nullable int64u extendedPanId = 4; readonly attribute nullable octet_string<17> meshLocalPrefix = 5; readonly attribute int64u overrunCount = 6; - readonly attribute NeighborTable neighborTable[] = 7; - readonly attribute RouteTable routeTable[] = 8; + readonly attribute NeighborTableStruct neighborTable[] = 7; + readonly attribute RouteTableStruct routeTable[] = 8; readonly attribute nullable int32u partitionId = 9; readonly attribute nullable int8u weighting = 10; readonly attribute nullable int8u dataVersion = 11; @@ -1977,7 +1977,7 @@ server cluster ThreadNetworkDiagnostics = 53 { readonly attribute nullable SecurityPolicy securityPolicy = 59; readonly attribute nullable octet_string<4> channelPage0Mask = 60; readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61; - readonly attribute NetworkFault activeNetworkFaultsList[] = 62; + readonly attribute NetworkFaultEnum activeNetworkFaultsList[] = 62; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; diff --git a/examples/placeholder/linux/apps/app1/config.zap b/examples/placeholder/linux/apps/app1/config.zap index 02c19e69b624ec..e004e30e5f7df9 100644 --- a/examples/placeholder/linux/apps/app1/config.zap +++ b/examples/placeholder/linux/apps/app1/config.zap @@ -2688,22 +2688,6 @@ "side": "server", "enabled": 1, "attributes": [ - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, { "name": "Channel", "code": 0, @@ -2741,9 +2725,9 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "String", + "type": "char_string", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -2821,7 +2805,7 @@ "code": 7, "mfgCode": null, "side": "server", - "type": "NeighborTableStruct", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -2837,7 +2821,7 @@ "code": 8, "mfgCode": null, "side": "server", - "type": "RouteTableStruct", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -2949,7 +2933,7 @@ "code": 15, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2965,7 +2949,7 @@ "code": 16, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2981,7 +2965,7 @@ "code": 17, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -3697,7 +3681,7 @@ "reportableChange": 0 }, { - "name": "ActiveNetworkFaults", + "name": "ActiveNetworkFaultsList", "code": 62, "mfgCode": null, "side": "server", @@ -3711,6 +3695,22 @@ "minInterval": 0, "maxInterval": 65344, "reportableChange": 0 + }, + { + "name": "ClusterRevision", + "code": 65533, + "mfgCode": null, + "side": "server", + "type": "int16u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "1", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 } ] }, @@ -4279,22 +4279,6 @@ "side": "server", "enabled": 1, "attributes": [ - { - "name": "DataModelRevision", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "External", - "singleton": 1, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, { "name": "VendorName", "code": 1, @@ -4343,22 +4327,6 @@ "maxInterval": 65344, "reportableChange": 0 }, - { - "name": "ProductID", - "code": 4, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "External", - "singleton": 1, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, { "name": "NodeLabel", "code": 5, @@ -4375,22 +4343,6 @@ "maxInterval": 65344, "reportableChange": 0 }, - { - "name": "Location", - "code": 6, - "mfgCode": null, - "side": "server", - "type": "char_string", - "included": 1, - "storageOption": "External", - "singleton": 1, - "bounded": 0, - "defaultValue": "XX", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, { "name": "HardwareVersion", "code": 7, @@ -4535,22 +4487,6 @@ "maxInterval": 65344, "reportableChange": 0 }, - { - "name": "LocalConfigDisabled", - "code": 16, - "mfgCode": null, - "side": "server", - "type": "boolean", - "included": 1, - "storageOption": "NVM", - "singleton": 1, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, { "name": "Reachable", "code": 17, @@ -4583,22 +4519,6 @@ "maxInterval": 65344, "reportableChange": 0 }, - { - "name": "CapabilityMinima", - "code": 19, - "mfgCode": null, - "side": "server", - "type": "CapabilityMinimaStruct", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, { "name": "ProductAppearance", "code": 20, @@ -5548,90 +5468,6 @@ } ] }, - { - "name": "Window Covering", - "code": 258, - "mfgCode": null, - "define": "WINDOW_COVERING_CLUSTER", - "side": "client", - "enabled": 0, - "commands": [ - { - "name": "UpOrOpen", - "code": 0, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "DownOrClose", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "StopMotion", - "code": 2, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "GoToLiftValue", - "code": 4, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "GoToLiftPercentage", - "code": 5, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "GoToTiltValue", - "code": 7, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "GoToTiltPercentage", - "code": 8, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - } - ], - "attributes": [ - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "5", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] - }, { "name": "Door Lock", "code": 257, @@ -5641,7 +5477,7 @@ "enabled": 1, "commands": [ { - "name": "Lock Door", + "name": "LockDoor", "code": 0, "mfgCode": null, "source": "client", @@ -5649,7 +5485,7 @@ "outgoing": 0 }, { - "name": "Unlock Door", + "name": "UnlockDoor", "code": 1, "mfgCode": null, "source": "client", @@ -5657,15 +5493,7 @@ "outgoing": 0 }, { - "name": "Toggle", - "code": 2, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "Unlock with Timeout", + "name": "UnlockWithTimeout", "code": 3, "mfgCode": null, "source": "client", @@ -5700,28 +5528,12 @@ "side": "server", "enabled": 1, "attributes": [ - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "6", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, { "name": "LockState", "code": 0, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "DlLockState", "included": 1, "storageOption": "External", "singleton": 0, @@ -5737,7 +5549,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "DlLockType", "included": 1, "storageOption": "External", "singleton": 0, @@ -5769,7 +5581,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "DoorStateEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -5828,22 +5640,6 @@ "maxInterval": 65534, "reportableChange": 0 }, - { - "name": "NumberOfLogRecordsSupported", - "code": 16, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, { "name": "NumberOfTotalUsersSupported", "code": 17, @@ -6009,7 +5805,7 @@ "code": 27, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "DlCredentialRuleMask", "included": 1, "storageOption": "External", "singleton": 0, @@ -6037,27 +5833,11 @@ "reportableChange": 0 }, { - "name": "EnableLogging", - "code": 32, + "name": "Language", + "code": 33, "mfgCode": null, "side": "server", - "type": "boolean", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "Language", - "code": 33, - "mfgCode": null, - "side": "server", - "type": "String", + "type": "char_string", "included": 1, "storageOption": "External", "singleton": 0, @@ -6067,8 +5847,8 @@ "minInterval": 0, "maxInterval": 65344, "reportableChange": 0 - } - ,{ + }, + { "name": "LEDSettings", "code": 34, "mfgCode": null, @@ -6121,7 +5901,7 @@ "code": 37, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "OperatingModeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -6137,7 +5917,7 @@ "code": 38, "mfgCode": null, "side": "server", - "type": "bitmap16", + "type": "DlSupportedOperatingModes", "included": 1, "storageOption": "External", "singleton": 0, @@ -6153,7 +5933,7 @@ "code": 39, "mfgCode": null, "side": "server", - "type": "bitmap16", + "type": "DlDefaultConfigurationRegister", "included": 1, "storageOption": "External", "singleton": 0, @@ -6233,7 +6013,7 @@ "code": 44, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "DlLocalProgrammingFeatures", "included": 1, "storageOption": "External", "singleton": 0, @@ -6308,22 +6088,6 @@ "maxInterval": 65344, "reportableChange": 0 }, - { - "name": "SecurityLevel", - "code": 52, - "mfgCode": null, - "side": "server", - "type": "enum8", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, { "name": "ExpiringUserTimeout", "code": 53, @@ -6341,135 +6105,107 @@ "reportableChange": 0 }, { - "name": "AlarmMask", - "code": 64, + "name": "ClusterRevision", + "code": 65533, "mfgCode": null, "side": "server", - "type": "bitmap16", + "type": "int16u", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0xFFFF", + "defaultValue": "6", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 - }, + } + ] + }, + { + "name": "Window Covering", + "code": 258, + "mfgCode": null, + "define": "WINDOW_COVERING_CLUSTER", + "side": "client", + "enabled": 0, + "commands": [ { - "name": "KeypadOperationEventMask", - "code": 65, + "name": "UpOrOpen", + "code": 0, "mfgCode": null, - "side": "server", - "type": "bitmap16", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0xFFFF", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 + "source": "client", + "incoming": 1, + "outgoing": 0 }, { - "name": "RemoteOperationEventMask", - "code": 66, + "name": "DownOrClose", + "code": 1, "mfgCode": null, - "side": "server", - "type": "bitmap16", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0xFFFF", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 + "source": "client", + "incoming": 1, + "outgoing": 0 }, { - "name": "ManualOperationEventMask", - "code": 67, + "name": "StopMotion", + "code": 2, "mfgCode": null, - "side": "server", - "type": "bitmap16", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0xFFFF", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 + "source": "client", + "incoming": 1, + "outgoing": 0 }, { - "name": "RFIDOperationEventMask", - "code": 68, + "name": "GoToLiftValue", + "code": 4, "mfgCode": null, - "side": "server", - "type": "bitmap16", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0xFFFF", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 + "source": "client", + "incoming": 1, + "outgoing": 0 }, { - "name": "KeypadProgrammingEventMask", - "code": 69, + "name": "GoToLiftPercentage", + "code": 5, "mfgCode": null, - "side": "server", - "type": "bitmap16", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0xFFFF", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 + "source": "client", + "incoming": 1, + "outgoing": 0 }, { - "name": "RemoteProgrammingEventMask", - "code": 70, + "name": "GoToTiltValue", + "code": 7, "mfgCode": null, - "side": "server", - "type": "bitmap16", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0xFFFF", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 + "source": "client", + "incoming": 1, + "outgoing": 0 }, { - "name": "RFIDProgrammingEventMask", - "code": 71, + "name": "GoToTiltPercentage", + "code": 8, "mfgCode": null, - "side": "server", - "type": "bitmap16", + "source": "client", + "incoming": 1, + "outgoing": 0 + } + ], + "attributes": [ + { + "name": "ClusterRevision", + "code": 65533, + "mfgCode": null, + "side": "client", + "type": "int16u", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0xFFFF", + "defaultValue": "5", "reportable": 1, "minInterval": 0, "maxInterval": 65344, "reportableChange": 0 } ] - }, + }, { "name": "Window Covering", "code": 258, @@ -7202,22 +6938,6 @@ "maxInterval": 65534, "reportableChange": 0 }, - { - "name": "AlarmMask", - "code": 34, - "mfgCode": null, - "side": "server", - "type": "bitmap16", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, { "name": "FeatureMap", "code": 65532, @@ -7291,14 +7011,6 @@ "source": "client", "incoming": 0, "outgoing": 1 - }, - { - "name": "GetRelayStatusLog", - "code": 4, - "mfgCode": null, - "source": "client", - "incoming": 0, - "outgoing": 1 } ], "attributes": [ @@ -7335,14 +7047,6 @@ "source": "server", "incoming": 1, "outgoing": 0 - }, - { - "name": "GetRelayStatusLogResponse", - "code": 1, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 } ], "attributes": [ @@ -7714,22 +7418,6 @@ "maxInterval": 65344, "reportableChange": 0 }, - { - "name": "AlarmMask", - "code": 29, - "mfgCode": null, - "side": "server", - "type": "bitmap8", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, { "name": "ThermostatRunningMode", "code": 30, @@ -7895,7 +7583,7 @@ "code": 50, "mfgCode": null, "side": "server", - "type": "utc", + "type": "epoch_s", "included": 1, "storageOption": "External", "singleton": 0, @@ -8093,7 +7781,7 @@ "singleton": 1, "bounded": 1, "defaultValue": "0", - "reportable": 0, + "reportable": 1, "minInterval": 1, "maxInterval": 65344, "reportableChange": 0 @@ -8131,7 +7819,7 @@ "reportableChange": 0 }, { - "name": "ACCapacityFormat", + "name": "ACCapacityformat", "code": 71, "mfgCode": null, "side": "server", @@ -9181,94 +8869,68 @@ ] }, { - "name": "Target Navigator", - "code": 1285, + "name": "Channel", + "code": 1284, "mfgCode": null, - "define": "TARGET_NAVIGATOR_CLUSTER", + "define": "CHANNEL_CLUSTER", "side": "client", "enabled": 1, "commands": [ { - "name": "NavigateTarget", + "name": "ChangeChannel", "code": 0, "mfgCode": null, "source": "client", - "incoming": 0, - "outgoing": 1 - } - ], - "attributes": [ + "incoming": 1, + "outgoing": 0 + }, { - "name": "ClusterRevision", - "code": 65533, + "name": "ChangeChannelByNumber", + "code": 2, "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - }, - { - "name": "Target Navigator", - "code": 1285, - "mfgCode": null, - "define": "TARGET_NAVIGATOR_CLUSTER", - "side": "server", - "enabled": 1, - "commands": [ + "source": "client", + "incoming": 1, + "outgoing": 0 + }, { - "name": "NavigateTargetResponse", - "code": 1, + "name": "SkipChannel", + "code": 3, "mfgCode": null, - "source": "server", + "source": "client", "incoming": 1, "outgoing": 0 } ], "attributes": [ { - "name": "TargetList", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "CurrentTarget", - "code": 1, + "name": "ClusterRevision", + "code": 65533, "mfgCode": null, - "side": "server", - "type": "int8u", + "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0", + "defaultValue": "1", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 - }, + } + ] + }, + { + "name": "Channel", + "code": 1284, + "mfgCode": null, + "define": "CHANNEL_CLUSTER", + "side": "server", + "enabled": 1, + "attributes": [ { - "name": "GeneratedCommandList", - "code": 65528, + "name": "ChannelList", + "code": 0, "mfgCode": null, "side": "server", "type": "array", @@ -9279,39 +8941,39 @@ "defaultValue": "", "reportable": 1, "minInterval": 1, - "maxInterval": 65534, + "maxInterval": 65344, "reportableChange": 0 }, { - "name": "AcceptedCommandList", - "code": 65529, + "name": "Lineup", + "code": 1, "mfgCode": null, "side": "server", - "type": "array", + "type": "LineupInfoStruct", "included": 1, "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 }, { - "name": "AttributeList", - "code": 65531, + "name": "CurrentChannel", + "code": 2, "mfgCode": null, "side": "server", - "type": "array", + "type": "ChannelInfoStruct", "included": 1, "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 }, { @@ -9337,27 +8999,27 @@ "side": "server", "type": "int16u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "1", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 } ] }, { - "name": "Keypad Input", - "code": 1289, + "name": "Target Navigator", + "code": 1285, "mfgCode": null, - "define": "KEYPAD_INPUT_CLUSTER", + "define": "TARGET_NAVIGATOR_CLUSTER", "side": "client", "enabled": 1, "commands": [ { - "name": "SendKey", + "name": "NavigateTarget", "code": 0, "mfgCode": null, "source": "client", @@ -9385,15 +9047,15 @@ ] }, { - "name": "Keypad Input", - "code": 1289, + "name": "Target Navigator", + "code": 1285, "mfgCode": null, - "define": "KEYPAD_INPUT_CLUSTER", + "define": "TARGET_NAVIGATOR_CLUSTER", "side": "server", "enabled": 1, "commands": [ { - "name": "SendKeyResponse", + "name": "NavigateTargetResponse", "code": 1, "mfgCode": null, "source": "server", @@ -9402,6 +9064,38 @@ } ], "attributes": [ + { + "name": "TargetList", + "code": 0, + "mfgCode": null, + "side": "server", + "type": "array", + "included": 1, + "storageOption": "External", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "CurrentTarget", + "code": 1, + "mfgCode": null, + "side": "server", + "type": "int8u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "GeneratedCommandList", "code": 65528, @@ -9485,28 +9179,100 @@ ] }, { - "name": "Content Launcher", - "code": 1290, + "name": "Media Playback", + "code": 1286, "mfgCode": null, - "define": "CONTENT_LAUNCHER_CLUSTER", + "define": "MEDIA_PLAYBACK_CLUSTER", "side": "client", "enabled": 1, "commands": [ { - "name": "LaunchContent", + "name": "Play", "code": 0, "mfgCode": null, "source": "client", "incoming": 1, - "outgoing": 0 + "outgoing": 1 }, { - "name": "LaunchURL", + "name": "Pause", "code": 1, "mfgCode": null, "source": "client", "incoming": 1, "outgoing": 1 + }, + { + "name": "Stop", + "code": 2, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 1 + }, + { + "name": "StartOver", + "code": 3, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 1 + }, + { + "name": "Previous", + "code": 4, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 1 + }, + { + "name": "Next", + "code": 5, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 1 + }, + { + "name": "Rewind", + "code": 6, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 1 + }, + { + "name": "FastForward", + "code": 7, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 1 + }, + { + "name": "SkipForward", + "code": 8, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 1 + }, + { + "name": "SkipBackward", + "code": 9, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 1 + }, + { + "name": "Seek", + "code": 11, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 1 } ], "attributes": [ @@ -9522,23 +9288,23 @@ "bounded": 0, "defaultValue": "1", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 } ] }, { - "name": "Content Launcher", - "code": 1290, + "name": "Media Playback", + "code": 1286, "mfgCode": null, - "define": "CONTENT_LAUNCHER_CLUSTER", + "define": "MEDIA_PLAYBACK_CLUSTER", "side": "server", "enabled": 1, "commands": [ { - "name": "LauncherResponse", - "code": 2, + "name": "PlaybackResponse", + "code": 10, "mfgCode": null, "source": "server", "incoming": 1, @@ -9547,13 +9313,13 @@ ], "attributes": [ { - "name": "AcceptHeader", + "name": "CurrentState", "code": 0, "mfgCode": null, "side": "server", - "type": "array", + "type": "PlaybackStateEnum", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -9563,29 +9329,29 @@ "reportableChange": 0 }, { - "name": "SupportedStreamingProtocols", + "name": "StartTime", "code": 1, "mfgCode": null, "side": "server", - "type": "bitmap32", + "type": "epoch_us", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0", + "defaultValue": "", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "GeneratedCommandList", - "code": 65528, + "name": "Duration", + "code": 2, "mfgCode": null, "side": "server", - "type": "array", + "type": "int64u", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -9595,11 +9361,11 @@ "reportableChange": 0 }, { - "name": "AcceptedCommandList", - "code": 65529, + "name": "SampledPosition", + "code": 3, "mfgCode": null, "side": "server", - "type": "array", + "type": "PlaybackPositionStruct", "included": 1, "storageOption": "External", "singleton": 0, @@ -9611,13 +9377,29 @@ "reportableChange": 0 }, { - "name": "AttributeList", - "code": 65531, + "name": "PlaybackSpeed", + "code": 4, "mfgCode": null, "side": "server", - "type": "array", + "type": "single", "included": 1, - "storageOption": "External", + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "1", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "SeekRangeEnd", + "code": 5, + "mfgCode": null, + "side": "server", + "type": "int64u", + "included": 1, + "storageOption": "RAM", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -9626,6 +9408,22 @@ "maxInterval": 65534, "reportableChange": 0 }, + { + "name": "SeekRangeStart", + "code": 6, + "mfgCode": null, + "side": "server", + "type": "int64u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "1", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "FeatureMap", "code": 65532, @@ -9661,12 +9459,46 @@ ] }, { - "name": "Application Basic", - "code": 1293, + "name": "Media Input", + "code": 1287, "mfgCode": null, - "define": "APPLICATION_BASIC_CLUSTER", + "define": "MEDIA_INPUT_CLUSTER", "side": "client", "enabled": 1, + "commands": [ + { + "name": "SelectInput", + "code": 0, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 0 + }, + { + "name": "ShowInputStatus", + "code": 1, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 0 + }, + { + "name": "HideInputStatus", + "code": 2, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 0 + }, + { + "name": "RenameInput", + "code": 3, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 0 + } + ], "attributes": [ { "name": "ClusterRevision", @@ -9687,141 +9519,179 @@ ] }, { - "name": "Application Basic", - "code": 1293, + "name": "Media Input", + "code": 1287, "mfgCode": null, - "define": "APPLICATION_BASIC_CLUSTER", + "define": "MEDIA_INPUT_CLUSTER", "side": "server", "enabled": 1, "attributes": [ { - "name": "VendorName", + "name": "InputList", "code": 0, "mfgCode": null, "side": "server", - "type": "char_string", + "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", "reportable": 1, - "minInterval": 1, + "minInterval": 0, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "VendorID", + "name": "CurrentInput", "code": 1, "mfgCode": null, "side": "server", - "type": "vendor_id", + "type": "int8u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0x0", + "defaultValue": "", "reportable": 1, - "minInterval": 1, + "minInterval": 0, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "ApplicationName", - "code": 2, + "name": "ClusterRevision", + "code": 65533, "mfgCode": null, "side": "server", - "type": "char_string", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "1", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 - }, + } + ] + }, + { + "name": "Low Power", + "code": 1288, + "mfgCode": null, + "define": "LOW_POWER_CLUSTER", + "side": "client", + "enabled": 1, + "commands": [ { - "name": "ProductID", - "code": 3, + "name": "Sleep", + "code": 0, "mfgCode": null, - "side": "server", + "source": "client", + "incoming": 1, + "outgoing": 0 + } + ], + "attributes": [ + { + "name": "ClusterRevision", + "code": 65533, + "mfgCode": null, + "side": "client", "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x0", + "defaultValue": "1", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 - }, + } + ] + }, + { + "name": "Low Power", + "code": 1288, + "mfgCode": null, + "define": "LOW_POWER_CLUSTER", + "side": "server", + "enabled": 0, + "attributes": [ { - "name": "Application", - "code": 4, + "name": "ClusterRevision", + "code": 65533, "mfgCode": null, "side": "server", - "type": "ApplicationStruct", + "type": "int16u", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "1", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 - }, + } + ] + }, + { + "name": "Keypad Input", + "code": 1289, + "mfgCode": null, + "define": "KEYPAD_INPUT_CLUSTER", + "side": "client", + "enabled": 1, + "commands": [ { - "name": "Status", - "code": 5, + "name": "SendKey", + "code": 0, "mfgCode": null, - "side": "server", - "type": "ApplicationStatusEnum", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x01", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, + "source": "client", + "incoming": 0, + "outgoing": 1 + } + ], + "attributes": [ { - "name": "ApplicationVersion", - "code": 6, + "name": "ClusterRevision", + "code": 65533, "mfgCode": null, - "side": "server", - "type": "char_string", + "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "1", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 - }, + } + ] + }, + { + "name": "Keypad Input", + "code": 1289, + "mfgCode": null, + "define": "KEYPAD_INPUT_CLUSTER", + "side": "server", + "enabled": 1, + "commands": [ { - "name": "AllowedVendorList", - "code": 7, + "name": "SendKeyResponse", + "code": 1, "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, + "source": "server", + "incoming": 1, + "outgoing": 0 + } + ], + "attributes": [ { "name": "GeneratedCommandList", "code": 65528, @@ -9905,15 +9775,15 @@ ] }, { - "name": "Account Login", - "code": 1294, + "name": "Content Launcher", + "code": 1290, "mfgCode": null, - "define": "ACCOUNT_LOGIN_CLUSTER", + "define": "CONTENT_LAUNCHER_CLUSTER", "side": "client", "enabled": 1, "commands": [ { - "name": "GetSetupPIN", + "name": "LaunchContent", "code": 0, "mfgCode": null, "source": "client", @@ -9921,20 +9791,12 @@ "outgoing": 0 }, { - "name": "Login", - "code": 2, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "Logout", - "code": 3, + "name": "LaunchURL", + "code": 1, "mfgCode": null, "source": "client", "incoming": 1, - "outgoing": 0 + "outgoing": 1 } ], "attributes": [ @@ -9950,61 +9812,51 @@ "bounded": 0, "defaultValue": "1", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 } ] }, { - "name": "Account Login", - "code": 1294, + "name": "Content Launcher", + "code": 1290, "mfgCode": null, - "define": "ACCOUNT_LOGIN_CLUSTER", + "define": "CONTENT_LAUNCHER_CLUSTER", "side": "server", "enabled": 1, "commands": [ { - "name": "GetSetupPINResponse", - "code": 1, + "name": "LauncherResponse", + "code": 2, "mfgCode": null, "source": "server", - "incoming": 0, + "incoming": 1, "outgoing": 1 } ], "attributes": [ { - "name": "ClusterRevision", - "code": 65533, + "name": "AcceptHeader", + "code": 0, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 - } - ] - }, - { - "name": "Application Launcher", - "code": 1292, - "mfgCode": null, - "define": "APPLICATION_LAUNCHER_CLUSTER", - "side": "client", - "enabled": 1, - "attributes": [ + }, { - "name": "FeatureMap", - "code": 65532, + "name": "SupportedStreamingProtocols", + "code": 1, "mfgCode": null, - "side": "client", + "side": "server", "type": "bitmap32", "included": 1, "storageOption": "RAM", @@ -10017,87 +9869,51 @@ "reportableChange": 0 }, { - "name": "ClusterRevision", - "code": 65533, + "name": "GeneratedCommandList", + "code": 65528, "mfgCode": null, - "side": "client", - "type": "int16u", + "side": "server", + "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 - } - ], - "commands": [ - { - "name": "LaunchApp", - "code": 0, - "mfgCode": null, - "source": "client", - "incoming": 0, - "outgoing": 1 - }, - { - "name": "StopApp", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 0, - "outgoing": 1 }, { - "name": "HideApp", - "code": 2, - "mfgCode": null, - "source": "client", - "incoming": 0, - "outgoing": 1 - } - ] - }, - { - "name": "Application Launcher", - "code": 1292, - "mfgCode": null, - "define": "APPLICATION_LAUNCHER_CLUSTER", - "side": "server", - "enabled": 1, - "attributes": [ - { - "name": "CatalogList", - "code": 0, + "name": "AcceptedCommandList", + "code": 65529, "mfgCode": null, "side": "server", "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 }, { - "name": "CurrentApp", - "code": 1, + "name": "AttributeList", + "code": 65531, "mfgCode": null, "side": "server", - "type": "ApplicationEP", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 }, { @@ -10128,20 +9944,10 @@ "bounded": 0, "defaultValue": "1", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 } - ], - "commands": [ - { - "name": "LauncherResponse", - "code": 3, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - } ] }, { @@ -10151,6 +9957,24 @@ "define": "AUDIO_OUTPUT_CLUSTER", "side": "client", "enabled": 1, + "commands": [ + { + "name": "SelectOutput", + "code": 0, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 0 + }, + { + "name": "RenameOutput", + "code": 1, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 0 + } + ], "attributes": [ { "name": "FeatureMap", @@ -10184,24 +10008,6 @@ "maxInterval": 65344, "reportableChange": 0 } - ], - "commands": [ - { - "name": "SelectOutput", - "code": 0, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "RenameOutput", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - } ] }, { @@ -10219,7 +10025,7 @@ "side": "server", "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -10279,13 +10085,55 @@ ] }, { - "name": "Channel", - "code": 1284, + "name": "Application Launcher", + "code": 1292, "mfgCode": null, - "define": "CHANNEL_CLUSTER", + "define": "APPLICATION_LAUNCHER_CLUSTER", "side": "client", "enabled": 1, + "commands": [ + { + "name": "LaunchApp", + "code": 0, + "mfgCode": null, + "source": "client", + "incoming": 0, + "outgoing": 1 + }, + { + "name": "StopApp", + "code": 1, + "mfgCode": null, + "source": "client", + "incoming": 0, + "outgoing": 1 + }, + { + "name": "HideApp", + "code": 2, + "mfgCode": null, + "source": "client", + "incoming": 0, + "outgoing": 1 + } + ], "attributes": [ + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "client", + "type": "bitmap32", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "ClusterRevision", "code": 65533, @@ -10302,44 +10150,28 @@ "maxInterval": 65344, "reportableChange": 0 } - ], + ] + }, + { + "name": "Application Launcher", + "code": 1292, + "mfgCode": null, + "define": "APPLICATION_LAUNCHER_CLUSTER", + "side": "server", + "enabled": 1, "commands": [ { - "name": "ChangeChannel", - "code": 0, + "name": "LauncherResponse", + "code": 3, "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "ChangeChannelByNumber", - "code": 2, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "SkipChannel", - "code": 3, - "mfgCode": null, - "source": "client", + "source": "server", "incoming": 1, "outgoing": 0 } - ] - }, - { - "name": "Channel", - "code": 1284, - "mfgCode": null, - "define": "CHANNEL_CLUSTER", - "side": "server", - "enabled": 1, + ], "attributes": [ { - "name": "ChannelList", + "name": "CatalogList", "code": 0, "mfgCode": null, "side": "server", @@ -10350,32 +10182,16 @@ "bounded": 0, "defaultValue": "", "reportable": 1, - "minInterval": 1, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "Lineup", - "code": 1, - "mfgCode": null, - "side": "server", - "type": "LineupInfo", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, "minInterval": 0, "maxInterval": 65344, "reportableChange": 0 }, { - "name": "CurrentChannel", - "code": 2, + "name": "CurrentApp", + "code": 1, "mfgCode": null, "side": "server", - "type": "ChannelInfo", + "type": "ApplicationEPStruct", "included": 1, "storageOption": "External", "singleton": 0, @@ -10409,7 +10225,7 @@ "side": "server", "type": "int16u", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, "defaultValue": "1", @@ -10418,35 +10234,15 @@ "maxInterval": 65344, "reportableChange": 0 } - ], - "commands": [ - { - "name": "ChangeChannelResponse", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - } ] }, { - "name": "Low Power", - "code": 1288, + "name": "Application Basic", + "code": 1293, "mfgCode": null, - "define": "LOW_POWER_CLUSTER", + "define": "APPLICATION_BASIC_CLUSTER", "side": "client", "enabled": 1, - "commands": [ - { - "name": "Sleep", - "code": 0, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - } - ], "attributes": [ { "name": "ClusterRevision", @@ -10467,173 +10263,85 @@ ] }, { - "name": "Low Power", - "code": 1288, + "name": "Application Basic", + "code": 1293, "mfgCode": null, - "define": "LOW_POWER_CLUSTER", + "define": "APPLICATION_BASIC_CLUSTER", "side": "server", - "enabled": 0, + "enabled": 1, "attributes": [ { - "name": "ClusterRevision", - "code": 65533, + "name": "VendorName", + "code": 0, "mfgCode": null, - "side": "client", - "type": "int16u", + "side": "server", + "type": "char_string", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 - } - ] - }, - { - "name": "Media Playback", - "code": 1286, - "mfgCode": null, - "define": "MEDIA_PLAYBACK_CLUSTER", - "side": "client", - "enabled": 1, - "commands": [ - { - "name": "Play", - "code": 0, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 }, { - "name": "Pause", + "name": "VendorID", "code": 1, "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 + "side": "server", + "type": "vendor_id", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x0", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 }, { - "name": "Stop", + "name": "ApplicationName", "code": 2, "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 + "side": "server", + "type": "char_string", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 }, { - "name": "StartOver", + "name": "ProductID", "code": 3, "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "Previous", - "code": 4, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "Next", - "code": 5, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "Rewind", - "code": 6, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "FastForward", - "code": 7, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "SkipForward", - "code": 8, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "SkipBackward", - "code": 9, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "Seek", - "code": 11, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - } - ], - "attributes": [ - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", + "side": "server", "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "0x0", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 - } - ] - }, - { - "name": "Media Playback", - "code": 1286, - "mfgCode": null, - "define": "MEDIA_PLAYBACK_CLUSTER", - "side": "server", - "enabled": 1, - "commands": [ + }, { - "name": "PlaybackResponse", - "code": 10, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - } - ], - "attributes": [ - { - "name": "CurrentState", - "code": 0, + "name": "Application", + "code": 4, "mfgCode": null, "side": "server", - "type": "PlaybackStateType", + "type": "ApplicationStruct", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -10643,27 +10351,27 @@ "reportableChange": 0 }, { - "name": "StartTime", - "code": 1, + "name": "Status", + "code": 5, "mfgCode": null, "side": "server", - "type": "epoch_us", + "type": "ApplicationStatusEnum", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "0x01", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "Duration", - "code": 2, + "name": "ApplicationVersion", + "code": 6, "mfgCode": null, "side": "server", - "type": "int64u", + "type": "char_string", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -10675,11 +10383,11 @@ "reportableChange": 0 }, { - "name": "SampledPosition", - "code": 3, + "name": "AllowedVendorList", + "code": 7, "mfgCode": null, "side": "server", - "type": "PlaybackPositionType", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -10689,31 +10397,31 @@ "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 - }, + }, { - "name": "PlaybackSpeed", - "code": 4, + "name": "GeneratedCommandList", + "code": 65528, "mfgCode": null, "side": "server", - "type": "SingleType", + "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "SeekRangeEnd", - "code": 5, + "name": "AcceptedCommandList", + "code": 65529, "mfgCode": null, "side": "server", - "type": "int64u", + "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -10723,16 +10431,16 @@ "reportableChange": 0 }, { - "name": "SeekRangeStart", - "code": 6, + "name": "AttributeList", + "code": 65531, "mfgCode": null, "side": "server", - "type": "int64u", + "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -10773,15 +10481,15 @@ ] }, { - "name": "Media Input", - "code": 1287, + "name": "Account Login", + "code": 1294, "mfgCode": null, - "define": "MEDIA_INPUT_CLUSTER", + "define": "ACCOUNT_LOGIN_CLUSTER", "side": "client", "enabled": 1, "commands": [ { - "name": "SelectInput", + "name": "GetSetupPIN", "code": 0, "mfgCode": null, "source": "client", @@ -10789,15 +10497,7 @@ "outgoing": 0 }, { - "name": "ShowInputStatus", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "HideInputStatus", + "name": "Login", "code": 2, "mfgCode": null, "source": "client", @@ -10805,7 +10505,7 @@ "outgoing": 0 }, { - "name": "RenameInput", + "name": "Logout", "code": 3, "mfgCode": null, "source": "client", @@ -10826,19 +10526,29 @@ "bounded": 0, "defaultValue": "1", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 } ] }, { - "name": "Media Input", - "code": 1287, + "name": "Account Login", + "code": 1294, "mfgCode": null, - "define": "MEDIA_INPUT_CLUSTER", + "define": "ACCOUNT_LOGIN_CLUSTER", "side": "server", "enabled": 1, + "commands": [ + { + "name": "GetSetupPINResponse", + "code": 1, + "mfgCode": null, + "source": "server", + "incoming": 0, + "outgoing": 1 + } + ], "attributes": [ { "name": "ClusterRevision", @@ -10852,40 +10562,8 @@ "bounded": 0, "defaultValue": "1", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "InputList", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "InputInfoStruct", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "CurrentInput", - "code": 1, - "mfgCode": null, - "side": "server", - "type": "int8u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, "minInterval": 0, - "maxInterval": 65534, + "maxInterval": 65344, "reportableChange": 0 } ] @@ -13562,191 +13240,15 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x00", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "CurrentSaturation", - "code": 1, - "mfgCode": null, - "side": "server", - "type": "int8u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "RemainingTime", - "code": 2, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "CurrentX", - "code": 3, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x616B", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "CurrentY", - "code": 4, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x607D", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "DriftCompensation", - "code": 5, - "mfgCode": null, - "side": "server", - "type": "enum8", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 0, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "CompensationText", - "code": 6, - "mfgCode": null, - "side": "server", - "type": "string", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 0, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ColorTemperatureMireds", - "code": 7, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00FA", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ColorMode", - "code": 8, - "mfgCode": null, - "side": "server", - "type": "enum8", - "included": 1, - "storageOption": "External", - "singleton": 1, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "Options", - "code": 15, - "mfgCode": null, - "side": "server", - "type": "bitmap8", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "EnhancedCurrentHue", - "code": 16384, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "EnhancedColorMode", - "code": 16385, - "mfgCode": null, - "side": "server", - "type": "enum8", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x01", + "defaultValue": "0x00", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "ColorLoopActive", - "code": 16386, + "name": "CurrentSaturation", + "code": 1, "mfgCode": null, "side": "server", "type": "int8u", @@ -13756,29 +13258,29 @@ "bounded": 0, "defaultValue": "0x00", "reportable": 1, - "minInterval": 0, + "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "ColorLoopDirection", - "code": 16387, + "name": "RemainingTime", + "code": 2, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x00", "reportable": 1, - "minInterval": 0, + "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "ColorLoopTime", - "code": 16388, + "name": "CurrentX", + "code": 3, "mfgCode": null, "side": "server", "type": "int16u", @@ -13786,15 +13288,15 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x0019", + "defaultValue": "0x616B", "reportable": 1, - "minInterval": 0, + "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "ColorLoopStartEnhancedHue", - "code": 16389, + "name": "CurrentY", + "code": 4, "mfgCode": null, "side": "server", "type": "int16u", @@ -13802,87 +13304,87 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x2300", + "defaultValue": "0x607D", "reportable": 1, - "minInterval": 0, + "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "ColorLoopStoredEnhancedHue", - "code": 16390, + "name": "DriftCompensation", + "code": 5, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "enum8", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0x00", + "defaultValue": "", "reportable": 1, - "minInterval": 0, + "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "ColorCapabilities", - "code": 16394, + "name": "CompensationText", + "code": 6, "mfgCode": null, "side": "server", - "type": "bitmap16", + "type": "char_string", "included": 1, "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0x00", + "defaultValue": "", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "ColorTempPhysicalMinMireds", - "code": 16395, + "name": "ColorTemperatureMireds", + "code": 7, "mfgCode": null, "side": "server", "type": "int16u", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x00", + "defaultValue": "0x00FA", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "ColorTempPhysicalMaxMireds", - "code": 16396, + "name": "ColorMode", + "code": 8, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "enum8", "included": 1, "storageOption": "External", - "singleton": 0, + "singleton": 1, "bounded": 0, - "defaultValue": "0xfeff", + "defaultValue": "1", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "CoupleColorTempToLevelMinMireds", - "code": 16397, + "name": "Options", + "code": 15, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "bitmap8", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "0x00", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -14368,6 +13870,182 @@ "maxInterval": 65534, "reportableChange": 0 }, + { + "name": "EnhancedCurrentHue", + "code": 16384, + "mfgCode": null, + "side": "server", + "type": "int16u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x00", + "reportable": 1, + "minInterval": 0, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "EnhancedColorMode", + "code": 16385, + "mfgCode": null, + "side": "server", + "type": "enum8", + "included": 1, + "storageOption": "External", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x01", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "ColorLoopActive", + "code": 16386, + "mfgCode": null, + "side": "server", + "type": "int8u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x00", + "reportable": 1, + "minInterval": 0, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "ColorLoopDirection", + "code": 16387, + "mfgCode": null, + "side": "server", + "type": "int8u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x00", + "reportable": 1, + "minInterval": 0, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "ColorLoopTime", + "code": 16388, + "mfgCode": null, + "side": "server", + "type": "int16u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x0019", + "reportable": 1, + "minInterval": 0, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "ColorLoopStartEnhancedHue", + "code": 16389, + "mfgCode": null, + "side": "server", + "type": "int16u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x2300", + "reportable": 1, + "minInterval": 0, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "ColorLoopStoredEnhancedHue", + "code": 16390, + "mfgCode": null, + "side": "server", + "type": "int16u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x00", + "reportable": 1, + "minInterval": 0, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "ColorCapabilities", + "code": 16394, + "mfgCode": null, + "side": "server", + "type": "bitmap16", + "included": 1, + "storageOption": "External", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x00", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "ColorTempPhysicalMinMireds", + "code": 16395, + "mfgCode": null, + "side": "server", + "type": "int16u", + "included": 1, + "storageOption": "External", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x00", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "ColorTempPhysicalMaxMireds", + "code": 16396, + "mfgCode": null, + "side": "server", + "type": "int16u", + "included": 1, + "storageOption": "External", + "singleton": 0, + "bounded": 0, + "defaultValue": "0xfeff", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "CoupleColorTempToLevelMinMireds", + "code": 16397, + "mfgCode": null, + "side": "server", + "type": "int16u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "StartUpColorTemperatureMireds", "code": 16400, diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index 3043fa328c04be..c358c036735cac 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -1627,14 +1627,14 @@ client cluster ThreadNetworkDiagnostics = 53 { kNotConnected = 1; } - enum NetworkFault : ENUM8 { + enum NetworkFaultEnum : ENUM8 { kUnspecified = 0; kLinkDown = 1; kHardwareFailure = 2; kNetworkJammed = 3; } - enum RoutingRole : ENUM8 { + enum RoutingRoleEnum : ENUM8 { kUnspecified = 0; kUnassigned = 1; kSleepyEndDevice = 2; @@ -1651,7 +1651,7 @@ client cluster ThreadNetworkDiagnostics = 53 { kMACCounts = 0x8; } - struct NeighborTable { + struct NeighborTableStruct { int64u extAddress = 0; int32u age = 1; int16u rloc16 = 2; @@ -1683,7 +1683,7 @@ client cluster ThreadNetworkDiagnostics = 53 { boolean channelMaskPresent = 11; } - struct RouteTable { + struct RouteTableStruct { int64u extAddress = 0; int16u rloc16 = 1; int8u routerId = 2; @@ -1706,19 +1706,19 @@ client cluster ThreadNetworkDiagnostics = 53 { } info event NetworkFaultChange = 1 { - NetworkFault current[] = 0; - NetworkFault previous[] = 1; + NetworkFaultEnum current[] = 0; + NetworkFaultEnum previous[] = 1; } readonly attribute nullable int16u channel = 0; - readonly attribute nullable RoutingRole routingRole = 1; + readonly attribute nullable RoutingRoleEnum routingRole = 1; readonly attribute nullable char_string<16> networkName = 2; readonly attribute nullable int16u panId = 3; readonly attribute nullable int64u extendedPanId = 4; readonly attribute nullable octet_string<17> meshLocalPrefix = 5; readonly attribute optional int64u overrunCount = 6; - readonly attribute NeighborTable neighborTable[] = 7; - readonly attribute RouteTable routeTable[] = 8; + readonly attribute NeighborTableStruct neighborTable[] = 7; + readonly attribute RouteTableStruct routeTable[] = 8; readonly attribute nullable int32u partitionId = 9; readonly attribute nullable int8u weighting = 10; readonly attribute nullable int8u dataVersion = 11; @@ -1772,7 +1772,7 @@ client cluster ThreadNetworkDiagnostics = 53 { readonly attribute nullable SecurityPolicy securityPolicy = 59; readonly attribute nullable octet_string<4> channelPage0Mask = 60; readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61; - readonly attribute NetworkFault activeNetworkFaultsList[] = 62; + readonly attribute NetworkFaultEnum activeNetworkFaultsList[] = 62; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; @@ -1791,14 +1791,14 @@ server cluster ThreadNetworkDiagnostics = 53 { kNotConnected = 1; } - enum NetworkFault : ENUM8 { + enum NetworkFaultEnum : ENUM8 { kUnspecified = 0; kLinkDown = 1; kHardwareFailure = 2; kNetworkJammed = 3; } - enum RoutingRole : ENUM8 { + enum RoutingRoleEnum : ENUM8 { kUnspecified = 0; kUnassigned = 1; kSleepyEndDevice = 2; @@ -1815,7 +1815,7 @@ server cluster ThreadNetworkDiagnostics = 53 { kMACCounts = 0x8; } - struct NeighborTable { + struct NeighborTableStruct { int64u extAddress = 0; int32u age = 1; int16u rloc16 = 2; @@ -1847,7 +1847,7 @@ server cluster ThreadNetworkDiagnostics = 53 { boolean channelMaskPresent = 11; } - struct RouteTable { + struct RouteTableStruct { int64u extAddress = 0; int16u rloc16 = 1; int8u routerId = 2; @@ -1870,19 +1870,19 @@ server cluster ThreadNetworkDiagnostics = 53 { } info event NetworkFaultChange = 1 { - NetworkFault current[] = 0; - NetworkFault previous[] = 1; + NetworkFaultEnum current[] = 0; + NetworkFaultEnum previous[] = 1; } readonly attribute nullable int16u channel = 0; - readonly attribute nullable RoutingRole routingRole = 1; + readonly attribute nullable RoutingRoleEnum routingRole = 1; readonly attribute nullable char_string<16> networkName = 2; readonly attribute nullable int16u panId = 3; readonly attribute nullable int64u extendedPanId = 4; readonly attribute nullable octet_string<17> meshLocalPrefix = 5; readonly attribute int64u overrunCount = 6; - readonly attribute NeighborTable neighborTable[] = 7; - readonly attribute RouteTable routeTable[] = 8; + readonly attribute NeighborTableStruct neighborTable[] = 7; + readonly attribute RouteTableStruct routeTable[] = 8; readonly attribute nullable int32u partitionId = 9; readonly attribute nullable int8u weighting = 10; readonly attribute nullable int8u dataVersion = 11; @@ -1936,7 +1936,7 @@ server cluster ThreadNetworkDiagnostics = 53 { readonly attribute nullable SecurityPolicy securityPolicy = 59; readonly attribute nullable octet_string<4> channelPage0Mask = 60; readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61; - readonly attribute NetworkFault activeNetworkFaultsList[] = 62; + readonly attribute NetworkFaultEnum activeNetworkFaultsList[] = 62; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; diff --git a/examples/placeholder/linux/apps/app2/config.zap b/examples/placeholder/linux/apps/app2/config.zap index 843b76828465d8..fdb2a1647e2c63 100644 --- a/examples/placeholder/linux/apps/app2/config.zap +++ b/examples/placeholder/linux/apps/app2/config.zap @@ -2888,22 +2888,6 @@ "side": "server", "enabled": 1, "attributes": [ - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, { "name": "Channel", "code": 0, @@ -2941,9 +2925,9 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "String", + "type": "char_string", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -3021,7 +3005,7 @@ "code": 7, "mfgCode": null, "side": "server", - "type": "NeighborTableStruct", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -3037,7 +3021,7 @@ "code": 8, "mfgCode": null, "side": "server", - "type": "RouteTableStruct", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -3149,7 +3133,7 @@ "code": 15, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -3165,7 +3149,7 @@ "code": 16, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -3181,7 +3165,7 @@ "code": 17, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -3897,7 +3881,7 @@ "reportableChange": 0 }, { - "name": "ActiveNetworkFaults", + "name": "ActiveNetworkFaultsList", "code": 62, "mfgCode": null, "side": "server", @@ -3911,6 +3895,22 @@ "minInterval": 0, "maxInterval": 65344, "reportableChange": 0 + }, + { + "name": "ClusterRevision", + "code": 65533, + "mfgCode": null, + "side": "server", + "type": "int16u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "1", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 } ] }, @@ -4479,22 +4479,6 @@ "side": "server", "enabled": 1, "attributes": [ - { - "name": "DataModelRevision", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "External", - "singleton": 1, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, { "name": "VendorName", "code": 1, @@ -4543,22 +4527,6 @@ "maxInterval": 65344, "reportableChange": 0 }, - { - "name": "ProductID", - "code": 4, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "External", - "singleton": 1, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, { "name": "NodeLabel", "code": 5, @@ -4575,22 +4543,6 @@ "maxInterval": 65344, "reportableChange": 0 }, - { - "name": "Location", - "code": 6, - "mfgCode": null, - "side": "server", - "type": "char_string", - "included": 1, - "storageOption": "External", - "singleton": 1, - "bounded": 0, - "defaultValue": "XX", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, { "name": "HardwareVersion", "code": 7, @@ -4735,22 +4687,6 @@ "maxInterval": 65344, "reportableChange": 0 }, - { - "name": "LocalConfigDisabled", - "code": 16, - "mfgCode": null, - "side": "server", - "type": "boolean", - "included": 1, - "storageOption": "NVM", - "singleton": 1, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, { "name": "Reachable", "code": 17, @@ -4783,22 +4719,6 @@ "maxInterval": 65344, "reportableChange": 0 }, - { - "name": "CapabilityMinima", - "code": 19, - "mfgCode": null, - "side": "server", - "type": "CapabilityMinimaStruct", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, { "name": "ProductAppearance", "code": 20, @@ -5841,7 +5761,7 @@ "enabled": 1, "commands": [ { - "name": "Lock Door", + "name": "LockDoor", "code": 0, "mfgCode": null, "source": "client", @@ -5849,7 +5769,7 @@ "outgoing": 0 }, { - "name": "Unlock Door", + "name": "UnlockDoor", "code": 1, "mfgCode": null, "source": "client", @@ -5857,15 +5777,7 @@ "outgoing": 0 }, { - "name": "Toggle", - "code": 2, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "Unlock with Timeout", + "name": "UnlockWithTimeout", "code": 3, "mfgCode": null, "source": "client", @@ -5900,28 +5812,12 @@ "side": "server", "enabled": 1, "attributes": [ - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "6", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, { "name": "LockState", "code": 0, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "DlLockState", "included": 1, "storageOption": "External", "singleton": 0, @@ -5937,7 +5833,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "DlLockType", "included": 1, "storageOption": "External", "singleton": 0, @@ -5969,7 +5865,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "DoorStateEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -6028,22 +5924,6 @@ "maxInterval": 65534, "reportableChange": 0 }, - { - "name": "NumberOfLogRecordsSupported", - "code": 16, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, { "name": "NumberOfTotalUsersSupported", "code": 17, @@ -6209,7 +6089,7 @@ "code": 27, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "DlCredentialRuleMask", "included": 1, "storageOption": "External", "singleton": 0, @@ -6236,28 +6116,12 @@ "maxInterval": 65344, "reportableChange": 0 }, - { - "name": "EnableLogging", - "code": 32, - "mfgCode": null, - "side": "server", - "type": "boolean", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65534, - "reportableChange": 0 - }, { "name": "Language", "code": 33, "mfgCode": null, "side": "server", - "type": "String", + "type": "char_string", "included": 1, "storageOption": "External", "singleton": 0, @@ -6267,8 +6131,8 @@ "minInterval": 0, "maxInterval": 65344, "reportableChange": 0 - } - ,{ + }, + { "name": "LEDSettings", "code": 34, "mfgCode": null, @@ -6321,7 +6185,7 @@ "code": 37, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "OperatingModeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -6337,7 +6201,7 @@ "code": 38, "mfgCode": null, "side": "server", - "type": "bitmap16", + "type": "DlSupportedOperatingModes", "included": 1, "storageOption": "External", "singleton": 0, @@ -6353,7 +6217,7 @@ "code": 39, "mfgCode": null, "side": "server", - "type": "bitmap16", + "type": "DlDefaultConfigurationRegister", "included": 1, "storageOption": "External", "singleton": 0, @@ -6433,7 +6297,7 @@ "code": 44, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "DlLocalProgrammingFeatures", "included": 1, "storageOption": "External", "singleton": 0, @@ -6508,22 +6372,6 @@ "maxInterval": 65344, "reportableChange": 0 }, - { - "name": "SecurityLevel", - "code": 52, - "mfgCode": null, - "side": "server", - "type": "enum8", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, { "name": "ExpiringUserTimeout", "code": 53, @@ -6541,162 +6389,50 @@ "reportableChange": 0 }, { - "name": "AlarmMask", - "code": 64, + "name": "ClusterRevision", + "code": 65533, "mfgCode": null, "side": "server", - "type": "bitmap16", + "type": "int16u", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0xFFFF", + "defaultValue": "6", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 + } + ] + }, + { + "name": "Window Covering", + "code": 258, + "mfgCode": null, + "define": "WINDOW_COVERING_CLUSTER", + "side": "client", + "enabled": 0, + "commands": [ + { + "name": "UpOrOpen", + "code": 0, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 0 }, { - "name": "KeypadOperationEventMask", - "code": 65, + "name": "DownOrClose", + "code": 1, "mfgCode": null, - "side": "server", - "type": "bitmap16", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0xFFFF", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 + "source": "client", + "incoming": 1, + "outgoing": 0 }, { - "name": "RemoteOperationEventMask", - "code": 66, - "mfgCode": null, - "side": "server", - "type": "bitmap16", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0xFFFF", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "ManualOperationEventMask", - "code": 67, - "mfgCode": null, - "side": "server", - "type": "bitmap16", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0xFFFF", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "RFIDOperationEventMask", - "code": 68, - "mfgCode": null, - "side": "server", - "type": "bitmap16", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0xFFFF", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "KeypadProgrammingEventMask", - "code": 69, - "mfgCode": null, - "side": "server", - "type": "bitmap16", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0xFFFF", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "RemoteProgrammingEventMask", - "code": 70, - "mfgCode": null, - "side": "server", - "type": "bitmap16", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0xFFFF", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "RFIDProgrammingEventMask", - "code": 71, - "mfgCode": null, - "side": "server", - "type": "bitmap16", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0xFFFF", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] - }, - { - "name": "Window Covering", - "code": 258, - "mfgCode": null, - "define": "WINDOW_COVERING_CLUSTER", - "side": "client", - "enabled": 0, - "commands": [ - { - "name": "UpOrOpen", - "code": 0, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "DownOrClose", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "StopMotion", - "code": 2, + "name": "StopMotion", + "code": 2, "mfgCode": null, "source": "client", "incoming": 1, @@ -7486,22 +7222,6 @@ "maxInterval": 65534, "reportableChange": 0 }, - { - "name": "AlarmMask", - "code": 34, - "mfgCode": null, - "side": "server", - "type": "bitmap16", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, { "name": "FeatureMap", "code": 65532, @@ -7575,14 +7295,6 @@ "source": "client", "incoming": 0, "outgoing": 1 - }, - { - "name": "GetRelayStatusLog", - "code": 4, - "mfgCode": null, - "source": "client", - "incoming": 0, - "outgoing": 1 } ], "attributes": [ @@ -7619,14 +7331,6 @@ "source": "server", "incoming": 1, "outgoing": 0 - }, - { - "name": "GetRelayStatusLogResponse", - "code": 1, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 } ], "attributes": [ @@ -7998,22 +7702,6 @@ "maxInterval": 65344, "reportableChange": 0 }, - { - "name": "AlarmMask", - "code": 29, - "mfgCode": null, - "side": "server", - "type": "bitmap8", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, { "name": "ThermostatRunningMode", "code": 30, @@ -8179,7 +7867,7 @@ "code": 50, "mfgCode": null, "side": "server", - "type": "utc", + "type": "epoch_s", "included": 1, "storageOption": "External", "singleton": 0, @@ -8377,7 +8065,7 @@ "singleton": 1, "bounded": 0, "defaultValue": "0", - "reportable": 0, + "reportable": 1, "minInterval": 0, "maxInterval": 65344, "reportableChange": 0 @@ -8415,7 +8103,7 @@ "reportableChange": 0 }, { - "name": "ACCapacityFormat", + "name": "ACCapacityformat", "code": 71, "mfgCode": null, "side": "server", @@ -9465,20 +9153,36 @@ ] }, { - "name": "Target Navigator", - "code": 1285, + "name": "Channel", + "code": 1284, "mfgCode": null, - "define": "TARGET_NAVIGATOR_CLUSTER", + "define": "CHANNEL_CLUSTER", "side": "client", "enabled": 1, "commands": [ { - "name": "NavigateTarget", + "name": "ChangeChannel", "code": 0, "mfgCode": null, "source": "client", - "incoming": 0, - "outgoing": 1 + "incoming": 1, + "outgoing": 0 + }, + { + "name": "ChangeChannelByNumber", + "code": 2, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 0 + }, + { + "name": "SkipChannel", + "code": 3, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 0 } ], "attributes": [ @@ -9494,32 +9198,22 @@ "bounded": 0, "defaultValue": "1", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 } ] }, { - "name": "Target Navigator", - "code": 1285, + "name": "Channel", + "code": 1284, "mfgCode": null, - "define": "TARGET_NAVIGATOR_CLUSTER", + "define": "CHANNEL_CLUSTER", "side": "server", "enabled": 1, - "commands": [ - { - "name": "NavigateTargetResponse", - "code": 1, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - } - ], "attributes": [ { - "name": "TargetList", + "name": "ChannelList", "code": 0, "mfgCode": null, "side": "server", @@ -9531,117 +9225,85 @@ "defaultValue": "", "reportable": 1, "minInterval": 1, - "maxInterval": 65534, + "maxInterval": 65344, "reportableChange": 0 }, { - "name": "CurrentTarget", + "name": "Lineup", "code": 1, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "LineupInfoStruct", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0", + "defaultValue": "", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 }, { - "name": "GeneratedCommandList", - "code": 65528, + "name": "CurrentChannel", + "code": 2, "mfgCode": null, "side": "server", - "type": "array", + "type": "ChannelInfoStruct", "included": 1, "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 }, { - "name": "AcceptedCommandList", - "code": 65529, + "name": "FeatureMap", + "code": 65532, "mfgCode": null, "side": "server", - "type": "array", + "type": "bitmap32", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "0", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "AttributeList", - "code": 65531, + "name": "ClusterRevision", + "code": 65533, "mfgCode": null, "side": "server", - "type": "array", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "1", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "server", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 } ] }, { - "name": "Keypad Input", - "code": 1289, + "name": "Target Navigator", + "code": 1285, "mfgCode": null, - "define": "KEYPAD_INPUT_CLUSTER", + "define": "TARGET_NAVIGATOR_CLUSTER", "side": "client", "enabled": 1, "commands": [ { - "name": "SendKey", + "name": "NavigateTarget", "code": 0, "mfgCode": null, "source": "client", @@ -9669,15 +9331,15 @@ ] }, { - "name": "Keypad Input", - "code": 1289, + "name": "Target Navigator", + "code": 1285, "mfgCode": null, - "define": "KEYPAD_INPUT_CLUSTER", + "define": "TARGET_NAVIGATOR_CLUSTER", "side": "server", "enabled": 1, "commands": [ { - "name": "SendKeyResponse", + "name": "NavigateTargetResponse", "code": 1, "mfgCode": null, "source": "server", @@ -9686,6 +9348,38 @@ } ], "attributes": [ + { + "name": "TargetList", + "code": 0, + "mfgCode": null, + "side": "server", + "type": "array", + "included": 1, + "storageOption": "External", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "CurrentTarget", + "code": 1, + "mfgCode": null, + "side": "server", + "type": "int8u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "GeneratedCommandList", "code": 65528, @@ -9769,15 +9463,15 @@ ] }, { - "name": "Content Launcher", - "code": 1290, + "name": "Media Playback", + "code": 1286, "mfgCode": null, - "define": "CONTENT_LAUNCHER_CLUSTER", + "define": "MEDIA_PLAYBACK_CLUSTER", "side": "client", "enabled": 1, "commands": [ { - "name": "LaunchContent", + "name": "Play", "code": 0, "mfgCode": null, "source": "client", @@ -9785,12 +9479,84 @@ "outgoing": 1 }, { - "name": "LaunchURL", + "name": "Pause", "code": 1, "mfgCode": null, "source": "client", "incoming": 1, "outgoing": 1 + }, + { + "name": "Stop", + "code": 2, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 1 + }, + { + "name": "StartOver", + "code": 3, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 1 + }, + { + "name": "Previous", + "code": 4, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 1 + }, + { + "name": "Next", + "code": 5, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 1 + }, + { + "name": "Rewind", + "code": 6, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 1 + }, + { + "name": "FastForward", + "code": 7, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 1 + }, + { + "name": "SkipForward", + "code": 8, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 1 + }, + { + "name": "SkipBackward", + "code": 9, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 1 + }, + { + "name": "Seek", + "code": 11, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 1 } ], "attributes": [ @@ -9806,23 +9572,23 @@ "bounded": 0, "defaultValue": "1", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 } ] }, { - "name": "Content Launcher", - "code": 1290, + "name": "Media Playback", + "code": 1286, "mfgCode": null, - "define": "CONTENT_LAUNCHER_CLUSTER", + "define": "MEDIA_PLAYBACK_CLUSTER", "side": "server", "enabled": 1, "commands": [ { - "name": "LauncherResponse", - "code": 2, + "name": "PlaybackResponse", + "code": 10, "mfgCode": null, "source": "server", "incoming": 1, @@ -9831,13 +9597,13 @@ ], "attributes": [ { - "name": "AcceptHeader", + "name": "CurrentState", "code": 0, "mfgCode": null, "side": "server", - "type": "array", + "type": "PlaybackStateEnum", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -9847,29 +9613,29 @@ "reportableChange": 0 }, { - "name": "SupportedStreamingProtocols", + "name": "StartTime", "code": 1, "mfgCode": null, "side": "server", - "type": "bitmap32", + "type": "epoch_us", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0", + "defaultValue": "", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "GeneratedCommandList", - "code": 65528, + "name": "Duration", + "code": 2, "mfgCode": null, "side": "server", - "type": "array", + "type": "int64u", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -9879,11 +9645,11 @@ "reportableChange": 0 }, { - "name": "AcceptedCommandList", - "code": 65529, + "name": "SampledPosition", + "code": 3, "mfgCode": null, "side": "server", - "type": "array", + "type": "PlaybackPositionStruct", "included": 1, "storageOption": "External", "singleton": 0, @@ -9895,43 +9661,43 @@ "reportableChange": 0 }, { - "name": "AttributeList", - "code": 65531, + "name": "PlaybackSpeed", + "code": 4, "mfgCode": null, "side": "server", - "type": "array", + "type": "single", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "1", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "FeatureMap", - "code": 65532, + "name": "SeekRangeEnd", + "code": 5, "mfgCode": null, "side": "server", - "type": "bitmap32", + "type": "int64u", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0", + "defaultValue": "", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "ClusterRevision", - "code": 65533, + "name": "SeekRangeStart", + "code": 6, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "int64u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -9941,22 +9707,28 @@ "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 - } - ] - }, - { - "name": "Application Basic", - "code": 1293, - "mfgCode": null, - "define": "APPLICATION_BASIC_CLUSTER", - "side": "client", - "enabled": 1, - "attributes": [ + }, + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "server", + "type": "bitmap32", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "ClusterRevision", "code": 65533, "mfgCode": null, - "side": "client", + "side": "server", "type": "int16u", "included": 1, "storageOption": "RAM", @@ -9971,141 +9743,239 @@ ] }, { - "name": "Application Basic", - "code": 1293, + "name": "Media Input", + "code": 1287, "mfgCode": null, - "define": "APPLICATION_BASIC_CLUSTER", - "side": "server", + "define": "MEDIA_INPUT_CLUSTER", + "side": "client", "enabled": 1, - "attributes": [ + "commands": [ { - "name": "VendorName", + "name": "SelectInput", "code": 0, "mfgCode": null, - "side": "server", - "type": "char_string", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 + "source": "client", + "incoming": 1, + "outgoing": 0 }, { - "name": "VendorID", + "name": "ShowInputStatus", "code": 1, "mfgCode": null, - "side": "server", - "type": "vendor_id", + "source": "client", + "incoming": 1, + "outgoing": 0 + }, + { + "name": "HideInputStatus", + "code": 2, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 0 + }, + { + "name": "RenameInput", + "code": 3, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 0 + } + ], + "attributes": [ + { + "name": "ClusterRevision", + "code": 65533, + "mfgCode": null, + "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x0", + "defaultValue": "1", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 - }, + } + ] + }, + { + "name": "Media Input", + "code": 1287, + "mfgCode": null, + "define": "MEDIA_INPUT_CLUSTER", + "side": "server", + "enabled": 1, + "attributes": [ { - "name": "ApplicationName", - "code": 2, + "name": "InputList", + "code": 0, "mfgCode": null, "side": "server", - "type": "char_string", + "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", "reportable": 1, - "minInterval": 1, + "minInterval": 0, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "ProductID", - "code": 3, + "name": "CurrentInput", + "code": 1, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "int8u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0x0", + "defaultValue": "", "reportable": 1, - "minInterval": 1, + "minInterval": 0, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "Application", - "code": 4, + "name": "ClusterRevision", + "code": 65533, "mfgCode": null, "side": "server", - "type": "ApplicationStruct", + "type": "int16u", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "1", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 - }, + } + ] + }, + { + "name": "Low Power", + "code": 1288, + "mfgCode": null, + "define": "LOW_POWER_CLUSTER", + "side": "client", + "enabled": 1, + "commands": [ { - "name": "Status", - "code": 5, + "name": "Sleep", + "code": 0, "mfgCode": null, - "side": "server", - "type": "ApplicationStatusEnum", + "source": "client", + "incoming": 1, + "outgoing": 0 + } + ], + "attributes": [ + { + "name": "ClusterRevision", + "code": 65533, + "mfgCode": null, + "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x01", + "defaultValue": "1", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 - }, + } + ] + }, + { + "name": "Low Power", + "code": 1288, + "mfgCode": null, + "define": "LOW_POWER_CLUSTER", + "side": "server", + "enabled": 0, + "attributes": [ { - "name": "ApplicationVersion", - "code": 6, + "name": "ClusterRevision", + "code": 65533, "mfgCode": null, "side": "server", - "type": "char_string", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "1", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 - }, + } + ] + }, + { + "name": "Keypad Input", + "code": 1289, + "mfgCode": null, + "define": "KEYPAD_INPUT_CLUSTER", + "side": "client", + "enabled": 1, + "commands": [ { - "name": "AllowedVendorList", - "code": 7, + "name": "SendKey", + "code": 0, "mfgCode": null, - "side": "server", - "type": "array", + "source": "client", + "incoming": 0, + "outgoing": 1 + } + ], + "attributes": [ + { + "name": "ClusterRevision", + "code": 65533, + "mfgCode": null, + "side": "client", + "type": "int16u", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "1", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 - }, + } + ] + }, + { + "name": "Keypad Input", + "code": 1289, + "mfgCode": null, + "define": "KEYPAD_INPUT_CLUSTER", + "side": "server", + "enabled": 1, + "commands": [ + { + "name": "SendKeyResponse", + "code": 1, + "mfgCode": null, + "source": "server", + "incoming": 1, + "outgoing": 0 + } + ], + "attributes": [ { "name": "GeneratedCommandList", "code": 65528, @@ -10189,36 +10059,28 @@ ] }, { - "name": "Account Login", - "code": 1294, + "name": "Content Launcher", + "code": 1290, "mfgCode": null, - "define": "ACCOUNT_LOGIN_CLUSTER", + "define": "CONTENT_LAUNCHER_CLUSTER", "side": "client", "enabled": 1, "commands": [ { - "name": "GetSetupPIN", + "name": "LaunchContent", "code": 0, "mfgCode": null, "source": "client", "incoming": 1, - "outgoing": 0 - }, - { - "name": "Login", - "code": 2, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 + "outgoing": 1 }, { - "name": "Logout", - "code": 3, + "name": "LaunchURL", + "code": 1, "mfgCode": null, "source": "client", "incoming": 1, - "outgoing": 0 + "outgoing": 1 } ], "attributes": [ @@ -10234,61 +10096,51 @@ "bounded": 0, "defaultValue": "1", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 } ] }, { - "name": "Account Login", - "code": 1294, + "name": "Content Launcher", + "code": 1290, "mfgCode": null, - "define": "ACCOUNT_LOGIN_CLUSTER", + "define": "CONTENT_LAUNCHER_CLUSTER", "side": "server", "enabled": 1, "commands": [ { - "name": "GetSetupPINResponse", - "code": 1, + "name": "LauncherResponse", + "code": 2, "mfgCode": null, "source": "server", - "incoming": 0, + "incoming": 1, "outgoing": 1 } ], "attributes": [ { - "name": "ClusterRevision", - "code": 65533, + "name": "AcceptHeader", + "code": 0, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 - } - ] - }, - { - "name": "Application Launcher", - "code": 1292, - "mfgCode": null, - "define": "APPLICATION_LAUNCHER_CLUSTER", - "side": "client", - "enabled": 1, - "attributes": [ + }, { - "name": "FeatureMap", - "code": 65532, + "name": "SupportedStreamingProtocols", + "code": 1, "mfgCode": null, - "side": "client", + "side": "server", "type": "bitmap32", "included": 1, "storageOption": "RAM", @@ -10301,87 +10153,51 @@ "reportableChange": 0 }, { - "name": "ClusterRevision", - "code": 65533, + "name": "GeneratedCommandList", + "code": 65528, "mfgCode": null, - "side": "client", - "type": "int16u", + "side": "server", + "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 - } - ], - "commands": [ - { - "name": "LaunchApp", - "code": 0, - "mfgCode": null, - "source": "client", - "incoming": 0, - "outgoing": 1 }, { - "name": "StopApp", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 0, - "outgoing": 1 - }, - { - "name": "HideApp", - "code": 2, - "mfgCode": null, - "source": "client", - "incoming": 0, - "outgoing": 1 - } - ] - }, - { - "name": "Application Launcher", - "code": 1292, - "mfgCode": null, - "define": "APPLICATION_LAUNCHER_CLUSTER", - "side": "server", - "enabled": 1, - "attributes": [ - { - "name": "CatalogList", - "code": 0, + "name": "AcceptedCommandList", + "code": 65529, "mfgCode": null, "side": "server", "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 }, { - "name": "CurrentApp", - "code": 1, + "name": "AttributeList", + "code": 65531, "mfgCode": null, "side": "server", - "type": "ApplicationEP", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 }, { @@ -10412,20 +10228,10 @@ "bounded": 0, "defaultValue": "1", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 } - ], - "commands": [ - { - "name": "LauncherResponse", - "code": 3, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - } ] }, { @@ -10435,6 +10241,24 @@ "define": "AUDIO_OUTPUT_CLUSTER", "side": "client", "enabled": 1, + "commands": [ + { + "name": "SelectOutput", + "code": 0, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 0 + }, + { + "name": "RenameOutput", + "code": 1, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 0 + } + ], "attributes": [ { "name": "FeatureMap", @@ -10468,24 +10292,6 @@ "maxInterval": 65344, "reportableChange": 0 } - ], - "commands": [ - { - "name": "SelectOutput", - "code": 0, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "RenameOutput", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - } ] }, { @@ -10503,7 +10309,7 @@ "side": "server", "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -10563,13 +10369,55 @@ ] }, { - "name": "Channel", - "code": 1284, + "name": "Application Launcher", + "code": 1292, "mfgCode": null, - "define": "CHANNEL_CLUSTER", + "define": "APPLICATION_LAUNCHER_CLUSTER", "side": "client", "enabled": 1, + "commands": [ + { + "name": "LaunchApp", + "code": 0, + "mfgCode": null, + "source": "client", + "incoming": 0, + "outgoing": 1 + }, + { + "name": "StopApp", + "code": 1, + "mfgCode": null, + "source": "client", + "incoming": 0, + "outgoing": 1 + }, + { + "name": "HideApp", + "code": 2, + "mfgCode": null, + "source": "client", + "incoming": 0, + "outgoing": 1 + } + ], "attributes": [ + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "client", + "type": "bitmap32", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "ClusterRevision", "code": 65533, @@ -10586,44 +10434,28 @@ "maxInterval": 65344, "reportableChange": 0 } - ], + ] + }, + { + "name": "Application Launcher", + "code": 1292, + "mfgCode": null, + "define": "APPLICATION_LAUNCHER_CLUSTER", + "side": "server", + "enabled": 1, "commands": [ { - "name": "ChangeChannel", - "code": 0, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "ChangeChannelByNumber", - "code": 2, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "SkipChannel", + "name": "LauncherResponse", "code": 3, "mfgCode": null, - "source": "client", + "source": "server", "incoming": 1, "outgoing": 0 } - ] - }, - { - "name": "Channel", - "code": 1284, - "mfgCode": null, - "define": "CHANNEL_CLUSTER", - "side": "server", - "enabled": 1, + ], "attributes": [ { - "name": "ChannelList", + "name": "CatalogList", "code": 0, "mfgCode": null, "side": "server", @@ -10634,32 +10466,16 @@ "bounded": 0, "defaultValue": "", "reportable": 1, - "minInterval": 1, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "Lineup", - "code": 1, - "mfgCode": null, - "side": "server", - "type": "LineupInfo", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, "minInterval": 0, "maxInterval": 65344, "reportableChange": 0 }, { - "name": "CurrentChannel", - "code": 2, + "name": "CurrentApp", + "code": 1, "mfgCode": null, "side": "server", - "type": "ChannelInfo", + "type": "ApplicationEPStruct", "included": 1, "storageOption": "External", "singleton": 0, @@ -10693,7 +10509,7 @@ "side": "server", "type": "int16u", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, "defaultValue": "1", @@ -10702,35 +10518,15 @@ "maxInterval": 65344, "reportableChange": 0 } - ], - "commands": [ - { - "name": "ChangeChannelResponse", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - } ] }, { - "name": "Low Power", - "code": 1288, + "name": "Application Basic", + "code": 1293, "mfgCode": null, - "define": "LOW_POWER_CLUSTER", + "define": "APPLICATION_BASIC_CLUSTER", "side": "client", "enabled": 1, - "commands": [ - { - "name": "Sleep", - "code": 0, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - } - ], "attributes": [ { "name": "ClusterRevision", @@ -10751,173 +10547,85 @@ ] }, { - "name": "Low Power", - "code": 1288, + "name": "Application Basic", + "code": 1293, "mfgCode": null, - "define": "LOW_POWER_CLUSTER", + "define": "APPLICATION_BASIC_CLUSTER", "side": "server", - "enabled": 0, + "enabled": 1, "attributes": [ { - "name": "ClusterRevision", - "code": 65533, + "name": "VendorName", + "code": 0, "mfgCode": null, - "side": "client", - "type": "int16u", + "side": "server", + "type": "char_string", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 - } - ] - }, - { - "name": "Media Playback", - "code": 1286, - "mfgCode": null, - "define": "MEDIA_PLAYBACK_CLUSTER", - "side": "client", - "enabled": 1, - "commands": [ - { - "name": "Play", - "code": 0, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 }, { - "name": "Pause", + "name": "VendorID", "code": 1, "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 + "side": "server", + "type": "vendor_id", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x0", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 }, { - "name": "Stop", + "name": "ApplicationName", "code": 2, "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 + "side": "server", + "type": "char_string", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 }, { - "name": "StartOver", + "name": "ProductID", "code": 3, "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "Previous", - "code": 4, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "Next", - "code": 5, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "Rewind", - "code": 6, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "FastForward", - "code": 7, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "SkipForward", - "code": 8, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "SkipBackward", - "code": 9, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "Seek", - "code": 11, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - } - ], - "attributes": [ - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", + "side": "server", "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "0x0", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 - } - ] - }, - { - "name": "Media Playback", - "code": 1286, - "mfgCode": null, - "define": "MEDIA_PLAYBACK_CLUSTER", - "side": "server", - "enabled": 1, - "commands": [ + }, { - "name": "PlaybackResponse", - "code": 10, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - } - ], - "attributes": [ - { - "name": "CurrentState", - "code": 0, + "name": "Application", + "code": 4, "mfgCode": null, "side": "server", - "type": "PlaybackStateType", + "type": "ApplicationStruct", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -10927,27 +10635,27 @@ "reportableChange": 0 }, { - "name": "StartTime", - "code": 1, + "name": "Status", + "code": 5, "mfgCode": null, "side": "server", - "type": "epoch_us", + "type": "ApplicationStatusEnum", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "0x01", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "Duration", - "code": 2, + "name": "ApplicationVersion", + "code": 6, "mfgCode": null, "side": "server", - "type": "int64u", + "type": "char_string", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -10959,11 +10667,11 @@ "reportableChange": 0 }, { - "name": "SampledPosition", - "code": 3, + "name": "AllowedVendorList", + "code": 7, "mfgCode": null, "side": "server", - "type": "PlaybackPositionType", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -10973,31 +10681,31 @@ "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 - }, + }, { - "name": "PlaybackSpeed", - "code": 4, + "name": "GeneratedCommandList", + "code": 65528, "mfgCode": null, "side": "server", - "type": "SingleType", + "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "SeekRangeEnd", - "code": 5, + "name": "AcceptedCommandList", + "code": 65529, "mfgCode": null, "side": "server", - "type": "int64u", + "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -11007,16 +10715,16 @@ "reportableChange": 0 }, { - "name": "SeekRangeStart", - "code": 6, + "name": "AttributeList", + "code": 65531, "mfgCode": null, "side": "server", - "type": "int64u", + "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -11057,15 +10765,15 @@ ] }, { - "name": "Media Input", - "code": 1287, + "name": "Account Login", + "code": 1294, "mfgCode": null, - "define": "MEDIA_INPUT_CLUSTER", + "define": "ACCOUNT_LOGIN_CLUSTER", "side": "client", "enabled": 1, "commands": [ { - "name": "SelectInput", + "name": "GetSetupPIN", "code": 0, "mfgCode": null, "source": "client", @@ -11073,15 +10781,7 @@ "outgoing": 0 }, { - "name": "ShowInputStatus", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "HideInputStatus", + "name": "Login", "code": 2, "mfgCode": null, "source": "client", @@ -11089,7 +10789,7 @@ "outgoing": 0 }, { - "name": "RenameInput", + "name": "Logout", "code": 3, "mfgCode": null, "source": "client", @@ -11110,19 +10810,29 @@ "bounded": 0, "defaultValue": "1", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 } ] }, { - "name": "Media Input", - "code": 1287, + "name": "Account Login", + "code": 1294, "mfgCode": null, - "define": "MEDIA_INPUT_CLUSTER", + "define": "ACCOUNT_LOGIN_CLUSTER", "side": "server", "enabled": 1, + "commands": [ + { + "name": "GetSetupPINResponse", + "code": 1, + "mfgCode": null, + "source": "server", + "incoming": 0, + "outgoing": 1 + } + ], "attributes": [ { "name": "ClusterRevision", @@ -11136,40 +10846,8 @@ "bounded": 0, "defaultValue": "1", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "InputList", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "InputInfoStruct", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "CurrentInput", - "code": 1, - "mfgCode": null, - "side": "server", - "type": "int8u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, "minInterval": 0, - "maxInterval": 65534, + "maxInterval": 65344, "reportableChange": 0 } ] @@ -13557,196 +13235,20 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int8u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "CurrentSaturation", - "code": 1, - "mfgCode": null, - "side": "server", - "type": "int8u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "RemainingTime", - "code": 2, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "CurrentX", - "code": 3, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x616B", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "CurrentY", - "code": 4, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x607D", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "DriftCompensation", - "code": 5, - "mfgCode": null, - "side": "server", - "type": "enum8", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 0, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "CompensationText", - "code": 6, - "mfgCode": null, - "side": "server", - "type": "string", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 0, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ColorTemperatureMireds", - "code": 7, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00FA", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ColorMode", - "code": 8, - "mfgCode": null, - "side": "server", - "type": "enum8", - "included": 1, - "storageOption": "External", - "singleton": 1, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "Options", - "code": 15, - "mfgCode": null, - "side": "server", - "type": "bitmap8", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "EnhancedCurrentHue", - "code": 16384, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "EnhancedColorMode", - "code": 16385, - "mfgCode": null, - "side": "server", - "type": "enum8", + "type": "int8u", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x01", + "defaultValue": "0x00", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "ColorLoopActive", - "code": 16386, + "name": "CurrentSaturation", + "code": 1, "mfgCode": null, "side": "server", "type": "int8u", @@ -13756,29 +13258,29 @@ "bounded": 0, "defaultValue": "0x00", "reportable": 1, - "minInterval": 0, + "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "ColorLoopDirection", - "code": 16387, + "name": "RemainingTime", + "code": 2, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x00", "reportable": 1, - "minInterval": 0, + "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "ColorLoopTime", - "code": 16388, + "name": "CurrentX", + "code": 3, "mfgCode": null, "side": "server", "type": "int16u", @@ -13786,15 +13288,15 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x0019", + "defaultValue": "0x616B", "reportable": 1, - "minInterval": 0, + "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "ColorLoopStartEnhancedHue", - "code": 16389, + "name": "CurrentY", + "code": 4, "mfgCode": null, "side": "server", "type": "int16u", @@ -13802,87 +13304,87 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x2300", + "defaultValue": "0x607D", "reportable": 1, - "minInterval": 0, + "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "ColorLoopStoredEnhancedHue", - "code": 16390, + "name": "DriftCompensation", + "code": 5, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "enum8", "included": 1, "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0x00", + "defaultValue": "", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "ColorCapabilities", - "code": 16394, + "name": "CompensationText", + "code": 6, "mfgCode": null, "side": "server", - "type": "bitmap16", + "type": "char_string", "included": 1, "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0x00", + "defaultValue": "", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "ColorTempPhysicalMinMireds", - "code": 16395, + "name": "ColorTemperatureMireds", + "code": 7, "mfgCode": null, "side": "server", "type": "int16u", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x00", + "defaultValue": "0x00FA", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "ColorTempPhysicalMaxMireds", - "code": 16396, + "name": "ColorMode", + "code": 8, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "enum8", "included": 1, "storageOption": "External", - "singleton": 0, + "singleton": 1, "bounded": 0, - "defaultValue": "0xfeff", + "defaultValue": "1", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "CoupleColorTempToLevelMinMireds", - "code": 16397, + "name": "Options", + "code": 15, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "bitmap8", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "0x00", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -14368,6 +13870,182 @@ "maxInterval": 65534, "reportableChange": 0 }, + { + "name": "EnhancedCurrentHue", + "code": 16384, + "mfgCode": null, + "side": "server", + "type": "int16u", + "included": 1, + "storageOption": "External", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x00", + "reportable": 1, + "minInterval": 0, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "EnhancedColorMode", + "code": 16385, + "mfgCode": null, + "side": "server", + "type": "enum8", + "included": 1, + "storageOption": "External", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x01", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "ColorLoopActive", + "code": 16386, + "mfgCode": null, + "side": "server", + "type": "int8u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x00", + "reportable": 1, + "minInterval": 0, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "ColorLoopDirection", + "code": 16387, + "mfgCode": null, + "side": "server", + "type": "int8u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x00", + "reportable": 1, + "minInterval": 0, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "ColorLoopTime", + "code": 16388, + "mfgCode": null, + "side": "server", + "type": "int16u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x0019", + "reportable": 1, + "minInterval": 0, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "ColorLoopStartEnhancedHue", + "code": 16389, + "mfgCode": null, + "side": "server", + "type": "int16u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x2300", + "reportable": 1, + "minInterval": 0, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "ColorLoopStoredEnhancedHue", + "code": 16390, + "mfgCode": null, + "side": "server", + "type": "int16u", + "included": 1, + "storageOption": "External", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x00", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "ColorCapabilities", + "code": 16394, + "mfgCode": null, + "side": "server", + "type": "bitmap16", + "included": 1, + "storageOption": "External", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x00", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "ColorTempPhysicalMinMireds", + "code": 16395, + "mfgCode": null, + "side": "server", + "type": "int16u", + "included": 1, + "storageOption": "External", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x00", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "ColorTempPhysicalMaxMireds", + "code": 16396, + "mfgCode": null, + "side": "server", + "type": "int16u", + "included": 1, + "storageOption": "External", + "singleton": 0, + "bounded": 0, + "defaultValue": "0xfeff", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "CoupleColorTempToLevelMinMireds", + "code": 16397, + "mfgCode": null, + "side": "server", + "type": "int16u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "StartUpColorTemperatureMireds", "code": 16400, diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter index c1791c3fdfbe72..587ae240c6df22 100644 --- a/examples/pump-app/pump-common/pump-app.matter +++ b/examples/pump-app/pump-common/pump-app.matter @@ -844,14 +844,14 @@ server cluster ThreadNetworkDiagnostics = 53 { kNotConnected = 1; } - enum NetworkFault : ENUM8 { + enum NetworkFaultEnum : ENUM8 { kUnspecified = 0; kLinkDown = 1; kHardwareFailure = 2; kNetworkJammed = 3; } - enum RoutingRole : ENUM8 { + enum RoutingRoleEnum : ENUM8 { kUnspecified = 0; kUnassigned = 1; kSleepyEndDevice = 2; @@ -868,7 +868,7 @@ server cluster ThreadNetworkDiagnostics = 53 { kMACCounts = 0x8; } - struct NeighborTable { + struct NeighborTableStruct { int64u extAddress = 0; int32u age = 1; int16u rloc16 = 2; @@ -900,7 +900,7 @@ server cluster ThreadNetworkDiagnostics = 53 { boolean channelMaskPresent = 11; } - struct RouteTable { + struct RouteTableStruct { int64u extAddress = 0; int16u rloc16 = 1; int8u routerId = 2; @@ -923,18 +923,18 @@ server cluster ThreadNetworkDiagnostics = 53 { } info event NetworkFaultChange = 1 { - NetworkFault current[] = 0; - NetworkFault previous[] = 1; + NetworkFaultEnum current[] = 0; + NetworkFaultEnum previous[] = 1; } readonly attribute nullable int16u channel = 0; - readonly attribute nullable RoutingRole routingRole = 1; + readonly attribute nullable RoutingRoleEnum routingRole = 1; readonly attribute nullable char_string<16> networkName = 2; readonly attribute nullable int16u panId = 3; readonly attribute nullable int64u extendedPanId = 4; readonly attribute nullable octet_string<17> meshLocalPrefix = 5; - readonly attribute NeighborTable neighborTable[] = 7; - readonly attribute RouteTable routeTable[] = 8; + readonly attribute NeighborTableStruct neighborTable[] = 7; + readonly attribute RouteTableStruct routeTable[] = 8; readonly attribute nullable int32u partitionId = 9; readonly attribute nullable int8u weighting = 10; readonly attribute nullable int8u dataVersion = 11; @@ -943,7 +943,7 @@ server cluster ThreadNetworkDiagnostics = 53 { readonly attribute nullable SecurityPolicy securityPolicy = 59; readonly attribute nullable octet_string<4> channelPage0Mask = 60; readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61; - readonly attribute NetworkFault activeNetworkFaultsList[] = 62; + readonly attribute NetworkFaultEnum activeNetworkFaultsList[] = 62; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; diff --git a/examples/pump-app/pump-common/pump-app.zap b/examples/pump-app/pump-common/pump-app.zap index de1eb19e862422..535179b503cb88 100644 --- a/examples/pump-app/pump-common/pump-app.zap +++ b/examples/pump-app/pump-common/pump-app.zap @@ -3588,7 +3588,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "RoutingRole", + "type": "RoutingRoleEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter index a5f22c5343be9f..a93cfc43db1268 100644 --- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter +++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter @@ -769,14 +769,14 @@ server cluster ThreadNetworkDiagnostics = 53 { kNotConnected = 1; } - enum NetworkFault : ENUM8 { + enum NetworkFaultEnum : ENUM8 { kUnspecified = 0; kLinkDown = 1; kHardwareFailure = 2; kNetworkJammed = 3; } - enum RoutingRole : ENUM8 { + enum RoutingRoleEnum : ENUM8 { kUnspecified = 0; kUnassigned = 1; kSleepyEndDevice = 2; @@ -793,7 +793,7 @@ server cluster ThreadNetworkDiagnostics = 53 { kMACCounts = 0x8; } - struct NeighborTable { + struct NeighborTableStruct { int64u extAddress = 0; int32u age = 1; int16u rloc16 = 2; @@ -825,7 +825,7 @@ server cluster ThreadNetworkDiagnostics = 53 { boolean channelMaskPresent = 11; } - struct RouteTable { + struct RouteTableStruct { int64u extAddress = 0; int16u rloc16 = 1; int8u routerId = 2; @@ -848,18 +848,18 @@ server cluster ThreadNetworkDiagnostics = 53 { } info event NetworkFaultChange = 1 { - NetworkFault current[] = 0; - NetworkFault previous[] = 1; + NetworkFaultEnum current[] = 0; + NetworkFaultEnum previous[] = 1; } readonly attribute nullable int16u channel = 0; - readonly attribute nullable RoutingRole routingRole = 1; + readonly attribute nullable RoutingRoleEnum routingRole = 1; readonly attribute nullable char_string<16> networkName = 2; readonly attribute nullable int16u panId = 3; readonly attribute nullable int64u extendedPanId = 4; readonly attribute nullable octet_string<17> meshLocalPrefix = 5; - readonly attribute NeighborTable neighborTable[] = 7; - readonly attribute RouteTable routeTable[] = 8; + readonly attribute NeighborTableStruct neighborTable[] = 7; + readonly attribute RouteTableStruct routeTable[] = 8; readonly attribute nullable int32u partitionId = 9; readonly attribute nullable int8u weighting = 10; readonly attribute nullable int8u dataVersion = 11; @@ -868,7 +868,7 @@ server cluster ThreadNetworkDiagnostics = 53 { readonly attribute nullable SecurityPolicy securityPolicy = 59; readonly attribute nullable octet_string<4> channelPage0Mask = 60; readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61; - readonly attribute NetworkFault activeNetworkFaultsList[] = 62; + readonly attribute NetworkFaultEnum activeNetworkFaultsList[] = 62; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap b/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap index 2c493074d018fe..d743025f249405 100644 --- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap +++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap @@ -3536,7 +3536,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "RoutingRole", + "type": "RoutingRoleEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter index e8dd4cb1fb3cfa..dc19d42e74fc87 100644 --- a/examples/thermostat/thermostat-common/thermostat.matter +++ b/examples/thermostat/thermostat-common/thermostat.matter @@ -1100,14 +1100,14 @@ server cluster ThreadNetworkDiagnostics = 53 { kNotConnected = 1; } - enum NetworkFault : ENUM8 { + enum NetworkFaultEnum : ENUM8 { kUnspecified = 0; kLinkDown = 1; kHardwareFailure = 2; kNetworkJammed = 3; } - enum RoutingRole : ENUM8 { + enum RoutingRoleEnum : ENUM8 { kUnspecified = 0; kUnassigned = 1; kSleepyEndDevice = 2; @@ -1124,7 +1124,7 @@ server cluster ThreadNetworkDiagnostics = 53 { kMACCounts = 0x8; } - struct NeighborTable { + struct NeighborTableStruct { int64u extAddress = 0; int32u age = 1; int16u rloc16 = 2; @@ -1156,7 +1156,7 @@ server cluster ThreadNetworkDiagnostics = 53 { boolean channelMaskPresent = 11; } - struct RouteTable { + struct RouteTableStruct { int64u extAddress = 0; int16u rloc16 = 1; int8u routerId = 2; @@ -1179,19 +1179,19 @@ server cluster ThreadNetworkDiagnostics = 53 { } info event NetworkFaultChange = 1 { - NetworkFault current[] = 0; - NetworkFault previous[] = 1; + NetworkFaultEnum current[] = 0; + NetworkFaultEnum previous[] = 1; } readonly attribute nullable int16u channel = 0; - readonly attribute nullable RoutingRole routingRole = 1; + readonly attribute nullable RoutingRoleEnum routingRole = 1; readonly attribute nullable char_string<16> networkName = 2; readonly attribute nullable int16u panId = 3; readonly attribute nullable int64u extendedPanId = 4; readonly attribute nullable octet_string<17> meshLocalPrefix = 5; readonly attribute int64u overrunCount = 6; - readonly attribute NeighborTable neighborTable[] = 7; - readonly attribute RouteTable routeTable[] = 8; + readonly attribute NeighborTableStruct neighborTable[] = 7; + readonly attribute RouteTableStruct routeTable[] = 8; readonly attribute nullable int32u partitionId = 9; readonly attribute nullable int8u weighting = 10; readonly attribute nullable int8u dataVersion = 11; @@ -1245,7 +1245,7 @@ server cluster ThreadNetworkDiagnostics = 53 { readonly attribute nullable SecurityPolicy securityPolicy = 59; readonly attribute nullable octet_string<4> channelPage0Mask = 60; readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61; - readonly attribute NetworkFault activeNetworkFaultsList[] = 62; + readonly attribute NetworkFaultEnum activeNetworkFaultsList[] = 62; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap index 38a43665b9817b..8d7be4e08c9ae2 100644 --- a/examples/thermostat/thermostat-common/thermostat.zap +++ b/examples/thermostat/thermostat-common/thermostat.zap @@ -3090,7 +3090,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "RoutingRole", + "type": "RoutingRoleEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter index fba612d8ff17ac..ec510c202a0520 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -1126,14 +1126,14 @@ server cluster ThreadNetworkDiagnostics = 53 { kNotConnected = 1; } - enum NetworkFault : ENUM8 { + enum NetworkFaultEnum : ENUM8 { kUnspecified = 0; kLinkDown = 1; kHardwareFailure = 2; kNetworkJammed = 3; } - enum RoutingRole : ENUM8 { + enum RoutingRoleEnum : ENUM8 { kUnspecified = 0; kUnassigned = 1; kSleepyEndDevice = 2; @@ -1150,7 +1150,7 @@ server cluster ThreadNetworkDiagnostics = 53 { kMACCounts = 0x8; } - struct NeighborTable { + struct NeighborTableStruct { int64u extAddress = 0; int32u age = 1; int16u rloc16 = 2; @@ -1182,7 +1182,7 @@ server cluster ThreadNetworkDiagnostics = 53 { boolean channelMaskPresent = 11; } - struct RouteTable { + struct RouteTableStruct { int64u extAddress = 0; int16u rloc16 = 1; int8u routerId = 2; @@ -1205,19 +1205,19 @@ server cluster ThreadNetworkDiagnostics = 53 { } info event NetworkFaultChange = 1 { - NetworkFault current[] = 0; - NetworkFault previous[] = 1; + NetworkFaultEnum current[] = 0; + NetworkFaultEnum previous[] = 1; } readonly attribute nullable int16u channel = 0; - readonly attribute nullable RoutingRole routingRole = 1; + readonly attribute nullable RoutingRoleEnum routingRole = 1; readonly attribute nullable char_string<16> networkName = 2; readonly attribute nullable int16u panId = 3; readonly attribute nullable int64u extendedPanId = 4; readonly attribute nullable octet_string<17> meshLocalPrefix = 5; readonly attribute int64u overrunCount = 6; - readonly attribute NeighborTable neighborTable[] = 7; - readonly attribute RouteTable routeTable[] = 8; + readonly attribute NeighborTableStruct neighborTable[] = 7; + readonly attribute RouteTableStruct routeTable[] = 8; readonly attribute nullable int32u partitionId = 9; readonly attribute nullable int8u weighting = 10; readonly attribute nullable int8u dataVersion = 11; @@ -1271,7 +1271,7 @@ server cluster ThreadNetworkDiagnostics = 53 { readonly attribute nullable SecurityPolicy securityPolicy = 59; readonly attribute nullable octet_string<4> channelPage0Mask = 60; readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61; - readonly attribute NetworkFault activeNetworkFaultsList[] = 62; + readonly attribute NetworkFaultEnum activeNetworkFaultsList[] = 62; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; diff --git a/examples/tv-app/tv-common/tv-app.zap b/examples/tv-app/tv-common/tv-app.zap index 44f6bfa5c1bbf7..cb3816516f45df 100644 --- a/examples/tv-app/tv-common/tv-app.zap +++ b/examples/tv-app/tv-common/tv-app.zap @@ -2850,7 +2850,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "RoutingRole", + "type": "RoutingRoleEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap index 1f4e5c2ce8a36b..0ba8d97e790675 100644 --- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap +++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap @@ -2957,7 +2957,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "RoutingRole", + "type": "RoutingRoleEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter index a2bffdc911cc30..5404b09b067edc 100644 --- a/examples/window-app/common/window-app.matter +++ b/examples/window-app/common/window-app.matter @@ -1231,14 +1231,14 @@ server cluster ThreadNetworkDiagnostics = 53 { kNotConnected = 1; } - enum NetworkFault : ENUM8 { + enum NetworkFaultEnum : ENUM8 { kUnspecified = 0; kLinkDown = 1; kHardwareFailure = 2; kNetworkJammed = 3; } - enum RoutingRole : ENUM8 { + enum RoutingRoleEnum : ENUM8 { kUnspecified = 0; kUnassigned = 1; kSleepyEndDevice = 2; @@ -1255,7 +1255,7 @@ server cluster ThreadNetworkDiagnostics = 53 { kMACCounts = 0x8; } - struct NeighborTable { + struct NeighborTableStruct { int64u extAddress = 0; int32u age = 1; int16u rloc16 = 2; @@ -1287,7 +1287,7 @@ server cluster ThreadNetworkDiagnostics = 53 { boolean channelMaskPresent = 11; } - struct RouteTable { + struct RouteTableStruct { int64u extAddress = 0; int16u rloc16 = 1; int8u routerId = 2; @@ -1310,19 +1310,19 @@ server cluster ThreadNetworkDiagnostics = 53 { } info event NetworkFaultChange = 1 { - NetworkFault current[] = 0; - NetworkFault previous[] = 1; + NetworkFaultEnum current[] = 0; + NetworkFaultEnum previous[] = 1; } readonly attribute nullable int16u channel = 0; - readonly attribute nullable RoutingRole routingRole = 1; + readonly attribute nullable RoutingRoleEnum routingRole = 1; readonly attribute nullable char_string<16> networkName = 2; readonly attribute nullable int16u panId = 3; readonly attribute nullable int64u extendedPanId = 4; readonly attribute nullable octet_string<17> meshLocalPrefix = 5; readonly attribute int64u overrunCount = 6; - readonly attribute NeighborTable neighborTable[] = 7; - readonly attribute RouteTable routeTable[] = 8; + readonly attribute NeighborTableStruct neighborTable[] = 7; + readonly attribute RouteTableStruct routeTable[] = 8; readonly attribute nullable int32u partitionId = 9; readonly attribute nullable int8u weighting = 10; readonly attribute nullable int8u dataVersion = 11; @@ -1376,7 +1376,7 @@ server cluster ThreadNetworkDiagnostics = 53 { readonly attribute nullable SecurityPolicy securityPolicy = 59; readonly attribute nullable octet_string<4> channelPage0Mask = 60; readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61; - readonly attribute NetworkFault activeNetworkFaultsList[] = 62; + readonly attribute NetworkFaultEnum activeNetworkFaultsList[] = 62; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; diff --git a/examples/window-app/common/window-app.zap b/examples/window-app/common/window-app.zap index d01a811832ce27..3c40c65a2da0fc 100644 --- a/examples/window-app/common/window-app.zap +++ b/examples/window-app/common/window-app.zap @@ -3728,7 +3728,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "RoutingRole", + "type": "RoutingRoleEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/scripts/tools/zap/tests/inputs/all-clusters-app.zap b/scripts/tools/zap/tests/inputs/all-clusters-app.zap index 10fad2786a1a60..a0796c8d118164 100644 --- a/scripts/tools/zap/tests/inputs/all-clusters-app.zap +++ b/scripts/tools/zap/tests/inputs/all-clusters-app.zap @@ -3866,7 +3866,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "RoutingRole", + "type": "RoutingRoleEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/scripts/tools/zap/tests/inputs/lighting-app.zap b/scripts/tools/zap/tests/inputs/lighting-app.zap index 13b609841cc616..ee7b3bf3ab2879 100644 --- a/scripts/tools/zap/tests/inputs/lighting-app.zap +++ b/scripts/tools/zap/tests/inputs/lighting-app.zap @@ -3097,7 +3097,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "RoutingRole", + "type": "RoutingRoleEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/src/app/clusters/general-diagnostics-server/GenericFaultTestEventTriggerDelegate.cpp b/src/app/clusters/general-diagnostics-server/GenericFaultTestEventTriggerDelegate.cpp index 3d4fd54f5b8b4b..41062c7cb4fe21 100644 --- a/src/app/clusters/general-diagnostics-server/GenericFaultTestEventTriggerDelegate.cpp +++ b/src/app/clusters/general-diagnostics-server/GenericFaultTestEventTriggerDelegate.cpp @@ -67,12 +67,13 @@ CHIP_ERROR GenericFaultTestEventTriggerDelegate::HandleEventTrigger(uint64_t eve GeneralFaults networkFaultsCurrent; // Network faults injections - ReturnErrorOnFailure(networkFaultsPrevious.add(EMBER_ZCL_NETWORK_FAULT_ENUM_HARDWARE_FAILURE)); - ReturnErrorOnFailure(networkFaultsPrevious.add(EMBER_ZCL_NETWORK_FAULT_ENUM_NETWORK_JAMMED)); + using app::Clusters::GeneralDiagnostics::NetworkFaultEnum; + ReturnErrorOnFailure(networkFaultsPrevious.add(to_underlying(NetworkFaultEnum::kHardwareFailure))); + ReturnErrorOnFailure(networkFaultsPrevious.add(to_underlying(NetworkFaultEnum::kNetworkJammed))); - ReturnErrorOnFailure(networkFaultsCurrent.add(EMBER_ZCL_NETWORK_FAULT_ENUM_HARDWARE_FAILURE)); - ReturnErrorOnFailure(networkFaultsCurrent.add(EMBER_ZCL_NETWORK_FAULT_ENUM_NETWORK_JAMMED)); - ReturnErrorOnFailure(networkFaultsCurrent.add(EMBER_ZCL_NETWORK_FAULT_ENUM_CONNECTION_FAILED)); + ReturnErrorOnFailure(networkFaultsCurrent.add(to_underlying(NetworkFaultEnum::kHardwareFailure))); + ReturnErrorOnFailure(networkFaultsCurrent.add(to_underlying(NetworkFaultEnum::kNetworkJammed))); + ReturnErrorOnFailure(networkFaultsCurrent.add(to_underlying(NetworkFaultEnum::kConnectionFailed))); app::Clusters::GeneralDiagnosticsServer::Instance().OnNetworkFaultsDetect(networkFaultsPrevious, networkFaultsCurrent); } diff --git a/src/app/common/templates/config-data.yaml b/src/app/common/templates/config-data.yaml index 1d73fff9b0bcfe..d07c3e35246bfd 100644 --- a/src/app/common/templates/config-data.yaml +++ b/src/app/common/templates/config-data.yaml @@ -8,10 +8,8 @@ WeakEnums: - EnhancedColorMode - InterfaceTypeEnum - MoveMode - - NetworkFaultEnum - PHYRateEnum - RadioFaultEnum - - RoutingRole - StepMode DefineBitmaps: diff --git a/src/app/zap-templates/zcl/data-model/chip/thread-network-diagnostics-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/thread-network-diagnostics-cluster.xml index dc97fab3cea554..bfd9197647cb93 100644 --- a/src/app/zap-templates/zcl/data-model/chip/thread-network-diagnostics-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/thread-network-diagnostics-cluster.xml @@ -13,14 +13,14 @@ limitations under the License. --> - + - + @@ -35,7 +35,7 @@ limitations under the License. - + @@ -52,7 +52,7 @@ limitations under the License. - + @@ -92,14 +92,14 @@ limitations under the License. THREAD_NETWORK_DIAGNOSTICS_CLUSTER The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems Channel - RoutingRole + RoutingRole NetworkName PanId ExtendedPanId MeshLocalPrefix OverrunCount - NeighborTable - RouteTable + NeighborTable + RouteTable PartitionId Weighting DataVersion @@ -153,7 +153,7 @@ limitations under the License. SecurityPolicy ChannelPage0Mask OperationalDatasetComponents - ActiveNetworkFaultsList + ActiveNetworkFaultsList Reception of this command SHALL reset the OverrunCount attributes to 0 @@ -163,8 +163,8 @@ limitations under the License. Indicate a change in the set of network faults currently detected by the Node - - + + diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 4ee17e93b1ef8f..ed238fa6fefe24 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -1818,14 +1818,14 @@ client cluster ThreadNetworkDiagnostics = 53 { kNotConnected = 1; } - enum NetworkFault : ENUM8 { + enum NetworkFaultEnum : ENUM8 { kUnspecified = 0; kLinkDown = 1; kHardwareFailure = 2; kNetworkJammed = 3; } - enum RoutingRole : ENUM8 { + enum RoutingRoleEnum : ENUM8 { kUnspecified = 0; kUnassigned = 1; kSleepyEndDevice = 2; @@ -1842,7 +1842,7 @@ client cluster ThreadNetworkDiagnostics = 53 { kMACCounts = 0x8; } - struct NeighborTable { + struct NeighborTableStruct { int64u extAddress = 0; int32u age = 1; int16u rloc16 = 2; @@ -1874,7 +1874,7 @@ client cluster ThreadNetworkDiagnostics = 53 { boolean channelMaskPresent = 11; } - struct RouteTable { + struct RouteTableStruct { int64u extAddress = 0; int16u rloc16 = 1; int8u routerId = 2; @@ -1897,19 +1897,19 @@ client cluster ThreadNetworkDiagnostics = 53 { } info event NetworkFaultChange = 1 { - NetworkFault current[] = 0; - NetworkFault previous[] = 1; + NetworkFaultEnum current[] = 0; + NetworkFaultEnum previous[] = 1; } readonly attribute nullable int16u channel = 0; - readonly attribute nullable RoutingRole routingRole = 1; + readonly attribute nullable RoutingRoleEnum routingRole = 1; readonly attribute nullable char_string<16> networkName = 2; readonly attribute nullable int16u panId = 3; readonly attribute nullable int64u extendedPanId = 4; readonly attribute nullable octet_string<17> meshLocalPrefix = 5; readonly attribute optional int64u overrunCount = 6; - readonly attribute NeighborTable neighborTable[] = 7; - readonly attribute RouteTable routeTable[] = 8; + readonly attribute NeighborTableStruct neighborTable[] = 7; + readonly attribute RouteTableStruct routeTable[] = 8; readonly attribute nullable int32u partitionId = 9; readonly attribute nullable int8u weighting = 10; readonly attribute nullable int8u dataVersion = 11; @@ -1963,7 +1963,7 @@ client cluster ThreadNetworkDiagnostics = 53 { readonly attribute nullable SecurityPolicy securityPolicy = 59; readonly attribute nullable octet_string<4> channelPage0Mask = 60; readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61; - readonly attribute NetworkFault activeNetworkFaultsList[] = 62; + readonly attribute NetworkFaultEnum activeNetworkFaultsList[] = 62; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap index 4f2c87f31896e2..c24af2a88dd63b 100644 --- a/src/controller/data_model/controller-clusters.zap +++ b/src/controller/data_model/controller-clusters.zap @@ -6229,7 +6229,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "RoutingRole", + "type": "RoutingRoleEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp index 875b9a9d400ca3..db04f2398bc259 100644 --- a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp +++ b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp @@ -6817,28 +6817,28 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR newElement_0_isChildCtorSignature.c_str(), entry_0.isChild, newElement_0_isChild); - jclass neighborTableStructClass_1; + jclass neighborTableStructStructClass_1; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$ThreadNetworkDiagnosticsClusterNeighborTable", - neighborTableStructClass_1); + env, "chip/devicecontroller/ChipStructs$ThreadNetworkDiagnosticsClusterNeighborTableStruct", + neighborTableStructStructClass_1); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipStructs$ThreadNetworkDiagnosticsClusterNeighborTable"); + ChipLogError(Zcl, "Could not find class ChipStructs$ThreadNetworkDiagnosticsClusterNeighborTableStruct"); return nullptr; } - jmethodID neighborTableStructCtor_1 = - env->GetMethodID(neighborTableStructClass_1, "", + jmethodID neighborTableStructStructCtor_1 = + env->GetMethodID(neighborTableStructStructClass_1, "", "(Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/Integer;Ljava/lang/Long;Ljava/lang/Long;Ljava/" "lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/" "Integer;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;)V"); - if (neighborTableStructCtor_1 == nullptr) + if (neighborTableStructStructCtor_1 == nullptr) { - ChipLogError(Zcl, "Could not find ChipStructs$ThreadNetworkDiagnosticsClusterNeighborTable constructor"); + ChipLogError(Zcl, "Could not find ChipStructs$ThreadNetworkDiagnosticsClusterNeighborTableStruct constructor"); return nullptr; } newElement_0 = env->NewObject( - neighborTableStructClass_1, neighborTableStructCtor_1, newElement_0_extAddress, newElement_0_age, + neighborTableStructStructClass_1, neighborTableStructStructCtor_1, newElement_0_extAddress, newElement_0_age, newElement_0_rloc16, newElement_0_linkFrameCounter, newElement_0_mleFrameCounter, newElement_0_lqi, newElement_0_averageRssi, newElement_0_lastRssi, newElement_0_frameErrorRate, newElement_0_messageErrorRate, newElement_0_rxOnWhenIdle, newElement_0_fullThreadDevice, newElement_0_fullNetworkData, newElement_0_isChild); @@ -6922,28 +6922,29 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR newElement_0_linkEstablishedCtorSignature.c_str(), entry_0.linkEstablished, newElement_0_linkEstablished); - jclass routeTableStructClass_1; + jclass routeTableStructStructClass_1; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$ThreadNetworkDiagnosticsClusterRouteTable", routeTableStructClass_1); + env, "chip/devicecontroller/ChipStructs$ThreadNetworkDiagnosticsClusterRouteTableStruct", + routeTableStructStructClass_1); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipStructs$ThreadNetworkDiagnosticsClusterRouteTable"); + ChipLogError(Zcl, "Could not find class ChipStructs$ThreadNetworkDiagnosticsClusterRouteTableStruct"); return nullptr; } - jmethodID routeTableStructCtor_1 = env->GetMethodID( - routeTableStructClass_1, "", + jmethodID routeTableStructStructCtor_1 = env->GetMethodID( + routeTableStructStructClass_1, "", "(Ljava/lang/Long;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/" "Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/Boolean;)V"); - if (routeTableStructCtor_1 == nullptr) + if (routeTableStructStructCtor_1 == nullptr) { - ChipLogError(Zcl, "Could not find ChipStructs$ThreadNetworkDiagnosticsClusterRouteTable constructor"); + ChipLogError(Zcl, "Could not find ChipStructs$ThreadNetworkDiagnosticsClusterRouteTableStruct constructor"); return nullptr; } - newElement_0 = - env->NewObject(routeTableStructClass_1, routeTableStructCtor_1, newElement_0_extAddress, newElement_0_rloc16, - newElement_0_routerId, newElement_0_nextHop, newElement_0_pathCost, newElement_0_LQIIn, - newElement_0_LQIOut, newElement_0_age, newElement_0_allocated, newElement_0_linkEstablished); + newElement_0 = env->NewObject(routeTableStructStructClass_1, routeTableStructStructCtor_1, newElement_0_extAddress, + newElement_0_rloc16, newElement_0_routerId, newElement_0_nextHop, + newElement_0_pathCost, newElement_0_LQIIn, newElement_0_LQIOut, newElement_0_age, + newElement_0_allocated, newElement_0_linkEstablished); chip::JniReferences::GetInstance().AddToList(value, newElement_0); } return value; diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp index 3638025408f99e..4eab5f596c9677 100644 --- a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp +++ b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp @@ -11330,7 +11330,7 @@ CHIPThreadNetworkDiagnosticsRoutingRoleAttributeCallback::~CHIPThreadNetworkDiag } void CHIPThreadNetworkDiagnosticsRoutingRoleAttributeCallback::CallbackFn( - void * context, const chip::app::DataModel::Nullable & value) + void * context, const chip::app::DataModel::Nullable & value) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -11664,7 +11664,7 @@ CHIPThreadNetworkDiagnosticsNeighborTableAttributeCallback::~CHIPThreadNetworkDi void CHIPThreadNetworkDiagnosticsNeighborTableAttributeCallback::CallbackFn( void * context, const chip::app::DataModel::DecodableList< - chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTable::DecodableType> & list) + chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTableStruct::DecodableType> & list) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -11789,30 +11789,31 @@ void CHIPThreadNetworkDiagnosticsNeighborTableAttributeCallback::CallbackFn( newElement_0_isChildCtorSignature.c_str(), entry_0.isChild, newElement_0_isChild); - jclass neighborTableStructClass_1; + jclass neighborTableStructStructClass_1; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$ThreadNetworkDiagnosticsClusterNeighborTable", neighborTableStructClass_1); + env, "chip/devicecontroller/ChipStructs$ThreadNetworkDiagnosticsClusterNeighborTableStruct", + neighborTableStructStructClass_1); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipStructs$ThreadNetworkDiagnosticsClusterNeighborTable"); + ChipLogError(Zcl, "Could not find class ChipStructs$ThreadNetworkDiagnosticsClusterNeighborTableStruct"); return; } - jmethodID neighborTableStructCtor_1 = - env->GetMethodID(neighborTableStructClass_1, "", + jmethodID neighborTableStructStructCtor_1 = + env->GetMethodID(neighborTableStructStructClass_1, "", "(Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/Integer;Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/" "Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/" "Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;)V"); - if (neighborTableStructCtor_1 == nullptr) + if (neighborTableStructStructCtor_1 == nullptr) { - ChipLogError(Zcl, "Could not find ChipStructs$ThreadNetworkDiagnosticsClusterNeighborTable constructor"); + ChipLogError(Zcl, "Could not find ChipStructs$ThreadNetworkDiagnosticsClusterNeighborTableStruct constructor"); return; } newElement_0 = env->NewObject( - neighborTableStructClass_1, neighborTableStructCtor_1, newElement_0_extAddress, newElement_0_age, newElement_0_rloc16, - newElement_0_linkFrameCounter, newElement_0_mleFrameCounter, newElement_0_lqi, newElement_0_averageRssi, - newElement_0_lastRssi, newElement_0_frameErrorRate, newElement_0_messageErrorRate, newElement_0_rxOnWhenIdle, - newElement_0_fullThreadDevice, newElement_0_fullNetworkData, newElement_0_isChild); + neighborTableStructStructClass_1, neighborTableStructStructCtor_1, newElement_0_extAddress, newElement_0_age, + newElement_0_rloc16, newElement_0_linkFrameCounter, newElement_0_mleFrameCounter, newElement_0_lqi, + newElement_0_averageRssi, newElement_0_lastRssi, newElement_0_frameErrorRate, newElement_0_messageErrorRate, + newElement_0_rxOnWhenIdle, newElement_0_fullThreadDevice, newElement_0_fullNetworkData, newElement_0_isChild); chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0); } @@ -11852,8 +11853,8 @@ CHIPThreadNetworkDiagnosticsRouteTableAttributeCallback::~CHIPThreadNetworkDiagn void CHIPThreadNetworkDiagnosticsRouteTableAttributeCallback::CallbackFn( void * context, - const chip::app::DataModel::DecodableList & - list) + const chip::app::DataModel::DecodableList< + chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTableStruct::DecodableType> & list) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -11939,27 +11940,29 @@ void CHIPThreadNetworkDiagnosticsRouteTableAttributeCallback::CallbackFn( newElement_0_linkEstablishedCtorSignature.c_str(), entry_0.linkEstablished, newElement_0_linkEstablished); - jclass routeTableStructClass_1; + jclass routeTableStructStructClass_1; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$ThreadNetworkDiagnosticsClusterRouteTable", routeTableStructClass_1); + env, "chip/devicecontroller/ChipStructs$ThreadNetworkDiagnosticsClusterRouteTableStruct", + routeTableStructStructClass_1); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipStructs$ThreadNetworkDiagnosticsClusterRouteTable"); + ChipLogError(Zcl, "Could not find class ChipStructs$ThreadNetworkDiagnosticsClusterRouteTableStruct"); return; } - jmethodID routeTableStructCtor_1 = - env->GetMethodID(routeTableStructClass_1, "", + jmethodID routeTableStructStructCtor_1 = + env->GetMethodID(routeTableStructStructClass_1, "", "(Ljava/lang/Long;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/" "lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/Boolean;)V"); - if (routeTableStructCtor_1 == nullptr) + if (routeTableStructStructCtor_1 == nullptr) { - ChipLogError(Zcl, "Could not find ChipStructs$ThreadNetworkDiagnosticsClusterRouteTable constructor"); + ChipLogError(Zcl, "Could not find ChipStructs$ThreadNetworkDiagnosticsClusterRouteTableStruct constructor"); return; } - newElement_0 = env->NewObject(routeTableStructClass_1, routeTableStructCtor_1, newElement_0_extAddress, newElement_0_rloc16, - newElement_0_routerId, newElement_0_nextHop, newElement_0_pathCost, newElement_0_LQIIn, - newElement_0_LQIOut, newElement_0_age, newElement_0_allocated, newElement_0_linkEstablished); + newElement_0 = env->NewObject(routeTableStructStructClass_1, routeTableStructStructCtor_1, newElement_0_extAddress, + newElement_0_rloc16, newElement_0_routerId, newElement_0_nextHop, newElement_0_pathCost, + newElement_0_LQIIn, newElement_0_LQIOut, newElement_0_age, newElement_0_allocated, + newElement_0_linkEstablished); chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0); } @@ -12602,7 +12605,8 @@ CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback:: } void CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback::CallbackFn( - void * context, const chip::app::DataModel::DecodableList & list) + void * context, + const chip::app::DataModel::DecodableList & list) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java index 080468b42da714..afc88c277b524e 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java @@ -8345,7 +8345,8 @@ default void onSubscriptionEstablished(long subscriptionId) {} } public interface NeighborTableAttributeCallback { - void onSuccess(List valueList); + void onSuccess( + List valueList); void onError(Exception ex); @@ -8353,7 +8354,7 @@ default void onSubscriptionEstablished(long subscriptionId) {} } public interface RouteTableAttributeCallback { - void onSuccess(List valueList); + void onSuccess(List valueList); void onError(Exception ex); diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java index d60eb2642c6983..9f9b24fca943f8 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java @@ -746,7 +746,7 @@ public String toString() { } } - public static class ThreadNetworkDiagnosticsClusterNeighborTable { + public static class ThreadNetworkDiagnosticsClusterNeighborTableStruct { public Long extAddress; public Long age; public Integer rloc16; @@ -762,7 +762,7 @@ public static class ThreadNetworkDiagnosticsClusterNeighborTable { public Boolean fullNetworkData; public Boolean isChild; - public ThreadNetworkDiagnosticsClusterNeighborTable( + public ThreadNetworkDiagnosticsClusterNeighborTableStruct( Long extAddress, Long age, Integer rloc16, @@ -796,7 +796,7 @@ public ThreadNetworkDiagnosticsClusterNeighborTable( @Override public String toString() { StringBuilder output = new StringBuilder(); - output.append("ThreadNetworkDiagnosticsClusterNeighborTable {\n"); + output.append("ThreadNetworkDiagnosticsClusterNeighborTableStruct {\n"); output.append("\textAddress: "); output.append(extAddress); output.append("\n"); @@ -930,7 +930,7 @@ public String toString() { } } - public static class ThreadNetworkDiagnosticsClusterRouteTable { + public static class ThreadNetworkDiagnosticsClusterRouteTableStruct { public Long extAddress; public Integer rloc16; public Integer routerId; @@ -942,7 +942,7 @@ public static class ThreadNetworkDiagnosticsClusterRouteTable { public Boolean allocated; public Boolean linkEstablished; - public ThreadNetworkDiagnosticsClusterRouteTable( + public ThreadNetworkDiagnosticsClusterRouteTableStruct( Long extAddress, Integer rloc16, Integer routerId, @@ -968,7 +968,7 @@ public ThreadNetworkDiagnosticsClusterRouteTable( @Override public String toString() { StringBuilder output = new StringBuilder(); - output.append("ThreadNetworkDiagnosticsClusterRouteTable {\n"); + output.append("ThreadNetworkDiagnosticsClusterRouteTableStruct {\n"); output.append("\textAddress: "); output.append(extAddress); output.append("\n"); diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java index e13d3d70917a5c..7dfe1e569b67c0 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java @@ -4394,11 +4394,11 @@ public void setCallbackDelegate(ClusterCommandCallback callback) { @Override public void onSuccess( - List valueList) { + List valueList) { Map responseValues = new LinkedHashMap<>(); CommandResponseInfo commandResponseInfo = new CommandResponseInfo( - "valueList", "List"); + "valueList", "List"); responseValues.put(commandResponseInfo, valueList); callback.onSuccess(responseValues); } @@ -4420,11 +4420,12 @@ public void setCallbackDelegate(ClusterCommandCallback callback) { } @Override - public void onSuccess(List valueList) { + public void onSuccess( + List valueList) { Map responseValues = new LinkedHashMap<>(); CommandResponseInfo commandResponseInfo = new CommandResponseInfo( - "valueList", "List"); + "valueList", "List"); responseValues.put(commandResponseInfo, valueList); callback.onSuccess(responseValues); } diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index fa9072aad0e8f6..0afd782c6e90ea 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -8807,14 +8807,14 @@ def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ ClusterObjectFieldDescriptor(Label="channel", Tag=0x00000000, Type=typing.Union[Nullable, uint]), - ClusterObjectFieldDescriptor(Label="routingRole", Tag=0x00000001, Type=typing.Union[Nullable, ThreadNetworkDiagnostics.Enums.RoutingRole]), + ClusterObjectFieldDescriptor(Label="routingRole", Tag=0x00000001, Type=typing.Union[Nullable, ThreadNetworkDiagnostics.Enums.RoutingRoleEnum]), ClusterObjectFieldDescriptor(Label="networkName", Tag=0x00000002, Type=typing.Union[Nullable, str]), ClusterObjectFieldDescriptor(Label="panId", Tag=0x00000003, Type=typing.Union[Nullable, uint]), ClusterObjectFieldDescriptor(Label="extendedPanId", Tag=0x00000004, Type=typing.Union[Nullable, uint]), ClusterObjectFieldDescriptor(Label="meshLocalPrefix", Tag=0x00000005, Type=typing.Union[Nullable, bytes]), ClusterObjectFieldDescriptor(Label="overrunCount", Tag=0x00000006, Type=typing.Optional[uint]), - ClusterObjectFieldDescriptor(Label="neighborTable", Tag=0x00000007, Type=typing.List[ThreadNetworkDiagnostics.Structs.NeighborTable]), - ClusterObjectFieldDescriptor(Label="routeTable", Tag=0x00000008, Type=typing.List[ThreadNetworkDiagnostics.Structs.RouteTable]), + ClusterObjectFieldDescriptor(Label="neighborTable", Tag=0x00000007, Type=typing.List[ThreadNetworkDiagnostics.Structs.NeighborTableStruct]), + ClusterObjectFieldDescriptor(Label="routeTable", Tag=0x00000008, Type=typing.List[ThreadNetworkDiagnostics.Structs.RouteTableStruct]), ClusterObjectFieldDescriptor(Label="partitionId", Tag=0x00000009, Type=typing.Union[Nullable, uint]), ClusterObjectFieldDescriptor(Label="weighting", Tag=0x0000000A, Type=typing.Union[Nullable, uint]), ClusterObjectFieldDescriptor(Label="dataVersion", Tag=0x0000000B, Type=typing.Union[Nullable, uint]), @@ -8868,7 +8868,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor(Label="securityPolicy", Tag=0x0000003B, Type=typing.Union[Nullable, ThreadNetworkDiagnostics.Structs.SecurityPolicy]), ClusterObjectFieldDescriptor(Label="channelPage0Mask", Tag=0x0000003C, Type=typing.Union[Nullable, bytes]), ClusterObjectFieldDescriptor(Label="operationalDatasetComponents", Tag=0x0000003D, Type=typing.Union[Nullable, ThreadNetworkDiagnostics.Structs.OperationalDatasetComponents]), - ClusterObjectFieldDescriptor(Label="activeNetworkFaultsList", Tag=0x0000003E, Type=typing.List[ThreadNetworkDiagnostics.Enums.NetworkFault]), + ClusterObjectFieldDescriptor(Label="activeNetworkFaultsList", Tag=0x0000003E, Type=typing.List[ThreadNetworkDiagnostics.Enums.NetworkFaultEnum]), ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]), ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]), ClusterObjectFieldDescriptor(Label="eventList", Tag=0x0000FFFA, Type=typing.List[uint]), @@ -8878,14 +8878,14 @@ def descriptor(cls) -> ClusterObjectDescriptor: ]) channel: 'typing.Union[Nullable, uint]' = None - routingRole: 'typing.Union[Nullable, ThreadNetworkDiagnostics.Enums.RoutingRole]' = None + routingRole: 'typing.Union[Nullable, ThreadNetworkDiagnostics.Enums.RoutingRoleEnum]' = None networkName: 'typing.Union[Nullable, str]' = None panId: 'typing.Union[Nullable, uint]' = None extendedPanId: 'typing.Union[Nullable, uint]' = None meshLocalPrefix: 'typing.Union[Nullable, bytes]' = None overrunCount: 'typing.Optional[uint]' = None - neighborTable: 'typing.List[ThreadNetworkDiagnostics.Structs.NeighborTable]' = None - routeTable: 'typing.List[ThreadNetworkDiagnostics.Structs.RouteTable]' = None + neighborTable: 'typing.List[ThreadNetworkDiagnostics.Structs.NeighborTableStruct]' = None + routeTable: 'typing.List[ThreadNetworkDiagnostics.Structs.RouteTableStruct]' = None partitionId: 'typing.Union[Nullable, uint]' = None weighting: 'typing.Union[Nullable, uint]' = None dataVersion: 'typing.Union[Nullable, uint]' = None @@ -8939,7 +8939,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: securityPolicy: 'typing.Union[Nullable, ThreadNetworkDiagnostics.Structs.SecurityPolicy]' = None channelPage0Mask: 'typing.Union[Nullable, bytes]' = None operationalDatasetComponents: 'typing.Union[Nullable, ThreadNetworkDiagnostics.Structs.OperationalDatasetComponents]' = None - activeNetworkFaultsList: 'typing.List[ThreadNetworkDiagnostics.Enums.NetworkFault]' = None + activeNetworkFaultsList: 'typing.List[ThreadNetworkDiagnostics.Enums.NetworkFaultEnum]' = None generatedCommandList: 'typing.List[uint]' = None acceptedCommandList: 'typing.List[uint]' = None eventList: 'typing.List[uint]' = None @@ -8957,7 +8957,7 @@ class ConnectionStatusEnum(MatterIntEnum): # enum value. This specific should never be transmitted. kUnknownEnumValue = 2, - class NetworkFault(MatterIntEnum): + class NetworkFaultEnum(MatterIntEnum): kUnspecified = 0x00 kLinkDown = 0x01 kHardwareFailure = 0x02 @@ -8968,7 +8968,7 @@ class NetworkFault(MatterIntEnum): # enum value. This specific should never be transmitted. kUnknownEnumValue = 4, - class RoutingRole(MatterIntEnum): + class RoutingRoleEnum(MatterIntEnum): kUnspecified = 0x00 kUnassigned = 0x01 kSleepyEndDevice = 0x02 @@ -8991,7 +8991,7 @@ class Feature(IntFlag): class Structs: @dataclass - class NeighborTable(ClusterObject): + class NeighborTableStruct(ClusterObject): @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( @@ -9061,7 +9061,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: channelMaskPresent: 'bool' = False @dataclass - class RouteTable(ClusterObject): + class RouteTableStruct(ClusterObject): @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( @@ -9145,9 +9145,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, ThreadNetworkDiagnostics.Enums.RoutingRole]) + return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, ThreadNetworkDiagnostics.Enums.RoutingRoleEnum]) - value: 'typing.Union[Nullable, ThreadNetworkDiagnostics.Enums.RoutingRole]' = NullValue + value: 'typing.Union[Nullable, ThreadNetworkDiagnostics.Enums.RoutingRoleEnum]' = NullValue @dataclass class NetworkName(ClusterAttributeDescriptor): @@ -9241,9 +9241,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.List[ThreadNetworkDiagnostics.Structs.NeighborTable]) + return ClusterObjectFieldDescriptor(Type=typing.List[ThreadNetworkDiagnostics.Structs.NeighborTableStruct]) - value: 'typing.List[ThreadNetworkDiagnostics.Structs.NeighborTable]' = field(default_factory=lambda: []) + value: 'typing.List[ThreadNetworkDiagnostics.Structs.NeighborTableStruct]' = field(default_factory=lambda: []) @dataclass class RouteTable(ClusterAttributeDescriptor): @@ -9257,9 +9257,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.List[ThreadNetworkDiagnostics.Structs.RouteTable]) + return ClusterObjectFieldDescriptor(Type=typing.List[ThreadNetworkDiagnostics.Structs.RouteTableStruct]) - value: 'typing.List[ThreadNetworkDiagnostics.Structs.RouteTable]' = field(default_factory=lambda: []) + value: 'typing.List[ThreadNetworkDiagnostics.Structs.RouteTableStruct]' = field(default_factory=lambda: []) @dataclass class PartitionId(ClusterAttributeDescriptor): @@ -10121,9 +10121,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.List[ThreadNetworkDiagnostics.Enums.NetworkFault]) + return ClusterObjectFieldDescriptor(Type=typing.List[ThreadNetworkDiagnostics.Enums.NetworkFaultEnum]) - value: 'typing.List[ThreadNetworkDiagnostics.Enums.NetworkFault]' = field(default_factory=lambda: []) + value: 'typing.List[ThreadNetworkDiagnostics.Enums.NetworkFaultEnum]' = field(default_factory=lambda: []) @dataclass class GeneratedCommandList(ClusterAttributeDescriptor): @@ -10255,12 +10255,12 @@ def event_id(cls) -> int: def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ - ClusterObjectFieldDescriptor(Label="current", Tag=0, Type=typing.List[ThreadNetworkDiagnostics.Enums.NetworkFault]), - ClusterObjectFieldDescriptor(Label="previous", Tag=1, Type=typing.List[ThreadNetworkDiagnostics.Enums.NetworkFault]), + ClusterObjectFieldDescriptor(Label="current", Tag=0, Type=typing.List[ThreadNetworkDiagnostics.Enums.NetworkFaultEnum]), + ClusterObjectFieldDescriptor(Label="previous", Tag=1, Type=typing.List[ThreadNetworkDiagnostics.Enums.NetworkFaultEnum]), ]) - current: 'typing.List[ThreadNetworkDiagnostics.Enums.NetworkFault]' = field(default_factory=lambda: []) - previous: 'typing.List[ThreadNetworkDiagnostics.Enums.NetworkFault]' = field(default_factory=lambda: []) + current: 'typing.List[ThreadNetworkDiagnostics.Enums.NetworkFaultEnum]' = field(default_factory=lambda: []) + previous: 'typing.List[ThreadNetworkDiagnostics.Enums.NetworkFaultEnum]' = field(default_factory=lambda: []) @dataclass diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml index fea8909cfb5c96..3ba0c92699bd50 100644 --- a/src/darwin/Framework/CHIP/templates/availability.yaml +++ b/src/darwin/Framework/CHIP/templates/availability.yaml @@ -3131,8 +3131,11 @@ - NetworkFaultType - RadioFaultType ThreadNetworkDiagnostics: - - NetworkFault - - RoutingRole + # NetworkFaultEnum and RoutingRoleEnum were originally just named + # NetworkFault and RoutingRole, but we generate the same API for + # both of those names, so the name can just change here. + - NetworkFaultEnum + - RoutingRoleEnum - ThreadConnectionStatus WiFiNetworkDiagnostics: # AssociationFailureCauseEnum was originally just named @@ -3531,12 +3534,15 @@ - BLEFault - EthernetFault ThreadNetworkDiagnostics: - NetworkFault: + # NetworkFaultEnum and RoutingRoleEnum were originally just named + # NetworkFault and RoutingRole, but we generate the same API for + # both of those names, so the name can just change here. + NetworkFaultEnum: - Unspecified - LinkDown - HardwareFailure - NetworkJammed - RoutingRole: + RoutingRoleEnum: - Unspecified - Unassigned - SleepyEndDevice @@ -8118,6 +8124,9 @@ - ProductAppearanceStruct TemperatureControl: - TemperatureLevelStruct + ThreadNetworkDiagnostics: + - NeighborTableStruct + - RouteTableStruct struct fields: AccessControl: AccessControlTargetStruct: @@ -8136,6 +8145,33 @@ TemperatureLevelStruct: - label - temperatureLevel + ThreadNetworkDiagnostics: + NeighborTableStruct: + - extAddress + - age + - rloc16 + - linkFrameCounter + - mleFrameCounter + - lqi + - averageRssi + - lastRssi + - frameErrorRate + - messageErrorRate + - rxOnWhenIdle + - fullThreadDevice + - fullNetworkData + - isChild + RouteTableStruct: + - extAddress + - rloc16 + - routerId + - nextHop + - pathCost + - lqiIn + - lqiOut + - age + - allocated + - linkEstablished events: RefrigeratorAlarm: - Notify @@ -9805,6 +9841,9 @@ structs: AccessControl: - Target + ThreadNetworkDiagnostics: + - NeighborTable + - RouteTable bitmaps: Groups: - GroupClusterFeature @@ -9824,6 +9863,9 @@ structs: AccessControl: AccessControlTargetStruct: Target + ThreadNetworkDiagnostics: + NeighborTableStruct: NeighborTable + RouteTableStruct: RouteTable enum values: TimeSynchronization: TimeSourceEnum: diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm index 2a8bcb79d39e90..e65888cfe20a17 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm @@ -5790,8 +5790,8 @@ static id _Nullable DecodeAttributeValueForThreadNetworkDiagnosticsCluster( auto iter_0 = cppValue.begin(); while (iter_0.Next()) { auto & entry_0 = iter_0.GetValue(); - MTRThreadNetworkDiagnosticsClusterNeighborTable * newElement_0; - newElement_0 = [MTRThreadNetworkDiagnosticsClusterNeighborTable new]; + MTRThreadNetworkDiagnosticsClusterNeighborTableStruct * newElement_0; + newElement_0 = [MTRThreadNetworkDiagnosticsClusterNeighborTableStruct new]; newElement_0.extAddress = [NSNumber numberWithUnsignedLongLong:entry_0.extAddress]; newElement_0.age = [NSNumber numberWithUnsignedInt:entry_0.age]; newElement_0.rloc16 = [NSNumber numberWithUnsignedShort:entry_0.rloc16]; @@ -5838,8 +5838,8 @@ static id _Nullable DecodeAttributeValueForThreadNetworkDiagnosticsCluster( auto iter_0 = cppValue.begin(); while (iter_0.Next()) { auto & entry_0 = iter_0.GetValue(); - MTRThreadNetworkDiagnosticsClusterRouteTable * newElement_0; - newElement_0 = [MTRThreadNetworkDiagnosticsClusterRouteTable new]; + MTRThreadNetworkDiagnosticsClusterRouteTableStruct * newElement_0; + newElement_0 = [MTRThreadNetworkDiagnosticsClusterRouteTableStruct new]; newElement_0.extAddress = [NSNumber numberWithUnsignedLongLong:entry_0.extAddress]; newElement_0.rloc16 = [NSNumber numberWithUnsignedShort:entry_0.rloc16]; newElement_0.routerId = [NSNumber numberWithUnsignedChar:entry_0.routerId]; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm index d112ab6d2176cf..b9045be6c0909f 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm @@ -29556,7 +29556,7 @@ - (void)readAttributeRoutingRoleWithCompletion:(void (^)(NSNumber * _Nullable va { MTRReadParams * params = [[MTRReadParams alloc] init]; using TypeInfo = ThreadNetworkDiagnostics::Attributes::RoutingRole::TypeInfo; - return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -29566,7 +29566,7 @@ - (void)subscribeAttributeRoutingRoleWithParams:(MTRSubscribeParams * _Nonnull)p reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { using TypeInfo = ThreadNetworkDiagnostics::Attributes::RoutingRole::TypeInfo; - MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -29576,9 +29576,9 @@ + (void)readAttributeRoutingRoleWithClusterStateCache:(MTRClusterStateCacheConta queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion { - auto * bridge = new MTRNullableThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackBridge(queue, completion); + auto * bridge = new MTRNullableThreadNetworkDiagnosticsClusterRoutingRoleEnumAttributeCallbackBridge(queue, completion); std::move(*bridge).DispatchLocalAction(clusterStateCacheContainer.baseDevice, - ^(NullableThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallback successCb, MTRErrorCallback failureCb) { + ^(NullableThreadNetworkDiagnosticsClusterRoutingRoleEnumAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; using TypeInfo = ThreadNetworkDiagnostics::Attributes::RoutingRole::TypeInfo; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h index 242230baac62b3..c9022d3ddea220 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h @@ -318,14 +318,14 @@ typedef void (*ThreadNetworkDiagnosticsClusterConnectionStatusEnumAttributeCallb void *, chip::app::Clusters::ThreadNetworkDiagnostics::ConnectionStatusEnum); typedef void (*NullableThreadNetworkDiagnosticsClusterConnectionStatusEnumAttributeCallback)( void *, const chip::app::DataModel::Nullable &); -typedef void (*ThreadNetworkDiagnosticsClusterNetworkFaultAttributeCallback)( - void *, chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFault); -typedef void (*NullableThreadNetworkDiagnosticsClusterNetworkFaultAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); -typedef void (*ThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallback)( - void *, chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRole); -typedef void (*NullableThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); +typedef void (*ThreadNetworkDiagnosticsClusterNetworkFaultEnumAttributeCallback)( + void *, chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFaultEnum); +typedef void (*NullableThreadNetworkDiagnosticsClusterNetworkFaultEnumAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); +typedef void (*ThreadNetworkDiagnosticsClusterRoutingRoleEnumAttributeCallback)( + void *, chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRoleEnum); +typedef void (*NullableThreadNetworkDiagnosticsClusterRoutingRoleEnumAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); typedef void (*WiFiNetworkDiagnosticsClusterAssociationFailureCauseEnumAttributeCallback)( void *, chip::app::Clusters::WiFiNetworkDiagnostics::AssociationFailureCauseEnum); typedef void (*NullableWiFiNetworkDiagnosticsClusterAssociationFailureCauseEnumAttributeCallback)( @@ -1435,11 +1435,11 @@ typedef void (*SoftwareDiagnosticsAttributeListListAttributeCallback)( typedef void (*ThreadNetworkDiagnosticsNeighborTableListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList< - chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTable::DecodableType> & data); + chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTableStruct::DecodableType> & data); typedef void (*ThreadNetworkDiagnosticsRouteTableListAttributeCallback)( void * context, - const chip::app::DataModel::DecodableList & - data); + const chip::app::DataModel::DecodableList< + chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTableStruct::DecodableType> & data); typedef void (*ThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallback)( void *, const chip::app::DataModel::Nullable &); @@ -1448,7 +1448,8 @@ typedef void (*ThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttribu const chip::app::DataModel::Nullable< chip::app::Clusters::ThreadNetworkDiagnostics::Structs::OperationalDatasetComponents::DecodableType> &); typedef void (*ThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallback)( - void * context, const chip::app::DataModel::DecodableList & data); + void * context, + const chip::app::DataModel::DecodableList & data); typedef void (*ThreadNetworkDiagnosticsGeneratedCommandListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); typedef void (*ThreadNetworkDiagnosticsAcceptedCommandListListAttributeCallback)( @@ -7239,9 +7240,10 @@ class MTRThreadNetworkDiagnosticsNeighborTableListAttributeCallbackBridge MTRActionBlock action) : MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - static void OnSuccessFn(void * context, - const chip::app::DataModel::DecodableList< - chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTable::DecodableType> & value); + static void + OnSuccessFn(void * context, + const chip::app::DataModel::DecodableList< + chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTableStruct::DecodableType> & value); }; class MTRThreadNetworkDiagnosticsNeighborTableListAttributeCallbackSubscriptionBridge @@ -7276,7 +7278,7 @@ class MTRThreadNetworkDiagnosticsRouteTableListAttributeCallbackBridge static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList< - chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTable::DecodableType> & value); + chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTableStruct::DecodableType> & value); }; class MTRThreadNetworkDiagnosticsRouteTableListAttributeCallbackSubscriptionBridge @@ -7387,7 +7389,7 @@ class MTRThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallbackBri static void OnSuccessFn(void * context, - const chip::app::DataModel::DecodableList & value); + const chip::app::DataModel::DecodableList & value); }; class MTRThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallbackSubscriptionBridge @@ -26334,139 +26336,143 @@ class MTRNullableThreadNetworkDiagnosticsClusterConnectionStatusEnumAttributeCal MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRThreadNetworkDiagnosticsClusterNetworkFaultAttributeCallbackBridge - : public MTRCallbackBridge +class MTRThreadNetworkDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRThreadNetworkDiagnosticsClusterNetworkFaultAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRThreadNetworkDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRThreadNetworkDiagnosticsClusterNetworkFaultAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRThreadNetworkDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - static void OnSuccessFn(void * context, chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFault value); + static void OnSuccessFn(void * context, chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFaultEnum value); }; -class MTRThreadNetworkDiagnosticsClusterNetworkFaultAttributeCallbackSubscriptionBridge - : public MTRThreadNetworkDiagnosticsClusterNetworkFaultAttributeCallbackBridge +class MTRThreadNetworkDiagnosticsClusterNetworkFaultEnumAttributeCallbackSubscriptionBridge + : public MTRThreadNetworkDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge { public: - MTRThreadNetworkDiagnosticsClusterNetworkFaultAttributeCallbackSubscriptionBridge( + MTRThreadNetworkDiagnosticsClusterNetworkFaultEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRThreadNetworkDiagnosticsClusterNetworkFaultAttributeCallbackBridge(queue, handler, action), + MTRThreadNetworkDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRThreadNetworkDiagnosticsClusterNetworkFaultAttributeCallbackBridge::KeepAliveOnCallback; - using MTRThreadNetworkDiagnosticsClusterNetworkFaultAttributeCallbackBridge::OnDone; + using MTRThreadNetworkDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRThreadNetworkDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRNullableThreadNetworkDiagnosticsClusterNetworkFaultAttributeCallbackBridge - : public MTRCallbackBridge +class MTRNullableThreadNetworkDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRNullableThreadNetworkDiagnosticsClusterNetworkFaultAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRNullableThreadNetworkDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge(dispatch_queue_t queue, + ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRNullableThreadNetworkDiagnosticsClusterNetworkFaultAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, - OnSuccessFn){}; + MTRNullableThreadNetworkDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge(dispatch_queue_t queue, + ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, + OnSuccessFn){}; static void OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + const chip::app::DataModel::Nullable & value); }; -class MTRNullableThreadNetworkDiagnosticsClusterNetworkFaultAttributeCallbackSubscriptionBridge - : public MTRNullableThreadNetworkDiagnosticsClusterNetworkFaultAttributeCallbackBridge +class MTRNullableThreadNetworkDiagnosticsClusterNetworkFaultEnumAttributeCallbackSubscriptionBridge + : public MTRNullableThreadNetworkDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge { public: - MTRNullableThreadNetworkDiagnosticsClusterNetworkFaultAttributeCallbackSubscriptionBridge( + MTRNullableThreadNetworkDiagnosticsClusterNetworkFaultEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullableThreadNetworkDiagnosticsClusterNetworkFaultAttributeCallbackBridge(queue, handler, action), + MTRNullableThreadNetworkDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRNullableThreadNetworkDiagnosticsClusterNetworkFaultAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullableThreadNetworkDiagnosticsClusterNetworkFaultAttributeCallbackBridge::OnDone; + using MTRNullableThreadNetworkDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRNullableThreadNetworkDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackBridge - : public MTRCallbackBridge +class MTRThreadNetworkDiagnosticsClusterRoutingRoleEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRThreadNetworkDiagnosticsClusterRoutingRoleEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRThreadNetworkDiagnosticsClusterRoutingRoleEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - static void OnSuccessFn(void * context, chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRole value); + static void OnSuccessFn(void * context, chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRoleEnum value); }; -class MTRThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackSubscriptionBridge - : public MTRThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackBridge +class MTRThreadNetworkDiagnosticsClusterRoutingRoleEnumAttributeCallbackSubscriptionBridge + : public MTRThreadNetworkDiagnosticsClusterRoutingRoleEnumAttributeCallbackBridge { public: - MTRThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackSubscriptionBridge( + MTRThreadNetworkDiagnosticsClusterRoutingRoleEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackBridge(queue, handler, action), + MTRThreadNetworkDiagnosticsClusterRoutingRoleEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackBridge::KeepAliveOnCallback; - using MTRThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackBridge::OnDone; + using MTRThreadNetworkDiagnosticsClusterRoutingRoleEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRThreadNetworkDiagnosticsClusterRoutingRoleEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRNullableThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackBridge - : public MTRCallbackBridge +class MTRNullableThreadNetworkDiagnosticsClusterRoutingRoleEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRNullableThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRNullableThreadNetworkDiagnosticsClusterRoutingRoleEnumAttributeCallbackBridge(dispatch_queue_t queue, + ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRNullableThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, - OnSuccessFn){}; + MTRNullableThreadNetworkDiagnosticsClusterRoutingRoleEnumAttributeCallbackBridge(dispatch_queue_t queue, + ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, + OnSuccessFn){}; static void OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + const chip::app::DataModel::Nullable & value); }; -class MTRNullableThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackSubscriptionBridge - : public MTRNullableThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackBridge +class MTRNullableThreadNetworkDiagnosticsClusterRoutingRoleEnumAttributeCallbackSubscriptionBridge + : public MTRNullableThreadNetworkDiagnosticsClusterRoutingRoleEnumAttributeCallbackBridge { public: - MTRNullableThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackSubscriptionBridge( + MTRNullableThreadNetworkDiagnosticsClusterRoutingRoleEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullableThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackBridge(queue, handler, action), + MTRNullableThreadNetworkDiagnosticsClusterRoutingRoleEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRNullableThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullableThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackBridge::OnDone; + using MTRNullableThreadNetworkDiagnosticsClusterRoutingRoleEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRNullableThreadNetworkDiagnosticsClusterRoutingRoleEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm index 228f624bd14719..1ab0b6fb85417f 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm @@ -5578,7 +5578,7 @@ void MTRThreadNetworkDiagnosticsNeighborTableListAttributeCallbackBridge::OnSuccessFn(void * context, const chip::app::DataModel::DecodableList< - chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTable::DecodableType> & value) + chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTableStruct::DecodableType> & value) { NSArray * _Nonnull objCValue; { // Scope for our temporary variables @@ -5586,8 +5586,8 @@ auto iter_0 = value.begin(); while (iter_0.Next()) { auto & entry_0 = iter_0.GetValue(); - MTRThreadNetworkDiagnosticsClusterNeighborTable * newElement_0; - newElement_0 = [MTRThreadNetworkDiagnosticsClusterNeighborTable new]; + MTRThreadNetworkDiagnosticsClusterNeighborTableStruct * newElement_0; + newElement_0 = [MTRThreadNetworkDiagnosticsClusterNeighborTableStruct new]; newElement_0.extAddress = [NSNumber numberWithUnsignedLongLong:entry_0.extAddress]; newElement_0.age = [NSNumber numberWithUnsignedInt:entry_0.age]; newElement_0.rloc16 = [NSNumber numberWithUnsignedShort:entry_0.rloc16]; @@ -5638,8 +5638,8 @@ } void MTRThreadNetworkDiagnosticsRouteTableListAttributeCallbackBridge::OnSuccessFn(void * context, - const chip::app::DataModel::DecodableList & - value) + const chip::app::DataModel::DecodableList< + chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTableStruct::DecodableType> & value) { NSArray * _Nonnull objCValue; { // Scope for our temporary variables @@ -5647,8 +5647,8 @@ auto iter_0 = value.begin(); while (iter_0.Next()) { auto & entry_0 = iter_0.GetValue(); - MTRThreadNetworkDiagnosticsClusterRouteTable * newElement_0; - newElement_0 = [MTRThreadNetworkDiagnosticsClusterRouteTable new]; + MTRThreadNetworkDiagnosticsClusterRouteTableStruct * newElement_0; + newElement_0 = [MTRThreadNetworkDiagnosticsClusterRouteTableStruct new]; newElement_0.extAddress = [NSNumber numberWithUnsignedLongLong:entry_0.extAddress]; newElement_0.rloc16 = [NSNumber numberWithUnsignedShort:entry_0.rloc16]; newElement_0.routerId = [NSNumber numberWithUnsignedChar:entry_0.routerId]; @@ -5756,8 +5756,8 @@ } } -void MTRThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::DecodableList & value) +void MTRThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallbackBridge::OnSuccessFn(void * context, + const chip::app::DataModel::DecodableList & value) { NSArray * _Nonnull objCValue; { // Scope for our temporary variables @@ -25740,15 +25740,15 @@ } } -void MTRThreadNetworkDiagnosticsClusterNetworkFaultAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFault value) +void MTRThreadNetworkDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFaultEnum value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void MTRThreadNetworkDiagnosticsClusterNetworkFaultAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRThreadNetworkDiagnosticsClusterNetworkFaultEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -25763,8 +25763,8 @@ } } -void MTRNullableThreadNetworkDiagnosticsClusterNetworkFaultAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void MTRNullableThreadNetworkDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -25775,7 +25775,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableThreadNetworkDiagnosticsClusterNetworkFaultAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableThreadNetworkDiagnosticsClusterNetworkFaultEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -25790,15 +25790,15 @@ } } -void MTRThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRole value) +void MTRThreadNetworkDiagnosticsClusterRoutingRoleEnumAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRoleEnum value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void MTRThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRThreadNetworkDiagnosticsClusterRoutingRoleEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -25813,8 +25813,8 @@ } } -void MTRNullableThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void MTRNullableThreadNetworkDiagnosticsClusterRoutingRoleEnumAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -25825,7 +25825,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableThreadNetworkDiagnosticsClusterRoutingRoleEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h index cc74fc4ae256a8..70c25dfb65ac46 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h @@ -396,24 +396,28 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @property (nonatomic, copy) NSData * _Nullable faultRecording API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); @end -API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) -@interface MTRThreadNetworkDiagnosticsClusterNeighborTable : NSObject -@property (nonatomic, copy) NSNumber * _Nonnull extAddress API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSNumber * _Nonnull age API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSNumber * _Nonnull rloc16 API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSNumber * _Nonnull linkFrameCounter API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSNumber * _Nonnull mleFrameCounter API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSNumber * _Nonnull lqi API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSNumber * _Nullable averageRssi API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSNumber * _Nullable lastRssi API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSNumber * _Nonnull frameErrorRate API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSNumber * _Nonnull messageErrorRate API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSNumber * _Nonnull rxOnWhenIdle API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSNumber * _Nonnull fullThreadDevice API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSNumber * _Nonnull fullNetworkData API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSNumber * _Nonnull isChild API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +MTR_NEWLY_AVAILABLE +@interface MTRThreadNetworkDiagnosticsClusterNeighborTableStruct : NSObject +@property (nonatomic, copy) NSNumber * _Nonnull extAddress MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull age MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull rloc16 MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull linkFrameCounter MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull mleFrameCounter MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull lqi MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nullable averageRssi MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nullable lastRssi MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull frameErrorRate MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull messageErrorRate MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull rxOnWhenIdle MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull fullThreadDevice MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull fullNetworkData MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull isChild MTR_NEWLY_AVAILABLE; @end +API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) +MTR_NEWLY_DEPRECATED("Please use MTRThreadNetworkDiagnosticsClusterNeighborTableStruct") +@interface MTRThreadNetworkDiagnosticsClusterNeighborTable : MTRThreadNetworkDiagnosticsClusterNeighborTableStruct +@end API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @interface MTRThreadNetworkDiagnosticsClusterOperationalDatasetComponents : NSObject @property (nonatomic, copy) @@ -435,20 +439,24 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @property (nonatomic, copy) NSNumber * _Nonnull channelMaskPresent API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); @end -API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) -@interface MTRThreadNetworkDiagnosticsClusterRouteTable : NSObject -@property (nonatomic, copy) NSNumber * _Nonnull extAddress API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSNumber * _Nonnull rloc16 API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSNumber * _Nonnull routerId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSNumber * _Nonnull nextHop API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSNumber * _Nonnull pathCost API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSNumber * _Nonnull lqiIn API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSNumber * _Nonnull lqiOut API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSNumber * _Nonnull age API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSNumber * _Nonnull allocated API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSNumber * _Nonnull linkEstablished API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +MTR_NEWLY_AVAILABLE +@interface MTRThreadNetworkDiagnosticsClusterRouteTableStruct : NSObject +@property (nonatomic, copy) NSNumber * _Nonnull extAddress MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull rloc16 MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull routerId MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull nextHop MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull pathCost MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull lqiIn MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull lqiOut MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull age MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull allocated MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull linkEstablished MTR_NEWLY_AVAILABLE; @end +API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) +MTR_NEWLY_DEPRECATED("Please use MTRThreadNetworkDiagnosticsClusterRouteTableStruct") +@interface MTRThreadNetworkDiagnosticsClusterRouteTable : MTRThreadNetworkDiagnosticsClusterRouteTableStruct +@end API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @interface MTRThreadNetworkDiagnosticsClusterSecurityPolicy : NSObject @property (nonatomic, copy) NSNumber * _Nonnull rotationTime API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm index ab2063b6160e59..0dc8ce3582f28a 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm @@ -1473,7 +1473,7 @@ - (NSString *)description @end -@implementation MTRThreadNetworkDiagnosticsClusterNeighborTable +@implementation MTRThreadNetworkDiagnosticsClusterNeighborTableStruct - (instancetype)init { if (self = [super init]) { @@ -1511,7 +1511,7 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone { - auto other = [[MTRThreadNetworkDiagnosticsClusterNeighborTable alloc] init]; + auto other = [[MTRThreadNetworkDiagnosticsClusterNeighborTableStruct alloc] init]; other.extAddress = self.extAddress; other.age = self.age; @@ -1544,6 +1544,9 @@ - (NSString *)description @end +@implementation MTRThreadNetworkDiagnosticsClusterNeighborTable : MTRThreadNetworkDiagnosticsClusterNeighborTableStruct +@end + @implementation MTRThreadNetworkDiagnosticsClusterOperationalDatasetComponents - (instancetype)init { @@ -1610,7 +1613,7 @@ - (NSString *)description @end -@implementation MTRThreadNetworkDiagnosticsClusterRouteTable +@implementation MTRThreadNetworkDiagnosticsClusterRouteTableStruct - (instancetype)init { if (self = [super init]) { @@ -1640,7 +1643,7 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone { - auto other = [[MTRThreadNetworkDiagnosticsClusterRouteTable alloc] init]; + auto other = [[MTRThreadNetworkDiagnosticsClusterRouteTableStruct alloc] init]; other.extAddress = self.extAddress; other.rloc16 = self.rloc16; @@ -1668,6 +1671,9 @@ - (NSString *)description @end +@implementation MTRThreadNetworkDiagnosticsClusterRouteTable : MTRThreadNetworkDiagnosticsClusterRouteTableStruct +@end + @implementation MTRThreadNetworkDiagnosticsClusterSecurityPolicy - (instancetype)init { diff --git a/src/platform/Linux/DiagnosticDataProviderImpl.cpp b/src/platform/Linux/DiagnosticDataProviderImpl.cpp index 3d14605e9de316..b4351970ac9206 100644 --- a/src/platform/Linux/DiagnosticDataProviderImpl.cpp +++ b/src/platform/Linux/DiagnosticDataProviderImpl.cpp @@ -426,9 +426,9 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetActiveNetworkFaults(GeneralFaults::_WriteThreadNetw break; case ThreadNetworkDiagnostics::Attributes::RoutingRole::Id: { - ThreadNetworkDiagnostics::RoutingRole routingRole; + using ThreadNetworkDiagnostics::RoutingRoleEnum; + RoutingRoleEnum routingRole; otDeviceRole otRole = otThreadGetDeviceRole(mOTInst); if (otRole == OT_DEVICE_ROLE_DISABLED) { - routingRole = EMBER_ZCL_ROUTING_ROLE_UNSPECIFIED; + routingRole = RoutingRoleEnum::kUnspecified; } else if (otRole == OT_DEVICE_ROLE_DETACHED) { - routingRole = EMBER_ZCL_ROUTING_ROLE_UNASSIGNED; + routingRole = RoutingRoleEnum::kUnassigned; } else if (otRole == OT_DEVICE_ROLE_ROUTER) { - routingRole = EMBER_ZCL_ROUTING_ROLE_ROUTER; + routingRole = RoutingRoleEnum::kRouter; } else if (otRole == OT_DEVICE_ROLE_LEADER) { - routingRole = EMBER_ZCL_ROUTING_ROLE_LEADER; + routingRole = RoutingRoleEnum::kLeader; } else if (otRole == OT_DEVICE_ROLE_CHILD) { @@ -1086,17 +1087,17 @@ CHIP_ERROR GenericThreadStackManagerImpl_OpenThread::_WriteThreadNetw if (linkMode.mRxOnWhenIdle) { - routingRole = EMBER_ZCL_ROUTING_ROLE_END_DEVICE; + routingRole = RoutingRoleEnum::kEndDevice; #if CHIP_DEVICE_CONFIG_THREAD_FTD if (otThreadIsRouterEligible(mOTInst)) { - routingRole = EMBER_ZCL_ROUTING_ROLE_REED; + routingRole = RoutingRoleEnum::kReed; } #endif } else { - routingRole = EMBER_ZCL_ROUTING_ROLE_SLEEPY_END_DEVICE; + routingRole = RoutingRoleEnum::kSleepyEndDevice; } } @@ -1149,7 +1150,7 @@ CHIP_ERROR GenericThreadStackManagerImpl_OpenThread::_WriteThreadNetw while (otThreadGetNextNeighborInfo(mOTInst, &iterator, &neighInfo) == OT_ERROR_NONE) { - ThreadNetworkDiagnostics::Structs::NeighborTable::Type neighborTable; + ThreadNetworkDiagnostics::Structs::NeighborTableStruct::Type neighborTable; app::DataModel::Nullable averageRssi; app::DataModel::Nullable lastRssi; @@ -1209,7 +1210,7 @@ CHIP_ERROR GenericThreadStackManagerImpl_OpenThread::_WriteThreadNetw { if (otThreadGetRouterInfo(mOTInst, i, &routerInfo) == OT_ERROR_NONE) { - ThreadNetworkDiagnostics::Structs::RouteTable::Type routeTable; + ThreadNetworkDiagnostics::Structs::RouteTableStruct::Type routeTable; routeTable.extAddress = Encoding::BigEndian::Get64(routerInfo.mExtAddress.m8); routeTable.rloc16 = routerInfo.mRloc16; @@ -1233,7 +1234,7 @@ CHIP_ERROR GenericThreadStackManagerImpl_OpenThread::_WriteThreadNetw otError otErr = otThreadGetParentInfo(mOTInst, &routerInfo); ReturnErrorOnFailure(MapOpenThreadError(otErr)); - ThreadNetworkDiagnostics::Structs::RouteTable::Type routeTable; + ThreadNetworkDiagnostics::Structs::RouteTableStruct::Type routeTable; routeTable.extAddress = Encoding::BigEndian::Get64(routerInfo.mExtAddress.m8); routeTable.rloc16 = routerInfo.mRloc16; @@ -1661,7 +1662,8 @@ CHIP_ERROR GenericThreadStackManagerImpl_OpenThread::_WriteThreadNetw case ThreadNetworkDiagnostics::Attributes::ActiveNetworkFaultsList::Id: { err = encoder.EncodeList([](const auto & aEncoder) -> CHIP_ERROR { // TODO activeNetworkFaultsList isn't tracked. Encode the list of 4 entries at 0 none the less - ThreadNetworkDiagnostics::NetworkFault activeNetworkFaultsList[4] = { ThreadNetworkDiagnostics::NetworkFault(0) }; + ThreadNetworkDiagnostics::NetworkFaultEnum activeNetworkFaultsList[4] = { ThreadNetworkDiagnostics::NetworkFaultEnum( + 0) }; for (auto fault : activeNetworkFaultsList) { ReturnErrorOnFailure(aEncoder.Encode(fault)); diff --git a/src/platform/bouffalolab/BL702/DiagnosticDataProviderImpl.cpp b/src/platform/bouffalolab/BL702/DiagnosticDataProviderImpl.cpp index 4716c9cad033ff..acdf61e27caa26 100644 --- a/src/platform/bouffalolab/BL702/DiagnosticDataProviderImpl.cpp +++ b/src/platform/bouffalolab/BL702/DiagnosticDataProviderImpl.cpp @@ -233,9 +233,9 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetActiveRadioFaults(GeneralFaults & networkFaults) { #if CHIP_CONFIG_TEST - ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_HARDWARE_FAILURE)); - ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_NETWORK_JAMMED)); - ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_CONNECTION_FAILED)); + ReturnErrorOnFailure(networkFaults.add(to_underlying(NetworkFaultEnum::kHardwareFailure))); + ReturnErrorOnFailure(networkFaults.add(to_underlying(NetworkFaultEnum::kNetworkJammed))); + ReturnErrorOnFailure(networkFaults.add(to_underlying(NetworkFaultEnum::kConnectionFailed))); #endif return CHIP_NO_ERROR; diff --git a/src/platform/cc13xx_26xx/DiagnosticDataProviderImpl.cpp b/src/platform/cc13xx_26xx/DiagnosticDataProviderImpl.cpp index 07eefd23ca3b9a..ead676bcf81bfe 100644 --- a/src/platform/cc13xx_26xx/DiagnosticDataProviderImpl.cpp +++ b/src/platform/cc13xx_26xx/DiagnosticDataProviderImpl.cpp @@ -229,9 +229,11 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetActiveRadioFaults(GeneralFaults & networkFaults) { #if CHIP_CONFIG_TEST - ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_HARDWARE_FAILURE)); - ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_NETWORK_JAMMED)); - ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_CONNECTION_FAILED)); + using app::Clusters::GeneralDiagnostics::NetworkFaultEnum; + + ReturnErrorOnFailure(networkFaults.add(to_underlying(NetworkFaultEnum::kHardwareFailure))); + ReturnErrorOnFailure(networkFaults.add(to_underlying(NetworkFaultEnum::kNetworkJammed))); + ReturnErrorOnFailure(networkFaults.add(to_underlying(NetworkFaultEnum::kConnectionFailed))); #endif return CHIP_NO_ERROR; diff --git a/src/platform/mt793x/DiagnosticDataProviderImpl.cpp b/src/platform/mt793x/DiagnosticDataProviderImpl.cpp index faf5407c832b54..504c4e3161c7ed 100644 --- a/src/platform/mt793x/DiagnosticDataProviderImpl.cpp +++ b/src/platform/mt793x/DiagnosticDataProviderImpl.cpp @@ -192,9 +192,9 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetActiveRadioFaults(GeneralFaults & networkFaults) { #if CHIP_CONFIG_TEST - ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_HARDWARE_FAILURE)); - ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_NETWORK_JAMMED)); - ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_CONNECTION_FAILED)); + ReturnErrorOnFailure(networkFaults.add(to_underlying(NetworkFaultEnum::kHardwareFailure))); + ReturnErrorOnFailure(networkFaults.add(to_underlying(NetworkFaultEnum::kNetworkJammed))); + ReturnErrorOnFailure(networkFaults.add(to_underlying(NetworkFaultEnum::kConnectionFailed))); #endif return CHIP_NO_ERROR; diff --git a/src/platform/qpg/DiagnosticDataProviderImpl.cpp b/src/platform/qpg/DiagnosticDataProviderImpl.cpp index 01f58a4d179f10..2a0ef745f50719 100644 --- a/src/platform/qpg/DiagnosticDataProviderImpl.cpp +++ b/src/platform/qpg/DiagnosticDataProviderImpl.cpp @@ -171,9 +171,11 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetActiveNetworkFaults(GeneralFaults & networkFaults) { #if CHIP_CONFIG_TEST - ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_HARDWARE_FAILURE)); - ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_NETWORK_JAMMED)); - ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_CONNECTION_FAILED)); + ReturnErrorOnFailure(networkFaults.add(to_underlying(NetworkFaultEnum::kHardwareFailure))); + ReturnErrorOnFailure(networkFaults.add(to_underlying(NetworkFaultEnum::kNetworkJammed))); + ReturnErrorOnFailure(networkFaults.add(to_underlying(NetworkFaultEnum::kConnectionFailed))); #endif return CHIP_NO_ERROR; diff --git a/src/platform/webos/DiagnosticDataProviderImpl.cpp b/src/platform/webos/DiagnosticDataProviderImpl.cpp index e7f3f979f01e8c..cf0a550243e09b 100644 --- a/src/platform/webos/DiagnosticDataProviderImpl.cpp +++ b/src/platform/webos/DiagnosticDataProviderImpl.cpp @@ -412,9 +412,9 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetActiveNetworkFaults(GeneralFaults(4); @@ -930,9 +921,9 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(ThreadNetworkDiagnostic return static_cast(2); } } -static auto __attribute__((unused)) EnsureKnownEnumValue(ThreadNetworkDiagnostics::NetworkFault val) +static auto __attribute__((unused)) EnsureKnownEnumValue(ThreadNetworkDiagnostics::NetworkFaultEnum val) { - using EnumType = ThreadNetworkDiagnostics::NetworkFault; + using EnumType = ThreadNetworkDiagnostics::NetworkFaultEnum; switch (val) { case EnumType::kUnspecified: @@ -944,14 +935,11 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(ThreadNetworkDiagnostic return static_cast(4); } } -static auto __attribute__((unused)) EnsureKnownEnumValue(ThreadNetworkDiagnostics::RoutingRole val) +static auto __attribute__((unused)) EnsureKnownEnumValue(ThreadNetworkDiagnostics::RoutingRoleEnum val) { - using EnumType = ThreadNetworkDiagnostics::RoutingRole; + using EnumType = ThreadNetworkDiagnostics::RoutingRoleEnum; switch (val) { -// Need to convert consumers to using the new enum classes, so we -// don't just have casts all over. -#ifdef CHIP_USE_ENUM_CLASS_FOR_IM_ENUM case EnumType::kUnspecified: case EnumType::kUnassigned: case EnumType::kSleepyEndDevice: @@ -959,15 +947,6 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(ThreadNetworkDiagnostic case EnumType::kReed: case EnumType::kRouter: case EnumType::kLeader: -#else // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM - case EMBER_ZCL_ROUTING_ROLE_UNSPECIFIED: - case EMBER_ZCL_ROUTING_ROLE_UNASSIGNED: - case EMBER_ZCL_ROUTING_ROLE_SLEEPY_END_DEVICE: - case EMBER_ZCL_ROUTING_ROLE_END_DEVICE: - case EMBER_ZCL_ROUTING_ROLE_REED: - case EMBER_ZCL_ROUTING_ROLE_ROUTER: - case EMBER_ZCL_ROUTING_ROLE_LEADER: -#endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM return val; default: return static_cast(7); diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h index cf71fb2ec647cf..8b375098cd1df6 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h @@ -1016,9 +1016,6 @@ using InterfaceTypeEnum static InterfaceTypeEnum __attribute__((unused)) kInterfaceTypeEnumkUnknownEnumValue = static_cast(5); #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM -// Need to convert consumers to using the new enum classes, so we -// don't just have casts all over. -#ifdef CHIP_USE_ENUM_CLASS_FOR_IM_ENUM // Enum for NetworkFaultEnum enum class NetworkFaultEnum : uint8_t { @@ -1032,10 +1029,6 @@ enum class NetworkFaultEnum : uint8_t // enum value. This specific should never be transmitted. kUnknownEnumValue = 4, }; -#else // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM -using NetworkFaultEnum = EmberAfNetworkFaultEnum; -static NetworkFaultEnum __attribute__((unused)) kNetworkFaultEnumkUnknownEnumValue = static_cast(4); -#endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM // Need to convert consumers to using the new enum classes, so we // don't just have casts all over. @@ -1085,8 +1078,8 @@ enum class ConnectionStatusEnum : uint8_t kUnknownEnumValue = 2, }; -// Enum for NetworkFault -enum class NetworkFault : uint8_t +// Enum for NetworkFaultEnum +enum class NetworkFaultEnum : uint8_t { kUnspecified = 0x00, kLinkDown = 0x01, @@ -1099,11 +1092,8 @@ enum class NetworkFault : uint8_t kUnknownEnumValue = 4, }; -// Need to convert consumers to using the new enum classes, so we -// don't just have casts all over. -#ifdef CHIP_USE_ENUM_CLASS_FOR_IM_ENUM -// Enum for RoutingRole -enum class RoutingRole : uint8_t +// Enum for RoutingRoleEnum +enum class RoutingRoleEnum : uint8_t { kUnspecified = 0x00, kUnassigned = 0x01, @@ -1118,10 +1108,6 @@ enum class RoutingRole : uint8_t // enum value. This specific should never be transmitted. kUnknownEnumValue = 7, }; -#else // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM -using RoutingRole = EmberAfRoutingRole; -static RoutingRole __attribute__((unused)) kRoutingRolekUnknownEnumValue = static_cast(7); -#endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM // Bitmap for Feature enum class Feature : uint32_t diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp index 56dd2dd58df6b8..eb2f49dbf438e3 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp @@ -7119,7 +7119,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } // namespace SoftwareDiagnostics namespace ThreadNetworkDiagnostics { namespace Structs { -namespace NeighborTable { +namespace NeighborTableStruct { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -7210,7 +7210,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } -} // namespace NeighborTable +} // namespace NeighborTableStruct namespace OperationalDatasetComponents { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { @@ -7295,7 +7295,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } } // namespace OperationalDatasetComponents -namespace RouteTable { +namespace RouteTableStruct { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -7370,7 +7370,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } -} // namespace RouteTable +} // namespace RouteTableStruct namespace SecurityPolicy { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h index 5568df5c6975b6..d14b3901dbb4b7 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h @@ -8566,7 +8566,7 @@ struct DecodableType } // namespace SoftwareDiagnostics namespace ThreadNetworkDiagnostics { namespace Structs { -namespace NeighborTable { +namespace NeighborTableStruct { enum class Fields : uint8_t { kExtAddress = 0, @@ -8612,7 +8612,7 @@ struct Type using DecodableType = Type; -} // namespace NeighborTable +} // namespace NeighborTableStruct namespace OperationalDatasetComponents { enum class Fields : uint8_t { @@ -8656,7 +8656,7 @@ struct Type using DecodableType = Type; } // namespace OperationalDatasetComponents -namespace RouteTable { +namespace RouteTableStruct { enum class Fields : uint8_t { kExtAddress = 0, @@ -8694,7 +8694,7 @@ struct Type using DecodableType = Type; -} // namespace RouteTable +} // namespace RouteTableStruct namespace SecurityPolicy { enum class Fields : uint8_t { @@ -8778,9 +8778,9 @@ struct TypeInfo namespace RoutingRole { struct TypeInfo { - using Type = chip::app::DataModel::Nullable; - using DecodableType = chip::app::DataModel::Nullable; - using DecodableArgType = const chip::app::DataModel::Nullable &; + using Type = chip::app::DataModel::Nullable; + using DecodableType = chip::app::DataModel::Nullable; + using DecodableArgType = const chip::app::DataModel::Nullable &; static constexpr ClusterId GetClusterId() { return Clusters::ThreadNetworkDiagnostics::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::RoutingRole::Id; } @@ -8852,11 +8852,12 @@ struct TypeInfo namespace NeighborTable { struct TypeInfo { - using Type = chip::app::DataModel::List; - using DecodableType = - chip::app::DataModel::DecodableList; + using Type = + chip::app::DataModel::List; + using DecodableType = chip::app::DataModel::DecodableList< + chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTableStruct::DecodableType>; using DecodableArgType = const chip::app::DataModel::DecodableList< - chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTable::DecodableType> &; + chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTableStruct::DecodableType> &; static constexpr ClusterId GetClusterId() { return Clusters::ThreadNetworkDiagnostics::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::NeighborTable::Id; } @@ -8866,11 +8867,11 @@ struct TypeInfo namespace RouteTable { struct TypeInfo { - using Type = chip::app::DataModel::List; - using DecodableType = - chip::app::DataModel::DecodableList; + using Type = chip::app::DataModel::List; + using DecodableType = chip::app::DataModel::DecodableList< + chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTableStruct::DecodableType>; using DecodableArgType = const chip::app::DataModel::DecodableList< - chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTable::DecodableType> &; + chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTableStruct::DecodableType> &; static constexpr ClusterId GetClusterId() { return Clusters::ThreadNetworkDiagnostics::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::RouteTable::Id; } @@ -9522,10 +9523,10 @@ struct TypeInfo namespace ActiveNetworkFaultsList { struct TypeInfo { - using Type = chip::app::DataModel::List; - using DecodableType = chip::app::DataModel::DecodableList; + using Type = chip::app::DataModel::List; + using DecodableType = chip::app::DataModel::DecodableList; using DecodableArgType = - const chip::app::DataModel::DecodableList &; + const chip::app::DataModel::DecodableList &; static constexpr ClusterId GetClusterId() { return Clusters::ThreadNetworkDiagnostics::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::ActiveNetworkFaultsList::Id; } @@ -9701,8 +9702,8 @@ struct Type static constexpr ClusterId GetClusterId() { return Clusters::ThreadNetworkDiagnostics::Id; } static constexpr bool kIsFabricScoped = false; - DataModel::List current; - DataModel::List previous; + DataModel::List current; + DataModel::List previous; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; }; @@ -9714,8 +9715,8 @@ struct DecodableType static constexpr EventId GetEventId() { return Events::NetworkFaultChange::Id; } static constexpr ClusterId GetClusterId() { return Clusters::ThreadNetworkDiagnostics::Id; } - DataModel::DecodableList current; - DataModel::DecodableList previous; + DataModel::DecodableList current; + DataModel::DecodableList previous; CHIP_ERROR Decode(TLV::TLVReader & reader); }; diff --git a/zzz_generated/app-common/app-common/zap-generated/enums.h b/zzz_generated/app-common/app-common/zap-generated/enums.h index 6e843b5bcd3804..2152ee8e992212 100644 --- a/zzz_generated/app-common/app-common/zap-generated/enums.h +++ b/zzz_generated/app-common/app-common/zap-generated/enums.h @@ -80,15 +80,6 @@ enum EmberAfMoveMode : uint8_t EMBER_ZCL_MOVE_MODE_DOWN = 1, }; -// Enum for NetworkFaultEnum -enum EmberAfNetworkFaultEnum : uint8_t -{ - EMBER_ZCL_NETWORK_FAULT_ENUM_UNSPECIFIED = 0, - EMBER_ZCL_NETWORK_FAULT_ENUM_HARDWARE_FAILURE = 1, - EMBER_ZCL_NETWORK_FAULT_ENUM_NETWORK_JAMMED = 2, - EMBER_ZCL_NETWORK_FAULT_ENUM_CONNECTION_FAILED = 3, -}; - // Enum for PHYRateEnum enum EmberAfPHYRateEnum : uint8_t { @@ -116,18 +107,6 @@ enum EmberAfRadioFaultEnum : uint8_t EMBER_ZCL_RADIO_FAULT_ENUM_ETHERNET_FAULT = 6, }; -// Enum for RoutingRole -enum EmberAfRoutingRole : uint8_t -{ - EMBER_ZCL_ROUTING_ROLE_UNSPECIFIED = 0, - EMBER_ZCL_ROUTING_ROLE_UNASSIGNED = 1, - EMBER_ZCL_ROUTING_ROLE_SLEEPY_END_DEVICE = 2, - EMBER_ZCL_ROUTING_ROLE_END_DEVICE = 3, - EMBER_ZCL_ROUTING_ROLE_REED = 4, - EMBER_ZCL_ROUTING_ROLE_ROUTER = 5, - EMBER_ZCL_ROUTING_ROLE_LEADER = 6, -}; - // Enum for StepMode enum EmberAfStepMode : uint8_t { diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index 8139b425a55c00..e0387eb485c90c 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -12700,7 +12700,7 @@ void registerClusterThreadNetworkDiagnostics(Commands & commands, CredentialIssu make_unique>(Id, credsIssuerConfig), // make_unique>>(Id, "channel", 0, UINT16_MAX, Attributes::Channel::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // - make_unique>>( + make_unique>>( Id, "routing-role", 0, UINT8_MAX, Attributes::RoutingRole::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique>>( Id, "network-name", Attributes::NetworkName::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // @@ -12714,10 +12714,10 @@ void registerClusterThreadNetworkDiagnostics(Commands & commands, CredentialIssu make_unique>(Id, "overrun-count", 0, UINT64_MAX, Attributes::OverrunCount::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique>>( + chip::app::DataModel::List>>( Id, "neighbor-table", Attributes::NeighborTable::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique>>( + chip::app::DataModel::List>>( Id, "route-table", Attributes::RouteTable::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique>>( Id, "partition-id", 0, UINT32_MAX, Attributes::PartitionId::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // @@ -12840,8 +12840,8 @@ void registerClusterThreadNetworkDiagnostics(Commands & commands, CredentialIssu chip::app::Clusters::ThreadNetworkDiagnostics::Structs::OperationalDatasetComponents::Type>>>( Id, "operational-dataset-components", Attributes::OperationalDatasetComponents::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // - make_unique< - WriteAttributeAsComplex>>( + make_unique>>( Id, "active-network-faults-list", Attributes::ActiveNetworkFaultsList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique>>( diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp index 569a8e74ca92cd..3240478c70981e 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp @@ -931,7 +931,7 @@ void ComplexArgumentParser::Finalize(chip::app::Clusters::SoftwareDiagnostics::S } CHIP_ERROR ComplexArgumentParser::Setup(const char * label, - chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTable::Type & request, + chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTableStruct::Type & request, Json::Value & value) { VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT); @@ -940,29 +940,31 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, Json::Value valueCopy(value); ReturnErrorOnFailure( - ComplexArgumentParser::EnsureMemberExist("NeighborTable.extAddress", "extAddress", value.isMember("extAddress"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("NeighborTable.age", "age", value.isMember("age"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("NeighborTable.rloc16", "rloc16", value.isMember("rloc16"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("NeighborTable.linkFrameCounter", "linkFrameCounter", + ComplexArgumentParser::EnsureMemberExist("NeighborTableStruct.extAddress", "extAddress", value.isMember("extAddress"))); + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("NeighborTableStruct.age", "age", value.isMember("age"))); + ReturnErrorOnFailure( + ComplexArgumentParser::EnsureMemberExist("NeighborTableStruct.rloc16", "rloc16", value.isMember("rloc16"))); + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("NeighborTableStruct.linkFrameCounter", "linkFrameCounter", value.isMember("linkFrameCounter"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("NeighborTable.mleFrameCounter", "mleFrameCounter", + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("NeighborTableStruct.mleFrameCounter", "mleFrameCounter", value.isMember("mleFrameCounter"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("NeighborTable.lqi", "lqi", value.isMember("lqi"))); + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("NeighborTableStruct.lqi", "lqi", value.isMember("lqi"))); ReturnErrorOnFailure( - ComplexArgumentParser::EnsureMemberExist("NeighborTable.averageRssi", "averageRssi", value.isMember("averageRssi"))); + ComplexArgumentParser::EnsureMemberExist("NeighborTableStruct.averageRssi", "averageRssi", value.isMember("averageRssi"))); ReturnErrorOnFailure( - ComplexArgumentParser::EnsureMemberExist("NeighborTable.lastRssi", "lastRssi", value.isMember("lastRssi"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("NeighborTable.frameErrorRate", "frameErrorRate", + ComplexArgumentParser::EnsureMemberExist("NeighborTableStruct.lastRssi", "lastRssi", value.isMember("lastRssi"))); + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("NeighborTableStruct.frameErrorRate", "frameErrorRate", value.isMember("frameErrorRate"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("NeighborTable.messageErrorRate", "messageErrorRate", + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("NeighborTableStruct.messageErrorRate", "messageErrorRate", value.isMember("messageErrorRate"))); - ReturnErrorOnFailure( - ComplexArgumentParser::EnsureMemberExist("NeighborTable.rxOnWhenIdle", "rxOnWhenIdle", value.isMember("rxOnWhenIdle"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("NeighborTable.fullThreadDevice", "fullThreadDevice", + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("NeighborTableStruct.rxOnWhenIdle", "rxOnWhenIdle", + value.isMember("rxOnWhenIdle"))); + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("NeighborTableStruct.fullThreadDevice", "fullThreadDevice", value.isMember("fullThreadDevice"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("NeighborTable.fullNetworkData", "fullNetworkData", + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("NeighborTableStruct.fullNetworkData", "fullNetworkData", value.isMember("fullNetworkData"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("NeighborTable.isChild", "isChild", value.isMember("isChild"))); + ReturnErrorOnFailure( + ComplexArgumentParser::EnsureMemberExist("NeighborTableStruct.isChild", "isChild", value.isMember("isChild"))); char labelWithMember[kMaxLabelLength]; snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "extAddress"); @@ -1024,7 +1026,7 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, return ComplexArgumentParser::EnsureNoMembersRemaining(label, valueCopy); } -void ComplexArgumentParser::Finalize(chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTable::Type & request) +void ComplexArgumentParser::Finalize(chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTableStruct::Type & request) { ComplexArgumentParser::Finalize(request.extAddress); ComplexArgumentParser::Finalize(request.age); @@ -1153,7 +1155,7 @@ void ComplexArgumentParser::Finalize( } CHIP_ERROR ComplexArgumentParser::Setup(const char * label, - chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTable::Type & request, + chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTableStruct::Type & request, Json::Value & value) { VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT); @@ -1162,17 +1164,20 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, Json::Value valueCopy(value); ReturnErrorOnFailure( - ComplexArgumentParser::EnsureMemberExist("RouteTable.extAddress", "extAddress", value.isMember("extAddress"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("RouteTable.rloc16", "rloc16", value.isMember("rloc16"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("RouteTable.routerId", "routerId", value.isMember("routerId"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("RouteTable.nextHop", "nextHop", value.isMember("nextHop"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("RouteTable.pathCost", "pathCost", value.isMember("pathCost"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("RouteTable.LQIIn", "LQIIn", value.isMember("LQIIn"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("RouteTable.LQIOut", "LQIOut", value.isMember("LQIOut"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("RouteTable.age", "age", value.isMember("age"))); + ComplexArgumentParser::EnsureMemberExist("RouteTableStruct.extAddress", "extAddress", value.isMember("extAddress"))); + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("RouteTableStruct.rloc16", "rloc16", value.isMember("rloc16"))); + ReturnErrorOnFailure( + ComplexArgumentParser::EnsureMemberExist("RouteTableStruct.routerId", "routerId", value.isMember("routerId"))); + ReturnErrorOnFailure( + ComplexArgumentParser::EnsureMemberExist("RouteTableStruct.nextHop", "nextHop", value.isMember("nextHop"))); + ReturnErrorOnFailure( + ComplexArgumentParser::EnsureMemberExist("RouteTableStruct.pathCost", "pathCost", value.isMember("pathCost"))); + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("RouteTableStruct.LQIIn", "LQIIn", value.isMember("LQIIn"))); + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("RouteTableStruct.LQIOut", "LQIOut", value.isMember("LQIOut"))); + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("RouteTableStruct.age", "age", value.isMember("age"))); ReturnErrorOnFailure( - ComplexArgumentParser::EnsureMemberExist("RouteTable.allocated", "allocated", value.isMember("allocated"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("RouteTable.linkEstablished", "linkEstablished", + ComplexArgumentParser::EnsureMemberExist("RouteTableStruct.allocated", "allocated", value.isMember("allocated"))); + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("RouteTableStruct.linkEstablished", "linkEstablished", value.isMember("linkEstablished"))); char labelWithMember[kMaxLabelLength]; @@ -1219,7 +1224,7 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, return ComplexArgumentParser::EnsureNoMembersRemaining(label, valueCopy); } -void ComplexArgumentParser::Finalize(chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTable::Type & request) +void ComplexArgumentParser::Finalize(chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTableStruct::Type & request) { ComplexArgumentParser::Finalize(request.extAddress); ComplexArgumentParser::Finalize(request.rloc16); diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h index 5bffae9e8d6294..3393c805021af6 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h @@ -132,10 +132,11 @@ static CHIP_ERROR Setup(const char * label, chip::app::Clusters::SoftwareDiagnos static void Finalize(chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetricsStruct::Type & request); -static CHIP_ERROR Setup(const char * label, chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTable::Type & request, +static CHIP_ERROR Setup(const char * label, + chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTableStruct::Type & request, Json::Value & value); -static void Finalize(chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTable::Type & request); +static void Finalize(chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTableStruct::Type & request); static CHIP_ERROR Setup(const char * label, chip::app::Clusters::ThreadNetworkDiagnostics::Structs::OperationalDatasetComponents::Type & request, @@ -143,10 +144,11 @@ static CHIP_ERROR Setup(const char * label, static void Finalize(chip::app::Clusters::ThreadNetworkDiagnostics::Structs::OperationalDatasetComponents::Type & request); -static CHIP_ERROR Setup(const char * label, chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTable::Type & request, +static CHIP_ERROR Setup(const char * label, + chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTableStruct::Type & request, Json::Value & value); -static void Finalize(chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTable::Type & request); +static void Finalize(chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTableStruct::Type & request); static CHIP_ERROR Setup(const char * label, chip::app::Clusters::ThreadNetworkDiagnostics::Structs::SecurityPolicy::Type & request, Json::Value & value); diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp index 6e7f0796fe81cc..a4d2745f7bacf4 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -824,7 +824,7 @@ DataModelLogger::LogValue(const char * label, size_t indent, CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, - const chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTable::DecodableType & value) + const chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTableStruct::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); { @@ -1052,7 +1052,7 @@ CHIP_ERROR DataModelLogger::LogValue( CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, - const chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTable::DecodableType & value) + const chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTableStruct::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); { @@ -6464,7 +6464,7 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP return DataModelLogger::LogValue("Channel", 1, value); } case ThreadNetworkDiagnostics::Attributes::RoutingRole::Id: { - chip::app::DataModel::Nullable value; + chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("RoutingRole", 1, value); } @@ -6495,13 +6495,14 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP } case ThreadNetworkDiagnostics::Attributes::NeighborTable::Id: { chip::app::DataModel::DecodableList< - chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTable::DecodableType> + chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTableStruct::DecodableType> value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("NeighborTable", 1, value); } case ThreadNetworkDiagnostics::Attributes::RouteTable::Id: { - chip::app::DataModel::DecodableList + chip::app::DataModel::DecodableList< + chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTableStruct::DecodableType> value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("RouteTable", 1, value); @@ -6775,7 +6776,7 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP return DataModelLogger::LogValue("OperationalDatasetComponents", 1, value); } case ThreadNetworkDiagnostics::Attributes::ActiveNetworkFaultsList::Id: { - chip::app::DataModel::DecodableList value; + chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("ActiveNetworkFaultsList", 1, value); } diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h index 4819d5ec500168..62a813d1242ef7 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h @@ -85,15 +85,16 @@ static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetricsStruct::DecodableType & value); -static CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTable::DecodableType & value); +static CHIP_ERROR +LogValue(const char * label, size_t indent, + const chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTableStruct::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::ThreadNetworkDiagnostics::Structs::OperationalDatasetComponents::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTable::DecodableType & value); + const chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTableStruct::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::ThreadNetworkDiagnostics::Structs::SecurityPolicy::DecodableType & value); diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index 5abc3d5e1515fb..1d762fc94185b8 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -53124,7 +53124,7 @@ class Test_TC_DGTHREAD_2_1Suite : public TestCommand case 2: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::DataModel::Nullable value; + chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); @@ -53366,7 +53366,7 @@ class Test_TC_DGTHREAD_2_1Suite : public TestCommand case 33: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::DataModel::DecodableList value; + chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "list", "list")); }