DEMM, WHM, EVSEM to disallow OnMode/StartupMode in All-Clusters-App (#36106)
* Fixes #36074, #36073, #36072 - remove OnMode and Startup Mode from all-clusters-app.zap in DEMM, EEVSEM, WHM
* Fixes #36074, #36073, #36072 - remove OnMode and Startup Mode from all-clusters-app.zap in DEMM, EEVSEM, WHM
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 45e58ff..aa3ef44 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
@@ -8774,8 +8774,6 @@
server cluster EnergyEvseMode {
callback attribute supportedModes;
callback attribute currentMode;
- ram attribute startUpMode;
- ram attribute onMode;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute eventList;
@@ -8790,8 +8788,6 @@
server cluster WaterHeaterMode {
callback attribute supportedModes;
callback attribute currentMode;
- ram attribute startUpMode;
- ram attribute onMode;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute eventList;
@@ -8806,8 +8802,6 @@
server cluster DeviceEnergyManagementMode {
callback attribute supportedModes;
callback attribute currentMode;
- ram attribute startUpMode;
- ram attribute onMode;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute eventList;
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 f8e3dbd..741812b 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
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 104,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,20 +41,23 @@
"code": 17,
"profileId": 259,
"label": "MA-powersource",
- "name": "MA-powersource"
+ "name": "MA-powersource",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 17,
"profileId": 259,
"label": "MA-powersource",
- "name": "MA-powersource"
+ "name": "MA-powersource",
+ "deviceTypeOrder": 0
},
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 1
}
],
"deviceVersions": [
@@ -6102,20 +6105,23 @@
"code": 256,
"profileId": 259,
"label": "MA-onofflight",
- "name": "MA-onofflight"
+ "name": "MA-onofflight",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 256,
"profileId": 259,
"label": "MA-onofflight",
- "name": "MA-onofflight"
+ "name": "MA-onofflight",
+ "deviceTypeOrder": 0
},
{
"code": 17,
"profileId": 259,
"label": "MA-powersource",
- "name": "MA-powersource"
+ "name": "MA-powersource",
+ "deviceTypeOrder": 1
}
],
"deviceVersions": [
@@ -14527,38 +14533,6 @@
"reportableChange": 0
},
{
- "name": "StartUpMode",
- "code": 2,
- "mfgCode": null,
- "side": "server",
- "type": "int8u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "OnMode",
- "code": 3,
- "mfgCode": null,
- "side": "server",
- "type": "int8u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "GeneratedCommandList",
"code": 65528,
"mfgCode": null,
@@ -14715,38 +14689,6 @@
"reportableChange": 0
},
{
- "name": "StartUpMode",
- "code": 2,
- "mfgCode": null,
- "side": "server",
- "type": "int8u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "OnMode",
- "code": 3,
- "mfgCode": null,
- "side": "server",
- "type": "int8u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "GeneratedCommandList",
"code": 65528,
"mfgCode": null,
@@ -14904,38 +14846,6 @@
"reportableChange": 0
},
{
- "name": "StartUpMode",
- "code": 2,
- "mfgCode": null,
- "side": "server",
- "type": "int8u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "OnMode",
- "code": 3,
- "mfgCode": null,
- "side": "server",
- "type": "int8u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "GeneratedCommandList",
"code": 65528,
"mfgCode": null,
@@ -23363,20 +23273,23 @@
"code": 256,
"profileId": 259,
"label": "MA-onofflight",
- "name": "MA-onofflight"
+ "name": "MA-onofflight",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 256,
"profileId": 259,
"label": "MA-onofflight",
- "name": "MA-onofflight"
+ "name": "MA-onofflight",
+ "deviceTypeOrder": 0
},
{
"code": 17,
"profileId": 259,
"label": "MA-powersource",
- "name": "MA-powersource"
+ "name": "MA-powersource",
+ "deviceTypeOrder": 1
}
],
"deviceVersions": [
@@ -24815,14 +24728,16 @@
"code": 15,
"profileId": 259,
"label": "MA-genericswitch",
- "name": "MA-genericswitch"
+ "name": "MA-genericswitch",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 15,
"profileId": 259,
"label": "MA-genericswitch",
- "name": "MA-genericswitch"
+ "name": "MA-genericswitch",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -25274,14 +25189,16 @@
"code": 15,
"profileId": 259,
"label": "MA-genericswitch",
- "name": "MA-genericswitch"
+ "name": "MA-genericswitch",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 15,
"profileId": 259,
"label": "MA-genericswitch",
- "name": "MA-genericswitch"
+ "name": "MA-genericswitch",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -25685,14 +25602,16 @@
"code": 25,
"profileId": 259,
"label": "MA-secondary-network-interface",
- "name": "MA-secondary-network-interface"
+ "name": "MA-secondary-network-interface",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 25,
"profileId": 259,
"label": "MA-secondary-network-interface",
- "name": "MA-secondary-network-interface"
+ "name": "MA-secondary-network-interface",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
