From 4bb35b3cd2eaa39c3c4330d0a535b3de606ee898 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Fri, 26 May 2023 00:43:32 -0400 Subject: [PATCH] Regenerate generated code. --- .../all-clusters-app.matter | 20 +-- .../all-clusters-minimal-app.matter | 20 +-- .../bridge-common/bridge-app.matter | 20 +-- ...p_rootnode_dimmablelight_bCwGYSDpoe.matter | 20 +-- .../contact-sensor-app.matter | 20 +-- .../bridge-common/bridge-app.matter | 20 +-- .../light-switch-app.matter | 20 +-- .../data_model/lighting-app-thread.matter | 20 +-- .../lighting-common/lighting-app.matter | 20 +-- .../nxp/zap/lighting-on-off.matter | 20 +-- examples/lighting-app/qpg/zap/light.matter | 20 +-- .../data_model/lighting-thread-app.matter | 20 +-- examples/lock-app/lock-common/lock-app.matter | 20 +-- examples/lock-app/nxp/zap/lock-app.matter | 20 +-- examples/lock-app/qpg/zap/lock.matter | 20 +-- .../placeholder/linux/apps/app1/config.matter | 40 ++--- .../placeholder/linux/apps/app2/config.matter | 40 ++--- examples/pump-app/pump-common/pump-app.matter | 20 +-- .../pump-controller-app.matter | 20 +-- .../thermostat-common/thermostat.matter | 20 +-- examples/tv-app/tv-common/tv-app.matter | 20 +-- examples/window-app/common/window-app.matter | 20 +-- .../data_model/controller-clusters.matter | 20 +-- .../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 +++--- .../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 +- .../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 +- 46 files changed, 588 insertions(+), 607 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-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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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-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/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/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/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/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index ea82d27ad379d5..e407314d735ea6 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/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp index 5652312cda9d94..6efd51d3e7e7ff 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 371ebe86c0d28d..9b4a828599af5d 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 617763b5f12c31..879c4594e85bb6 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 0fea3804b54e07..d85ec992bce123 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 b0922f2bed16a3..d3565f7faad7b5 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 48d94a7c929106..27e1ffa7ea52fd 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/zap-generated/MTRAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm index af82867b120000..b6c0a592dfa93b 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 86ab427ba3c300..5c3cd246d9e8a0 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 7affdabb92dffc..77aae3dd5e5b08 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h @@ -316,14 +316,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)( @@ -1425,11 +1425,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 &); @@ -1438,7 +1438,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)( @@ -7211,9 +7212,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 @@ -7248,7 +7250,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 @@ -7359,7 +7361,7 @@ class MTRThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallbackBri static void OnSuccessFn(void * context, - const chip::app::DataModel::DecodableList & value); + const chip::app::DataModel::DecodableList & value); }; class MTRThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallbackSubscriptionBridge @@ -26021,139 +26023,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 c7eb03493f64d9..16baf013c4bff1 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 @@ -25409,15 +25409,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; @@ -25432,8 +25432,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()) { @@ -25444,7 +25444,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableThreadNetworkDiagnosticsClusterNetworkFaultAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableThreadNetworkDiagnosticsClusterNetworkFaultEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -25459,15 +25459,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; @@ -25482,8 +25482,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()) { @@ -25494,7 +25494,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 a61ee5b0006168..87f83e6497728b 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 082e2ea0c1f1c1..8d84c6e2a6ac4f 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/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h index 221d18e5e7b70d..d952c3675153de 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h @@ -870,19 +870,10 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(GeneralDiagnostics::Net using EnumType = GeneralDiagnostics::NetworkFaultEnum; 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::kHardwareFailure: case EnumType::kNetworkJammed: case EnumType::kConnectionFailed: -#else // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM - case EMBER_ZCL_NETWORK_FAULT_ENUM_UNSPECIFIED: - case EMBER_ZCL_NETWORK_FAULT_ENUM_HARDWARE_FAILURE: - case EMBER_ZCL_NETWORK_FAULT_ENUM_NETWORK_JAMMED: - case EMBER_ZCL_NETWORK_FAULT_ENUM_CONNECTION_FAILED: -#endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM return val; default: return static_cast(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 2f371669f1657a..8acd14d87747dd 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 2ae5a2a6bd892e..e4aa2568258c37 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 ba6e7dacdbbb4d..11a3e7159567b5 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 d5b2dbb52af1e5..55a297cf5f3809 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -12555,7 +12555,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), // @@ -12569,10 +12569,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), // @@ -12695,8 +12695,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 2e5bea9e2fb698..426315161379e2 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 a73e784a7dffd7..d344f621a3503a 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 81653db806d80a..9358694daa5935 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, "{"); { @@ -6349,7 +6349,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); } @@ -6380,13 +6380,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); @@ -6660,7 +6661,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 24df49586083b8..0b4311a59e33cd 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")); }