Align Thread Network Diagnostics XML to the spec. (#26860)
* Align Thread Network Diagnostics XML to the spec.
Spec changes happened in
https://github.com/CHIP-Specifications/connectedhomeip-spec/pull/6169 and
https://github.com/CHIP-Specifications/connectedhomeip-spec/pull/6338
Fixes https://github.com/project-chip/connectedhomeip/issues/25339
* Auto-update ZAP files.
* Regenerate generated code.
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 913d86d..95e20cb 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 @@
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 @@
kMACCounts = 0x8;
}
- struct NeighborTable {
+ struct NeighborTableStruct {
int64u extAddress = 0;
int32u age = 1;
int16u rloc16 = 2;
@@ -1704,7 +1704,7 @@
boolean channelMaskPresent = 11;
}
- struct RouteTable {
+ struct RouteTableStruct {
int64u extAddress = 0;
int16u rloc16 = 1;
int8u routerId = 2;
@@ -1727,19 +1727,19 @@
}
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 @@
readonly attribute nullable SecurityPolicy securityPolicy = 59;
readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
- readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
+ readonly attribute NetworkFaultEnum activeNetworkFaultsList[] = 62;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
index a0b8b9b..c872509 100644
--- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
+++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
@@ -3882,7 +3882,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "RoutingRole",
+ "type": "RoutingRoleEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -25792,6 +25792,5 @@
"endpointVersion": 1,
"deviceIdentifier": 61442
}
- ],
- "log": []
+ ]
}
\ No newline at end of file
diff --git a/examples/all-clusters-app/linux/AllClustersCommandDelegate.cpp b/examples/all-clusters-app/linux/AllClustersCommandDelegate.cpp
index 503bab4..e311837 100644
--- a/examples/all-clusters-app/linux/AllClustersCommandDelegate.cpp
+++ b/examples/all-clusters-app/linux/AllClustersCommandDelegate.cpp
@@ -214,12 +214,12 @@
GeneralFaults<kMaxNetworkFaults> current;
// On Linux Simulation, set following radio faults statically.
- ReturnOnFailure(previous.add(EMBER_ZCL_NETWORK_FAULT_ENUM_HARDWARE_FAILURE));
- ReturnOnFailure(previous.add(EMBER_ZCL_NETWORK_FAULT_ENUM_NETWORK_JAMMED));
+ ReturnOnFailure(previous.add(to_underlying(Clusters::GeneralDiagnostics::NetworkFaultEnum::kHardwareFailure)));
+ ReturnOnFailure(previous.add(to_underlying(Clusters::GeneralDiagnostics::NetworkFaultEnum::kNetworkJammed)));
- ReturnOnFailure(current.add(EMBER_ZCL_NETWORK_FAULT_ENUM_HARDWARE_FAILURE));
- ReturnOnFailure(current.add(EMBER_ZCL_NETWORK_FAULT_ENUM_NETWORK_JAMMED));
- ReturnOnFailure(current.add(EMBER_ZCL_NETWORK_FAULT_ENUM_CONNECTION_FAILED));
+ ReturnOnFailure(current.add(to_underlying(Clusters::GeneralDiagnostics::NetworkFaultEnum::kHardwareFailure)));
+ ReturnOnFailure(current.add(to_underlying(Clusters::GeneralDiagnostics::NetworkFaultEnum::kNetworkJammed)));
+ ReturnOnFailure(current.add(to_underlying(Clusters::GeneralDiagnostics::NetworkFaultEnum::kConnectionFailed)));
Clusters::GeneralDiagnosticsServer::Instance().OnNetworkFaultsDetect(previous, current);
}
else
diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
index 07f74cd..1193a78 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 @@
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 @@
kMACCounts = 0x8;
}
- struct NeighborTable {
+ struct NeighborTableStruct {
int64u extAddress = 0;
int32u age = 1;
int16u rloc16 = 2;
@@ -1548,7 +1548,7 @@
boolean channelMaskPresent = 11;
}
- struct RouteTable {
+ struct RouteTableStruct {
int64u extAddress = 0;
int16u rloc16 = 1;
int8u routerId = 2;
@@ -1571,18 +1571,18 @@
}
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 @@
readonly attribute nullable SecurityPolicy securityPolicy = 59;
readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
- readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
+ readonly attribute NetworkFaultEnum activeNetworkFaultsList[] = 62;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap
index b02e910..42d5356 100644
--- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap
+++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap
@@ -3806,7 +3806,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "RoutingRole",
+ "type": "RoutingRoleEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter
index 32b8d2e..e953b46 100644
--- a/examples/bridge-app/bridge-common/bridge-app.matter
+++ b/examples/bridge-app/bridge-common/bridge-app.matter
@@ -1034,14 +1034,14 @@
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 @@
kMACCounts = 0x8;
}
- struct NeighborTable {
+ struct NeighborTableStruct {
int64u extAddress = 0;
int32u age = 1;
int16u rloc16 = 2;
@@ -1090,7 +1090,7 @@
boolean channelMaskPresent = 11;
}
- struct RouteTable {
+ struct RouteTableStruct {
int64u extAddress = 0;
int16u rloc16 = 1;
int8u routerId = 2;
@@ -1113,19 +1113,19 @@
}
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 @@
readonly attribute nullable SecurityPolicy securityPolicy = 59;
readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
- readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
+ readonly attribute NetworkFaultEnum activeNetworkFaultsList[] = 62;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
diff --git a/examples/bridge-app/bridge-common/bridge-app.zap b/examples/bridge-app/bridge-common/bridge-app.zap
index 920ea17..5911b54 100644
--- a/examples/bridge-app/bridge-common/bridge-app.zap
+++ b/examples/bridge-app/bridge-common/bridge-app.zap
@@ -2559,7 +2559,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "RoutingRole",
+ "type": "RoutingRoleEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
index 87a8216..641130d 100644
--- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
+++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
@@ -916,14 +916,14 @@
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 @@
kMACCounts = 0x8;
}
- struct NeighborTable {
+ struct NeighborTableStruct {
int64u extAddress = 0;
int32u age = 1;
int16u rloc16 = 2;
@@ -972,7 +972,7 @@
boolean channelMaskPresent = 11;
}
- struct RouteTable {
+ struct RouteTableStruct {
int64u extAddress = 0;
int16u rloc16 = 1;
int8u routerId = 2;
@@ -995,19 +995,19 @@
}
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 @@
readonly attribute nullable SecurityPolicy securityPolicy = 59;
readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
- readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
+ readonly attribute NetworkFaultEnum activeNetworkFaultsList[] = 62;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap
index f031d3d..583a90f 100644
--- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap
+++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap
@@ -3076,7 +3076,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "RoutingRole",
+ "type": "RoutingRoleEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap
index 3443a88..b2e5993 100644
--- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap
+++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap
@@ -3076,7 +3076,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "RoutingRole",
+ "type": "RoutingRoleEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap
index 1a347ec..1588271 100644
--- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap
+++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap
@@ -3076,7 +3076,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "RoutingRole",
+ "type": "RoutingRoleEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap
index 771cfe7..a12503c 100644
--- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap
+++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap
@@ -3124,7 +3124,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "RoutingRole",
+ "type": "RoutingRoleEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap
index a398cfe..3fdaa21 100644
--- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap
+++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap
@@ -3076,7 +3076,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "RoutingRole",
+ "type": "RoutingRoleEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap
index a6df919..e72d130 100644
--- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap
+++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap
@@ -3076,7 +3076,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "RoutingRole",
+ "type": "RoutingRoleEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap b/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap
index 0e21ca5..051d00c 100644
--- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap
+++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap
@@ -3124,7 +3124,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "RoutingRole",
+ "type": "RoutingRoleEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap
index ff13ace..9cafe22 100644
--- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap
+++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap
@@ -3076,7 +3076,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "RoutingRole",
+ "type": "RoutingRoleEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap
index 8f9676e..fc8a1d5 100644
--- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap
+++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap
@@ -3076,7 +3076,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "RoutingRole",
+ "type": "RoutingRoleEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap
index aac331b..54a810e 100644
--- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap
+++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap
@@ -3076,7 +3076,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "RoutingRole",
+ "type": "RoutingRoleEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap
index a321d2b..f74319c 100644
--- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap
+++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap
@@ -3076,7 +3076,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "RoutingRole",
+ "type": "RoutingRoleEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap
index c19b17b..7efab7f 100644
--- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap
+++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap
@@ -3076,7 +3076,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "RoutingRole",
+ "type": "RoutingRoleEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap
index 6f557a2..ab2c7a1 100644
--- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap
+++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap
@@ -3076,7 +3076,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "RoutingRole",
+ "type": "RoutingRoleEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap
index a351b6a..17e5f45 100644
--- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap
+++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap
@@ -3076,7 +3076,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "RoutingRole",
+ "type": "RoutingRoleEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap
index 2d1328a..6a6ba10 100644
--- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap
+++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap
@@ -3076,7 +3076,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "RoutingRole",
+ "type": "RoutingRoleEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap
index 45d9a02..5cbfd18 100644
--- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap
+++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap
@@ -3076,7 +3076,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "RoutingRole",
+ "type": "RoutingRoleEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
diff --git a/examples/chef/devices/rootnode_pump_a811bb33a0.zap b/examples/chef/devices/rootnode_pump_a811bb33a0.zap
index af6d260..fdc2618 100644
--- a/examples/chef/devices/rootnode_pump_a811bb33a0.zap
+++ b/examples/chef/devices/rootnode_pump_a811bb33a0.zap
@@ -3705,7 +3705,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "RoutingRole",
+ "type": "RoutingRoleEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap
index 6e54444..09cb5ea 100644
--- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap
+++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap
@@ -3076,7 +3076,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "RoutingRole",
+ "type": "RoutingRoleEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap
index c205b1d..80bbbb2 100644
--- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap
+++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap
@@ -3076,7 +3076,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "RoutingRole",
+ "type": "RoutingRoleEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap
index 32bc098..99a099d 100644
--- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap
+++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap
@@ -3124,7 +3124,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "RoutingRole",
+ "type": "RoutingRoleEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap
index fac7b92..2cca7b2 100644
--- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap
+++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap
@@ -3076,7 +3076,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "RoutingRole",
+ "type": "RoutingRoleEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
diff --git a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter
index f917642..cd86ce6 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 @@
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 @@
kMACCounts = 0x8;
}
- struct NeighborTable {
+ struct NeighborTableStruct {
int64u extAddress = 0;
int32u age = 1;
int16u rloc16 = 2;
@@ -950,7 +950,7 @@
boolean channelMaskPresent = 11;
}
- struct RouteTable {
+ struct RouteTableStruct {
int64u extAddress = 0;
int16u rloc16 = 1;
int8u routerId = 2;
@@ -973,19 +973,19 @@
}
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 @@
readonly attribute nullable SecurityPolicy securityPolicy = 59;
readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
- readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
+ readonly attribute NetworkFaultEnum activeNetworkFaultsList[] = 62;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
diff --git a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap
index 990672e..33ae147 100644
--- a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap
+++ b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap
@@ -3076,7 +3076,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "RoutingRole",
+ "type": "RoutingRoleEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
diff --git a/examples/dynamic-bridge-app/bridge-common/bridge-app.matter b/examples/dynamic-bridge-app/bridge-common/bridge-app.matter
index b10efb5..47b4d0c 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 @@
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 @@
kMACCounts = 0x8;
}
- struct NeighborTable {
+ struct NeighborTableStruct {
int64u extAddress = 0;
int32u age = 1;
int16u rloc16 = 2;
@@ -1090,7 +1090,7 @@
boolean channelMaskPresent = 11;
}
- struct RouteTable {
+ struct RouteTableStruct {
int64u extAddress = 0;
int16u rloc16 = 1;
int8u routerId = 2;
@@ -1113,19 +1113,19 @@
}
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 @@
readonly attribute nullable SecurityPolicy securityPolicy = 59;
readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
- readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
+ readonly attribute NetworkFaultEnum activeNetworkFaultsList[] = 62;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
diff --git a/examples/dynamic-bridge-app/bridge-common/bridge-app.zap b/examples/dynamic-bridge-app/bridge-common/bridge-app.zap
index 4b3a07c..3efd440 100644
--- a/examples/dynamic-bridge-app/bridge-common/bridge-app.zap
+++ b/examples/dynamic-bridge-app/bridge-common/bridge-app.zap
@@ -2557,7 +2557,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "RoutingRole",
+ "type": "RoutingRoleEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.matter b/examples/light-switch-app/light-switch-common/light-switch-app.matter
index 5159a1b..d3c365b 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 @@
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 @@
kMACCounts = 0x8;
}
- struct NeighborTable {
+ struct NeighborTableStruct {
int64u extAddress = 0;
int32u age = 1;
int16u rloc16 = 2;
@@ -1260,7 +1260,7 @@
boolean channelMaskPresent = 11;
}
- struct RouteTable {
+ struct RouteTableStruct {
int64u extAddress = 0;
int16u rloc16 = 1;
int8u routerId = 2;
@@ -1283,19 +1283,19 @@
}
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 @@
readonly attribute nullable SecurityPolicy securityPolicy = 59;
readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
- readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
+ readonly attribute NetworkFaultEnum activeNetworkFaultsList[] = 62;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.zap b/examples/light-switch-app/light-switch-common/light-switch-app.zap
index 674a2b2..fe82743 100644
--- a/examples/light-switch-app/light-switch-common/light-switch-app.zap
+++ b/examples/light-switch-app/light-switch-common/light-switch-app.zap
@@ -3058,7 +3058,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "RoutingRole",
+ "type": "RoutingRoleEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter
index 976e85a..4430a35 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 @@
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 @@
kMACCounts = 0x8;
}
- struct NeighborTable {
+ struct NeighborTableStruct {
int64u extAddress = 0;
int32u age = 1;
int16u rloc16 = 2;
@@ -1120,7 +1120,7 @@
boolean channelMaskPresent = 11;
}
- struct RouteTable {
+ struct RouteTableStruct {
int64u extAddress = 0;
int16u rloc16 = 1;
int8u routerId = 2;
@@ -1143,19 +1143,19 @@
}
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 @@
readonly attribute nullable SecurityPolicy securityPolicy = 59;
readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
- readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
+ readonly attribute NetworkFaultEnum activeNetworkFaultsList[] = 62;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap
index dbf0663..ae1990d 100644
--- a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap
+++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap
@@ -3097,7 +3097,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "RoutingRole",
+ "type": "RoutingRoleEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap
index 819a109..b1ac849 100644
--- a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap
+++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap
@@ -3097,7 +3097,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "RoutingRole",
+ "type": "RoutingRoleEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter
index 580e841..d1621108 100644
--- a/examples/lighting-app/lighting-common/lighting-app.matter
+++ b/examples/lighting-app/lighting-common/lighting-app.matter
@@ -1064,14 +1064,14 @@
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 @@
kMACCounts = 0x8;
}
- struct NeighborTable {
+ struct NeighborTableStruct {
int64u extAddress = 0;
int32u age = 1;
int16u rloc16 = 2;
@@ -1120,7 +1120,7 @@
boolean channelMaskPresent = 11;
}
- struct RouteTable {
+ struct RouteTableStruct {
int64u extAddress = 0;
int16u rloc16 = 1;
int8u routerId = 2;
@@ -1143,19 +1143,19 @@
}
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 @@
readonly attribute nullable SecurityPolicy securityPolicy = 59;
readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
- readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
+ readonly attribute NetworkFaultEnum activeNetworkFaultsList[] = 62;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
diff --git a/examples/lighting-app/lighting-common/lighting-app.zap b/examples/lighting-app/lighting-common/lighting-app.zap
index d799c8d..f252998 100644
--- a/examples/lighting-app/lighting-common/lighting-app.zap
+++ b/examples/lighting-app/lighting-common/lighting-app.zap
@@ -18,17 +18,17 @@
"package": [
{
"pathRelativity": "relativeToZap",
- "path": "../../../src/app/zap-templates/app-templates.json",
- "type": "gen-templates-json",
- "version": "chip-v1"
- },
- {
- "pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/zcl/zcl.json",
"type": "zcl-properties",
"category": "matter",
"version": 1,
"description": "Matter SDK ZCL data"
+ },
+ {
+ "pathRelativity": "relativeToZap",
+ "path": "../../../src/app/zap-templates/app-templates.json",
+ "type": "gen-templates-json",
+ "version": "chip-v1"
}
],
"endpointTypes": [
@@ -3097,7 +3097,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "RoutingRole",
+ "type": "RoutingRoleEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -8341,6 +8341,5 @@
"endpointVersion": 1,
"deviceIdentifier": 257
}
- ],
- "log": []
+ ]
}
\ No newline at end of file
diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.matter b/examples/lighting-app/nxp/zap/lighting-on-off.matter
index 5d2e337..685fac3 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 @@
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 @@
kMACCounts = 0x8;
}
- struct NeighborTable {
+ struct NeighborTableStruct {
int64u extAddress = 0;
int32u age = 1;
int16u rloc16 = 2;
@@ -1004,7 +1004,7 @@
boolean channelMaskPresent = 11;
}
- struct RouteTable {
+ struct RouteTableStruct {
int64u extAddress = 0;
int16u rloc16 = 1;
int8u routerId = 2;
@@ -1027,19 +1027,19 @@
}
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 @@
readonly attribute nullable SecurityPolicy securityPolicy = 59;
readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
- readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
+ readonly attribute NetworkFaultEnum activeNetworkFaultsList[] = 62;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.zap b/examples/lighting-app/nxp/zap/lighting-on-off.zap
index 0706d84..1bd0a98 100644
--- a/examples/lighting-app/nxp/zap/lighting-on-off.zap
+++ b/examples/lighting-app/nxp/zap/lighting-on-off.zap
@@ -3200,7 +3200,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "RoutingRole",
+ "type": "RoutingRoleEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
diff --git a/examples/lighting-app/qpg/zap/light.matter b/examples/lighting-app/qpg/zap/light.matter
index ff264ca..a35c1e7 100644
--- a/examples/lighting-app/qpg/zap/light.matter
+++ b/examples/lighting-app/qpg/zap/light.matter
@@ -1008,14 +1008,14 @@
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 @@
kMACCounts = 0x8;
}
- struct NeighborTable {
+ struct NeighborTableStruct {
int64u extAddress = 0;
int32u age = 1;
int16u rloc16 = 2;
@@ -1064,7 +1064,7 @@
boolean channelMaskPresent = 11;
}
- struct RouteTable {
+ struct RouteTableStruct {
int64u extAddress = 0;
int16u rloc16 = 1;
int8u routerId = 2;
@@ -1087,19 +1087,19 @@
}
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 @@
readonly attribute nullable SecurityPolicy securityPolicy = 59;
readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
- readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
+ readonly attribute NetworkFaultEnum activeNetworkFaultsList[] = 62;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
diff --git a/examples/lighting-app/qpg/zap/light.zap b/examples/lighting-app/qpg/zap/light.zap
index 55f8020..5354dd6 100644
--- a/examples/lighting-app/qpg/zap/light.zap
+++ b/examples/lighting-app/qpg/zap/light.zap
@@ -3665,7 +3665,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "RoutingRole",
+ "type": "RoutingRoleEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
diff --git a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter
index e761595..9cb04a6 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 @@
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 @@
kMACCounts = 0x8;
}
- struct NeighborTable {
+ struct NeighborTableStruct {
int64u extAddress = 0;
int32u age = 1;
int16u rloc16 = 2;
@@ -1120,7 +1120,7 @@
boolean channelMaskPresent = 11;
}
- struct RouteTable {
+ struct RouteTableStruct {
int64u extAddress = 0;
int16u rloc16 = 1;
int8u routerId = 2;
@@ -1143,19 +1143,19 @@
}
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 @@
readonly attribute nullable SecurityPolicy securityPolicy = 59;
readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
- readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
+ readonly attribute NetworkFaultEnum activeNetworkFaultsList[] = 62;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
diff --git a/examples/lighting-app/silabs/data_model/lighting-thread-app.zap b/examples/lighting-app/silabs/data_model/lighting-thread-app.zap
index 8b08a3f..ab56bfd 100644
--- a/examples/lighting-app/silabs/data_model/lighting-thread-app.zap
+++ b/examples/lighting-app/silabs/data_model/lighting-thread-app.zap
@@ -2979,7 +2979,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "RoutingRole",
+ "type": "RoutingRoleEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
diff --git a/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap b/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap
index 808f47d..db1814e 100644
--- a/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap
+++ b/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap
@@ -3005,7 +3005,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "RoutingRole",
+ "type": "RoutingRoleEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter
index 1dff883..83f5d0b 100644
--- a/examples/lock-app/lock-common/lock-app.matter
+++ b/examples/lock-app/lock-common/lock-app.matter
@@ -1111,14 +1111,14 @@
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 @@
kMACCounts = 0x8;
}
- struct NeighborTable {
+ struct NeighborTableStruct {
int64u extAddress = 0;
int32u age = 1;
int16u rloc16 = 2;
@@ -1167,7 +1167,7 @@
boolean channelMaskPresent = 11;
}
- struct RouteTable {
+ struct RouteTableStruct {
int64u extAddress = 0;
int16u rloc16 = 1;
int8u routerId = 2;
@@ -1190,19 +1190,19 @@
}
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 @@
readonly attribute nullable SecurityPolicy securityPolicy = 59;
readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
- readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
+ readonly attribute NetworkFaultEnum activeNetworkFaultsList[] = 62;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
diff --git a/examples/lock-app/lock-common/lock-app.zap b/examples/lock-app/lock-common/lock-app.zap
index 74a1d27..f35e6ab 100644
--- a/examples/lock-app/lock-common/lock-app.zap
+++ b/examples/lock-app/lock-common/lock-app.zap
@@ -3034,7 +3034,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "RoutingRole",
+ "type": "RoutingRoleEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
diff --git a/examples/lock-app/nxp/zap/lock-app.matter b/examples/lock-app/nxp/zap/lock-app.matter
index 7b739d8..4c3ae95 100644
--- a/examples/lock-app/nxp/zap/lock-app.matter
+++ b/examples/lock-app/nxp/zap/lock-app.matter
@@ -567,14 +567,14 @@
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 @@
kMACCounts = 0x8;
}
- struct NeighborTable {
+ struct NeighborTableStruct {
int64u extAddress = 0;
int32u age = 1;
int16u rloc16 = 2;
@@ -623,7 +623,7 @@
boolean channelMaskPresent = 11;
}
- struct RouteTable {
+ struct RouteTableStruct {
int64u extAddress = 0;
int16u rloc16 = 1;
int8u routerId = 2;
@@ -646,19 +646,19 @@
}
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 @@
readonly attribute nullable SecurityPolicy securityPolicy = 59;
readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
- readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
+ readonly attribute NetworkFaultEnum activeNetworkFaultsList[] = 62;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
diff --git a/examples/lock-app/nxp/zap/lock-app.zap b/examples/lock-app/nxp/zap/lock-app.zap
index e136bca..bf5b89e 100644
--- a/examples/lock-app/nxp/zap/lock-app.zap
+++ b/examples/lock-app/nxp/zap/lock-app.zap
@@ -3200,7 +3200,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "RoutingRole",
+ "type": "RoutingRoleEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
diff --git a/examples/lock-app/qpg/zap/lock.matter b/examples/lock-app/qpg/zap/lock.matter
index 1e11358..a4ade38 100644
--- a/examples/lock-app/qpg/zap/lock.matter
+++ b/examples/lock-app/qpg/zap/lock.matter
@@ -842,14 +842,14 @@
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 @@
kMACCounts = 0x8;
}
- struct NeighborTable {
+ struct NeighborTableStruct {
int64u extAddress = 0;
int32u age = 1;
int16u rloc16 = 2;
@@ -898,7 +898,7 @@
boolean channelMaskPresent = 11;
}
- struct RouteTable {
+ struct RouteTableStruct {
int64u extAddress = 0;
int16u rloc16 = 1;
int8u routerId = 2;
@@ -921,19 +921,19 @@
}
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 @@
readonly attribute nullable SecurityPolicy securityPolicy = 59;
readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
- readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
+ readonly attribute NetworkFaultEnum activeNetworkFaultsList[] = 62;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
diff --git a/examples/lock-app/qpg/zap/lock.zap b/examples/lock-app/qpg/zap/lock.zap
index d12fbed..d77964e 100644
--- a/examples/lock-app/qpg/zap/lock.zap
+++ b/examples/lock-app/qpg/zap/lock.zap
@@ -3602,7 +3602,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "RoutingRole",
+ "type": "RoutingRoleEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter
index bffde23..351a34c 100644
--- a/examples/placeholder/linux/apps/app1/config.matter
+++ b/examples/placeholder/linux/apps/app1/config.matter
@@ -1668,14 +1668,14 @@
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 @@
kMACCounts = 0x8;
}
- struct NeighborTable {
+ struct NeighborTableStruct {
int64u extAddress = 0;
int32u age = 1;
int16u rloc16 = 2;
@@ -1724,7 +1724,7 @@
boolean channelMaskPresent = 11;
}
- struct RouteTable {
+ struct RouteTableStruct {
int64u extAddress = 0;
int16u rloc16 = 1;
int8u routerId = 2;
@@ -1747,19 +1747,19 @@
}
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 @@
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 @@
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 @@
kMACCounts = 0x8;
}
- struct NeighborTable {
+ struct NeighborTableStruct {
int64u extAddress = 0;
int32u age = 1;
int16u rloc16 = 2;
@@ -1888,7 +1888,7 @@
boolean channelMaskPresent = 11;
}
- struct RouteTable {
+ struct RouteTableStruct {
int64u extAddress = 0;
int16u rloc16 = 1;
int8u routerId = 2;
@@ -1911,19 +1911,19 @@
}
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 @@
readonly attribute nullable SecurityPolicy securityPolicy = 59;
readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
- readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
+ readonly attribute NetworkFaultEnum activeNetworkFaultsList[] = 62;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
diff --git a/examples/placeholder/linux/apps/app1/config.zap b/examples/placeholder/linux/apps/app1/config.zap
index 02c19e6..e004e30 100644
--- a/examples/placeholder/linux/apps/app1/config.zap
+++ b/examples/placeholder/linux/apps/app1/config.zap
@@ -2689,22 +2689,6 @@
"enabled": 1,
"attributes": [
{
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "Channel",
"code": 0,
"mfgCode": null,
@@ -2741,9 +2725,9 @@
"code": 2,
"mfgCode": null,
"side": "server",
- "type": "String",
+ "type": "char_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2821,7 +2805,7 @@
"code": 7,
"mfgCode": null,
"side": "server",
- "type": "NeighborTableStruct",
+ "type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -2837,7 +2821,7 @@
"code": 8,
"mfgCode": null,
"side": "server",
- "type": "RouteTableStruct",
+ "type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -2949,7 +2933,7 @@
"code": 15,
"mfgCode": null,
"side": "server",
- "type": "int8u",
+ "type": "int16u",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -2965,7 +2949,7 @@
"code": 16,
"mfgCode": null,
"side": "server",
- "type": "int8u",
+ "type": "int16u",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -2981,7 +2965,7 @@
"code": 17,
"mfgCode": null,
"side": "server",
- "type": "int8u",
+ "type": "int16u",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -3697,7 +3681,7 @@
"reportableChange": 0
},
{
- "name": "ActiveNetworkFaults",
+ "name": "ActiveNetworkFaultsList",
"code": 62,
"mfgCode": null,
"side": "server",
@@ -3711,6 +3695,22 @@
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
+ },
+ {
+ "name": "ClusterRevision",
+ "code": 65533,
+ "mfgCode": null,
+ "side": "server",
+ "type": "int16u",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "1",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
}
]
},
@@ -4280,22 +4280,6 @@
"enabled": 1,
"attributes": [
{
- "name": "DataModelRevision",
- "code": 0,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "External",
- "singleton": 1,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
"name": "VendorName",
"code": 1,
"mfgCode": null,
@@ -4344,22 +4328,6 @@
"reportableChange": 0
},
{
- "name": "ProductID",
- "code": 4,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "External",
- "singleton": 1,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
"name": "NodeLabel",
"code": 5,
"mfgCode": null,
@@ -4376,22 +4344,6 @@
"reportableChange": 0
},
{
- "name": "Location",
- "code": 6,
- "mfgCode": null,
- "side": "server",
- "type": "char_string",
- "included": 1,
- "storageOption": "External",
- "singleton": 1,
- "bounded": 0,
- "defaultValue": "XX",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
"name": "HardwareVersion",
"code": 7,
"mfgCode": null,
@@ -4536,22 +4488,6 @@
"reportableChange": 0
},
{
- "name": "LocalConfigDisabled",
- "code": 16,
- "mfgCode": null,
- "side": "server",
- "type": "boolean",
- "included": 1,
- "storageOption": "NVM",
- "singleton": 1,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
"name": "Reachable",
"code": 17,
"mfgCode": null,
@@ -4584,22 +4520,6 @@
"reportableChange": 0
},
{
- "name": "CapabilityMinima",
- "code": 19,
- "mfgCode": null,
- "side": "server",
- "type": "CapabilityMinimaStruct",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "ProductAppearance",
"code": 20,
"mfgCode": null,
@@ -5549,90 +5469,6 @@
]
},
{
- "name": "Window Covering",
- "code": 258,
- "mfgCode": null,
- "define": "WINDOW_COVERING_CLUSTER",
- "side": "client",
- "enabled": 0,
- "commands": [
- {
- "name": "UpOrOpen",
- "code": 0,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
- },
- {
- "name": "DownOrClose",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
- },
- {
- "name": "StopMotion",
- "code": 2,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
- },
- {
- "name": "GoToLiftValue",
- "code": 4,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
- },
- {
- "name": "GoToLiftPercentage",
- "code": 5,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
- },
- {
- "name": "GoToTiltValue",
- "code": 7,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
- },
- {
- "name": "GoToTiltPercentage",
- "code": 8,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
- }
- ],
- "attributes": [
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "client",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "5",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- }
- ]
- },
- {
"name": "Door Lock",
"code": 257,
"mfgCode": null,
@@ -5641,7 +5477,7 @@
"enabled": 1,
"commands": [
{
- "name": "Lock Door",
+ "name": "LockDoor",
"code": 0,
"mfgCode": null,
"source": "client",
@@ -5649,7 +5485,7 @@
"outgoing": 0
},
{
- "name": "Unlock Door",
+ "name": "UnlockDoor",
"code": 1,
"mfgCode": null,
"source": "client",
@@ -5657,15 +5493,7 @@
"outgoing": 0
},
{
- "name": "Toggle",
- "code": 2,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
- },
- {
- "name": "Unlock with Timeout",
+ "name": "UnlockWithTimeout",
"code": 3,
"mfgCode": null,
"source": "client",
@@ -5701,27 +5529,11 @@
"enabled": 1,
"attributes": [
{
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "6",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "LockState",
"code": 0,
"mfgCode": null,
"side": "server",
- "type": "enum8",
+ "type": "DlLockState",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -5737,7 +5549,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "enum8",
+ "type": "DlLockType",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -5769,7 +5581,7 @@
"code": 3,
"mfgCode": null,
"side": "server",
- "type": "enum8",
+ "type": "DoorStateEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -5829,22 +5641,6 @@
"reportableChange": 0
},
{
- "name": "NumberOfLogRecordsSupported",
- "code": 16,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
"name": "NumberOfTotalUsersSupported",
"code": 17,
"mfgCode": null,
@@ -6009,7 +5805,7 @@
"code": 27,
"mfgCode": null,
"side": "server",
- "type": "bitmap8",
+ "type": "DlCredentialRuleMask",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -6037,27 +5833,11 @@
"reportableChange": 0
},
{
- "name": "EnableLogging",
- "code": 32,
- "mfgCode": null,
- "side": "server",
- "type": "boolean",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "Language",
"code": 33,
"mfgCode": null,
"side": "server",
- "type": "String",
+ "type": "char_string",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -6067,8 +5847,8 @@
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
- }
- ,{
+ },
+ {
"name": "LEDSettings",
"code": 34,
"mfgCode": null,
@@ -6121,7 +5901,7 @@
"code": 37,
"mfgCode": null,
"side": "server",
- "type": "enum8",
+ "type": "OperatingModeEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -6137,7 +5917,7 @@
"code": 38,
"mfgCode": null,
"side": "server",
- "type": "bitmap16",
+ "type": "DlSupportedOperatingModes",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -6153,7 +5933,7 @@
"code": 39,
"mfgCode": null,
"side": "server",
- "type": "bitmap16",
+ "type": "DlDefaultConfigurationRegister",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -6233,7 +6013,7 @@
"code": 44,
"mfgCode": null,
"side": "server",
- "type": "bitmap8",
+ "type": "DlLocalProgrammingFeatures",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -6309,22 +6089,6 @@
"reportableChange": 0
},
{
- "name": "SecurityLevel",
- "code": 52,
- "mfgCode": null,
- "side": "server",
- "type": "enum8",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
"name": "ExpiringUserTimeout",
"code": 53,
"mfgCode": null,
@@ -6341,135 +6105,107 @@
"reportableChange": 0
},
{
- "name": "AlarmMask",
- "code": 64,
+ "name": "ClusterRevision",
+ "code": 65533,
"mfgCode": null,
"side": "server",
- "type": "bitmap16",
+ "type": "int16u",
"included": 1,
- "storageOption": "External",
+ "storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "0xFFFF",
+ "defaultValue": "6",
"reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
+ "minInterval": 1,
+ "maxInterval": 65534,
"reportableChange": 0
+ }
+ ]
+ },
+ {
+ "name": "Window Covering",
+ "code": 258,
+ "mfgCode": null,
+ "define": "WINDOW_COVERING_CLUSTER",
+ "side": "client",
+ "enabled": 0,
+ "commands": [
+ {
+ "name": "UpOrOpen",
+ "code": 0,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 0
},
{
- "name": "KeypadOperationEventMask",
- "code": 65,
+ "name": "DownOrClose",
+ "code": 1,
"mfgCode": null,
- "side": "server",
- "type": "bitmap16",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0xFFFF",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 0
},
{
- "name": "RemoteOperationEventMask",
- "code": 66,
+ "name": "StopMotion",
+ "code": 2,
"mfgCode": null,
- "side": "server",
- "type": "bitmap16",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0xFFFF",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 0
},
{
- "name": "ManualOperationEventMask",
- "code": 67,
+ "name": "GoToLiftValue",
+ "code": 4,
"mfgCode": null,
- "side": "server",
- "type": "bitmap16",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0xFFFF",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 0
},
{
- "name": "RFIDOperationEventMask",
- "code": 68,
+ "name": "GoToLiftPercentage",
+ "code": 5,
"mfgCode": null,
- "side": "server",
- "type": "bitmap16",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0xFFFF",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 0
},
{
- "name": "KeypadProgrammingEventMask",
- "code": 69,
+ "name": "GoToTiltValue",
+ "code": 7,
"mfgCode": null,
- "side": "server",
- "type": "bitmap16",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0xFFFF",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 0
},
{
- "name": "RemoteProgrammingEventMask",
- "code": 70,
+ "name": "GoToTiltPercentage",
+ "code": 8,
"mfgCode": null,
- "side": "server",
- "type": "bitmap16",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0xFFFF",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 0
+ }
+ ],
+ "attributes": [
{
- "name": "RFIDProgrammingEventMask",
- "code": 71,
+ "name": "ClusterRevision",
+ "code": 65533,
"mfgCode": null,
- "side": "server",
- "type": "bitmap16",
+ "side": "client",
+ "type": "int16u",
"included": 1,
- "storageOption": "External",
+ "storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "0xFFFF",
+ "defaultValue": "5",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
}
]
- },
+ },
{
"name": "Window Covering",
"code": 258,
@@ -7203,22 +6939,6 @@
"reportableChange": 0
},
{
- "name": "AlarmMask",
- "code": 34,
- "mfgCode": null,
- "side": "server",
- "type": "bitmap16",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0x00",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
@@ -7291,14 +7011,6 @@
"source": "client",
"incoming": 0,
"outgoing": 1
- },
- {
- "name": "GetRelayStatusLog",
- "code": 4,
- "mfgCode": null,
- "source": "client",
- "incoming": 0,
- "outgoing": 1
}
],
"attributes": [
@@ -7335,14 +7047,6 @@
"source": "server",
"incoming": 1,
"outgoing": 0
- },
- {
- "name": "GetRelayStatusLogResponse",
- "code": 1,
- "mfgCode": null,
- "source": "server",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -7715,22 +7419,6 @@
"reportableChange": 0
},
{
- "name": "AlarmMask",
- "code": 29,
- "mfgCode": null,
- "side": "server",
- "type": "bitmap8",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0x00",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
"name": "ThermostatRunningMode",
"code": 30,
"mfgCode": null,
@@ -7895,7 +7583,7 @@
"code": 50,
"mfgCode": null,
"side": "server",
- "type": "utc",
+ "type": "epoch_s",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -8093,7 +7781,7 @@
"singleton": 1,
"bounded": 1,
"defaultValue": "0",
- "reportable": 0,
+ "reportable": 1,
"minInterval": 1,
"maxInterval": 65344,
"reportableChange": 0
@@ -8131,7 +7819,7 @@
"reportableChange": 0
},
{
- "name": "ACCapacityFormat",
+ "name": "ACCapacityformat",
"code": 71,
"mfgCode": null,
"side": "server",
@@ -9181,6 +8869,148 @@
]
},
{
+ "name": "Channel",
+ "code": 1284,
+ "mfgCode": null,
+ "define": "CHANNEL_CLUSTER",
+ "side": "client",
+ "enabled": 1,
+ "commands": [
+ {
+ "name": "ChangeChannel",
+ "code": 0,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 0
+ },
+ {
+ "name": "ChangeChannelByNumber",
+ "code": 2,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 0
+ },
+ {
+ "name": "SkipChannel",
+ "code": 3,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 0
+ }
+ ],
+ "attributes": [
+ {
+ "name": "ClusterRevision",
+ "code": 65533,
+ "mfgCode": null,
+ "side": "client",
+ "type": "int16u",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "1",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65344,
+ "reportableChange": 0
+ }
+ ]
+ },
+ {
+ "name": "Channel",
+ "code": 1284,
+ "mfgCode": null,
+ "define": "CHANNEL_CLUSTER",
+ "side": "server",
+ "enabled": 1,
+ "attributes": [
+ {
+ "name": "ChannelList",
+ "code": 0,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65344,
+ "reportableChange": 0
+ },
+ {
+ "name": "Lineup",
+ "code": 1,
+ "mfgCode": null,
+ "side": "server",
+ "type": "LineupInfoStruct",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65344,
+ "reportableChange": 0
+ },
+ {
+ "name": "CurrentChannel",
+ "code": 2,
+ "mfgCode": null,
+ "side": "server",
+ "type": "ChannelInfoStruct",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65344,
+ "reportableChange": 0
+ },
+ {
+ "name": "FeatureMap",
+ "code": 65532,
+ "mfgCode": null,
+ "side": "server",
+ "type": "bitmap32",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "0",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "ClusterRevision",
+ "code": 65533,
+ "mfgCode": null,
+ "side": "server",
+ "type": "int16u",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "1",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65344,
+ "reportableChange": 0
+ }
+ ]
+ },
+ {
"name": "Target Navigator",
"code": 1285,
"mfgCode": null,
@@ -9349,6 +9179,466 @@
]
},
{
+ "name": "Media Playback",
+ "code": 1286,
+ "mfgCode": null,
+ "define": "MEDIA_PLAYBACK_CLUSTER",
+ "side": "client",
+ "enabled": 1,
+ "commands": [
+ {
+ "name": "Play",
+ "code": 0,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 1
+ },
+ {
+ "name": "Pause",
+ "code": 1,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 1
+ },
+ {
+ "name": "Stop",
+ "code": 2,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 1
+ },
+ {
+ "name": "StartOver",
+ "code": 3,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 1
+ },
+ {
+ "name": "Previous",
+ "code": 4,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 1
+ },
+ {
+ "name": "Next",
+ "code": 5,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 1
+ },
+ {
+ "name": "Rewind",
+ "code": 6,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 1
+ },
+ {
+ "name": "FastForward",
+ "code": 7,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 1
+ },
+ {
+ "name": "SkipForward",
+ "code": 8,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 1
+ },
+ {
+ "name": "SkipBackward",
+ "code": 9,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 1
+ },
+ {
+ "name": "Seek",
+ "code": 11,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 1
+ }
+ ],
+ "attributes": [
+ {
+ "name": "ClusterRevision",
+ "code": 65533,
+ "mfgCode": null,
+ "side": "client",
+ "type": "int16u",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "1",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65344,
+ "reportableChange": 0
+ }
+ ]
+ },
+ {
+ "name": "Media Playback",
+ "code": 1286,
+ "mfgCode": null,
+ "define": "MEDIA_PLAYBACK_CLUSTER",
+ "side": "server",
+ "enabled": 1,
+ "commands": [
+ {
+ "name": "PlaybackResponse",
+ "code": 10,
+ "mfgCode": null,
+ "source": "server",
+ "incoming": 1,
+ "outgoing": 1
+ }
+ ],
+ "attributes": [
+ {
+ "name": "CurrentState",
+ "code": 0,
+ "mfgCode": null,
+ "side": "server",
+ "type": "PlaybackStateEnum",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "StartTime",
+ "code": 1,
+ "mfgCode": null,
+ "side": "server",
+ "type": "epoch_us",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "Duration",
+ "code": 2,
+ "mfgCode": null,
+ "side": "server",
+ "type": "int64u",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "SampledPosition",
+ "code": 3,
+ "mfgCode": null,
+ "side": "server",
+ "type": "PlaybackPositionStruct",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "PlaybackSpeed",
+ "code": 4,
+ "mfgCode": null,
+ "side": "server",
+ "type": "single",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "1",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "SeekRangeEnd",
+ "code": 5,
+ "mfgCode": null,
+ "side": "server",
+ "type": "int64u",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "SeekRangeStart",
+ "code": 6,
+ "mfgCode": null,
+ "side": "server",
+ "type": "int64u",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "1",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "FeatureMap",
+ "code": 65532,
+ "mfgCode": null,
+ "side": "server",
+ "type": "bitmap32",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "0",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "ClusterRevision",
+ "code": 65533,
+ "mfgCode": null,
+ "side": "server",
+ "type": "int16u",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "1",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ }
+ ]
+ },
+ {
+ "name": "Media Input",
+ "code": 1287,
+ "mfgCode": null,
+ "define": "MEDIA_INPUT_CLUSTER",
+ "side": "client",
+ "enabled": 1,
+ "commands": [
+ {
+ "name": "SelectInput",
+ "code": 0,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 0
+ },
+ {
+ "name": "ShowInputStatus",
+ "code": 1,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 0
+ },
+ {
+ "name": "HideInputStatus",
+ "code": 2,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 0
+ },
+ {
+ "name": "RenameInput",
+ "code": 3,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 0
+ }
+ ],
+ "attributes": [
+ {
+ "name": "ClusterRevision",
+ "code": 65533,
+ "mfgCode": null,
+ "side": "client",
+ "type": "int16u",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "1",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ }
+ ]
+ },
+ {
+ "name": "Media Input",
+ "code": 1287,
+ "mfgCode": null,
+ "define": "MEDIA_INPUT_CLUSTER",
+ "side": "server",
+ "enabled": 1,
+ "attributes": [
+ {
+ "name": "InputList",
+ "code": 0,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "CurrentInput",
+ "code": 1,
+ "mfgCode": null,
+ "side": "server",
+ "type": "int8u",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "ClusterRevision",
+ "code": 65533,
+ "mfgCode": null,
+ "side": "server",
+ "type": "int16u",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "1",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ }
+ ]
+ },
+ {
+ "name": "Low Power",
+ "code": 1288,
+ "mfgCode": null,
+ "define": "LOW_POWER_CLUSTER",
+ "side": "client",
+ "enabled": 1,
+ "commands": [
+ {
+ "name": "Sleep",
+ "code": 0,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 0
+ }
+ ],
+ "attributes": [
+ {
+ "name": "ClusterRevision",
+ "code": 65533,
+ "mfgCode": null,
+ "side": "client",
+ "type": "int16u",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "1",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ }
+ ]
+ },
+ {
+ "name": "Low Power",
+ "code": 1288,
+ "mfgCode": null,
+ "define": "LOW_POWER_CLUSTER",
+ "side": "server",
+ "enabled": 0,
+ "attributes": [
+ {
+ "name": "ClusterRevision",
+ "code": 65533,
+ "mfgCode": null,
+ "side": "server",
+ "type": "int16u",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "1",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ }
+ ]
+ },
+ {
"name": "Keypad Input",
"code": 1289,
"mfgCode": null,
@@ -9661,6 +9951,292 @@
]
},
{
+ "name": "Audio Output",
+ "code": 1291,
+ "mfgCode": null,
+ "define": "AUDIO_OUTPUT_CLUSTER",
+ "side": "client",
+ "enabled": 1,
+ "commands": [
+ {
+ "name": "SelectOutput",
+ "code": 0,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 0
+ },
+ {
+ "name": "RenameOutput",
+ "code": 1,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 0
+ }
+ ],
+ "attributes": [
+ {
+ "name": "FeatureMap",
+ "code": 65532,
+ "mfgCode": null,
+ "side": "client",
+ "type": "bitmap32",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "0",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "ClusterRevision",
+ "code": 65533,
+ "mfgCode": null,
+ "side": "client",
+ "type": "int16u",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "1",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65344,
+ "reportableChange": 0
+ }
+ ]
+ },
+ {
+ "name": "Audio Output",
+ "code": 1291,
+ "mfgCode": null,
+ "define": "AUDIO_OUTPUT_CLUSTER",
+ "side": "server",
+ "enabled": 1,
+ "attributes": [
+ {
+ "name": "OutputList",
+ "code": 0,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65344,
+ "reportableChange": 0
+ },
+ {
+ "name": "CurrentOutput",
+ "code": 1,
+ "mfgCode": null,
+ "side": "server",
+ "type": "int8u",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65344,
+ "reportableChange": 0
+ },
+ {
+ "name": "FeatureMap",
+ "code": 65532,
+ "mfgCode": null,
+ "side": "server",
+ "type": "bitmap32",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "0",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "ClusterRevision",
+ "code": 65533,
+ "mfgCode": null,
+ "side": "server",
+ "type": "int16u",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "1",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65344,
+ "reportableChange": 0
+ }
+ ]
+ },
+ {
+ "name": "Application Launcher",
+ "code": 1292,
+ "mfgCode": null,
+ "define": "APPLICATION_LAUNCHER_CLUSTER",
+ "side": "client",
+ "enabled": 1,
+ "commands": [
+ {
+ "name": "LaunchApp",
+ "code": 0,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 0,
+ "outgoing": 1
+ },
+ {
+ "name": "StopApp",
+ "code": 1,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 0,
+ "outgoing": 1
+ },
+ {
+ "name": "HideApp",
+ "code": 2,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 0,
+ "outgoing": 1
+ }
+ ],
+ "attributes": [
+ {
+ "name": "FeatureMap",
+ "code": 65532,
+ "mfgCode": null,
+ "side": "client",
+ "type": "bitmap32",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "0",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "ClusterRevision",
+ "code": 65533,
+ "mfgCode": null,
+ "side": "client",
+ "type": "int16u",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "1",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65344,
+ "reportableChange": 0
+ }
+ ]
+ },
+ {
+ "name": "Application Launcher",
+ "code": 1292,
+ "mfgCode": null,
+ "define": "APPLICATION_LAUNCHER_CLUSTER",
+ "side": "server",
+ "enabled": 1,
+ "commands": [
+ {
+ "name": "LauncherResponse",
+ "code": 3,
+ "mfgCode": null,
+ "source": "server",
+ "incoming": 1,
+ "outgoing": 0
+ }
+ ],
+ "attributes": [
+ {
+ "name": "CatalogList",
+ "code": 0,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65344,
+ "reportableChange": 0
+ },
+ {
+ "name": "CurrentApp",
+ "code": 1,
+ "mfgCode": null,
+ "side": "server",
+ "type": "ApplicationEPStruct",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65344,
+ "reportableChange": 0
+ },
+ {
+ "name": "FeatureMap",
+ "code": 65532,
+ "mfgCode": null,
+ "side": "server",
+ "type": "bitmap32",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "0",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "ClusterRevision",
+ "code": 65533,
+ "mfgCode": null,
+ "side": "server",
+ "type": "int16u",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "1",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65344,
+ "reportableChange": 0
+ }
+ ]
+ },
+ {
"name": "Application Basic",
"code": 1293,
"mfgCode": null,
@@ -9991,904 +10567,6 @@
"reportableChange": 0
}
]
- },
- {
- "name": "Application Launcher",
- "code": 1292,
- "mfgCode": null,
- "define": "APPLICATION_LAUNCHER_CLUSTER",
- "side": "client",
- "enabled": 1,
- "attributes": [
- {
- "name": "FeatureMap",
- "code": 65532,
- "mfgCode": null,
- "side": "client",
- "type": "bitmap32",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "client",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- }
- ],
- "commands": [
- {
- "name": "LaunchApp",
- "code": 0,
- "mfgCode": null,
- "source": "client",
- "incoming": 0,
- "outgoing": 1
- },
- {
- "name": "StopApp",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 0,
- "outgoing": 1
- },
- {
- "name": "HideApp",
- "code": 2,
- "mfgCode": null,
- "source": "client",
- "incoming": 0,
- "outgoing": 1
- }
- ]
- },
- {
- "name": "Application Launcher",
- "code": 1292,
- "mfgCode": null,
- "define": "APPLICATION_LAUNCHER_CLUSTER",
- "side": "server",
- "enabled": 1,
- "attributes": [
- {
- "name": "CatalogList",
- "code": 0,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "CurrentApp",
- "code": 1,
- "mfgCode": null,
- "side": "server",
- "type": "ApplicationEP",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "FeatureMap",
- "code": 65532,
- "mfgCode": null,
- "side": "server",
- "type": "bitmap32",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- }
- ],
- "commands": [
- {
- "name": "LauncherResponse",
- "code": 3,
- "mfgCode": null,
- "source": "server",
- "incoming": 1,
- "outgoing": 0
- }
- ]
- },
- {
- "name": "Audio Output",
- "code": 1291,
- "mfgCode": null,
- "define": "AUDIO_OUTPUT_CLUSTER",
- "side": "client",
- "enabled": 1,
- "attributes": [
- {
- "name": "FeatureMap",
- "code": 65532,
- "mfgCode": null,
- "side": "client",
- "type": "bitmap32",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "client",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- }
- ],
- "commands": [
- {
- "name": "SelectOutput",
- "code": 0,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
- },
- {
- "name": "RenameOutput",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
- }
- ]
- },
- {
- "name": "Audio Output",
- "code": 1291,
- "mfgCode": null,
- "define": "AUDIO_OUTPUT_CLUSTER",
- "side": "server",
- "enabled": 1,
- "attributes": [
- {
- "name": "OutputList",
- "code": 0,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "CurrentOutput",
- "code": 1,
- "mfgCode": null,
- "side": "server",
- "type": "int8u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "FeatureMap",
- "code": 65532,
- "mfgCode": null,
- "side": "server",
- "type": "bitmap32",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- }
- ]
- },
- {
- "name": "Channel",
- "code": 1284,
- "mfgCode": null,
- "define": "CHANNEL_CLUSTER",
- "side": "client",
- "enabled": 1,
- "attributes": [
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "client",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- }
- ],
- "commands": [
- {
- "name": "ChangeChannel",
- "code": 0,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
- },
- {
- "name": "ChangeChannelByNumber",
- "code": 2,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
- },
- {
- "name": "SkipChannel",
- "code": 3,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
- }
- ]
- },
- {
- "name": "Channel",
- "code": 1284,
- "mfgCode": null,
- "define": "CHANNEL_CLUSTER",
- "side": "server",
- "enabled": 1,
- "attributes": [
- {
- "name": "ChannelList",
- "code": 0,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "Lineup",
- "code": 1,
- "mfgCode": null,
- "side": "server",
- "type": "LineupInfo",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "CurrentChannel",
- "code": 2,
- "mfgCode": null,
- "side": "server",
- "type": "ChannelInfo",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "FeatureMap",
- "code": 65532,
- "mfgCode": null,
- "side": "server",
- "type": "bitmap32",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- }
- ],
- "commands": [
- {
- "name": "ChangeChannelResponse",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
- }
- ]
- },
- {
- "name": "Low Power",
- "code": 1288,
- "mfgCode": null,
- "define": "LOW_POWER_CLUSTER",
- "side": "client",
- "enabled": 1,
- "commands": [
- {
- "name": "Sleep",
- "code": 0,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
- }
- ],
- "attributes": [
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "client",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- }
- ]
- },
- {
- "name": "Low Power",
- "code": 1288,
- "mfgCode": null,
- "define": "LOW_POWER_CLUSTER",
- "side": "server",
- "enabled": 0,
- "attributes": [
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "client",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- }
- ]
- },
- {
- "name": "Media Playback",
- "code": 1286,
- "mfgCode": null,
- "define": "MEDIA_PLAYBACK_CLUSTER",
- "side": "client",
- "enabled": 1,
- "commands": [
- {
- "name": "Play",
- "code": 0,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 1
- },
- {
- "name": "Pause",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 1
- },
- {
- "name": "Stop",
- "code": 2,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 1
- },
- {
- "name": "StartOver",
- "code": 3,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 1
- },
- {
- "name": "Previous",
- "code": 4,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 1
- },
- {
- "name": "Next",
- "code": 5,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 1
- },
- {
- "name": "Rewind",
- "code": 6,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 1
- },
- {
- "name": "FastForward",
- "code": 7,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 1
- },
- {
- "name": "SkipForward",
- "code": 8,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 1
- },
- {
- "name": "SkipBackward",
- "code": 9,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 1
- },
- {
- "name": "Seek",
- "code": 11,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 1
- }
- ],
- "attributes": [
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "client",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- }
- ]
- },
- {
- "name": "Media Playback",
- "code": 1286,
- "mfgCode": null,
- "define": "MEDIA_PLAYBACK_CLUSTER",
- "side": "server",
- "enabled": 1,
- "commands": [
- {
- "name": "PlaybackResponse",
- "code": 10,
- "mfgCode": null,
- "source": "server",
- "incoming": 1,
- "outgoing": 1
- }
- ],
- "attributes": [
- {
- "name": "CurrentState",
- "code": 0,
- "mfgCode": null,
- "side": "server",
- "type": "PlaybackStateType",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "StartTime",
- "code": 1,
- "mfgCode": null,
- "side": "server",
- "type": "epoch_us",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "Duration",
- "code": 2,
- "mfgCode": null,
- "side": "server",
- "type": "int64u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "SampledPosition",
- "code": 3,
- "mfgCode": null,
- "side": "server",
- "type": "PlaybackPositionType",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "PlaybackSpeed",
- "code": 4,
- "mfgCode": null,
- "side": "server",
- "type": "SingleType",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "SeekRangeEnd",
- "code": 5,
- "mfgCode": null,
- "side": "server",
- "type": "int64u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "SeekRangeStart",
- "code": 6,
- "mfgCode": null,
- "side": "server",
- "type": "int64u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "FeatureMap",
- "code": 65532,
- "mfgCode": null,
- "side": "server",
- "type": "bitmap32",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- }
- ]
- },
- {
- "name": "Media Input",
- "code": 1287,
- "mfgCode": null,
- "define": "MEDIA_INPUT_CLUSTER",
- "side": "client",
- "enabled": 1,
- "commands": [
- {
- "name": "SelectInput",
- "code": 0,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
- },
- {
- "name": "ShowInputStatus",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
- },
- {
- "name": "HideInputStatus",
- "code": 2,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
- },
- {
- "name": "RenameInput",
- "code": 3,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
- }
- ],
- "attributes": [
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "client",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- }
- ]
- },
- {
- "name": "Media Input",
- "code": 1287,
- "mfgCode": null,
- "define": "MEDIA_INPUT_CLUSTER",
- "side": "server",
- "enabled": 1,
- "attributes": [
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "InputList",
- "code": 0,
- "mfgCode": null,
- "side": "server",
- "type": "InputInfoStruct",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "CurrentInput",
- "code": 1,
- "mfgCode": null,
- "side": "server",
- "type": "int8u",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65534,
- "reportableChange": 0
- }
- ]
}
]
},
@@ -13643,7 +13321,7 @@
"singleton": 0,
"bounded": 0,
"defaultValue": "",
- "reportable": 0,
+ "reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
@@ -13653,13 +13331,13 @@
"code": 6,
"mfgCode": null,
"side": "server",
- "type": "string",
+ "type": "char_string",
"included": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
- "reportable": 0,
+ "reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
@@ -13713,182 +13391,6 @@
"reportableChange": 0
},
{
- "name": "EnhancedCurrentHue",
- "code": 16384,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0x00",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "EnhancedColorMode",
- "code": 16385,
- "mfgCode": null,
- "side": "server",
- "type": "enum8",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0x01",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "ColorLoopActive",
- "code": 16386,
- "mfgCode": null,
- "side": "server",
- "type": "int8u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0x00",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "ColorLoopDirection",
- "code": 16387,
- "mfgCode": null,
- "side": "server",
- "type": "int8u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0x00",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "ColorLoopTime",
- "code": 16388,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0x0019",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "ColorLoopStartEnhancedHue",
- "code": 16389,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0x2300",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "ColorLoopStoredEnhancedHue",
- "code": 16390,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0x00",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "ColorCapabilities",
- "code": 16394,
- "mfgCode": null,
- "side": "server",
- "type": "bitmap16",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0x00",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "ColorTempPhysicalMinMireds",
- "code": 16395,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0x00",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "ColorTempPhysicalMaxMireds",
- "code": 16396,
- "mfgCode": null,
- "side": "server",
- "type": "bitmap8",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0xfeff",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "CoupleColorTempToLevelMinMireds",
- "code": 16397,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "NumberOfPrimaries",
"code": 16,
"mfgCode": null,
@@ -14369,6 +13871,182 @@
"reportableChange": 0
},
{
+ "name": "EnhancedCurrentHue",
+ "code": 16384,
+ "mfgCode": null,
+ "side": "server",
+ "type": "int16u",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "0x00",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "EnhancedColorMode",
+ "code": 16385,
+ "mfgCode": null,
+ "side": "server",
+ "type": "enum8",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "0x01",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "ColorLoopActive",
+ "code": 16386,
+ "mfgCode": null,
+ "side": "server",
+ "type": "int8u",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "0x00",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "ColorLoopDirection",
+ "code": 16387,
+ "mfgCode": null,
+ "side": "server",
+ "type": "int8u",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "0x00",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "ColorLoopTime",
+ "code": 16388,
+ "mfgCode": null,
+ "side": "server",
+ "type": "int16u",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "0x0019",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "ColorLoopStartEnhancedHue",
+ "code": 16389,
+ "mfgCode": null,
+ "side": "server",
+ "type": "int16u",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "0x2300",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "ColorLoopStoredEnhancedHue",
+ "code": 16390,
+ "mfgCode": null,
+ "side": "server",
+ "type": "int16u",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "0x00",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "ColorCapabilities",
+ "code": 16394,
+ "mfgCode": null,
+ "side": "server",
+ "type": "bitmap16",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "0x00",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "ColorTempPhysicalMinMireds",
+ "code": 16395,
+ "mfgCode": null,
+ "side": "server",
+ "type": "int16u",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "0x00",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "ColorTempPhysicalMaxMireds",
+ "code": 16396,
+ "mfgCode": null,
+ "side": "server",
+ "type": "int16u",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "0xfeff",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "CoupleColorTempToLevelMinMireds",
+ "code": 16397,
+ "mfgCode": null,
+ "side": "server",
+ "type": "int16u",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
"name": "StartUpColorTemperatureMireds",
"code": 16400,
"mfgCode": null,
diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter
index 3043fa3..c358c03 100644
--- a/examples/placeholder/linux/apps/app2/config.matter
+++ b/examples/placeholder/linux/apps/app2/config.matter
@@ -1627,14 +1627,14 @@
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 @@
kMACCounts = 0x8;
}
- struct NeighborTable {
+ struct NeighborTableStruct {
int64u extAddress = 0;
int32u age = 1;
int16u rloc16 = 2;
@@ -1683,7 +1683,7 @@
boolean channelMaskPresent = 11;
}
- struct RouteTable {
+ struct RouteTableStruct {
int64u extAddress = 0;
int16u rloc16 = 1;
int8u routerId = 2;
@@ -1706,19 +1706,19 @@
}
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 @@
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 @@
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 @@
kMACCounts = 0x8;
}
- struct NeighborTable {
+ struct NeighborTableStruct {
int64u extAddress = 0;
int32u age = 1;
int16u rloc16 = 2;
@@ -1847,7 +1847,7 @@
boolean channelMaskPresent = 11;
}
- struct RouteTable {
+ struct RouteTableStruct {
int64u extAddress = 0;
int16u rloc16 = 1;
int8u routerId = 2;
@@ -1870,19 +1870,19 @@
}
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 @@
readonly attribute nullable SecurityPolicy securityPolicy = 59;
readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
- readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
+ readonly attribute NetworkFaultEnum activeNetworkFaultsList[] = 62;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
diff --git a/examples/placeholder/linux/apps/app2/config.zap b/examples/placeholder/linux/apps/app2/config.zap
index 843b768..fdb2a16 100644
--- a/examples/placeholder/linux/apps/app2/config.zap
+++ b/examples/placeholder/linux/apps/app2/config.zap
@@ -2889,22 +2889,6 @@
"enabled": 1,
"attributes": [
{
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "Channel",
"code": 0,
"mfgCode": null,
@@ -2941,9 +2925,9 @@
"code": 2,
"mfgCode": null,
"side": "server",
- "type": "String",
+ "type": "char_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3021,7 +3005,7 @@
"code": 7,
"mfgCode": null,
"side": "server",
- "type": "NeighborTableStruct",
+ "type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -3037,7 +3021,7 @@
"code": 8,
"mfgCode": null,
"side": "server",
- "type": "RouteTableStruct",
+ "type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -3149,7 +3133,7 @@
"code": 15,
"mfgCode": null,
"side": "server",
- "type": "int8u",
+ "type": "int16u",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -3165,7 +3149,7 @@
"code": 16,
"mfgCode": null,
"side": "server",
- "type": "int8u",
+ "type": "int16u",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -3181,7 +3165,7 @@
"code": 17,
"mfgCode": null,
"side": "server",
- "type": "int8u",
+ "type": "int16u",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -3897,7 +3881,7 @@
"reportableChange": 0
},
{
- "name": "ActiveNetworkFaults",
+ "name": "ActiveNetworkFaultsList",
"code": 62,
"mfgCode": null,
"side": "server",
@@ -3911,6 +3895,22 @@
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
+ },
+ {
+ "name": "ClusterRevision",
+ "code": 65533,
+ "mfgCode": null,
+ "side": "server",
+ "type": "int16u",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "1",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
}
]
},
@@ -4480,22 +4480,6 @@
"enabled": 1,
"attributes": [
{
- "name": "DataModelRevision",
- "code": 0,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "External",
- "singleton": 1,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
"name": "VendorName",
"code": 1,
"mfgCode": null,
@@ -4544,22 +4528,6 @@
"reportableChange": 0
},
{
- "name": "ProductID",
- "code": 4,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "External",
- "singleton": 1,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
"name": "NodeLabel",
"code": 5,
"mfgCode": null,
@@ -4576,22 +4544,6 @@
"reportableChange": 0
},
{
- "name": "Location",
- "code": 6,
- "mfgCode": null,
- "side": "server",
- "type": "char_string",
- "included": 1,
- "storageOption": "External",
- "singleton": 1,
- "bounded": 0,
- "defaultValue": "XX",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
"name": "HardwareVersion",
"code": 7,
"mfgCode": null,
@@ -4736,22 +4688,6 @@
"reportableChange": 0
},
{
- "name": "LocalConfigDisabled",
- "code": 16,
- "mfgCode": null,
- "side": "server",
- "type": "boolean",
- "included": 1,
- "storageOption": "NVM",
- "singleton": 1,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
"name": "Reachable",
"code": 17,
"mfgCode": null,
@@ -4784,22 +4720,6 @@
"reportableChange": 0
},
{
- "name": "CapabilityMinima",
- "code": 19,
- "mfgCode": null,
- "side": "server",
- "type": "CapabilityMinimaStruct",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "ProductAppearance",
"code": 20,
"mfgCode": null,
@@ -5841,7 +5761,7 @@
"enabled": 1,
"commands": [
{
- "name": "Lock Door",
+ "name": "LockDoor",
"code": 0,
"mfgCode": null,
"source": "client",
@@ -5849,7 +5769,7 @@
"outgoing": 0
},
{
- "name": "Unlock Door",
+ "name": "UnlockDoor",
"code": 1,
"mfgCode": null,
"source": "client",
@@ -5857,15 +5777,7 @@
"outgoing": 0
},
{
- "name": "Toggle",
- "code": 2,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
- },
- {
- "name": "Unlock with Timeout",
+ "name": "UnlockWithTimeout",
"code": 3,
"mfgCode": null,
"source": "client",
@@ -5901,27 +5813,11 @@
"enabled": 1,
"attributes": [
{
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "6",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "LockState",
"code": 0,
"mfgCode": null,
"side": "server",
- "type": "enum8",
+ "type": "DlLockState",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -5937,7 +5833,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "enum8",
+ "type": "DlLockType",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -5969,7 +5865,7 @@
"code": 3,
"mfgCode": null,
"side": "server",
- "type": "enum8",
+ "type": "DoorStateEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -6029,22 +5925,6 @@
"reportableChange": 0
},
{
- "name": "NumberOfLogRecordsSupported",
- "code": 16,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
"name": "NumberOfTotalUsersSupported",
"code": 17,
"mfgCode": null,
@@ -6209,7 +6089,7 @@
"code": 27,
"mfgCode": null,
"side": "server",
- "type": "bitmap8",
+ "type": "DlCredentialRuleMask",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -6237,27 +6117,11 @@
"reportableChange": 0
},
{
- "name": "EnableLogging",
- "code": 32,
- "mfgCode": null,
- "side": "server",
- "type": "boolean",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "Language",
"code": 33,
"mfgCode": null,
"side": "server",
- "type": "String",
+ "type": "char_string",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -6267,8 +6131,8 @@
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
- }
- ,{
+ },
+ {
"name": "LEDSettings",
"code": 34,
"mfgCode": null,
@@ -6321,7 +6185,7 @@
"code": 37,
"mfgCode": null,
"side": "server",
- "type": "enum8",
+ "type": "OperatingModeEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -6337,7 +6201,7 @@
"code": 38,
"mfgCode": null,
"side": "server",
- "type": "bitmap16",
+ "type": "DlSupportedOperatingModes",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -6353,7 +6217,7 @@
"code": 39,
"mfgCode": null,
"side": "server",
- "type": "bitmap16",
+ "type": "DlDefaultConfigurationRegister",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -6433,7 +6297,7 @@
"code": 44,
"mfgCode": null,
"side": "server",
- "type": "bitmap8",
+ "type": "DlLocalProgrammingFeatures",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -6509,22 +6373,6 @@
"reportableChange": 0
},
{
- "name": "SecurityLevel",
- "code": 52,
- "mfgCode": null,
- "side": "server",
- "type": "enum8",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
"name": "ExpiringUserTimeout",
"code": 53,
"mfgCode": null,
@@ -6541,135 +6389,23 @@
"reportableChange": 0
},
{
- "name": "AlarmMask",
- "code": 64,
+ "name": "ClusterRevision",
+ "code": 65533,
"mfgCode": null,
"side": "server",
- "type": "bitmap16",
+ "type": "int16u",
"included": 1,
- "storageOption": "External",
+ "storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "0xFFFF",
+ "defaultValue": "6",
"reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "KeypadOperationEventMask",
- "code": 65,
- "mfgCode": null,
- "side": "server",
- "type": "bitmap16",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0xFFFF",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "RemoteOperationEventMask",
- "code": 66,
- "mfgCode": null,
- "side": "server",
- "type": "bitmap16",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0xFFFF",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "ManualOperationEventMask",
- "code": 67,
- "mfgCode": null,
- "side": "server",
- "type": "bitmap16",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0xFFFF",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "RFIDOperationEventMask",
- "code": 68,
- "mfgCode": null,
- "side": "server",
- "type": "bitmap16",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0xFFFF",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "KeypadProgrammingEventMask",
- "code": 69,
- "mfgCode": null,
- "side": "server",
- "type": "bitmap16",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0xFFFF",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "RemoteProgrammingEventMask",
- "code": 70,
- "mfgCode": null,
- "side": "server",
- "type": "bitmap16",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0xFFFF",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "RFIDProgrammingEventMask",
- "code": 71,
- "mfgCode": null,
- "side": "server",
- "type": "bitmap16",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0xFFFF",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
+ "minInterval": 1,
+ "maxInterval": 65534,
"reportableChange": 0
}
]
- },
+ },
{
"name": "Window Covering",
"code": 258,
@@ -7487,22 +7223,6 @@
"reportableChange": 0
},
{
- "name": "AlarmMask",
- "code": 34,
- "mfgCode": null,
- "side": "server",
- "type": "bitmap16",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0x00",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
@@ -7575,14 +7295,6 @@
"source": "client",
"incoming": 0,
"outgoing": 1
- },
- {
- "name": "GetRelayStatusLog",
- "code": 4,
- "mfgCode": null,
- "source": "client",
- "incoming": 0,
- "outgoing": 1
}
],
"attributes": [
@@ -7619,14 +7331,6 @@
"source": "server",
"incoming": 1,
"outgoing": 0
- },
- {
- "name": "GetRelayStatusLogResponse",
- "code": 1,
- "mfgCode": null,
- "source": "server",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -7999,22 +7703,6 @@
"reportableChange": 0
},
{
- "name": "AlarmMask",
- "code": 29,
- "mfgCode": null,
- "side": "server",
- "type": "bitmap8",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0x00",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
"name": "ThermostatRunningMode",
"code": 30,
"mfgCode": null,
@@ -8179,7 +7867,7 @@
"code": 50,
"mfgCode": null,
"side": "server",
- "type": "utc",
+ "type": "epoch_s",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -8377,7 +8065,7 @@
"singleton": 1,
"bounded": 0,
"defaultValue": "0",
- "reportable": 0,
+ "reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
@@ -8415,7 +8103,7 @@
"reportableChange": 0
},
{
- "name": "ACCapacityFormat",
+ "name": "ACCapacityformat",
"code": 71,
"mfgCode": null,
"side": "server",
@@ -9465,6 +9153,148 @@
]
},
{
+ "name": "Channel",
+ "code": 1284,
+ "mfgCode": null,
+ "define": "CHANNEL_CLUSTER",
+ "side": "client",
+ "enabled": 1,
+ "commands": [
+ {
+ "name": "ChangeChannel",
+ "code": 0,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 0
+ },
+ {
+ "name": "ChangeChannelByNumber",
+ "code": 2,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 0
+ },
+ {
+ "name": "SkipChannel",
+ "code": 3,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 0
+ }
+ ],
+ "attributes": [
+ {
+ "name": "ClusterRevision",
+ "code": 65533,
+ "mfgCode": null,
+ "side": "client",
+ "type": "int16u",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "1",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65344,
+ "reportableChange": 0
+ }
+ ]
+ },
+ {
+ "name": "Channel",
+ "code": 1284,
+ "mfgCode": null,
+ "define": "CHANNEL_CLUSTER",
+ "side": "server",
+ "enabled": 1,
+ "attributes": [
+ {
+ "name": "ChannelList",
+ "code": 0,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65344,
+ "reportableChange": 0
+ },
+ {
+ "name": "Lineup",
+ "code": 1,
+ "mfgCode": null,
+ "side": "server",
+ "type": "LineupInfoStruct",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65344,
+ "reportableChange": 0
+ },
+ {
+ "name": "CurrentChannel",
+ "code": 2,
+ "mfgCode": null,
+ "side": "server",
+ "type": "ChannelInfoStruct",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65344,
+ "reportableChange": 0
+ },
+ {
+ "name": "FeatureMap",
+ "code": 65532,
+ "mfgCode": null,
+ "side": "server",
+ "type": "bitmap32",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "0",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "ClusterRevision",
+ "code": 65533,
+ "mfgCode": null,
+ "side": "server",
+ "type": "int16u",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "1",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65344,
+ "reportableChange": 0
+ }
+ ]
+ },
+ {
"name": "Target Navigator",
"code": 1285,
"mfgCode": null,
@@ -9633,6 +9463,466 @@
]
},
{
+ "name": "Media Playback",
+ "code": 1286,
+ "mfgCode": null,
+ "define": "MEDIA_PLAYBACK_CLUSTER",
+ "side": "client",
+ "enabled": 1,
+ "commands": [
+ {
+ "name": "Play",
+ "code": 0,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 1
+ },
+ {
+ "name": "Pause",
+ "code": 1,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 1
+ },
+ {
+ "name": "Stop",
+ "code": 2,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 1
+ },
+ {
+ "name": "StartOver",
+ "code": 3,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 1
+ },
+ {
+ "name": "Previous",
+ "code": 4,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 1
+ },
+ {
+ "name": "Next",
+ "code": 5,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 1
+ },
+ {
+ "name": "Rewind",
+ "code": 6,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 1
+ },
+ {
+ "name": "FastForward",
+ "code": 7,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 1
+ },
+ {
+ "name": "SkipForward",
+ "code": 8,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 1
+ },
+ {
+ "name": "SkipBackward",
+ "code": 9,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 1
+ },
+ {
+ "name": "Seek",
+ "code": 11,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 1
+ }
+ ],
+ "attributes": [
+ {
+ "name": "ClusterRevision",
+ "code": 65533,
+ "mfgCode": null,
+ "side": "client",
+ "type": "int16u",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "1",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65344,
+ "reportableChange": 0
+ }
+ ]
+ },
+ {
+ "name": "Media Playback",
+ "code": 1286,
+ "mfgCode": null,
+ "define": "MEDIA_PLAYBACK_CLUSTER",
+ "side": "server",
+ "enabled": 1,
+ "commands": [
+ {
+ "name": "PlaybackResponse",
+ "code": 10,
+ "mfgCode": null,
+ "source": "server",
+ "incoming": 1,
+ "outgoing": 1
+ }
+ ],
+ "attributes": [
+ {
+ "name": "CurrentState",
+ "code": 0,
+ "mfgCode": null,
+ "side": "server",
+ "type": "PlaybackStateEnum",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "StartTime",
+ "code": 1,
+ "mfgCode": null,
+ "side": "server",
+ "type": "epoch_us",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "Duration",
+ "code": 2,
+ "mfgCode": null,
+ "side": "server",
+ "type": "int64u",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "SampledPosition",
+ "code": 3,
+ "mfgCode": null,
+ "side": "server",
+ "type": "PlaybackPositionStruct",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "PlaybackSpeed",
+ "code": 4,
+ "mfgCode": null,
+ "side": "server",
+ "type": "single",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "1",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "SeekRangeEnd",
+ "code": 5,
+ "mfgCode": null,
+ "side": "server",
+ "type": "int64u",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "SeekRangeStart",
+ "code": 6,
+ "mfgCode": null,
+ "side": "server",
+ "type": "int64u",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "1",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "FeatureMap",
+ "code": 65532,
+ "mfgCode": null,
+ "side": "server",
+ "type": "bitmap32",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "0",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "ClusterRevision",
+ "code": 65533,
+ "mfgCode": null,
+ "side": "server",
+ "type": "int16u",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "1",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ }
+ ]
+ },
+ {
+ "name": "Media Input",
+ "code": 1287,
+ "mfgCode": null,
+ "define": "MEDIA_INPUT_CLUSTER",
+ "side": "client",
+ "enabled": 1,
+ "commands": [
+ {
+ "name": "SelectInput",
+ "code": 0,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 0
+ },
+ {
+ "name": "ShowInputStatus",
+ "code": 1,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 0
+ },
+ {
+ "name": "HideInputStatus",
+ "code": 2,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 0
+ },
+ {
+ "name": "RenameInput",
+ "code": 3,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 0
+ }
+ ],
+ "attributes": [
+ {
+ "name": "ClusterRevision",
+ "code": 65533,
+ "mfgCode": null,
+ "side": "client",
+ "type": "int16u",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "1",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ }
+ ]
+ },
+ {
+ "name": "Media Input",
+ "code": 1287,
+ "mfgCode": null,
+ "define": "MEDIA_INPUT_CLUSTER",
+ "side": "server",
+ "enabled": 1,
+ "attributes": [
+ {
+ "name": "InputList",
+ "code": 0,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "CurrentInput",
+ "code": 1,
+ "mfgCode": null,
+ "side": "server",
+ "type": "int8u",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "ClusterRevision",
+ "code": 65533,
+ "mfgCode": null,
+ "side": "server",
+ "type": "int16u",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "1",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ }
+ ]
+ },
+ {
+ "name": "Low Power",
+ "code": 1288,
+ "mfgCode": null,
+ "define": "LOW_POWER_CLUSTER",
+ "side": "client",
+ "enabled": 1,
+ "commands": [
+ {
+ "name": "Sleep",
+ "code": 0,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 0
+ }
+ ],
+ "attributes": [
+ {
+ "name": "ClusterRevision",
+ "code": 65533,
+ "mfgCode": null,
+ "side": "client",
+ "type": "int16u",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "1",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ }
+ ]
+ },
+ {
+ "name": "Low Power",
+ "code": 1288,
+ "mfgCode": null,
+ "define": "LOW_POWER_CLUSTER",
+ "side": "server",
+ "enabled": 0,
+ "attributes": [
+ {
+ "name": "ClusterRevision",
+ "code": 65533,
+ "mfgCode": null,
+ "side": "server",
+ "type": "int16u",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "1",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ }
+ ]
+ },
+ {
"name": "Keypad Input",
"code": 1289,
"mfgCode": null,
@@ -9945,6 +10235,292 @@
]
},
{
+ "name": "Audio Output",
+ "code": 1291,
+ "mfgCode": null,
+ "define": "AUDIO_OUTPUT_CLUSTER",
+ "side": "client",
+ "enabled": 1,
+ "commands": [
+ {
+ "name": "SelectOutput",
+ "code": 0,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 0
+ },
+ {
+ "name": "RenameOutput",
+ "code": 1,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 0
+ }
+ ],
+ "attributes": [
+ {
+ "name": "FeatureMap",
+ "code": 65532,
+ "mfgCode": null,
+ "side": "client",
+ "type": "bitmap32",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "0",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "ClusterRevision",
+ "code": 65533,
+ "mfgCode": null,
+ "side": "client",
+ "type": "int16u",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "1",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65344,
+ "reportableChange": 0
+ }
+ ]
+ },
+ {
+ "name": "Audio Output",
+ "code": 1291,
+ "mfgCode": null,
+ "define": "AUDIO_OUTPUT_CLUSTER",
+ "side": "server",
+ "enabled": 1,
+ "attributes": [
+ {
+ "name": "OutputList",
+ "code": 0,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65344,
+ "reportableChange": 0
+ },
+ {
+ "name": "CurrentOutput",
+ "code": 1,
+ "mfgCode": null,
+ "side": "server",
+ "type": "int8u",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65344,
+ "reportableChange": 0
+ },
+ {
+ "name": "FeatureMap",
+ "code": 65532,
+ "mfgCode": null,
+ "side": "server",
+ "type": "bitmap32",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "0",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "ClusterRevision",
+ "code": 65533,
+ "mfgCode": null,
+ "side": "server",
+ "type": "int16u",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "1",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65344,
+ "reportableChange": 0
+ }
+ ]
+ },
+ {
+ "name": "Application Launcher",
+ "code": 1292,
+ "mfgCode": null,
+ "define": "APPLICATION_LAUNCHER_CLUSTER",
+ "side": "client",
+ "enabled": 1,
+ "commands": [
+ {
+ "name": "LaunchApp",
+ "code": 0,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 0,
+ "outgoing": 1
+ },
+ {
+ "name": "StopApp",
+ "code": 1,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 0,
+ "outgoing": 1
+ },
+ {
+ "name": "HideApp",
+ "code": 2,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 0,
+ "outgoing": 1
+ }
+ ],
+ "attributes": [
+ {
+ "name": "FeatureMap",
+ "code": 65532,
+ "mfgCode": null,
+ "side": "client",
+ "type": "bitmap32",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "0",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "ClusterRevision",
+ "code": 65533,
+ "mfgCode": null,
+ "side": "client",
+ "type": "int16u",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "1",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65344,
+ "reportableChange": 0
+ }
+ ]
+ },
+ {
+ "name": "Application Launcher",
+ "code": 1292,
+ "mfgCode": null,
+ "define": "APPLICATION_LAUNCHER_CLUSTER",
+ "side": "server",
+ "enabled": 1,
+ "commands": [
+ {
+ "name": "LauncherResponse",
+ "code": 3,
+ "mfgCode": null,
+ "source": "server",
+ "incoming": 1,
+ "outgoing": 0
+ }
+ ],
+ "attributes": [
+ {
+ "name": "CatalogList",
+ "code": 0,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65344,
+ "reportableChange": 0
+ },
+ {
+ "name": "CurrentApp",
+ "code": 1,
+ "mfgCode": null,
+ "side": "server",
+ "type": "ApplicationEPStruct",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65344,
+ "reportableChange": 0
+ },
+ {
+ "name": "FeatureMap",
+ "code": 65532,
+ "mfgCode": null,
+ "side": "server",
+ "type": "bitmap32",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "0",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "ClusterRevision",
+ "code": 65533,
+ "mfgCode": null,
+ "side": "server",
+ "type": "int16u",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "1",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65344,
+ "reportableChange": 0
+ }
+ ]
+ },
+ {
"name": "Application Basic",
"code": 1293,
"mfgCode": null,
@@ -10275,904 +10851,6 @@
"reportableChange": 0
}
]
- },
- {
- "name": "Application Launcher",
- "code": 1292,
- "mfgCode": null,
- "define": "APPLICATION_LAUNCHER_CLUSTER",
- "side": "client",
- "enabled": 1,
- "attributes": [
- {
- "name": "FeatureMap",
- "code": 65532,
- "mfgCode": null,
- "side": "client",
- "type": "bitmap32",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "client",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- }
- ],
- "commands": [
- {
- "name": "LaunchApp",
- "code": 0,
- "mfgCode": null,
- "source": "client",
- "incoming": 0,
- "outgoing": 1
- },
- {
- "name": "StopApp",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 0,
- "outgoing": 1
- },
- {
- "name": "HideApp",
- "code": 2,
- "mfgCode": null,
- "source": "client",
- "incoming": 0,
- "outgoing": 1
- }
- ]
- },
- {
- "name": "Application Launcher",
- "code": 1292,
- "mfgCode": null,
- "define": "APPLICATION_LAUNCHER_CLUSTER",
- "side": "server",
- "enabled": 1,
- "attributes": [
- {
- "name": "CatalogList",
- "code": 0,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "CurrentApp",
- "code": 1,
- "mfgCode": null,
- "side": "server",
- "type": "ApplicationEP",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "FeatureMap",
- "code": 65532,
- "mfgCode": null,
- "side": "server",
- "type": "bitmap32",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- }
- ],
- "commands": [
- {
- "name": "LauncherResponse",
- "code": 3,
- "mfgCode": null,
- "source": "server",
- "incoming": 1,
- "outgoing": 0
- }
- ]
- },
- {
- "name": "Audio Output",
- "code": 1291,
- "mfgCode": null,
- "define": "AUDIO_OUTPUT_CLUSTER",
- "side": "client",
- "enabled": 1,
- "attributes": [
- {
- "name": "FeatureMap",
- "code": 65532,
- "mfgCode": null,
- "side": "client",
- "type": "bitmap32",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "client",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- }
- ],
- "commands": [
- {
- "name": "SelectOutput",
- "code": 0,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
- },
- {
- "name": "RenameOutput",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
- }
- ]
- },
- {
- "name": "Audio Output",
- "code": 1291,
- "mfgCode": null,
- "define": "AUDIO_OUTPUT_CLUSTER",
- "side": "server",
- "enabled": 1,
- "attributes": [
- {
- "name": "OutputList",
- "code": 0,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "CurrentOutput",
- "code": 1,
- "mfgCode": null,
- "side": "server",
- "type": "int8u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "FeatureMap",
- "code": 65532,
- "mfgCode": null,
- "side": "server",
- "type": "bitmap32",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- }
- ]
- },
- {
- "name": "Channel",
- "code": 1284,
- "mfgCode": null,
- "define": "CHANNEL_CLUSTER",
- "side": "client",
- "enabled": 1,
- "attributes": [
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "client",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- }
- ],
- "commands": [
- {
- "name": "ChangeChannel",
- "code": 0,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
- },
- {
- "name": "ChangeChannelByNumber",
- "code": 2,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
- },
- {
- "name": "SkipChannel",
- "code": 3,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
- }
- ]
- },
- {
- "name": "Channel",
- "code": 1284,
- "mfgCode": null,
- "define": "CHANNEL_CLUSTER",
- "side": "server",
- "enabled": 1,
- "attributes": [
- {
- "name": "ChannelList",
- "code": 0,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "Lineup",
- "code": 1,
- "mfgCode": null,
- "side": "server",
- "type": "LineupInfo",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "CurrentChannel",
- "code": 2,
- "mfgCode": null,
- "side": "server",
- "type": "ChannelInfo",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "FeatureMap",
- "code": 65532,
- "mfgCode": null,
- "side": "server",
- "type": "bitmap32",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- }
- ],
- "commands": [
- {
- "name": "ChangeChannelResponse",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
- }
- ]
- },
- {
- "name": "Low Power",
- "code": 1288,
- "mfgCode": null,
- "define": "LOW_POWER_CLUSTER",
- "side": "client",
- "enabled": 1,
- "commands": [
- {
- "name": "Sleep",
- "code": 0,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
- }
- ],
- "attributes": [
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "client",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- }
- ]
- },
- {
- "name": "Low Power",
- "code": 1288,
- "mfgCode": null,
- "define": "LOW_POWER_CLUSTER",
- "side": "server",
- "enabled": 0,
- "attributes": [
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "client",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- }
- ]
- },
- {
- "name": "Media Playback",
- "code": 1286,
- "mfgCode": null,
- "define": "MEDIA_PLAYBACK_CLUSTER",
- "side": "client",
- "enabled": 1,
- "commands": [
- {
- "name": "Play",
- "code": 0,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 1
- },
- {
- "name": "Pause",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 1
- },
- {
- "name": "Stop",
- "code": 2,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 1
- },
- {
- "name": "StartOver",
- "code": 3,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 1
- },
- {
- "name": "Previous",
- "code": 4,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 1
- },
- {
- "name": "Next",
- "code": 5,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 1
- },
- {
- "name": "Rewind",
- "code": 6,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 1
- },
- {
- "name": "FastForward",
- "code": 7,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 1
- },
- {
- "name": "SkipForward",
- "code": 8,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 1
- },
- {
- "name": "SkipBackward",
- "code": 9,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 1
- },
- {
- "name": "Seek",
- "code": 11,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 1
- }
- ],
- "attributes": [
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "client",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- }
- ]
- },
- {
- "name": "Media Playback",
- "code": 1286,
- "mfgCode": null,
- "define": "MEDIA_PLAYBACK_CLUSTER",
- "side": "server",
- "enabled": 1,
- "commands": [
- {
- "name": "PlaybackResponse",
- "code": 10,
- "mfgCode": null,
- "source": "server",
- "incoming": 1,
- "outgoing": 1
- }
- ],
- "attributes": [
- {
- "name": "CurrentState",
- "code": 0,
- "mfgCode": null,
- "side": "server",
- "type": "PlaybackStateType",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "StartTime",
- "code": 1,
- "mfgCode": null,
- "side": "server",
- "type": "epoch_us",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "Duration",
- "code": 2,
- "mfgCode": null,
- "side": "server",
- "type": "int64u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "SampledPosition",
- "code": 3,
- "mfgCode": null,
- "side": "server",
- "type": "PlaybackPositionType",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "PlaybackSpeed",
- "code": 4,
- "mfgCode": null,
- "side": "server",
- "type": "SingleType",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "SeekRangeEnd",
- "code": 5,
- "mfgCode": null,
- "side": "server",
- "type": "int64u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "SeekRangeStart",
- "code": 6,
- "mfgCode": null,
- "side": "server",
- "type": "int64u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "FeatureMap",
- "code": 65532,
- "mfgCode": null,
- "side": "server",
- "type": "bitmap32",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- }
- ]
- },
- {
- "name": "Media Input",
- "code": 1287,
- "mfgCode": null,
- "define": "MEDIA_INPUT_CLUSTER",
- "side": "client",
- "enabled": 1,
- "commands": [
- {
- "name": "SelectInput",
- "code": 0,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
- },
- {
- "name": "ShowInputStatus",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
- },
- {
- "name": "HideInputStatus",
- "code": 2,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
- },
- {
- "name": "RenameInput",
- "code": 3,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
- }
- ],
- "attributes": [
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "client",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- }
- ]
- },
- {
- "name": "Media Input",
- "code": 1287,
- "mfgCode": null,
- "define": "MEDIA_INPUT_CLUSTER",
- "side": "server",
- "enabled": 1,
- "attributes": [
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "InputList",
- "code": 0,
- "mfgCode": null,
- "side": "server",
- "type": "InputInfoStruct",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "CurrentInput",
- "code": 1,
- "mfgCode": null,
- "side": "server",
- "type": "int8u",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65534,
- "reportableChange": 0
- }
- ]
}
]
},
@@ -13643,7 +13321,7 @@
"singleton": 0,
"bounded": 0,
"defaultValue": "",
- "reportable": 0,
+ "reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
@@ -13653,13 +13331,13 @@
"code": 6,
"mfgCode": null,
"side": "server",
- "type": "string",
+ "type": "char_string",
"included": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
- "reportable": 0,
+ "reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
@@ -13713,182 +13391,6 @@
"reportableChange": 0
},
{
- "name": "EnhancedCurrentHue",
- "code": 16384,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0x00",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "EnhancedColorMode",
- "code": 16385,
- "mfgCode": null,
- "side": "server",
- "type": "enum8",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0x01",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "ColorLoopActive",
- "code": 16386,
- "mfgCode": null,
- "side": "server",
- "type": "int8u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0x00",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "ColorLoopDirection",
- "code": 16387,
- "mfgCode": null,
- "side": "server",
- "type": "int8u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0x00",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "ColorLoopTime",
- "code": 16388,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0x0019",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "ColorLoopStartEnhancedHue",
- "code": 16389,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0x2300",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "ColorLoopStoredEnhancedHue",
- "code": 16390,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0x00",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "ColorCapabilities",
- "code": 16394,
- "mfgCode": null,
- "side": "server",
- "type": "bitmap16",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0x00",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "ColorTempPhysicalMinMireds",
- "code": 16395,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0x00",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "ColorTempPhysicalMaxMireds",
- "code": 16396,
- "mfgCode": null,
- "side": "server",
- "type": "bitmap8",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0xfeff",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "CoupleColorTempToLevelMinMireds",
- "code": 16397,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "NumberOfPrimaries",
"code": 16,
"mfgCode": null,
@@ -14369,6 +13871,182 @@
"reportableChange": 0
},
{
+ "name": "EnhancedCurrentHue",
+ "code": 16384,
+ "mfgCode": null,
+ "side": "server",
+ "type": "int16u",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "0x00",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "EnhancedColorMode",
+ "code": 16385,
+ "mfgCode": null,
+ "side": "server",
+ "type": "enum8",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "0x01",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "ColorLoopActive",
+ "code": 16386,
+ "mfgCode": null,
+ "side": "server",
+ "type": "int8u",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "0x00",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "ColorLoopDirection",
+ "code": 16387,
+ "mfgCode": null,
+ "side": "server",
+ "type": "int8u",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "0x00",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "ColorLoopTime",
+ "code": 16388,
+ "mfgCode": null,
+ "side": "server",
+ "type": "int16u",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "0x0019",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "ColorLoopStartEnhancedHue",
+ "code": 16389,
+ "mfgCode": null,
+ "side": "server",
+ "type": "int16u",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "0x2300",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "ColorLoopStoredEnhancedHue",
+ "code": 16390,
+ "mfgCode": null,
+ "side": "server",
+ "type": "int16u",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "0x00",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "ColorCapabilities",
+ "code": 16394,
+ "mfgCode": null,
+ "side": "server",
+ "type": "bitmap16",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "0x00",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "ColorTempPhysicalMinMireds",
+ "code": 16395,
+ "mfgCode": null,
+ "side": "server",
+ "type": "int16u",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "0x00",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "ColorTempPhysicalMaxMireds",
+ "code": 16396,
+ "mfgCode": null,
+ "side": "server",
+ "type": "int16u",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "0xfeff",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "CoupleColorTempToLevelMinMireds",
+ "code": 16397,
+ "mfgCode": null,
+ "side": "server",
+ "type": "int16u",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
"name": "StartUpColorTemperatureMireds",
"code": 16400,
"mfgCode": null,
diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter
index c1791c3..587ae24 100644
--- a/examples/pump-app/pump-common/pump-app.matter
+++ b/examples/pump-app/pump-common/pump-app.matter
@@ -844,14 +844,14 @@
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 @@
kMACCounts = 0x8;
}
- struct NeighborTable {
+ struct NeighborTableStruct {
int64u extAddress = 0;
int32u age = 1;
int16u rloc16 = 2;
@@ -900,7 +900,7 @@
boolean channelMaskPresent = 11;
}
- struct RouteTable {
+ struct RouteTableStruct {
int64u extAddress = 0;
int16u rloc16 = 1;
int8u routerId = 2;
@@ -923,18 +923,18 @@
}
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 @@
readonly attribute nullable SecurityPolicy securityPolicy = 59;
readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
- readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
+ readonly attribute NetworkFaultEnum activeNetworkFaultsList[] = 62;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
diff --git a/examples/pump-app/pump-common/pump-app.zap b/examples/pump-app/pump-common/pump-app.zap
index de1eb19..535179b 100644
--- a/examples/pump-app/pump-common/pump-app.zap
+++ b/examples/pump-app/pump-common/pump-app.zap
@@ -3588,7 +3588,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "RoutingRole",
+ "type": "RoutingRoleEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter
index a5f22c5..a93cfc4 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 @@
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 @@
kMACCounts = 0x8;
}
- struct NeighborTable {
+ struct NeighborTableStruct {
int64u extAddress = 0;
int32u age = 1;
int16u rloc16 = 2;
@@ -825,7 +825,7 @@
boolean channelMaskPresent = 11;
}
- struct RouteTable {
+ struct RouteTableStruct {
int64u extAddress = 0;
int16u rloc16 = 1;
int8u routerId = 2;
@@ -848,18 +848,18 @@
}
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 @@
readonly attribute nullable SecurityPolicy securityPolicy = 59;
readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
- readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
+ readonly attribute NetworkFaultEnum activeNetworkFaultsList[] = 62;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap b/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap
index 2c49307..d743025 100644
--- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap
+++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap
@@ -3536,7 +3536,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "RoutingRole",
+ "type": "RoutingRoleEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter
index e8dd4cb..dc19d42 100644
--- a/examples/thermostat/thermostat-common/thermostat.matter
+++ b/examples/thermostat/thermostat-common/thermostat.matter
@@ -1100,14 +1100,14 @@
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 @@
kMACCounts = 0x8;
}
- struct NeighborTable {
+ struct NeighborTableStruct {
int64u extAddress = 0;
int32u age = 1;
int16u rloc16 = 2;
@@ -1156,7 +1156,7 @@
boolean channelMaskPresent = 11;
}
- struct RouteTable {
+ struct RouteTableStruct {
int64u extAddress = 0;
int16u rloc16 = 1;
int8u routerId = 2;
@@ -1179,19 +1179,19 @@
}
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 @@
readonly attribute nullable SecurityPolicy securityPolicy = 59;
readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
- readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
+ readonly attribute NetworkFaultEnum activeNetworkFaultsList[] = 62;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap
index 38a4366..8d7be4e 100644
--- a/examples/thermostat/thermostat-common/thermostat.zap
+++ b/examples/thermostat/thermostat-common/thermostat.zap
@@ -3090,7 +3090,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "RoutingRole",
+ "type": "RoutingRoleEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter
index fba612d..ec510c2 100644
--- a/examples/tv-app/tv-common/tv-app.matter
+++ b/examples/tv-app/tv-common/tv-app.matter
@@ -1126,14 +1126,14 @@
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 @@
kMACCounts = 0x8;
}
- struct NeighborTable {
+ struct NeighborTableStruct {
int64u extAddress = 0;
int32u age = 1;
int16u rloc16 = 2;
@@ -1182,7 +1182,7 @@
boolean channelMaskPresent = 11;
}
- struct RouteTable {
+ struct RouteTableStruct {
int64u extAddress = 0;
int16u rloc16 = 1;
int8u routerId = 2;
@@ -1205,19 +1205,19 @@
}
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 @@
readonly attribute nullable SecurityPolicy securityPolicy = 59;
readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
- readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
+ readonly attribute NetworkFaultEnum activeNetworkFaultsList[] = 62;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
diff --git a/examples/tv-app/tv-common/tv-app.zap b/examples/tv-app/tv-common/tv-app.zap
index 44f6bfa..cb38165 100644
--- a/examples/tv-app/tv-common/tv-app.zap
+++ b/examples/tv-app/tv-common/tv-app.zap
@@ -2850,7 +2850,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "RoutingRole",
+ "type": "RoutingRoleEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap
index 1f4e5c2..0ba8d97 100644
--- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap
+++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap
@@ -2957,7 +2957,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "RoutingRole",
+ "type": "RoutingRoleEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter
index a2bffdc..5404b09 100644
--- a/examples/window-app/common/window-app.matter
+++ b/examples/window-app/common/window-app.matter
@@ -1231,14 +1231,14 @@
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 @@
kMACCounts = 0x8;
}
- struct NeighborTable {
+ struct NeighborTableStruct {
int64u extAddress = 0;
int32u age = 1;
int16u rloc16 = 2;
@@ -1287,7 +1287,7 @@
boolean channelMaskPresent = 11;
}
- struct RouteTable {
+ struct RouteTableStruct {
int64u extAddress = 0;
int16u rloc16 = 1;
int8u routerId = 2;
@@ -1310,19 +1310,19 @@
}
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 @@
readonly attribute nullable SecurityPolicy securityPolicy = 59;
readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
- readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
+ readonly attribute NetworkFaultEnum activeNetworkFaultsList[] = 62;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
diff --git a/examples/window-app/common/window-app.zap b/examples/window-app/common/window-app.zap
index d01a811..3c40c65 100644
--- a/examples/window-app/common/window-app.zap
+++ b/examples/window-app/common/window-app.zap
@@ -3728,7 +3728,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "RoutingRole",
+ "type": "RoutingRoleEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
diff --git a/scripts/tools/zap/tests/inputs/all-clusters-app.zap b/scripts/tools/zap/tests/inputs/all-clusters-app.zap
index 10fad27..a0796c8 100644
--- a/scripts/tools/zap/tests/inputs/all-clusters-app.zap
+++ b/scripts/tools/zap/tests/inputs/all-clusters-app.zap
@@ -3866,7 +3866,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "RoutingRole",
+ "type": "RoutingRoleEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
diff --git a/scripts/tools/zap/tests/inputs/lighting-app.zap b/scripts/tools/zap/tests/inputs/lighting-app.zap
index 13b6098..ee7b3bf 100644
--- a/scripts/tools/zap/tests/inputs/lighting-app.zap
+++ b/scripts/tools/zap/tests/inputs/lighting-app.zap
@@ -3097,7 +3097,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "RoutingRole",
+ "type": "RoutingRoleEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
diff --git a/src/app/clusters/general-diagnostics-server/GenericFaultTestEventTriggerDelegate.cpp b/src/app/clusters/general-diagnostics-server/GenericFaultTestEventTriggerDelegate.cpp
index 3d4fd54..41062c7 100644
--- a/src/app/clusters/general-diagnostics-server/GenericFaultTestEventTriggerDelegate.cpp
+++ b/src/app/clusters/general-diagnostics-server/GenericFaultTestEventTriggerDelegate.cpp
@@ -67,12 +67,13 @@
GeneralFaults<kMaxNetworkFaults> networkFaultsCurrent;
// Network faults injections
- ReturnErrorOnFailure(networkFaultsPrevious.add(EMBER_ZCL_NETWORK_FAULT_ENUM_HARDWARE_FAILURE));
- ReturnErrorOnFailure(networkFaultsPrevious.add(EMBER_ZCL_NETWORK_FAULT_ENUM_NETWORK_JAMMED));
+ using app::Clusters::GeneralDiagnostics::NetworkFaultEnum;
+ ReturnErrorOnFailure(networkFaultsPrevious.add(to_underlying(NetworkFaultEnum::kHardwareFailure)));
+ ReturnErrorOnFailure(networkFaultsPrevious.add(to_underlying(NetworkFaultEnum::kNetworkJammed)));
- ReturnErrorOnFailure(networkFaultsCurrent.add(EMBER_ZCL_NETWORK_FAULT_ENUM_HARDWARE_FAILURE));
- ReturnErrorOnFailure(networkFaultsCurrent.add(EMBER_ZCL_NETWORK_FAULT_ENUM_NETWORK_JAMMED));
- ReturnErrorOnFailure(networkFaultsCurrent.add(EMBER_ZCL_NETWORK_FAULT_ENUM_CONNECTION_FAILED));
+ ReturnErrorOnFailure(networkFaultsCurrent.add(to_underlying(NetworkFaultEnum::kHardwareFailure)));
+ ReturnErrorOnFailure(networkFaultsCurrent.add(to_underlying(NetworkFaultEnum::kNetworkJammed)));
+ ReturnErrorOnFailure(networkFaultsCurrent.add(to_underlying(NetworkFaultEnum::kConnectionFailed)));
app::Clusters::GeneralDiagnosticsServer::Instance().OnNetworkFaultsDetect(networkFaultsPrevious, networkFaultsCurrent);
}
diff --git a/src/app/common/templates/config-data.yaml b/src/app/common/templates/config-data.yaml
index 1d73fff..d07c3e3 100644
--- a/src/app/common/templates/config-data.yaml
+++ b/src/app/common/templates/config-data.yaml
@@ -8,10 +8,8 @@
- EnhancedColorMode
- InterfaceTypeEnum
- MoveMode
- - NetworkFaultEnum
- PHYRateEnum
- RadioFaultEnum
- - RoutingRole
- StepMode
DefineBitmaps:
diff --git a/src/app/zap-templates/zcl/data-model/chip/thread-network-diagnostics-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/thread-network-diagnostics-cluster.xml
index dc97fab..bfd9197 100644
--- a/src/app/zap-templates/zcl/data-model/chip/thread-network-diagnostics-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/thread-network-diagnostics-cluster.xml
@@ -13,14 +13,14 @@
-->
<configurator>
<domain name="CHIP"/>
- <enum name="NetworkFault" type="ENUM8">
+ <enum name="NetworkFaultEnum" type="ENUM8">
<cluster code="0x0035"/>
<item name="Unspecified" value="0x00"/>
<item name="LinkDown" value="0x01"/>
<item name="HardwareFailure" value="0x02"/>
<item name="NetworkJammed" value="0x03"/>
</enum>
- <enum name="RoutingRole" type="ENUM8">
+ <enum name="RoutingRoleEnum" type="ENUM8">
<cluster code="0x0035"/>
<item name="Unspecified" value="0x00"/>
<item name="Unassigned" value="0x01"/>
@@ -35,7 +35,7 @@
<item name="Connected" value="0x00"/>
<item name="NotConnected" value="0x01"/>
</enum>
- <struct name="NeighborTable">
+ <struct name="NeighborTableStruct">
<cluster code="0x0035"/>
<item name="ExtAddress" type="INT64U"/>
<item name="Age" type="INT32U"/>
@@ -52,7 +52,7 @@
<item name="FullNetworkData" type="BOOLEAN"/>
<item name="IsChild" type="BOOLEAN"/>
</struct>
- <struct name="RouteTable">
+ <struct name="RouteTableStruct">
<cluster code="0x0035"/>
<item name="ExtAddress" type="INT64U"/>
<item name="Rloc16" type="INT16U"/>
@@ -92,14 +92,14 @@
<define>THREAD_NETWORK_DIAGNOSTICS_CLUSTER</define>
<description>The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems</description>
<attribute side="server" code="0x00" define="CHANNEL" type="INT16U" min="0x00" max="0xFFFF" writable="false" isNullable="true" optional="false">Channel</attribute>
- <attribute side="server" code="0x01" define="ROUTING_ROLE" type="RoutingRole" writable="false" isNullable="true" optional="false">RoutingRole</attribute>
+ <attribute side="server" code="0x01" define="ROUTING_ROLE" type="RoutingRoleEnum" writable="false" isNullable="true" optional="false">RoutingRole</attribute>
<attribute side="server" code="0x02" define="NETWORK_NAME" type="CHAR_STRING" length="16" writable="false" default="" isNullable="true" optional="false">NetworkName</attribute>
<attribute side="server" code="0x03" define="DIAG_PAN_ID" type="INT16U" min="0x0000" max="0xFFFF" writable="false" default="0x0000" isNullable="true" optional="false">PanId</attribute>
<attribute side="server" code="0x04" define="DIAG_EXTENDED_PAN_ID" type="INT64U" min="0x0000000000000000" max="0xFFFFFFFFFFFFFFFF" writable="false" default="0x0000000000000000" isNullable="true" optional="false">ExtendedPanId</attribute>
<attribute side="server" code="0x05" define="MESH_LOCAL_PREFIX" type="OCTET_STRING" length="17" writable="false" isNullable="true" optional="false">MeshLocalPrefix</attribute>
<attribute side="server" code="0x06" define="DIAG_OVERRUN_COUNT" type="INT64U" min="0x0000000000000000" max="0xFFFFFFFFFFFFFFFF" writable="false" default="0x0000000000000000" optional="true">OverrunCount</attribute>
- <attribute side="server" code="0x07" define="NEIGHBOR_TABLE" type="ARRAY" entryType="NeighborTable" length="254" writable="false" optional="false">NeighborTable</attribute>
- <attribute side="server" code="0x08" define="ROUTE_TABLE" type="ARRAY" entryType="RouteTable" length="254" writable="false" optional="false">RouteTable</attribute>
+ <attribute side="server" code="0x07" define="NEIGHBOR_TABLE" type="ARRAY" entryType="NeighborTableStruct" length="254" writable="false" optional="false">NeighborTable</attribute>
+ <attribute side="server" code="0x08" define="ROUTE_TABLE" type="ARRAY" entryType="RouteTableStruct" length="254" writable="false" optional="false">RouteTable</attribute>
<attribute side="server" code="0x09" define="PARTITION_ID" type="INT32U" min="0x00000000" max="0xFFFFFFFF" writable="false" isNullable="true" optional="false">PartitionId</attribute>
<attribute side="server" code="0x0A" define="WEIGHTING" type="INT8U" min="0x00" max="0xFF" writable="false" isNullable="true" optional="false">Weighting</attribute>
<attribute side="server" code="0x0B" define="DATA_VERSION" type="INT8U" min="0x00" max="0xFF" writable="false" isNullable="true" optional="false">DataVersion</attribute>
@@ -153,7 +153,7 @@
<attribute side="server" code="0x3B" define="SECURITY_POLICY" type="SecurityPolicy" writable="false" isNullable="true" optional="false">SecurityPolicy</attribute>
<attribute side="server" code="0x3C" define="DIAG_CHANNEL_MASK" type="OCTET_STRING" length="4" writable="false" isNullable="true" optional="false">ChannelPage0Mask</attribute>
<attribute side="server" code="0x3D" define="OPERATIONAL_DATASET_COMPONENTS" type="OperationalDatasetComponents" writable="false" isNullable="true" optional="false">OperationalDatasetComponents</attribute>
- <attribute side="server" code="0x3E" define="ACTIVE_THREAD_NETWORK_FAULTS" type="ARRAY" entryType="NetworkFault" length="4" writable="false" optional="false">ActiveNetworkFaultsList</attribute>
+ <attribute side="server" code="0x3E" define="ACTIVE_THREAD_NETWORK_FAULTS" type="ARRAY" entryType="NetworkFaultEnum" length="4" writable="false" optional="false">ActiveNetworkFaultsList</attribute>
<command source="client" code="0x00" name="ResetCounts" optional="true" cli="chip thread_network_diagnostics resetcounts">
<description>Reception of this command SHALL reset the OverrunCount attributes to 0</description>
</command>
@@ -163,8 +163,8 @@
</event>
<event side="server" code="0x01" name="NetworkFaultChange" priority="info" optional="true">
<description>Indicate a change in the set of network faults currently detected by the Node</description>
- <field id="0" name="Current" type="NetworkFault" array="true"/>
- <field id="1" name="Previous" type="NetworkFault" array="true"/>
+ <field id="0" name="Current" type="NetworkFaultEnum" array="true"/>
+ <field id="1" name="Previous" type="NetworkFaultEnum" array="true"/>
</event>
</cluster>
<bitmap name="Feature" type="BITMAP32">
diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
index 4ee17e9..ed238fa 100644
--- a/src/controller/data_model/controller-clusters.matter
+++ b/src/controller/data_model/controller-clusters.matter
@@ -1818,14 +1818,14 @@
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 @@
kMACCounts = 0x8;
}
- struct NeighborTable {
+ struct NeighborTableStruct {
int64u extAddress = 0;
int32u age = 1;
int16u rloc16 = 2;
@@ -1874,7 +1874,7 @@
boolean channelMaskPresent = 11;
}
- struct RouteTable {
+ struct RouteTableStruct {
int64u extAddress = 0;
int16u rloc16 = 1;
int8u routerId = 2;
@@ -1897,19 +1897,19 @@
}
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 @@
readonly attribute nullable SecurityPolicy securityPolicy = 59;
readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
- readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
+ readonly attribute NetworkFaultEnum activeNetworkFaultsList[] = 62;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap
index 4f2c87f..c24af2a 100644
--- a/src/controller/data_model/controller-clusters.zap
+++ b/src/controller/data_model/controller-clusters.zap
@@ -6229,7 +6229,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "RoutingRole",
+ "type": "RoutingRoleEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
index 875b9a9..db04f23 100644
--- a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
+++ b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
@@ -6817,28 +6817,28 @@
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, "<init>",
+ jmethodID neighborTableStructStructCtor_1 =
+ env->GetMethodID(neighborTableStructStructClass_1, "<init>",
"(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 @@
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, "<init>",
+ jmethodID routeTableStructStructCtor_1 = env->GetMethodID(
+ routeTableStructStructClass_1, "<init>",
"(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 3638025..4eab5f5 100644
--- a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp
+++ b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp
@@ -11330,7 +11330,7 @@
}
void CHIPThreadNetworkDiagnosticsRoutingRoleAttributeCallback::CallbackFn(
- void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRole> & value)
+ void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRoleEnum> & value)
{
chip::DeviceLayer::StackUnlock unlock;
CHIP_ERROR err = CHIP_NO_ERROR;
@@ -11664,7 +11664,7 @@
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 @@
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, "<init>",
+ jmethodID neighborTableStructStructCtor_1 =
+ env->GetMethodID(neighborTableStructStructClass_1, "<init>",
"(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 @@
void CHIPThreadNetworkDiagnosticsRouteTableAttributeCallback::CallbackFn(
void * context,
- const chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTable::DecodableType> &
- 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 @@
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, "<init>",
+ jmethodID routeTableStructStructCtor_1 =
+ env->GetMethodID(routeTableStructStructClass_1, "<init>",
"(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 @@
}
void CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback::CallbackFn(
- void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFault> & list)
+ void * context,
+ const chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFaultEnum> & 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 080468b..afc88c2 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 @@
}
public interface NeighborTableAttributeCallback {
- void onSuccess(List<ChipStructs.ThreadNetworkDiagnosticsClusterNeighborTable> valueList);
+ void onSuccess(
+ List<ChipStructs.ThreadNetworkDiagnosticsClusterNeighborTableStruct> valueList);
void onError(Exception ex);
@@ -8353,7 +8354,7 @@
}
public interface RouteTableAttributeCallback {
- void onSuccess(List<ChipStructs.ThreadNetworkDiagnosticsClusterRouteTable> valueList);
+ void onSuccess(List<ChipStructs.ThreadNetworkDiagnosticsClusterRouteTableStruct> 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 d60eb26..9f9b24f 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 static class ThreadNetworkDiagnosticsClusterNeighborTable {
+ public static class ThreadNetworkDiagnosticsClusterNeighborTableStruct {
public Long extAddress;
public Long age;
public Integer rloc16;
@@ -762,7 +762,7 @@
public Boolean fullNetworkData;
public Boolean isChild;
- public ThreadNetworkDiagnosticsClusterNeighborTable(
+ public ThreadNetworkDiagnosticsClusterNeighborTableStruct(
Long extAddress,
Long age,
Integer rloc16,
@@ -796,7 +796,7 @@
@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 static class ThreadNetworkDiagnosticsClusterRouteTable {
+ public static class ThreadNetworkDiagnosticsClusterRouteTableStruct {
public Long extAddress;
public Integer rloc16;
public Integer routerId;
@@ -942,7 +942,7 @@
public Boolean allocated;
public Boolean linkEstablished;
- public ThreadNetworkDiagnosticsClusterRouteTable(
+ public ThreadNetworkDiagnosticsClusterRouteTableStruct(
Long extAddress,
Integer rloc16,
Integer routerId,
@@ -968,7 +968,7 @@
@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 e13d3d7..7dfe1e5 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 @@
@Override
public void onSuccess(
- List<ChipStructs.ThreadNetworkDiagnosticsClusterNeighborTable> valueList) {
+ List<ChipStructs.ThreadNetworkDiagnosticsClusterNeighborTableStruct> valueList) {
Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
CommandResponseInfo commandResponseInfo =
new CommandResponseInfo(
- "valueList", "List<ChipStructs.ThreadNetworkDiagnosticsClusterNeighborTable>");
+ "valueList", "List<ChipStructs.ThreadNetworkDiagnosticsClusterNeighborTableStruct>");
responseValues.put(commandResponseInfo, valueList);
callback.onSuccess(responseValues);
}
@@ -4420,11 +4420,12 @@
}
@Override
- public void onSuccess(List<ChipStructs.ThreadNetworkDiagnosticsClusterRouteTable> valueList) {
+ public void onSuccess(
+ List<ChipStructs.ThreadNetworkDiagnosticsClusterRouteTableStruct> valueList) {
Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
CommandResponseInfo commandResponseInfo =
new CommandResponseInfo(
- "valueList", "List<ChipStructs.ThreadNetworkDiagnosticsClusterRouteTable>");
+ "valueList", "List<ChipStructs.ThreadNetworkDiagnosticsClusterRouteTableStruct>");
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 fa9072a..0afd782 100644
--- a/src/controller/python/chip/clusters/Objects.py
+++ b/src/controller/python/chip/clusters/Objects.py
@@ -8807,14 +8807,14 @@
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 @@
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 @@
])
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 @@
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 @@
# 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 @@
# 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 Structs:
@dataclass
- class NeighborTable(ClusterObject):
+ class NeighborTableStruct(ClusterObject):
@ChipUtility.classproperty
def descriptor(cls) -> ClusterObjectDescriptor:
return ClusterObjectDescriptor(
@@ -9061,7 +9061,7 @@
channelMaskPresent: 'bool' = False
@dataclass
- class RouteTable(ClusterObject):
+ class RouteTableStruct(ClusterObject):
@ChipUtility.classproperty
def descriptor(cls) -> ClusterObjectDescriptor:
return ClusterObjectDescriptor(
@@ -9145,9 +9145,9 @@
@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 @@
@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 @@
@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 @@
@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 descriptor(cls) -> ClusterObjectDescriptor:
return ClusterObjectDescriptor(
Fields=[
- ClusterObjectFieldDescriptor(Label="current", Tag=0, Type=typing.List[ThreadNetworkDiagnostics.Enums.NetworkFault]),
- ClusterObjectFieldDescriptor(Label="previous", Tag=1, Type=typing.List[ThreadNetworkDiagnostics.Enums.NetworkFault]),
+ ClusterObjectFieldDescriptor(Label="current", Tag=0, Type=typing.List[ThreadNetworkDiagnostics.Enums.NetworkFaultEnum]),
+ ClusterObjectFieldDescriptor(Label="previous", Tag=1, Type=typing.List[ThreadNetworkDiagnostics.Enums.NetworkFaultEnum]),
])
- current: 'typing.List[ThreadNetworkDiagnostics.Enums.NetworkFault]' = field(default_factory=lambda: [])
- previous: 'typing.List[ThreadNetworkDiagnostics.Enums.NetworkFault]' = field(default_factory=lambda: [])
+ current: 'typing.List[ThreadNetworkDiagnostics.Enums.NetworkFaultEnum]' = field(default_factory=lambda: [])
+ previous: 'typing.List[ThreadNetworkDiagnostics.Enums.NetworkFaultEnum]' = field(default_factory=lambda: [])
@dataclass
diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml
index fea8909..3ba0c92 100644
--- a/src/darwin/Framework/CHIP/templates/availability.yaml
+++ b/src/darwin/Framework/CHIP/templates/availability.yaml
@@ -3131,8 +3131,11 @@
- NetworkFaultType
- RadioFaultType
ThreadNetworkDiagnostics:
- - NetworkFault
- - RoutingRole
+ # NetworkFaultEnum and RoutingRoleEnum were originally just named
+ # NetworkFault and RoutingRole, but we generate the same API for
+ # both of those names, so the name can just change here.
+ - NetworkFaultEnum
+ - RoutingRoleEnum
- ThreadConnectionStatus
WiFiNetworkDiagnostics:
# AssociationFailureCauseEnum was originally just named
@@ -3531,12 +3534,15 @@
- BLEFault
- EthernetFault
ThreadNetworkDiagnostics:
- NetworkFault:
+ # NetworkFaultEnum and RoutingRoleEnum were originally just named
+ # NetworkFault and RoutingRole, but we generate the same API for
+ # both of those names, so the name can just change here.
+ NetworkFaultEnum:
- Unspecified
- LinkDown
- HardwareFailure
- NetworkJammed
- RoutingRole:
+ RoutingRoleEnum:
- Unspecified
- Unassigned
- SleepyEndDevice
@@ -8118,6 +8124,9 @@
- ProductAppearanceStruct
TemperatureControl:
- TemperatureLevelStruct
+ ThreadNetworkDiagnostics:
+ - NeighborTableStruct
+ - RouteTableStruct
struct fields:
AccessControl:
AccessControlTargetStruct:
@@ -8136,6 +8145,33 @@
TemperatureLevelStruct:
- label
- temperatureLevel
+ ThreadNetworkDiagnostics:
+ NeighborTableStruct:
+ - extAddress
+ - age
+ - rloc16
+ - linkFrameCounter
+ - mleFrameCounter
+ - lqi
+ - averageRssi
+ - lastRssi
+ - frameErrorRate
+ - messageErrorRate
+ - rxOnWhenIdle
+ - fullThreadDevice
+ - fullNetworkData
+ - isChild
+ RouteTableStruct:
+ - extAddress
+ - rloc16
+ - routerId
+ - nextHop
+ - pathCost
+ - lqiIn
+ - lqiOut
+ - age
+ - allocated
+ - linkEstablished
events:
RefrigeratorAlarm:
- Notify
@@ -9805,6 +9841,9 @@
structs:
AccessControl:
- Target
+ ThreadNetworkDiagnostics:
+ - NeighborTable
+ - RouteTable
bitmaps:
Groups:
- GroupClusterFeature
@@ -9824,6 +9863,9 @@
structs:
AccessControl:
AccessControlTargetStruct: Target
+ ThreadNetworkDiagnostics:
+ NeighborTableStruct: NeighborTable
+ RouteTableStruct: RouteTable
enum values:
TimeSynchronization:
TimeSourceEnum:
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm
index 2a8bcb7..e65888c 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm
@@ -5790,8 +5790,8 @@
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 @@
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 d112ab6..b9045be 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
@@ -29556,7 +29556,7 @@
{
MTRReadParams * params = [[MTRReadParams alloc] init];
using TypeInfo = ThreadNetworkDiagnostics::Attributes::RoutingRole::TypeInfo;
- return MTRReadAttribute<MTRNullableThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackBridge, NSNumber,
+ return MTRReadAttribute<MTRNullableThreadNetworkDiagnosticsClusterRoutingRoleEnumAttributeCallbackBridge, NSNumber,
TypeInfo::DecodableType>(
params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId());
}
@@ -29566,7 +29566,7 @@
reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
{
using TypeInfo = ThreadNetworkDiagnostics::Attributes::RoutingRole::TypeInfo;
- MTRSubscribeAttribute<MTRNullableThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackSubscriptionBridge, NSNumber,
+ MTRSubscribeAttribute<MTRNullableThreadNetworkDiagnosticsClusterRoutingRoleEnumAttributeCallbackSubscriptionBridge, NSNumber,
TypeInfo::DecodableType>(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint,
TypeInfo::GetClusterId(), TypeInfo::GetAttributeId());
}
@@ -29576,9 +29576,9 @@
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 242230b..c9022d3 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h
@@ -318,14 +318,14 @@
void *, chip::app::Clusters::ThreadNetworkDiagnostics::ConnectionStatusEnum);
typedef void (*NullableThreadNetworkDiagnosticsClusterConnectionStatusEnumAttributeCallback)(
void *, const chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::ConnectionStatusEnum> &);
-typedef void (*ThreadNetworkDiagnosticsClusterNetworkFaultAttributeCallback)(
- void *, chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFault);
-typedef void (*NullableThreadNetworkDiagnosticsClusterNetworkFaultAttributeCallback)(
- void *, const chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFault> &);
-typedef void (*ThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallback)(
- void *, chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRole);
-typedef void (*NullableThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallback)(
- void *, const chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRole> &);
+typedef void (*ThreadNetworkDiagnosticsClusterNetworkFaultEnumAttributeCallback)(
+ void *, chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFaultEnum);
+typedef void (*NullableThreadNetworkDiagnosticsClusterNetworkFaultEnumAttributeCallback)(
+ void *, const chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFaultEnum> &);
+typedef void (*ThreadNetworkDiagnosticsClusterRoutingRoleEnumAttributeCallback)(
+ void *, chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRoleEnum);
+typedef void (*NullableThreadNetworkDiagnosticsClusterRoutingRoleEnumAttributeCallback)(
+ void *, const chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRoleEnum> &);
typedef void (*WiFiNetworkDiagnosticsClusterAssociationFailureCauseEnumAttributeCallback)(
void *, chip::app::Clusters::WiFiNetworkDiagnostics::AssociationFailureCauseEnum);
typedef void (*NullableWiFiNetworkDiagnosticsClusterAssociationFailureCauseEnumAttributeCallback)(
@@ -1435,11 +1435,11 @@
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<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTable::DecodableType> &
- data);
+ const chip::app::DataModel::DecodableList<
+ chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTableStruct::DecodableType> & data);
typedef void (*ThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallback)(
void *,
const chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::SecurityPolicy::DecodableType> &);
@@ -1448,7 +1448,8 @@
const chip::app::DataModel::Nullable<
chip::app::Clusters::ThreadNetworkDiagnostics::Structs::OperationalDatasetComponents::DecodableType> &);
typedef void (*ThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallback)(
- void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFault> & data);
+ void * context,
+ const chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFaultEnum> & data);
typedef void (*ThreadNetworkDiagnosticsGeneratedCommandListListAttributeCallback)(
void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
typedef void (*ThreadNetworkDiagnosticsAcceptedCommandListListAttributeCallback)(
@@ -7239,9 +7240,10 @@
MTRActionBlock action) :
MTRCallbackBridge<ThreadNetworkDiagnosticsNeighborTableListAttributeCallback>(queue, handler, action, OnSuccessFn){};
- static void OnSuccessFn(void * context,
- const chip::app::DataModel::DecodableList<
- chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTable::DecodableType> & value);
+ static void
+ OnSuccessFn(void * context,
+ const chip::app::DataModel::DecodableList<
+ chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTableStruct::DecodableType> & value);
};
class MTRThreadNetworkDiagnosticsNeighborTableListAttributeCallbackSubscriptionBridge
@@ -7276,7 +7278,7 @@
static void OnSuccessFn(void * context,
const chip::app::DataModel::DecodableList<
- chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTable::DecodableType> & value);
+ chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTableStruct::DecodableType> & value);
};
class MTRThreadNetworkDiagnosticsRouteTableListAttributeCallbackSubscriptionBridge
@@ -7387,7 +7389,7 @@
static void
OnSuccessFn(void * context,
- const chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFault> & value);
+ const chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFaultEnum> & value);
};
class MTRThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallbackSubscriptionBridge
@@ -26334,139 +26336,143 @@
MTRSubscriptionEstablishedHandler mEstablishedHandler;
};
-class MTRThreadNetworkDiagnosticsClusterNetworkFaultAttributeCallbackBridge
- : public MTRCallbackBridge<ThreadNetworkDiagnosticsClusterNetworkFaultAttributeCallback>
+class MTRThreadNetworkDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge
+ : public MTRCallbackBridge<ThreadNetworkDiagnosticsClusterNetworkFaultEnumAttributeCallback>
{
public:
- MTRThreadNetworkDiagnosticsClusterNetworkFaultAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
- MTRCallbackBridge<ThreadNetworkDiagnosticsClusterNetworkFaultAttributeCallback>(queue, handler, OnSuccessFn){};
+ MTRThreadNetworkDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
+ MTRCallbackBridge<ThreadNetworkDiagnosticsClusterNetworkFaultEnumAttributeCallback>(queue, handler, OnSuccessFn){};
- MTRThreadNetworkDiagnosticsClusterNetworkFaultAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
- MTRActionBlock action) :
- MTRCallbackBridge<ThreadNetworkDiagnosticsClusterNetworkFaultAttributeCallback>(queue, handler, action, OnSuccessFn){};
+ MTRThreadNetworkDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+ MTRActionBlock action) :
+ MTRCallbackBridge<ThreadNetworkDiagnosticsClusterNetworkFaultEnumAttributeCallback>(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<NullableThreadNetworkDiagnosticsClusterNetworkFaultAttributeCallback>
+class MTRNullableThreadNetworkDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge
+ : public MTRCallbackBridge<NullableThreadNetworkDiagnosticsClusterNetworkFaultEnumAttributeCallback>
{
public:
- MTRNullableThreadNetworkDiagnosticsClusterNetworkFaultAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
- MTRCallbackBridge<NullableThreadNetworkDiagnosticsClusterNetworkFaultAttributeCallback>(queue, handler, OnSuccessFn){};
+ MTRNullableThreadNetworkDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge(dispatch_queue_t queue,
+ ResponseHandler handler) :
+ MTRCallbackBridge<NullableThreadNetworkDiagnosticsClusterNetworkFaultEnumAttributeCallback>(queue, handler, OnSuccessFn){};
- MTRNullableThreadNetworkDiagnosticsClusterNetworkFaultAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
- MTRActionBlock action) :
- MTRCallbackBridge<NullableThreadNetworkDiagnosticsClusterNetworkFaultAttributeCallback>(queue, handler, action,
- OnSuccessFn){};
+ MTRNullableThreadNetworkDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge(dispatch_queue_t queue,
+ ResponseHandler handler,
+ MTRActionBlock action) :
+ MTRCallbackBridge<NullableThreadNetworkDiagnosticsClusterNetworkFaultEnumAttributeCallback>(queue, handler, action,
+ OnSuccessFn){};
static void
OnSuccessFn(void * context,
- const chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFault> & value);
+ const chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFaultEnum> & 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<ThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallback>
+class MTRThreadNetworkDiagnosticsClusterRoutingRoleEnumAttributeCallbackBridge
+ : public MTRCallbackBridge<ThreadNetworkDiagnosticsClusterRoutingRoleEnumAttributeCallback>
{
public:
- MTRThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
- MTRCallbackBridge<ThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallback>(queue, handler, OnSuccessFn){};
+ MTRThreadNetworkDiagnosticsClusterRoutingRoleEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
+ MTRCallbackBridge<ThreadNetworkDiagnosticsClusterRoutingRoleEnumAttributeCallback>(queue, handler, OnSuccessFn){};
- MTRThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
- MTRActionBlock action) :
- MTRCallbackBridge<ThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallback>(queue, handler, action, OnSuccessFn){};
+ MTRThreadNetworkDiagnosticsClusterRoutingRoleEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+ MTRActionBlock action) :
+ MTRCallbackBridge<ThreadNetworkDiagnosticsClusterRoutingRoleEnumAttributeCallback>(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<NullableThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallback>
+class MTRNullableThreadNetworkDiagnosticsClusterRoutingRoleEnumAttributeCallbackBridge
+ : public MTRCallbackBridge<NullableThreadNetworkDiagnosticsClusterRoutingRoleEnumAttributeCallback>
{
public:
- MTRNullableThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
- MTRCallbackBridge<NullableThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallback>(queue, handler, OnSuccessFn){};
+ MTRNullableThreadNetworkDiagnosticsClusterRoutingRoleEnumAttributeCallbackBridge(dispatch_queue_t queue,
+ ResponseHandler handler) :
+ MTRCallbackBridge<NullableThreadNetworkDiagnosticsClusterRoutingRoleEnumAttributeCallback>(queue, handler, OnSuccessFn){};
- MTRNullableThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
- MTRActionBlock action) :
- MTRCallbackBridge<NullableThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallback>(queue, handler, action,
- OnSuccessFn){};
+ MTRNullableThreadNetworkDiagnosticsClusterRoutingRoleEnumAttributeCallbackBridge(dispatch_queue_t queue,
+ ResponseHandler handler,
+ MTRActionBlock action) :
+ MTRCallbackBridge<NullableThreadNetworkDiagnosticsClusterRoutingRoleEnumAttributeCallback>(queue, handler, action,
+ OnSuccessFn){};
static void
OnSuccessFn(void * context,
- const chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRole> & value);
+ const chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRoleEnum> & 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 228f624..1ab0b6f 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<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTable::DecodableType> &
- 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<chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFault> & value)
+void MTRThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallbackBridge::OnSuccessFn(void * context,
+ const chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFaultEnum> & value)
{
NSArray * _Nonnull objCValue;
{ // Scope for our temporary variables
@@ -25740,15 +25740,15 @@
}
}
-void MTRThreadNetworkDiagnosticsClusterNetworkFaultAttributeCallbackBridge::OnSuccessFn(
- void * context, chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFault value)
+void MTRThreadNetworkDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge::OnSuccessFn(
+ void * context, chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFaultEnum value)
{
NSNumber * _Nonnull objCValue;
objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
DispatchSuccess(context, objCValue);
};
-void MTRThreadNetworkDiagnosticsClusterNetworkFaultAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRThreadNetworkDiagnosticsClusterNetworkFaultEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
{
if (!mQueue) {
return;
@@ -25763,8 +25763,8 @@
}
}
-void MTRNullableThreadNetworkDiagnosticsClusterNetworkFaultAttributeCallbackBridge::OnSuccessFn(
- void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFault> & value)
+void MTRNullableThreadNetworkDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge::OnSuccessFn(
+ void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFaultEnum> & value)
{
NSNumber * _Nullable objCValue;
if (value.IsNull()) {
@@ -25775,7 +25775,7 @@
DispatchSuccess(context, objCValue);
};
-void MTRNullableThreadNetworkDiagnosticsClusterNetworkFaultAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRNullableThreadNetworkDiagnosticsClusterNetworkFaultEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
{
if (!mQueue) {
return;
@@ -25790,15 +25790,15 @@
}
}
-void MTRThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackBridge::OnSuccessFn(
- void * context, chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRole value)
+void MTRThreadNetworkDiagnosticsClusterRoutingRoleEnumAttributeCallbackBridge::OnSuccessFn(
+ void * context, chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRoleEnum value)
{
NSNumber * _Nonnull objCValue;
objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
DispatchSuccess(context, objCValue);
};
-void MTRThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRThreadNetworkDiagnosticsClusterRoutingRoleEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
{
if (!mQueue) {
return;
@@ -25813,8 +25813,8 @@
}
}
-void MTRNullableThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackBridge::OnSuccessFn(
- void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRole> & value)
+void MTRNullableThreadNetworkDiagnosticsClusterRoutingRoleEnumAttributeCallbackBridge::OnSuccessFn(
+ void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRoleEnum> & value)
{
NSNumber * _Nullable objCValue;
if (value.IsNull()) {
@@ -25825,7 +25825,7 @@
DispatchSuccess(context, objCValue);
};
-void MTRNullableThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRNullableThreadNetworkDiagnosticsClusterRoutingRoleEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
{
if (!mQueue) {
return;
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h
index cc74fc4..70c25df 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h
@@ -396,25 +396,29 @@
@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 <NSCopying>
-@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 <NSCopying>
+@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 <NSCopying>
@property (nonatomic, copy)
NSNumber * _Nonnull activeTimestampPresent API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
@@ -435,21 +439,25 @@
@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 <NSCopying>
-@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 <NSCopying>
+@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 <NSCopying>
@property (nonatomic, copy) NSNumber * _Nonnull rotationTime API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
@property (nonatomic, copy) NSNumber * _Nonnull flags 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 ab2063b..0dc8ce3 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm
@@ -1473,7 +1473,7 @@
@end
-@implementation MTRThreadNetworkDiagnosticsClusterNeighborTable
+@implementation MTRThreadNetworkDiagnosticsClusterNeighborTableStruct
- (instancetype)init
{
if (self = [super init]) {
@@ -1511,7 +1511,7 @@
- (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 @@
@end
+@implementation MTRThreadNetworkDiagnosticsClusterNeighborTable : MTRThreadNetworkDiagnosticsClusterNeighborTableStruct
+@end
+
@implementation MTRThreadNetworkDiagnosticsClusterOperationalDatasetComponents
- (instancetype)init
{
@@ -1610,7 +1613,7 @@
@end
-@implementation MTRThreadNetworkDiagnosticsClusterRouteTable
+@implementation MTRThreadNetworkDiagnosticsClusterRouteTableStruct
- (instancetype)init
{
if (self = [super init]) {
@@ -1640,7 +1643,7 @@
- (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 @@
@end
+@implementation MTRThreadNetworkDiagnosticsClusterRouteTable : MTRThreadNetworkDiagnosticsClusterRouteTableStruct
+@end
+
@implementation MTRThreadNetworkDiagnosticsClusterSecurityPolicy
- (instancetype)init
{
diff --git a/src/platform/Linux/DiagnosticDataProviderImpl.cpp b/src/platform/Linux/DiagnosticDataProviderImpl.cpp
index 3d14605..b435197 100644
--- a/src/platform/Linux/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/Linux/DiagnosticDataProviderImpl.cpp
@@ -426,9 +426,9 @@
{
#if CHIP_CONFIG_TEST
// On Linux Simulation, set following radio faults statically.
- ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_HARDWARE_FAILURE));
- ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_NETWORK_JAMMED));
- ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_CONNECTION_FAILED));
+ ReturnErrorOnFailure(networkFaults.add(to_underlying(NetworkFaultEnum::kHardwareFailure)));
+ ReturnErrorOnFailure(networkFaults.add(to_underlying(NetworkFaultEnum::kNetworkJammed)));
+ ReturnErrorOnFailure(networkFaults.add(to_underlying(NetworkFaultEnum::kConnectionFailed)));
#endif
return CHIP_NO_ERROR;
diff --git a/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.hpp b/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.hpp
index 3142fd1..b502a88 100644
--- a/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.hpp
+++ b/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.hpp
@@ -1061,24 +1061,25 @@
break;
case ThreadNetworkDiagnostics::Attributes::RoutingRole::Id: {
- ThreadNetworkDiagnostics::RoutingRole routingRole;
+ using ThreadNetworkDiagnostics::RoutingRoleEnum;
+ RoutingRoleEnum routingRole;
otDeviceRole otRole = otThreadGetDeviceRole(mOTInst);
if (otRole == OT_DEVICE_ROLE_DISABLED)
{
- routingRole = EMBER_ZCL_ROUTING_ROLE_UNSPECIFIED;
+ routingRole = RoutingRoleEnum::kUnspecified;
}
else if (otRole == OT_DEVICE_ROLE_DETACHED)
{
- routingRole = EMBER_ZCL_ROUTING_ROLE_UNASSIGNED;
+ routingRole = RoutingRoleEnum::kUnassigned;
}
else if (otRole == OT_DEVICE_ROLE_ROUTER)
{
- routingRole = EMBER_ZCL_ROUTING_ROLE_ROUTER;
+ routingRole = RoutingRoleEnum::kRouter;
}
else if (otRole == OT_DEVICE_ROLE_LEADER)
{
- routingRole = EMBER_ZCL_ROUTING_ROLE_LEADER;
+ routingRole = RoutingRoleEnum::kLeader;
}
else if (otRole == OT_DEVICE_ROLE_CHILD)
{
@@ -1086,17 +1087,17 @@
if (linkMode.mRxOnWhenIdle)
{
- routingRole = EMBER_ZCL_ROUTING_ROLE_END_DEVICE;
+ routingRole = RoutingRoleEnum::kEndDevice;
#if CHIP_DEVICE_CONFIG_THREAD_FTD
if (otThreadIsRouterEligible(mOTInst))
{
- routingRole = EMBER_ZCL_ROUTING_ROLE_REED;
+ routingRole = RoutingRoleEnum::kReed;
}
#endif
}
else
{
- routingRole = EMBER_ZCL_ROUTING_ROLE_SLEEPY_END_DEVICE;
+ routingRole = RoutingRoleEnum::kSleepyEndDevice;
}
}
@@ -1149,7 +1150,7 @@
while (otThreadGetNextNeighborInfo(mOTInst, &iterator, &neighInfo) == OT_ERROR_NONE)
{
- ThreadNetworkDiagnostics::Structs::NeighborTable::Type neighborTable;
+ ThreadNetworkDiagnostics::Structs::NeighborTableStruct::Type neighborTable;
app::DataModel::Nullable<int8_t> averageRssi;
app::DataModel::Nullable<int8_t> lastRssi;
@@ -1209,7 +1210,7 @@
{
if (otThreadGetRouterInfo(mOTInst, i, &routerInfo) == OT_ERROR_NONE)
{
- ThreadNetworkDiagnostics::Structs::RouteTable::Type routeTable;
+ ThreadNetworkDiagnostics::Structs::RouteTableStruct::Type routeTable;
routeTable.extAddress = Encoding::BigEndian::Get64(routerInfo.mExtAddress.m8);
routeTable.rloc16 = routerInfo.mRloc16;
@@ -1233,7 +1234,7 @@
otError otErr = otThreadGetParentInfo(mOTInst, &routerInfo);
ReturnErrorOnFailure(MapOpenThreadError(otErr));
- ThreadNetworkDiagnostics::Structs::RouteTable::Type routeTable;
+ ThreadNetworkDiagnostics::Structs::RouteTableStruct::Type routeTable;
routeTable.extAddress = Encoding::BigEndian::Get64(routerInfo.mExtAddress.m8);
routeTable.rloc16 = routerInfo.mRloc16;
@@ -1661,7 +1662,8 @@
case ThreadNetworkDiagnostics::Attributes::ActiveNetworkFaultsList::Id: {
err = encoder.EncodeList([](const auto & aEncoder) -> CHIP_ERROR {
// TODO activeNetworkFaultsList isn't tracked. Encode the list of 4 entries at 0 none the less
- ThreadNetworkDiagnostics::NetworkFault activeNetworkFaultsList[4] = { ThreadNetworkDiagnostics::NetworkFault(0) };
+ ThreadNetworkDiagnostics::NetworkFaultEnum activeNetworkFaultsList[4] = { ThreadNetworkDiagnostics::NetworkFaultEnum(
+ 0) };
for (auto fault : activeNetworkFaultsList)
{
ReturnErrorOnFailure(aEncoder.Encode(fault));
diff --git a/src/platform/bouffalolab/BL702/DiagnosticDataProviderImpl.cpp b/src/platform/bouffalolab/BL702/DiagnosticDataProviderImpl.cpp
index 4716c9c..acdf61e 100644
--- a/src/platform/bouffalolab/BL702/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/bouffalolab/BL702/DiagnosticDataProviderImpl.cpp
@@ -233,9 +233,9 @@
CHIP_ERROR DiagnosticDataProviderImpl::GetActiveNetworkFaults(GeneralFaults<kMaxNetworkFaults> & networkFaults)
{
#if CHIP_CONFIG_TEST
- ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_HARDWARE_FAILURE));
- ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_NETWORK_JAMMED));
- ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_CONNECTION_FAILED));
+ ReturnErrorOnFailure(networkFaults.add(to_underlying(NetworkFaultEnum::kHardwareFailure)));
+ ReturnErrorOnFailure(networkFaults.add(to_underlying(NetworkFaultEnum::kNetworkJammed)));
+ ReturnErrorOnFailure(networkFaults.add(to_underlying(NetworkFaultEnum::kConnectionFailed)));
#endif
return CHIP_NO_ERROR;
diff --git a/src/platform/cc13xx_26xx/DiagnosticDataProviderImpl.cpp b/src/platform/cc13xx_26xx/DiagnosticDataProviderImpl.cpp
index 07eefd2..ead676b 100644
--- a/src/platform/cc13xx_26xx/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/cc13xx_26xx/DiagnosticDataProviderImpl.cpp
@@ -229,9 +229,11 @@
CHIP_ERROR DiagnosticDataProviderImpl::GetActiveNetworkFaults(GeneralFaults<kMaxNetworkFaults> & networkFaults)
{
#if CHIP_CONFIG_TEST
- ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_HARDWARE_FAILURE));
- ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_NETWORK_JAMMED));
- ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_CONNECTION_FAILED));
+ using app::Clusters::GeneralDiagnostics::NetworkFaultEnum;
+
+ ReturnErrorOnFailure(networkFaults.add(to_underlying(NetworkFaultEnum::kHardwareFailure)));
+ ReturnErrorOnFailure(networkFaults.add(to_underlying(NetworkFaultEnum::kNetworkJammed)));
+ ReturnErrorOnFailure(networkFaults.add(to_underlying(NetworkFaultEnum::kConnectionFailed)));
#endif
return CHIP_NO_ERROR;
diff --git a/src/platform/mt793x/DiagnosticDataProviderImpl.cpp b/src/platform/mt793x/DiagnosticDataProviderImpl.cpp
index faf5407..504c4e3 100644
--- a/src/platform/mt793x/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/mt793x/DiagnosticDataProviderImpl.cpp
@@ -192,9 +192,9 @@
CHIP_ERROR DiagnosticDataProviderImpl::GetActiveNetworkFaults(GeneralFaults<kMaxNetworkFaults> & networkFaults)
{
#if CHIP_CONFIG_TEST
- ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_HARDWARE_FAILURE));
- ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_NETWORK_JAMMED));
- ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_CONNECTION_FAILED));
+ ReturnErrorOnFailure(networkFaults.add(to_underlying(NetworkFaultEnum::kHardwareFailure)));
+ ReturnErrorOnFailure(networkFaults.add(to_underlying(NetworkFaultEnum::kNetworkJammed)));
+ ReturnErrorOnFailure(networkFaults.add(to_underlying(NetworkFaultEnum::kConnectionFailed)));
#endif
return CHIP_NO_ERROR;
diff --git a/src/platform/qpg/DiagnosticDataProviderImpl.cpp b/src/platform/qpg/DiagnosticDataProviderImpl.cpp
index 01f58a4..2a0ef74 100644
--- a/src/platform/qpg/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/qpg/DiagnosticDataProviderImpl.cpp
@@ -171,9 +171,11 @@
{
ChipLogProgress(DeviceLayer, "GetActiveNetworkFaults");
#if CHIP_CONFIG_TEST
- ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_HARDWARE_FAILURE));
- ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_NETWORK_JAMMED));
- ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_CONNECTION_FAILED));
+ using app::Clusters::GeneralDiagnostics::NetworkFaultEnum;
+
+ ReturnErrorOnFailure(networkFaults.add(to_underlying(NetworkFaultEnum::kHardwareFailure)));
+ ReturnErrorOnFailure(networkFaults.add(to_underlying(NetworkFaultEnum::kNetworkJammed)));
+ ReturnErrorOnFailure(networkFaults.add(to_underlying(NetworkFaultEnum::kConnectionFailed)));
#endif
return CHIP_NO_ERROR;
diff --git a/src/platform/silabs/DiagnosticDataProviderImpl.cpp b/src/platform/silabs/DiagnosticDataProviderImpl.cpp
index 75877b4..14f15f3 100644
--- a/src/platform/silabs/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/silabs/DiagnosticDataProviderImpl.cpp
@@ -234,9 +234,9 @@
CHIP_ERROR DiagnosticDataProviderImpl::GetActiveNetworkFaults(GeneralFaults<kMaxNetworkFaults> & networkFaults)
{
#if CHIP_CONFIG_TEST
- ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_HARDWARE_FAILURE));
- ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_NETWORK_JAMMED));
- ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_CONNECTION_FAILED));
+ ReturnErrorOnFailure(networkFaults.add(to_underlying(NetworkFaultEnum::kHardwareFailure)));
+ ReturnErrorOnFailure(networkFaults.add(to_underlying(NetworkFaultEnum::kNetworkJammed)));
+ ReturnErrorOnFailure(networkFaults.add(to_underlying(NetworkFaultEnum::kConnectionFailed)));
#endif
return CHIP_NO_ERROR;
diff --git a/src/platform/webos/DiagnosticDataProviderImpl.cpp b/src/platform/webos/DiagnosticDataProviderImpl.cpp
index e7f3f97..cf0a550 100644
--- a/src/platform/webos/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/webos/DiagnosticDataProviderImpl.cpp
@@ -412,9 +412,9 @@
{
#if CHIP_CONFIG_TEST
// On Linux Simulation, set following radio faults statically.
- ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_HARDWARE_FAILURE));
- ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_NETWORK_JAMMED));
- ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_CONNECTION_FAILED));
+ ReturnErrorOnFailure(networkFaults.add(to_underlying(NetworkFaultEnum::kHardwareFailure)));
+ ReturnErrorOnFailure(networkFaults.add(to_underlying(NetworkFaultEnum::kNetworkJammed)));
+ ReturnErrorOnFailure(networkFaults.add(to_underlying(NetworkFaultEnum::kConnectionFailed)));
#endif
return CHIP_NO_ERROR;
diff --git a/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 5188903..07c3a13 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 @@
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<EnumType>(4);
@@ -930,9 +921,9 @@
return static_cast<EnumType>(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 @@
return static_cast<EnumType>(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 @@
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<EnumType>(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 cf71fb2..8b37509 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 @@
static InterfaceTypeEnum __attribute__((unused)) kInterfaceTypeEnumkUnknownEnumValue = static_cast<InterfaceTypeEnum>(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 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<NetworkFaultEnum>(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 @@
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 @@
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 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<RoutingRole>(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 56dd2dd..eb2f49d 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 @@
} // 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 @@
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 @@
}
} // namespace OperationalDatasetComponents
-namespace RouteTable {
+namespace RouteTableStruct {
CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
{
TLV::TLVType outer;
@@ -7370,7 +7370,7 @@
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 5568df5..d14b390 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 @@
} // namespace SoftwareDiagnostics
namespace ThreadNetworkDiagnostics {
namespace Structs {
-namespace NeighborTable {
+namespace NeighborTableStruct {
enum class Fields : uint8_t
{
kExtAddress = 0,
@@ -8612,7 +8612,7 @@
using DecodableType = Type;
-} // namespace NeighborTable
+} // namespace NeighborTableStruct
namespace OperationalDatasetComponents {
enum class Fields : uint8_t
{
@@ -8656,7 +8656,7 @@
using DecodableType = Type;
} // namespace OperationalDatasetComponents
-namespace RouteTable {
+namespace RouteTableStruct {
enum class Fields : uint8_t
{
kExtAddress = 0,
@@ -8694,7 +8694,7 @@
using DecodableType = Type;
-} // namespace RouteTable
+} // namespace RouteTableStruct
namespace SecurityPolicy {
enum class Fields : uint8_t
{
@@ -8778,9 +8778,9 @@
namespace RoutingRole {
struct TypeInfo
{
- using Type = chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRole>;
- using DecodableType = chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRole>;
- using DecodableArgType = const chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRole> &;
+ using Type = chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRoleEnum>;
+ using DecodableType = chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRoleEnum>;
+ using DecodableArgType = const chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRoleEnum> &;
static constexpr ClusterId GetClusterId() { return Clusters::ThreadNetworkDiagnostics::Id; }
static constexpr AttributeId GetAttributeId() { return Attributes::RoutingRole::Id; }
@@ -8852,11 +8852,12 @@
namespace NeighborTable {
struct TypeInfo
{
- using Type = chip::app::DataModel::List<const chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTable::Type>;
- using DecodableType =
- chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTable::DecodableType>;
+ using Type =
+ chip::app::DataModel::List<const chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTableStruct::Type>;
+ 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 @@
namespace RouteTable {
struct TypeInfo
{
- using Type = chip::app::DataModel::List<const chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTable::Type>;
- using DecodableType =
- chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTable::DecodableType>;
+ using Type = chip::app::DataModel::List<const chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTableStruct::Type>;
+ 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 @@
namespace ActiveNetworkFaultsList {
struct TypeInfo
{
- using Type = chip::app::DataModel::List<const chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFault>;
- using DecodableType = chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFault>;
+ using Type = chip::app::DataModel::List<const chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFaultEnum>;
+ using DecodableType = chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFaultEnum>;
using DecodableArgType =
- const chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFault> &;
+ const chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFaultEnum> &;
static constexpr ClusterId GetClusterId() { return Clusters::ThreadNetworkDiagnostics::Id; }
static constexpr AttributeId GetAttributeId() { return Attributes::ActiveNetworkFaultsList::Id; }
@@ -9701,8 +9702,8 @@
static constexpr ClusterId GetClusterId() { return Clusters::ThreadNetworkDiagnostics::Id; }
static constexpr bool kIsFabricScoped = false;
- DataModel::List<const NetworkFault> current;
- DataModel::List<const NetworkFault> previous;
+ DataModel::List<const NetworkFaultEnum> current;
+ DataModel::List<const NetworkFaultEnum> previous;
CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
};
@@ -9714,8 +9715,8 @@
static constexpr EventId GetEventId() { return Events::NetworkFaultChange::Id; }
static constexpr ClusterId GetClusterId() { return Clusters::ThreadNetworkDiagnostics::Id; }
- DataModel::DecodableList<NetworkFault> current;
- DataModel::DecodableList<NetworkFault> previous;
+ DataModel::DecodableList<NetworkFaultEnum> current;
+ DataModel::DecodableList<NetworkFaultEnum> 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 6e843b5..2152ee8 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 @@
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 @@
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 8139b42..e0387eb 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h
+++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h
@@ -12700,7 +12700,7 @@
make_unique<WriteAttribute<>>(Id, credsIssuerConfig), //
make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint16_t>>>(Id, "channel", 0, UINT16_MAX, Attributes::Channel::Id,
WriteCommandType::kForceWrite, credsIssuerConfig), //
- make_unique<WriteAttribute<chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRole>>>(
+ make_unique<WriteAttribute<chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRoleEnum>>>(
Id, "routing-role", 0, UINT8_MAX, Attributes::RoutingRole::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
make_unique<WriteAttribute<chip::app::DataModel::Nullable<chip::CharSpan>>>(
Id, "network-name", Attributes::NetworkName::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
@@ -12714,10 +12714,10 @@
make_unique<WriteAttribute<uint64_t>>(Id, "overrun-count", 0, UINT64_MAX, Attributes::OverrunCount::Id,
WriteCommandType::kForceWrite, credsIssuerConfig), //
make_unique<WriteAttributeAsComplex<
- chip::app::DataModel::List<const chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTable::Type>>>(
+ chip::app::DataModel::List<const chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTableStruct::Type>>>(
Id, "neighbor-table", Attributes::NeighborTable::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
make_unique<WriteAttributeAsComplex<
- chip::app::DataModel::List<const chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTable::Type>>>(
+ chip::app::DataModel::List<const chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTableStruct::Type>>>(
Id, "route-table", Attributes::RouteTable::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint32_t>>>(
Id, "partition-id", 0, UINT32_MAX, Attributes::PartitionId::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
@@ -12840,8 +12840,8 @@
chip::app::Clusters::ThreadNetworkDiagnostics::Structs::OperationalDatasetComponents::Type>>>(
Id, "operational-dataset-components", Attributes::OperationalDatasetComponents::Id, WriteCommandType::kForceWrite,
credsIssuerConfig), //
- make_unique<
- WriteAttributeAsComplex<chip::app::DataModel::List<const chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFault>>>(
+ make_unique<WriteAttributeAsComplex<
+ chip::app::DataModel::List<const chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFaultEnum>>>(
Id, "active-network-faults-list", Attributes::ActiveNetworkFaultsList::Id, WriteCommandType::kForceWrite,
credsIssuerConfig), //
make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp
index 569a8e7..3240478 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 @@
}
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 @@
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 @@
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 @@
}
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 @@
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("RouteTable.allocated", "allocated", value.isMember("allocated")));
- ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("RouteTable.linkEstablished", "linkEstablished",
+ 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("RouteTableStruct.allocated", "allocated", value.isMember("allocated")));
+ ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("RouteTableStruct.linkEstablished", "linkEstablished",
value.isMember("linkEstablished")));
char labelWithMember[kMaxLabelLength];
@@ -1219,7 +1224,7 @@
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 5bffae9..3393c80 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 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 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 6e7f079..a4d2745 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 @@
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(const char * label, size_t indent,
- const chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTable::DecodableType & value)
+ const chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTableStruct::DecodableType & value)
{
DataModelLogger::LogString(label, indent, "{");
{
@@ -6464,7 +6464,7 @@
return DataModelLogger::LogValue("Channel", 1, value);
}
case ThreadNetworkDiagnostics::Attributes::RoutingRole::Id: {
- chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRole> value;
+ chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRoleEnum> value;
ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
return DataModelLogger::LogValue("RoutingRole", 1, value);
}
@@ -6495,13 +6495,14 @@
}
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::Clusters::ThreadNetworkDiagnostics::Structs::RouteTable::DecodableType>
+ chip::app::DataModel::DecodableList<
+ chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTableStruct::DecodableType>
value;
ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
return DataModelLogger::LogValue("RouteTable", 1, value);
@@ -6775,7 +6776,7 @@
return DataModelLogger::LogValue("OperationalDatasetComponents", 1, value);
}
case ThreadNetworkDiagnostics::Attributes::ActiveNetworkFaultsList::Id: {
- chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFault> value;
+ chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFaultEnum> 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 4819d5e..62a813d 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,
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 5abc3d5..1d762fc 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 @@
case 2:
VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
{
- chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRole> value;
+ chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRoleEnum> value;
VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8"));
VerifyOrReturn(CheckConstraintMinValue("value", value, 0U));
@@ -53366,7 +53366,7 @@
case 33:
VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
{
- chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFault> value;
+ chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFaultEnum> value;
VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
VerifyOrReturn(CheckConstraintType("value", "list", "list"));
}
