Align naming in Software Diagnostics cluster XML with the spec. (#24287)
* Align naming in Software Diagnostics cluster XML with the spec.
* Regenerate generated code.
diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
index d3c4b3c..223180a 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
@@ -1220,7 +1220,7 @@
kWaterMarks = 0x1;
}
- struct ThreadMetrics {
+ struct ThreadMetricsStruct {
int64u id = 0;
optional char_string<8> name = 1;
optional int32u stackFreeCurrent = 2;
@@ -1234,7 +1234,7 @@
optional OCTET_STRING faultRecording = 2;
}
- readonly attribute ThreadMetrics threadMetrics[] = 0;
+ readonly attribute ThreadMetricsStruct threadMetrics[] = 0;
readonly attribute int64u currentHeapFree = 1;
readonly attribute int64u currentHeapUsed = 2;
readonly attribute int64u currentHeapHighWatermark = 3;
diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter
index 9e196b0..9de6bf1 100644
--- a/examples/bridge-app/bridge-common/bridge-app.matter
+++ b/examples/bridge-app/bridge-common/bridge-app.matter
@@ -898,7 +898,7 @@
kWaterMarks = 0x1;
}
- struct ThreadMetrics {
+ struct ThreadMetricsStruct {
int64u id = 0;
optional char_string<8> name = 1;
optional int32u stackFreeCurrent = 2;
@@ -912,7 +912,7 @@
optional OCTET_STRING faultRecording = 2;
}
- readonly attribute ThreadMetrics threadMetrics[] = 0;
+ readonly attribute ThreadMetricsStruct threadMetrics[] = 0;
readonly attribute int64u currentHeapFree = 1;
readonly attribute int64u currentHeapUsed = 2;
readonly attribute int64u currentHeapHighWatermark = 3;
diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
index 2077099..50f9dd7 100644
--- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
+++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
@@ -750,7 +750,7 @@
kWaterMarks = 0x1;
}
- struct ThreadMetrics {
+ struct ThreadMetricsStruct {
int64u id = 0;
optional char_string<8> name = 1;
optional int32u stackFreeCurrent = 2;
@@ -764,7 +764,7 @@
optional OCTET_STRING faultRecording = 2;
}
- readonly attribute ThreadMetrics threadMetrics[] = 0;
+ readonly attribute ThreadMetricsStruct threadMetrics[] = 0;
readonly attribute int64u currentHeapFree = 1;
readonly attribute int64u currentHeapUsed = 2;
readonly attribute int64u currentHeapHighWatermark = 3;
diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
index 64f4e15..9c5a387 100644
--- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
+++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
@@ -862,7 +862,7 @@
kWaterMarks = 0x1;
}
- struct ThreadMetrics {
+ struct ThreadMetricsStruct {
int64u id = 0;
optional char_string<8> name = 1;
optional int32u stackFreeCurrent = 2;
@@ -876,7 +876,7 @@
optional OCTET_STRING faultRecording = 2;
}
- readonly attribute ThreadMetrics threadMetrics[] = 0;
+ readonly attribute ThreadMetricsStruct threadMetrics[] = 0;
readonly attribute int64u currentHeapFree = 1;
readonly attribute int64u currentHeapUsed = 2;
readonly attribute int64u currentHeapHighWatermark = 3;
diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
index 92c6d0e..fc111c0 100644
--- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
+++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
@@ -735,7 +735,7 @@
kWaterMarks = 0x1;
}
- struct ThreadMetrics {
+ struct ThreadMetricsStruct {
int64u id = 0;
optional char_string<8> name = 1;
optional int32u stackFreeCurrent = 2;
@@ -749,7 +749,7 @@
optional OCTET_STRING faultRecording = 2;
}
- readonly attribute ThreadMetrics threadMetrics[] = 0;
+ readonly attribute ThreadMetricsStruct threadMetrics[] = 0;
readonly attribute int64u currentHeapFree = 1;
readonly attribute int64u currentHeapUsed = 2;
readonly attribute int64u currentHeapHighWatermark = 3;
diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
index 5d95208..b79a4a9 100644
--- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
+++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
@@ -884,7 +884,7 @@
kWaterMarks = 0x1;
}
- struct ThreadMetrics {
+ struct ThreadMetricsStruct {
int64u id = 0;
optional char_string<8> name = 1;
optional int32u stackFreeCurrent = 2;
@@ -898,7 +898,7 @@
optional OCTET_STRING faultRecording = 2;
}
- readonly attribute ThreadMetrics threadMetrics[] = 0;
+ readonly attribute ThreadMetricsStruct threadMetrics[] = 0;
readonly attribute int64u currentHeapFree = 1;
readonly attribute int64u currentHeapUsed = 2;
readonly attribute int64u currentHeapHighWatermark = 3;
diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
index d60f528..f9065c5 100644
--- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
+++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
@@ -735,7 +735,7 @@
kWaterMarks = 0x1;
}
- struct ThreadMetrics {
+ struct ThreadMetricsStruct {
int64u id = 0;
optional char_string<8> name = 1;
optional int32u stackFreeCurrent = 2;
@@ -749,7 +749,7 @@
optional OCTET_STRING faultRecording = 2;
}
- readonly attribute ThreadMetrics threadMetrics[] = 0;
+ readonly attribute ThreadMetricsStruct threadMetrics[] = 0;
readonly attribute int64u currentHeapFree = 1;
readonly attribute int64u currentHeapUsed = 2;
readonly attribute int64u currentHeapHighWatermark = 3;
diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
index 9657afc..07dd8cc 100644
--- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
+++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
@@ -884,7 +884,7 @@
kWaterMarks = 0x1;
}
- struct ThreadMetrics {
+ struct ThreadMetricsStruct {
int64u id = 0;
optional char_string<8> name = 1;
optional int32u stackFreeCurrent = 2;
@@ -898,7 +898,7 @@
optional OCTET_STRING faultRecording = 2;
}
- readonly attribute ThreadMetrics threadMetrics[] = 0;
+ readonly attribute ThreadMetricsStruct threadMetrics[] = 0;
readonly attribute int64u currentHeapFree = 1;
readonly attribute int64u currentHeapUsed = 2;
readonly attribute int64u currentHeapHighWatermark = 3;
diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter
index 0da0377..38d0ae6 100644
--- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter
+++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter
@@ -737,7 +737,7 @@
kWaterMarks = 0x1;
}
- struct ThreadMetrics {
+ struct ThreadMetricsStruct {
int64u id = 0;
optional char_string<8> name = 1;
optional int32u stackFreeCurrent = 2;
@@ -751,7 +751,7 @@
optional OCTET_STRING faultRecording = 2;
}
- readonly attribute ThreadMetrics threadMetrics[] = 0;
+ readonly attribute ThreadMetricsStruct threadMetrics[] = 0;
readonly attribute int64u currentHeapFree = 1;
readonly attribute int64u currentHeapUsed = 2;
readonly attribute int64u currentHeapHighWatermark = 3;
diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
index f1551f2..0df49de 100644
--- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
+++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
@@ -748,7 +748,7 @@
kWaterMarks = 0x1;
}
- struct ThreadMetrics {
+ struct ThreadMetricsStruct {
int64u id = 0;
optional char_string<8> name = 1;
optional int32u stackFreeCurrent = 2;
@@ -762,7 +762,7 @@
optional OCTET_STRING faultRecording = 2;
}
- readonly attribute ThreadMetrics threadMetrics[] = 0;
+ readonly attribute ThreadMetricsStruct threadMetrics[] = 0;
readonly attribute int64u currentHeapFree = 1;
readonly attribute int64u currentHeapUsed = 2;
readonly attribute int64u currentHeapHighWatermark = 3;
diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
index ee51f83..d1c5e67 100644
--- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
+++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
@@ -877,7 +877,7 @@
kWaterMarks = 0x1;
}
- struct ThreadMetrics {
+ struct ThreadMetricsStruct {
int64u id = 0;
optional char_string<8> name = 1;
optional int32u stackFreeCurrent = 2;
@@ -891,7 +891,7 @@
optional OCTET_STRING faultRecording = 2;
}
- readonly attribute ThreadMetrics threadMetrics[] = 0;
+ readonly attribute ThreadMetricsStruct threadMetrics[] = 0;
readonly attribute int64u currentHeapFree = 1;
readonly attribute int64u currentHeapUsed = 2;
readonly attribute int64u currentHeapHighWatermark = 3;
diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
index b8d3088..46478dc 100644
--- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
+++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
@@ -748,7 +748,7 @@
kWaterMarks = 0x1;
}
- struct ThreadMetrics {
+ struct ThreadMetricsStruct {
int64u id = 0;
optional char_string<8> name = 1;
optional int32u stackFreeCurrent = 2;
@@ -762,7 +762,7 @@
optional OCTET_STRING faultRecording = 2;
}
- readonly attribute ThreadMetrics threadMetrics[] = 0;
+ readonly attribute ThreadMetricsStruct threadMetrics[] = 0;
readonly attribute int64u currentHeapFree = 1;
readonly attribute int64u currentHeapUsed = 2;
readonly attribute int64u currentHeapHighWatermark = 3;
diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
index 3c337b3..52bc8a6 100644
--- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
+++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
@@ -748,7 +748,7 @@
kWaterMarks = 0x1;
}
- struct ThreadMetrics {
+ struct ThreadMetricsStruct {
int64u id = 0;
optional char_string<8> name = 1;
optional int32u stackFreeCurrent = 2;
@@ -762,7 +762,7 @@
optional OCTET_STRING faultRecording = 2;
}
- readonly attribute ThreadMetrics threadMetrics[] = 0;
+ readonly attribute ThreadMetricsStruct threadMetrics[] = 0;
readonly attribute int64u currentHeapFree = 1;
readonly attribute int64u currentHeapUsed = 2;
readonly attribute int64u currentHeapHighWatermark = 3;
diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
index dbe0949..973f496 100644
--- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
+++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
@@ -748,7 +748,7 @@
kWaterMarks = 0x1;
}
- struct ThreadMetrics {
+ struct ThreadMetricsStruct {
int64u id = 0;
optional char_string<8> name = 1;
optional int32u stackFreeCurrent = 2;
@@ -762,7 +762,7 @@
optional OCTET_STRING faultRecording = 2;
}
- readonly attribute ThreadMetrics threadMetrics[] = 0;
+ readonly attribute ThreadMetricsStruct threadMetrics[] = 0;
readonly attribute int64u currentHeapFree = 1;
readonly attribute int64u currentHeapUsed = 2;
readonly attribute int64u currentHeapHighWatermark = 3;
diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
index 736958c..c04de79 100644
--- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
+++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
@@ -884,7 +884,7 @@
kWaterMarks = 0x1;
}
- struct ThreadMetrics {
+ struct ThreadMetricsStruct {
int64u id = 0;
optional char_string<8> name = 1;
optional int32u stackFreeCurrent = 2;
@@ -898,7 +898,7 @@
optional OCTET_STRING faultRecording = 2;
}
- readonly attribute ThreadMetrics threadMetrics[] = 0;
+ readonly attribute ThreadMetricsStruct threadMetrics[] = 0;
readonly attribute int64u currentHeapFree = 1;
readonly attribute int64u currentHeapUsed = 2;
readonly attribute int64u currentHeapHighWatermark = 3;
diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
index 2d3dab4..f9eee7d 100644
--- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
+++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
@@ -827,7 +827,7 @@
kWaterMarks = 0x1;
}
- struct ThreadMetrics {
+ struct ThreadMetricsStruct {
int64u id = 0;
optional char_string<8> name = 1;
optional int32u stackFreeCurrent = 2;
@@ -841,7 +841,7 @@
optional OCTET_STRING faultRecording = 2;
}
- readonly attribute ThreadMetrics threadMetrics[] = 0;
+ readonly attribute ThreadMetricsStruct threadMetrics[] = 0;
readonly attribute int64u currentHeapFree = 1;
readonly attribute int64u currentHeapUsed = 2;
readonly attribute int64u currentHeapHighWatermark = 3;
diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
index 9c6d87a..b26bc9a 100644
--- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
+++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
@@ -785,7 +785,7 @@
kWaterMarks = 0x1;
}
- struct ThreadMetrics {
+ struct ThreadMetricsStruct {
int64u id = 0;
optional char_string<8> name = 1;
optional int32u stackFreeCurrent = 2;
@@ -799,7 +799,7 @@
optional OCTET_STRING faultRecording = 2;
}
- readonly attribute ThreadMetrics threadMetrics[] = 0;
+ readonly attribute ThreadMetricsStruct threadMetrics[] = 0;
readonly attribute int64u currentHeapFree = 1;
readonly attribute int64u currentHeapUsed = 2;
readonly attribute int64u currentHeapHighWatermark = 3;
diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
index a05ec34..05724a4 100644
--- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
+++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
@@ -753,7 +753,7 @@
kWaterMarks = 0x1;
}
- struct ThreadMetrics {
+ struct ThreadMetricsStruct {
int64u id = 0;
optional char_string<8> name = 1;
optional int32u stackFreeCurrent = 2;
@@ -767,7 +767,7 @@
optional OCTET_STRING faultRecording = 2;
}
- readonly attribute ThreadMetrics threadMetrics[] = 0;
+ readonly attribute ThreadMetricsStruct threadMetrics[] = 0;
readonly attribute int64u currentHeapFree = 1;
readonly attribute int64u currentHeapUsed = 2;
readonly attribute int64u currentHeapHighWatermark = 3;
diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
index b22236f..d3c88eb 100644
--- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
+++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
@@ -875,7 +875,7 @@
kWaterMarks = 0x1;
}
- struct ThreadMetrics {
+ struct ThreadMetricsStruct {
int64u id = 0;
optional char_string<8> name = 1;
optional int32u stackFreeCurrent = 2;
@@ -889,7 +889,7 @@
optional OCTET_STRING faultRecording = 2;
}
- readonly attribute ThreadMetrics threadMetrics[] = 0;
+ readonly attribute ThreadMetricsStruct threadMetrics[] = 0;
readonly attribute int64u currentHeapFree = 1;
readonly attribute int64u currentHeapUsed = 2;
readonly attribute int64u currentHeapHighWatermark = 3;
diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter
index 956938c..6192a20 100644
--- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter
+++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter
@@ -748,7 +748,7 @@
kWaterMarks = 0x1;
}
- struct ThreadMetrics {
+ struct ThreadMetricsStruct {
int64u id = 0;
optional char_string<8> name = 1;
optional int32u stackFreeCurrent = 2;
@@ -762,7 +762,7 @@
optional OCTET_STRING faultRecording = 2;
}
- readonly attribute ThreadMetrics threadMetrics[] = 0;
+ readonly attribute ThreadMetricsStruct threadMetrics[] = 0;
readonly attribute int64u currentHeapFree = 1;
readonly attribute int64u currentHeapUsed = 2;
readonly attribute int64u currentHeapHighWatermark = 3;
diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
index c15a487..be4033d 100644
--- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
+++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
@@ -735,7 +735,7 @@
kWaterMarks = 0x1;
}
- struct ThreadMetrics {
+ struct ThreadMetricsStruct {
int64u id = 0;
optional char_string<8> name = 1;
optional int32u stackFreeCurrent = 2;
@@ -749,7 +749,7 @@
optional OCTET_STRING faultRecording = 2;
}
- readonly attribute ThreadMetrics threadMetrics[] = 0;
+ readonly attribute ThreadMetricsStruct threadMetrics[] = 0;
readonly attribute int64u currentHeapFree = 1;
readonly attribute int64u currentHeapUsed = 2;
readonly attribute int64u currentHeapHighWatermark = 3;
diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter
index 729ceff..aa61ccb 100644
--- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter
+++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter
@@ -735,7 +735,7 @@
kWaterMarks = 0x1;
}
- struct ThreadMetrics {
+ struct ThreadMetricsStruct {
int64u id = 0;
optional char_string<8> name = 1;
optional int32u stackFreeCurrent = 2;
@@ -749,7 +749,7 @@
optional OCTET_STRING faultRecording = 2;
}
- readonly attribute ThreadMetrics threadMetrics[] = 0;
+ readonly attribute ThreadMetricsStruct threadMetrics[] = 0;
readonly attribute int64u currentHeapFree = 1;
readonly attribute int64u currentHeapUsed = 2;
readonly attribute int64u currentHeapHighWatermark = 3;
diff --git a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter
index 0696014..c59e6c8 100644
--- a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter
+++ b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter
@@ -738,7 +738,7 @@
kWaterMarks = 0x1;
}
- struct ThreadMetrics {
+ struct ThreadMetricsStruct {
int64u id = 0;
optional char_string<8> name = 1;
optional int32u stackFreeCurrent = 2;
@@ -752,7 +752,7 @@
optional OCTET_STRING faultRecording = 2;
}
- readonly attribute ThreadMetrics threadMetrics[] = 0;
+ readonly attribute ThreadMetricsStruct threadMetrics[] = 0;
readonly attribute int64u currentHeapFree = 1;
readonly attribute int64u currentHeapUsed = 2;
readonly attribute int64u currentHeapHighWatermark = 3;
diff --git a/examples/dynamic-bridge-app/bridge-common/bridge-app.matter b/examples/dynamic-bridge-app/bridge-common/bridge-app.matter
index 9e196b0..9de6bf1 100644
--- a/examples/dynamic-bridge-app/bridge-common/bridge-app.matter
+++ b/examples/dynamic-bridge-app/bridge-common/bridge-app.matter
@@ -898,7 +898,7 @@
kWaterMarks = 0x1;
}
- struct ThreadMetrics {
+ struct ThreadMetricsStruct {
int64u id = 0;
optional char_string<8> name = 1;
optional int32u stackFreeCurrent = 2;
@@ -912,7 +912,7 @@
optional OCTET_STRING faultRecording = 2;
}
- readonly attribute ThreadMetrics threadMetrics[] = 0;
+ readonly attribute ThreadMetricsStruct threadMetrics[] = 0;
readonly attribute int64u currentHeapFree = 1;
readonly attribute int64u currentHeapUsed = 2;
readonly attribute int64u currentHeapHighWatermark = 3;
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 af2fc54..4c97c8e 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
@@ -940,7 +940,7 @@
kWaterMarks = 0x1;
}
- struct ThreadMetrics {
+ struct ThreadMetricsStruct {
int64u id = 0;
optional char_string<8> name = 1;
optional int32u stackFreeCurrent = 2;
@@ -954,7 +954,7 @@
optional OCTET_STRING faultRecording = 2;
}
- readonly attribute ThreadMetrics threadMetrics[] = 0;
+ readonly attribute ThreadMetricsStruct threadMetrics[] = 0;
readonly attribute int64u currentHeapFree = 1;
readonly attribute int64u currentHeapUsed = 2;
readonly attribute int64u currentHeapHighWatermark = 3;
diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter
index 34d79e8..ab0b8ea 100644
--- a/examples/lighting-app/lighting-common/lighting-app.matter
+++ b/examples/lighting-app/lighting-common/lighting-app.matter
@@ -896,7 +896,7 @@
kWaterMarks = 0x1;
}
- struct ThreadMetrics {
+ struct ThreadMetricsStruct {
int64u id = 0;
optional char_string<8> name = 1;
optional int32u stackFreeCurrent = 2;
@@ -910,7 +910,7 @@
optional OCTET_STRING faultRecording = 2;
}
- readonly attribute ThreadMetrics threadMetrics[] = 0;
+ readonly attribute ThreadMetricsStruct threadMetrics[] = 0;
readonly attribute int64u currentHeapFree = 1;
readonly attribute int64u currentHeapUsed = 2;
readonly attribute int64u currentHeapHighWatermark = 3;
diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.matter b/examples/lighting-app/nxp/zap/lighting-on-off.matter
index ce768f1..353a2e6 100644
--- a/examples/lighting-app/nxp/zap/lighting-on-off.matter
+++ b/examples/lighting-app/nxp/zap/lighting-on-off.matter
@@ -805,7 +805,7 @@
kWaterMarks = 0x1;
}
- struct ThreadMetrics {
+ struct ThreadMetricsStruct {
int64u id = 0;
optional char_string<8> name = 1;
optional int32u stackFreeCurrent = 2;
@@ -819,7 +819,7 @@
optional OCTET_STRING faultRecording = 2;
}
- readonly attribute ThreadMetrics threadMetrics[] = 0;
+ readonly attribute ThreadMetricsStruct threadMetrics[] = 0;
readonly attribute int64u currentHeapFree = 1;
readonly attribute int64u currentHeapUsed = 2;
readonly attribute int64u currentHeapHighWatermark = 3;
diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter
index 2e7ff08..5bfa177 100644
--- a/examples/lock-app/lock-common/lock-app.matter
+++ b/examples/lock-app/lock-common/lock-app.matter
@@ -812,7 +812,7 @@
kWaterMarks = 0x1;
}
- struct ThreadMetrics {
+ struct ThreadMetricsStruct {
int64u id = 0;
optional char_string<8> name = 1;
optional int32u stackFreeCurrent = 2;
@@ -826,7 +826,7 @@
optional OCTET_STRING faultRecording = 2;
}
- readonly attribute ThreadMetrics threadMetrics[] = 0;
+ readonly attribute ThreadMetricsStruct threadMetrics[] = 0;
readonly attribute int64u currentHeapFree = 1;
readonly attribute int64u currentHeapUsed = 2;
readonly attribute int64u currentHeapHighWatermark = 3;
diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter
index f8ffde9..09eeccf 100644
--- a/examples/placeholder/linux/apps/app1/config.matter
+++ b/examples/placeholder/linux/apps/app1/config.matter
@@ -1025,7 +1025,7 @@
kWaterMarks = 0x1;
}
- struct ThreadMetrics {
+ struct ThreadMetricsStruct {
int64u id = 0;
optional char_string<8> name = 1;
optional int32u stackFreeCurrent = 2;
@@ -1039,7 +1039,7 @@
optional OCTET_STRING faultRecording = 2;
}
- readonly attribute ThreadMetrics threadMetrics[] = 0;
+ readonly attribute ThreadMetricsStruct threadMetrics[] = 0;
readonly attribute int64u currentHeapFree = 1;
readonly attribute int64u currentHeapUsed = 2;
readonly attribute int64u currentHeapHighWatermark = 3;
diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter
index f8ffde9..09eeccf 100644
--- a/examples/placeholder/linux/apps/app2/config.matter
+++ b/examples/placeholder/linux/apps/app2/config.matter
@@ -1025,7 +1025,7 @@
kWaterMarks = 0x1;
}
- struct ThreadMetrics {
+ struct ThreadMetricsStruct {
int64u id = 0;
optional char_string<8> name = 1;
optional int32u stackFreeCurrent = 2;
@@ -1039,7 +1039,7 @@
optional OCTET_STRING faultRecording = 2;
}
- readonly attribute ThreadMetrics threadMetrics[] = 0;
+ readonly attribute ThreadMetricsStruct threadMetrics[] = 0;
readonly attribute int64u currentHeapFree = 1;
readonly attribute int64u currentHeapUsed = 2;
readonly attribute int64u currentHeapHighWatermark = 3;
diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter
index 15d0641..f0b8a5d 100644
--- a/examples/thermostat/thermostat-common/thermostat.matter
+++ b/examples/thermostat/thermostat-common/thermostat.matter
@@ -900,7 +900,7 @@
kWaterMarks = 0x1;
}
- struct ThreadMetrics {
+ struct ThreadMetricsStruct {
int64u id = 0;
optional char_string<8> name = 1;
optional int32u stackFreeCurrent = 2;
@@ -914,7 +914,7 @@
optional OCTET_STRING faultRecording = 2;
}
- readonly attribute ThreadMetrics threadMetrics[] = 0;
+ readonly attribute ThreadMetricsStruct threadMetrics[] = 0;
readonly attribute int64u currentHeapFree = 1;
readonly attribute int64u currentHeapUsed = 2;
readonly attribute int64u currentHeapHighWatermark = 3;
diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter
index e3c07dd..4bc3302 100644
--- a/examples/tv-app/tv-common/tv-app.matter
+++ b/examples/tv-app/tv-common/tv-app.matter
@@ -945,7 +945,7 @@
kWaterMarks = 0x1;
}
- struct ThreadMetrics {
+ struct ThreadMetricsStruct {
int64u id = 0;
optional char_string<8> name = 1;
optional int32u stackFreeCurrent = 2;
@@ -959,7 +959,7 @@
optional OCTET_STRING faultRecording = 2;
}
- readonly attribute ThreadMetrics threadMetrics[] = 0;
+ readonly attribute ThreadMetricsStruct threadMetrics[] = 0;
readonly attribute int64u currentHeapFree = 1;
readonly attribute int64u currentHeapUsed = 2;
readonly attribute int64u currentHeapHighWatermark = 3;
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 b073a35..0fcfd6f 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
@@ -1117,7 +1117,7 @@
kWaterMarks = 0x1;
}
- struct ThreadMetrics {
+ struct ThreadMetricsStruct {
int64u id = 0;
optional char_string<8> name = 1;
optional int32u stackFreeCurrent = 2;
@@ -1131,7 +1131,7 @@
optional OCTET_STRING faultRecording = 2;
}
- readonly attribute ThreadMetrics threadMetrics[] = 0;
+ readonly attribute ThreadMetricsStruct threadMetrics[] = 0;
readonly attribute int64u currentHeapFree = 1;
readonly attribute int64u currentHeapUsed = 2;
readonly attribute int64u currentHeapHighWatermark = 3;
diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter
index c29a4d43..6b0ca3d 100644
--- a/examples/window-app/common/window-app.matter
+++ b/examples/window-app/common/window-app.matter
@@ -952,7 +952,7 @@
kWaterMarks = 0x1;
}
- struct ThreadMetrics {
+ struct ThreadMetricsStruct {
int64u id = 0;
optional char_string<8> name = 1;
optional int32u stackFreeCurrent = 2;
@@ -966,7 +966,7 @@
optional OCTET_STRING faultRecording = 2;
}
- readonly attribute ThreadMetrics threadMetrics[] = 0;
+ readonly attribute ThreadMetricsStruct threadMetrics[] = 0;
readonly attribute int64u currentHeapFree = 1;
readonly attribute int64u currentHeapUsed = 2;
readonly attribute int64u currentHeapHighWatermark = 3;
diff --git a/src/app/zap-templates/zcl/data-model/chip/software-diagnostics-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/software-diagnostics-cluster.xml
index 3d59779..84ff1c9 100644
--- a/src/app/zap-templates/zcl/data-model/chip/software-diagnostics-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/software-diagnostics-cluster.xml
@@ -16,7 +16,7 @@
-->
<configurator>
<domain name="CHIP"/>
- <struct name="ThreadMetrics">
+ <struct name="ThreadMetricsStruct">
<cluster code="0x0034"/>
<item name="Id" type="INT64U"/>
<item name="Name" type="CHAR_STRING" length="8" optional="true"/>
@@ -30,7 +30,7 @@
<code>0x0034</code>
<define>SOFTWARE_DIAGNOSTICS_CLUSTER</define>
<description>The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems.</description>
- <attribute side="server" code="0x00" define="THREAD_METRICS" type="ARRAY" entryType="ThreadMetrics" length="254" writable="false" optional="true">ThreadMetrics</attribute>
+ <attribute side="server" code="0x00" define="THREAD_METRICS" type="ARRAY" entryType="ThreadMetricsStruct" length="254" writable="false" optional="true">ThreadMetrics</attribute>
<attribute side="server" code="0x01" define="CURRENT_HEAP_FREE" type="INT64U" min="0x0000000000000000" max="0xFFFFFFFFFFFFFFFF" writable="false" default="0x0000000000000000" optional="true">CurrentHeapFree</attribute>
<attribute side="server" code="0x02" define="CURRENT_HEAP_USED" type="INT64U" min="0x0000000000000000" max="0xFFFFFFFFFFFFFFFF" writable="false" default="0x0000000000000000" optional="true">CurrentHeapUsed</attribute>
<attribute side="server" code="0x03" define="CURRENT_HEAP_HIGH_WATERMARK" type="INT64U" min="0x0000000000000000" max="0xFFFFFFFFFFFFFFFF" writable="false" default="0x0000000000000000" optional="true">CurrentHeapHighWatermark</attribute>
@@ -39,7 +39,7 @@
</command>
<event side="server" code="0x00" name="SoftwareFault" priority="info" optional="true">
<description>Indicate the last software fault that has taken place on the Node.</description>
- <field id="0" name="Id" type="INT64U"/>
+ <field id="0" name="ID" type="INT64U"/>
<field id="1" name="Name" type="CHAR_STRING" length="8" optional="true"/>
<field id="2" name="FaultRecording" type="OCTET_STRING" length="1024" optional="true"/>
</event>
diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
index 76131a2..df18963 100644
--- a/src/controller/data_model/controller-clusters.matter
+++ b/src/controller/data_model/controller-clusters.matter
@@ -1396,7 +1396,7 @@
kWaterMarks = 0x1;
}
- struct ThreadMetrics {
+ struct ThreadMetricsStruct {
int64u id = 0;
optional char_string<8> name = 1;
optional int32u stackFreeCurrent = 2;
@@ -1410,7 +1410,7 @@
optional OCTET_STRING faultRecording = 2;
}
- readonly attribute ThreadMetrics threadMetrics[] = 0;
+ readonly attribute ThreadMetricsStruct threadMetrics[] = 0;
readonly attribute int64u currentHeapFree = 1;
readonly attribute int64u currentHeapUsed = 2;
readonly attribute int64u currentHeapHighWatermark = 3;
diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
index 8049945..f20ca29 100644
--- a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
+++ b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
@@ -5265,26 +5265,27 @@
chip::JniReferences::GetInstance().CreateOptional(newElement_0_stackSizeInsideOptional, newElement_0_stackSize);
}
- jclass threadMetricsStructClass_1;
+ jclass threadMetricsStructStructClass_1;
err = chip::JniReferences::GetInstance().GetClassRef(
- env, "chip/devicecontroller/ChipStructs$SoftwareDiagnosticsClusterThreadMetrics", threadMetricsStructClass_1);
+ env, "chip/devicecontroller/ChipStructs$SoftwareDiagnosticsClusterThreadMetricsStruct",
+ threadMetricsStructStructClass_1);
if (err != CHIP_NO_ERROR)
{
- ChipLogError(Zcl, "Could not find class ChipStructs$SoftwareDiagnosticsClusterThreadMetrics");
+ ChipLogError(Zcl, "Could not find class ChipStructs$SoftwareDiagnosticsClusterThreadMetricsStruct");
return nullptr;
}
- jmethodID threadMetricsStructCtor_1 = env->GetMethodID(
- threadMetricsStructClass_1, "<init>",
+ jmethodID threadMetricsStructStructCtor_1 = env->GetMethodID(
+ threadMetricsStructStructClass_1, "<init>",
"(Ljava/lang/Long;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V");
- if (threadMetricsStructCtor_1 == nullptr)
+ if (threadMetricsStructStructCtor_1 == nullptr)
{
- ChipLogError(Zcl, "Could not find ChipStructs$SoftwareDiagnosticsClusterThreadMetrics constructor");
+ ChipLogError(Zcl, "Could not find ChipStructs$SoftwareDiagnosticsClusterThreadMetricsStruct constructor");
return nullptr;
}
- newElement_0 =
- env->NewObject(threadMetricsStructClass_1, threadMetricsStructCtor_1, newElement_0_id, newElement_0_name,
- newElement_0_stackFreeCurrent, newElement_0_stackFreeMinimum, newElement_0_stackSize);
+ newElement_0 = env->NewObject(threadMetricsStructStructClass_1, threadMetricsStructStructCtor_1, newElement_0_id,
+ newElement_0_name, newElement_0_stackFreeCurrent, newElement_0_stackFreeMinimum,
+ newElement_0_stackSize);
chip::JniReferences::GetInstance().AddToList(value, newElement_0);
}
return value;
diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp
index ff4b34a..55c8d99 100644
--- a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp
+++ b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp
@@ -8334,8 +8334,8 @@
void CHIPSoftwareDiagnosticsThreadMetricsAttributeCallback::CallbackFn(
void * context,
- const chip::app::DataModel::DecodableList<chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetrics::DecodableType> &
- list)
+ const chip::app::DataModel::DecodableList<
+ chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetricsStruct::DecodableType> & list)
{
chip::DeviceLayer::StackUnlock unlock;
CHIP_ERROR err = CHIP_NO_ERROR;
@@ -8431,25 +8431,27 @@
chip::JniReferences::GetInstance().CreateOptional(newElement_0_stackSizeInsideOptional, newElement_0_stackSize);
}
- jclass threadMetricsStructClass_1;
+ jclass threadMetricsStructStructClass_1;
err = chip::JniReferences::GetInstance().GetClassRef(
- env, "chip/devicecontroller/ChipStructs$SoftwareDiagnosticsClusterThreadMetrics", threadMetricsStructClass_1);
+ env, "chip/devicecontroller/ChipStructs$SoftwareDiagnosticsClusterThreadMetricsStruct",
+ threadMetricsStructStructClass_1);
if (err != CHIP_NO_ERROR)
{
- ChipLogError(Zcl, "Could not find class ChipStructs$SoftwareDiagnosticsClusterThreadMetrics");
+ ChipLogError(Zcl, "Could not find class ChipStructs$SoftwareDiagnosticsClusterThreadMetricsStruct");
return;
}
- jmethodID threadMetricsStructCtor_1 =
- env->GetMethodID(threadMetricsStructClass_1, "<init>",
+ jmethodID threadMetricsStructStructCtor_1 =
+ env->GetMethodID(threadMetricsStructStructClass_1, "<init>",
"(Ljava/lang/Long;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V");
- if (threadMetricsStructCtor_1 == nullptr)
+ if (threadMetricsStructStructCtor_1 == nullptr)
{
- ChipLogError(Zcl, "Could not find ChipStructs$SoftwareDiagnosticsClusterThreadMetrics constructor");
+ ChipLogError(Zcl, "Could not find ChipStructs$SoftwareDiagnosticsClusterThreadMetricsStruct constructor");
return;
}
- newElement_0 = env->NewObject(threadMetricsStructClass_1, threadMetricsStructCtor_1, newElement_0_id, newElement_0_name,
- newElement_0_stackFreeCurrent, newElement_0_stackFreeMinimum, newElement_0_stackSize);
+ newElement_0 =
+ env->NewObject(threadMetricsStructStructClass_1, threadMetricsStructStructCtor_1, newElement_0_id, newElement_0_name,
+ newElement_0_stackFreeCurrent, newElement_0_stackFreeMinimum, newElement_0_stackSize);
chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
}
diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.h b/src/controller/java/zap-generated/CHIPReadCallbacks.h
index 7101e2a..2e9522f 100644
--- a/src/controller/java/zap-generated/CHIPReadCallbacks.h
+++ b/src/controller/java/zap-generated/CHIPReadCallbacks.h
@@ -3488,10 +3488,9 @@
}
}
- static void CallbackFn(
- void * context,
- const chip::app::DataModel::DecodableList<chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetrics::DecodableType> &
- list);
+ static void CallbackFn(void * context,
+ const chip::app::DataModel::DecodableList<
+ chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetricsStruct::DecodableType> & list);
static void OnSubscriptionEstablished(void * context)
{
CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
index 0815690..27db828 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
@@ -6965,7 +6965,7 @@
@Nullable Integer timedInvokeTimeoutMs);
public interface ThreadMetricsAttributeCallback {
- void onSuccess(List<ChipStructs.SoftwareDiagnosticsClusterThreadMetrics> valueList);
+ void onSuccess(List<ChipStructs.SoftwareDiagnosticsClusterThreadMetricsStruct> valueList);
void onError(Exception ex);
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java
index e7ef691..baa99f3 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java
@@ -678,14 +678,14 @@
}
}
- public static class SoftwareDiagnosticsClusterThreadMetrics {
+ public static class SoftwareDiagnosticsClusterThreadMetricsStruct {
public Long id;
public Optional<String> name;
public Optional<Long> stackFreeCurrent;
public Optional<Long> stackFreeMinimum;
public Optional<Long> stackSize;
- public SoftwareDiagnosticsClusterThreadMetrics(
+ public SoftwareDiagnosticsClusterThreadMetricsStruct(
Long id,
Optional<String> name,
Optional<Long> stackFreeCurrent,
@@ -701,7 +701,7 @@
@Override
public String toString() {
StringBuilder output = new StringBuilder();
- output.append("SoftwareDiagnosticsClusterThreadMetrics {\n");
+ output.append("SoftwareDiagnosticsClusterThreadMetricsStruct {\n");
output.append("\tid: ");
output.append(id);
output.append("\n");
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
index ac7c3c7..18703c4 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
@@ -2783,11 +2783,12 @@
}
@Override
- public void onSuccess(List<ChipStructs.SoftwareDiagnosticsClusterThreadMetrics> valueList) {
+ public void onSuccess(
+ List<ChipStructs.SoftwareDiagnosticsClusterThreadMetricsStruct> valueList) {
Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
CommandResponseInfo commandResponseInfo =
new CommandResponseInfo(
- "valueList", "List<ChipStructs.SoftwareDiagnosticsClusterThreadMetrics>");
+ "valueList", "List<ChipStructs.SoftwareDiagnosticsClusterThreadMetricsStruct>");
responseValues.put(commandResponseInfo, valueList);
callback.onSuccess(responseValues);
}
diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py
index c5a9826..0020b94 100644
--- a/src/controller/python/chip/clusters/Objects.py
+++ b/src/controller/python/chip/clusters/Objects.py
@@ -7696,7 +7696,7 @@
def descriptor(cls) -> ClusterObjectDescriptor:
return ClusterObjectDescriptor(
Fields = [
- ClusterObjectFieldDescriptor(Label="threadMetrics", Tag=0x00000000, Type=typing.Optional[typing.List[SoftwareDiagnostics.Structs.ThreadMetrics]]),
+ ClusterObjectFieldDescriptor(Label="threadMetrics", Tag=0x00000000, Type=typing.Optional[typing.List[SoftwareDiagnostics.Structs.ThreadMetricsStruct]]),
ClusterObjectFieldDescriptor(Label="currentHeapFree", Tag=0x00000001, Type=typing.Optional[uint]),
ClusterObjectFieldDescriptor(Label="currentHeapUsed", Tag=0x00000002, Type=typing.Optional[uint]),
ClusterObjectFieldDescriptor(Label="currentHeapHighWatermark", Tag=0x00000003, Type=typing.Optional[uint]),
@@ -7707,7 +7707,7 @@
ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
])
- threadMetrics: 'typing.Optional[typing.List[SoftwareDiagnostics.Structs.ThreadMetrics]]' = None
+ threadMetrics: 'typing.Optional[typing.List[SoftwareDiagnostics.Structs.ThreadMetricsStruct]]' = None
currentHeapFree: 'typing.Optional[uint]' = None
currentHeapUsed: 'typing.Optional[uint]' = None
currentHeapHighWatermark: 'typing.Optional[uint]' = None
@@ -7720,7 +7720,7 @@
class Structs:
@dataclass
- class ThreadMetrics(ClusterObject):
+ class ThreadMetricsStruct(ClusterObject):
@ChipUtility.classproperty
def descriptor(cls) -> ClusterObjectDescriptor:
return ClusterObjectDescriptor(
@@ -7769,9 +7769,9 @@
@ChipUtility.classproperty
def attribute_type(cls) -> ClusterObjectFieldDescriptor:
- return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[SoftwareDiagnostics.Structs.ThreadMetrics]])
+ return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[SoftwareDiagnostics.Structs.ThreadMetricsStruct]])
- value: 'typing.Optional[typing.List[SoftwareDiagnostics.Structs.ThreadMetrics]]' = None
+ value: 'typing.Optional[typing.List[SoftwareDiagnostics.Structs.ThreadMetricsStruct]]' = None
@dataclass
class CurrentHeapFree(ClusterAttributeDescriptor):
diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml
index f38744f..45e38a3 100644
--- a/src/darwin/Framework/CHIP/templates/availability.yaml
+++ b/src/darwin/Framework/CHIP/templates/availability.yaml
@@ -4957,6 +4957,8 @@
AccessControl:
- AccessControlEntryStruct
- AccessControlExtensionStruct
+ SoftwareDiagnostics:
+ - ThreadMetricsStruct
struct fields:
UnitTesting:
SimpleStruct:
@@ -5034,6 +5036,13 @@
AccessControlExtensionStruct:
- data
- fabricIndex
+ SoftwareDiagnostics:
+ ThreadMetricsStruct:
+ - id
+ - name
+ - stackFreeCurrent
+ - stackFreeMinimum
+ - stackSize
events:
OTASoftwareUpdateRequestor:
- StateTransition
@@ -5264,6 +5273,8 @@
- WiredFaultChangeType
- BatFaultChangeType
- BatChargeFaultChangeType
+ SoftwareDiagnostics:
+ - ThreadMetrics
struct fields:
Descriptor:
DeviceTypeStruct:
@@ -5353,6 +5364,8 @@
AccessControl:
AccessControlEntryStruct: AccessControlEntry
AccessControlExtensionStruct: ExtensionEntry
+ SoftwareDiagnostics:
+ ThreadMetricsStruct: ThreadMetrics
struct fields:
Descriptor:
DeviceTypeStruct:
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm
index eeaace2..4aa9e05 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm
@@ -4620,8 +4620,8 @@
auto iter_0 = cppValue.begin();
while (iter_0.Next()) {
auto & entry_0 = iter_0.GetValue();
- MTRSoftwareDiagnosticsClusterThreadMetrics * newElement_0;
- newElement_0 = [MTRSoftwareDiagnosticsClusterThreadMetrics new];
+ MTRSoftwareDiagnosticsClusterThreadMetricsStruct * newElement_0;
+ newElement_0 = [MTRSoftwareDiagnosticsClusterThreadMetricsStruct new];
newElement_0.id = [NSNumber numberWithUnsignedLongLong:entry_0.id];
if (entry_0.name.HasValue()) {
newElement_0.name = [[NSString alloc] initWithBytes:entry_0.name.Value().data()
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h
index d4be5ad..71847e7 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h
@@ -737,8 +737,8 @@
void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
typedef void (*SoftwareDiagnosticsThreadMetricsListAttributeCallback)(
void * context,
- const chip::app::DataModel::DecodableList<chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetrics::DecodableType> &
- data);
+ const chip::app::DataModel::DecodableList<
+ chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetricsStruct::DecodableType> & data);
typedef void (*SoftwareDiagnosticsGeneratedCommandListListAttributeCallback)(
void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
typedef void (*SoftwareDiagnosticsAcceptedCommandListListAttributeCallback)(
@@ -5015,10 +5015,9 @@
MTRActionBlock action) :
MTRCallbackBridge<SoftwareDiagnosticsThreadMetricsListAttributeCallback>(queue, handler, action, OnSuccessFn){};
- static void OnSuccessFn(
- void * context,
- const chip::app::DataModel::DecodableList<chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetrics::DecodableType> &
- value);
+ static void OnSuccessFn(void * context,
+ const chip::app::DataModel::DecodableList<
+ chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetricsStruct::DecodableType> & value);
};
class MTRSoftwareDiagnosticsThreadMetricsListAttributeCallbackSubscriptionBridge
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm
index 4eaac1a..b165675 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm
@@ -4370,8 +4370,8 @@
}
void MTRSoftwareDiagnosticsThreadMetricsListAttributeCallbackBridge::OnSuccessFn(void * context,
- const chip::app::DataModel::DecodableList<chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetrics::DecodableType> &
- value)
+ const chip::app::DataModel::DecodableList<
+ chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetricsStruct::DecodableType> & value)
{
NSArray * _Nonnull objCValue;
{ // Scope for our temporary variables
@@ -4379,8 +4379,8 @@
auto iter_0 = value.begin();
while (iter_0.Next()) {
auto & entry_0 = iter_0.GetValue();
- MTRSoftwareDiagnosticsClusterThreadMetrics * newElement_0;
- newElement_0 = [MTRSoftwareDiagnosticsClusterThreadMetrics new];
+ MTRSoftwareDiagnosticsClusterThreadMetricsStruct * newElement_0;
+ newElement_0 = [MTRSoftwareDiagnosticsClusterThreadMetricsStruct new];
newElement_0.id = [NSNumber numberWithUnsignedLongLong:entry_0.id];
if (entry_0.name.HasValue()) {
newElement_0.name = [[NSString alloc] initWithBytes:entry_0.name.Value().data()
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h
index 9c5aa2e..9ae9a82 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h
@@ -356,13 +356,18 @@
@property (nonatomic, copy) NSNumber * _Nonnull bootReason API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
@end
+MTR_NEWLY_AVAILABLE
+@interface MTRSoftwareDiagnosticsClusterThreadMetricsStruct : NSObject <NSCopying>
+@property (nonatomic, copy) NSNumber * _Nonnull id MTR_NEWLY_AVAILABLE;
+@property (nonatomic, copy) NSString * _Nullable name MTR_NEWLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nullable stackFreeCurrent MTR_NEWLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nullable stackFreeMinimum MTR_NEWLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nullable stackSize MTR_NEWLY_AVAILABLE;
+@end
+
API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRSoftwareDiagnosticsClusterThreadMetrics : NSObject <NSCopying>
-@property (nonatomic, copy) NSNumber * _Nonnull id API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
-@property (nonatomic, copy) NSString * _Nullable name API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
-@property (nonatomic, copy) NSNumber * _Nullable stackFreeCurrent API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
-@property (nonatomic, copy) NSNumber * _Nullable stackFreeMinimum API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
-@property (nonatomic, copy) NSNumber * _Nullable stackSize API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+MTR_NEWLY_DEPRECATED("Please use MTRSoftwareDiagnosticsClusterThreadMetricsStruct")
+@interface MTRSoftwareDiagnosticsClusterThreadMetrics : MTRSoftwareDiagnosticsClusterThreadMetricsStruct
@end
API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm
index bdb39bf..7494b57 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm
@@ -1337,7 +1337,7 @@
@end
-@implementation MTRSoftwareDiagnosticsClusterThreadMetrics
+@implementation MTRSoftwareDiagnosticsClusterThreadMetricsStruct
- (instancetype)init
{
if (self = [super init]) {
@@ -1357,7 +1357,7 @@
- (id)copyWithZone:(NSZone * _Nullable)zone
{
- auto other = [[MTRSoftwareDiagnosticsClusterThreadMetrics alloc] init];
+ auto other = [[MTRSoftwareDiagnosticsClusterThreadMetricsStruct alloc] init];
other.id = self.id;
other.name = self.name;
@@ -1378,6 +1378,9 @@
@end
+@implementation MTRSoftwareDiagnosticsClusterThreadMetrics : MTRSoftwareDiagnosticsClusterThreadMetricsStruct
+@end
+
@implementation MTRSoftwareDiagnosticsClusterSoftwareFaultEvent
- (instancetype)init
{
diff --git a/src/include/platform/DiagnosticDataProvider.h b/src/include/platform/DiagnosticDataProvider.h
index 2f09b10..a1f78a4 100644
--- a/src/include/platform/DiagnosticDataProvider.h
+++ b/src/include/platform/DiagnosticDataProvider.h
@@ -45,7 +45,7 @@
using BootReasonType = app::Clusters::GeneralDiagnostics::BootReasonType;
-struct ThreadMetrics : public app::Clusters::SoftwareDiagnostics::Structs::ThreadMetrics::Type
+struct ThreadMetrics : public app::Clusters::SoftwareDiagnostics::Structs::ThreadMetricsStruct::Type
{
char NameBuf[kMaxThreadNameLength + 1];
ThreadMetrics * Next; /* Pointer to the next structure. */
diff --git a/zzz_generated/app-common/app-common/zap-generated/af-structs.h b/zzz_generated/app-common/app-common/zap-generated/af-structs.h
index 09a9bc0..d64c50f 100644
--- a/zzz_generated/app-common/app-common/zap-generated/af-structs.h
+++ b/zzz_generated/app-common/app-common/zap-generated/af-structs.h
@@ -554,15 +554,15 @@
uint8_t LQI;
} ThreadInterfaceScanResult;
-// Struct for ThreadMetrics
-typedef struct _ThreadMetrics
+// Struct for ThreadMetricsStruct
+typedef struct _ThreadMetricsStruct
{
uint64_t Id;
chip::CharSpan Name;
uint32_t StackFreeCurrent;
uint32_t StackFreeMinimum;
uint32_t StackSize;
-} ThreadMetrics;
+} ThreadMetricsStruct;
// Struct for TimeZoneType
typedef struct _TimeZoneType
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 f80dd0b..25d7f20 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
@@ -6811,7 +6811,7 @@
} // namespace GeneralDiagnostics
namespace SoftwareDiagnostics {
namespace Structs {
-namespace ThreadMetrics {
+namespace ThreadMetricsStruct {
CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
{
TLV::TLVType outer;
@@ -6866,7 +6866,7 @@
return CHIP_NO_ERROR;
}
-} // namespace ThreadMetrics
+} // namespace ThreadMetricsStruct
} // namespace Structs
namespace Commands {
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 c85b9ce..f3a677e 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
@@ -8074,7 +8074,7 @@
} // namespace GeneralDiagnostics
namespace SoftwareDiagnostics {
namespace Structs {
-namespace ThreadMetrics {
+namespace ThreadMetricsStruct {
enum class Fields
{
kId = 0,
@@ -8102,7 +8102,7 @@
using DecodableType = Type;
-} // namespace ThreadMetrics
+} // namespace ThreadMetricsStruct
} // namespace Structs
namespace Commands {
@@ -8151,11 +8151,11 @@
namespace ThreadMetrics {
struct TypeInfo
{
- using Type = chip::app::DataModel::List<const chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetrics::Type>;
+ using Type = chip::app::DataModel::List<const chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetricsStruct::Type>;
using DecodableType =
- chip::app::DataModel::DecodableList<chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetrics::DecodableType>;
+ chip::app::DataModel::DecodableList<chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetricsStruct::DecodableType>;
using DecodableArgType = const chip::app::DataModel::DecodableList<
- chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetrics::DecodableType> &;
+ chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetricsStruct::DecodableType> &;
static constexpr ClusterId GetClusterId() { return Clusters::SoftwareDiagnostics::Id; }
static constexpr AttributeId GetAttributeId() { return Attributes::ThreadMetrics::Id; }
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp
index 31abe5f..3924e62 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp
+++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp
@@ -2130,12 +2130,12 @@
ComplexArgumentParser::Finalize(request.lqi);
}
CHIP_ERROR ComplexArgumentParser::Setup(const char * label,
- chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetrics::Type & request,
+ chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetricsStruct::Type & request,
Json::Value & value)
{
VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT);
- ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("ThreadMetrics.id", "id", value.isMember("id")));
+ ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("ThreadMetricsStruct.id", "id", value.isMember("id")));
char labelWithMember[kMaxLabelLength];
snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "id");
@@ -2168,7 +2168,7 @@
return CHIP_NO_ERROR;
}
-void ComplexArgumentParser::Finalize(chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetrics::Type & request)
+void ComplexArgumentParser::Finalize(chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetricsStruct::Type & request)
{
ComplexArgumentParser::Finalize(request.id);
ComplexArgumentParser::Finalize(request.name);
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h
index 84df4a8..89ce99d 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h
+++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h
@@ -246,10 +246,10 @@
Json::Value & value);
static void Finalize(chip::app::Clusters::NetworkCommissioning::Structs::ThreadInterfaceScanResult::Type & request);
-static CHIP_ERROR Setup(const char * label, chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetrics::Type & request,
+static CHIP_ERROR Setup(const char * label, chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetricsStruct::Type & request,
Json::Value & value);
-static void Finalize(chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetrics::Type & request);
+static void Finalize(chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetricsStruct::Type & request);
static CHIP_ERROR Setup(const char * label, chip::app::Clusters::TimeSynchronization::Structs::TimeZoneType::Type & request,
Json::Value & value);
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
index 813f470..f8623e6 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
+++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
@@ -2283,8 +2283,9 @@
return CHIP_NO_ERROR;
}
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
- const chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetrics::DecodableType & value)
+CHIP_ERROR
+DataModelLogger::LogValue(const char * label, size_t indent,
+ const chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetricsStruct::DecodableType & value)
{
DataModelLogger::LogString(label, indent, "{");
{
@@ -5678,7 +5679,8 @@
switch (path.mAttributeId)
{
case SoftwareDiagnostics::Attributes::ThreadMetrics::Id: {
- chip::app::DataModel::DecodableList<chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetrics::DecodableType>
+ chip::app::DataModel::DecodableList<
+ chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetricsStruct::DecodableType>
value;
ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
return DataModelLogger::LogValue("ThreadMetrics", 1, value);
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h
index a3a71f6..9b3a89d 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h
+++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h
@@ -134,7 +134,7 @@
LogValue(const char * label, size_t indent,
const chip::app::Clusters::NetworkCommissioning::Structs::ThreadInterfaceScanResult::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent,
- const chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetrics::DecodableType & value);
+ const chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetricsStruct::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::TimeSynchronization::Structs::TimeZoneType::DecodableType & value);
static CHIP_ERROR
diff --git a/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.h b/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.h
index af6596c..4b357fa 100644
--- a/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.h
+++ b/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.h
@@ -208,8 +208,8 @@
void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
typedef void (*SoftwareDiagnosticsThreadMetricsListAttributeCallback)(
void * context,
- const chip::app::DataModel::DecodableList<chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetrics::DecodableType> &
- data);
+ const chip::app::DataModel::DecodableList<
+ chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetricsStruct::DecodableType> & data);
typedef void (*SoftwareDiagnosticsGeneratedCommandListListAttributeCallback)(
void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
typedef void (*SoftwareDiagnosticsAcceptedCommandListListAttributeCallback)(
