Update zapfile_formatter to also check for mandatory commands (#19005)
* Update zapfile_formatter to also check for manditory commands
Check for TestEventTriggersEnabled attribute exists, and check for
TestEventTrigger command.
* regen files from zap
* Update TestEventTrigger command to be server instead of client
* Minor fix to zapfile_formatter
* regen from zap file
diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
index 6934bf1..e424fb6 100644
--- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
+++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
@@ -3339,16 +3339,7 @@
"define": "GENERAL_DIAGNOSTICS_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [
- {
- "name": "TestEventTrigger",
- "code": 0,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
- }
- ],
+ "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -3375,7 +3366,16 @@
"define": "GENERAL_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
+ "commands": [
+ {
+ "name": "TestEventTrigger",
+ "code": 0,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 0
+ }
+ ],
"attributes": [
{
"name": "NetworkInterfaces",
diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap
index e5ef9c8..5ffbbf5 100644
--- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap
+++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap
@@ -3339,16 +3339,7 @@
"define": "GENERAL_DIAGNOSTICS_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [
- {
- "name": "TestEventTrigger",
- "code": 0,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
- }
- ],
+ "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -3375,7 +3366,16 @@
"define": "GENERAL_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
+ "commands": [
+ {
+ "name": "TestEventTrigger",
+ "code": 0,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 0
+ }
+ ],
"attributes": [
{
"name": "NetworkInterfaces",
diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter
index a83df54..99aafe4 100644
--- a/examples/bridge-app/bridge-common/bridge-app.matter
+++ b/examples/bridge-app/bridge-common/bridge-app.matter
@@ -443,8 +443,16 @@
readonly attribute ENUM8 activeHardwareFaults[] = 5;
readonly attribute ENUM8 activeRadioFaults[] = 6;
readonly attribute ENUM8 activeNetworkFaults[] = 7;
+ readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
+
+ request struct TestEventTriggerRequest {
+ OCTET_STRING enableKey = 0;
+ INT64U eventTrigger = 1;
+ }
+
+ command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
}
server cluster LevelControl = 8 {
@@ -1252,6 +1260,7 @@
callback attribute activeHardwareFaults;
callback attribute activeRadioFaults;
callback attribute activeNetworkFaults;
+ callback attribute testEventTriggersEnabled;
ram attribute featureMap;
ram attribute clusterRevision default = 1;
}
diff --git a/examples/bridge-app/bridge-common/bridge-app.zap b/examples/bridge-app/bridge-common/bridge-app.zap
index bd55518..3b8613a 100644
--- a/examples/bridge-app/bridge-common/bridge-app.zap
+++ b/examples/bridge-app/bridge-common/bridge-app.zap
@@ -1555,7 +1555,16 @@
"define": "GENERAL_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
+ "commands": [
+ {
+ "name": "TestEventTrigger",
+ "code": 0,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 0
+ }
+ ],
"attributes": [
{
"name": "NetworkInterfaces",
@@ -1686,6 +1695,22 @@
"reportableChange": 0
},
{
+ "name": "TestEventTriggersEnabled",
+ "code": 8,
+ "mfgCode": null,
+ "side": "server",
+ "type": "boolean",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "false",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
diff --git a/examples/chef/devices/lighting-app.zap b/examples/chef/devices/lighting-app.zap
index 6f8fc1e..5144752 100644
--- a/examples/chef/devices/lighting-app.zap
+++ b/examples/chef/devices/lighting-app.zap
@@ -2613,7 +2613,16 @@
"define": "GENERAL_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
+ "commands": [
+ {
+ "name": "TestEventTrigger",
+ "code": 0,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 0
+ }
+ ],
"attributes": [
{
"name": "NetworkInterfaces",
@@ -2744,6 +2753,22 @@
"reportableChange": 0
},
{
+ "name": "TestEventTriggersEnabled",
+ "code": 8,
+ "mfgCode": null,
+ "side": "server",
+ "type": "boolean",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "false",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
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 91bc8c8..ad86f5e 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
@@ -629,8 +629,16 @@
readonly attribute ENUM8 activeHardwareFaults[] = 5;
readonly attribute ENUM8 activeRadioFaults[] = 6;
readonly attribute ENUM8 activeNetworkFaults[] = 7;
+ readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
+
+ request struct TestEventTriggerRequest {
+ OCTET_STRING enableKey = 0;
+ INT64U eventTrigger = 1;
+ }
+
+ command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
}
server cluster GroupKeyManagement = 63 {
@@ -1790,6 +1798,7 @@
callback attribute activeHardwareFaults;
callback attribute activeRadioFaults;
callback attribute activeNetworkFaults;
+ callback attribute testEventTriggersEnabled;
ram attribute featureMap;
ram attribute clusterRevision default = 1;
}
diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.zap b/examples/light-switch-app/light-switch-common/light-switch-app.zap
index 3ab06ab..8979e23 100644
--- a/examples/light-switch-app/light-switch-common/light-switch-app.zap
+++ b/examples/light-switch-app/light-switch-common/light-switch-app.zap
@@ -2612,7 +2612,16 @@
"define": "GENERAL_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
+ "commands": [
+ {
+ "name": "TestEventTrigger",
+ "code": 0,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 0
+ }
+ ],
"attributes": [
{
"name": "NetworkInterfaces",
@@ -2743,6 +2752,22 @@
"reportableChange": 0
},
{
+ "name": "TestEventTriggersEnabled",
+ "code": 8,
+ "mfgCode": null,
+ "side": "server",
+ "type": "boolean",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "false",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter
index 3a260d9..2644879 100644
--- a/examples/lighting-app/lighting-common/lighting-app.matter
+++ b/examples/lighting-app/lighting-common/lighting-app.matter
@@ -642,8 +642,16 @@
readonly attribute ENUM8 activeHardwareFaults[] = 5;
readonly attribute ENUM8 activeRadioFaults[] = 6;
readonly attribute ENUM8 activeNetworkFaults[] = 7;
+ readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
+
+ request struct TestEventTriggerRequest {
+ OCTET_STRING enableKey = 0;
+ INT64U eventTrigger = 1;
+ }
+
+ command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
}
server cluster GroupKeyManagement = 63 {
@@ -1772,6 +1780,7 @@
callback attribute activeHardwareFaults;
callback attribute activeRadioFaults;
callback attribute activeNetworkFaults;
+ callback attribute testEventTriggersEnabled;
ram attribute featureMap;
ram attribute clusterRevision default = 1;
}
diff --git a/examples/lighting-app/lighting-common/lighting-app.zap b/examples/lighting-app/lighting-common/lighting-app.zap
index b3bf7d4..367ea34 100644
--- a/examples/lighting-app/lighting-common/lighting-app.zap
+++ b/examples/lighting-app/lighting-common/lighting-app.zap
@@ -2629,7 +2629,16 @@
"define": "GENERAL_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
+ "commands": [
+ {
+ "name": "TestEventTrigger",
+ "code": 0,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 0
+ }
+ ],
"attributes": [
{
"name": "NetworkInterfaces",
@@ -2760,6 +2769,22 @@
"reportableChange": 0
},
{
+ "name": "TestEventTriggersEnabled",
+ "code": 8,
+ "mfgCode": null,
+ "side": "server",
+ "type": "boolean",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "false",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter
index 11a6b78..1a4cf09 100644
--- a/examples/lock-app/lock-common/lock-app.matter
+++ b/examples/lock-app/lock-common/lock-app.matter
@@ -962,8 +962,16 @@
readonly attribute ENUM8 activeHardwareFaults[] = 5;
readonly attribute ENUM8 activeRadioFaults[] = 6;
readonly attribute ENUM8 activeNetworkFaults[] = 7;
+ readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
+
+ request struct TestEventTriggerRequest {
+ OCTET_STRING enableKey = 0;
+ INT64U eventTrigger = 1;
+ }
+
+ command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
}
server cluster Groups = 4 {
@@ -1967,6 +1975,7 @@
callback attribute activeHardwareFaults;
callback attribute activeRadioFaults;
callback attribute activeNetworkFaults;
+ callback attribute testEventTriggersEnabled;
ram attribute featureMap;
ram attribute clusterRevision default = 1;
}
diff --git a/examples/lock-app/lock-common/lock-app.zap b/examples/lock-app/lock-common/lock-app.zap
index 610a168..c5eef5b 100755
--- a/examples/lock-app/lock-common/lock-app.zap
+++ b/examples/lock-app/lock-common/lock-app.zap
@@ -2797,7 +2797,16 @@
"define": "GENERAL_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
+ "commands": [
+ {
+ "name": "TestEventTrigger",
+ "code": 0,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 0
+ }
+ ],
"attributes": [
{
"name": "NetworkInterfaces",
@@ -2928,6 +2937,22 @@
"reportableChange": 0
},
{
+ "name": "TestEventTriggersEnabled",
+ "code": 8,
+ "mfgCode": null,
+ "side": "server",
+ "type": "boolean",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "false",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter
index 7954bc0..98bdcd4 100644
--- a/examples/placeholder/linux/apps/app1/config.matter
+++ b/examples/placeholder/linux/apps/app1/config.matter
@@ -786,8 +786,16 @@
readonly attribute ENUM8 activeHardwareFaults[] = 5;
readonly attribute ENUM8 activeRadioFaults[] = 6;
readonly attribute ENUM8 activeNetworkFaults[] = 7;
+ readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
+
+ request struct TestEventTriggerRequest {
+ OCTET_STRING enableKey = 0;
+ INT64U eventTrigger = 1;
+ }
+
+ command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
}
server cluster Groups = 4 {
@@ -2708,6 +2716,7 @@
callback attribute activeHardwareFaults;
callback attribute activeRadioFaults;
callback attribute activeNetworkFaults;
+ callback attribute testEventTriggersEnabled;
ram attribute featureMap;
ram attribute clusterRevision default = 1;
}
diff --git a/examples/placeholder/linux/apps/app1/config.zap b/examples/placeholder/linux/apps/app1/config.zap
index a870564..8ad332d 100644
--- a/examples/placeholder/linux/apps/app1/config.zap
+++ b/examples/placeholder/linux/apps/app1/config.zap
@@ -2130,7 +2130,16 @@
"define": "GENERAL_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
+ "commands": [
+ {
+ "name": "TestEventTrigger",
+ "code": 0,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 0
+ }
+ ],
"attributes": [
{
"name": "NetworkInterfaces",
@@ -2261,6 +2270,22 @@
"reportableChange": 0
},
{
+ "name": "TestEventTriggersEnabled",
+ "code": 8,
+ "mfgCode": null,
+ "side": "server",
+ "type": "boolean",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "false",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter
index 7954bc0..98bdcd4 100644
--- a/examples/placeholder/linux/apps/app2/config.matter
+++ b/examples/placeholder/linux/apps/app2/config.matter
@@ -786,8 +786,16 @@
readonly attribute ENUM8 activeHardwareFaults[] = 5;
readonly attribute ENUM8 activeRadioFaults[] = 6;
readonly attribute ENUM8 activeNetworkFaults[] = 7;
+ readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
+
+ request struct TestEventTriggerRequest {
+ OCTET_STRING enableKey = 0;
+ INT64U eventTrigger = 1;
+ }
+
+ command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
}
server cluster Groups = 4 {
@@ -2708,6 +2716,7 @@
callback attribute activeHardwareFaults;
callback attribute activeRadioFaults;
callback attribute activeNetworkFaults;
+ callback attribute testEventTriggersEnabled;
ram attribute featureMap;
ram attribute clusterRevision default = 1;
}
diff --git a/examples/placeholder/linux/apps/app2/config.zap b/examples/placeholder/linux/apps/app2/config.zap
index a870564..8ad332d 100644
--- a/examples/placeholder/linux/apps/app2/config.zap
+++ b/examples/placeholder/linux/apps/app2/config.zap
@@ -2130,7 +2130,16 @@
"define": "GENERAL_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
+ "commands": [
+ {
+ "name": "TestEventTrigger",
+ "code": 0,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 0
+ }
+ ],
"attributes": [
{
"name": "NetworkInterfaces",
@@ -2261,6 +2270,22 @@
"reportableChange": 0
},
{
+ "name": "TestEventTriggersEnabled",
+ "code": 8,
+ "mfgCode": null,
+ "side": "server",
+ "type": "boolean",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "false",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter
index a276e08..f3cd7fa 100644
--- a/examples/pump-app/pump-common/pump-app.matter
+++ b/examples/pump-app/pump-common/pump-app.matter
@@ -375,8 +375,16 @@
readonly attribute ENUM8 activeHardwareFaults[] = 5;
readonly attribute ENUM8 activeRadioFaults[] = 6;
readonly attribute ENUM8 activeNetworkFaults[] = 7;
+ readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
+
+ request struct TestEventTriggerRequest {
+ OCTET_STRING enableKey = 0;
+ INT64U eventTrigger = 1;
+ }
+
+ command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
}
server cluster GroupKeyManagement = 63 {
@@ -1701,6 +1709,7 @@
callback attribute activeHardwareFaults;
callback attribute activeRadioFaults;
callback attribute activeNetworkFaults;
+ callback attribute testEventTriggersEnabled;
ram attribute featureMap;
ram attribute clusterRevision default = 1;
}
diff --git a/examples/pump-app/pump-common/pump-app.zap b/examples/pump-app/pump-common/pump-app.zap
index 50f3d23..1dc6918 100644
--- a/examples/pump-app/pump-common/pump-app.zap
+++ b/examples/pump-app/pump-common/pump-app.zap
@@ -3037,7 +3037,16 @@
"define": "GENERAL_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
+ "commands": [
+ {
+ "name": "TestEventTrigger",
+ "code": 0,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 0
+ }
+ ],
"attributes": [
{
"name": "NetworkInterfaces",
@@ -3168,6 +3177,22 @@
"reportableChange": 0
},
{
+ "name": "TestEventTriggersEnabled",
+ "code": 8,
+ "mfgCode": null,
+ "side": "server",
+ "type": "boolean",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "false",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
"name": "GeneratedCommandList",
"code": 65528,
"mfgCode": null,
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 a1a8a88..e298cc8 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
@@ -367,11 +367,19 @@
readonly attribute ENUM8 activeHardwareFaults[] = 5;
readonly attribute ENUM8 activeRadioFaults[] = 6;
readonly attribute ENUM8 activeNetworkFaults[] = 7;
+ readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute attrib_id attributeList[] = 65531;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
+
+ request struct TestEventTriggerRequest {
+ OCTET_STRING enableKey = 0;
+ INT64U eventTrigger = 1;
+ }
+
+ command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
}
server cluster GroupKeyManagement = 63 {
@@ -1419,6 +1427,7 @@
callback attribute activeHardwareFaults;
callback attribute activeRadioFaults;
callback attribute activeNetworkFaults;
+ callback attribute testEventTriggersEnabled;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap b/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap
index bef6851..b178196 100644
--- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap
+++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap
@@ -2983,7 +2983,16 @@
"define": "GENERAL_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
+ "commands": [
+ {
+ "name": "TestEventTrigger",
+ "code": 0,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 0
+ }
+ ],
"attributes": [
{
"name": "NetworkInterfaces",
@@ -3114,6 +3123,22 @@
"reportableChange": 0
},
{
+ "name": "TestEventTriggersEnabled",
+ "code": 8,
+ "mfgCode": null,
+ "side": "server",
+ "type": "boolean",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "false",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
"name": "GeneratedCommandList",
"code": 65528,
"mfgCode": null,
diff --git a/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter b/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter
index 7803f4b..fc1c978 100644
--- a/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter
+++ b/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter
@@ -377,8 +377,16 @@
readonly attribute ENUM8 activeHardwareFaults[] = 5;
readonly attribute ENUM8 activeRadioFaults[] = 6;
readonly attribute ENUM8 activeNetworkFaults[] = 7;
+ readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
+
+ request struct TestEventTriggerRequest {
+ OCTET_STRING enableKey = 0;
+ INT64U eventTrigger = 1;
+ }
+
+ command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
}
server cluster LocalizationConfiguration = 43 {
@@ -857,6 +865,7 @@
callback attribute activeHardwareFaults;
callback attribute activeRadioFaults;
callback attribute activeNetworkFaults;
+ callback attribute testEventTriggersEnabled;
ram attribute featureMap;
ram attribute clusterRevision default = 1;
}
diff --git a/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap b/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap
index 6297f28..4cba033 100644
--- a/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap
+++ b/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap
@@ -1919,7 +1919,16 @@
"define": "GENERAL_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
+ "commands": [
+ {
+ "name": "TestEventTrigger",
+ "code": 0,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 0
+ }
+ ],
"attributes": [
{
"name": "NetworkInterfaces",
@@ -2050,6 +2059,22 @@
"reportableChange": 0
},
{
+ "name": "TestEventTriggersEnabled",
+ "code": 8,
+ "mfgCode": null,
+ "side": "server",
+ "type": "boolean",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "false",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter
index 14870c4..3ecb46d 100644
--- a/examples/thermostat/thermostat-common/thermostat.matter
+++ b/examples/thermostat/thermostat-common/thermostat.matter
@@ -391,8 +391,16 @@
readonly attribute ENUM8 activeHardwareFaults[] = 5;
readonly attribute ENUM8 activeRadioFaults[] = 6;
readonly attribute ENUM8 activeNetworkFaults[] = 7;
+ readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
+
+ request struct TestEventTriggerRequest {
+ OCTET_STRING enableKey = 0;
+ INT64U eventTrigger = 1;
+ }
+
+ command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
}
server cluster GroupKeyManagement = 63 {
@@ -1486,6 +1494,7 @@
callback attribute activeHardwareFaults;
callback attribute activeRadioFaults;
callback attribute activeNetworkFaults;
+ callback attribute testEventTriggersEnabled;
ram attribute featureMap;
ram attribute clusterRevision default = 1;
}
diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap
index 6ae9dd5..08304d7 100644
--- a/examples/thermostat/thermostat-common/thermostat.zap
+++ b/examples/thermostat/thermostat-common/thermostat.zap
@@ -2437,7 +2437,16 @@
"define": "GENERAL_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
+ "commands": [
+ {
+ "name": "TestEventTrigger",
+ "code": 0,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 0
+ }
+ ],
"attributes": [
{
"name": "NetworkInterfaces",
@@ -2568,6 +2577,22 @@
"reportableChange": 0
},
{
+ "name": "TestEventTriggersEnabled",
+ "code": 8,
+ "mfgCode": null,
+ "side": "server",
+ "type": "boolean",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "false",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter
index af1de7b..4c28f94 100644
--- a/examples/tv-app/tv-common/tv-app.matter
+++ b/examples/tv-app/tv-common/tv-app.matter
@@ -760,8 +760,16 @@
readonly attribute ENUM8 activeHardwareFaults[] = 5;
readonly attribute ENUM8 activeRadioFaults[] = 6;
readonly attribute ENUM8 activeNetworkFaults[] = 7;
+ readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
+
+ request struct TestEventTriggerRequest {
+ OCTET_STRING enableKey = 0;
+ INT64U eventTrigger = 1;
+ }
+
+ command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
}
server cluster GroupKeyManagement = 63 {
@@ -2145,6 +2153,7 @@
callback attribute activeHardwareFaults;
callback attribute activeRadioFaults;
callback attribute activeNetworkFaults;
+ callback attribute testEventTriggersEnabled;
ram attribute featureMap;
ram attribute clusterRevision default = 1;
}
diff --git a/examples/tv-app/tv-common/tv-app.zap b/examples/tv-app/tv-common/tv-app.zap
index cde4316..151a8ad 100644
--- a/examples/tv-app/tv-common/tv-app.zap
+++ b/examples/tv-app/tv-common/tv-app.zap
@@ -2453,7 +2453,16 @@
"define": "GENERAL_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
+ "commands": [
+ {
+ "name": "TestEventTrigger",
+ "code": 0,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 0
+ }
+ ],
"attributes": [
{
"name": "NetworkInterfaces",
@@ -2584,6 +2593,22 @@
"reportableChange": 0
},
{
+ "name": "TestEventTriggersEnabled",
+ "code": 8,
+ "mfgCode": null,
+ "side": "server",
+ "type": "boolean",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "false",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
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 50f9d44..00df7af 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
@@ -684,8 +684,16 @@
readonly attribute ENUM8 activeHardwareFaults[] = 5;
readonly attribute ENUM8 activeRadioFaults[] = 6;
readonly attribute ENUM8 activeNetworkFaults[] = 7;
+ readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
+
+ request struct TestEventTriggerRequest {
+ OCTET_STRING enableKey = 0;
+ INT64U eventTrigger = 1;
+ }
+
+ command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
}
server cluster GroupKeyManagement = 63 {
@@ -2317,6 +2325,7 @@
callback attribute activeHardwareFaults;
callback attribute activeRadioFaults;
callback attribute activeNetworkFaults;
+ callback attribute testEventTriggersEnabled;
ram attribute featureMap;
ram attribute clusterRevision default = 1;
}
diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap
index 5879be4..3eb0264 100644
--- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap
+++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap
@@ -2404,7 +2404,16 @@
"define": "GENERAL_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
+ "commands": [
+ {
+ "name": "TestEventTrigger",
+ "code": 0,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 0
+ }
+ ],
"attributes": [
{
"name": "NetworkInterfaces",
@@ -2535,6 +2544,22 @@
"reportableChange": 0
},
{
+ "name": "TestEventTriggersEnabled",
+ "code": 8,
+ "mfgCode": null,
+ "side": "server",
+ "type": "boolean",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "false",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter
index 535f04a..01f3093 100644
--- a/examples/window-app/common/window-app.matter
+++ b/examples/window-app/common/window-app.matter
@@ -358,11 +358,19 @@
readonly attribute ENUM8 activeHardwareFaults[] = 5;
readonly attribute ENUM8 activeRadioFaults[] = 6;
readonly attribute ENUM8 activeNetworkFaults[] = 7;
+ readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute attrib_id attributeList[] = 65531;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
+
+ request struct TestEventTriggerRequest {
+ OCTET_STRING enableKey = 0;
+ INT64U eventTrigger = 1;
+ }
+
+ command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
}
server cluster GroupKeyManagement = 63 {
@@ -1683,6 +1691,7 @@
callback attribute activeHardwareFaults;
callback attribute activeRadioFaults;
callback attribute activeNetworkFaults;
+ callback attribute testEventTriggersEnabled;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
diff --git a/examples/window-app/common/window-app.zap b/examples/window-app/common/window-app.zap
index 94f6905..cf0fdab 100644
--- a/examples/window-app/common/window-app.zap
+++ b/examples/window-app/common/window-app.zap
@@ -2979,7 +2979,16 @@
"define": "GENERAL_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
+ "commands": [
+ {
+ "name": "TestEventTrigger",
+ "code": 0,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 0
+ }
+ ],
"attributes": [
{
"name": "NetworkInterfaces",
@@ -3110,6 +3119,22 @@
"reportableChange": 0
},
{
+ "name": "TestEventTriggersEnabled",
+ "code": 8,
+ "mfgCode": null,
+ "side": "server",
+ "type": "boolean",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "false",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
"name": "GeneratedCommandList",
"code": 65528,
"mfgCode": null,
diff --git a/scripts/tools/zap/zapfile_formatter.py b/scripts/tools/zap/zapfile_formatter.py
index 4240cd2..a6a9508 100755
--- a/scripts/tools/zap/zapfile_formatter.py
+++ b/scripts/tools/zap/zapfile_formatter.py
@@ -20,37 +20,83 @@
from typing import List
_DEFAULT_CLUSTER_REVISION_ATTRIBUTE = {
- "name": "ClusterRevision",
- "code": 0xFFFD,
- "mfgCode": None,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
+ "entry": {
+ "name": "ClusterRevision",
+ "code": 0xFFFD,
+ "mfgCode": None,
+ "side": "server",
+ "type": "int16u",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "1",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ "clusterCode": None,
+ "clusterParamKey": "attributes",
+ "side": "server"
}
_DEFAULT_FEATURE_MAP_ATTRIBUTE = {
- "name": "FeatureMap",
- "code": 0xFFFC,
- "mfgCode": None,
- "side": "server",
- "type": "bitmap32",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
+ "entry": {
+ "name": "FeatureMap",
+ "code": 0xFFFC,
+ "mfgCode": None,
+ "side": "server",
+ "type": "bitmap32",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "0",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ "clusterCode": None,
+ "clusterParamKey": "attributes",
+ "side": "server"
+}
+
+_TEST_EVENT_TRIGGERS_ENABLED_ATTRIBUTE = {
+ "entry": {
+ "name": "TestEventTriggersEnabled",
+ "code": 8,
+ "mfgCode": None,
+ "side": "server",
+ "type": "boolean",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "false",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ "clusterCode": 51,
+ "clusterParamKey": "attributes",
+ "side": "server"
+}
+
+_TEST_EVENT_TRIGGERS_CLIENT_COMMAND = {
+ "entry": {
+ "name": "TestEventTrigger",
+ "code": 0,
+ "mfgCode": None,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 0
+ },
+ "clusterCode": 51,
+ "clusterParamKey": "commands",
+ "side": "server"
}
@@ -62,76 +108,111 @@
pass
-class ValidateMandatoryServerClusterAttributes(Mutator):
- def __init__(self, attribute_entry, add_if_missing, forces_include, replace_if_storage_nvm):
- self._attribute_entry = attribute_entry
- self._add_if_missing = add_if_missing
- self._forces_include = forces_include
- self._replace_if_storage_nvm = replace_if_storage_nvm
+class ValidateMandatoryClusterParam(Mutator):
+ def __init__(self, param_details, args):
+ self._param_entry = param_details["entry"]
+ self._cluster_specific_code = param_details["clusterCode"]
+ self._param_key = param_details["clusterParamKey"]
+ self._cluster_side = param_details["side"]
+ self._add_if_missing = args.add_missing_cluster_param
+ self._forces_enable = args.force_enable_cluster_param
+ self._replace_if_storage_nvm = args.mandatory_attributes_replace_if_storage_nvm
super().__init__()
- def _addMissingMandatoryAttribute(self, candidate: object):
- attributes = candidate.get("attributes", [])
+ def _addEntry(self, candidate: object):
+ param_list = candidate.get(self._param_key, [])
insert_index = 0
- for attribute in attributes:
- attribute_code = attribute.get("code")
- if attribute_code is not None and attribute_code > self._attribute_entry[
- "code"]:
+ for entry in param_list:
+ code = entry.get("code")
+ if code is not None and code > self._param_entry["code"]:
break
insert_index += 1
- # Insert the new attribute in the right place, WITH NO RENUMBERING
- new_attrib_list = attributes[0:insert_index]
- new_attrib_list.append(self._attribute_entry)
- new_attrib_list.extend(attributes[insert_index:])
+ # Insert the new entry in the right place, with no renumbering
+ new_param_list = param_list[0:insert_index]
+ new_param_list.append(self._param_entry)
+ new_param_list.extend(param_list[insert_index:])
- # Replace the attribute list with the augmented item
- candidate["attributes"] = new_attrib_list
+ # Replace the param list with the augmented item
+ candidate[self._param_key] = new_param_list
+
+ def _isCandidateValidCluster(self, candidate: object):
+ if not isinstance(candidate, dict):
+ return False
+
+ # We only care about adding mandatory entires to .
+ if self._param_key not in candidate:
+ return False
+
+ # Valid clusters must have enabled and side.
+ if (("enabled" not in candidate) or ("side" not in candidate)):
+ return False
+
+ if self._cluster_side not in candidate.get("side"):
+ return False
+
+ # Command clusters do not need to be enabled for it to have an effect on auto generated
+ # files based off of the zap file.
+ if (self._param_key != "commands") and (not candidate.get("enabled")):
+ return False
+
+ if self._cluster_specific_code is not None and self._cluster_specific_code != candidate["code"]:
+ return False
+
+ return True
+
+ def _attributeSpecificChecks(self, param: object, cluster_name):
+ if not param["included"]:
+ print("WARNING: param 0x%X(%s) in cluster %s found, but included is false" %
+ (self._param_entry["code"], self._param_entry["name"], cluster_name))
+ if self._forces_enable:
+ param["included"] = self._param_entry["included"]
+
+ if param["storageOption"] == "NVM":
+ print("WARNING: param 0x%X(%s) in cluster %s found, but storageOption was NVM" %
+ (self._param_entry["code"], self._param_entry["name"], cluster_name))
+ if self._replace_if_storage_nvm:
+ param["storageOption"] = self._param_entry["storageOption"]
+
+ def _commandSpecificChecks(self, param: object, cluster_name):
+ if param["incoming"] != self._param_entry["incoming"]:
+ print("WARNING: param 0x%X(%s) in cluster %s found, but incoming field isn't correct" %
+ (self._param_entry["code"], self._param_entry["name"], cluster_name))
+ if self._forces_enable:
+ param["incoming"] = self._param_entry["incoming"]
+
+ if param["outgoing"] != self._param_entry["outgoing"]:
+ print("WARNING: param 0x%X(%s) in cluster %s found, but outgoing field isn't correct" %
+ (self._param_entry["code"], self._param_entry["name"], cluster_name))
+ if self._forces_enable:
+ param["outgoing"] = self._param_entry["outgoing"]
def handle(self, candidate: object):
- if not isinstance(candidate, dict):
+ if not self._isCandidateValidCluster(candidate):
return
- # We only care about adding mandatory attributes.
- if "attributes" not in candidate:
- return
-
- # If the cluster is not a server or is not enabled we do not enforce adding manidory attribute.
- if (("enabled" not in candidate) or ("side" not in candidate)):
- return
- if (not candidate.get("enabled")) or ("server"
- not in candidate.get("side")):
- return
-
- for attribute in candidate.get("attributes", []):
- if attribute["code"] != self._attribute_entry["code"]:
+ for param in candidate.get(self._param_key, []):
+ if param["code"] != self._param_entry["code"]:
continue
- if attribute["name"] != self._attribute_entry["name"]:
+ if param["name"] != self._param_entry["name"]:
print(
- "WARNING: attribute 0x%X has mismatching name %s (should be %s)" %
- (self._attribute_entry["code"], attribute["name"],
- self._attribute_entry["name"]))
+ "WARNING: param 0x%X has mismatching name %s (should be %s)" %
+ (self._param_entry["code"], param["name"],
+ self._param_entry["name"]))
- if not attribute["included"]:
- print("WARNING: attribute 0x%X(%s) in cluster %s found, but included is false" %
- (self._attribute_entry["code"], self._attribute_entry["name"], candidate["name"]))
- if self._forces_include:
- attribute["included"] = self._attribute_entry["included"]
-
- if attribute["storageOption"] == "NVM":
- print("WARNING: attribute 0x%X(%s) in cluster %s found, but storageOption was NVM" %
- (self._attribute_entry["code"], self._attribute_entry["name"], candidate["name"]))
- if self._replace_if_storage_nvm:
- attribute["storageOption"] = self._attribute_entry["storageOption"]
+ if self._param_key == "attributes":
+ self._attributeSpecificChecks(param, candidate["name"])
+ elif self._param_key == "commands":
+ self._commandSpecificChecks(param, candidate["name"])
break
else:
print(
- "WARNING: Did not find mandatory attribute %s in cluster %s (0x%X)" %
- (self._attribute_entry["name"], candidate["name"], candidate["code"]))
+ "WARNING: Did not find mandatory param %s in cluster %s (0x%X)" %
+ (self._param_entry["name"], candidate["name"], candidate["code"]))
if self._add_if_missing:
- self._addMissingMandatoryAttribute(candidate)
+ self._addEntry(candidate)
def loadZapfile(filename: str):
@@ -164,10 +245,10 @@
parser = argparse.ArgumentParser(description='Mutate ZAP files')
parser.add_argument('zap_filenames', metavar='zap-filename', type=str, nargs='+',
help='zapfiles that need mutating')
- parser.add_argument('--mandatory-attributes-add-missing', default=False, action='store_true',
- help="Add missing mandatory attributes to server clusters (default: False)")
- parser.add_argument('--mandatory-attributes-force-included', default=False, action='store_true',
- help="If mandatory attribute is not included, include it (default: False)")
+ parser.add_argument('--add-missing-cluster-param', default=False, action='store_true',
+ help="Add missing mandatory cluster parameters (default: False)")
+ parser.add_argument('--force-enable-cluster-param', default=False, action='store_true',
+ help="If mandatory cluster paramater is not missing and not enabled, enable it (default: False)")
parser.add_argument('--mandatory-attributes-replace-if-storage-nvm', default=False, action='store_true',
help="Enforce mandatory attribute use default storage type (default: False)")
return parser.parse_args()
@@ -177,14 +258,17 @@
args = setupArgumentsParser()
mutators = []
- add_missing_cluster_revision = ValidateMandatoryServerClusterAttributes(
- _DEFAULT_CLUSTER_REVISION_ATTRIBUTE, args.mandatory_attributes_add_missing,
- args.mandatory_attributes_force_included, args.mandatory_attributes_replace_if_storage_nvm)
- add_missing_feature_map = ValidateMandatoryServerClusterAttributes(
- _DEFAULT_FEATURE_MAP_ATTRIBUTE, args.mandatory_attributes_add_missing,
- args.mandatory_attributes_force_included, args.mandatory_attributes_replace_if_storage_nvm)
+ add_missing_cluster_revision = ValidateMandatoryClusterParam(
+ _DEFAULT_CLUSTER_REVISION_ATTRIBUTE, args)
+ add_missing_feature_map = ValidateMandatoryClusterParam(
+ _DEFAULT_FEATURE_MAP_ATTRIBUTE, args)
+ add_general_diagnostic_test_event_trigger_enabled = ValidateMandatoryClusterParam(
+ _TEST_EVENT_TRIGGERS_ENABLED_ATTRIBUTE, args)
+ add_general_diagnostic_test_event_trigger_command = ValidateMandatoryClusterParam(
+ _TEST_EVENT_TRIGGERS_CLIENT_COMMAND, args)
- mutators.extend([add_missing_cluster_revision, add_missing_feature_map])
+ mutators.extend([add_missing_cluster_revision, add_missing_feature_map,
+ add_general_diagnostic_test_event_trigger_enabled, add_general_diagnostic_test_event_trigger_command])
for zap_filename in args.zap_filenames:
body = loadZapfile(zap_filename)
diff --git a/zzz_generated/bridge-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/bridge-app/zap-generated/IMClusterCommandHandler.cpp
index 87a96cc..2f49a61 100644
--- a/zzz_generated/bridge-app/zap-generated/IMClusterCommandHandler.cpp
+++ b/zzz_generated/bridge-app/zap-generated/IMClusterCommandHandler.cpp
@@ -192,6 +192,43 @@
} // namespace GeneralCommissioning
+namespace GeneralDiagnostics {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+ CHIP_ERROR TLVError = CHIP_NO_ERROR;
+ bool wasHandled = false;
+ {
+ switch (aCommandPath.mCommandId)
+ {
+ case Commands::TestEventTrigger::Id: {
+ Commands::TestEventTrigger::DecodableType commandData;
+ TLVError = DataModel::Decode(aDataTlv, commandData);
+ if (TLVError == CHIP_NO_ERROR)
+ {
+ wasHandled = emberAfGeneralDiagnosticsClusterTestEventTriggerCallback(apCommandObj, aCommandPath, commandData);
+ }
+ break;
+ }
+ default: {
+ // Unrecognized command ID, error status will apply.
+ apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+ ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+ ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+ return;
+ }
+ }
+ }
+
+ if (CHIP_NO_ERROR != TLVError || !wasHandled)
+ {
+ apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+ ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+ }
+}
+
+} // namespace GeneralDiagnostics
+
namespace LevelControl {
void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
@@ -551,6 +588,9 @@
case Clusters::GeneralCommissioning::Id:
Clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
break;
+ case Clusters::GeneralDiagnostics::Id:
+ Clusters::GeneralDiagnostics::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+ break;
case Clusters::LevelControl::Id:
Clusters::LevelControl::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
break;
diff --git a/zzz_generated/bridge-app/zap-generated/endpoint_config.h b/zzz_generated/bridge-app/zap-generated/endpoint_config.h
index fa3f853..8a80051 100644
--- a/zzz_generated/bridge-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/bridge-app/zap-generated/endpoint_config.h
@@ -90,7 +90,7 @@
#define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask
// This is an array of EmberAfAttributeMetadata structures.
-#define GENERATED_ATTRIBUTE_COUNT 225
+#define GENERATED_ATTRIBUTE_COUNT 226
#define GENERATED_ATTRIBUTES \
{ \
\
@@ -224,7 +224,9 @@
ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */ \
{ 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \
{ 0x00000007, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
- ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaults */ \
+ ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaults */ \
+ { 0x00000008, ZAP_TYPE(BOOLEAN), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
+ ZAP_EMPTY_DEFAULT() }, /* TestEventTriggersEnabled */ \
{ 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \
{ 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \
\
@@ -525,18 +527,22 @@
/* GeneratedCommandList (index=21)*/ \
0x00000001 /* RetrieveLogsResponse */, \
chip::kInvalidCommandId /* end of list */, \
- /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */\
+ /* Endpoint: 0, Cluster: General Diagnostics (server) */\
/* AcceptedCommandList (index=23) */ \
+ 0x00000000 /* TestEventTrigger */, \
+ chip::kInvalidCommandId /* end of list */, \
+ /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */\
+ /* AcceptedCommandList (index=25) */ \
0x00000000 /* ResetCounts */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 0, Cluster: AdministratorCommissioning (server) */\
- /* AcceptedCommandList (index=25) */ \
+ /* AcceptedCommandList (index=27) */ \
0x00000000 /* OpenCommissioningWindow */, \
0x00000001 /* OpenBasicCommissioningWindow */, \
0x00000002 /* RevokeCommissioning */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 0, Cluster: Operational Credentials (server) */\
- /* AcceptedCommandList (index=29) */ \
+ /* AcceptedCommandList (index=31) */ \
0x00000000 /* AttestationRequest */, \
0x00000002 /* CertificateChainRequest */, \
0x00000004 /* CSRRequest */, \
@@ -546,20 +552,20 @@
0x0000000A /* RemoveFabric */, \
0x0000000B /* AddTrustedRootCertificate */, \
chip::kInvalidCommandId /* end of list */, \
- /* GeneratedCommandList (index=38)*/ \
+ /* GeneratedCommandList (index=40)*/ \
0x00000001 /* AttestationResponse */, \
0x00000003 /* CertificateChainResponse */, \
0x00000005 /* CSRResponse */, \
0x00000008 /* NOCResponse */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 1, Cluster: On/Off (server) */\
- /* AcceptedCommandList (index=43) */ \
+ /* AcceptedCommandList (index=45) */ \
0x00000000 /* Off */, \
0x00000001 /* On */, \
0x00000002 /* Toggle */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 1, Cluster: Level Control (server) */\
- /* AcceptedCommandList (index=47) */ \
+ /* AcceptedCommandList (index=49) */ \
0x00000000 /* MoveToLevel */, \
0x00000001 /* Move */, \
0x00000002 /* Step */, \
@@ -692,17 +698,17 @@
/* Endpoint: 0, Cluster: General Diagnostics (server) */ \
.clusterId = 0x00000033, \
.attributes = ZAP_ATTRIBUTE_INDEX(66), \
- .attributeCount = 10, \
+ .attributeCount = 11, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
- .acceptedCommandList = nullptr ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 23 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
/* Endpoint: 0, Cluster: Software Diagnostics (server) */ \
.clusterId = 0x00000034, \
- .attributes = ZAP_ATTRIBUTE_INDEX(76), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(77), \
.attributeCount = 6, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -713,7 +719,7 @@
{ \
/* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \
.clusterId = 0x00000035, \
- .attributes = ZAP_ATTRIBUTE_INDEX(82), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(83), \
.attributeCount = 65, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -724,7 +730,7 @@
{ \
/* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \
.clusterId = 0x00000036, \
- .attributes = ZAP_ATTRIBUTE_INDEX(147), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(148), \
.attributeCount = 15, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -735,40 +741,40 @@
{ \
/* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \
.clusterId = 0x00000037, \
- .attributes = ZAP_ATTRIBUTE_INDEX(162), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(163), \
.attributeCount = 11, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 23 ) ,\
- .generatedCommandList = nullptr ,\
- },\
- { \
- /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \
- .clusterId = 0x0000003C, \
- .attributes = ZAP_ATTRIBUTE_INDEX(173), \
- .attributeCount = 5, \
- .clusterSize = 6, \
- .mask = ZAP_CLUSTER_MASK(SERVER), \
- .functions = NULL, \
.acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 25 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
+ /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \
+ .clusterId = 0x0000003C, \
+ .attributes = ZAP_ATTRIBUTE_INDEX(174), \
+ .attributeCount = 5, \
+ .clusterSize = 6, \
+ .mask = ZAP_CLUSTER_MASK(SERVER), \
+ .functions = NULL, \
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 27 ) ,\
+ .generatedCommandList = nullptr ,\
+ },\
+ { \
/* Endpoint: 0, Cluster: Operational Credentials (server) */ \
.clusterId = 0x0000003E, \
- .attributes = ZAP_ATTRIBUTE_INDEX(178), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(179), \
.attributeCount = 8, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 29 ) ,\
- .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 38 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 31 ) ,\
+ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 40 ) ,\
},\
{ \
/* Endpoint: 0, Cluster: Fixed Label (server) */ \
.clusterId = 0x00000040, \
- .attributes = ZAP_ATTRIBUTE_INDEX(186), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(187), \
.attributeCount = 3, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -779,7 +785,7 @@
{ \
/* Endpoint: 0, Cluster: User Label (server) */ \
.clusterId = 0x00000041, \
- .attributes = ZAP_ATTRIBUTE_INDEX(189), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(190), \
.attributeCount = 3, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -790,29 +796,29 @@
{ \
/* Endpoint: 1, Cluster: On/Off (server) */ \
.clusterId = 0x00000006, \
- .attributes = ZAP_ATTRIBUTE_INDEX(192), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(193), \
.attributeCount = 3, \
.clusterSize = 7, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
.functions = chipFuncArrayOnOffServer, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 43 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 45 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
/* Endpoint: 1, Cluster: Level Control (server) */ \
.clusterId = 0x00000008, \
- .attributes = ZAP_ATTRIBUTE_INDEX(195), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(196), \
.attributeCount = 16, \
.clusterSize = 27, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
.functions = chipFuncArrayLevelControlServer, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 47 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 49 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
/* Endpoint: 1, Cluster: Descriptor (server) */ \
.clusterId = 0x0000001D, \
- .attributes = ZAP_ATTRIBUTE_INDEX(211), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(212), \
.attributeCount = 6, \
.clusterSize = 4, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -823,7 +829,7 @@
{ \
/* Endpoint: 1, Cluster: Switch (server) */ \
.clusterId = 0x0000003B, \
- .attributes = ZAP_ATTRIBUTE_INDEX(217), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(218), \
.attributeCount = 5, \
.clusterSize = 9, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -834,7 +840,7 @@
{ \
/* Endpoint: 1, Cluster: Fixed Label (server) */ \
.clusterId = 0x00000040, \
- .attributes = ZAP_ATTRIBUTE_INDEX(222), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(223), \
.attributeCount = 3, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
diff --git a/zzz_generated/light-switch-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/light-switch-app/zap-generated/IMClusterCommandHandler.cpp
index 18a0337..c7d1360 100644
--- a/zzz_generated/light-switch-app/zap-generated/IMClusterCommandHandler.cpp
+++ b/zzz_generated/light-switch-app/zap-generated/IMClusterCommandHandler.cpp
@@ -229,6 +229,43 @@
} // namespace GeneralCommissioning
+namespace GeneralDiagnostics {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+ CHIP_ERROR TLVError = CHIP_NO_ERROR;
+ bool wasHandled = false;
+ {
+ switch (aCommandPath.mCommandId)
+ {
+ case Commands::TestEventTrigger::Id: {
+ Commands::TestEventTrigger::DecodableType commandData;
+ TLVError = DataModel::Decode(aDataTlv, commandData);
+ if (TLVError == CHIP_NO_ERROR)
+ {
+ wasHandled = emberAfGeneralDiagnosticsClusterTestEventTriggerCallback(apCommandObj, aCommandPath, commandData);
+ }
+ break;
+ }
+ default: {
+ // Unrecognized command ID, error status will apply.
+ apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+ ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+ ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+ return;
+ }
+ }
+ }
+
+ if (CHIP_NO_ERROR != TLVError || !wasHandled)
+ {
+ apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+ ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+ }
+}
+
+} // namespace GeneralDiagnostics
+
namespace GroupKeyManagement {
void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
@@ -777,6 +814,9 @@
case Clusters::GeneralCommissioning::Id:
Clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
break;
+ case Clusters::GeneralDiagnostics::Id:
+ Clusters::GeneralDiagnostics::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+ break;
case Clusters::GroupKeyManagement::Id:
Clusters::GroupKeyManagement::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
break;
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 205027b..2f498a7 100644
--- a/zzz_generated/light-switch-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/light-switch-app/zap-generated/endpoint_config.h
@@ -80,7 +80,7 @@
#define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask
// This is an array of EmberAfAttributeMetadata structures.
-#define GENERATED_ATTRIBUTE_COUNT 222
+#define GENERATED_ATTRIBUTE_COUNT 223
#define GENERATED_ATTRIBUTES \
{ \
\
@@ -222,7 +222,9 @@
ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */ \
{ 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \
{ 0x00000007, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
- ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaults */ \
+ ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaults */ \
+ { 0x00000008, ZAP_TYPE(BOOLEAN), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
+ ZAP_EMPTY_DEFAULT() }, /* TestEventTriggersEnabled */ \
{ 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \
{ 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \
\
@@ -517,30 +519,34 @@
/* GeneratedCommandList (index=23)*/ \
0x00000001 /* RetrieveLogsResponse */, \
chip::kInvalidCommandId /* end of list */, \
- /* Endpoint: 0, Cluster: Software Diagnostics (server) */\
+ /* Endpoint: 0, Cluster: General Diagnostics (server) */\
/* AcceptedCommandList (index=25) */ \
+ 0x00000000 /* TestEventTrigger */, \
+ chip::kInvalidCommandId /* end of list */, \
+ /* Endpoint: 0, Cluster: Software Diagnostics (server) */\
+ /* AcceptedCommandList (index=27) */ \
0x00000000 /* ResetWatermarks */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */\
- /* AcceptedCommandList (index=27) */ \
- 0x00000000 /* ResetCounts */, \
- chip::kInvalidCommandId /* end of list */, \
- /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */\
/* AcceptedCommandList (index=29) */ \
0x00000000 /* ResetCounts */, \
chip::kInvalidCommandId /* end of list */, \
- /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */\
+ /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */\
/* AcceptedCommandList (index=31) */ \
0x00000000 /* ResetCounts */, \
chip::kInvalidCommandId /* end of list */, \
- /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */\
+ /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */\
/* AcceptedCommandList (index=33) */ \
+ 0x00000000 /* ResetCounts */, \
+ chip::kInvalidCommandId /* end of list */, \
+ /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */\
+ /* AcceptedCommandList (index=35) */ \
0x00000000 /* OpenCommissioningWindow */, \
0x00000001 /* OpenBasicCommissioningWindow */, \
0x00000002 /* RevokeCommissioning */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 0, Cluster: Operational Credentials (server) */\
- /* AcceptedCommandList (index=37) */ \
+ /* AcceptedCommandList (index=39) */ \
0x00000000 /* AttestationRequest */, \
0x00000002 /* CertificateChainRequest */, \
0x00000004 /* CSRRequest */, \
@@ -550,30 +556,30 @@
0x0000000A /* RemoveFabric */, \
0x0000000B /* AddTrustedRootCertificate */, \
chip::kInvalidCommandId /* end of list */, \
- /* GeneratedCommandList (index=46)*/ \
+ /* GeneratedCommandList (index=48)*/ \
0x00000001 /* AttestationResponse */, \
0x00000003 /* CertificateChainResponse */, \
0x00000005 /* CSRResponse */, \
0x00000008 /* NOCResponse */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 0, Cluster: Group Key Management (server) */\
- /* AcceptedCommandList (index=51) */ \
+ /* AcceptedCommandList (index=53) */ \
0x00000000 /* KeySetWrite */, \
0x00000001 /* KeySetRead */, \
0x00000003 /* KeySetRemove */, \
0x00000004 /* KeySetReadAllIndices */, \
chip::kInvalidCommandId /* end of list */, \
- /* GeneratedCommandList (index=56)*/ \
+ /* GeneratedCommandList (index=58)*/ \
0x00000002 /* KeySetReadResponse */, \
0x00000005 /* KeySetReadAllIndicesResponse */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 1, Cluster: Identify (server) */\
- /* AcceptedCommandList (index=59) */ \
+ /* AcceptedCommandList (index=61) */ \
0x00000000 /* Identify */, \
0x00000040 /* TriggerEffect */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 1, Cluster: Groups (server) */\
- /* AcceptedCommandList (index=62) */ \
+ /* AcceptedCommandList (index=64) */ \
0x00000000 /* AddGroup */, \
0x00000001 /* ViewGroup */, \
0x00000002 /* GetGroupMembership */, \
@@ -581,7 +587,7 @@
0x00000004 /* RemoveAllGroups */, \
0x00000005 /* AddGroupIfIdentifying */, \
chip::kInvalidCommandId /* end of list */, \
- /* GeneratedCommandList (index=69)*/ \
+ /* GeneratedCommandList (index=71)*/ \
0x00000000 /* AddGroupResponse */, \
0x00000001 /* ViewGroupResponse */, \
0x00000002 /* GetGroupMembershipResponse */, \
@@ -721,18 +727,7 @@
/* Endpoint: 0, Cluster: General Diagnostics (server) */ \
.clusterId = 0x00000033, \
.attributes = ZAP_ATTRIBUTE_INDEX(72), \
- .attributeCount = 10, \
- .clusterSize = 6, \
- .mask = ZAP_CLUSTER_MASK(SERVER), \
- .functions = NULL, \
- .acceptedCommandList = nullptr ,\
- .generatedCommandList = nullptr ,\
- },\
- { \
- /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \
- .clusterId = 0x00000034, \
- .attributes = ZAP_ATTRIBUTE_INDEX(82), \
- .attributeCount = 6, \
+ .attributeCount = 11, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
@@ -740,10 +735,10 @@
.generatedCommandList = nullptr ,\
},\
{ \
- /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \
- .clusterId = 0x00000035, \
- .attributes = ZAP_ATTRIBUTE_INDEX(88), \
- .attributeCount = 65, \
+ /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \
+ .clusterId = 0x00000034, \
+ .attributes = ZAP_ATTRIBUTE_INDEX(83), \
+ .attributeCount = 6, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
@@ -751,10 +746,10 @@
.generatedCommandList = nullptr ,\
},\
{ \
- /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \
- .clusterId = 0x00000036, \
- .attributes = ZAP_ATTRIBUTE_INDEX(153), \
- .attributeCount = 15, \
+ /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \
+ .clusterId = 0x00000035, \
+ .attributes = ZAP_ATTRIBUTE_INDEX(89), \
+ .attributeCount = 65, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
@@ -762,10 +757,10 @@
.generatedCommandList = nullptr ,\
},\
{ \
- /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \
- .clusterId = 0x00000037, \
- .attributes = ZAP_ATTRIBUTE_INDEX(168), \
- .attributeCount = 11, \
+ /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \
+ .clusterId = 0x00000036, \
+ .attributes = ZAP_ATTRIBUTE_INDEX(154), \
+ .attributeCount = 15, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
@@ -773,9 +768,20 @@
.generatedCommandList = nullptr ,\
},\
{ \
+ /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \
+ .clusterId = 0x00000037, \
+ .attributes = ZAP_ATTRIBUTE_INDEX(169), \
+ .attributeCount = 11, \
+ .clusterSize = 6, \
+ .mask = ZAP_CLUSTER_MASK(SERVER), \
+ .functions = NULL, \
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 33 ) ,\
+ .generatedCommandList = nullptr ,\
+ },\
+ { \
/* Endpoint: 0, Cluster: Switch (server) */ \
.clusterId = 0x0000003B, \
- .attributes = ZAP_ATTRIBUTE_INDEX(179), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(180), \
.attributeCount = 2, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -786,40 +792,40 @@
{ \
/* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \
.clusterId = 0x0000003C, \
- .attributes = ZAP_ATTRIBUTE_INDEX(181), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(182), \
.attributeCount = 5, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 33 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 35 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
/* Endpoint: 0, Cluster: Operational Credentials (server) */ \
.clusterId = 0x0000003E, \
- .attributes = ZAP_ATTRIBUTE_INDEX(186), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(187), \
.attributeCount = 8, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 37 ) ,\
- .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 46 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 39 ) ,\
+ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 48 ) ,\
},\
{ \
/* Endpoint: 0, Cluster: Group Key Management (server) */ \
.clusterId = 0x0000003F, \
- .attributes = ZAP_ATTRIBUTE_INDEX(194), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(195), \
.attributeCount = 6, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 51 ) ,\
- .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 56 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 53 ) ,\
+ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 58 ) ,\
},\
{ \
/* Endpoint: 0, Cluster: Fixed Label (server) */ \
.clusterId = 0x00000040, \
- .attributes = ZAP_ATTRIBUTE_INDEX(200), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(201), \
.attributeCount = 3, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -830,7 +836,7 @@
{ \
/* Endpoint: 0, Cluster: User Label (server) */ \
.clusterId = 0x00000041, \
- .attributes = ZAP_ATTRIBUTE_INDEX(203), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(204), \
.attributeCount = 3, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -841,7 +847,7 @@
{ \
/* Endpoint: 1, Cluster: Identify (client) */ \
.clusterId = 0x00000003, \
- .attributes = ZAP_ATTRIBUTE_INDEX(206), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(207), \
.attributeCount = 0, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -852,29 +858,29 @@
{ \
/* Endpoint: 1, Cluster: Identify (server) */ \
.clusterId = 0x00000003, \
- .attributes = ZAP_ATTRIBUTE_INDEX(206), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(207), \
.attributeCount = 4, \
.clusterSize = 9, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \
.functions = chipFuncArrayIdentifyServer, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 59 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 61 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
/* Endpoint: 1, Cluster: Groups (server) */ \
.clusterId = 0x00000004, \
- .attributes = ZAP_ATTRIBUTE_INDEX(210), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(211), \
.attributeCount = 3, \
.clusterSize = 7, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
.functions = chipFuncArrayGroupsServer, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 62 ) ,\
- .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 69 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 64 ) ,\
+ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 71 ) ,\
},\
{ \
/* Endpoint: 1, Cluster: Scenes (client) */ \
.clusterId = 0x00000005, \
- .attributes = ZAP_ATTRIBUTE_INDEX(213), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(214), \
.attributeCount = 0, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -885,7 +891,7 @@
{ \
/* Endpoint: 1, Cluster: On/Off (client) */ \
.clusterId = 0x00000006, \
- .attributes = ZAP_ATTRIBUTE_INDEX(213), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(214), \
.attributeCount = 0, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -896,7 +902,7 @@
{ \
/* Endpoint: 1, Cluster: Descriptor (server) */ \
.clusterId = 0x0000001D, \
- .attributes = ZAP_ATTRIBUTE_INDEX(213), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(214), \
.attributeCount = 6, \
.clusterSize = 4, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -907,7 +913,7 @@
{ \
/* Endpoint: 1, Cluster: Binding (server) */ \
.clusterId = 0x0000001E, \
- .attributes = ZAP_ATTRIBUTE_INDEX(219), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(220), \
.attributeCount = 3, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -918,7 +924,7 @@
{ \
/* Endpoint: 1, Cluster: Color Control (client) */ \
.clusterId = 0x00000300, \
- .attributes = ZAP_ATTRIBUTE_INDEX(222), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(223), \
.attributeCount = 0, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(CLIENT), \
diff --git a/zzz_generated/lighting-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/lighting-app/zap-generated/IMClusterCommandHandler.cpp
index 6416aac..adf2da7 100644
--- a/zzz_generated/lighting-app/zap-generated/IMClusterCommandHandler.cpp
+++ b/zzz_generated/lighting-app/zap-generated/IMClusterCommandHandler.cpp
@@ -429,6 +429,43 @@
} // namespace GeneralCommissioning
+namespace GeneralDiagnostics {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+ CHIP_ERROR TLVError = CHIP_NO_ERROR;
+ bool wasHandled = false;
+ {
+ switch (aCommandPath.mCommandId)
+ {
+ case Commands::TestEventTrigger::Id: {
+ Commands::TestEventTrigger::DecodableType commandData;
+ TLVError = DataModel::Decode(aDataTlv, commandData);
+ if (TLVError == CHIP_NO_ERROR)
+ {
+ wasHandled = emberAfGeneralDiagnosticsClusterTestEventTriggerCallback(apCommandObj, aCommandPath, commandData);
+ }
+ break;
+ }
+ default: {
+ // Unrecognized command ID, error status will apply.
+ apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+ ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+ ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+ return;
+ }
+ }
+ }
+
+ if (CHIP_NO_ERROR != TLVError || !wasHandled)
+ {
+ apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+ ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+ }
+}
+
+} // namespace GeneralDiagnostics
+
namespace GroupKeyManagement {
void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
@@ -1162,6 +1199,9 @@
case Clusters::GeneralCommissioning::Id:
Clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
break;
+ case Clusters::GeneralDiagnostics::Id:
+ Clusters::GeneralDiagnostics::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+ break;
case Clusters::GroupKeyManagement::Id:
Clusters::GroupKeyManagement::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
break;
diff --git a/zzz_generated/lighting-app/zap-generated/endpoint_config.h b/zzz_generated/lighting-app/zap-generated/endpoint_config.h
index b6528a8..bef43ea 100644
--- a/zzz_generated/lighting-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/lighting-app/zap-generated/endpoint_config.h
@@ -99,7 +99,7 @@
#define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask
// This is an array of EmberAfAttributeMetadata structures.
-#define GENERATED_ATTRIBUTE_COUNT 270
+#define GENERATED_ATTRIBUTE_COUNT 271
#define GENERATED_ATTRIBUTES \
{ \
\
@@ -241,7 +241,9 @@
ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */ \
{ 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \
{ 0x00000007, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
- ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaults */ \
+ ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaults */ \
+ { 0x00000008, ZAP_TYPE(BOOLEAN), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
+ ZAP_EMPTY_DEFAULT() }, /* TestEventTriggersEnabled */ \
{ 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \
{ 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \
\
@@ -628,30 +630,34 @@
/* GeneratedCommandList (index=35)*/ \
0x00000001 /* RetrieveLogsResponse */, \
chip::kInvalidCommandId /* end of list */, \
- /* Endpoint: 0, Cluster: Software Diagnostics (server) */\
+ /* Endpoint: 0, Cluster: General Diagnostics (server) */\
/* AcceptedCommandList (index=37) */ \
+ 0x00000000 /* TestEventTrigger */, \
+ chip::kInvalidCommandId /* end of list */, \
+ /* Endpoint: 0, Cluster: Software Diagnostics (server) */\
+ /* AcceptedCommandList (index=39) */ \
0x00000000 /* ResetWatermarks */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */\
- /* AcceptedCommandList (index=39) */ \
- 0x00000000 /* ResetCounts */, \
- chip::kInvalidCommandId /* end of list */, \
- /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */\
/* AcceptedCommandList (index=41) */ \
0x00000000 /* ResetCounts */, \
chip::kInvalidCommandId /* end of list */, \
- /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */\
+ /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */\
/* AcceptedCommandList (index=43) */ \
0x00000000 /* ResetCounts */, \
chip::kInvalidCommandId /* end of list */, \
- /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */\
+ /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */\
/* AcceptedCommandList (index=45) */ \
+ 0x00000000 /* ResetCounts */, \
+ chip::kInvalidCommandId /* end of list */, \
+ /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */\
+ /* AcceptedCommandList (index=47) */ \
0x00000000 /* OpenCommissioningWindow */, \
0x00000001 /* OpenBasicCommissioningWindow */, \
0x00000002 /* RevokeCommissioning */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 0, Cluster: Operational Credentials (server) */\
- /* AcceptedCommandList (index=49) */ \
+ /* AcceptedCommandList (index=51) */ \
0x00000000 /* AttestationRequest */, \
0x00000002 /* CertificateChainRequest */, \
0x00000004 /* CSRRequest */, \
@@ -661,30 +667,30 @@
0x0000000A /* RemoveFabric */, \
0x0000000B /* AddTrustedRootCertificate */, \
chip::kInvalidCommandId /* end of list */, \
- /* GeneratedCommandList (index=58)*/ \
+ /* GeneratedCommandList (index=60)*/ \
0x00000001 /* AttestationResponse */, \
0x00000003 /* CertificateChainResponse */, \
0x00000005 /* CSRResponse */, \
0x00000008 /* NOCResponse */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 0, Cluster: Group Key Management (server) */\
- /* AcceptedCommandList (index=63) */ \
+ /* AcceptedCommandList (index=65) */ \
0x00000000 /* KeySetWrite */, \
0x00000001 /* KeySetRead */, \
0x00000003 /* KeySetRemove */, \
0x00000004 /* KeySetReadAllIndices */, \
chip::kInvalidCommandId /* end of list */, \
- /* GeneratedCommandList (index=68)*/ \
+ /* GeneratedCommandList (index=70)*/ \
0x00000002 /* KeySetReadResponse */, \
0x00000005 /* KeySetReadAllIndicesResponse */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 1, Cluster: Identify (server) */\
- /* AcceptedCommandList (index=71) */ \
+ /* AcceptedCommandList (index=73) */ \
0x00000000 /* Identify */, \
0x00000040 /* TriggerEffect */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 1, Cluster: Groups (server) */\
- /* AcceptedCommandList (index=74) */ \
+ /* AcceptedCommandList (index=76) */ \
0x00000000 /* AddGroup */, \
0x00000001 /* ViewGroup */, \
0x00000002 /* GetGroupMembership */, \
@@ -692,14 +698,14 @@
0x00000004 /* RemoveAllGroups */, \
0x00000005 /* AddGroupIfIdentifying */, \
chip::kInvalidCommandId /* end of list */, \
- /* GeneratedCommandList (index=81)*/ \
+ /* GeneratedCommandList (index=83)*/ \
0x00000000 /* AddGroupResponse */, \
0x00000001 /* ViewGroupResponse */, \
0x00000002 /* GetGroupMembershipResponse */, \
0x00000003 /* RemoveGroupResponse */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 1, Cluster: On/Off (server) */\
- /* AcceptedCommandList (index=86) */ \
+ /* AcceptedCommandList (index=88) */ \
0x00000000 /* Off */, \
0x00000001 /* On */, \
0x00000002 /* Toggle */, \
@@ -708,7 +714,7 @@
0x00000042 /* OnWithTimedOff */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 1, Cluster: Level Control (server) */\
- /* AcceptedCommandList (index=93) */ \
+ /* AcceptedCommandList (index=95) */ \
0x00000000 /* MoveToLevel */, \
0x00000001 /* Move */, \
0x00000002 /* Step */, \
@@ -719,7 +725,7 @@
0x00000007 /* StopWithOnOff */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 1, Cluster: Color Control (server) */\
- /* AcceptedCommandList (index=102) */ \
+ /* AcceptedCommandList (index=104) */ \
0x00000000 /* MoveToHue */, \
0x00000001 /* MoveHue */, \
0x00000002 /* StepHue */, \
@@ -874,18 +880,7 @@
/* Endpoint: 0, Cluster: General Diagnostics (server) */ \
.clusterId = 0x00000033, \
.attributes = ZAP_ATTRIBUTE_INDEX(72), \
- .attributeCount = 10, \
- .clusterSize = 6, \
- .mask = ZAP_CLUSTER_MASK(SERVER), \
- .functions = NULL, \
- .acceptedCommandList = nullptr ,\
- .generatedCommandList = nullptr ,\
- },\
- { \
- /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \
- .clusterId = 0x00000034, \
- .attributes = ZAP_ATTRIBUTE_INDEX(82), \
- .attributeCount = 6, \
+ .attributeCount = 11, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
@@ -893,10 +888,10 @@
.generatedCommandList = nullptr ,\
},\
{ \
- /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \
- .clusterId = 0x00000035, \
- .attributes = ZAP_ATTRIBUTE_INDEX(88), \
- .attributeCount = 65, \
+ /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \
+ .clusterId = 0x00000034, \
+ .attributes = ZAP_ATTRIBUTE_INDEX(83), \
+ .attributeCount = 6, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
@@ -904,10 +899,10 @@
.generatedCommandList = nullptr ,\
},\
{ \
- /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \
- .clusterId = 0x00000036, \
- .attributes = ZAP_ATTRIBUTE_INDEX(153), \
- .attributeCount = 15, \
+ /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \
+ .clusterId = 0x00000035, \
+ .attributes = ZAP_ATTRIBUTE_INDEX(89), \
+ .attributeCount = 65, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
@@ -915,10 +910,10 @@
.generatedCommandList = nullptr ,\
},\
{ \
- /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \
- .clusterId = 0x00000037, \
- .attributes = ZAP_ATTRIBUTE_INDEX(168), \
- .attributeCount = 11, \
+ /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \
+ .clusterId = 0x00000036, \
+ .attributes = ZAP_ATTRIBUTE_INDEX(154), \
+ .attributeCount = 15, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
@@ -926,9 +921,20 @@
.generatedCommandList = nullptr ,\
},\
{ \
+ /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \
+ .clusterId = 0x00000037, \
+ .attributes = ZAP_ATTRIBUTE_INDEX(169), \
+ .attributeCount = 11, \
+ .clusterSize = 6, \
+ .mask = ZAP_CLUSTER_MASK(SERVER), \
+ .functions = NULL, \
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 45 ) ,\
+ .generatedCommandList = nullptr ,\
+ },\
+ { \
/* Endpoint: 0, Cluster: Switch (server) */ \
.clusterId = 0x0000003B, \
- .attributes = ZAP_ATTRIBUTE_INDEX(179), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(180), \
.attributeCount = 2, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -939,40 +945,40 @@
{ \
/* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \
.clusterId = 0x0000003C, \
- .attributes = ZAP_ATTRIBUTE_INDEX(181), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(182), \
.attributeCount = 5, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 45 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 47 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
/* Endpoint: 0, Cluster: Operational Credentials (server) */ \
.clusterId = 0x0000003E, \
- .attributes = ZAP_ATTRIBUTE_INDEX(186), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(187), \
.attributeCount = 8, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 49 ) ,\
- .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 58 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 51 ) ,\
+ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 60 ) ,\
},\
{ \
/* Endpoint: 0, Cluster: Group Key Management (server) */ \
.clusterId = 0x0000003F, \
- .attributes = ZAP_ATTRIBUTE_INDEX(194), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(195), \
.attributeCount = 6, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 63 ) ,\
- .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 68 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 65 ) ,\
+ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 70 ) ,\
},\
{ \
/* Endpoint: 0, Cluster: Fixed Label (server) */ \
.clusterId = 0x00000040, \
- .attributes = ZAP_ATTRIBUTE_INDEX(200), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(201), \
.attributeCount = 3, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -983,7 +989,7 @@
{ \
/* Endpoint: 0, Cluster: User Label (server) */ \
.clusterId = 0x00000041, \
- .attributes = ZAP_ATTRIBUTE_INDEX(203), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(204), \
.attributeCount = 3, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -994,51 +1000,51 @@
{ \
/* Endpoint: 1, Cluster: Identify (server) */ \
.clusterId = 0x00000003, \
- .attributes = ZAP_ATTRIBUTE_INDEX(206), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(207), \
.attributeCount = 4, \
.clusterSize = 9, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \
.functions = chipFuncArrayIdentifyServer, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 71 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 73 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
/* Endpoint: 1, Cluster: Groups (server) */ \
.clusterId = 0x00000004, \
- .attributes = ZAP_ATTRIBUTE_INDEX(210), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(211), \
.attributeCount = 3, \
.clusterSize = 7, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
.functions = chipFuncArrayGroupsServer, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 74 ) ,\
- .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 81 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 76 ) ,\
+ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 83 ) ,\
},\
{ \
/* Endpoint: 1, Cluster: On/Off (server) */ \
.clusterId = 0x00000006, \
- .attributes = ZAP_ATTRIBUTE_INDEX(213), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(214), \
.attributeCount = 7, \
.clusterSize = 13, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
.functions = chipFuncArrayOnOffServer, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 86 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 88 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
/* Endpoint: 1, Cluster: Level Control (server) */ \
.clusterId = 0x00000008, \
- .attributes = ZAP_ATTRIBUTE_INDEX(220), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(221), \
.attributeCount = 16, \
.clusterSize = 27, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
.functions = chipFuncArrayLevelControlServer, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 93 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 95 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
/* Endpoint: 1, Cluster: Descriptor (server) */ \
.clusterId = 0x0000001D, \
- .attributes = ZAP_ATTRIBUTE_INDEX(236), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(237), \
.attributeCount = 6, \
.clusterSize = 4, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1049,18 +1055,18 @@
{ \
/* Endpoint: 1, Cluster: Color Control (server) */ \
.clusterId = 0x00000300, \
- .attributes = ZAP_ATTRIBUTE_INDEX(242), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(243), \
.attributeCount = 23, \
.clusterSize = 40, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
.functions = chipFuncArrayColorControlServer, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 102 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 104 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
/* Endpoint: 1, Cluster: Occupancy Sensing (server) */ \
.clusterId = 0x00000406, \
- .attributes = ZAP_ATTRIBUTE_INDEX(265), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(266), \
.attributeCount = 5, \
.clusterSize = 9, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
diff --git a/zzz_generated/lock-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/lock-app/zap-generated/IMClusterCommandHandler.cpp
index 3687b94..9ed0879 100644
--- a/zzz_generated/lock-app/zap-generated/IMClusterCommandHandler.cpp
+++ b/zzz_generated/lock-app/zap-generated/IMClusterCommandHandler.cpp
@@ -419,6 +419,43 @@
} // namespace GeneralCommissioning
+namespace GeneralDiagnostics {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+ CHIP_ERROR TLVError = CHIP_NO_ERROR;
+ bool wasHandled = false;
+ {
+ switch (aCommandPath.mCommandId)
+ {
+ case Commands::TestEventTrigger::Id: {
+ Commands::TestEventTrigger::DecodableType commandData;
+ TLVError = DataModel::Decode(aDataTlv, commandData);
+ if (TLVError == CHIP_NO_ERROR)
+ {
+ wasHandled = emberAfGeneralDiagnosticsClusterTestEventTriggerCallback(apCommandObj, aCommandPath, commandData);
+ }
+ break;
+ }
+ default: {
+ // Unrecognized command ID, error status will apply.
+ apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+ ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+ ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+ return;
+ }
+ }
+ }
+
+ if (CHIP_NO_ERROR != TLVError || !wasHandled)
+ {
+ apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+ ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+ }
+}
+
+} // namespace GeneralDiagnostics
+
namespace Groups {
void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
@@ -952,6 +989,9 @@
case Clusters::GeneralCommissioning::Id:
Clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
break;
+ case Clusters::GeneralDiagnostics::Id:
+ Clusters::GeneralDiagnostics::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+ break;
case Clusters::Groups::Id:
Clusters::Groups::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
break;
diff --git a/zzz_generated/lock-app/zap-generated/endpoint_config.h b/zzz_generated/lock-app/zap-generated/endpoint_config.h
index 7ec1926..f89c5f4 100644
--- a/zzz_generated/lock-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/lock-app/zap-generated/endpoint_config.h
@@ -129,7 +129,7 @@
#define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask
// This is an array of EmberAfAttributeMetadata structures.
-#define GENERATED_ATTRIBUTE_COUNT 260
+#define GENERATED_ATTRIBUTE_COUNT 261
#define GENERATED_ATTRIBUTES \
{ \
\
@@ -279,7 +279,9 @@
ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */ \
{ 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \
{ 0x00000007, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
- ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaults */ \
+ ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaults */ \
+ { 0x00000008, ZAP_TYPE(BOOLEAN), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
+ ZAP_EMPTY_DEFAULT() }, /* TestEventTriggersEnabled */ \
{ 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \
{ 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \
\
@@ -619,30 +621,34 @@
/* GeneratedCommandList (index=23)*/ \
0x00000001 /* RetrieveLogsResponse */, \
chip::kInvalidCommandId /* end of list */, \
- /* Endpoint: 0, Cluster: Software Diagnostics (server) */\
+ /* Endpoint: 0, Cluster: General Diagnostics (server) */\
/* AcceptedCommandList (index=25) */ \
+ 0x00000000 /* TestEventTrigger */, \
+ chip::kInvalidCommandId /* end of list */, \
+ /* Endpoint: 0, Cluster: Software Diagnostics (server) */\
+ /* AcceptedCommandList (index=27) */ \
0x00000000 /* ResetWatermarks */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */\
- /* AcceptedCommandList (index=27) */ \
- 0x00000000 /* ResetCounts */, \
- chip::kInvalidCommandId /* end of list */, \
- /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */\
/* AcceptedCommandList (index=29) */ \
0x00000000 /* ResetCounts */, \
chip::kInvalidCommandId /* end of list */, \
- /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */\
+ /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */\
/* AcceptedCommandList (index=31) */ \
0x00000000 /* ResetCounts */, \
chip::kInvalidCommandId /* end of list */, \
- /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */\
+ /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */\
/* AcceptedCommandList (index=33) */ \
+ 0x00000000 /* ResetCounts */, \
+ chip::kInvalidCommandId /* end of list */, \
+ /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */\
+ /* AcceptedCommandList (index=35) */ \
0x00000000 /* OpenCommissioningWindow */, \
0x00000001 /* OpenBasicCommissioningWindow */, \
0x00000002 /* RevokeCommissioning */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 0, Cluster: Operational Credentials (server) */\
- /* AcceptedCommandList (index=37) */ \
+ /* AcceptedCommandList (index=39) */ \
0x00000000 /* AttestationRequest */, \
0x00000002 /* CertificateChainRequest */, \
0x00000004 /* CSRRequest */, \
@@ -652,18 +658,18 @@
0x0000000A /* RemoveFabric */, \
0x0000000B /* AddTrustedRootCertificate */, \
chip::kInvalidCommandId /* end of list */, \
- /* GeneratedCommandList (index=46)*/ \
+ /* GeneratedCommandList (index=48)*/ \
0x00000001 /* AttestationResponse */, \
0x00000003 /* CertificateChainResponse */, \
0x00000005 /* CSRResponse */, \
0x00000008 /* NOCResponse */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 1, Cluster: Identify (server) */\
- /* AcceptedCommandList (index=51) */ \
+ /* AcceptedCommandList (index=53) */ \
0x00000000 /* Identify */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 1, Cluster: Groups (server) */\
- /* AcceptedCommandList (index=53) */ \
+ /* AcceptedCommandList (index=55) */ \
0x00000000 /* AddGroup */, \
0x00000001 /* ViewGroup */, \
0x00000002 /* GetGroupMembership */, \
@@ -671,20 +677,20 @@
0x00000004 /* RemoveAllGroups */, \
0x00000005 /* AddGroupIfIdentifying */, \
chip::kInvalidCommandId /* end of list */, \
- /* GeneratedCommandList (index=60)*/ \
+ /* GeneratedCommandList (index=62)*/ \
0x00000000 /* AddGroupResponse */, \
0x00000001 /* ViewGroupResponse */, \
0x00000002 /* GetGroupMembershipResponse */, \
0x00000003 /* RemoveGroupResponse */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 1, Cluster: On/Off (server) */\
- /* AcceptedCommandList (index=65) */ \
+ /* AcceptedCommandList (index=67) */ \
0x00000000 /* Off */, \
0x00000001 /* On */, \
0x00000002 /* Toggle */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 1, Cluster: Door Lock (server) */\
- /* AcceptedCommandList (index=69) */ \
+ /* AcceptedCommandList (index=71) */ \
0x00000000 /* LockDoor */, \
0x00000001 /* UnlockDoor */, \
0x00000003 /* UnlockWithTimeout */, \
@@ -704,7 +710,7 @@
0x00000024 /* GetCredentialStatus */, \
0x00000026 /* ClearCredential */, \
chip::kInvalidCommandId /* end of list */, \
- /* GeneratedCommandList (index=88)*/ \
+ /* GeneratedCommandList (index=90)*/ \
0x0000000C /* GetWeekDayScheduleResponse */, \
0x0000000F /* GetYearDayScheduleResponse */, \
0x00000012 /* GetHolidayScheduleResponse */, \
@@ -857,18 +863,7 @@
/* Endpoint: 0, Cluster: General Diagnostics (server) */ \
.clusterId = 0x00000033, \
.attributes = ZAP_ATTRIBUTE_INDEX(78), \
- .attributeCount = 10, \
- .clusterSize = 6, \
- .mask = ZAP_CLUSTER_MASK(SERVER), \
- .functions = NULL, \
- .acceptedCommandList = nullptr ,\
- .generatedCommandList = nullptr ,\
- },\
- { \
- /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \
- .clusterId = 0x00000034, \
- .attributes = ZAP_ATTRIBUTE_INDEX(88), \
- .attributeCount = 6, \
+ .attributeCount = 11, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
@@ -876,10 +871,10 @@
.generatedCommandList = nullptr ,\
},\
{ \
- /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \
- .clusterId = 0x00000035, \
- .attributes = ZAP_ATTRIBUTE_INDEX(94), \
- .attributeCount = 65, \
+ /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \
+ .clusterId = 0x00000034, \
+ .attributes = ZAP_ATTRIBUTE_INDEX(89), \
+ .attributeCount = 6, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
@@ -887,10 +882,10 @@
.generatedCommandList = nullptr ,\
},\
{ \
- /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \
- .clusterId = 0x00000036, \
- .attributes = ZAP_ATTRIBUTE_INDEX(159), \
- .attributeCount = 15, \
+ /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \
+ .clusterId = 0x00000035, \
+ .attributes = ZAP_ATTRIBUTE_INDEX(95), \
+ .attributeCount = 65, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
@@ -898,10 +893,10 @@
.generatedCommandList = nullptr ,\
},\
{ \
- /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \
- .clusterId = 0x00000037, \
- .attributes = ZAP_ATTRIBUTE_INDEX(174), \
- .attributeCount = 11, \
+ /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \
+ .clusterId = 0x00000036, \
+ .attributes = ZAP_ATTRIBUTE_INDEX(160), \
+ .attributeCount = 15, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
@@ -909,10 +904,10 @@
.generatedCommandList = nullptr ,\
},\
{ \
- /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \
- .clusterId = 0x0000003C, \
- .attributes = ZAP_ATTRIBUTE_INDEX(185), \
- .attributeCount = 5, \
+ /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \
+ .clusterId = 0x00000037, \
+ .attributes = ZAP_ATTRIBUTE_INDEX(175), \
+ .attributeCount = 11, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
@@ -920,20 +915,31 @@
.generatedCommandList = nullptr ,\
},\
{ \
+ /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \
+ .clusterId = 0x0000003C, \
+ .attributes = ZAP_ATTRIBUTE_INDEX(186), \
+ .attributeCount = 5, \
+ .clusterSize = 6, \
+ .mask = ZAP_CLUSTER_MASK(SERVER), \
+ .functions = NULL, \
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 35 ) ,\
+ .generatedCommandList = nullptr ,\
+ },\
+ { \
/* Endpoint: 0, Cluster: Operational Credentials (server) */ \
.clusterId = 0x0000003E, \
- .attributes = ZAP_ATTRIBUTE_INDEX(190), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(191), \
.attributeCount = 8, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 37 ) ,\
- .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 46 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 39 ) ,\
+ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 48 ) ,\
},\
{ \
/* Endpoint: 0, Cluster: Fixed Label (server) */ \
.clusterId = 0x00000040, \
- .attributes = ZAP_ATTRIBUTE_INDEX(198), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(199), \
.attributeCount = 3, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -944,7 +950,7 @@
{ \
/* Endpoint: 0, Cluster: User Label (server) */ \
.clusterId = 0x00000041, \
- .attributes = ZAP_ATTRIBUTE_INDEX(201), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(202), \
.attributeCount = 3, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -955,40 +961,40 @@
{ \
/* Endpoint: 1, Cluster: Identify (server) */ \
.clusterId = 0x00000003, \
- .attributes = ZAP_ATTRIBUTE_INDEX(204), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(205), \
.attributeCount = 3, \
.clusterSize = 8, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \
.functions = chipFuncArrayIdentifyServer, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 51 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 53 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
/* Endpoint: 1, Cluster: Groups (server) */ \
.clusterId = 0x00000004, \
- .attributes = ZAP_ATTRIBUTE_INDEX(207), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(208), \
.attributeCount = 3, \
.clusterSize = 7, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
.functions = chipFuncArrayGroupsServer, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 53 ) ,\
- .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 60 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 55 ) ,\
+ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 62 ) ,\
},\
{ \
/* Endpoint: 1, Cluster: On/Off (server) */ \
.clusterId = 0x00000006, \
- .attributes = ZAP_ATTRIBUTE_INDEX(210), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(211), \
.attributeCount = 7, \
.clusterSize = 13, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
.functions = chipFuncArrayOnOffServer, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 65 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 67 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
/* Endpoint: 1, Cluster: Descriptor (server) */ \
.clusterId = 0x0000001D, \
- .attributes = ZAP_ATTRIBUTE_INDEX(217), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(218), \
.attributeCount = 6, \
.clusterSize = 4, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -999,7 +1005,7 @@
{ \
/* Endpoint: 1, Cluster: Power Source (server) */ \
.clusterId = 0x0000002F, \
- .attributes = ZAP_ATTRIBUTE_INDEX(223), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(224), \
.attributeCount = 9, \
.clusterSize = 133, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1010,13 +1016,13 @@
{ \
/* Endpoint: 1, Cluster: Door Lock (server) */ \
.clusterId = 0x00000101, \
- .attributes = ZAP_ATTRIBUTE_INDEX(232), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(233), \
.attributeCount = 28, \
.clusterSize = 42, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \
.functions = chipFuncArrayDoorLockServer, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 69 ) ,\
- .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 88 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 71 ) ,\
+ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 90 ) ,\
},\
}
diff --git a/zzz_generated/placeholder/app1/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/placeholder/app1/zap-generated/IMClusterCommandHandler.cpp
index 50bd275..1e57879 100644
--- a/zzz_generated/placeholder/app1/zap-generated/IMClusterCommandHandler.cpp
+++ b/zzz_generated/placeholder/app1/zap-generated/IMClusterCommandHandler.cpp
@@ -293,6 +293,43 @@
} // namespace GeneralCommissioning
+namespace GeneralDiagnostics {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+ CHIP_ERROR TLVError = CHIP_NO_ERROR;
+ bool wasHandled = false;
+ {
+ switch (aCommandPath.mCommandId)
+ {
+ case Commands::TestEventTrigger::Id: {
+ Commands::TestEventTrigger::DecodableType commandData;
+ TLVError = DataModel::Decode(aDataTlv, commandData);
+ if (TLVError == CHIP_NO_ERROR)
+ {
+ wasHandled = emberAfGeneralDiagnosticsClusterTestEventTriggerCallback(apCommandObj, aCommandPath, commandData);
+ }
+ break;
+ }
+ default: {
+ // Unrecognized command ID, error status will apply.
+ apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+ ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+ ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+ return;
+ }
+ }
+ }
+
+ if (CHIP_NO_ERROR != TLVError || !wasHandled)
+ {
+ apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+ ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+ }
+}
+
+} // namespace GeneralDiagnostics
+
namespace Groups {
void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
@@ -1171,6 +1208,9 @@
case Clusters::GeneralCommissioning::Id:
Clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
break;
+ case Clusters::GeneralDiagnostics::Id:
+ Clusters::GeneralDiagnostics::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+ break;
case Clusters::Groups::Id:
Clusters::Groups::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
break;
diff --git a/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h b/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h
index 38dbbc1..a693a88 100644
--- a/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h
+++ b/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h
@@ -106,7 +106,7 @@
#define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask
// This is an array of EmberAfAttributeMetadata structures.
-#define GENERATED_ATTRIBUTE_COUNT 334
+#define GENERATED_ATTRIBUTE_COUNT 335
#define GENERATED_ATTRIBUTES \
{ \
\
@@ -259,7 +259,9 @@
ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */ \
{ 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \
{ 0x00000007, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
- ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaults */ \
+ ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaults */ \
+ { 0x00000008, ZAP_TYPE(BOOLEAN), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
+ ZAP_EMPTY_DEFAULT() }, /* TestEventTriggersEnabled */ \
{ 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \
{ 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \
\
@@ -709,26 +711,30 @@
0x00000005 /* NetworkConfigResponse */, \
0x00000007 /* ConnectNetworkResponse */, \
chip::kInvalidCommandId /* end of list */, \
- /* Endpoint: 0, Cluster: Software Diagnostics (server) */\
+ /* Endpoint: 0, Cluster: General Diagnostics (server) */\
/* AcceptedCommandList (index=26) */ \
+ 0x00000000 /* TestEventTrigger */, \
+ chip::kInvalidCommandId /* end of list */, \
+ /* Endpoint: 0, Cluster: Software Diagnostics (server) */\
+ /* AcceptedCommandList (index=28) */ \
0x00000000 /* ResetWatermarks */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */\
- /* AcceptedCommandList (index=28) */ \
- 0x00000000 /* ResetCounts */, \
- chip::kInvalidCommandId /* end of list */, \
- /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */\
/* AcceptedCommandList (index=30) */ \
0x00000000 /* ResetCounts */, \
chip::kInvalidCommandId /* end of list */, \
- /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */\
+ /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */\
/* AcceptedCommandList (index=32) */ \
+ 0x00000000 /* ResetCounts */, \
+ chip::kInvalidCommandId /* end of list */, \
+ /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */\
+ /* AcceptedCommandList (index=34) */ \
0x00000000 /* OpenCommissioningWindow */, \
0x00000001 /* OpenBasicCommissioningWindow */, \
0x00000002 /* RevokeCommissioning */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 0, Cluster: Operational Credentials (server) */\
- /* AcceptedCommandList (index=36) */ \
+ /* AcceptedCommandList (index=38) */ \
0x00000000 /* AttestationRequest */, \
0x00000002 /* CertificateChainRequest */, \
0x00000004 /* CSRRequest */, \
@@ -738,18 +744,18 @@
0x0000000A /* RemoveFabric */, \
0x0000000B /* AddTrustedRootCertificate */, \
chip::kInvalidCommandId /* end of list */, \
- /* GeneratedCommandList (index=45)*/ \
+ /* GeneratedCommandList (index=47)*/ \
0x00000001 /* AttestationResponse */, \
0x00000003 /* CertificateChainResponse */, \
0x00000005 /* CSRResponse */, \
0x00000008 /* NOCResponse */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 0, Cluster: Mode Select (server) */\
- /* AcceptedCommandList (index=50) */ \
+ /* AcceptedCommandList (index=52) */ \
0x00000000 /* ChangeToMode */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 0, Cluster: Window Covering (server) */\
- /* AcceptedCommandList (index=52) */ \
+ /* AcceptedCommandList (index=54) */ \
0x00000000 /* UpOrOpen */, \
0x00000001 /* DownOrClose */, \
0x00000002 /* StopMotion */, \
@@ -759,37 +765,37 @@
0x00000008 /* GoToTiltPercentage */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 0, Cluster: Thermostat (server) */\
- /* AcceptedCommandList (index=60) */ \
+ /* AcceptedCommandList (index=62) */ \
0x00000000 /* SetpointRaiseLower */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 0, Cluster: Target Navigator (server) */\
- /* AcceptedCommandList (index=62) */ \
+ /* AcceptedCommandList (index=64) */ \
0x00000000 /* NavigateTarget */, \
chip::kInvalidCommandId /* end of list */, \
- /* GeneratedCommandList (index=64)*/ \
+ /* GeneratedCommandList (index=66)*/ \
0x00000001 /* NavigateTargetResponse */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 0, Cluster: Keypad Input (server) */\
- /* AcceptedCommandList (index=66) */ \
+ /* AcceptedCommandList (index=68) */ \
0x00000000 /* SendKey */, \
chip::kInvalidCommandId /* end of list */, \
- /* GeneratedCommandList (index=68)*/ \
+ /* GeneratedCommandList (index=70)*/ \
0x00000001 /* SendKeyResponse */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 0, Cluster: Content Launcher (server) */\
- /* AcceptedCommandList (index=70) */ \
+ /* AcceptedCommandList (index=72) */ \
0x00000000 /* LaunchContent */, \
0x00000001 /* LaunchURL */, \
chip::kInvalidCommandId /* end of list */, \
- /* GeneratedCommandList (index=73)*/ \
+ /* GeneratedCommandList (index=75)*/ \
0x00000002 /* LaunchResponse */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 1, Cluster: Identify (server) */\
- /* AcceptedCommandList (index=75) */ \
+ /* AcceptedCommandList (index=77) */ \
0x00000000 /* Identify */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 1, Cluster: Groups (server) */\
- /* AcceptedCommandList (index=77) */ \
+ /* AcceptedCommandList (index=79) */ \
0x00000000 /* AddGroup */, \
0x00000001 /* ViewGroup */, \
0x00000002 /* GetGroupMembership */, \
@@ -797,14 +803,14 @@
0x00000004 /* RemoveAllGroups */, \
0x00000005 /* AddGroupIfIdentifying */, \
chip::kInvalidCommandId /* end of list */, \
- /* GeneratedCommandList (index=84)*/ \
+ /* GeneratedCommandList (index=86)*/ \
0x00000000 /* AddGroupResponse */, \
0x00000001 /* ViewGroupResponse */, \
0x00000002 /* GetGroupMembershipResponse */, \
0x00000003 /* RemoveGroupResponse */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 1, Cluster: Scenes (server) */\
- /* AcceptedCommandList (index=89) */ \
+ /* AcceptedCommandList (index=91) */ \
0x00000000 /* AddScene */, \
0x00000001 /* ViewScene */, \
0x00000002 /* RemoveScene */, \
@@ -813,7 +819,7 @@
0x00000005 /* RecallScene */, \
0x00000006 /* GetSceneMembership */, \
chip::kInvalidCommandId /* end of list */, \
- /* GeneratedCommandList (index=97)*/ \
+ /* GeneratedCommandList (index=99)*/ \
0x00000000 /* AddSceneResponse */, \
0x00000001 /* ViewSceneResponse */, \
0x00000002 /* RemoveSceneResponse */, \
@@ -822,13 +828,13 @@
0x00000006 /* GetSceneMembershipResponse */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 1, Cluster: On/Off (server) */\
- /* AcceptedCommandList (index=104) */ \
+ /* AcceptedCommandList (index=106) */ \
0x00000000 /* Off */, \
0x00000001 /* On */, \
0x00000002 /* Toggle */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 1, Cluster: Level Control (server) */\
- /* AcceptedCommandList (index=108) */ \
+ /* AcceptedCommandList (index=110) */ \
0x00000000 /* MoveToLevel */, \
0x00000001 /* Move */, \
0x00000002 /* Step */, \
@@ -839,7 +845,7 @@
0x00000007 /* StopWithOnOff */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 1, Cluster: Color Control (server) */\
- /* AcceptedCommandList (index=117) */ \
+ /* AcceptedCommandList (index=119) */ \
0x00000007 /* MoveToColor */, \
0x00000008 /* MoveColor */, \
0x00000009 /* StepColor */, \
@@ -967,18 +973,7 @@
/* Endpoint: 0, Cluster: General Diagnostics (server) */ \
.clusterId = 0x00000033, \
.attributes = ZAP_ATTRIBUTE_INDEX(93), \
- .attributeCount = 10, \
- .clusterSize = 6, \
- .mask = ZAP_CLUSTER_MASK(SERVER), \
- .functions = NULL, \
- .acceptedCommandList = nullptr ,\
- .generatedCommandList = nullptr ,\
- },\
- { \
- /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \
- .clusterId = 0x00000034, \
- .attributes = ZAP_ATTRIBUTE_INDEX(103), \
- .attributeCount = 6, \
+ .attributeCount = 11, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
@@ -986,10 +981,10 @@
.generatedCommandList = nullptr ,\
},\
{ \
- /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \
- .clusterId = 0x00000036, \
- .attributes = ZAP_ATTRIBUTE_INDEX(109), \
- .attributeCount = 15, \
+ /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \
+ .clusterId = 0x00000034, \
+ .attributes = ZAP_ATTRIBUTE_INDEX(104), \
+ .attributeCount = 6, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
@@ -997,10 +992,10 @@
.generatedCommandList = nullptr ,\
},\
{ \
- /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \
- .clusterId = 0x00000037, \
- .attributes = ZAP_ATTRIBUTE_INDEX(124), \
- .attributeCount = 11, \
+ /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \
+ .clusterId = 0x00000036, \
+ .attributes = ZAP_ATTRIBUTE_INDEX(110), \
+ .attributeCount = 15, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
@@ -1008,9 +1003,20 @@
.generatedCommandList = nullptr ,\
},\
{ \
+ /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \
+ .clusterId = 0x00000037, \
+ .attributes = ZAP_ATTRIBUTE_INDEX(125), \
+ .attributeCount = 11, \
+ .clusterSize = 6, \
+ .mask = ZAP_CLUSTER_MASK(SERVER), \
+ .functions = NULL, \
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 32 ) ,\
+ .generatedCommandList = nullptr ,\
+ },\
+ { \
/* Endpoint: 0, Cluster: Switch (client) */ \
.clusterId = 0x0000003B, \
- .attributes = ZAP_ATTRIBUTE_INDEX(135), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(136), \
.attributeCount = 0, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1021,7 +1027,7 @@
{ \
/* Endpoint: 0, Cluster: Switch (server) */ \
.clusterId = 0x0000003B, \
- .attributes = ZAP_ATTRIBUTE_INDEX(135), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(136), \
.attributeCount = 5, \
.clusterSize = 9, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1032,18 +1038,18 @@
{ \
/* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \
.clusterId = 0x0000003C, \
- .attributes = ZAP_ATTRIBUTE_INDEX(140), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(141), \
.attributeCount = 5, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 32 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 34 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
/* Endpoint: 0, Cluster: Operational Credentials (client) */ \
.clusterId = 0x0000003E, \
- .attributes = ZAP_ATTRIBUTE_INDEX(145), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(146), \
.attributeCount = 0, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1054,18 +1060,18 @@
{ \
/* Endpoint: 0, Cluster: Operational Credentials (server) */ \
.clusterId = 0x0000003E, \
- .attributes = ZAP_ATTRIBUTE_INDEX(145), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(146), \
.attributeCount = 7, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 36 ) ,\
- .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 45 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 38 ) ,\
+ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 47 ) ,\
},\
{ \
/* Endpoint: 0, Cluster: Boolean State (server) */ \
.clusterId = 0x00000045, \
- .attributes = ZAP_ATTRIBUTE_INDEX(152), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(153), \
.attributeCount = 3, \
.clusterSize = 7, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1076,7 +1082,7 @@
{ \
/* Endpoint: 0, Cluster: Mode Select (client) */ \
.clusterId = 0x00000050, \
- .attributes = ZAP_ATTRIBUTE_INDEX(155), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(156), \
.attributeCount = 0, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1087,29 +1093,29 @@
{ \
/* Endpoint: 0, Cluster: Mode Select (server) */ \
.clusterId = 0x00000050, \
- .attributes = ZAP_ATTRIBUTE_INDEX(155), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(156), \
.attributeCount = 7, \
.clusterSize = 41, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \
.functions = chipFuncArrayModeSelectServer, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 50 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 52 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
/* Endpoint: 0, Cluster: Window Covering (server) */ \
.clusterId = 0x00000102, \
- .attributes = ZAP_ATTRIBUTE_INDEX(162), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(163), \
.attributeCount = 20, \
.clusterSize = 35, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \
.functions = chipFuncArrayWindowCoveringServer, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 52 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 54 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
/* Endpoint: 0, Cluster: Pump Configuration and Control (server) */ \
.clusterId = 0x00000200, \
- .attributes = ZAP_ATTRIBUTE_INDEX(182), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(183), \
.attributeCount = 25, \
.clusterSize = 52, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \
@@ -1120,18 +1126,18 @@
{ \
/* Endpoint: 0, Cluster: Thermostat (server) */ \
.clusterId = 0x00000201, \
- .attributes = ZAP_ATTRIBUTE_INDEX(207), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(208), \
.attributeCount = 18, \
.clusterSize = 32, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \
.functions = chipFuncArrayThermostatServer, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 60 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 62 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
/* Endpoint: 0, Cluster: Thermostat User Interface Configuration (client) */ \
.clusterId = 0x00000204, \
- .attributes = ZAP_ATTRIBUTE_INDEX(225), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(226), \
.attributeCount = 0, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1142,7 +1148,7 @@
{ \
/* Endpoint: 0, Cluster: Thermostat User Interface Configuration (server) */ \
.clusterId = 0x00000204, \
- .attributes = ZAP_ATTRIBUTE_INDEX(225), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(226), \
.attributeCount = 5, \
.clusterSize = 9, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \
@@ -1153,7 +1159,7 @@
{ \
/* Endpoint: 0, Cluster: Illuminance Measurement (server) */ \
.clusterId = 0x00000400, \
- .attributes = ZAP_ATTRIBUTE_INDEX(230), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(231), \
.attributeCount = 7, \
.clusterSize = 15, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1164,7 +1170,7 @@
{ \
/* Endpoint: 0, Cluster: Temperature Measurement (client) */ \
.clusterId = 0x00000402, \
- .attributes = ZAP_ATTRIBUTE_INDEX(237), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(238), \
.attributeCount = 0, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1175,7 +1181,7 @@
{ \
/* Endpoint: 0, Cluster: Temperature Measurement (server) */ \
.clusterId = 0x00000402, \
- .attributes = ZAP_ATTRIBUTE_INDEX(237), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(238), \
.attributeCount = 5, \
.clusterSize = 12, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1186,7 +1192,7 @@
{ \
/* Endpoint: 0, Cluster: Pressure Measurement (server) */ \
.clusterId = 0x00000403, \
- .attributes = ZAP_ATTRIBUTE_INDEX(242), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(243), \
.attributeCount = 11, \
.clusterSize = 23, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1197,7 +1203,7 @@
{ \
/* Endpoint: 0, Cluster: Flow Measurement (server) */ \
.clusterId = 0x00000404, \
- .attributes = ZAP_ATTRIBUTE_INDEX(253), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(254), \
.attributeCount = 6, \
.clusterSize = 14, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1208,7 +1214,7 @@
{ \
/* Endpoint: 0, Cluster: Relative Humidity Measurement (client) */ \
.clusterId = 0x00000405, \
- .attributes = ZAP_ATTRIBUTE_INDEX(259), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(260), \
.attributeCount = 0, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1219,7 +1225,7 @@
{ \
/* Endpoint: 0, Cluster: Relative Humidity Measurement (server) */ \
.clusterId = 0x00000405, \
- .attributes = ZAP_ATTRIBUTE_INDEX(259), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(260), \
.attributeCount = 6, \
.clusterSize = 14, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1230,7 +1236,7 @@
{ \
/* Endpoint: 0, Cluster: Target Navigator (client) */ \
.clusterId = 0x00000505, \
- .attributes = ZAP_ATTRIBUTE_INDEX(265), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(266), \
.attributeCount = 0, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1241,18 +1247,18 @@
{ \
/* Endpoint: 0, Cluster: Target Navigator (server) */ \
.clusterId = 0x00000505, \
- .attributes = ZAP_ATTRIBUTE_INDEX(265), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(266), \
.attributeCount = 4, \
.clusterSize = 7, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 62 ) ,\
- .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 64 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 64 ) ,\
+ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 66 ) ,\
},\
{ \
/* Endpoint: 0, Cluster: Keypad Input (client) */ \
.clusterId = 0x00000509, \
- .attributes = ZAP_ATTRIBUTE_INDEX(269), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(270), \
.attributeCount = 0, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1263,18 +1269,18 @@
{ \
/* Endpoint: 0, Cluster: Keypad Input (server) */ \
.clusterId = 0x00000509, \
- .attributes = ZAP_ATTRIBUTE_INDEX(269), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(270), \
.attributeCount = 2, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 66 ) ,\
- .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 68 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 68 ) ,\
+ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 70 ) ,\
},\
{ \
/* Endpoint: 0, Cluster: Content Launcher (client) */ \
.clusterId = 0x0000050A, \
- .attributes = ZAP_ATTRIBUTE_INDEX(271), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(272), \
.attributeCount = 0, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1285,18 +1291,18 @@
{ \
/* Endpoint: 0, Cluster: Content Launcher (server) */ \
.clusterId = 0x0000050A, \
- .attributes = ZAP_ATTRIBUTE_INDEX(271), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(272), \
.attributeCount = 4, \
.clusterSize = 10, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 70 ) ,\
- .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 73 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 72 ) ,\
+ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 75 ) ,\
},\
{ \
/* Endpoint: 0, Cluster: Application Basic (client) */ \
.clusterId = 0x0000050D, \
- .attributes = ZAP_ATTRIBUTE_INDEX(275), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(276), \
.attributeCount = 0, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1307,7 +1313,7 @@
{ \
/* Endpoint: 0, Cluster: Application Basic (server) */ \
.clusterId = 0x0000050D, \
- .attributes = ZAP_ATTRIBUTE_INDEX(275), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(276), \
.attributeCount = 10, \
.clusterSize = 110, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1318,40 +1324,40 @@
{ \
/* Endpoint: 1, Cluster: Identify (server) */ \
.clusterId = 0x00000003, \
- .attributes = ZAP_ATTRIBUTE_INDEX(285), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(286), \
.attributeCount = 4, \
.clusterSize = 9, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \
.functions = chipFuncArrayIdentifyServer, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 75 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 77 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
/* Endpoint: 1, Cluster: Groups (server) */ \
.clusterId = 0x00000004, \
- .attributes = ZAP_ATTRIBUTE_INDEX(289), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(290), \
.attributeCount = 3, \
.clusterSize = 7, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
.functions = chipFuncArrayGroupsServer, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 77 ) ,\
- .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 84 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 79 ) ,\
+ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 86 ) ,\
},\
{ \
/* Endpoint: 1, Cluster: Scenes (server) */ \
.clusterId = 0x00000005, \
- .attributes = ZAP_ATTRIBUTE_INDEX(292), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(293), \
.attributeCount = 7, \
.clusterSize = 12, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
.functions = chipFuncArrayScenesServer, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 89 ) ,\
- .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 97 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 91 ) ,\
+ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 99 ) ,\
},\
{ \
/* Endpoint: 1, Cluster: On/Off (client) */ \
.clusterId = 0x00000006, \
- .attributes = ZAP_ATTRIBUTE_INDEX(299), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(300), \
.attributeCount = 0, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1362,29 +1368,29 @@
{ \
/* Endpoint: 1, Cluster: On/Off (server) */ \
.clusterId = 0x00000006, \
- .attributes = ZAP_ATTRIBUTE_INDEX(299), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(300), \
.attributeCount = 3, \
.clusterSize = 7, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
.functions = chipFuncArrayOnOffServer, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 104 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 106 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
/* Endpoint: 1, Cluster: Level Control (server) */ \
.clusterId = 0x00000008, \
- .attributes = ZAP_ATTRIBUTE_INDEX(302), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(303), \
.attributeCount = 3, \
.clusterSize = 7, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
.functions = chipFuncArrayLevelControlServer, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 108 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 110 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
/* Endpoint: 1, Cluster: Basic (server) */ \
.clusterId = 0x00000028, \
- .attributes = ZAP_ATTRIBUTE_INDEX(305), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(306), \
.attributeCount = 22, \
.clusterSize = 41, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
@@ -1395,12 +1401,12 @@
{ \
/* Endpoint: 1, Cluster: Color Control (server) */ \
.clusterId = 0x00000300, \
- .attributes = ZAP_ATTRIBUTE_INDEX(327), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(328), \
.attributeCount = 7, \
.clusterSize = 15, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
.functions = chipFuncArrayColorControlServer, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 117 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 119 ) ,\
.generatedCommandList = nullptr ,\
},\
}
diff --git a/zzz_generated/placeholder/app2/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/placeholder/app2/zap-generated/IMClusterCommandHandler.cpp
index 50bd275..1e57879 100644
--- a/zzz_generated/placeholder/app2/zap-generated/IMClusterCommandHandler.cpp
+++ b/zzz_generated/placeholder/app2/zap-generated/IMClusterCommandHandler.cpp
@@ -293,6 +293,43 @@
} // namespace GeneralCommissioning
+namespace GeneralDiagnostics {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+ CHIP_ERROR TLVError = CHIP_NO_ERROR;
+ bool wasHandled = false;
+ {
+ switch (aCommandPath.mCommandId)
+ {
+ case Commands::TestEventTrigger::Id: {
+ Commands::TestEventTrigger::DecodableType commandData;
+ TLVError = DataModel::Decode(aDataTlv, commandData);
+ if (TLVError == CHIP_NO_ERROR)
+ {
+ wasHandled = emberAfGeneralDiagnosticsClusterTestEventTriggerCallback(apCommandObj, aCommandPath, commandData);
+ }
+ break;
+ }
+ default: {
+ // Unrecognized command ID, error status will apply.
+ apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+ ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+ ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+ return;
+ }
+ }
+ }
+
+ if (CHIP_NO_ERROR != TLVError || !wasHandled)
+ {
+ apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+ ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+ }
+}
+
+} // namespace GeneralDiagnostics
+
namespace Groups {
void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
@@ -1171,6 +1208,9 @@
case Clusters::GeneralCommissioning::Id:
Clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
break;
+ case Clusters::GeneralDiagnostics::Id:
+ Clusters::GeneralDiagnostics::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+ break;
case Clusters::Groups::Id:
Clusters::Groups::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
break;
diff --git a/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h b/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h
index 38dbbc1..a693a88 100644
--- a/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h
+++ b/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h
@@ -106,7 +106,7 @@
#define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask
// This is an array of EmberAfAttributeMetadata structures.
-#define GENERATED_ATTRIBUTE_COUNT 334
+#define GENERATED_ATTRIBUTE_COUNT 335
#define GENERATED_ATTRIBUTES \
{ \
\
@@ -259,7 +259,9 @@
ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */ \
{ 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \
{ 0x00000007, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
- ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaults */ \
+ ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaults */ \
+ { 0x00000008, ZAP_TYPE(BOOLEAN), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
+ ZAP_EMPTY_DEFAULT() }, /* TestEventTriggersEnabled */ \
{ 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \
{ 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \
\
@@ -709,26 +711,30 @@
0x00000005 /* NetworkConfigResponse */, \
0x00000007 /* ConnectNetworkResponse */, \
chip::kInvalidCommandId /* end of list */, \
- /* Endpoint: 0, Cluster: Software Diagnostics (server) */\
+ /* Endpoint: 0, Cluster: General Diagnostics (server) */\
/* AcceptedCommandList (index=26) */ \
+ 0x00000000 /* TestEventTrigger */, \
+ chip::kInvalidCommandId /* end of list */, \
+ /* Endpoint: 0, Cluster: Software Diagnostics (server) */\
+ /* AcceptedCommandList (index=28) */ \
0x00000000 /* ResetWatermarks */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */\
- /* AcceptedCommandList (index=28) */ \
- 0x00000000 /* ResetCounts */, \
- chip::kInvalidCommandId /* end of list */, \
- /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */\
/* AcceptedCommandList (index=30) */ \
0x00000000 /* ResetCounts */, \
chip::kInvalidCommandId /* end of list */, \
- /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */\
+ /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */\
/* AcceptedCommandList (index=32) */ \
+ 0x00000000 /* ResetCounts */, \
+ chip::kInvalidCommandId /* end of list */, \
+ /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */\
+ /* AcceptedCommandList (index=34) */ \
0x00000000 /* OpenCommissioningWindow */, \
0x00000001 /* OpenBasicCommissioningWindow */, \
0x00000002 /* RevokeCommissioning */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 0, Cluster: Operational Credentials (server) */\
- /* AcceptedCommandList (index=36) */ \
+ /* AcceptedCommandList (index=38) */ \
0x00000000 /* AttestationRequest */, \
0x00000002 /* CertificateChainRequest */, \
0x00000004 /* CSRRequest */, \
@@ -738,18 +744,18 @@
0x0000000A /* RemoveFabric */, \
0x0000000B /* AddTrustedRootCertificate */, \
chip::kInvalidCommandId /* end of list */, \
- /* GeneratedCommandList (index=45)*/ \
+ /* GeneratedCommandList (index=47)*/ \
0x00000001 /* AttestationResponse */, \
0x00000003 /* CertificateChainResponse */, \
0x00000005 /* CSRResponse */, \
0x00000008 /* NOCResponse */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 0, Cluster: Mode Select (server) */\
- /* AcceptedCommandList (index=50) */ \
+ /* AcceptedCommandList (index=52) */ \
0x00000000 /* ChangeToMode */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 0, Cluster: Window Covering (server) */\
- /* AcceptedCommandList (index=52) */ \
+ /* AcceptedCommandList (index=54) */ \
0x00000000 /* UpOrOpen */, \
0x00000001 /* DownOrClose */, \
0x00000002 /* StopMotion */, \
@@ -759,37 +765,37 @@
0x00000008 /* GoToTiltPercentage */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 0, Cluster: Thermostat (server) */\
- /* AcceptedCommandList (index=60) */ \
+ /* AcceptedCommandList (index=62) */ \
0x00000000 /* SetpointRaiseLower */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 0, Cluster: Target Navigator (server) */\
- /* AcceptedCommandList (index=62) */ \
+ /* AcceptedCommandList (index=64) */ \
0x00000000 /* NavigateTarget */, \
chip::kInvalidCommandId /* end of list */, \
- /* GeneratedCommandList (index=64)*/ \
+ /* GeneratedCommandList (index=66)*/ \
0x00000001 /* NavigateTargetResponse */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 0, Cluster: Keypad Input (server) */\
- /* AcceptedCommandList (index=66) */ \
+ /* AcceptedCommandList (index=68) */ \
0x00000000 /* SendKey */, \
chip::kInvalidCommandId /* end of list */, \
- /* GeneratedCommandList (index=68)*/ \
+ /* GeneratedCommandList (index=70)*/ \
0x00000001 /* SendKeyResponse */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 0, Cluster: Content Launcher (server) */\
- /* AcceptedCommandList (index=70) */ \
+ /* AcceptedCommandList (index=72) */ \
0x00000000 /* LaunchContent */, \
0x00000001 /* LaunchURL */, \
chip::kInvalidCommandId /* end of list */, \
- /* GeneratedCommandList (index=73)*/ \
+ /* GeneratedCommandList (index=75)*/ \
0x00000002 /* LaunchResponse */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 1, Cluster: Identify (server) */\
- /* AcceptedCommandList (index=75) */ \
+ /* AcceptedCommandList (index=77) */ \
0x00000000 /* Identify */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 1, Cluster: Groups (server) */\
- /* AcceptedCommandList (index=77) */ \
+ /* AcceptedCommandList (index=79) */ \
0x00000000 /* AddGroup */, \
0x00000001 /* ViewGroup */, \
0x00000002 /* GetGroupMembership */, \
@@ -797,14 +803,14 @@
0x00000004 /* RemoveAllGroups */, \
0x00000005 /* AddGroupIfIdentifying */, \
chip::kInvalidCommandId /* end of list */, \
- /* GeneratedCommandList (index=84)*/ \
+ /* GeneratedCommandList (index=86)*/ \
0x00000000 /* AddGroupResponse */, \
0x00000001 /* ViewGroupResponse */, \
0x00000002 /* GetGroupMembershipResponse */, \
0x00000003 /* RemoveGroupResponse */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 1, Cluster: Scenes (server) */\
- /* AcceptedCommandList (index=89) */ \
+ /* AcceptedCommandList (index=91) */ \
0x00000000 /* AddScene */, \
0x00000001 /* ViewScene */, \
0x00000002 /* RemoveScene */, \
@@ -813,7 +819,7 @@
0x00000005 /* RecallScene */, \
0x00000006 /* GetSceneMembership */, \
chip::kInvalidCommandId /* end of list */, \
- /* GeneratedCommandList (index=97)*/ \
+ /* GeneratedCommandList (index=99)*/ \
0x00000000 /* AddSceneResponse */, \
0x00000001 /* ViewSceneResponse */, \
0x00000002 /* RemoveSceneResponse */, \
@@ -822,13 +828,13 @@
0x00000006 /* GetSceneMembershipResponse */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 1, Cluster: On/Off (server) */\
- /* AcceptedCommandList (index=104) */ \
+ /* AcceptedCommandList (index=106) */ \
0x00000000 /* Off */, \
0x00000001 /* On */, \
0x00000002 /* Toggle */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 1, Cluster: Level Control (server) */\
- /* AcceptedCommandList (index=108) */ \
+ /* AcceptedCommandList (index=110) */ \
0x00000000 /* MoveToLevel */, \
0x00000001 /* Move */, \
0x00000002 /* Step */, \
@@ -839,7 +845,7 @@
0x00000007 /* StopWithOnOff */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 1, Cluster: Color Control (server) */\
- /* AcceptedCommandList (index=117) */ \
+ /* AcceptedCommandList (index=119) */ \
0x00000007 /* MoveToColor */, \
0x00000008 /* MoveColor */, \
0x00000009 /* StepColor */, \
@@ -967,18 +973,7 @@
/* Endpoint: 0, Cluster: General Diagnostics (server) */ \
.clusterId = 0x00000033, \
.attributes = ZAP_ATTRIBUTE_INDEX(93), \
- .attributeCount = 10, \
- .clusterSize = 6, \
- .mask = ZAP_CLUSTER_MASK(SERVER), \
- .functions = NULL, \
- .acceptedCommandList = nullptr ,\
- .generatedCommandList = nullptr ,\
- },\
- { \
- /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \
- .clusterId = 0x00000034, \
- .attributes = ZAP_ATTRIBUTE_INDEX(103), \
- .attributeCount = 6, \
+ .attributeCount = 11, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
@@ -986,10 +981,10 @@
.generatedCommandList = nullptr ,\
},\
{ \
- /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \
- .clusterId = 0x00000036, \
- .attributes = ZAP_ATTRIBUTE_INDEX(109), \
- .attributeCount = 15, \
+ /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \
+ .clusterId = 0x00000034, \
+ .attributes = ZAP_ATTRIBUTE_INDEX(104), \
+ .attributeCount = 6, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
@@ -997,10 +992,10 @@
.generatedCommandList = nullptr ,\
},\
{ \
- /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \
- .clusterId = 0x00000037, \
- .attributes = ZAP_ATTRIBUTE_INDEX(124), \
- .attributeCount = 11, \
+ /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \
+ .clusterId = 0x00000036, \
+ .attributes = ZAP_ATTRIBUTE_INDEX(110), \
+ .attributeCount = 15, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
@@ -1008,9 +1003,20 @@
.generatedCommandList = nullptr ,\
},\
{ \
+ /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \
+ .clusterId = 0x00000037, \
+ .attributes = ZAP_ATTRIBUTE_INDEX(125), \
+ .attributeCount = 11, \
+ .clusterSize = 6, \
+ .mask = ZAP_CLUSTER_MASK(SERVER), \
+ .functions = NULL, \
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 32 ) ,\
+ .generatedCommandList = nullptr ,\
+ },\
+ { \
/* Endpoint: 0, Cluster: Switch (client) */ \
.clusterId = 0x0000003B, \
- .attributes = ZAP_ATTRIBUTE_INDEX(135), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(136), \
.attributeCount = 0, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1021,7 +1027,7 @@
{ \
/* Endpoint: 0, Cluster: Switch (server) */ \
.clusterId = 0x0000003B, \
- .attributes = ZAP_ATTRIBUTE_INDEX(135), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(136), \
.attributeCount = 5, \
.clusterSize = 9, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1032,18 +1038,18 @@
{ \
/* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \
.clusterId = 0x0000003C, \
- .attributes = ZAP_ATTRIBUTE_INDEX(140), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(141), \
.attributeCount = 5, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 32 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 34 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
/* Endpoint: 0, Cluster: Operational Credentials (client) */ \
.clusterId = 0x0000003E, \
- .attributes = ZAP_ATTRIBUTE_INDEX(145), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(146), \
.attributeCount = 0, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1054,18 +1060,18 @@
{ \
/* Endpoint: 0, Cluster: Operational Credentials (server) */ \
.clusterId = 0x0000003E, \
- .attributes = ZAP_ATTRIBUTE_INDEX(145), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(146), \
.attributeCount = 7, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 36 ) ,\
- .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 45 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 38 ) ,\
+ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 47 ) ,\
},\
{ \
/* Endpoint: 0, Cluster: Boolean State (server) */ \
.clusterId = 0x00000045, \
- .attributes = ZAP_ATTRIBUTE_INDEX(152), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(153), \
.attributeCount = 3, \
.clusterSize = 7, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1076,7 +1082,7 @@
{ \
/* Endpoint: 0, Cluster: Mode Select (client) */ \
.clusterId = 0x00000050, \
- .attributes = ZAP_ATTRIBUTE_INDEX(155), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(156), \
.attributeCount = 0, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1087,29 +1093,29 @@
{ \
/* Endpoint: 0, Cluster: Mode Select (server) */ \
.clusterId = 0x00000050, \
- .attributes = ZAP_ATTRIBUTE_INDEX(155), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(156), \
.attributeCount = 7, \
.clusterSize = 41, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \
.functions = chipFuncArrayModeSelectServer, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 50 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 52 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
/* Endpoint: 0, Cluster: Window Covering (server) */ \
.clusterId = 0x00000102, \
- .attributes = ZAP_ATTRIBUTE_INDEX(162), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(163), \
.attributeCount = 20, \
.clusterSize = 35, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \
.functions = chipFuncArrayWindowCoveringServer, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 52 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 54 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
/* Endpoint: 0, Cluster: Pump Configuration and Control (server) */ \
.clusterId = 0x00000200, \
- .attributes = ZAP_ATTRIBUTE_INDEX(182), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(183), \
.attributeCount = 25, \
.clusterSize = 52, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \
@@ -1120,18 +1126,18 @@
{ \
/* Endpoint: 0, Cluster: Thermostat (server) */ \
.clusterId = 0x00000201, \
- .attributes = ZAP_ATTRIBUTE_INDEX(207), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(208), \
.attributeCount = 18, \
.clusterSize = 32, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \
.functions = chipFuncArrayThermostatServer, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 60 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 62 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
/* Endpoint: 0, Cluster: Thermostat User Interface Configuration (client) */ \
.clusterId = 0x00000204, \
- .attributes = ZAP_ATTRIBUTE_INDEX(225), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(226), \
.attributeCount = 0, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1142,7 +1148,7 @@
{ \
/* Endpoint: 0, Cluster: Thermostat User Interface Configuration (server) */ \
.clusterId = 0x00000204, \
- .attributes = ZAP_ATTRIBUTE_INDEX(225), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(226), \
.attributeCount = 5, \
.clusterSize = 9, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \
@@ -1153,7 +1159,7 @@
{ \
/* Endpoint: 0, Cluster: Illuminance Measurement (server) */ \
.clusterId = 0x00000400, \
- .attributes = ZAP_ATTRIBUTE_INDEX(230), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(231), \
.attributeCount = 7, \
.clusterSize = 15, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1164,7 +1170,7 @@
{ \
/* Endpoint: 0, Cluster: Temperature Measurement (client) */ \
.clusterId = 0x00000402, \
- .attributes = ZAP_ATTRIBUTE_INDEX(237), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(238), \
.attributeCount = 0, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1175,7 +1181,7 @@
{ \
/* Endpoint: 0, Cluster: Temperature Measurement (server) */ \
.clusterId = 0x00000402, \
- .attributes = ZAP_ATTRIBUTE_INDEX(237), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(238), \
.attributeCount = 5, \
.clusterSize = 12, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1186,7 +1192,7 @@
{ \
/* Endpoint: 0, Cluster: Pressure Measurement (server) */ \
.clusterId = 0x00000403, \
- .attributes = ZAP_ATTRIBUTE_INDEX(242), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(243), \
.attributeCount = 11, \
.clusterSize = 23, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1197,7 +1203,7 @@
{ \
/* Endpoint: 0, Cluster: Flow Measurement (server) */ \
.clusterId = 0x00000404, \
- .attributes = ZAP_ATTRIBUTE_INDEX(253), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(254), \
.attributeCount = 6, \
.clusterSize = 14, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1208,7 +1214,7 @@
{ \
/* Endpoint: 0, Cluster: Relative Humidity Measurement (client) */ \
.clusterId = 0x00000405, \
- .attributes = ZAP_ATTRIBUTE_INDEX(259), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(260), \
.attributeCount = 0, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1219,7 +1225,7 @@
{ \
/* Endpoint: 0, Cluster: Relative Humidity Measurement (server) */ \
.clusterId = 0x00000405, \
- .attributes = ZAP_ATTRIBUTE_INDEX(259), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(260), \
.attributeCount = 6, \
.clusterSize = 14, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1230,7 +1236,7 @@
{ \
/* Endpoint: 0, Cluster: Target Navigator (client) */ \
.clusterId = 0x00000505, \
- .attributes = ZAP_ATTRIBUTE_INDEX(265), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(266), \
.attributeCount = 0, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1241,18 +1247,18 @@
{ \
/* Endpoint: 0, Cluster: Target Navigator (server) */ \
.clusterId = 0x00000505, \
- .attributes = ZAP_ATTRIBUTE_INDEX(265), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(266), \
.attributeCount = 4, \
.clusterSize = 7, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 62 ) ,\
- .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 64 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 64 ) ,\
+ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 66 ) ,\
},\
{ \
/* Endpoint: 0, Cluster: Keypad Input (client) */ \
.clusterId = 0x00000509, \
- .attributes = ZAP_ATTRIBUTE_INDEX(269), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(270), \
.attributeCount = 0, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1263,18 +1269,18 @@
{ \
/* Endpoint: 0, Cluster: Keypad Input (server) */ \
.clusterId = 0x00000509, \
- .attributes = ZAP_ATTRIBUTE_INDEX(269), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(270), \
.attributeCount = 2, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 66 ) ,\
- .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 68 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 68 ) ,\
+ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 70 ) ,\
},\
{ \
/* Endpoint: 0, Cluster: Content Launcher (client) */ \
.clusterId = 0x0000050A, \
- .attributes = ZAP_ATTRIBUTE_INDEX(271), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(272), \
.attributeCount = 0, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1285,18 +1291,18 @@
{ \
/* Endpoint: 0, Cluster: Content Launcher (server) */ \
.clusterId = 0x0000050A, \
- .attributes = ZAP_ATTRIBUTE_INDEX(271), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(272), \
.attributeCount = 4, \
.clusterSize = 10, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 70 ) ,\
- .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 73 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 72 ) ,\
+ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 75 ) ,\
},\
{ \
/* Endpoint: 0, Cluster: Application Basic (client) */ \
.clusterId = 0x0000050D, \
- .attributes = ZAP_ATTRIBUTE_INDEX(275), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(276), \
.attributeCount = 0, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1307,7 +1313,7 @@
{ \
/* Endpoint: 0, Cluster: Application Basic (server) */ \
.clusterId = 0x0000050D, \
- .attributes = ZAP_ATTRIBUTE_INDEX(275), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(276), \
.attributeCount = 10, \
.clusterSize = 110, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1318,40 +1324,40 @@
{ \
/* Endpoint: 1, Cluster: Identify (server) */ \
.clusterId = 0x00000003, \
- .attributes = ZAP_ATTRIBUTE_INDEX(285), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(286), \
.attributeCount = 4, \
.clusterSize = 9, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \
.functions = chipFuncArrayIdentifyServer, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 75 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 77 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
/* Endpoint: 1, Cluster: Groups (server) */ \
.clusterId = 0x00000004, \
- .attributes = ZAP_ATTRIBUTE_INDEX(289), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(290), \
.attributeCount = 3, \
.clusterSize = 7, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
.functions = chipFuncArrayGroupsServer, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 77 ) ,\
- .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 84 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 79 ) ,\
+ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 86 ) ,\
},\
{ \
/* Endpoint: 1, Cluster: Scenes (server) */ \
.clusterId = 0x00000005, \
- .attributes = ZAP_ATTRIBUTE_INDEX(292), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(293), \
.attributeCount = 7, \
.clusterSize = 12, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
.functions = chipFuncArrayScenesServer, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 89 ) ,\
- .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 97 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 91 ) ,\
+ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 99 ) ,\
},\
{ \
/* Endpoint: 1, Cluster: On/Off (client) */ \
.clusterId = 0x00000006, \
- .attributes = ZAP_ATTRIBUTE_INDEX(299), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(300), \
.attributeCount = 0, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1362,29 +1368,29 @@
{ \
/* Endpoint: 1, Cluster: On/Off (server) */ \
.clusterId = 0x00000006, \
- .attributes = ZAP_ATTRIBUTE_INDEX(299), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(300), \
.attributeCount = 3, \
.clusterSize = 7, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
.functions = chipFuncArrayOnOffServer, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 104 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 106 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
/* Endpoint: 1, Cluster: Level Control (server) */ \
.clusterId = 0x00000008, \
- .attributes = ZAP_ATTRIBUTE_INDEX(302), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(303), \
.attributeCount = 3, \
.clusterSize = 7, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
.functions = chipFuncArrayLevelControlServer, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 108 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 110 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
/* Endpoint: 1, Cluster: Basic (server) */ \
.clusterId = 0x00000028, \
- .attributes = ZAP_ATTRIBUTE_INDEX(305), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(306), \
.attributeCount = 22, \
.clusterSize = 41, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
@@ -1395,12 +1401,12 @@
{ \
/* Endpoint: 1, Cluster: Color Control (server) */ \
.clusterId = 0x00000300, \
- .attributes = ZAP_ATTRIBUTE_INDEX(327), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(328), \
.attributeCount = 7, \
.clusterSize = 15, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
.functions = chipFuncArrayColorControlServer, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 117 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 119 ) ,\
.generatedCommandList = nullptr ,\
},\
}
diff --git a/zzz_generated/pump-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/pump-app/zap-generated/IMClusterCommandHandler.cpp
index 89e0426..877ab16 100644
--- a/zzz_generated/pump-app/zap-generated/IMClusterCommandHandler.cpp
+++ b/zzz_generated/pump-app/zap-generated/IMClusterCommandHandler.cpp
@@ -192,6 +192,43 @@
} // namespace GeneralCommissioning
+namespace GeneralDiagnostics {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+ CHIP_ERROR TLVError = CHIP_NO_ERROR;
+ bool wasHandled = false;
+ {
+ switch (aCommandPath.mCommandId)
+ {
+ case Commands::TestEventTrigger::Id: {
+ Commands::TestEventTrigger::DecodableType commandData;
+ TLVError = DataModel::Decode(aDataTlv, commandData);
+ if (TLVError == CHIP_NO_ERROR)
+ {
+ wasHandled = emberAfGeneralDiagnosticsClusterTestEventTriggerCallback(apCommandObj, aCommandPath, commandData);
+ }
+ break;
+ }
+ default: {
+ // Unrecognized command ID, error status will apply.
+ apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+ ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+ ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+ return;
+ }
+ }
+ }
+
+ if (CHIP_NO_ERROR != TLVError || !wasHandled)
+ {
+ apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+ ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+ }
+}
+
+} // namespace GeneralDiagnostics
+
namespace GroupKeyManagement {
void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
@@ -973,6 +1010,9 @@
case Clusters::GeneralCommissioning::Id:
Clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
break;
+ case Clusters::GeneralDiagnostics::Id:
+ Clusters::GeneralDiagnostics::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+ break;
case Clusters::GroupKeyManagement::Id:
Clusters::GroupKeyManagement::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
break;
diff --git a/zzz_generated/pump-app/zap-generated/endpoint_config.h b/zzz_generated/pump-app/zap-generated/endpoint_config.h
index 89c72de..0af0247 100644
--- a/zzz_generated/pump-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/pump-app/zap-generated/endpoint_config.h
@@ -100,7 +100,7 @@
#define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask
// This is an array of EmberAfAttributeMetadata structures.
-#define GENERATED_ATTRIBUTE_COUNT 268
+#define GENERATED_ATTRIBUTE_COUNT 269
#define GENERATED_ATTRIBUTES \
{ \
\
@@ -261,7 +261,9 @@
ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */ \
{ 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \
{ 0x00000007, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
- ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaults */ \
+ ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaults */ \
+ { 0x00000008, ZAP_TYPE(BOOLEAN), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
+ ZAP_EMPTY_DEFAULT() }, /* TestEventTriggersEnabled */ \
{ 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \
{ 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \
\
@@ -641,22 +643,26 @@
/* GeneratedCommandList (index=53)*/ \
0x00000001 /* RetrieveLogsResponse */, \
chip::kInvalidCommandId /* end of list */, \
- /* Endpoint: 0, Cluster: Software Diagnostics (server) */\
+ /* Endpoint: 0, Cluster: General Diagnostics (server) */\
/* AcceptedCommandList (index=55) */ \
+ 0x00000000 /* TestEventTrigger */, \
+ chip::kInvalidCommandId /* end of list */, \
+ /* Endpoint: 0, Cluster: Software Diagnostics (server) */\
+ /* AcceptedCommandList (index=57) */ \
0x00000000 /* ResetWatermarks */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */\
- /* AcceptedCommandList (index=57) */ \
+ /* AcceptedCommandList (index=59) */ \
0x00000000 /* ResetCounts */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 0, Cluster: AdministratorCommissioning (server) */\
- /* AcceptedCommandList (index=59) */ \
+ /* AcceptedCommandList (index=61) */ \
0x00000000 /* OpenCommissioningWindow */, \
0x00000001 /* OpenBasicCommissioningWindow */, \
0x00000002 /* RevokeCommissioning */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 0, Cluster: Operational Credentials (server) */\
- /* AcceptedCommandList (index=63) */ \
+ /* AcceptedCommandList (index=65) */ \
0x00000000 /* AttestationRequest */, \
0x00000002 /* CertificateChainRequest */, \
0x00000004 /* CSRRequest */, \
@@ -666,25 +672,25 @@
0x0000000A /* RemoveFabric */, \
0x0000000B /* AddTrustedRootCertificate */, \
chip::kInvalidCommandId /* end of list */, \
- /* GeneratedCommandList (index=72)*/ \
+ /* GeneratedCommandList (index=74)*/ \
0x00000001 /* AttestationResponse */, \
0x00000003 /* CertificateChainResponse */, \
0x00000005 /* CSRResponse */, \
0x00000008 /* NOCResponse */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 0, Cluster: Group Key Management (server) */\
- /* AcceptedCommandList (index=77) */ \
+ /* AcceptedCommandList (index=79) */ \
0x00000000 /* KeySetWrite */, \
0x00000001 /* KeySetRead */, \
0x00000003 /* KeySetRemove */, \
0x00000004 /* KeySetReadAllIndices */, \
chip::kInvalidCommandId /* end of list */, \
- /* GeneratedCommandList (index=82)*/ \
+ /* GeneratedCommandList (index=84)*/ \
0x00000002 /* KeySetReadResponse */, \
0x00000005 /* KeySetReadAllIndicesResponse */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 1, Cluster: On/Off (server) */\
- /* AcceptedCommandList (index=85) */ \
+ /* AcceptedCommandList (index=87) */ \
0x00000000 /* Off */, \
0x00000001 /* On */, \
0x00000002 /* Toggle */, \
@@ -693,7 +699,7 @@
0x00000042 /* OnWithTimedOff */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 1, Cluster: Level Control (server) */\
- /* AcceptedCommandList (index=92) */ \
+ /* AcceptedCommandList (index=94) */ \
0x00000000 /* MoveToLevel */, \
0x00000001 /* Move */, \
0x00000002 /* Step */, \
@@ -870,18 +876,7 @@
/* Endpoint: 0, Cluster: General Diagnostics (server) */ \
.clusterId = 0x00000033, \
.attributes = ZAP_ATTRIBUTE_INDEX(85), \
- .attributeCount = 10, \
- .clusterSize = 6, \
- .mask = ZAP_CLUSTER_MASK(SERVER), \
- .functions = NULL, \
- .acceptedCommandList = nullptr ,\
- .generatedCommandList = nullptr ,\
- },\
- { \
- /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \
- .clusterId = 0x00000034, \
- .attributes = ZAP_ATTRIBUTE_INDEX(95), \
- .attributeCount = 6, \
+ .attributeCount = 11, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
@@ -889,10 +884,10 @@
.generatedCommandList = nullptr ,\
},\
{ \
- /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \
- .clusterId = 0x00000035, \
- .attributes = ZAP_ATTRIBUTE_INDEX(101), \
- .attributeCount = 65, \
+ /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \
+ .clusterId = 0x00000034, \
+ .attributes = ZAP_ATTRIBUTE_INDEX(96), \
+ .attributeCount = 6, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
@@ -900,10 +895,10 @@
.generatedCommandList = nullptr ,\
},\
{ \
- /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \
- .clusterId = 0x0000003C, \
- .attributes = ZAP_ATTRIBUTE_INDEX(166), \
- .attributeCount = 5, \
+ /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \
+ .clusterId = 0x00000035, \
+ .attributes = ZAP_ATTRIBUTE_INDEX(102), \
+ .attributeCount = 65, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
@@ -911,31 +906,42 @@
.generatedCommandList = nullptr ,\
},\
{ \
+ /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \
+ .clusterId = 0x0000003C, \
+ .attributes = ZAP_ATTRIBUTE_INDEX(167), \
+ .attributeCount = 5, \
+ .clusterSize = 6, \
+ .mask = ZAP_CLUSTER_MASK(SERVER), \
+ .functions = NULL, \
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 61 ) ,\
+ .generatedCommandList = nullptr ,\
+ },\
+ { \
/* Endpoint: 0, Cluster: Operational Credentials (server) */ \
.clusterId = 0x0000003E, \
- .attributes = ZAP_ATTRIBUTE_INDEX(171), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(172), \
.attributeCount = 8, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 63 ) ,\
- .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 72 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 65 ) ,\
+ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 74 ) ,\
},\
{ \
/* Endpoint: 0, Cluster: Group Key Management (server) */ \
.clusterId = 0x0000003F, \
- .attributes = ZAP_ATTRIBUTE_INDEX(179), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(180), \
.attributeCount = 6, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 77 ) ,\
- .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 82 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 79 ) ,\
+ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 84 ) ,\
},\
{ \
/* Endpoint: 0, Cluster: Fixed Label (server) */ \
.clusterId = 0x00000040, \
- .attributes = ZAP_ATTRIBUTE_INDEX(185), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(186), \
.attributeCount = 3, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -946,7 +952,7 @@
{ \
/* Endpoint: 0, Cluster: User Label (server) */ \
.clusterId = 0x00000041, \
- .attributes = ZAP_ATTRIBUTE_INDEX(188), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(189), \
.attributeCount = 3, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -957,29 +963,29 @@
{ \
/* Endpoint: 1, Cluster: On/Off (server) */ \
.clusterId = 0x00000006, \
- .attributes = ZAP_ATTRIBUTE_INDEX(191), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(192), \
.attributeCount = 7, \
.clusterSize = 13, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
.functions = chipFuncArrayOnOffServer, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 85 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 87 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
/* Endpoint: 1, Cluster: Level Control (server) */ \
.clusterId = 0x00000008, \
- .attributes = ZAP_ATTRIBUTE_INDEX(198), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(199), \
.attributeCount = 16, \
.clusterSize = 27, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
.functions = chipFuncArrayLevelControlServer, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 92 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 94 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
/* Endpoint: 1, Cluster: Descriptor (server) */ \
.clusterId = 0x0000001D, \
- .attributes = ZAP_ATTRIBUTE_INDEX(214), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(215), \
.attributeCount = 6, \
.clusterSize = 4, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -990,7 +996,7 @@
{ \
/* Endpoint: 1, Cluster: Pump Configuration and Control (server) */ \
.clusterId = 0x00000200, \
- .attributes = ZAP_ATTRIBUTE_INDEX(220), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(221), \
.attributeCount = 25, \
.clusterSize = 52, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \
@@ -1001,7 +1007,7 @@
{ \
/* Endpoint: 1, Cluster: Temperature Measurement (client) */ \
.clusterId = 0x00000402, \
- .attributes = ZAP_ATTRIBUTE_INDEX(245), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(246), \
.attributeCount = 0, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1012,7 +1018,7 @@
{ \
/* Endpoint: 1, Cluster: Temperature Measurement (server) */ \
.clusterId = 0x00000402, \
- .attributes = ZAP_ATTRIBUTE_INDEX(245), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(246), \
.attributeCount = 6, \
.clusterSize = 14, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1023,7 +1029,7 @@
{ \
/* Endpoint: 1, Cluster: Pressure Measurement (client) */ \
.clusterId = 0x00000403, \
- .attributes = ZAP_ATTRIBUTE_INDEX(251), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(252), \
.attributeCount = 0, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1034,7 +1040,7 @@
{ \
/* Endpoint: 1, Cluster: Pressure Measurement (server) */ \
.clusterId = 0x00000403, \
- .attributes = ZAP_ATTRIBUTE_INDEX(251), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(252), \
.attributeCount = 11, \
.clusterSize = 23, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1045,7 +1051,7 @@
{ \
/* Endpoint: 1, Cluster: Flow Measurement (client) */ \
.clusterId = 0x00000404, \
- .attributes = ZAP_ATTRIBUTE_INDEX(262), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(263), \
.attributeCount = 0, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1056,7 +1062,7 @@
{ \
/* Endpoint: 1, Cluster: Flow Measurement (server) */ \
.clusterId = 0x00000404, \
- .attributes = ZAP_ATTRIBUTE_INDEX(262), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(263), \
.attributeCount = 6, \
.clusterSize = 14, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1067,7 +1073,7 @@
{ \
/* Endpoint: 1, Cluster: Occupancy Sensing (client) */ \
.clusterId = 0x00000406, \
- .attributes = ZAP_ATTRIBUTE_INDEX(268), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(269), \
.attributeCount = 0, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(CLIENT), \
diff --git a/zzz_generated/pump-controller-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/pump-controller-app/zap-generated/IMClusterCommandHandler.cpp
index a3d19ed..85464b5 100644
--- a/zzz_generated/pump-controller-app/zap-generated/IMClusterCommandHandler.cpp
+++ b/zzz_generated/pump-controller-app/zap-generated/IMClusterCommandHandler.cpp
@@ -192,6 +192,43 @@
} // namespace GeneralCommissioning
+namespace GeneralDiagnostics {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+ CHIP_ERROR TLVError = CHIP_NO_ERROR;
+ bool wasHandled = false;
+ {
+ switch (aCommandPath.mCommandId)
+ {
+ case Commands::TestEventTrigger::Id: {
+ Commands::TestEventTrigger::DecodableType commandData;
+ TLVError = DataModel::Decode(aDataTlv, commandData);
+ if (TLVError == CHIP_NO_ERROR)
+ {
+ wasHandled = emberAfGeneralDiagnosticsClusterTestEventTriggerCallback(apCommandObj, aCommandPath, commandData);
+ }
+ break;
+ }
+ default: {
+ // Unrecognized command ID, error status will apply.
+ apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+ ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+ ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+ return;
+ }
+ }
+ }
+
+ if (CHIP_NO_ERROR != TLVError || !wasHandled)
+ {
+ apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+ ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+ }
+}
+
+} // namespace GeneralDiagnostics
+
namespace GroupKeyManagement {
void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
@@ -700,6 +737,9 @@
case Clusters::GeneralCommissioning::Id:
Clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
break;
+ case Clusters::GeneralDiagnostics::Id:
+ Clusters::GeneralDiagnostics::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+ break;
case Clusters::GroupKeyManagement::Id:
Clusters::GroupKeyManagement::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
break;
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 0a4aae8..fca68d9 100644
--- a/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h
@@ -90,7 +90,7 @@
#define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask
// This is an array of EmberAfAttributeMetadata structures.
-#define GENERATED_ATTRIBUTE_COUNT 190
+#define GENERATED_ATTRIBUTE_COUNT 191
#define GENERATED_ATTRIBUTES \
{ \
\
@@ -242,7 +242,9 @@
ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */ \
{ 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \
{ 0x00000007, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
- ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaults */ \
+ ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaults */ \
+ { 0x00000008, ZAP_TYPE(BOOLEAN), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
+ ZAP_EMPTY_DEFAULT() }, /* TestEventTriggersEnabled */ \
{ 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \
{ 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \
\
@@ -494,22 +496,26 @@
/* GeneratedCommandList (index=38)*/ \
0x00000001 /* RetrieveLogsResponse */, \
chip::kInvalidCommandId /* end of list */, \
- /* Endpoint: 0, Cluster: Software Diagnostics (server) */\
+ /* Endpoint: 0, Cluster: General Diagnostics (server) */\
/* AcceptedCommandList (index=40) */ \
+ 0x00000000 /* TestEventTrigger */, \
+ chip::kInvalidCommandId /* end of list */, \
+ /* Endpoint: 0, Cluster: Software Diagnostics (server) */\
+ /* AcceptedCommandList (index=42) */ \
0x00000000 /* ResetWatermarks */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */\
- /* AcceptedCommandList (index=42) */ \
+ /* AcceptedCommandList (index=44) */ \
0x00000000 /* ResetCounts */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 0, Cluster: AdministratorCommissioning (server) */\
- /* AcceptedCommandList (index=44) */ \
+ /* AcceptedCommandList (index=46) */ \
0x00000000 /* OpenCommissioningWindow */, \
0x00000001 /* OpenBasicCommissioningWindow */, \
0x00000002 /* RevokeCommissioning */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 0, Cluster: Operational Credentials (server) */\
- /* AcceptedCommandList (index=48) */ \
+ /* AcceptedCommandList (index=50) */ \
0x00000000 /* AttestationRequest */, \
0x00000002 /* CertificateChainRequest */, \
0x00000004 /* CSRRequest */, \
@@ -519,20 +525,20 @@
0x0000000A /* RemoveFabric */, \
0x0000000B /* AddTrustedRootCertificate */, \
chip::kInvalidCommandId /* end of list */, \
- /* GeneratedCommandList (index=57)*/ \
+ /* GeneratedCommandList (index=59)*/ \
0x00000001 /* AttestationResponse */, \
0x00000003 /* CertificateChainResponse */, \
0x00000005 /* CSRResponse */, \
0x00000008 /* NOCResponse */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 0, Cluster: Group Key Management (server) */\
- /* AcceptedCommandList (index=62) */ \
+ /* AcceptedCommandList (index=64) */ \
0x00000000 /* KeySetWrite */, \
0x00000001 /* KeySetRead */, \
0x00000003 /* KeySetRemove */, \
0x00000004 /* KeySetReadAllIndices */, \
chip::kInvalidCommandId /* end of list */, \
- /* GeneratedCommandList (index=67)*/ \
+ /* GeneratedCommandList (index=69)*/ \
0x00000002 /* KeySetReadResponse */, \
0x00000005 /* KeySetReadAllIndicesResponse */, \
chip::kInvalidCommandId /* end of list */, \
@@ -692,18 +698,7 @@
/* Endpoint: 0, Cluster: General Diagnostics (server) */ \
.clusterId = 0x00000033, \
.attributes = ZAP_ATTRIBUTE_INDEX(78), \
- .attributeCount = 10, \
- .clusterSize = 6, \
- .mask = ZAP_CLUSTER_MASK(SERVER), \
- .functions = NULL, \
- .acceptedCommandList = nullptr ,\
- .generatedCommandList = nullptr ,\
- },\
- { \
- /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \
- .clusterId = 0x00000034, \
- .attributes = ZAP_ATTRIBUTE_INDEX(88), \
- .attributeCount = 6, \
+ .attributeCount = 11, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
@@ -711,10 +706,10 @@
.generatedCommandList = nullptr ,\
},\
{ \
- /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \
- .clusterId = 0x00000035, \
- .attributes = ZAP_ATTRIBUTE_INDEX(94), \
- .attributeCount = 65, \
+ /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \
+ .clusterId = 0x00000034, \
+ .attributes = ZAP_ATTRIBUTE_INDEX(89), \
+ .attributeCount = 6, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
@@ -722,10 +717,10 @@
.generatedCommandList = nullptr ,\
},\
{ \
- /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \
- .clusterId = 0x0000003C, \
- .attributes = ZAP_ATTRIBUTE_INDEX(159), \
- .attributeCount = 5, \
+ /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \
+ .clusterId = 0x00000035, \
+ .attributes = ZAP_ATTRIBUTE_INDEX(95), \
+ .attributeCount = 65, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
@@ -733,31 +728,42 @@
.generatedCommandList = nullptr ,\
},\
{ \
+ /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \
+ .clusterId = 0x0000003C, \
+ .attributes = ZAP_ATTRIBUTE_INDEX(160), \
+ .attributeCount = 5, \
+ .clusterSize = 6, \
+ .mask = ZAP_CLUSTER_MASK(SERVER), \
+ .functions = NULL, \
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 46 ) ,\
+ .generatedCommandList = nullptr ,\
+ },\
+ { \
/* Endpoint: 0, Cluster: Operational Credentials (server) */ \
.clusterId = 0x0000003E, \
- .attributes = ZAP_ATTRIBUTE_INDEX(164), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(165), \
.attributeCount = 8, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 48 ) ,\
- .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 57 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 50 ) ,\
+ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 59 ) ,\
},\
{ \
/* Endpoint: 0, Cluster: Group Key Management (server) */ \
.clusterId = 0x0000003F, \
- .attributes = ZAP_ATTRIBUTE_INDEX(172), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(173), \
.attributeCount = 6, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 62 ) ,\
- .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 67 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 64 ) ,\
+ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 69 ) ,\
},\
{ \
/* Endpoint: 0, Cluster: Fixed Label (server) */ \
.clusterId = 0x00000040, \
- .attributes = ZAP_ATTRIBUTE_INDEX(178), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(179), \
.attributeCount = 3, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -768,7 +774,7 @@
{ \
/* Endpoint: 0, Cluster: User Label (server) */ \
.clusterId = 0x00000041, \
- .attributes = ZAP_ATTRIBUTE_INDEX(181), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(182), \
.attributeCount = 3, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -779,7 +785,7 @@
{ \
/* Endpoint: 1, Cluster: On/Off (client) */ \
.clusterId = 0x00000006, \
- .attributes = ZAP_ATTRIBUTE_INDEX(184), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(185), \
.attributeCount = 0, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -790,7 +796,7 @@
{ \
/* Endpoint: 1, Cluster: Descriptor (server) */ \
.clusterId = 0x0000001D, \
- .attributes = ZAP_ATTRIBUTE_INDEX(184), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(185), \
.attributeCount = 6, \
.clusterSize = 4, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -801,7 +807,7 @@
{ \
/* Endpoint: 1, Cluster: Pump Configuration and Control (client) */ \
.clusterId = 0x00000200, \
- .attributes = ZAP_ATTRIBUTE_INDEX(190), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(191), \
.attributeCount = 0, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -812,7 +818,7 @@
{ \
/* Endpoint: 1, Cluster: Temperature Measurement (client) */ \
.clusterId = 0x00000402, \
- .attributes = ZAP_ATTRIBUTE_INDEX(190), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(191), \
.attributeCount = 0, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -823,7 +829,7 @@
{ \
/* Endpoint: 1, Cluster: Pressure Measurement (client) */ \
.clusterId = 0x00000403, \
- .attributes = ZAP_ATTRIBUTE_INDEX(190), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(191), \
.attributeCount = 0, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -834,7 +840,7 @@
{ \
/* Endpoint: 1, Cluster: Flow Measurement (client) */ \
.clusterId = 0x00000404, \
- .attributes = ZAP_ATTRIBUTE_INDEX(190), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(191), \
.attributeCount = 0, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(CLIENT), \
diff --git a/zzz_generated/temperature-measurement-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/temperature-measurement-app/zap-generated/IMClusterCommandHandler.cpp
index fa18ffb..c357f8b 100644
--- a/zzz_generated/temperature-measurement-app/zap-generated/IMClusterCommandHandler.cpp
+++ b/zzz_generated/temperature-measurement-app/zap-generated/IMClusterCommandHandler.cpp
@@ -192,6 +192,43 @@
} // namespace GeneralCommissioning
+namespace GeneralDiagnostics {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+ CHIP_ERROR TLVError = CHIP_NO_ERROR;
+ bool wasHandled = false;
+ {
+ switch (aCommandPath.mCommandId)
+ {
+ case Commands::TestEventTrigger::Id: {
+ Commands::TestEventTrigger::DecodableType commandData;
+ TLVError = DataModel::Decode(aDataTlv, commandData);
+ if (TLVError == CHIP_NO_ERROR)
+ {
+ wasHandled = emberAfGeneralDiagnosticsClusterTestEventTriggerCallback(apCommandObj, aCommandPath, commandData);
+ }
+ break;
+ }
+ default: {
+ // Unrecognized command ID, error status will apply.
+ apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+ ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+ ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+ return;
+ }
+ }
+ }
+
+ if (CHIP_NO_ERROR != TLVError || !wasHandled)
+ {
+ apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+ ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+ }
+}
+
+} // namespace GeneralDiagnostics
+
namespace NetworkCommissioning {
void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
@@ -386,6 +423,9 @@
case Clusters::GeneralCommissioning::Id:
Clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
break;
+ case Clusters::GeneralDiagnostics::Id:
+ Clusters::GeneralDiagnostics::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+ break;
case Clusters::NetworkCommissioning::Id:
Clusters::NetworkCommissioning::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
break;
diff --git a/zzz_generated/temperature-measurement-app/zap-generated/endpoint_config.h b/zzz_generated/temperature-measurement-app/zap-generated/endpoint_config.h
index 79e84dd..9a03bf5 100644
--- a/zzz_generated/temperature-measurement-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/temperature-measurement-app/zap-generated/endpoint_config.h
@@ -90,7 +90,7 @@
#define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask
// This is an array of EmberAfAttributeMetadata structures.
-#define GENERATED_ATTRIBUTE_COUNT 135
+#define GENERATED_ATTRIBUTE_COUNT 136
#define GENERATED_ATTRIBUTES \
{ \
\
@@ -224,7 +224,9 @@
ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */ \
{ 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \
{ 0x00000007, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
- ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaults */ \
+ ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaults */ \
+ { 0x00000008, ZAP_TYPE(BOOLEAN), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
+ ZAP_EMPTY_DEFAULT() }, /* TestEventTriggersEnabled */ \
{ 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \
{ 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \
\
@@ -376,18 +378,22 @@
/* GeneratedCommandList (index=20)*/ \
0x00000001 /* RetrieveLogsResponse */, \
chip::kInvalidCommandId /* end of list */, \
- /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */\
+ /* Endpoint: 0, Cluster: General Diagnostics (server) */\
/* AcceptedCommandList (index=22) */ \
+ 0x00000000 /* TestEventTrigger */, \
+ chip::kInvalidCommandId /* end of list */, \
+ /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */\
+ /* AcceptedCommandList (index=24) */ \
0x00000000 /* ResetCounts */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 0, Cluster: AdministratorCommissioning (server) */\
- /* AcceptedCommandList (index=24) */ \
+ /* AcceptedCommandList (index=26) */ \
0x00000000 /* OpenCommissioningWindow */, \
0x00000001 /* OpenBasicCommissioningWindow */, \
0x00000002 /* RevokeCommissioning */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 0, Cluster: Operational Credentials (server) */\
- /* AcceptedCommandList (index=28) */ \
+ /* AcceptedCommandList (index=30) */ \
0x00000000 /* AttestationRequest */, \
0x00000002 /* CertificateChainRequest */, \
0x00000004 /* CSRRequest */, \
@@ -397,7 +403,7 @@
0x0000000A /* RemoveFabric */, \
0x0000000B /* AddTrustedRootCertificate */, \
chip::kInvalidCommandId /* end of list */, \
- /* GeneratedCommandList (index=37)*/ \
+ /* GeneratedCommandList (index=39)*/ \
0x00000001 /* AttestationResponse */, \
0x00000003 /* CertificateChainResponse */, \
0x00000005 /* CSRResponse */, \
@@ -515,17 +521,17 @@
/* Endpoint: 0, Cluster: General Diagnostics (server) */ \
.clusterId = 0x00000033, \
.attributes = ZAP_ATTRIBUTE_INDEX(66), \
- .attributeCount = 10, \
+ .attributeCount = 11, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
- .acceptedCommandList = nullptr ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 22 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
/* Endpoint: 0, Cluster: Software Diagnostics (server) */ \
.clusterId = 0x00000034, \
- .attributes = ZAP_ATTRIBUTE_INDEX(76), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(77), \
.attributeCount = 3, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -536,7 +542,7 @@
{ \
/* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \
.clusterId = 0x00000036, \
- .attributes = ZAP_ATTRIBUTE_INDEX(79), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(80), \
.attributeCount = 15, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -547,40 +553,40 @@
{ \
/* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \
.clusterId = 0x00000037, \
- .attributes = ZAP_ATTRIBUTE_INDEX(94), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(95), \
.attributeCount = 11, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 22 ) ,\
- .generatedCommandList = nullptr ,\
- },\
- { \
- /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \
- .clusterId = 0x0000003C, \
- .attributes = ZAP_ATTRIBUTE_INDEX(105), \
- .attributeCount = 5, \
- .clusterSize = 6, \
- .mask = ZAP_CLUSTER_MASK(SERVER), \
- .functions = NULL, \
.acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 24 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
+ /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \
+ .clusterId = 0x0000003C, \
+ .attributes = ZAP_ATTRIBUTE_INDEX(106), \
+ .attributeCount = 5, \
+ .clusterSize = 6, \
+ .mask = ZAP_CLUSTER_MASK(SERVER), \
+ .functions = NULL, \
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 26 ) ,\
+ .generatedCommandList = nullptr ,\
+ },\
+ { \
/* Endpoint: 0, Cluster: Operational Credentials (server) */ \
.clusterId = 0x0000003E, \
- .attributes = ZAP_ATTRIBUTE_INDEX(110), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(111), \
.attributeCount = 8, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 28 ) ,\
- .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 37 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 30 ) ,\
+ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 39 ) ,\
},\
{ \
/* Endpoint: 0, Cluster: Fixed Label (server) */ \
.clusterId = 0x00000040, \
- .attributes = ZAP_ATTRIBUTE_INDEX(118), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(119), \
.attributeCount = 3, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -591,7 +597,7 @@
{ \
/* Endpoint: 0, Cluster: User Label (server) */ \
.clusterId = 0x00000041, \
- .attributes = ZAP_ATTRIBUTE_INDEX(121), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(122), \
.attributeCount = 3, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -602,7 +608,7 @@
{ \
/* Endpoint: 1, Cluster: Descriptor (server) */ \
.clusterId = 0x0000001D, \
- .attributes = ZAP_ATTRIBUTE_INDEX(124), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(125), \
.attributeCount = 6, \
.clusterSize = 4, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -613,7 +619,7 @@
{ \
/* Endpoint: 1, Cluster: Temperature Measurement (server) */ \
.clusterId = 0x00000402, \
- .attributes = ZAP_ATTRIBUTE_INDEX(130), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(131), \
.attributeCount = 5, \
.clusterSize = 12, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
diff --git a/zzz_generated/thermostat/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/thermostat/zap-generated/IMClusterCommandHandler.cpp
index 321cb6a..3e268d6 100644
--- a/zzz_generated/thermostat/zap-generated/IMClusterCommandHandler.cpp
+++ b/zzz_generated/thermostat/zap-generated/IMClusterCommandHandler.cpp
@@ -192,6 +192,43 @@
} // namespace GeneralCommissioning
+namespace GeneralDiagnostics {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+ CHIP_ERROR TLVError = CHIP_NO_ERROR;
+ bool wasHandled = false;
+ {
+ switch (aCommandPath.mCommandId)
+ {
+ case Commands::TestEventTrigger::Id: {
+ Commands::TestEventTrigger::DecodableType commandData;
+ TLVError = DataModel::Decode(aDataTlv, commandData);
+ if (TLVError == CHIP_NO_ERROR)
+ {
+ wasHandled = emberAfGeneralDiagnosticsClusterTestEventTriggerCallback(apCommandObj, aCommandPath, commandData);
+ }
+ break;
+ }
+ default: {
+ // Unrecognized command ID, error status will apply.
+ apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+ ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+ ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+ return;
+ }
+ }
+ }
+
+ if (CHIP_NO_ERROR != TLVError || !wasHandled)
+ {
+ apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+ ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+ }
+}
+
+} // namespace GeneralDiagnostics
+
namespace Groups {
void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
@@ -727,6 +764,9 @@
case Clusters::GeneralCommissioning::Id:
Clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
break;
+ case Clusters::GeneralDiagnostics::Id:
+ Clusters::GeneralDiagnostics::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+ break;
case Clusters::Groups::Id:
Clusters::Groups::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
break;
diff --git a/zzz_generated/thermostat/zap-generated/endpoint_config.h b/zzz_generated/thermostat/zap-generated/endpoint_config.h
index fbf24a7..508a92f 100644
--- a/zzz_generated/thermostat/zap-generated/endpoint_config.h
+++ b/zzz_generated/thermostat/zap-generated/endpoint_config.h
@@ -101,7 +101,7 @@
#define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask
// This is an array of EmberAfAttributeMetadata structures.
-#define GENERATED_ATTRIBUTE_COUNT 259
+#define GENERATED_ATTRIBUTE_COUNT 260
#define GENERATED_ATTRIBUTES \
{ \
\
@@ -250,7 +250,9 @@
ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */ \
{ 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \
{ 0x00000007, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
- ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaults */ \
+ ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaults */ \
+ { 0x00000008, ZAP_TYPE(BOOLEAN), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
+ ZAP_EMPTY_DEFAULT() }, /* TestEventTriggersEnabled */ \
{ 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \
{ 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \
\
@@ -624,18 +626,22 @@
/* GeneratedCommandList (index=30)*/ \
0x00000001 /* RetrieveLogsResponse */, \
chip::kInvalidCommandId /* end of list */, \
- /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */\
+ /* Endpoint: 0, Cluster: General Diagnostics (server) */\
/* AcceptedCommandList (index=32) */ \
+ 0x00000000 /* TestEventTrigger */, \
+ chip::kInvalidCommandId /* end of list */, \
+ /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */\
+ /* AcceptedCommandList (index=34) */ \
0x00000000 /* ResetCounts */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 0, Cluster: AdministratorCommissioning (server) */\
- /* AcceptedCommandList (index=34) */ \
+ /* AcceptedCommandList (index=36) */ \
0x00000000 /* OpenCommissioningWindow */, \
0x00000001 /* OpenBasicCommissioningWindow */, \
0x00000002 /* RevokeCommissioning */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 0, Cluster: Operational Credentials (server) */\
- /* AcceptedCommandList (index=38) */ \
+ /* AcceptedCommandList (index=40) */ \
0x00000000 /* AttestationRequest */, \
0x00000002 /* CertificateChainRequest */, \
0x00000004 /* CSRRequest */, \
@@ -645,18 +651,18 @@
0x0000000A /* RemoveFabric */, \
0x0000000B /* AddTrustedRootCertificate */, \
chip::kInvalidCommandId /* end of list */, \
- /* GeneratedCommandList (index=47)*/ \
+ /* GeneratedCommandList (index=49)*/ \
0x00000001 /* AttestationResponse */, \
0x00000003 /* CertificateChainResponse */, \
0x00000005 /* CSRResponse */, \
0x00000008 /* NOCResponse */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 1, Cluster: Identify (server) */\
- /* AcceptedCommandList (index=52) */ \
+ /* AcceptedCommandList (index=54) */ \
0x00000000 /* Identify */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 1, Cluster: Groups (server) */\
- /* AcceptedCommandList (index=54) */ \
+ /* AcceptedCommandList (index=56) */ \
0x00000000 /* AddGroup */, \
0x00000001 /* ViewGroup */, \
0x00000002 /* GetGroupMembership */, \
@@ -664,14 +670,14 @@
0x00000004 /* RemoveAllGroups */, \
0x00000005 /* AddGroupIfIdentifying */, \
chip::kInvalidCommandId /* end of list */, \
- /* GeneratedCommandList (index=61)*/ \
+ /* GeneratedCommandList (index=63)*/ \
0x00000000 /* AddGroupResponse */, \
0x00000001 /* ViewGroupResponse */, \
0x00000002 /* GetGroupMembershipResponse */, \
0x00000003 /* RemoveGroupResponse */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 1, Cluster: Scenes (server) */\
- /* AcceptedCommandList (index=66) */ \
+ /* AcceptedCommandList (index=68) */ \
0x00000000 /* AddScene */, \
0x00000001 /* ViewScene */, \
0x00000002 /* RemoveScene */, \
@@ -680,7 +686,7 @@
0x00000005 /* RecallScene */, \
0x00000006 /* GetSceneMembership */, \
chip::kInvalidCommandId /* end of list */, \
- /* GeneratedCommandList (index=74)*/ \
+ /* GeneratedCommandList (index=76)*/ \
0x00000000 /* AddSceneResponse */, \
0x00000001 /* ViewSceneResponse */, \
0x00000002 /* RemoveSceneResponse */, \
@@ -689,13 +695,13 @@
0x00000006 /* GetSceneMembershipResponse */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 1, Cluster: Thermostat (server) */\
- /* AcceptedCommandList (index=81) */ \
+ /* AcceptedCommandList (index=83) */ \
0x00000000 /* SetpointRaiseLower */, \
0x00000001 /* SetWeeklySchedule */, \
0x00000002 /* GetWeeklySchedule */, \
0x00000003 /* ClearWeeklySchedule */, \
chip::kInvalidCommandId /* end of list */, \
- /* GeneratedCommandList (index=86)*/ \
+ /* GeneratedCommandList (index=88)*/ \
0x00000000 /* GetWeeklyScheduleResponse */, \
chip::kInvalidCommandId /* end of list */, \
}
@@ -843,17 +849,17 @@
/* Endpoint: 0, Cluster: General Diagnostics (server) */ \
.clusterId = 0x00000033, \
.attributes = ZAP_ATTRIBUTE_INDEX(74), \
- .attributeCount = 10, \
+ .attributeCount = 11, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
- .acceptedCommandList = nullptr ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 32 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
/* Endpoint: 0, Cluster: Software Diagnostics (server) */ \
.clusterId = 0x00000034, \
- .attributes = ZAP_ATTRIBUTE_INDEX(84), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(85), \
.attributeCount = 6, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -864,7 +870,7 @@
{ \
/* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \
.clusterId = 0x00000035, \
- .attributes = ZAP_ATTRIBUTE_INDEX(90), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(91), \
.attributeCount = 65, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -875,7 +881,7 @@
{ \
/* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \
.clusterId = 0x00000036, \
- .attributes = ZAP_ATTRIBUTE_INDEX(155), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(156), \
.attributeCount = 15, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -886,40 +892,40 @@
{ \
/* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \
.clusterId = 0x00000037, \
- .attributes = ZAP_ATTRIBUTE_INDEX(170), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(171), \
.attributeCount = 11, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 32 ) ,\
- .generatedCommandList = nullptr ,\
- },\
- { \
- /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \
- .clusterId = 0x0000003C, \
- .attributes = ZAP_ATTRIBUTE_INDEX(181), \
- .attributeCount = 5, \
- .clusterSize = 6, \
- .mask = ZAP_CLUSTER_MASK(SERVER), \
- .functions = NULL, \
.acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 34 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
+ /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \
+ .clusterId = 0x0000003C, \
+ .attributes = ZAP_ATTRIBUTE_INDEX(182), \
+ .attributeCount = 5, \
+ .clusterSize = 6, \
+ .mask = ZAP_CLUSTER_MASK(SERVER), \
+ .functions = NULL, \
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 36 ) ,\
+ .generatedCommandList = nullptr ,\
+ },\
+ { \
/* Endpoint: 0, Cluster: Operational Credentials (server) */ \
.clusterId = 0x0000003E, \
- .attributes = ZAP_ATTRIBUTE_INDEX(186), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(187), \
.attributeCount = 8, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 38 ) ,\
- .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 47 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 40 ) ,\
+ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 49 ) ,\
},\
{ \
/* Endpoint: 0, Cluster: Group Key Management (server) */ \
.clusterId = 0x0000003F, \
- .attributes = ZAP_ATTRIBUTE_INDEX(194), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(195), \
.attributeCount = 4, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -930,7 +936,7 @@
{ \
/* Endpoint: 0, Cluster: Fixed Label (server) */ \
.clusterId = 0x00000040, \
- .attributes = ZAP_ATTRIBUTE_INDEX(198), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(199), \
.attributeCount = 3, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -941,7 +947,7 @@
{ \
/* Endpoint: 0, Cluster: User Label (server) */ \
.clusterId = 0x00000041, \
- .attributes = ZAP_ATTRIBUTE_INDEX(201), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(202), \
.attributeCount = 3, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -952,7 +958,7 @@
{ \
/* Endpoint: 1, Cluster: Identify (client) */ \
.clusterId = 0x00000003, \
- .attributes = ZAP_ATTRIBUTE_INDEX(204), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(205), \
.attributeCount = 0, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -963,40 +969,40 @@
{ \
/* Endpoint: 1, Cluster: Identify (server) */ \
.clusterId = 0x00000003, \
- .attributes = ZAP_ATTRIBUTE_INDEX(204), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(205), \
.attributeCount = 4, \
.clusterSize = 9, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \
.functions = chipFuncArrayIdentifyServer, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 52 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 54 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
/* Endpoint: 1, Cluster: Groups (server) */ \
.clusterId = 0x00000004, \
- .attributes = ZAP_ATTRIBUTE_INDEX(208), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(209), \
.attributeCount = 3, \
.clusterSize = 7, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
.functions = chipFuncArrayGroupsServer, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 54 ) ,\
- .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 61 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 56 ) ,\
+ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 63 ) ,\
},\
{ \
/* Endpoint: 1, Cluster: Scenes (server) */ \
.clusterId = 0x00000005, \
- .attributes = ZAP_ATTRIBUTE_INDEX(211), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(212), \
.attributeCount = 7, \
.clusterSize = 12, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
.functions = chipFuncArrayScenesServer, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 66 ) ,\
- .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 74 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 68 ) ,\
+ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 76 ) ,\
},\
{ \
/* Endpoint: 1, Cluster: Basic (server) */ \
.clusterId = 0x00000028, \
- .attributes = ZAP_ATTRIBUTE_INDEX(218), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(219), \
.attributeCount = 22, \
.clusterSize = 41, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
@@ -1007,13 +1013,13 @@
{ \
/* Endpoint: 1, Cluster: Thermostat (server) */ \
.clusterId = 0x00000201, \
- .attributes = ZAP_ATTRIBUTE_INDEX(240), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(241), \
.attributeCount = 19, \
.clusterSize = 34, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \
.functions = chipFuncArrayThermostatServer, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 81 ) ,\
- .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 86 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 83 ) ,\
+ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 88 ) ,\
},\
}
diff --git a/zzz_generated/tv-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/tv-app/zap-generated/IMClusterCommandHandler.cpp
index 4b2d44d..05bc5e0 100644
--- a/zzz_generated/tv-app/zap-generated/IMClusterCommandHandler.cpp
+++ b/zzz_generated/tv-app/zap-generated/IMClusterCommandHandler.cpp
@@ -449,6 +449,43 @@
} // namespace GeneralCommissioning
+namespace GeneralDiagnostics {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+ CHIP_ERROR TLVError = CHIP_NO_ERROR;
+ bool wasHandled = false;
+ {
+ switch (aCommandPath.mCommandId)
+ {
+ case Commands::TestEventTrigger::Id: {
+ Commands::TestEventTrigger::DecodableType commandData;
+ TLVError = DataModel::Decode(aDataTlv, commandData);
+ if (TLVError == CHIP_NO_ERROR)
+ {
+ wasHandled = emberAfGeneralDiagnosticsClusterTestEventTriggerCallback(apCommandObj, aCommandPath, commandData);
+ }
+ break;
+ }
+ default: {
+ // Unrecognized command ID, error status will apply.
+ apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+ ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+ ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+ return;
+ }
+ }
+ }
+
+ if (CHIP_NO_ERROR != TLVError || !wasHandled)
+ {
+ apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+ ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+ }
+}
+
+} // namespace GeneralDiagnostics
+
namespace KeypadInput {
void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
@@ -1182,6 +1219,9 @@
case Clusters::GeneralCommissioning::Id:
Clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
break;
+ case Clusters::GeneralDiagnostics::Id:
+ Clusters::GeneralDiagnostics::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+ break;
case Clusters::KeypadInput::Id:
Clusters::KeypadInput::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
break;
diff --git a/zzz_generated/tv-app/zap-generated/endpoint_config.h b/zzz_generated/tv-app/zap-generated/endpoint_config.h
index 1c4b890..770e5b3 100644
--- a/zzz_generated/tv-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/tv-app/zap-generated/endpoint_config.h
@@ -146,7 +146,7 @@
#define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask
// This is an array of EmberAfAttributeMetadata structures.
-#define GENERATED_ATTRIBUTE_COUNT 347
+#define GENERATED_ATTRIBUTE_COUNT 348
#define GENERATED_ATTRIBUTES \
{ \
\
@@ -290,7 +290,9 @@
ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */ \
{ 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \
{ 0x00000007, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
- ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaults */ \
+ ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaults */ \
+ { 0x00000008, ZAP_TYPE(BOOLEAN), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
+ ZAP_EMPTY_DEFAULT() }, /* TestEventTriggersEnabled */ \
{ 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \
{ 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \
\
@@ -772,18 +774,22 @@
/* GeneratedCommandList (index=28)*/ \
0x00000001 /* RetrieveLogsResponse */, \
chip::kInvalidCommandId /* end of list */, \
- /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */\
+ /* Endpoint: 0, Cluster: General Diagnostics (server) */\
/* AcceptedCommandList (index=30) */ \
+ 0x00000000 /* TestEventTrigger */, \
+ chip::kInvalidCommandId /* end of list */, \
+ /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */\
+ /* AcceptedCommandList (index=32) */ \
0x00000000 /* ResetCounts */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 0, Cluster: AdministratorCommissioning (server) */\
- /* AcceptedCommandList (index=32) */ \
+ /* AcceptedCommandList (index=34) */ \
0x00000000 /* OpenCommissioningWindow */, \
0x00000001 /* OpenBasicCommissioningWindow */, \
0x00000002 /* RevokeCommissioning */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 0, Cluster: Operational Credentials (server) */\
- /* AcceptedCommandList (index=36) */ \
+ /* AcceptedCommandList (index=38) */ \
0x00000000 /* AttestationRequest */, \
0x00000002 /* CertificateChainRequest */, \
0x00000004 /* CSRRequest */, \
@@ -793,36 +799,36 @@
0x0000000A /* RemoveFabric */, \
0x0000000B /* AddTrustedRootCertificate */, \
chip::kInvalidCommandId /* end of list */, \
- /* GeneratedCommandList (index=45)*/ \
+ /* GeneratedCommandList (index=47)*/ \
0x00000001 /* AttestationResponse */, \
0x00000003 /* CertificateChainResponse */, \
0x00000005 /* CSRResponse */, \
0x00000008 /* NOCResponse */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 1, Cluster: On/Off (server) */\
- /* AcceptedCommandList (index=50) */ \
+ /* AcceptedCommandList (index=52) */ \
0x00000000 /* Off */, \
0x00000001 /* On */, \
0x00000002 /* Toggle */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 1, Cluster: Channel (server) */\
- /* AcceptedCommandList (index=54) */ \
+ /* AcceptedCommandList (index=56) */ \
0x00000000 /* ChangeChannel */, \
0x00000002 /* ChangeChannelByNumber */, \
0x00000003 /* SkipChannel */, \
chip::kInvalidCommandId /* end of list */, \
- /* GeneratedCommandList (index=58)*/ \
+ /* GeneratedCommandList (index=60)*/ \
0x00000001 /* ChangeChannelResponse */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 1, Cluster: Target Navigator (server) */\
- /* AcceptedCommandList (index=60) */ \
+ /* AcceptedCommandList (index=62) */ \
0x00000000 /* NavigateTarget */, \
chip::kInvalidCommandId /* end of list */, \
- /* GeneratedCommandList (index=62)*/ \
+ /* GeneratedCommandList (index=64)*/ \
0x00000001 /* NavigateTargetResponse */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 1, Cluster: Media Playback (server) */\
- /* AcceptedCommandList (index=64) */ \
+ /* AcceptedCommandList (index=66) */ \
0x00000000 /* Play */, \
0x00000001 /* Pause */, \
0x00000002 /* StopPlayback */, \
@@ -835,57 +841,57 @@
0x00000009 /* SkipBackward */, \
0x0000000B /* Seek */, \
chip::kInvalidCommandId /* end of list */, \
- /* GeneratedCommandList (index=76)*/ \
+ /* GeneratedCommandList (index=78)*/ \
0x0000000A /* PlaybackResponse */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 1, Cluster: Media Input (server) */\
- /* AcceptedCommandList (index=78) */ \
+ /* AcceptedCommandList (index=80) */ \
0x00000000 /* SelectInput */, \
0x00000001 /* ShowInputStatus */, \
0x00000002 /* HideInputStatus */, \
0x00000003 /* RenameInput */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 1, Cluster: Low Power (server) */\
- /* AcceptedCommandList (index=83) */ \
+ /* AcceptedCommandList (index=85) */ \
0x00000000 /* Sleep */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 1, Cluster: Keypad Input (server) */\
- /* AcceptedCommandList (index=85) */ \
+ /* AcceptedCommandList (index=87) */ \
0x00000000 /* SendKey */, \
chip::kInvalidCommandId /* end of list */, \
- /* GeneratedCommandList (index=87)*/ \
+ /* GeneratedCommandList (index=89)*/ \
0x00000001 /* SendKeyResponse */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 1, Cluster: Content Launcher (server) */\
- /* AcceptedCommandList (index=89) */ \
+ /* AcceptedCommandList (index=91) */ \
0x00000000 /* LaunchContent */, \
0x00000001 /* LaunchURL */, \
chip::kInvalidCommandId /* end of list */, \
- /* GeneratedCommandList (index=92)*/ \
+ /* GeneratedCommandList (index=94)*/ \
0x00000002 /* LaunchResponse */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 1, Cluster: Audio Output (server) */\
- /* AcceptedCommandList (index=94) */ \
+ /* AcceptedCommandList (index=96) */ \
0x00000000 /* SelectOutput */, \
0x00000001 /* RenameOutput */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 1, Cluster: Application Launcher (server) */\
- /* AcceptedCommandList (index=97) */ \
+ /* AcceptedCommandList (index=99) */ \
0x00000000 /* LaunchApp */, \
0x00000001 /* StopApp */, \
0x00000002 /* HideApp */, \
chip::kInvalidCommandId /* end of list */, \
- /* GeneratedCommandList (index=101)*/ \
+ /* GeneratedCommandList (index=103)*/ \
0x00000003 /* LauncherResponse */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 2, Cluster: On/Off (server) */\
- /* AcceptedCommandList (index=103) */ \
+ /* AcceptedCommandList (index=105) */ \
0x00000000 /* Off */, \
0x00000001 /* On */, \
0x00000002 /* Toggle */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 2, Cluster: Level Control (server) */\
- /* AcceptedCommandList (index=107) */ \
+ /* AcceptedCommandList (index=109) */ \
0x00000000 /* MoveToLevel */, \
0x00000001 /* Move */, \
0x00000002 /* Step */, \
@@ -896,7 +902,7 @@
0x00000007 /* StopWithOnOff */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 3, Cluster: Media Playback (server) */\
- /* AcceptedCommandList (index=116) */ \
+ /* AcceptedCommandList (index=118) */ \
0x00000000 /* Play */, \
0x00000001 /* Pause */, \
0x00000002 /* StopPlayback */, \
@@ -909,32 +915,32 @@
0x00000009 /* SkipBackward */, \
0x0000000B /* Seek */, \
chip::kInvalidCommandId /* end of list */, \
- /* GeneratedCommandList (index=128)*/ \
+ /* GeneratedCommandList (index=130)*/ \
0x0000000A /* PlaybackResponse */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 3, Cluster: Content Launcher (server) */\
- /* AcceptedCommandList (index=130) */ \
+ /* AcceptedCommandList (index=132) */ \
0x00000000 /* LaunchContent */, \
0x00000001 /* LaunchURL */, \
chip::kInvalidCommandId /* end of list */, \
- /* GeneratedCommandList (index=133)*/ \
+ /* GeneratedCommandList (index=135)*/ \
0x00000002 /* LaunchResponse */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 3, Cluster: Account Login (server) */\
- /* AcceptedCommandList (index=135) */ \
+ /* AcceptedCommandList (index=137) */ \
0x00000000 /* GetSetupPIN */, \
0x00000002 /* Login */, \
0x00000003 /* Logout */, \
chip::kInvalidCommandId /* end of list */, \
- /* GeneratedCommandList (index=139)*/ \
+ /* GeneratedCommandList (index=141)*/ \
0x00000001 /* GetSetupPINResponse */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 4, Cluster: Content Launcher (server) */\
- /* AcceptedCommandList (index=141) */ \
+ /* AcceptedCommandList (index=143) */ \
0x00000000 /* LaunchContent */, \
0x00000001 /* LaunchURL */, \
chip::kInvalidCommandId /* end of list */, \
- /* GeneratedCommandList (index=144)*/ \
+ /* GeneratedCommandList (index=146)*/ \
0x00000002 /* LaunchResponse */, \
chip::kInvalidCommandId /* end of list */, \
}
@@ -1104,17 +1110,17 @@
/* Endpoint: 0, Cluster: General Diagnostics (server) */ \
.clusterId = 0x00000033, \
.attributes = ZAP_ATTRIBUTE_INDEX(71), \
- .attributeCount = 10, \
+ .attributeCount = 11, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
- .acceptedCommandList = nullptr ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 30 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
/* Endpoint: 0, Cluster: Software Diagnostics (server) */ \
.clusterId = 0x00000034, \
- .attributes = ZAP_ATTRIBUTE_INDEX(81), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(82), \
.attributeCount = 6, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1125,7 +1131,7 @@
{ \
/* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \
.clusterId = 0x00000035, \
- .attributes = ZAP_ATTRIBUTE_INDEX(87), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(88), \
.attributeCount = 65, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1136,7 +1142,7 @@
{ \
/* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \
.clusterId = 0x00000036, \
- .attributes = ZAP_ATTRIBUTE_INDEX(152), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(153), \
.attributeCount = 15, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1147,29 +1153,29 @@
{ \
/* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \
.clusterId = 0x00000037, \
- .attributes = ZAP_ATTRIBUTE_INDEX(167), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(168), \
.attributeCount = 11, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 30 ) ,\
- .generatedCommandList = nullptr ,\
- },\
- { \
- /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \
- .clusterId = 0x0000003C, \
- .attributes = ZAP_ATTRIBUTE_INDEX(178), \
- .attributeCount = 5, \
- .clusterSize = 6, \
- .mask = ZAP_CLUSTER_MASK(SERVER), \
- .functions = NULL, \
.acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 32 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
+ /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \
+ .clusterId = 0x0000003C, \
+ .attributes = ZAP_ATTRIBUTE_INDEX(179), \
+ .attributeCount = 5, \
+ .clusterSize = 6, \
+ .mask = ZAP_CLUSTER_MASK(SERVER), \
+ .functions = NULL, \
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 34 ) ,\
+ .generatedCommandList = nullptr ,\
+ },\
+ { \
/* Endpoint: 0, Cluster: Operational Credentials (client) */ \
.clusterId = 0x0000003E, \
- .attributes = ZAP_ATTRIBUTE_INDEX(183), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(184), \
.attributeCount = 0, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1180,18 +1186,18 @@
{ \
/* Endpoint: 0, Cluster: Operational Credentials (server) */ \
.clusterId = 0x0000003E, \
- .attributes = ZAP_ATTRIBUTE_INDEX(183), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(184), \
.attributeCount = 8, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 36 ) ,\
- .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 45 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 38 ) ,\
+ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 47 ) ,\
},\
{ \
/* Endpoint: 0, Cluster: Group Key Management (server) */ \
.clusterId = 0x0000003F, \
- .attributes = ZAP_ATTRIBUTE_INDEX(191), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(192), \
.attributeCount = 4, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1202,7 +1208,7 @@
{ \
/* Endpoint: 0, Cluster: Fixed Label (server) */ \
.clusterId = 0x00000040, \
- .attributes = ZAP_ATTRIBUTE_INDEX(195), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(196), \
.attributeCount = 3, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1213,7 +1219,7 @@
{ \
/* Endpoint: 0, Cluster: User Label (server) */ \
.clusterId = 0x00000041, \
- .attributes = ZAP_ATTRIBUTE_INDEX(198), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(199), \
.attributeCount = 3, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1224,7 +1230,7 @@
{ \
/* Endpoint: 0, Cluster: Relative Humidity Measurement (server) */ \
.clusterId = 0x00000405, \
- .attributes = ZAP_ATTRIBUTE_INDEX(201), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(202), \
.attributeCount = 5, \
.clusterSize = 12, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1235,18 +1241,18 @@
{ \
/* Endpoint: 1, Cluster: On/Off (server) */ \
.clusterId = 0x00000006, \
- .attributes = ZAP_ATTRIBUTE_INDEX(206), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(207), \
.attributeCount = 3, \
.clusterSize = 7, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
.functions = chipFuncArrayOnOffServer, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 50 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 52 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
/* Endpoint: 1, Cluster: Descriptor (server) */ \
.clusterId = 0x0000001D, \
- .attributes = ZAP_ATTRIBUTE_INDEX(209), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(210), \
.attributeCount = 6, \
.clusterSize = 4, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1257,7 +1263,7 @@
{ \
/* Endpoint: 1, Cluster: Wake on LAN (server) */ \
.clusterId = 0x00000503, \
- .attributes = ZAP_ATTRIBUTE_INDEX(215), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(216), \
.attributeCount = 3, \
.clusterSize = 39, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1268,128 +1274,128 @@
{ \
/* Endpoint: 1, Cluster: Channel (server) */ \
.clusterId = 0x00000504, \
- .attributes = ZAP_ATTRIBUTE_INDEX(218), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(219), \
.attributeCount = 5, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 54 ) ,\
- .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 58 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 56 ) ,\
+ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 60 ) ,\
},\
{ \
/* Endpoint: 1, Cluster: Target Navigator (server) */ \
.clusterId = 0x00000505, \
- .attributes = ZAP_ATTRIBUTE_INDEX(223), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(224), \
.attributeCount = 4, \
.clusterSize = 7, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 60 ) ,\
- .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 62 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 62 ) ,\
+ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 64 ) ,\
},\
{ \
/* Endpoint: 1, Cluster: Media Playback (server) */ \
.clusterId = 0x00000506, \
- .attributes = ZAP_ATTRIBUTE_INDEX(227), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(228), \
.attributeCount = 9, \
.clusterSize = 43, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 64 ) ,\
- .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 76 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 66 ) ,\
+ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 78 ) ,\
},\
{ \
/* Endpoint: 1, Cluster: Media Input (server) */ \
.clusterId = 0x00000507, \
- .attributes = ZAP_ATTRIBUTE_INDEX(236), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(237), \
.attributeCount = 4, \
.clusterSize = 7, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 78 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 80 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
/* Endpoint: 1, Cluster: Low Power (server) */ \
.clusterId = 0x00000508, \
- .attributes = ZAP_ATTRIBUTE_INDEX(240), \
- .attributeCount = 2, \
- .clusterSize = 6, \
- .mask = ZAP_CLUSTER_MASK(SERVER), \
- .functions = NULL, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 83 ) ,\
- .generatedCommandList = nullptr ,\
- },\
- { \
- /* Endpoint: 1, Cluster: Keypad Input (server) */ \
- .clusterId = 0x00000509, \
- .attributes = ZAP_ATTRIBUTE_INDEX(242), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(241), \
.attributeCount = 2, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
.acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 85 ) ,\
- .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 87 ) ,\
+ .generatedCommandList = nullptr ,\
+ },\
+ { \
+ /* Endpoint: 1, Cluster: Keypad Input (server) */ \
+ .clusterId = 0x00000509, \
+ .attributes = ZAP_ATTRIBUTE_INDEX(243), \
+ .attributeCount = 2, \
+ .clusterSize = 6, \
+ .mask = ZAP_CLUSTER_MASK(SERVER), \
+ .functions = NULL, \
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 87 ) ,\
+ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 89 ) ,\
},\
{ \
/* Endpoint: 1, Cluster: Content Launcher (server) */ \
.clusterId = 0x0000050A, \
- .attributes = ZAP_ATTRIBUTE_INDEX(244), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(245), \
.attributeCount = 4, \
.clusterSize = 10, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 89 ) ,\
- .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 92 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 91 ) ,\
+ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 94 ) ,\
},\
{ \
/* Endpoint: 1, Cluster: Audio Output (server) */ \
.clusterId = 0x0000050B, \
- .attributes = ZAP_ATTRIBUTE_INDEX(248), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(249), \
.attributeCount = 4, \
.clusterSize = 7, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 94 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 96 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
/* Endpoint: 1, Cluster: Application Launcher (server) */ \
.clusterId = 0x0000050C, \
- .attributes = ZAP_ATTRIBUTE_INDEX(252), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(253), \
.attributeCount = 4, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 97 ) ,\
- .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 101 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 99 ) ,\
+ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 103 ) ,\
},\
{ \
/* Endpoint: 2, Cluster: On/Off (server) */ \
.clusterId = 0x00000006, \
- .attributes = ZAP_ATTRIBUTE_INDEX(256), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(257), \
.attributeCount = 3, \
.clusterSize = 7, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
.functions = chipFuncArrayOnOffServer, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 103 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 105 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
/* Endpoint: 2, Cluster: Level Control (server) */ \
.clusterId = 0x00000008, \
- .attributes = ZAP_ATTRIBUTE_INDEX(259), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(260), \
.attributeCount = 16, \
.clusterSize = 27, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
.functions = chipFuncArrayLevelControlServer, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 107 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 109 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
/* Endpoint: 2, Cluster: Descriptor (server) */ \
.clusterId = 0x0000001D, \
- .attributes = ZAP_ATTRIBUTE_INDEX(275), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(276), \
.attributeCount = 6, \
.clusterSize = 4, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1400,7 +1406,7 @@
{ \
/* Endpoint: 3, Cluster: Descriptor (server) */ \
.clusterId = 0x0000001D, \
- .attributes = ZAP_ATTRIBUTE_INDEX(281), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(282), \
.attributeCount = 6, \
.clusterSize = 4, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1411,29 +1417,29 @@
{ \
/* Endpoint: 3, Cluster: Media Playback (server) */ \
.clusterId = 0x00000506, \
- .attributes = ZAP_ATTRIBUTE_INDEX(287), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(288), \
.attributeCount = 9, \
.clusterSize = 43, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 116 ) ,\
- .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 128 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 118 ) ,\
+ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 130 ) ,\
},\
{ \
/* Endpoint: 3, Cluster: Content Launcher (server) */ \
.clusterId = 0x0000050A, \
- .attributes = ZAP_ATTRIBUTE_INDEX(296), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(297), \
.attributeCount = 4, \
.clusterSize = 10, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 130 ) ,\
- .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 133 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 132 ) ,\
+ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 135 ) ,\
},\
{ \
/* Endpoint: 3, Cluster: Application Basic (server) */ \
.clusterId = 0x0000050D, \
- .attributes = ZAP_ATTRIBUTE_INDEX(300), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(301), \
.attributeCount = 10, \
.clusterSize = 110, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1444,18 +1450,18 @@
{ \
/* Endpoint: 3, Cluster: Account Login (server) */ \
.clusterId = 0x0000050E, \
- .attributes = ZAP_ATTRIBUTE_INDEX(310), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(311), \
.attributeCount = 2, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 135 ) ,\
- .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 139 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 137 ) ,\
+ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 141 ) ,\
},\
{ \
/* Endpoint: 4, Cluster: Descriptor (server) */ \
.clusterId = 0x0000001D, \
- .attributes = ZAP_ATTRIBUTE_INDEX(312), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(313), \
.attributeCount = 6, \
.clusterSize = 4, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1466,18 +1472,18 @@
{ \
/* Endpoint: 4, Cluster: Content Launcher (server) */ \
.clusterId = 0x0000050A, \
- .attributes = ZAP_ATTRIBUTE_INDEX(318), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(319), \
.attributeCount = 4, \
.clusterSize = 10, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 141 ) ,\
- .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 144 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 143 ) ,\
+ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 146 ) ,\
},\
{ \
/* Endpoint: 4, Cluster: Application Basic (server) */ \
.clusterId = 0x0000050D, \
- .attributes = ZAP_ATTRIBUTE_INDEX(322), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(323), \
.attributeCount = 10, \
.clusterSize = 110, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1488,7 +1494,7 @@
{ \
/* Endpoint: 5, Cluster: Descriptor (server) */ \
.clusterId = 0x0000001D, \
- .attributes = ZAP_ATTRIBUTE_INDEX(332), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(333), \
.attributeCount = 6, \
.clusterSize = 4, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1499,7 +1505,7 @@
{ \
/* Endpoint: 5, Cluster: Application Basic (server) */ \
.clusterId = 0x0000050D, \
- .attributes = ZAP_ATTRIBUTE_INDEX(338), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(339), \
.attributeCount = 9, \
.clusterSize = 110, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
diff --git a/zzz_generated/tv-casting-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/tv-casting-app/zap-generated/IMClusterCommandHandler.cpp
index 3c1dcb9..64d7908 100644
--- a/zzz_generated/tv-casting-app/zap-generated/IMClusterCommandHandler.cpp
+++ b/zzz_generated/tv-casting-app/zap-generated/IMClusterCommandHandler.cpp
@@ -238,6 +238,43 @@
} // namespace GeneralCommissioning
+namespace GeneralDiagnostics {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+ CHIP_ERROR TLVError = CHIP_NO_ERROR;
+ bool wasHandled = false;
+ {
+ switch (aCommandPath.mCommandId)
+ {
+ case Commands::TestEventTrigger::Id: {
+ Commands::TestEventTrigger::DecodableType commandData;
+ TLVError = DataModel::Decode(aDataTlv, commandData);
+ if (TLVError == CHIP_NO_ERROR)
+ {
+ wasHandled = emberAfGeneralDiagnosticsClusterTestEventTriggerCallback(apCommandObj, aCommandPath, commandData);
+ }
+ break;
+ }
+ default: {
+ // Unrecognized command ID, error status will apply.
+ apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+ ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+ ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+ return;
+ }
+ }
+ }
+
+ if (CHIP_NO_ERROR != TLVError || !wasHandled)
+ {
+ apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+ ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+ }
+}
+
+} // namespace GeneralDiagnostics
+
namespace Groups {
void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
@@ -950,6 +987,9 @@
case Clusters::GeneralCommissioning::Id:
Clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
break;
+ case Clusters::GeneralDiagnostics::Id:
+ Clusters::GeneralDiagnostics::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+ break;
case Clusters::Groups::Id:
Clusters::Groups::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
break;
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 a27f5a0..aeb51d1 100644
--- a/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h
@@ -131,7 +131,7 @@
#define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask
// This is an array of EmberAfAttributeMetadata structures.
-#define GENERATED_ATTRIBUTE_COUNT 305
+#define GENERATED_ATTRIBUTE_COUNT 306
#define GENERATED_ATTRIBUTES \
{ \
\
@@ -275,7 +275,9 @@
ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */ \
{ 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \
{ 0x00000007, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
- ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaults */ \
+ ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaults */ \
+ { 0x00000008, ZAP_TYPE(BOOLEAN), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
+ ZAP_EMPTY_DEFAULT() }, /* TestEventTriggersEnabled */ \
{ 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \
{ 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \
\
@@ -709,18 +711,22 @@
/* GeneratedCommandList (index=28)*/ \
0x00000001 /* RetrieveLogsResponse */, \
chip::kInvalidCommandId /* end of list */, \
- /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */\
+ /* Endpoint: 0, Cluster: General Diagnostics (server) */\
/* AcceptedCommandList (index=30) */ \
+ 0x00000000 /* TestEventTrigger */, \
+ chip::kInvalidCommandId /* end of list */, \
+ /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */\
+ /* AcceptedCommandList (index=32) */ \
0x00000000 /* ResetCounts */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 0, Cluster: AdministratorCommissioning (server) */\
- /* AcceptedCommandList (index=32) */ \
+ /* AcceptedCommandList (index=34) */ \
0x00000000 /* OpenCommissioningWindow */, \
0x00000001 /* OpenBasicCommissioningWindow */, \
0x00000002 /* RevokeCommissioning */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 0, Cluster: Operational Credentials (server) */\
- /* AcceptedCommandList (index=36) */ \
+ /* AcceptedCommandList (index=38) */ \
0x00000000 /* AttestationRequest */, \
0x00000002 /* CertificateChainRequest */, \
0x00000004 /* CSRRequest */, \
@@ -730,18 +736,18 @@
0x0000000A /* RemoveFabric */, \
0x0000000B /* AddTrustedRootCertificate */, \
chip::kInvalidCommandId /* end of list */, \
- /* GeneratedCommandList (index=45)*/ \
+ /* GeneratedCommandList (index=47)*/ \
0x00000001 /* AttestationResponse */, \
0x00000003 /* CertificateChainResponse */, \
0x00000005 /* CSRResponse */, \
0x00000008 /* NOCResponse */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 1, Cluster: Identify (server) */\
- /* AcceptedCommandList (index=50) */ \
+ /* AcceptedCommandList (index=52) */ \
0x00000000 /* Identify */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 1, Cluster: Groups (server) */\
- /* AcceptedCommandList (index=52) */ \
+ /* AcceptedCommandList (index=54) */ \
0x00000000 /* AddGroup */, \
0x00000001 /* ViewGroup */, \
0x00000002 /* GetGroupMembership */, \
@@ -749,14 +755,14 @@
0x00000004 /* RemoveAllGroups */, \
0x00000005 /* AddGroupIfIdentifying */, \
chip::kInvalidCommandId /* end of list */, \
- /* GeneratedCommandList (index=59)*/ \
+ /* GeneratedCommandList (index=61)*/ \
0x00000000 /* AddGroupResponse */, \
0x00000001 /* ViewGroupResponse */, \
0x00000002 /* GetGroupMembershipResponse */, \
0x00000003 /* RemoveGroupResponse */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 1, Cluster: Scenes (server) */\
- /* AcceptedCommandList (index=64) */ \
+ /* AcceptedCommandList (index=66) */ \
0x00000000 /* AddScene */, \
0x00000001 /* ViewScene */, \
0x00000002 /* RemoveScene */, \
@@ -765,7 +771,7 @@
0x00000005 /* RecallScene */, \
0x00000006 /* GetSceneMembership */, \
chip::kInvalidCommandId /* end of list */, \
- /* GeneratedCommandList (index=72)*/ \
+ /* GeneratedCommandList (index=74)*/ \
0x00000000 /* AddSceneResponse */, \
0x00000001 /* ViewSceneResponse */, \
0x00000002 /* RemoveSceneResponse */, \
@@ -774,13 +780,13 @@
0x00000006 /* GetSceneMembershipResponse */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 1, Cluster: On/Off (server) */\
- /* AcceptedCommandList (index=79) */ \
+ /* AcceptedCommandList (index=81) */ \
0x00000000 /* Off */, \
0x00000001 /* On */, \
0x00000002 /* Toggle */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 1, Cluster: Level Control (server) */\
- /* AcceptedCommandList (index=83) */ \
+ /* AcceptedCommandList (index=85) */ \
0x00000000 /* MoveToLevel */, \
0x00000001 /* Move */, \
0x00000002 /* Step */, \
@@ -791,21 +797,21 @@
0x00000007 /* StopWithOnOff */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 1, Cluster: Barrier Control (server) */\
- /* AcceptedCommandList (index=92) */ \
+ /* AcceptedCommandList (index=94) */ \
0x00000000 /* BarrierControlGoToPercent */, \
0x00000001 /* BarrierControlStop */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 1, Cluster: IAS Zone (server) */\
- /* AcceptedCommandList (index=95) */ \
+ /* AcceptedCommandList (index=97) */ \
0x00000000 /* ZoneEnrollResponse */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 1, Cluster: Test Cluster (server) */\
- /* AcceptedCommandList (index=97) */ \
+ /* AcceptedCommandList (index=99) */ \
0x00000000 /* Test */, \
0x00000001 /* TestNotHandled */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 2, Cluster: On/Off (server) */\
- /* AcceptedCommandList (index=100) */ \
+ /* AcceptedCommandList (index=102) */ \
0x00000000 /* Off */, \
0x00000001 /* On */, \
0x00000002 /* Toggle */, \
@@ -944,17 +950,17 @@
/* Endpoint: 0, Cluster: General Diagnostics (server) */ \
.clusterId = 0x00000033, \
.attributes = ZAP_ATTRIBUTE_INDEX(71), \
- .attributeCount = 10, \
+ .attributeCount = 11, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
- .acceptedCommandList = nullptr ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 30 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
/* Endpoint: 0, Cluster: Software Diagnostics (server) */ \
.clusterId = 0x00000034, \
- .attributes = ZAP_ATTRIBUTE_INDEX(81), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(82), \
.attributeCount = 6, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -965,7 +971,7 @@
{ \
/* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \
.clusterId = 0x00000035, \
- .attributes = ZAP_ATTRIBUTE_INDEX(87), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(88), \
.attributeCount = 65, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -976,7 +982,7 @@
{ \
/* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \
.clusterId = 0x00000036, \
- .attributes = ZAP_ATTRIBUTE_INDEX(152), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(153), \
.attributeCount = 15, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -987,40 +993,40 @@
{ \
/* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \
.clusterId = 0x00000037, \
- .attributes = ZAP_ATTRIBUTE_INDEX(167), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(168), \
.attributeCount = 11, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 30 ) ,\
- .generatedCommandList = nullptr ,\
- },\
- { \
- /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \
- .clusterId = 0x0000003C, \
- .attributes = ZAP_ATTRIBUTE_INDEX(178), \
- .attributeCount = 5, \
- .clusterSize = 6, \
- .mask = ZAP_CLUSTER_MASK(SERVER), \
- .functions = NULL, \
.acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 32 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
+ /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \
+ .clusterId = 0x0000003C, \
+ .attributes = ZAP_ATTRIBUTE_INDEX(179), \
+ .attributeCount = 5, \
+ .clusterSize = 6, \
+ .mask = ZAP_CLUSTER_MASK(SERVER), \
+ .functions = NULL, \
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 34 ) ,\
+ .generatedCommandList = nullptr ,\
+ },\
+ { \
/* Endpoint: 0, Cluster: Operational Credentials (server) */ \
.clusterId = 0x0000003E, \
- .attributes = ZAP_ATTRIBUTE_INDEX(183), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(184), \
.attributeCount = 8, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 36 ) ,\
- .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 45 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 38 ) ,\
+ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 47 ) ,\
},\
{ \
/* Endpoint: 0, Cluster: Group Key Management (server) */ \
.clusterId = 0x0000003F, \
- .attributes = ZAP_ATTRIBUTE_INDEX(191), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(192), \
.attributeCount = 4, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1031,7 +1037,7 @@
{ \
/* Endpoint: 0, Cluster: Fixed Label (server) */ \
.clusterId = 0x00000040, \
- .attributes = ZAP_ATTRIBUTE_INDEX(195), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(196), \
.attributeCount = 3, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1042,7 +1048,7 @@
{ \
/* Endpoint: 0, Cluster: User Label (server) */ \
.clusterId = 0x00000041, \
- .attributes = ZAP_ATTRIBUTE_INDEX(198), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(199), \
.attributeCount = 3, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1053,40 +1059,40 @@
{ \
/* Endpoint: 1, Cluster: Identify (server) */ \
.clusterId = 0x00000003, \
- .attributes = ZAP_ATTRIBUTE_INDEX(201), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(202), \
.attributeCount = 3, \
.clusterSize = 8, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \
.functions = chipFuncArrayIdentifyServer, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 50 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 52 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
/* Endpoint: 1, Cluster: Groups (server) */ \
.clusterId = 0x00000004, \
- .attributes = ZAP_ATTRIBUTE_INDEX(204), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(205), \
.attributeCount = 3, \
.clusterSize = 7, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
.functions = chipFuncArrayGroupsServer, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 52 ) ,\
- .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 59 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 54 ) ,\
+ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 61 ) ,\
},\
{ \
/* Endpoint: 1, Cluster: Scenes (server) */ \
.clusterId = 0x00000005, \
- .attributes = ZAP_ATTRIBUTE_INDEX(207), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(208), \
.attributeCount = 7, \
.clusterSize = 12, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
.functions = chipFuncArrayScenesServer, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 64 ) ,\
- .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 72 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 66 ) ,\
+ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 74 ) ,\
},\
{ \
/* Endpoint: 1, Cluster: On/Off (client) */ \
.clusterId = 0x00000006, \
- .attributes = ZAP_ATTRIBUTE_INDEX(214), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(215), \
.attributeCount = 0, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1097,18 +1103,18 @@
{ \
/* Endpoint: 1, Cluster: On/Off (server) */ \
.clusterId = 0x00000006, \
- .attributes = ZAP_ATTRIBUTE_INDEX(214), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(215), \
.attributeCount = 7, \
.clusterSize = 13, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
.functions = chipFuncArrayOnOffServer, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 79 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 81 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
/* Endpoint: 1, Cluster: Level Control (client) */ \
.clusterId = 0x00000008, \
- .attributes = ZAP_ATTRIBUTE_INDEX(221), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(222), \
.attributeCount = 0, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1119,18 +1125,18 @@
{ \
/* Endpoint: 1, Cluster: Level Control (server) */ \
.clusterId = 0x00000008, \
- .attributes = ZAP_ATTRIBUTE_INDEX(221), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(222), \
.attributeCount = 16, \
.clusterSize = 27, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
.functions = chipFuncArrayLevelControlServer, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 83 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 85 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
/* Endpoint: 1, Cluster: Binary Input (Basic) (server) */ \
.clusterId = 0x0000000F, \
- .attributes = ZAP_ATTRIBUTE_INDEX(237), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(238), \
.attributeCount = 5, \
.clusterSize = 9, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1141,7 +1147,7 @@
{ \
/* Endpoint: 1, Cluster: Descriptor (client) */ \
.clusterId = 0x0000001D, \
- .attributes = ZAP_ATTRIBUTE_INDEX(242), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(243), \
.attributeCount = 0, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1152,7 +1158,7 @@
{ \
/* Endpoint: 1, Cluster: Descriptor (server) */ \
.clusterId = 0x0000001D, \
- .attributes = ZAP_ATTRIBUTE_INDEX(242), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(243), \
.attributeCount = 6, \
.clusterSize = 4, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1163,7 +1169,7 @@
{ \
/* Endpoint: 1, Cluster: Binding (server) */ \
.clusterId = 0x0000001E, \
- .attributes = ZAP_ATTRIBUTE_INDEX(248), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(249), \
.attributeCount = 3, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1174,7 +1180,7 @@
{ \
/* Endpoint: 1, Cluster: Switch (server) */ \
.clusterId = 0x0000003B, \
- .attributes = ZAP_ATTRIBUTE_INDEX(251), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(252), \
.attributeCount = 4, \
.clusterSize = 8, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1185,7 +1191,7 @@
{ \
/* Endpoint: 1, Cluster: Fixed Label (server) */ \
.clusterId = 0x00000040, \
- .attributes = ZAP_ATTRIBUTE_INDEX(255), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(256), \
.attributeCount = 3, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1196,29 +1202,29 @@
{ \
/* Endpoint: 1, Cluster: Barrier Control (server) */ \
.clusterId = 0x00000103, \
- .attributes = ZAP_ATTRIBUTE_INDEX(258), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(259), \
.attributeCount = 6, \
.clusterSize = 11, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 92 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 94 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
/* Endpoint: 1, Cluster: IAS Zone (server) */ \
.clusterId = 0x00000500, \
- .attributes = ZAP_ATTRIBUTE_INDEX(264), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(265), \
.attributeCount = 7, \
.clusterSize = 20, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION) | ZAP_CLUSTER_MASK(MESSAGE_SENT_FUNCTION), \
.functions = chipFuncArrayIasZoneServer, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 95 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 97 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
/* Endpoint: 1, Cluster: Wake on LAN (server) */ \
.clusterId = 0x00000503, \
- .attributes = ZAP_ATTRIBUTE_INDEX(271), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(272), \
.attributeCount = 3, \
.clusterSize = 39, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1229,7 +1235,7 @@
{ \
/* Endpoint: 1, Cluster: Channel (client) */ \
.clusterId = 0x00000504, \
- .attributes = ZAP_ATTRIBUTE_INDEX(274), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(275), \
.attributeCount = 0, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1240,7 +1246,7 @@
{ \
/* Endpoint: 1, Cluster: Target Navigator (client) */ \
.clusterId = 0x00000505, \
- .attributes = ZAP_ATTRIBUTE_INDEX(274), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(275), \
.attributeCount = 0, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1251,7 +1257,7 @@
{ \
/* Endpoint: 1, Cluster: Media Playback (client) */ \
.clusterId = 0x00000506, \
- .attributes = ZAP_ATTRIBUTE_INDEX(274), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(275), \
.attributeCount = 0, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1262,7 +1268,7 @@
{ \
/* Endpoint: 1, Cluster: Media Input (client) */ \
.clusterId = 0x00000507, \
- .attributes = ZAP_ATTRIBUTE_INDEX(274), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(275), \
.attributeCount = 0, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1273,7 +1279,7 @@
{ \
/* Endpoint: 1, Cluster: Keypad Input (client) */ \
.clusterId = 0x00000509, \
- .attributes = ZAP_ATTRIBUTE_INDEX(274), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(275), \
.attributeCount = 0, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1284,7 +1290,7 @@
{ \
/* Endpoint: 1, Cluster: Content Launcher (client) */ \
.clusterId = 0x0000050A, \
- .attributes = ZAP_ATTRIBUTE_INDEX(274), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(275), \
.attributeCount = 0, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1295,7 +1301,7 @@
{ \
/* Endpoint: 1, Cluster: Audio Output (client) */ \
.clusterId = 0x0000050B, \
- .attributes = ZAP_ATTRIBUTE_INDEX(274), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(275), \
.attributeCount = 0, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1306,7 +1312,7 @@
{ \
/* Endpoint: 1, Cluster: Application Launcher (client) */ \
.clusterId = 0x0000050C, \
- .attributes = ZAP_ATTRIBUTE_INDEX(274), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(275), \
.attributeCount = 0, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1317,7 +1323,7 @@
{ \
/* Endpoint: 1, Cluster: Application Basic (client) */ \
.clusterId = 0x0000050D, \
- .attributes = ZAP_ATTRIBUTE_INDEX(274), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(275), \
.attributeCount = 0, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1328,7 +1334,7 @@
{ \
/* Endpoint: 1, Cluster: Account Login (client) */ \
.clusterId = 0x0000050E, \
- .attributes = ZAP_ATTRIBUTE_INDEX(274), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(275), \
.attributeCount = 0, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1339,29 +1345,29 @@
{ \
/* Endpoint: 1, Cluster: Test Cluster (server) */ \
.clusterId = 0x0000050F, \
- .attributes = ZAP_ATTRIBUTE_INDEX(274), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(275), \
.attributeCount = 22, \
.clusterSize = 1068, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 97 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 99 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
/* Endpoint: 2, Cluster: On/Off (server) */ \
.clusterId = 0x00000006, \
- .attributes = ZAP_ATTRIBUTE_INDEX(296), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(297), \
.attributeCount = 3, \
.clusterSize = 7, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
.functions = chipFuncArrayOnOffServer, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 100 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 102 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
/* Endpoint: 2, Cluster: Descriptor (server) */ \
.clusterId = 0x0000001D, \
- .attributes = ZAP_ATTRIBUTE_INDEX(299), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(300), \
.attributeCount = 6, \
.clusterSize = 4, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
diff --git a/zzz_generated/window-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/window-app/zap-generated/IMClusterCommandHandler.cpp
index 8fbbc70..f1644ef 100644
--- a/zzz_generated/window-app/zap-generated/IMClusterCommandHandler.cpp
+++ b/zzz_generated/window-app/zap-generated/IMClusterCommandHandler.cpp
@@ -155,6 +155,43 @@
} // namespace GeneralCommissioning
+namespace GeneralDiagnostics {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+ CHIP_ERROR TLVError = CHIP_NO_ERROR;
+ bool wasHandled = false;
+ {
+ switch (aCommandPath.mCommandId)
+ {
+ case Commands::TestEventTrigger::Id: {
+ Commands::TestEventTrigger::DecodableType commandData;
+ TLVError = DataModel::Decode(aDataTlv, commandData);
+ if (TLVError == CHIP_NO_ERROR)
+ {
+ wasHandled = emberAfGeneralDiagnosticsClusterTestEventTriggerCallback(apCommandObj, aCommandPath, commandData);
+ }
+ break;
+ }
+ default: {
+ // Unrecognized command ID, error status will apply.
+ apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+ ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+ ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+ return;
+ }
+ }
+ }
+
+ if (CHIP_NO_ERROR != TLVError || !wasHandled)
+ {
+ apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+ ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+ }
+}
+
+} // namespace GeneralDiagnostics
+
namespace GroupKeyManagement {
void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
@@ -751,6 +788,9 @@
case Clusters::GeneralCommissioning::Id:
Clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
break;
+ case Clusters::GeneralDiagnostics::Id:
+ Clusters::GeneralDiagnostics::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+ break;
case Clusters::GroupKeyManagement::Id:
Clusters::GroupKeyManagement::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
break;
diff --git a/zzz_generated/window-app/zap-generated/endpoint_config.h b/zzz_generated/window-app/zap-generated/endpoint_config.h
index a481a65..1acf16c 100644
--- a/zzz_generated/window-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/window-app/zap-generated/endpoint_config.h
@@ -93,7 +93,7 @@
#define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask
// This is an array of EmberAfAttributeMetadata structures.
-#define GENERATED_ATTRIBUTE_COUNT 273
+#define GENERATED_ATTRIBUTE_COUNT 274
#define GENERATED_ATTRIBUTES \
{ \
\
@@ -242,7 +242,9 @@
ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */ \
{ 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \
{ 0x00000007, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
- ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaults */ \
+ ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaults */ \
+ { 0x00000008, ZAP_TYPE(BOOLEAN), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
+ ZAP_EMPTY_DEFAULT() }, /* TestEventTriggersEnabled */ \
{ 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \
{ 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \
\
@@ -608,26 +610,30 @@
0x00000005 /* NetworkConfigResponse */, \
0x00000007 /* ConnectNetworkResponse */, \
chip::kInvalidCommandId /* end of list */, \
- /* Endpoint: 0, Cluster: Software Diagnostics (server) */\
+ /* Endpoint: 0, Cluster: General Diagnostics (server) */\
/* AcceptedCommandList (index=21) */ \
+ 0x00000000 /* TestEventTrigger */, \
+ chip::kInvalidCommandId /* end of list */, \
+ /* Endpoint: 0, Cluster: Software Diagnostics (server) */\
+ /* AcceptedCommandList (index=23) */ \
0x00000000 /* ResetWatermarks */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */\
- /* AcceptedCommandList (index=23) */ \
- 0x00000000 /* ResetCounts */, \
- chip::kInvalidCommandId /* end of list */, \
- /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */\
/* AcceptedCommandList (index=25) */ \
0x00000000 /* ResetCounts */, \
chip::kInvalidCommandId /* end of list */, \
- /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */\
+ /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */\
/* AcceptedCommandList (index=27) */ \
+ 0x00000000 /* ResetCounts */, \
+ chip::kInvalidCommandId /* end of list */, \
+ /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */\
+ /* AcceptedCommandList (index=29) */ \
0x00000000 /* OpenCommissioningWindow */, \
0x00000001 /* OpenBasicCommissioningWindow */, \
0x00000002 /* RevokeCommissioning */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 0, Cluster: Operational Credentials (server) */\
- /* AcceptedCommandList (index=31) */ \
+ /* AcceptedCommandList (index=33) */ \
0x00000000 /* AttestationRequest */, \
0x00000002 /* CertificateChainRequest */, \
0x00000004 /* CSRRequest */, \
@@ -637,30 +643,30 @@
0x0000000A /* RemoveFabric */, \
0x0000000B /* AddTrustedRootCertificate */, \
chip::kInvalidCommandId /* end of list */, \
- /* GeneratedCommandList (index=40)*/ \
+ /* GeneratedCommandList (index=42)*/ \
0x00000001 /* AttestationResponse */, \
0x00000003 /* CertificateChainResponse */, \
0x00000005 /* CSRResponse */, \
0x00000008 /* NOCResponse */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 0, Cluster: Group Key Management (server) */\
- /* AcceptedCommandList (index=45) */ \
+ /* AcceptedCommandList (index=47) */ \
0x00000000 /* KeySetWrite */, \
0x00000001 /* KeySetRead */, \
0x00000003 /* KeySetRemove */, \
0x00000004 /* KeySetReadAllIndices */, \
chip::kInvalidCommandId /* end of list */, \
- /* GeneratedCommandList (index=50)*/ \
+ /* GeneratedCommandList (index=52)*/ \
0x00000002 /* KeySetReadResponse */, \
0x00000005 /* KeySetReadAllIndicesResponse */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 1, Cluster: Identify (server) */\
- /* AcceptedCommandList (index=53) */ \
+ /* AcceptedCommandList (index=55) */ \
0x00000000 /* Identify */, \
0x00000040 /* TriggerEffect */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 1, Cluster: Groups (server) */\
- /* AcceptedCommandList (index=56) */ \
+ /* AcceptedCommandList (index=58) */ \
0x00000000 /* AddGroup */, \
0x00000001 /* ViewGroup */, \
0x00000002 /* GetGroupMembership */, \
@@ -668,14 +674,14 @@
0x00000004 /* RemoveAllGroups */, \
0x00000005 /* AddGroupIfIdentifying */, \
chip::kInvalidCommandId /* end of list */, \
- /* GeneratedCommandList (index=63)*/ \
+ /* GeneratedCommandList (index=65)*/ \
0x00000000 /* AddGroupResponse */, \
0x00000001 /* ViewGroupResponse */, \
0x00000002 /* GetGroupMembershipResponse */, \
0x00000003 /* RemoveGroupResponse */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 1, Cluster: Window Covering (server) */\
- /* AcceptedCommandList (index=68) */ \
+ /* AcceptedCommandList (index=70) */ \
0x00000000 /* UpOrOpen */, \
0x00000001 /* DownOrClose */, \
0x00000002 /* StopMotion */, \
@@ -685,7 +691,7 @@
0x00000008 /* GoToTiltPercentage */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 2, Cluster: Groups (server) */\
- /* AcceptedCommandList (index=76) */ \
+ /* AcceptedCommandList (index=78) */ \
0x00000000 /* AddGroup */, \
0x00000001 /* ViewGroup */, \
0x00000002 /* GetGroupMembership */, \
@@ -693,14 +699,14 @@
0x00000004 /* RemoveAllGroups */, \
0x00000005 /* AddGroupIfIdentifying */, \
chip::kInvalidCommandId /* end of list */, \
- /* GeneratedCommandList (index=83)*/ \
+ /* GeneratedCommandList (index=85)*/ \
0x00000000 /* AddGroupResponse */, \
0x00000001 /* ViewGroupResponse */, \
0x00000002 /* GetGroupMembershipResponse */, \
0x00000003 /* RemoveGroupResponse */, \
chip::kInvalidCommandId /* end of list */, \
/* Endpoint: 2, Cluster: Window Covering (server) */\
- /* AcceptedCommandList (index=88) */ \
+ /* AcceptedCommandList (index=90) */ \
0x00000000 /* UpOrOpen */, \
0x00000001 /* DownOrClose */, \
0x00000002 /* StopMotion */, \
@@ -843,18 +849,7 @@
/* Endpoint: 0, Cluster: General Diagnostics (server) */ \
.clusterId = 0x00000033, \
.attributes = ZAP_ATTRIBUTE_INDEX(79), \
- .attributeCount = 10, \
- .clusterSize = 6, \
- .mask = ZAP_CLUSTER_MASK(SERVER), \
- .functions = NULL, \
- .acceptedCommandList = nullptr ,\
- .generatedCommandList = nullptr ,\
- },\
- { \
- /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \
- .clusterId = 0x00000034, \
- .attributes = ZAP_ATTRIBUTE_INDEX(89), \
- .attributeCount = 6, \
+ .attributeCount = 11, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
@@ -862,10 +857,10 @@
.generatedCommandList = nullptr ,\
},\
{ \
- /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \
- .clusterId = 0x00000035, \
- .attributes = ZAP_ATTRIBUTE_INDEX(95), \
- .attributeCount = 65, \
+ /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \
+ .clusterId = 0x00000034, \
+ .attributes = ZAP_ATTRIBUTE_INDEX(90), \
+ .attributeCount = 6, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
@@ -873,9 +868,20 @@
.generatedCommandList = nullptr ,\
},\
{ \
+ /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \
+ .clusterId = 0x00000035, \
+ .attributes = ZAP_ATTRIBUTE_INDEX(96), \
+ .attributeCount = 65, \
+ .clusterSize = 6, \
+ .mask = ZAP_CLUSTER_MASK(SERVER), \
+ .functions = NULL, \
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 25 ) ,\
+ .generatedCommandList = nullptr ,\
+ },\
+ { \
/* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \
.clusterId = 0x00000036, \
- .attributes = ZAP_ATTRIBUTE_INDEX(160), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(161), \
.attributeCount = 15, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -886,51 +892,51 @@
{ \
/* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \
.clusterId = 0x00000037, \
- .attributes = ZAP_ATTRIBUTE_INDEX(175), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(176), \
.attributeCount = 11, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 25 ) ,\
- .generatedCommandList = nullptr ,\
- },\
- { \
- /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \
- .clusterId = 0x0000003C, \
- .attributes = ZAP_ATTRIBUTE_INDEX(186), \
- .attributeCount = 5, \
- .clusterSize = 6, \
- .mask = ZAP_CLUSTER_MASK(SERVER), \
- .functions = NULL, \
.acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 27 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
+ /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \
+ .clusterId = 0x0000003C, \
+ .attributes = ZAP_ATTRIBUTE_INDEX(187), \
+ .attributeCount = 5, \
+ .clusterSize = 6, \
+ .mask = ZAP_CLUSTER_MASK(SERVER), \
+ .functions = NULL, \
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 29 ) ,\
+ .generatedCommandList = nullptr ,\
+ },\
+ { \
/* Endpoint: 0, Cluster: Operational Credentials (server) */ \
.clusterId = 0x0000003E, \
- .attributes = ZAP_ATTRIBUTE_INDEX(191), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(192), \
.attributeCount = 8, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 31 ) ,\
- .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 40 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 33 ) ,\
+ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 42 ) ,\
},\
{ \
/* Endpoint: 0, Cluster: Group Key Management (server) */ \
.clusterId = 0x0000003F, \
- .attributes = ZAP_ATTRIBUTE_INDEX(199), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(200), \
.attributeCount = 6, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 45 ) ,\
- .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 50 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 47 ) ,\
+ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 52 ) ,\
},\
{ \
/* Endpoint: 0, Cluster: Fixed Label (server) */ \
.clusterId = 0x00000040, \
- .attributes = ZAP_ATTRIBUTE_INDEX(205), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(206), \
.attributeCount = 3, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -941,7 +947,7 @@
{ \
/* Endpoint: 0, Cluster: User Label (server) */ \
.clusterId = 0x00000041, \
- .attributes = ZAP_ATTRIBUTE_INDEX(208), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(209), \
.attributeCount = 3, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -952,29 +958,29 @@
{ \
/* Endpoint: 1, Cluster: Identify (server) */ \
.clusterId = 0x00000003, \
- .attributes = ZAP_ATTRIBUTE_INDEX(211), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(212), \
.attributeCount = 4, \
.clusterSize = 9, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \
.functions = chipFuncArrayIdentifyServer, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 53 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 55 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
/* Endpoint: 1, Cluster: Groups (server) */ \
.clusterId = 0x00000004, \
- .attributes = ZAP_ATTRIBUTE_INDEX(215), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(216), \
.attributeCount = 3, \
.clusterSize = 7, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
.functions = chipFuncArrayGroupsServer, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 56 ) ,\
- .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 63 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 58 ) ,\
+ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 65 ) ,\
},\
{ \
/* Endpoint: 1, Cluster: Scenes (client) */ \
.clusterId = 0x00000005, \
- .attributes = ZAP_ATTRIBUTE_INDEX(218), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(219), \
.attributeCount = 0, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -985,7 +991,7 @@
{ \
/* Endpoint: 1, Cluster: Descriptor (server) */ \
.clusterId = 0x0000001D, \
- .attributes = ZAP_ATTRIBUTE_INDEX(218), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(219), \
.attributeCount = 6, \
.clusterSize = 4, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -996,29 +1002,29 @@
{ \
/* Endpoint: 1, Cluster: Window Covering (server) */ \
.clusterId = 0x00000102, \
- .attributes = ZAP_ATTRIBUTE_INDEX(224), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(225), \
.attributeCount = 20, \
.clusterSize = 35, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \
.functions = chipFuncArrayWindowCoveringServer, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 68 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 70 ) ,\
.generatedCommandList = nullptr ,\
},\
{ \
/* Endpoint: 2, Cluster: Groups (server) */ \
.clusterId = 0x00000004, \
- .attributes = ZAP_ATTRIBUTE_INDEX(244), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(245), \
.attributeCount = 3, \
.clusterSize = 7, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
.functions = chipFuncArrayGroupsServer, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 76 ) ,\
- .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 83 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 78 ) ,\
+ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 85 ) ,\
},\
{ \
/* Endpoint: 2, Cluster: Scenes (client) */ \
.clusterId = 0x00000005, \
- .attributes = ZAP_ATTRIBUTE_INDEX(247), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(248), \
.attributeCount = 0, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1029,7 +1035,7 @@
{ \
/* Endpoint: 2, Cluster: Descriptor (server) */ \
.clusterId = 0x0000001D, \
- .attributes = ZAP_ATTRIBUTE_INDEX(247), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(248), \
.attributeCount = 6, \
.clusterSize = 4, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1040,12 +1046,12 @@
{ \
/* Endpoint: 2, Cluster: Window Covering (server) */ \
.clusterId = 0x00000102, \
- .attributes = ZAP_ATTRIBUTE_INDEX(253), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(254), \
.attributeCount = 20, \
.clusterSize = 35, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \
.functions = chipFuncArrayWindowCoveringServer, \
- .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 88 ) ,\
+ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 90 ) ,\
.generatedCommandList = nullptr ,\
},\
}
