Power source new attribute (#27969)
* Update xml
* PowerSource: Add EndpointList
* Update tests.
* zap lock-app
* zap all-clusters
* zap all-clusters-minimal
* zap lighting-app
* zap placeholder apps
* zap smoke-co-alarm
* zap window-app
* zap test inputs
* Update src/app/zap-templates/zcl/data-model/chip/power-source-cluster.xml
Co-authored-by: Boris Zbarsky <bzbarsky@apple.com>
* Restyled by whitespace
* Restyled by prettier-yaml
* re-run zap after change.
* Remove power config from the descriptor test
* Remove deprecated tests from CI
Apparently the top level pics don't guard anything.
* re-zap
---------
Co-authored-by: Boris Zbarsky <bzbarsky@apple.com>
Co-authored-by: Restyled.io <commits@restyled.io>
diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
index b736c96..0b0662b 100644
--- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
+++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
@@ -1043,17 +1043,6 @@
readonly attribute int16u clusterRevision = 65533;
}
-/** This cluster is used to describe the configuration and capabilities of a Device's power system. */
-server cluster PowerSourceConfiguration = 46 {
- readonly attribute INT8U sources[] = 0;
- readonly attribute command_id generatedCommandList[] = 65528;
- readonly attribute command_id acceptedCommandList[] = 65529;
- readonly attribute event_id eventList[] = 65530;
- readonly attribute attrib_id attributeList[] = 65531;
- readonly attribute bitmap32 featureMap = 65532;
- readonly attribute int16u clusterRevision = 65533;
-}
-
/** This cluster is used to describe the configuration and capabilities of a physical power source that provides power to the Node. */
server cluster PowerSource = 47 {
enum BatApprovedChemistryEnum : ENUM16 {
@@ -1277,6 +1266,7 @@
readonly attribute BatChargeLevelEnum batChargeLevel = 14;
readonly attribute boolean batReplacementNeeded = 15;
readonly attribute BatReplaceabilityEnum batReplaceability = 16;
+ readonly attribute endpoint_no endpointList[] = 31;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
@@ -5819,12 +5809,6 @@
ram attribute clusterRevision default = 1;
}
- server cluster PowerSourceConfiguration {
- callback attribute sources;
- ram attribute featureMap default = 0;
- ram attribute clusterRevision default = 1;
- }
-
server cluster PowerSource {
ram attribute status default = 0;
ram attribute order default = 3;
@@ -5832,8 +5816,9 @@
ram attribute batChargeLevel default = 0;
ram attribute batReplacementNeeded;
ram attribute batReplaceability;
+ callback attribute endpointList;
ram attribute featureMap default = 2;
- ram attribute clusterRevision default = 1;
+ ram attribute clusterRevision default = 2;
}
server cluster GeneralCommissioning {
@@ -6200,8 +6185,9 @@
ram attribute batChargeLevel default = 0;
ram attribute batReplacementNeeded;
ram attribute batReplaceability;
+ callback attribute endpointList;
ram attribute featureMap default = 2;
- ram attribute clusterRevision default = 1;
+ ram attribute clusterRevision default = 2;
}
server cluster Switch {
@@ -7063,8 +7049,9 @@
ram attribute batChargeLevel default = 0;
ram attribute batReplacementNeeded;
ram attribute batReplaceability;
+ callback attribute endpointList;
ram attribute featureMap default = 2;
- ram attribute clusterRevision default = 1;
+ ram attribute clusterRevision default = 2;
}
server cluster OccupancySensing {
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 cdf2aad..f362955 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
@@ -2198,7 +2198,7 @@
"mfgCode": null,
"define": "POWER_SOURCE_CONFIGURATION_CLUSTER",
"side": "server",
- "enabled": 1,
+ "enabled": 0,
"attributes": [
{
"name": "Sources",
@@ -2763,6 +2763,22 @@
"reportableChange": 0
},
{
+ "name": "EndpointList",
+ "code": 31,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
"name": "GeneratedCommandList",
"code": 65528,
"mfgCode": null,
@@ -2836,7 +2852,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -12342,6 +12358,22 @@
"reportableChange": 0
},
{
+ "name": "EndpointList",
+ "code": 31,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
"name": "GeneratedCommandList",
"code": 65528,
"mfgCode": null,
@@ -12415,7 +12447,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "2",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -29322,6 +29354,22 @@
"reportableChange": 0
},
{
+ "name": "EndpointList",
+ "code": 31,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
"name": "GeneratedCommandList",
"code": 65528,
"mfgCode": null,
@@ -29395,7 +29443,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
