Skip to content

Commit 505797b

Browse files
jamesharrowyyzhong-g
jamesharrow
authored and
yyzhong-g
committed
DEMM, WHM, EVSEM to disallow OnMode/StartupMode in All-Clusters-App (project-chip#36106)
* Fixes project-chip#36074, project-chip#36073, project-chip#36072 - remove OnMode and Startup Mode from all-clusters-app.zap in DEMM, EEVSEM, WHM * Fixes project-chip#36074, project-chip#36073, project-chip#36072 - remove OnMode and Startup Mode from all-clusters-app.zap in DEMM, EEVSEM, WHM
1 parent dc24628 commit 505797b

File tree

2 files changed

+31
-118
lines changed

2 files changed

+31
-118
lines changed

‎examples/all-clusters-app/all-clusters-common/all-clusters-app.matter

-6
Original file line numberDiff line numberDiff line change
@@ -8774,8 +8774,6 @@ endpoint 1 {
87748774
server cluster EnergyEvseMode {
87758775
callback attribute supportedModes;
87768776
callback attribute currentMode;
8777-
ram attribute startUpMode;
8778-
ram attribute onMode;
87798777
callback attribute generatedCommandList;
87808778
callback attribute acceptedCommandList;
87818779
callback attribute eventList;
@@ -8790,8 +8788,6 @@ endpoint 1 {
87908788
server cluster WaterHeaterMode {
87918789
callback attribute supportedModes;
87928790
callback attribute currentMode;
8793-
ram attribute startUpMode;
8794-
ram attribute onMode;
87958791
callback attribute generatedCommandList;
87968792
callback attribute acceptedCommandList;
87978793
callback attribute eventList;
@@ -8806,8 +8802,6 @@ endpoint 1 {
88068802
server cluster DeviceEnergyManagementMode {
88078803
callback attribute supportedModes;
88088804
callback attribute currentMode;
8809-
ram attribute startUpMode;
8810-
ram attribute onMode;
88118805
callback attribute generatedCommandList;
88128806
callback attribute acceptedCommandList;
88138807
callback attribute eventList;

‎examples/all-clusters-app/all-clusters-common/all-clusters-app.zap

+31-112
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"fileFormat": 2,
3-
"featureLevel": 103,
3+
"featureLevel": 104,
44
"creator": "zap",
55
"keyValuePairs": [
66
{
@@ -41,20 +41,23 @@
4141
"code": 17,
4242
"profileId": 259,
4343
"label": "MA-powersource",
44-
"name": "MA-powersource"
44+
"name": "MA-powersource",
45+
"deviceTypeOrder": 0
4546
},
4647
"deviceTypes": [
4748
{
4849
"code": 17,
4950
"profileId": 259,
5051
"label": "MA-powersource",
51-
"name": "MA-powersource"
52+
"name": "MA-powersource",
53+
"deviceTypeOrder": 0
5254
},
5355
{
5456
"code": 22,
5557
"profileId": 259,
5658
"label": "MA-rootdevice",
57-
"name": "MA-rootdevice"
59+
"name": "MA-rootdevice",
60+
"deviceTypeOrder": 1
5861
}
5962
],
6063
"deviceVersions": [
@@ -6102,20 +6105,23 @@
61026105
"code": 256,
61036106
"profileId": 259,
61046107
"label": "MA-onofflight",
6105-
"name": "MA-onofflight"
6108+
"name": "MA-onofflight",
6109+
"deviceTypeOrder": 0
61066110
},
61076111
"deviceTypes": [
61086112
{
61096113
"code": 256,
61106114
"profileId": 259,
61116115
"label": "MA-onofflight",
6112-
"name": "MA-onofflight"
6116+
"name": "MA-onofflight",
6117+
"deviceTypeOrder": 0
61136118
},
61146119
{
61156120
"code": 17,
61166121
"profileId": 259,
61176122
"label": "MA-powersource",
6118-
"name": "MA-powersource"
6123+
"name": "MA-powersource",
6124+
"deviceTypeOrder": 1
61196125
}
61206126
],
61216127
"deviceVersions": [
@@ -14526,38 +14532,6 @@
1452614532
"maxInterval": 65534,
1452714533
"reportableChange": 0
1452814534
},
14529-
{
14530-
"name": "StartUpMode",
14531-
"code": 2,
14532-
"mfgCode": null,
14533-
"side": "server",
14534-
"type": "int8u",
14535-
"included": 1,
14536-
"storageOption": "RAM",
14537-
"singleton": 0,
14538-
"bounded": 0,
14539-
"defaultValue": "",
14540-
"reportable": 1,
14541-
"minInterval": 1,
14542-
"maxInterval": 65534,
14543-
"reportableChange": 0
14544-
},
14545-
{
14546-
"name": "OnMode",
14547-
"code": 3,
14548-
"mfgCode": null,
14549-
"side": "server",
14550-
"type": "int8u",
14551-
"included": 1,
14552-
"storageOption": "RAM",
14553-
"singleton": 0,
14554-
"bounded": 0,
14555-
"defaultValue": "",
14556-
"reportable": 1,
14557-
"minInterval": 1,
14558-
"maxInterval": 65534,
14559-
"reportableChange": 0
14560-
},
1456114535
{
1456214536
"name": "GeneratedCommandList",
1456314537
"code": 65528,
@@ -14714,38 +14688,6 @@
1471414688
"maxInterval": 65534,
1471514689
"reportableChange": 0
1471614690
},
14717-
{
14718-
"name": "StartUpMode",
14719-
"code": 2,
14720-
"mfgCode": null,
14721-
"side": "server",
14722-
"type": "int8u",
14723-
"included": 1,
14724-
"storageOption": "RAM",
14725-
"singleton": 0,
14726-
"bounded": 0,
14727-
"defaultValue": "",
14728-
"reportable": 1,
14729-
"minInterval": 1,
14730-
"maxInterval": 65534,
14731-
"reportableChange": 0
14732-
},
14733-
{
14734-
"name": "OnMode",
14735-
"code": 3,
14736-
"mfgCode": null,
14737-
"side": "server",
14738-
"type": "int8u",
14739-
"included": 1,
14740-
"storageOption": "RAM",
14741-
"singleton": 0,
14742-
"bounded": 0,
14743-
"defaultValue": "",
14744-
"reportable": 1,
14745-
"minInterval": 1,
14746-
"maxInterval": 65534,
14747-
"reportableChange": 0
14748-
},
1474914691
{
1475014692
"name": "GeneratedCommandList",
1475114693
"code": 65528,
@@ -14903,38 +14845,6 @@
1490314845
"maxInterval": 65534,
1490414846
"reportableChange": 0
1490514847
},
14906-
{
14907-
"name": "StartUpMode",
14908-
"code": 2,
14909-
"mfgCode": null,
14910-
"side": "server",
14911-
"type": "int8u",
14912-
"included": 1,
14913-
"storageOption": "RAM",
14914-
"singleton": 0,
14915-
"bounded": 0,
14916-
"defaultValue": "",
14917-
"reportable": 1,
14918-
"minInterval": 1,
14919-
"maxInterval": 65534,
14920-
"reportableChange": 0
14921-
},
14922-
{
14923-
"name": "OnMode",
14924-
"code": 3,
14925-
"mfgCode": null,
14926-
"side": "server",
14927-
"type": "int8u",
14928-
"included": 1,
14929-
"storageOption": "RAM",
14930-
"singleton": 0,
14931-
"bounded": 0,
14932-
"defaultValue": "",
14933-
"reportable": 1,
14934-
"minInterval": 1,
14935-
"maxInterval": 65534,
14936-
"reportableChange": 0
14937-
},
1493814848
{
1493914849
"name": "GeneratedCommandList",
1494014850
"code": 65528,
@@ -23363,20 +23273,23 @@
2336323273
"code": 256,
2336423274
"profileId": 259,
2336523275
"label": "MA-onofflight",
23366-
"name": "MA-onofflight"
23276+
"name": "MA-onofflight",
23277+
"deviceTypeOrder": 0
2336723278
},
2336823279
"deviceTypes": [
2336923280
{
2337023281
"code": 256,
2337123282
"profileId": 259,
2337223283
"label": "MA-onofflight",
23373-
"name": "MA-onofflight"
23284+
"name": "MA-onofflight",
23285+
"deviceTypeOrder": 0
2337423286
},
2337523287
{
2337623288
"code": 17,
2337723289
"profileId": 259,
2337823290
"label": "MA-powersource",
23379-
"name": "MA-powersource"
23291+
"name": "MA-powersource",
23292+
"deviceTypeOrder": 1
2338023293
}
2338123294
],
2338223295
"deviceVersions": [
@@ -24815,14 +24728,16 @@
2481524728
"code": 15,
2481624729
"profileId": 259,
2481724730
"label": "MA-genericswitch",
24818-
"name": "MA-genericswitch"
24731+
"name": "MA-genericswitch",
24732+
"deviceTypeOrder": 0
2481924733
},
2482024734
"deviceTypes": [
2482124735
{
2482224736
"code": 15,
2482324737
"profileId": 259,
2482424738
"label": "MA-genericswitch",
24825-
"name": "MA-genericswitch"
24739+
"name": "MA-genericswitch",
24740+
"deviceTypeOrder": 0
2482624741
}
2482724742
],
2482824743
"deviceVersions": [
@@ -25274,14 +25189,16 @@
2527425189
"code": 15,
2527525190
"profileId": 259,
2527625191
"label": "MA-genericswitch",
25277-
"name": "MA-genericswitch"
25192+
"name": "MA-genericswitch",
25193+
"deviceTypeOrder": 0
2527825194
},
2527925195
"deviceTypes": [
2528025196
{
2528125197
"code": 15,
2528225198
"profileId": 259,
2528325199
"label": "MA-genericswitch",
25284-
"name": "MA-genericswitch"
25200+
"name": "MA-genericswitch",
25201+
"deviceTypeOrder": 0
2528525202
}
2528625203
],
2528725204
"deviceVersions": [
@@ -25685,14 +25602,16 @@
2568525602
"code": 25,
2568625603
"profileId": 259,
2568725604
"label": "MA-secondary-network-interface",
25688-
"name": "MA-secondary-network-interface"
25605+
"name": "MA-secondary-network-interface",
25606+
"deviceTypeOrder": 0
2568925607
},
2569025608
"deviceTypes": [
2569125609
{
2569225610
"code": 25,
2569325611
"profileId": 259,
2569425612
"label": "MA-secondary-network-interface",
25695-
"name": "MA-secondary-network-interface"
25613+
"name": "MA-secondary-network-interface",
25614+
"deviceTypeOrder": 0
2569625615
}
2569725616
],
2569825617
"deviceVersions": [

0 commit comments

Comments
 (0)