Fix some Thread Network Diagnostics XML/ZAP issues. (#21692)
* Rename "ChannelMask" to "ChannelPage0Mask" to align with spec.
* Rename "delay" to "Delay" to align with spec.
* Add SecurityPolicy and OperationalDatasetComponents to the "must be external"
list, since they are struct-typed.
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 7c8fb0b..ca1e64e 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
@@ -1373,7 +1373,7 @@
readonly attribute nullable int64u pendingTimestamp = 57;
readonly attribute nullable int32u delay = 58;
readonly attribute nullable SecurityPolicy securityPolicy = 59;
- readonly attribute nullable octet_string<4> channelMask = 60;
+ readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
readonly attribute bitmap32 featureMap = 65532;
@@ -4058,7 +4058,7 @@
callback attribute pendingTimestamp;
callback attribute delay;
callback attribute securityPolicy;
- callback attribute channelMask;
+ callback attribute channelPage0Mask;
callback attribute operationalDatasetComponents;
callback attribute activeNetworkFaultsList;
ram attribute featureMap default = 0x000F;
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 08da101..2c81c4a 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
@@ -1236,7 +1236,7 @@
readonly attribute nullable int8u stableDataVersion = 12;
readonly attribute nullable int8u leaderRouterId = 13;
readonly attribute nullable SecurityPolicy securityPolicy = 59;
- readonly attribute nullable octet_string<4> channelMask = 60;
+ readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
readonly attribute bitmap32 featureMap = 65532;
@@ -3412,7 +3412,7 @@
callback attribute stableDataVersion;
callback attribute leaderRouterId;
callback attribute securityPolicy;
- callback attribute channelMask;
+ callback attribute channelPage0Mask;
callback attribute operationalDatasetComponents;
callback attribute activeNetworkFaultsList;
ram attribute featureMap;
diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter
index e9d6b46..5c0e2e6 100644
--- a/examples/bridge-app/bridge-common/bridge-app.matter
+++ b/examples/bridge-app/bridge-common/bridge-app.matter
@@ -1064,7 +1064,7 @@
readonly attribute nullable int64u pendingTimestamp = 57;
readonly attribute nullable int32u delay = 58;
readonly attribute nullable SecurityPolicy securityPolicy = 59;
- readonly attribute nullable octet_string<4> channelMask = 60;
+ readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
readonly attribute bitmap32 featureMap = 65532;
@@ -1647,7 +1647,7 @@
callback attribute pendingTimestamp;
callback attribute delay;
callback attribute securityPolicy;
- callback attribute channelMask;
+ callback attribute channelPage0Mask;
callback attribute operationalDatasetComponents;
callback attribute activeNetworkFaultsList;
ram attribute featureMap default = 15;
diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
index 6255126..88e4903 100644
--- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
+++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
@@ -1034,7 +1034,7 @@
readonly attribute nullable int64u pendingTimestamp = 57;
readonly attribute nullable int32u delay = 58;
readonly attribute nullable SecurityPolicy securityPolicy = 59;
- readonly attribute nullable octet_string<4> channelMask = 60;
+ readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
readonly attribute bitmap32 featureMap = 65532;
@@ -1573,7 +1573,7 @@
callback attribute pendingTimestamp;
callback attribute delay;
callback attribute securityPolicy;
- callback attribute channelMask;
+ callback attribute channelPage0Mask;
callback attribute operationalDatasetComponents;
callback attribute activeNetworkFaultsList;
ram attribute featureMap default = 0x000F;
diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
index 09d5732..49ea336 100644
--- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
+++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
@@ -913,7 +913,7 @@
readonly attribute nullable int64u pendingTimestamp = 57;
readonly attribute nullable int32u delay = 58;
readonly attribute nullable SecurityPolicy securityPolicy = 59;
- readonly attribute nullable octet_string<4> channelMask = 60;
+ readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
readonly attribute bitmap32 featureMap = 65532;
@@ -1468,7 +1468,7 @@
callback attribute pendingTimestamp;
callback attribute delay;
callback attribute securityPolicy;
- callback attribute channelMask;
+ callback attribute channelPage0Mask;
callback attribute operationalDatasetComponents;
callback attribute activeNetworkFaultsList;
ram attribute featureMap default = 0x000F;
diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
index 4dd4b1e..a6c9d6b 100644
--- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
+++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
@@ -1168,7 +1168,7 @@
readonly attribute nullable int64u pendingTimestamp = 57;
readonly attribute nullable int32u delay = 58;
readonly attribute nullable SecurityPolicy securityPolicy = 59;
- readonly attribute nullable octet_string<4> channelMask = 60;
+ readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
readonly attribute bitmap32 featureMap = 65532;
@@ -1720,7 +1720,7 @@
callback attribute pendingTimestamp;
callback attribute delay;
callback attribute securityPolicy;
- callback attribute channelMask;
+ callback attribute channelPage0Mask;
callback attribute operationalDatasetComponents;
callback attribute activeNetworkFaultsList;
ram attribute featureMap default = 0x000F;
diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
index 2a00a52..bb7d739 100644
--- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
+++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
@@ -1135,7 +1135,7 @@
readonly attribute nullable int64u pendingTimestamp = 57;
readonly attribute nullable int32u delay = 58;
readonly attribute nullable SecurityPolicy securityPolicy = 59;
- readonly attribute nullable octet_string<4> channelMask = 60;
+ readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
readonly attribute bitmap32 featureMap = 65532;
@@ -2075,7 +2075,7 @@
callback attribute pendingTimestamp;
callback attribute delay;
callback attribute securityPolicy;
- callback attribute channelMask;
+ callback attribute channelPage0Mask;
callback attribute operationalDatasetComponents;
callback attribute activeNetworkFaultsList;
ram attribute featureMap default = 0x000F;
diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
index 519f831..290f97c 100644
--- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
+++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
@@ -1168,7 +1168,7 @@
readonly attribute nullable int64u pendingTimestamp = 57;
readonly attribute nullable int32u delay = 58;
readonly attribute nullable SecurityPolicy securityPolicy = 59;
- readonly attribute nullable octet_string<4> channelMask = 60;
+ readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
readonly attribute bitmap32 featureMap = 65532;
@@ -1834,7 +1834,7 @@
callback attribute pendingTimestamp;
callback attribute delay;
callback attribute securityPolicy;
- callback attribute channelMask;
+ callback attribute channelPage0Mask;
callback attribute operationalDatasetComponents;
callback attribute activeNetworkFaultsList;
ram attribute featureMap default = 0x000F;
diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
index 69355b3..643a9f8 100644
--- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
+++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
@@ -926,7 +926,7 @@
readonly attribute nullable int64u pendingTimestamp = 57;
readonly attribute nullable int32u delay = 58;
readonly attribute nullable SecurityPolicy securityPolicy = 59;
- readonly attribute nullable octet_string<4> channelMask = 60;
+ readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
readonly attribute bitmap32 featureMap = 65532;
@@ -1480,7 +1480,7 @@
callback attribute pendingTimestamp;
callback attribute delay;
callback attribute securityPolicy;
- callback attribute channelMask;
+ callback attribute channelPage0Mask;
callback attribute operationalDatasetComponents;
callback attribute activeNetworkFaultsList;
ram attribute featureMap default = 0x000F;
diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
index a5a1ebd..0298dc9 100644
--- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
+++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
@@ -1161,7 +1161,7 @@
readonly attribute nullable int64u pendingTimestamp = 57;
readonly attribute nullable int32u delay = 58;
readonly attribute nullable SecurityPolicy securityPolicy = 59;
- readonly attribute nullable octet_string<4> channelMask = 60;
+ readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
readonly attribute bitmap32 featureMap = 65532;
@@ -1828,7 +1828,7 @@
callback attribute pendingTimestamp;
callback attribute delay;
callback attribute securityPolicy;
- callback attribute channelMask;
+ callback attribute channelPage0Mask;
callback attribute operationalDatasetComponents;
callback attribute activeNetworkFaultsList;
ram attribute featureMap default = 0x000F;
diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
index daefd53..d7283b1 100644
--- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
+++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
@@ -926,7 +926,7 @@
readonly attribute nullable int64u pendingTimestamp = 57;
readonly attribute nullable int32u delay = 58;
readonly attribute nullable SecurityPolicy securityPolicy = 59;
- readonly attribute nullable octet_string<4> channelMask = 60;
+ readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
readonly attribute bitmap32 featureMap = 65532;
@@ -1480,7 +1480,7 @@
callback attribute pendingTimestamp;
callback attribute delay;
callback attribute securityPolicy;
- callback attribute channelMask;
+ callback attribute channelPage0Mask;
callback attribute operationalDatasetComponents;
callback attribute activeNetworkFaultsList;
ram attribute featureMap default = 0x000F;
diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
index 44d86fa..82a55dc 100644
--- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
+++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
@@ -926,7 +926,7 @@
readonly attribute nullable int64u pendingTimestamp = 57;
readonly attribute nullable int32u delay = 58;
readonly attribute nullable SecurityPolicy securityPolicy = 59;
- readonly attribute nullable octet_string<4> channelMask = 60;
+ readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
readonly attribute bitmap32 featureMap = 65532;
@@ -1484,7 +1484,7 @@
callback attribute pendingTimestamp;
callback attribute delay;
callback attribute securityPolicy;
- callback attribute channelMask;
+ callback attribute channelPage0Mask;
callback attribute operationalDatasetComponents;
callback attribute activeNetworkFaultsList;
ram attribute featureMap default = 0x000F;
diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
index f0876d2..51bd188 100644
--- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
+++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
@@ -926,7 +926,7 @@
readonly attribute nullable int64u pendingTimestamp = 57;
readonly attribute nullable int32u delay = 58;
readonly attribute nullable SecurityPolicy securityPolicy = 59;
- readonly attribute nullable octet_string<4> channelMask = 60;
+ readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
readonly attribute bitmap32 featureMap = 65532;
@@ -1479,7 +1479,7 @@
callback attribute pendingTimestamp;
callback attribute delay;
callback attribute securityPolicy;
- callback attribute channelMask;
+ callback attribute channelPage0Mask;
callback attribute operationalDatasetComponents;
callback attribute activeNetworkFaultsList;
ram attribute featureMap default = 0x000F;
diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
index 04ae16d..f695c69 100644
--- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
+++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
@@ -1168,7 +1168,7 @@
readonly attribute nullable int64u pendingTimestamp = 57;
readonly attribute nullable int32u delay = 58;
readonly attribute nullable SecurityPolicy securityPolicy = 59;
- readonly attribute nullable octet_string<4> channelMask = 60;
+ readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
readonly attribute bitmap32 featureMap = 65532;
@@ -1710,7 +1710,7 @@
callback attribute pendingTimestamp;
callback attribute delay;
callback attribute securityPolicy;
- callback attribute channelMask;
+ callback attribute channelPage0Mask;
callback attribute operationalDatasetComponents;
callback attribute activeNetworkFaultsList;
ram attribute featureMap default = 0x000F;
diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
index de5359e..d02bfd2 100644
--- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
+++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
@@ -1227,7 +1227,7 @@
readonly attribute nullable int64u pendingTimestamp = 57;
readonly attribute nullable int32u delay = 58;
readonly attribute nullable SecurityPolicy securityPolicy = 59;
- readonly attribute nullable octet_string<4> channelMask = 60;
+ readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
readonly attribute bitmap32 featureMap = 65532;
@@ -1769,7 +1769,7 @@
callback attribute pendingTimestamp;
callback attribute delay;
callback attribute securityPolicy;
- callback attribute channelMask;
+ callback attribute channelPage0Mask;
callback attribute operationalDatasetComponents;
callback attribute activeNetworkFaultsList;
ram attribute featureMap default = 0x000F;
diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
index 9399d10..434da30 100644
--- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
+++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
@@ -1074,7 +1074,7 @@
readonly attribute nullable int64u pendingTimestamp = 57;
readonly attribute nullable int32u delay = 58;
readonly attribute nullable SecurityPolicy securityPolicy = 59;
- readonly attribute nullable octet_string<4> channelMask = 60;
+ readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
readonly attribute bitmap32 featureMap = 65532;
@@ -1616,7 +1616,7 @@
callback attribute pendingTimestamp;
callback attribute delay;
callback attribute securityPolicy;
- callback attribute channelMask;
+ callback attribute channelPage0Mask;
callback attribute operationalDatasetComponents;
callback attribute activeNetworkFaultsList;
ram attribute featureMap default = 0x000F;
diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
index ef125db..12e9a22 100644
--- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
+++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
@@ -926,7 +926,7 @@
readonly attribute nullable int64u pendingTimestamp = 57;
readonly attribute nullable int32u delay = 58;
readonly attribute nullable SecurityPolicy securityPolicy = 59;
- readonly attribute nullable octet_string<4> channelMask = 60;
+ readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
readonly attribute bitmap32 featureMap = 65532;
@@ -1483,7 +1483,7 @@
callback attribute pendingTimestamp;
callback attribute delay;
callback attribute securityPolicy;
- callback attribute channelMask;
+ callback attribute channelPage0Mask;
callback attribute operationalDatasetComponents;
callback attribute activeNetworkFaultsList;
ram attribute featureMap default = 0x000F;
diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
index e312606..709ac25 100644
--- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
+++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
@@ -1048,7 +1048,7 @@
readonly attribute nullable int64u pendingTimestamp = 57;
readonly attribute nullable int32u delay = 58;
readonly attribute nullable SecurityPolicy securityPolicy = 59;
- readonly attribute nullable octet_string<4> channelMask = 60;
+ readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
readonly attribute bitmap32 featureMap = 65532;
@@ -1590,7 +1590,7 @@
callback attribute pendingTimestamp;
callback attribute delay;
callback attribute securityPolicy;
- callback attribute channelMask;
+ callback attribute channelPage0Mask;
callback attribute operationalDatasetComponents;
callback attribute activeNetworkFaultsList;
ram attribute featureMap default = 0x000F;
diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter
index 0317222..759a2a2 100644
--- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter
+++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter
@@ -926,7 +926,7 @@
readonly attribute nullable int64u pendingTimestamp = 57;
readonly attribute nullable int32u delay = 58;
readonly attribute nullable SecurityPolicy securityPolicy = 59;
- readonly attribute nullable octet_string<4> channelMask = 60;
+ readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
readonly attribute bitmap32 featureMap = 65532;
@@ -1479,7 +1479,7 @@
callback attribute pendingTimestamp;
callback attribute delay;
callback attribute securityPolicy;
- callback attribute channelMask;
+ callback attribute channelPage0Mask;
callback attribute operationalDatasetComponents;
callback attribute activeNetworkFaultsList;
ram attribute featureMap default = 0x000F;
diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
index 5cfbad9..cbccf1d 100644
--- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
+++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
@@ -1024,7 +1024,7 @@
readonly attribute nullable int64u pendingTimestamp = 57;
readonly attribute nullable int32u delay = 58;
readonly attribute nullable SecurityPolicy securityPolicy = 59;
- readonly attribute nullable octet_string<4> channelMask = 60;
+ readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
readonly attribute bitmap32 featureMap = 65532;
@@ -1728,7 +1728,7 @@
callback attribute pendingTimestamp;
callback attribute delay;
callback attribute securityPolicy;
- callback attribute channelMask;
+ callback attribute channelPage0Mask;
callback attribute operationalDatasetComponents;
callback attribute activeNetworkFaultsList;
ram attribute featureMap default = 0x000F;
diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter
index 09d38c7..6118a68 100644
--- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter
+++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter
@@ -1024,7 +1024,7 @@
readonly attribute nullable int64u pendingTimestamp = 57;
readonly attribute nullable int32u delay = 58;
readonly attribute nullable SecurityPolicy securityPolicy = 59;
- readonly attribute nullable octet_string<4> channelMask = 60;
+ readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
readonly attribute bitmap32 featureMap = 65532;
@@ -1708,7 +1708,7 @@
callback attribute pendingTimestamp;
callback attribute delay;
callback attribute securityPolicy;
- callback attribute channelMask;
+ callback attribute channelPage0Mask;
callback attribute operationalDatasetComponents;
callback attribute activeNetworkFaultsList;
ram attribute featureMap default = 0x000F;
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 6790edb..eb6f3d2 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
@@ -1113,7 +1113,7 @@
readonly attribute nullable int64u pendingTimestamp = 57;
readonly attribute nullable int32u delay = 58;
readonly attribute nullable SecurityPolicy securityPolicy = 59;
- readonly attribute nullable octet_string<4> channelMask = 60;
+ readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
readonly attribute bitmap32 featureMap = 65532;
@@ -1901,7 +1901,7 @@
callback attribute pendingTimestamp;
callback attribute delay;
callback attribute securityPolicy;
- callback attribute channelMask;
+ callback attribute channelPage0Mask;
callback attribute operationalDatasetComponents;
callback attribute activeNetworkFaultsList;
ram attribute featureMap default = 0x000F;
diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter
index 05b2a97..cf7b3b4 100644
--- a/examples/lighting-app/lighting-common/lighting-app.matter
+++ b/examples/lighting-app/lighting-common/lighting-app.matter
@@ -1064,7 +1064,7 @@
readonly attribute nullable int64u pendingTimestamp = 57;
readonly attribute nullable int32u delay = 58;
readonly attribute nullable SecurityPolicy securityPolicy = 59;
- readonly attribute nullable octet_string<4> channelMask = 60;
+ readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
readonly attribute bitmap32 featureMap = 65532;
@@ -1883,7 +1883,7 @@
callback attribute pendingTimestamp;
callback attribute delay;
callback attribute securityPolicy;
- callback attribute channelMask;
+ callback attribute channelPage0Mask;
callback attribute operationalDatasetComponents;
callback attribute activeNetworkFaultsList;
ram attribute featureMap default = 0x000F;
diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter
index a418b42..e9ecd31 100644
--- a/examples/lock-app/lock-common/lock-app.matter
+++ b/examples/lock-app/lock-common/lock-app.matter
@@ -1030,7 +1030,7 @@
readonly attribute nullable int64u pendingTimestamp = 57;
readonly attribute nullable int32u delay = 58;
readonly attribute nullable SecurityPolicy securityPolicy = 59;
- readonly attribute nullable octet_string<4> channelMask = 60;
+ readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
readonly attribute bitmap32 featureMap = 65532;
@@ -2127,7 +2127,7 @@
callback attribute pendingTimestamp;
callback attribute delay;
callback attribute securityPolicy;
- callback attribute channelMask;
+ callback attribute channelPage0Mask;
callback attribute operationalDatasetComponents;
callback attribute activeNetworkFaultsList;
ram attribute featureMap default = 0x000F;
diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter
index 16a476f..66bbc6e 100644
--- a/examples/pump-app/pump-common/pump-app.matter
+++ b/examples/pump-app/pump-common/pump-app.matter
@@ -853,7 +853,7 @@
readonly attribute nullable int8u stableDataVersion = 12;
readonly attribute nullable int8u leaderRouterId = 13;
readonly attribute nullable SecurityPolicy securityPolicy = 59;
- readonly attribute nullable octet_string<4> channelMask = 60;
+ readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
readonly attribute command_id generatedCommandList[] = 65528;
@@ -1362,7 +1362,7 @@
callback attribute stableDataVersion;
callback attribute leaderRouterId;
callback attribute securityPolicy;
- callback attribute channelMask;
+ callback attribute channelPage0Mask;
callback attribute operationalDatasetComponents;
callback attribute activeNetworkFaultsList;
callback attribute generatedCommandList;
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 84df572..fea6937 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
@@ -757,7 +757,7 @@
readonly attribute nullable int8u stableDataVersion = 12;
readonly attribute nullable int8u leaderRouterId = 13;
readonly attribute nullable SecurityPolicy securityPolicy = 59;
- readonly attribute nullable octet_string<4> channelMask = 60;
+ readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
readonly attribute command_id generatedCommandList[] = 65528;
@@ -1223,7 +1223,7 @@
callback attribute stableDataVersion;
callback attribute leaderRouterId;
callback attribute securityPolicy;
- callback attribute channelMask;
+ callback attribute channelPage0Mask;
callback attribute operationalDatasetComponents;
callback attribute activeNetworkFaultsList;
callback attribute generatedCommandList;
diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter
index cdb60d4..3fda6b1 100644
--- a/examples/thermostat/thermostat-common/thermostat.matter
+++ b/examples/thermostat/thermostat-common/thermostat.matter
@@ -1071,7 +1071,7 @@
readonly attribute nullable int64u pendingTimestamp = 57;
readonly attribute nullable int32u delay = 58;
readonly attribute nullable SecurityPolicy securityPolicy = 59;
- readonly attribute nullable octet_string<4> channelMask = 60;
+ readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
readonly attribute bitmap32 featureMap = 65532;
@@ -1639,7 +1639,7 @@
callback attribute pendingTimestamp;
callback attribute delay;
callback attribute securityPolicy;
- callback attribute channelMask;
+ callback attribute channelPage0Mask;
callback attribute operationalDatasetComponents;
callback attribute activeNetworkFaultsList;
ram attribute featureMap default = 0x000F;
diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter
index b4314d0..f5bc82f 100644
--- a/examples/tv-app/tv-common/tv-app.matter
+++ b/examples/tv-app/tv-common/tv-app.matter
@@ -1111,7 +1111,7 @@
readonly attribute nullable int64u pendingTimestamp = 57;
readonly attribute nullable int32u delay = 58;
readonly attribute nullable SecurityPolicy securityPolicy = 59;
- readonly attribute nullable octet_string<4> channelMask = 60;
+ readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
readonly attribute bitmap32 featureMap = 65532;
@@ -2316,7 +2316,7 @@
callback attribute pendingTimestamp;
callback attribute delay;
callback attribute securityPolicy;
- callback attribute channelMask;
+ callback attribute channelPage0Mask;
callback attribute operationalDatasetComponents;
callback attribute activeNetworkFaultsList;
ram attribute featureMap default = 0x000F;
diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
index edb1857..1d16ba0 100644
--- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
+++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
@@ -1278,7 +1278,7 @@
readonly attribute nullable int64u pendingTimestamp = 57;
readonly attribute nullable int32u delay = 58;
readonly attribute nullable SecurityPolicy securityPolicy = 59;
- readonly attribute nullable octet_string<4> channelMask = 60;
+ readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
readonly attribute bitmap32 featureMap = 65532;
@@ -2317,7 +2317,7 @@
callback attribute pendingTimestamp;
callback attribute delay;
callback attribute securityPolicy;
- callback attribute channelMask;
+ callback attribute channelPage0Mask;
callback attribute operationalDatasetComponents;
callback attribute activeNetworkFaultsList;
ram attribute featureMap default = 0x000F;
diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter
index 0b38854..66513f7 100644
--- a/examples/window-app/common/window-app.matter
+++ b/examples/window-app/common/window-app.matter
@@ -1110,7 +1110,7 @@
readonly attribute nullable int64u pendingTimestamp = 57;
readonly attribute nullable int32u delay = 58;
readonly attribute nullable SecurityPolicy securityPolicy = 59;
- readonly attribute nullable octet_string<4> channelMask = 60;
+ readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
readonly attribute bitmap32 featureMap = 65532;
@@ -1804,7 +1804,7 @@
callback attribute pendingTimestamp;
callback attribute delay;
callback attribute securityPolicy;
- callback attribute channelMask;
+ callback attribute channelPage0Mask;
callback attribute operationalDatasetComponents;
callback attribute activeNetworkFaultsList;
ram attribute featureMap default = 0x000F;
diff --git a/src/app/clusters/thread-network-diagnostics-server/thread-network-diagnostics-server.cpp b/src/app/clusters/thread-network-diagnostics-server/thread-network-diagnostics-server.cpp
index 8ab1b7a..d92228b 100644
--- a/src/app/clusters/thread-network-diagnostics-server/thread-network-diagnostics-server.cpp
+++ b/src/app/clusters/thread-network-diagnostics-server/thread-network-diagnostics-server.cpp
@@ -123,7 +123,7 @@
case ThreadNetworkDiagnostics::Attributes::ActiveTimestamp::Id:
case ThreadNetworkDiagnostics::Attributes::PendingTimestamp::Id:
case ThreadNetworkDiagnostics::Attributes::Delay::Id:
- case ThreadNetworkDiagnostics::Attributes::ChannelMask::Id:
+ case ThreadNetworkDiagnostics::Attributes::ChannelPage0Mask::Id:
return ConnectivityMgr().WriteThreadNetworkDiagnosticAttributeToTlv(aPath.mAttributeId, aEncoder);
default:
break;
diff --git a/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_1.yaml b/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_1.yaml
index cf0c49d..2696772 100644
--- a/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_1.yaml
@@ -416,7 +416,7 @@
- label: "TH reads Delay attribute value from DUT"
PICS: DGTHREAD.S.A003a
command: "readAttribute"
- attribute: "delay"
+ attribute: "Delay"
response:
constraints:
type: int32u
@@ -452,7 +452,7 @@
- label: "TH reads ChannelPage0Mask attribute value from DUT"
PICS: DGTHREAD.S.A003c
command: "readAttribute"
- attribute: "ChannelMask"
+ attribute: "ChannelPage0Mask"
response:
constraints:
type: octet_string
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 dfbd481..c25db2a 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
@@ -152,9 +152,9 @@
<attribute side="server" code="0x37" define="RX_ERR_OTHER_COUNT" type="INT32U" min="0x00000000" max="0xFFFFFFFF" writable="false" default="0x0000" optional="true">RxErrOtherCount</attribute>
<attribute side="server" code="0x38" define="ACTIVE_TIMESTAMP" type="INT64U" min="0x0000000000000000" max="0xFFFFFFFFFFFFFFFF" writable="false" default="0x0000000000000000" isNullable="true" optional="true">ActiveTimestamp</attribute>
<attribute side="server" code="0x39" define="PENDING_TIMESTAMP" type="INT64U" min="0x0000000000000000" max="0xFFFFFFFFFFFFFFFF" writable="false" default="0x0000000000000000" isNullable="true" optional="true">PendingTimestamp</attribute>
- <attribute side="server" code="0x3A" define="DELAY" type="INT32U" min="0x00000000" max="0xFFFFFFFF" writable="false" default="0x0000" isNullable="true" optional="true">delay</attribute>
+ <attribute side="server" code="0x3A" define="DELAY" type="INT32U" min="0x00000000" max="0xFFFFFFFF" writable="false" default="0x0000" isNullable="true" optional="true">Delay</attribute>
<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">ChannelMask</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>
<command source="client" code="0x00" name="ResetCounts" optional="true" cli="chip thread_network_diagnostics resetcounts">
diff --git a/src/app/zap-templates/zcl/zcl-with-test-extensions.json b/src/app/zap-templates/zcl/zcl-with-test-extensions.json
index 83b1b3d..f717d05 100644
--- a/src/app/zap-templates/zcl/zcl-with-test-extensions.json
+++ b/src/app/zap-templates/zcl/zcl-with-test-extensions.json
@@ -239,8 +239,10 @@
"RxErrOtherCount",
"ActiveTimestamp",
"PendingTimestamp",
- "delay",
- "ChannelMask"
+ "Delay",
+ "SecurityPolicy",
+ "ChannelPage0Mask",
+ "OperationalDatasetComponents"
],
"WiFi Network Diagnostics": [
"bssid",
diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json
index 525bf98..c9ff659 100644
--- a/src/app/zap-templates/zcl/zcl.json
+++ b/src/app/zap-templates/zcl/zcl.json
@@ -233,8 +233,10 @@
"RxErrOtherCount",
"ActiveTimestamp",
"PendingTimestamp",
- "delay",
- "ChannelMask"
+ "Delay",
+ "SecurityPolicy",
+ "ChannelPage0Mask",
+ "OperationalDatasetComponents"
],
"WiFi Network Diagnostics": [
"bssid",
diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
index 6da4a9f..7e48829 100644
--- a/src/controller/data_model/controller-clusters.matter
+++ b/src/controller/data_model/controller-clusters.matter
@@ -1552,7 +1552,7 @@
readonly attribute nullable int64u pendingTimestamp = 57;
readonly attribute nullable int32u delay = 58;
readonly attribute nullable SecurityPolicy securityPolicy = 59;
- readonly attribute nullable octet_string<4> channelMask = 60;
+ readonly attribute nullable octet_string<4> channelPage0Mask = 60;
readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
readonly attribute command_id generatedCommandList[] = 65528;
diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
index 0804e3c..be8458b 100644
--- a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
+++ b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
@@ -6686,8 +6686,8 @@
}
return value;
}
- case Attributes::ChannelMask::Id: {
- using TypeInfo = Attributes::ChannelMask::TypeInfo;
+ case Attributes::ChannelPage0Mask::Id: {
+ using TypeInfo = Attributes::ChannelPage0Mask::TypeInfo;
TypeInfo::DecodableType cppValue;
*aError = app::DataModel::Decode(aReader, cppValue);
if (*aError != CHIP_NO_ERROR)
diff --git a/src/controller/java/zap-generated/CHIPCallbackTypes.h b/src/controller/java/zap-generated/CHIPCallbackTypes.h
index a4a6ec8..3ec74ab 100644
--- a/src/controller/java/zap-generated/CHIPCallbackTypes.h
+++ b/src/controller/java/zap-generated/CHIPCallbackTypes.h
@@ -694,8 +694,8 @@
void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::Delay::TypeInfo::DecodableArgType);
typedef void (*CHIPThreadNetworkDiagnosticsClusterSecurityPolicyAttributeCallbackType)(
void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::SecurityPolicy::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterChannelMaskAttributeCallbackType)(
- void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::ChannelMask::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterChannelPage0MaskAttributeCallbackType)(
+ void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::ChannelPage0Mask::TypeInfo::DecodableArgType);
typedef void (*CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponentsAttributeCallbackType)(
void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::OperationalDatasetComponents::TypeInfo::DecodableArgType);
typedef void (*CHIPThreadNetworkDiagnosticsClusterActiveNetworkFaultsListAttributeCallbackType)(
diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp
index 4cd55ea..647f9bf 100644
--- a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp
+++ b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp
@@ -9933,9 +9933,9 @@
env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
}
-CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback::CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback(
+CHIPThreadNetworkDiagnosticsChannelPage0MaskAttributeCallback::CHIPThreadNetworkDiagnosticsChannelPage0MaskAttributeCallback(
jobject javaCallback, bool keepAlive) :
- chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterChannelMaskAttributeCallbackType>(CallbackFn, this),
+ chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterChannelPage0MaskAttributeCallbackType>(CallbackFn, this),
keepAlive(keepAlive)
{
JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -9952,7 +9952,7 @@
}
}
-CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback::~CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback()
+CHIPThreadNetworkDiagnosticsChannelPage0MaskAttributeCallback::~CHIPThreadNetworkDiagnosticsChannelPage0MaskAttributeCallback()
{
JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
if (env == nullptr)
@@ -9963,7 +9963,7 @@
env->DeleteGlobalRef(javaCallbackRef);
}
-void CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback::CallbackFn(
+void CHIPThreadNetworkDiagnosticsChannelPage0MaskAttributeCallback::CallbackFn(
void * context, const chip::app::DataModel::Nullable<chip::ByteSpan> & value)
{
chip::DeviceLayer::StackUnlock unlock;
@@ -9972,8 +9972,8 @@
jobject javaCallbackRef;
VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
- std::unique_ptr<CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback, decltype(&maybeDestroy)> cppCallback(
- reinterpret_cast<CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback *>(context), maybeDestroy);
+ std::unique_ptr<CHIPThreadNetworkDiagnosticsChannelPage0MaskAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+ reinterpret_cast<CHIPThreadNetworkDiagnosticsChannelPage0MaskAttributeCallback *>(context), maybeDestroy);
// It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
javaCallbackRef = cppCallback.get()->javaCallbackRef;
diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.h b/src/controller/java/zap-generated/CHIPReadCallbacks.h
index effa50a..99bbaec 100644
--- a/src/controller/java/zap-generated/CHIPReadCallbacks.h
+++ b/src/controller/java/zap-generated/CHIPReadCallbacks.h
@@ -4082,20 +4082,20 @@
bool keepAlive;
};
-class CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback
- : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterChannelMaskAttributeCallbackType>
+class CHIPThreadNetworkDiagnosticsChannelPage0MaskAttributeCallback
+ : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterChannelPage0MaskAttributeCallbackType>
{
public:
- CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback(jobject javaCallback, bool keepAlive = false);
+ CHIPThreadNetworkDiagnosticsChannelPage0MaskAttributeCallback(jobject javaCallback, bool keepAlive = false);
- ~CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback();
+ ~CHIPThreadNetworkDiagnosticsChannelPage0MaskAttributeCallback();
- static void maybeDestroy(CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback * callback)
+ static void maybeDestroy(CHIPThreadNetworkDiagnosticsChannelPage0MaskAttributeCallback * callback)
{
if (!callback->keepAlive)
{
callback->Cancel();
- chip::Platform::Delete<CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback>(callback);
+ chip::Platform::Delete<CHIPThreadNetworkDiagnosticsChannelPage0MaskAttributeCallback>(callback);
}
}
@@ -4103,7 +4103,7 @@
static void OnSubscriptionEstablished(void * context)
{
CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
- reinterpret_cast<CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback *>(context)->javaCallbackRef);
+ reinterpret_cast<CHIPThreadNetworkDiagnosticsChannelPage0MaskAttributeCallback *>(context)->javaCallbackRef);
VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
};
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
index 7245413..9c791da 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
@@ -7277,7 +7277,7 @@
default void onSubscriptionEstablished() {}
}
- public interface ChannelMaskAttributeCallback {
+ public interface ChannelPage0MaskAttributeCallback {
void onSuccess(@Nullable byte[] value);
void onError(Exception ex);
@@ -7853,13 +7853,13 @@
subscribeDelayAttribute(chipClusterPtr, callback, minInterval, maxInterval);
}
- public void readChannelMaskAttribute(ChannelMaskAttributeCallback callback) {
- readChannelMaskAttribute(chipClusterPtr, callback);
+ public void readChannelPage0MaskAttribute(ChannelPage0MaskAttributeCallback callback) {
+ readChannelPage0MaskAttribute(chipClusterPtr, callback);
}
- public void subscribeChannelMaskAttribute(
- ChannelMaskAttributeCallback callback, int minInterval, int maxInterval) {
- subscribeChannelMaskAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+ public void subscribeChannelPage0MaskAttribute(
+ ChannelPage0MaskAttributeCallback callback, int minInterval, int maxInterval) {
+ subscribeChannelPage0MaskAttribute(chipClusterPtr, callback, minInterval, maxInterval);
}
public void readActiveNetworkFaultsListAttribute(
@@ -8305,12 +8305,12 @@
private native void subscribeDelayAttribute(
long chipClusterPtr, DelayAttributeCallback callback, int minInterval, int maxInterval);
- private native void readChannelMaskAttribute(
- long chipClusterPtr, ChannelMaskAttributeCallback callback);
+ private native void readChannelPage0MaskAttribute(
+ long chipClusterPtr, ChannelPage0MaskAttributeCallback callback);
- private native void subscribeChannelMaskAttribute(
+ private native void subscribeChannelPage0MaskAttribute(
long chipClusterPtr,
- ChannelMaskAttributeCallback callback,
+ ChannelPage0MaskAttributeCallback callback,
int minInterval,
int maxInterval);
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java
index 3b4c752..9068934 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java
@@ -1214,7 +1214,7 @@
return "SecurityPolicy";
}
if (attributeId == 60L) {
- return "ChannelMask";
+ return "ChannelPage0Mask";
}
if (attributeId == 61L) {
return "OperationalDatasetComponents";
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java
index 44bb3be..2520d1c 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java
@@ -4275,21 +4275,22 @@
readThreadNetworkDiagnosticsDelayCommandParams);
readThreadNetworkDiagnosticsInteractionInfo.put(
"readDelayAttribute", readThreadNetworkDiagnosticsDelayAttributeInteractionInfo);
- Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsChannelMaskCommandParams =
+ Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsChannelPage0MaskCommandParams =
new LinkedHashMap<String, CommandParameterInfo>();
- InteractionInfo readThreadNetworkDiagnosticsChannelMaskAttributeInteractionInfo =
+ InteractionInfo readThreadNetworkDiagnosticsChannelPage0MaskAttributeInteractionInfo =
new InteractionInfo(
(cluster, callback, commandArguments) -> {
((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
- .readChannelMaskAttribute(
- (ChipClusters.ThreadNetworkDiagnosticsCluster.ChannelMaskAttributeCallback)
+ .readChannelPage0MaskAttribute(
+ (ChipClusters.ThreadNetworkDiagnosticsCluster
+ .ChannelPage0MaskAttributeCallback)
callback);
},
() -> new ClusterInfoMapping.DelegatedOctetStringAttributeCallback(),
- readThreadNetworkDiagnosticsChannelMaskCommandParams);
+ readThreadNetworkDiagnosticsChannelPage0MaskCommandParams);
readThreadNetworkDiagnosticsInteractionInfo.put(
- "readChannelMaskAttribute",
- readThreadNetworkDiagnosticsChannelMaskAttributeInteractionInfo);
+ "readChannelPage0MaskAttribute",
+ readThreadNetworkDiagnosticsChannelPage0MaskAttributeInteractionInfo);
Map<String, CommandParameterInfo>
readThreadNetworkDiagnosticsActiveNetworkFaultsListCommandParams =
new LinkedHashMap<String, CommandParameterInfo>();
diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py
index ea60bc8..88d6317 100644
--- a/src/controller/python/chip/clusters/CHIPClusters.py
+++ b/src/controller/python/chip/clusters/CHIPClusters.py
@@ -2557,7 +2557,7 @@
"reportable": True,
},
0x0000003C: {
- "attributeName": "ChannelMask",
+ "attributeName": "ChannelPage0Mask",
"attributeId": 0x0000003C,
"type": "bytes",
"reportable": True,
diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py
index 399f64e..9d623a4 100644
--- a/src/controller/python/chip/clusters/Objects.py
+++ b/src/controller/python/chip/clusters/Objects.py
@@ -7847,7 +7847,7 @@
ClusterObjectFieldDescriptor(Label="pendingTimestamp", Tag=0x00000039, Type=typing.Union[None, Nullable, uint]),
ClusterObjectFieldDescriptor(Label="delay", Tag=0x0000003A, Type=typing.Union[None, Nullable, uint]),
ClusterObjectFieldDescriptor(Label="securityPolicy", Tag=0x0000003B, Type=typing.Union[Nullable, ThreadNetworkDiagnostics.Structs.SecurityPolicy]),
- ClusterObjectFieldDescriptor(Label="channelMask", Tag=0x0000003C, Type=typing.Union[Nullable, bytes]),
+ 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="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]),
@@ -7917,7 +7917,7 @@
pendingTimestamp: 'typing.Union[None, Nullable, uint]' = None
delay: 'typing.Union[None, Nullable, uint]' = None
securityPolicy: 'typing.Union[Nullable, ThreadNetworkDiagnostics.Structs.SecurityPolicy]' = None
- channelMask: 'typing.Union[Nullable, bytes]' = None
+ channelPage0Mask: 'typing.Union[Nullable, bytes]' = None
operationalDatasetComponents: 'typing.Union[Nullable, ThreadNetworkDiagnostics.Structs.OperationalDatasetComponents]' = None
activeNetworkFaultsList: 'typing.List[ThreadNetworkDiagnostics.Enums.NetworkFault]' = None
generatedCommandList: 'typing.List[uint]' = None
@@ -9039,7 +9039,7 @@
value: 'typing.Union[Nullable, ThreadNetworkDiagnostics.Structs.SecurityPolicy]' = NullValue
@dataclass
- class ChannelMask(ClusterAttributeDescriptor):
+ class ChannelPage0Mask(ClusterAttributeDescriptor):
@ChipUtility.classproperty
def cluster_id(cls) -> int:
return 0x0035
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm
index 0f89b2a..fa865ee 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm
@@ -5586,8 +5586,8 @@
}
return value;
}
- case Attributes::ChannelMask::Id: {
- using TypeInfo = Attributes::ChannelMask::TypeInfo;
+ case Attributes::ChannelPage0Mask::Id: {
+ using TypeInfo = Attributes::ChannelPage0Mask::TypeInfo;
TypeInfo::DecodableType cppValue;
*aError = DataModel::Decode(aReader, cppValue);
if (*aError != CHIP_NO_ERROR) {
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
index 710eaa1..f15e630 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
@@ -6422,21 +6422,23 @@
completionHandler:(void (^)(MTRThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable value,
NSError * _Nullable error))completionHandler;
-- (void)readAttributeChannelMaskWithCompletionHandler:(void (^)(
- NSData * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeChannelPage0MaskWithCompletionHandler:(void (^)(NSData * _Nullable value,
+ NSError * _Nullable error))completionHandler;
/**
* This API does not support setting autoResubscribe to NO in the
* MTRSubscribeParams.
*/
-- (void)subscribeAttributeChannelMaskWithMinInterval:(NSNumber * _Nonnull)minInterval
- maxInterval:(NSNumber * _Nonnull)maxInterval
- params:(MTRSubscribeParams * _Nullable)params
- subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
- reportHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeChannelMaskWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer
- endpoint:(NSNumber *)endpoint
- queue:(dispatch_queue_t)queue
- completionHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeChannelPage0MaskWithMinInterval:(NSNumber * _Nonnull)minInterval
+ maxInterval:(NSNumber * _Nonnull)maxInterval
+ params:(MTRSubscribeParams * _Nullable)params
+ subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+ reportHandler:
+ (void (^)(NSData * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeChannelPage0MaskWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer
+ endpoint:(NSNumber *)endpoint
+ queue:(dispatch_queue_t)queue
+ completionHandler:
+ (void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler;
- (void)readAttributeOperationalDatasetComponentsWithCompletionHandler:
(void (^)(MTRThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable value,
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
index 7bab276..2aecf89 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
@@ -26400,12 +26400,12 @@
});
}
-- (void)readAttributeChannelMaskWithCompletionHandler:(void (^)(
- NSData * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeChannelPage0MaskWithCompletionHandler:(void (^)(NSData * _Nullable value,
+ NSError * _Nullable error))completionHandler
{
new MTRNullableOctetStringAttributeCallbackBridge(self.callbackQueue, self.device, completionHandler,
^(ExchangeManager & exchangeManager, const SessionHandle & session, Cancelable * success, Cancelable * failure) {
- using TypeInfo = ThreadNetworkDiagnostics::Attributes::ChannelMask::TypeInfo;
+ using TypeInfo = ThreadNetworkDiagnostics::Attributes::ChannelPage0Mask::TypeInfo;
auto successFn = Callback<NullableOctetStringAttributeCallback>::FromCancelable(success);
auto failureFn = Callback<DefaultFailureCallbackType>::FromCancelable(failure);
chip::Controller::ThreadNetworkDiagnosticsCluster cppCluster(exchangeManager, session, self->_endpoint);
@@ -26413,11 +26413,12 @@
});
}
-- (void)subscribeAttributeChannelMaskWithMinInterval:(NSNumber * _Nonnull)minInterval
- maxInterval:(NSNumber * _Nonnull)maxInterval
- params:(MTRSubscribeParams * _Nullable)params
- subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
- reportHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeChannelPage0MaskWithMinInterval:(NSNumber * _Nonnull)minInterval
+ maxInterval:(NSNumber * _Nonnull)maxInterval
+ params:(MTRSubscribeParams * _Nullable)params
+ subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+ reportHandler:
+ (void (^)(NSData * _Nullable value, NSError * _Nullable error))reportHandler
{
// Make a copy of params before we go async.
minInterval = [minInterval copy];
@@ -26430,7 +26431,7 @@
// We don't support disabling auto-resubscribe.
return CHIP_ERROR_INVALID_ARGUMENT;
}
- using TypeInfo = ThreadNetworkDiagnostics::Attributes::ChannelMask::TypeInfo;
+ using TypeInfo = ThreadNetworkDiagnostics::Attributes::ChannelPage0Mask::TypeInfo;
auto successFn = Callback<NullableOctetStringAttributeCallback>::FromCancelable(success);
auto failureFn = Callback<DefaultFailureCallbackType>::FromCancelable(failure);
@@ -26444,15 +26445,16 @@
subscriptionEstablishedHandler);
}
-+ (void)readAttributeChannelMaskWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer
- endpoint:(NSNumber *)endpoint
- queue:(dispatch_queue_t)queue
- completionHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeChannelPage0MaskWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer
+ endpoint:(NSNumber *)endpoint
+ queue:(dispatch_queue_t)queue
+ completionHandler:
+ (void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler
{
new MTRNullableOctetStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
if (attributeCacheContainer.cppAttributeCache) {
chip::app::ConcreteAttributePath path;
- using TypeInfo = ThreadNetworkDiagnostics::Attributes::ChannelMask::TypeInfo;
+ using TypeInfo = ThreadNetworkDiagnostics::Attributes::ChannelPage0Mask::TypeInfo;
path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
path.mClusterId = TypeInfo::GetClusterId();
path.mAttributeId = TypeInfo::GetAttributeId();
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h
index 60193d1..ba1e102 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h
@@ -481,7 +481,7 @@
MTRClusterThreadNetworkDiagnosticsAttributePendingTimestampID = 0x00000039,
MTRClusterThreadNetworkDiagnosticsAttributeDelayID = 0x0000003A,
MTRClusterThreadNetworkDiagnosticsAttributeSecurityPolicyID = 0x0000003B,
- MTRClusterThreadNetworkDiagnosticsAttributeChannelMaskID = 0x0000003C,
+ MTRClusterThreadNetworkDiagnosticsAttributeChannelPage0MaskID = 0x0000003C,
MTRClusterThreadNetworkDiagnosticsAttributeOperationalDatasetComponentsID = 0x0000003D,
MTRClusterThreadNetworkDiagnosticsAttributeActiveNetworkFaultsListID = 0x0000003E,
MTRClusterThreadNetworkDiagnosticsAttributeGeneratedCommandListID = MTRClusterGlobalAttributeGeneratedCommandListID,
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h
index b954e81..4c72654 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h
@@ -1515,7 +1515,7 @@
- (NSDictionary<NSString *, id> *)readAttributeSecurityPolicyWithParams:(MTRReadParams * _Nullable)params;
-- (NSDictionary<NSString *, id> *)readAttributeChannelMaskWithParams:(MTRReadParams * _Nullable)params;
+- (NSDictionary<NSString *, id> *)readAttributeChannelPage0MaskWithParams:(MTRReadParams * _Nullable)params;
- (NSDictionary<NSString *, id> *)readAttributeOperationalDatasetComponentsWithParams:(MTRReadParams * _Nullable)params;
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm
index 3a5fa5f..e1bf12a 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm
@@ -6233,11 +6233,11 @@
params:params];
}
-- (NSDictionary<NSString *, id> *)readAttributeChannelMaskWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> *)readAttributeChannelPage0MaskWithParams:(MTRReadParams * _Nullable)params
{
return [self.device readAttributeWithEndpointId:@(_endpoint)
clusterId:@(MTRClusterThreadNetworkDiagnosticsID)
- attributeId:@(MTRClusterThreadNetworkDiagnosticsAttributeChannelMaskID)
+ attributeId:@(MTRClusterThreadNetworkDiagnosticsAttributeChannelPage0MaskID)
params:params];
}
diff --git a/src/platform/Linux/ThreadStackManagerImpl.cpp b/src/platform/Linux/ThreadStackManagerImpl.cpp
index 8c3c394..2f9f869 100644
--- a/src/platform/Linux/ThreadStackManagerImpl.cpp
+++ b/src/platform/Linux/ThreadStackManagerImpl.cpp
@@ -700,7 +700,7 @@
case ThreadNetworkDiagnostics::Attributes::ActiveTimestamp::Id:
case ThreadNetworkDiagnostics::Attributes::PendingTimestamp::Id:
case ThreadNetworkDiagnostics::Attributes::Delay::Id:
- case ThreadNetworkDiagnostics::Attributes::ChannelMask::Id:
+ case ThreadNetworkDiagnostics::Attributes::ChannelPage0Mask::Id:
case ThreadNetworkDiagnostics::Attributes::SecurityPolicy::Id:
case ThreadNetworkDiagnostics::Attributes::OperationalDatasetComponents::Id:
err = encoder.EncodeNull();
diff --git a/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.cpp b/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.cpp
index 1acfd00..3fde426 100644
--- a/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.cpp
+++ b/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.cpp
@@ -1587,7 +1587,7 @@
}
break;
- case ThreadNetworkDiagnostics::Attributes::ChannelMask::Id: {
+ case ThreadNetworkDiagnostics::Attributes::ChannelPage0Mask::Id: {
err = CHIP_ERROR_INCORRECT_STATE;
if (otDatasetIsCommissioned(mOTInst))
{
diff --git a/src/platform/webos/ThreadStackManagerImpl.cpp b/src/platform/webos/ThreadStackManagerImpl.cpp
index d342f78..1bb5338 100644
--- a/src/platform/webos/ThreadStackManagerImpl.cpp
+++ b/src/platform/webos/ThreadStackManagerImpl.cpp
@@ -697,7 +697,7 @@
case ThreadNetworkDiagnostics::Attributes::ActiveTimestamp::Id:
case ThreadNetworkDiagnostics::Attributes::PendingTimestamp::Id:
case ThreadNetworkDiagnostics::Attributes::Delay::Id:
- case ThreadNetworkDiagnostics::Attributes::ChannelMask::Id:
+ case ThreadNetworkDiagnostics::Attributes::ChannelPage0Mask::Id:
case ThreadNetworkDiagnostics::Attributes::SecurityPolicy::Id:
case ThreadNetworkDiagnostics::Attributes::OperationalDatasetComponents::Id:
err = encoder.EncodeNull();
diff --git a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h
index 4b820d9..9e47c5e 100644
--- a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h
@@ -651,11 +651,11 @@
{ 0x00000039, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* PendingTimestamp */ \
{ 0x0000003A, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* delay */ \
+ ZAP_EMPTY_DEFAULT() }, /* Delay */ \
{ 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */ \
{ 0x0000003C, ZAP_TYPE(OCTET_STRING), 5, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* ChannelMask */ \
+ ZAP_EMPTY_DEFAULT() }, /* ChannelPage0Mask */ \
{ 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */ \
{ 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
diff --git a/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h b/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h
index 7f67548..ada8022 100644
--- a/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h
@@ -473,7 +473,7 @@
{ 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */ \
{ 0x0000003C, ZAP_TYPE(OCTET_STRING), 5, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* ChannelMask */ \
+ ZAP_EMPTY_DEFAULT() }, /* ChannelPage0Mask */ \
{ 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */ \
{ 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp
index 2589783..b7cc41c 100644
--- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp
+++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp
@@ -7843,7 +7843,7 @@
} // namespace Delay
-namespace ChannelMask {
+namespace ChannelPage0Mask {
EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<chip::MutableByteSpan> & value)
{
@@ -7892,7 +7892,7 @@
return Set(endpoint, value.Value());
}
-} // namespace ChannelMask
+} // namespace ChannelPage0Mask
namespace FeatureMap {
diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h
index 37ef575..82072ee 100644
--- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h
+++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h
@@ -1380,12 +1380,12 @@
EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value);
} // namespace Delay
-namespace ChannelMask {
+namespace ChannelPage0Mask {
EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<chip::MutableByteSpan> & value); // octet_string
EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value);
EmberAfStatus SetNull(chip::EndpointId endpoint);
EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::ByteSpan> & value);
-} // namespace ChannelMask
+} // namespace ChannelPage0Mask
namespace FeatureMap {
EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
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 b29d624..d1663f2 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
@@ -7399,8 +7399,8 @@
case Attributes::SecurityPolicy::TypeInfo::GetAttributeId():
ReturnErrorOnFailure(DataModel::Decode(reader, securityPolicy));
break;
- case Attributes::ChannelMask::TypeInfo::GetAttributeId():
- ReturnErrorOnFailure(DataModel::Decode(reader, channelMask));
+ case Attributes::ChannelPage0Mask::TypeInfo::GetAttributeId():
+ ReturnErrorOnFailure(DataModel::Decode(reader, channelPage0Mask));
break;
case Attributes::OperationalDatasetComponents::TypeInfo::GetAttributeId():
ReturnErrorOnFailure(DataModel::Decode(reader, operationalDatasetComponents));
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 5f6dc00..818cd0f 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
@@ -9107,7 +9107,7 @@
static constexpr bool MustUseTimedWrite() { return false; }
};
} // namespace SecurityPolicy
-namespace ChannelMask {
+namespace ChannelPage0Mask {
struct TypeInfo
{
using Type = chip::app::DataModel::Nullable<chip::ByteSpan>;
@@ -9115,11 +9115,11 @@
using DecodableArgType = const chip::app::DataModel::Nullable<chip::ByteSpan> &;
static constexpr ClusterId GetClusterId() { return Clusters::ThreadNetworkDiagnostics::Id; }
- static constexpr AttributeId GetAttributeId() { return Attributes::ChannelMask::Id; }
+ static constexpr AttributeId GetAttributeId() { return Attributes::ChannelPage0Mask::Id; }
static constexpr bool MustUseTimedWrite() { return false; }
static constexpr size_t MaxLength() { return 4; }
};
-} // namespace ChannelMask
+} // namespace ChannelPage0Mask
namespace OperationalDatasetComponents {
struct TypeInfo
{
@@ -9248,7 +9248,7 @@
Attributes::PendingTimestamp::TypeInfo::DecodableType pendingTimestamp;
Attributes::Delay::TypeInfo::DecodableType delay;
Attributes::SecurityPolicy::TypeInfo::DecodableType securityPolicy;
- Attributes::ChannelMask::TypeInfo::DecodableType channelMask;
+ Attributes::ChannelPage0Mask::TypeInfo::DecodableType channelPage0Mask;
Attributes::OperationalDatasetComponents::TypeInfo::DecodableType operationalDatasetComponents;
Attributes::ActiveNetworkFaultsList::TypeInfo::DecodableType activeNetworkFaultsList;
Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
diff --git a/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h b/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h
index cf351b7..2b7e664 100644
--- a/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h
+++ b/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h
@@ -1504,9 +1504,9 @@
static constexpr AttributeId Id = 0x0000003B;
} // namespace SecurityPolicy
-namespace ChannelMask {
+namespace ChannelPage0Mask {
static constexpr AttributeId Id = 0x0000003C;
-} // namespace ChannelMask
+} // namespace ChannelPage0Mask
namespace OperationalDatasetComponents {
static constexpr AttributeId Id = 0x0000003D;
diff --git a/zzz_generated/bridge-app/zap-generated/endpoint_config.h b/zzz_generated/bridge-app/zap-generated/endpoint_config.h
index b0b251e..e11b58e 100644
--- a/zzz_generated/bridge-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/bridge-app/zap-generated/endpoint_config.h
@@ -344,11 +344,11 @@
{ 0x00000039, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* PendingTimestamp */ \
{ 0x0000003A, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* delay */ \
+ ZAP_EMPTY_DEFAULT() }, /* Delay */ \
{ 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */ \
{ 0x0000003C, ZAP_TYPE(OCTET_STRING), 5, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* ChannelMask */ \
+ ZAP_EMPTY_DEFAULT() }, /* ChannelPage0Mask */ \
{ 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */ \
{ 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
diff --git a/zzz_generated/chef-noip_rootnode_dimmablelight_bCwGYSDpoe/zap-generated/endpoint_config.h b/zzz_generated/chef-noip_rootnode_dimmablelight_bCwGYSDpoe/zap-generated/endpoint_config.h
index 1651ec3..fdfd612 100644
--- a/zzz_generated/chef-noip_rootnode_dimmablelight_bCwGYSDpoe/zap-generated/endpoint_config.h
+++ b/zzz_generated/chef-noip_rootnode_dimmablelight_bCwGYSDpoe/zap-generated/endpoint_config.h
@@ -308,11 +308,11 @@
{ 0x00000039, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* PendingTimestamp */ \
{ 0x0000003A, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* delay */ \
+ ZAP_EMPTY_DEFAULT() }, /* Delay */ \
{ 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */ \
{ 0x0000003C, ZAP_TYPE(OCTET_STRING), 5, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* ChannelMask */ \
+ ZAP_EMPTY_DEFAULT() }, /* ChannelPage0Mask */ \
{ 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */ \
{ 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
diff --git a/zzz_generated/chef-rootnode_contactsensor_lFAGG1bfRO/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_contactsensor_lFAGG1bfRO/zap-generated/endpoint_config.h
index 1c63eaa..e6eeae0 100644
--- a/zzz_generated/chef-rootnode_contactsensor_lFAGG1bfRO/zap-generated/endpoint_config.h
+++ b/zzz_generated/chef-rootnode_contactsensor_lFAGG1bfRO/zap-generated/endpoint_config.h
@@ -317,11 +317,11 @@
{ 0x00000039, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* PendingTimestamp */ \
{ 0x0000003A, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* delay */ \
+ ZAP_EMPTY_DEFAULT() }, /* Delay */ \
{ 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */ \
{ 0x0000003C, ZAP_TYPE(OCTET_STRING), 5, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* ChannelMask */ \
+ ZAP_EMPTY_DEFAULT() }, /* ChannelPage0Mask */ \
{ 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */ \
{ 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
diff --git a/zzz_generated/chef-rootnode_dimmablelight_bCwGYSDpoe/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_dimmablelight_bCwGYSDpoe/zap-generated/endpoint_config.h
index d4f6e59..c5bf7d7 100644
--- a/zzz_generated/chef-rootnode_dimmablelight_bCwGYSDpoe/zap-generated/endpoint_config.h
+++ b/zzz_generated/chef-rootnode_dimmablelight_bCwGYSDpoe/zap-generated/endpoint_config.h
@@ -320,11 +320,11 @@
{ 0x00000039, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* PendingTimestamp */ \
{ 0x0000003A, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* delay */ \
+ ZAP_EMPTY_DEFAULT() }, /* Delay */ \
{ 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */ \
{ 0x0000003C, ZAP_TYPE(OCTET_STRING), 5, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* ChannelMask */ \
+ ZAP_EMPTY_DEFAULT() }, /* ChannelPage0Mask */ \
{ 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */ \
{ 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
diff --git a/zzz_generated/chef-rootnode_doorlock_aNKYAreMXE/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_doorlock_aNKYAreMXE/zap-generated/endpoint_config.h
index f43e1d5..d96c77c 100644
--- a/zzz_generated/chef-rootnode_doorlock_aNKYAreMXE/zap-generated/endpoint_config.h
+++ b/zzz_generated/chef-rootnode_doorlock_aNKYAreMXE/zap-generated/endpoint_config.h
@@ -322,11 +322,11 @@
{ 0x00000039, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* PendingTimestamp */ \
{ 0x0000003A, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* delay */ \
+ ZAP_EMPTY_DEFAULT() }, /* Delay */ \
{ 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */ \
{ 0x0000003C, ZAP_TYPE(OCTET_STRING), 5, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* ChannelMask */ \
+ ZAP_EMPTY_DEFAULT() }, /* ChannelPage0Mask */ \
{ 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */ \
{ 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
diff --git a/zzz_generated/chef-rootnode_extendedcolorlight_8lcaaYJVAa/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_extendedcolorlight_8lcaaYJVAa/zap-generated/endpoint_config.h
index 427b272..8f91e80 100644
--- a/zzz_generated/chef-rootnode_extendedcolorlight_8lcaaYJVAa/zap-generated/endpoint_config.h
+++ b/zzz_generated/chef-rootnode_extendedcolorlight_8lcaaYJVAa/zap-generated/endpoint_config.h
@@ -326,11 +326,11 @@
{ 0x00000039, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* PendingTimestamp */ \
{ 0x0000003A, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* delay */ \
+ ZAP_EMPTY_DEFAULT() }, /* Delay */ \
{ 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */ \
{ 0x0000003C, ZAP_TYPE(OCTET_STRING), 5, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* ChannelMask */ \
+ ZAP_EMPTY_DEFAULT() }, /* ChannelPage0Mask */ \
{ 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */ \
{ 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
diff --git a/zzz_generated/chef-rootnode_flowsensor_1zVxHedlaV/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_flowsensor_1zVxHedlaV/zap-generated/endpoint_config.h
index d083bfd..7edbf35 100644
--- a/zzz_generated/chef-rootnode_flowsensor_1zVxHedlaV/zap-generated/endpoint_config.h
+++ b/zzz_generated/chef-rootnode_flowsensor_1zVxHedlaV/zap-generated/endpoint_config.h
@@ -317,11 +317,11 @@
{ 0x00000039, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* PendingTimestamp */ \
{ 0x0000003A, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* delay */ \
+ ZAP_EMPTY_DEFAULT() }, /* Delay */ \
{ 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */ \
{ 0x0000003C, ZAP_TYPE(OCTET_STRING), 5, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* ChannelMask */ \
+ ZAP_EMPTY_DEFAULT() }, /* ChannelPage0Mask */ \
{ 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */ \
{ 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
diff --git a/zzz_generated/chef-rootnode_heatingcoolingunit_ncdGai1E5a/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_heatingcoolingunit_ncdGai1E5a/zap-generated/endpoint_config.h
index 7a94436..9eea15b 100644
--- a/zzz_generated/chef-rootnode_heatingcoolingunit_ncdGai1E5a/zap-generated/endpoint_config.h
+++ b/zzz_generated/chef-rootnode_heatingcoolingunit_ncdGai1E5a/zap-generated/endpoint_config.h
@@ -323,11 +323,11 @@
{ 0x00000039, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* PendingTimestamp */ \
{ 0x0000003A, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* delay */ \
+ ZAP_EMPTY_DEFAULT() }, /* Delay */ \
{ 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */ \
{ 0x0000003C, ZAP_TYPE(OCTET_STRING), 5, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* ChannelMask */ \
+ ZAP_EMPTY_DEFAULT() }, /* ChannelPage0Mask */ \
{ 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */ \
{ 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
diff --git a/zzz_generated/chef-rootnode_humiditysensor_Xyj4gda6Hb/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_humiditysensor_Xyj4gda6Hb/zap-generated/endpoint_config.h
index 0e36227..6416065 100644
--- a/zzz_generated/chef-rootnode_humiditysensor_Xyj4gda6Hb/zap-generated/endpoint_config.h
+++ b/zzz_generated/chef-rootnode_humiditysensor_Xyj4gda6Hb/zap-generated/endpoint_config.h
@@ -317,11 +317,11 @@
{ 0x00000039, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* PendingTimestamp */ \
{ 0x0000003A, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* delay */ \
+ ZAP_EMPTY_DEFAULT() }, /* Delay */ \
{ 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */ \
{ 0x0000003C, ZAP_TYPE(OCTET_STRING), 5, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* ChannelMask */ \
+ ZAP_EMPTY_DEFAULT() }, /* ChannelPage0Mask */ \
{ 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */ \
{ 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
diff --git a/zzz_generated/chef-rootnode_lightsensor_lZQycTFcJK/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_lightsensor_lZQycTFcJK/zap-generated/endpoint_config.h
index 7c6cd7d..17c75ca 100644
--- a/zzz_generated/chef-rootnode_lightsensor_lZQycTFcJK/zap-generated/endpoint_config.h
+++ b/zzz_generated/chef-rootnode_lightsensor_lZQycTFcJK/zap-generated/endpoint_config.h
@@ -317,11 +317,11 @@
{ 0x00000039, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* PendingTimestamp */ \
{ 0x0000003A, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* delay */ \
+ ZAP_EMPTY_DEFAULT() }, /* Delay */ \
{ 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */ \
{ 0x0000003C, ZAP_TYPE(OCTET_STRING), 5, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* ChannelMask */ \
+ ZAP_EMPTY_DEFAULT() }, /* ChannelPage0Mask */ \
{ 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */ \
{ 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
diff --git a/zzz_generated/chef-rootnode_occupancysensor_iHyVgifZuo/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_occupancysensor_iHyVgifZuo/zap-generated/endpoint_config.h
index 7384f75..db33a44 100644
--- a/zzz_generated/chef-rootnode_occupancysensor_iHyVgifZuo/zap-generated/endpoint_config.h
+++ b/zzz_generated/chef-rootnode_occupancysensor_iHyVgifZuo/zap-generated/endpoint_config.h
@@ -317,11 +317,11 @@
{ 0x00000039, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* PendingTimestamp */ \
{ 0x0000003A, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* delay */ \
+ ZAP_EMPTY_DEFAULT() }, /* Delay */ \
{ 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */ \
{ 0x0000003C, ZAP_TYPE(OCTET_STRING), 5, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* ChannelMask */ \
+ ZAP_EMPTY_DEFAULT() }, /* ChannelPage0Mask */ \
{ 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */ \
{ 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
diff --git a/zzz_generated/chef-rootnode_onofflight_bbs1b7IaOV/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_onofflight_bbs1b7IaOV/zap-generated/endpoint_config.h
index 2397e31..dbfb4a1 100644
--- a/zzz_generated/chef-rootnode_onofflight_bbs1b7IaOV/zap-generated/endpoint_config.h
+++ b/zzz_generated/chef-rootnode_onofflight_bbs1b7IaOV/zap-generated/endpoint_config.h
@@ -320,11 +320,11 @@
{ 0x00000039, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* PendingTimestamp */ \
{ 0x0000003A, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* delay */ \
+ ZAP_EMPTY_DEFAULT() }, /* Delay */ \
{ 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */ \
{ 0x0000003C, ZAP_TYPE(OCTET_STRING), 5, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* ChannelMask */ \
+ ZAP_EMPTY_DEFAULT() }, /* ChannelPage0Mask */ \
{ 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */ \
{ 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
diff --git a/zzz_generated/chef-rootnode_onofflightswitch_FsPlMr090Q/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_onofflightswitch_FsPlMr090Q/zap-generated/endpoint_config.h
index 9b7b632..7760683 100644
--- a/zzz_generated/chef-rootnode_onofflightswitch_FsPlMr090Q/zap-generated/endpoint_config.h
+++ b/zzz_generated/chef-rootnode_onofflightswitch_FsPlMr090Q/zap-generated/endpoint_config.h
@@ -317,11 +317,11 @@
{ 0x00000039, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* PendingTimestamp */ \
{ 0x0000003A, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* delay */ \
+ ZAP_EMPTY_DEFAULT() }, /* Delay */ \
{ 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */ \
{ 0x0000003C, ZAP_TYPE(OCTET_STRING), 5, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* ChannelMask */ \
+ ZAP_EMPTY_DEFAULT() }, /* ChannelPage0Mask */ \
{ 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */ \
{ 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
diff --git a/zzz_generated/chef-rootnode_onoffpluginunit_Wtf8ss5EBY/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_onoffpluginunit_Wtf8ss5EBY/zap-generated/endpoint_config.h
index da18d22..5cee1a5 100644
--- a/zzz_generated/chef-rootnode_onoffpluginunit_Wtf8ss5EBY/zap-generated/endpoint_config.h
+++ b/zzz_generated/chef-rootnode_onoffpluginunit_Wtf8ss5EBY/zap-generated/endpoint_config.h
@@ -317,11 +317,11 @@
{ 0x00000039, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* PendingTimestamp */ \
{ 0x0000003A, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* delay */ \
+ ZAP_EMPTY_DEFAULT() }, /* Delay */ \
{ 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */ \
{ 0x0000003C, ZAP_TYPE(OCTET_STRING), 5, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* ChannelMask */ \
+ ZAP_EMPTY_DEFAULT() }, /* ChannelPage0Mask */ \
{ 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */ \
{ 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
diff --git a/zzz_generated/chef-rootnode_pressuresensor_s0qC9wLH4k/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_pressuresensor_s0qC9wLH4k/zap-generated/endpoint_config.h
index 0a65905..a18ca30 100644
--- a/zzz_generated/chef-rootnode_pressuresensor_s0qC9wLH4k/zap-generated/endpoint_config.h
+++ b/zzz_generated/chef-rootnode_pressuresensor_s0qC9wLH4k/zap-generated/endpoint_config.h
@@ -317,11 +317,11 @@
{ 0x00000039, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* PendingTimestamp */ \
{ 0x0000003A, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* delay */ \
+ ZAP_EMPTY_DEFAULT() }, /* Delay */ \
{ 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */ \
{ 0x0000003C, ZAP_TYPE(OCTET_STRING), 5, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* ChannelMask */ \
+ ZAP_EMPTY_DEFAULT() }, /* ChannelPage0Mask */ \
{ 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */ \
{ 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
diff --git a/zzz_generated/chef-rootnode_speaker_RpzeXdimqA/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_speaker_RpzeXdimqA/zap-generated/endpoint_config.h
index 8f4c02f..711e9ec 100644
--- a/zzz_generated/chef-rootnode_speaker_RpzeXdimqA/zap-generated/endpoint_config.h
+++ b/zzz_generated/chef-rootnode_speaker_RpzeXdimqA/zap-generated/endpoint_config.h
@@ -317,11 +317,11 @@
{ 0x00000039, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* PendingTimestamp */ \
{ 0x0000003A, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* delay */ \
+ ZAP_EMPTY_DEFAULT() }, /* Delay */ \
{ 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */ \
{ 0x0000003C, ZAP_TYPE(OCTET_STRING), 5, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* ChannelMask */ \
+ ZAP_EMPTY_DEFAULT() }, /* ChannelPage0Mask */ \
{ 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */ \
{ 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
diff --git a/zzz_generated/chef-rootnode_temperaturesensor_Qy1zkNW7c3/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_temperaturesensor_Qy1zkNW7c3/zap-generated/endpoint_config.h
index 1a02f97..6627619 100644
--- a/zzz_generated/chef-rootnode_temperaturesensor_Qy1zkNW7c3/zap-generated/endpoint_config.h
+++ b/zzz_generated/chef-rootnode_temperaturesensor_Qy1zkNW7c3/zap-generated/endpoint_config.h
@@ -317,11 +317,11 @@
{ 0x00000039, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* PendingTimestamp */ \
{ 0x0000003A, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* delay */ \
+ ZAP_EMPTY_DEFAULT() }, /* Delay */ \
{ 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */ \
{ 0x0000003C, ZAP_TYPE(OCTET_STRING), 5, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* ChannelMask */ \
+ ZAP_EMPTY_DEFAULT() }, /* ChannelPage0Mask */ \
{ 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */ \
{ 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
diff --git a/zzz_generated/chef-rootnode_thermostat_bm3fb8dhYi/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_thermostat_bm3fb8dhYi/zap-generated/endpoint_config.h
index 81b0056..19629e7 100644
--- a/zzz_generated/chef-rootnode_thermostat_bm3fb8dhYi/zap-generated/endpoint_config.h
+++ b/zzz_generated/chef-rootnode_thermostat_bm3fb8dhYi/zap-generated/endpoint_config.h
@@ -337,11 +337,11 @@
{ 0x00000039, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* PendingTimestamp */ \
{ 0x0000003A, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* delay */ \
+ ZAP_EMPTY_DEFAULT() }, /* Delay */ \
{ 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */ \
{ 0x0000003C, ZAP_TYPE(OCTET_STRING), 5, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* ChannelMask */ \
+ ZAP_EMPTY_DEFAULT() }, /* ChannelPage0Mask */ \
{ 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */ \
{ 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
diff --git a/zzz_generated/chef-rootnode_windowcovering_RLCxaGi9Yx/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_windowcovering_RLCxaGi9Yx/zap-generated/endpoint_config.h
index 5360f62..cef3ee5 100644
--- a/zzz_generated/chef-rootnode_windowcovering_RLCxaGi9Yx/zap-generated/endpoint_config.h
+++ b/zzz_generated/chef-rootnode_windowcovering_RLCxaGi9Yx/zap-generated/endpoint_config.h
@@ -317,11 +317,11 @@
{ 0x00000039, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* PendingTimestamp */ \
{ 0x0000003A, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* delay */ \
+ ZAP_EMPTY_DEFAULT() }, /* Delay */ \
{ 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */ \
{ 0x0000003C, ZAP_TYPE(OCTET_STRING), 5, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* ChannelMask */ \
+ ZAP_EMPTY_DEFAULT() }, /* ChannelPage0Mask */ \
{ 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */ \
{ 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h
index 35700c1..dfec5c8 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h
+++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h
@@ -2743,7 +2743,7 @@
| * PendingTimestamp | 0x0039 |
| * Delay | 0x003A |
| * SecurityPolicy | 0x003B |
-| * ChannelMask | 0x003C |
+| * ChannelPage0Mask | 0x003C |
| * OperationalDatasetComponents | 0x003D |
| * ActiveNetworkFaultsList | 0x003E |
| * GeneratedCommandList | 0xFFF8 |
@@ -9540,7 +9540,7 @@
make_unique<ReadAttribute>(Id, "pending-timestamp", Attributes::PendingTimestamp::Id, credsIssuerConfig), //
make_unique<ReadAttribute>(Id, "delay", Attributes::Delay::Id, credsIssuerConfig), //
make_unique<ReadAttribute>(Id, "security-policy", Attributes::SecurityPolicy::Id, credsIssuerConfig), //
- make_unique<ReadAttribute>(Id, "channel-mask", Attributes::ChannelMask::Id, credsIssuerConfig), //
+ make_unique<ReadAttribute>(Id, "channel-page0mask", Attributes::ChannelPage0Mask::Id, credsIssuerConfig), //
make_unique<ReadAttribute>(Id, "operational-dataset-components", Attributes::OperationalDatasetComponents::Id,
credsIssuerConfig), //
make_unique<ReadAttribute>(Id, "active-network-faults-list", Attributes::ActiveNetworkFaultsList::Id, credsIssuerConfig), //
@@ -9621,7 +9621,7 @@
make_unique<SubscribeAttribute>(Id, "pending-timestamp", Attributes::PendingTimestamp::Id, credsIssuerConfig), //
make_unique<SubscribeAttribute>(Id, "delay", Attributes::Delay::Id, credsIssuerConfig), //
make_unique<SubscribeAttribute>(Id, "security-policy", Attributes::SecurityPolicy::Id, credsIssuerConfig), //
- make_unique<SubscribeAttribute>(Id, "channel-mask", Attributes::ChannelMask::Id, credsIssuerConfig), //
+ make_unique<SubscribeAttribute>(Id, "channel-page0mask", Attributes::ChannelPage0Mask::Id, credsIssuerConfig), //
make_unique<SubscribeAttribute>(Id, "operational-dataset-components", Attributes::OperationalDatasetComponents::Id,
credsIssuerConfig), //
make_unique<SubscribeAttribute>(Id, "active-network-faults-list", Attributes::ActiveNetworkFaultsList::Id,
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 90ffe79..d629460 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
+++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
@@ -5850,7 +5850,7 @@
case ThreadNetworkDiagnostics::Attributes::Delay::Id: {
chip::app::DataModel::Nullable<uint32_t> value;
ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
- return DataModelLogger::LogValue("delay", 1, value);
+ return DataModelLogger::LogValue("Delay", 1, value);
}
case ThreadNetworkDiagnostics::Attributes::SecurityPolicy::Id: {
chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::SecurityPolicy::DecodableType>
@@ -5858,10 +5858,10 @@
ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
return DataModelLogger::LogValue("SecurityPolicy", 1, value);
}
- case ThreadNetworkDiagnostics::Attributes::ChannelMask::Id: {
+ case ThreadNetworkDiagnostics::Attributes::ChannelPage0Mask::Id: {
chip::app::DataModel::Nullable<chip::ByteSpan> value;
ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
- return DataModelLogger::LogValue("ChannelMask", 1, value);
+ return DataModelLogger::LogValue("ChannelPage0Mask", 1, value);
}
case ThreadNetworkDiagnostics::Attributes::OperationalDatasetComponents::Id: {
chip::app::DataModel::Nullable<
diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h
index 681a982..5d8f8d0 100644
--- a/zzz_generated/chip-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h
@@ -33610,7 +33610,7 @@
LogStep(31, "TH reads ChannelPage0Mask attribute value from DUT");
VerifyOrDo(!ShouldSkip("DGTHREAD.S.A003c"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
- ThreadNetworkDiagnostics::Attributes::ChannelMask::Id, true, chip::NullOptional);
+ ThreadNetworkDiagnostics::Attributes::ChannelPage0Mask::Id, true, chip::NullOptional);
}
case 32: {
LogStep(32, "Read OperationalDatasetComponents struct attribute from DUT and Verify the each field");
diff --git a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
index 788aab2..21813d5 100644
--- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
@@ -22345,7 +22345,7 @@
| * PendingTimestamp | 0x0039 |
| * Delay | 0x003A |
| * SecurityPolicy | 0x003B |
-| * ChannelMask | 0x003C |
+| * ChannelPage0Mask | 0x003C |
| * OperationalDatasetComponents | 0x003D |
| * ActiveNetworkFaultsList | 0x003E |
| * GeneratedCommandList | 0xFFF8 |
@@ -26249,16 +26249,16 @@
};
/*
- * Attribute ChannelMask
+ * Attribute ChannelPage0Mask
*/
-class ReadThreadNetworkDiagnosticsChannelMask : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsChannelPage0Mask : public ReadAttribute {
public:
- ReadThreadNetworkDiagnosticsChannelMask()
- : ReadAttribute("channel-mask")
+ ReadThreadNetworkDiagnosticsChannelPage0Mask()
+ : ReadAttribute("channel-page0mask")
{
}
- ~ReadThreadNetworkDiagnosticsChannelMask() {}
+ ~ReadThreadNetworkDiagnosticsChannelPage0Mask() {}
CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
{
@@ -26267,10 +26267,10 @@
dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
MTRBaseClusterThreadNetworkDiagnostics * cluster =
[[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
- [cluster readAttributeChannelMaskWithCompletionHandler:^(NSData * _Nullable value, NSError * _Nullable error) {
- NSLog(@"ThreadNetworkDiagnostics.ChannelMask response %@", [value description]);
+ [cluster readAttributeChannelPage0MaskWithCompletionHandler:^(NSData * _Nullable value, NSError * _Nullable error) {
+ NSLog(@"ThreadNetworkDiagnostics.ChannelPage0Mask response %@", [value description]);
if (error != nil) {
- LogNSError("ThreadNetworkDiagnostics ChannelMask read Error", error);
+ LogNSError("ThreadNetworkDiagnostics ChannelPage0Mask read Error", error);
}
SetCommandExitStatus(error);
}];
@@ -26278,14 +26278,14 @@
}
};
-class SubscribeAttributeThreadNetworkDiagnosticsChannelMask : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsChannelPage0Mask : public SubscribeAttribute {
public:
- SubscribeAttributeThreadNetworkDiagnosticsChannelMask()
- : SubscribeAttribute("channel-mask")
+ SubscribeAttributeThreadNetworkDiagnosticsChannelPage0Mask()
+ : SubscribeAttribute("channel-page0mask")
{
}
- ~SubscribeAttributeThreadNetworkDiagnosticsChannelMask() {}
+ ~SubscribeAttributeThreadNetworkDiagnosticsChannelPage0Mask() {}
CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
{
@@ -26297,14 +26297,14 @@
params.keepPreviousSubscriptions
= mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
- [cluster subscribeAttributeChannelMaskWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+ [cluster subscribeAttributeChannelPage0MaskWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
params:params
subscriptionEstablished:^() {
mSubscriptionEstablished = YES;
}
reportHandler:^(NSData * _Nullable value, NSError * _Nullable error) {
- NSLog(@"ThreadNetworkDiagnostics.ChannelMask response %@", [value description]);
+ NSLog(@"ThreadNetworkDiagnostics.ChannelPage0Mask response %@", [value description]);
SetCommandExitStatus(error);
}];
@@ -94156,8 +94156,8 @@
make_unique<SubscribeAttributeThreadNetworkDiagnosticsDelay>(), //
make_unique<ReadThreadNetworkDiagnosticsSecurityPolicy>(), //
make_unique<SubscribeAttributeThreadNetworkDiagnosticsSecurityPolicy>(), //
- make_unique<ReadThreadNetworkDiagnosticsChannelMask>(), //
- make_unique<SubscribeAttributeThreadNetworkDiagnosticsChannelMask>(), //
+ make_unique<ReadThreadNetworkDiagnosticsChannelPage0Mask>(), //
+ make_unique<SubscribeAttributeThreadNetworkDiagnosticsChannelPage0Mask>(), //
make_unique<ReadThreadNetworkDiagnosticsOperationalDatasetComponents>(), //
make_unique<SubscribeAttributeThreadNetworkDiagnosticsOperationalDatasetComponents>(), //
make_unique<ReadThreadNetworkDiagnosticsActiveNetworkFaultsList>(), //
diff --git a/zzz_generated/light-switch-app/zap-generated/endpoint_config.h b/zzz_generated/light-switch-app/zap-generated/endpoint_config.h
index d632b40..9fd63c4 100644
--- a/zzz_generated/light-switch-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/light-switch-app/zap-generated/endpoint_config.h
@@ -328,11 +328,11 @@
{ 0x00000039, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* PendingTimestamp */ \
{ 0x0000003A, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* delay */ \
+ ZAP_EMPTY_DEFAULT() }, /* Delay */ \
{ 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */ \
{ 0x0000003C, ZAP_TYPE(OCTET_STRING), 5, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* ChannelMask */ \
+ ZAP_EMPTY_DEFAULT() }, /* ChannelPage0Mask */ \
{ 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */ \
{ 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
diff --git a/zzz_generated/lighting-app/zap-generated/endpoint_config.h b/zzz_generated/lighting-app/zap-generated/endpoint_config.h
index 9a0d16f..b954740 100644
--- a/zzz_generated/lighting-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/lighting-app/zap-generated/endpoint_config.h
@@ -347,11 +347,11 @@
{ 0x00000039, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* PendingTimestamp */ \
{ 0x0000003A, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* delay */ \
+ ZAP_EMPTY_DEFAULT() }, /* Delay */ \
{ 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */ \
{ 0x0000003C, ZAP_TYPE(OCTET_STRING), 5, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* ChannelMask */ \
+ ZAP_EMPTY_DEFAULT() }, /* ChannelPage0Mask */ \
{ 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */ \
{ 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
diff --git a/zzz_generated/lock-app/zap-generated/endpoint_config.h b/zzz_generated/lock-app/zap-generated/endpoint_config.h
index a50fa39..6c42109 100644
--- a/zzz_generated/lock-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/lock-app/zap-generated/endpoint_config.h
@@ -385,11 +385,11 @@
{ 0x00000039, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* PendingTimestamp */ \
{ 0x0000003A, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* delay */ \
+ ZAP_EMPTY_DEFAULT() }, /* Delay */ \
{ 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */ \
{ 0x0000003C, ZAP_TYPE(OCTET_STRING), 5, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* ChannelMask */ \
+ ZAP_EMPTY_DEFAULT() }, /* ChannelPage0Mask */ \
{ 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */ \
{ 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
diff --git a/zzz_generated/pump-app/zap-generated/endpoint_config.h b/zzz_generated/pump-app/zap-generated/endpoint_config.h
index 89e8194..090696b 100644
--- a/zzz_generated/pump-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/pump-app/zap-generated/endpoint_config.h
@@ -218,7 +218,7 @@
{ 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */ \
{ 0x0000003C, ZAP_TYPE(OCTET_STRING), 5, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* ChannelMask */ \
+ ZAP_EMPTY_DEFAULT() }, /* ChannelPage0Mask */ \
{ 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */ \
{ 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
diff --git a/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h b/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h
index 628c45b..d331e7a 100644
--- a/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h
@@ -209,7 +209,7 @@
{ 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */ \
{ 0x0000003C, ZAP_TYPE(OCTET_STRING), 5, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* ChannelMask */ \
+ ZAP_EMPTY_DEFAULT() }, /* ChannelPage0Mask */ \
{ 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */ \
{ 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
diff --git a/zzz_generated/thermostat/zap-generated/endpoint_config.h b/zzz_generated/thermostat/zap-generated/endpoint_config.h
index e50c0ee..17347ae 100644
--- a/zzz_generated/thermostat/zap-generated/endpoint_config.h
+++ b/zzz_generated/thermostat/zap-generated/endpoint_config.h
@@ -365,11 +365,11 @@
{ 0x00000039, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* PendingTimestamp */ \
{ 0x0000003A, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* delay */ \
+ ZAP_EMPTY_DEFAULT() }, /* Delay */ \
{ 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */ \
{ 0x0000003C, ZAP_TYPE(OCTET_STRING), 5, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* ChannelMask */ \
+ ZAP_EMPTY_DEFAULT() }, /* ChannelPage0Mask */ \
{ 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */ \
{ 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
diff --git a/zzz_generated/tv-app/zap-generated/endpoint_config.h b/zzz_generated/tv-app/zap-generated/endpoint_config.h
index 21854a7..4e5feb1 100644
--- a/zzz_generated/tv-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/tv-app/zap-generated/endpoint_config.h
@@ -400,11 +400,11 @@
{ 0x00000039, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* PendingTimestamp */ \
{ 0x0000003A, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* delay */ \
+ ZAP_EMPTY_DEFAULT() }, /* Delay */ \
{ 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */ \
{ 0x0000003C, ZAP_TYPE(OCTET_STRING), 5, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* ChannelMask */ \
+ ZAP_EMPTY_DEFAULT() }, /* ChannelPage0Mask */ \
{ 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */ \
{ 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
diff --git a/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h b/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h
index 66878d6..c51c8ba 100644
--- a/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h
@@ -353,11 +353,11 @@
{ 0x00000039, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* PendingTimestamp */ \
{ 0x0000003A, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* delay */ \
+ ZAP_EMPTY_DEFAULT() }, /* Delay */ \
{ 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */ \
{ 0x0000003C, ZAP_TYPE(OCTET_STRING), 5, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* ChannelMask */ \
+ ZAP_EMPTY_DEFAULT() }, /* ChannelPage0Mask */ \
{ 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */ \
{ 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
diff --git a/zzz_generated/window-app/zap-generated/endpoint_config.h b/zzz_generated/window-app/zap-generated/endpoint_config.h
index 8ec07a9..39104a6 100644
--- a/zzz_generated/window-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/window-app/zap-generated/endpoint_config.h
@@ -349,11 +349,11 @@
{ 0x00000039, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* PendingTimestamp */ \
{ 0x0000003A, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* delay */ \
+ ZAP_EMPTY_DEFAULT() }, /* Delay */ \
{ 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */ \
{ 0x0000003C, ZAP_TYPE(OCTET_STRING), 5, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
- ZAP_EMPTY_DEFAULT() }, /* ChannelMask */ \
+ ZAP_EMPTY_DEFAULT() }, /* ChannelPage0Mask */ \
{ 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \
ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */ \
{ 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
