Skip to content

Commit ac83b5a

Browse files
jamesharrowjamesharrow
committed
Re-applied the changes to all-clusters-app.zap and energy-management-app.zap that needed to be resolved due to merge conflict (turn on startupmode and onmode in EVSEM, DEMM).
1 parent fb1501c commit ac83b5a

File tree

2 files changed

+137
-9
lines changed

2 files changed

+137
-9
lines changed

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

+72-8
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,20 @@
1717
}
1818
],
1919
"package": [
20-
{
21-
"pathRelativity": "relativeToZap",
22-
"path": "../../../src/app/zap-templates/app-templates.json",
23-
"type": "gen-templates-json",
24-
"category": "matter",
25-
"version": "chip-v1"
26-
},
2720
{
2821
"pathRelativity": "relativeToZap",
2922
"path": "../../../src/app/zap-templates/zcl/zcl-with-test-extensions.json",
3023
"type": "zcl-properties",
3124
"category": "matter",
3225
"version": 1,
3326
"description": "Matter SDK ZCL data with some extensions"
27+
},
28+
{
29+
"pathRelativity": "relativeToZap",
30+
"path": "../../../src/app/zap-templates/app-templates.json",
31+
"type": "gen-templates-json",
32+
"category": "matter",
33+
"version": "chip-v1"
3434
}
3535
],
3636
"endpointTypes": [
@@ -14615,6 +14615,38 @@
1461514615
"maxInterval": 65534,
1461614616
"reportableChange": 0
1461714617
},
14618+
{
14619+
"name": "StartUpMode",
14620+
"code": 2,
14621+
"mfgCode": null,
14622+
"side": "server",
14623+
"type": "int8u",
14624+
"included": 1,
14625+
"storageOption": "RAM",
14626+
"singleton": 0,
14627+
"bounded": 0,
14628+
"defaultValue": "",
14629+
"reportable": 1,
14630+
"minInterval": 1,
14631+
"maxInterval": 65534,
14632+
"reportableChange": 0
14633+
},
14634+
{
14635+
"name": "OnMode",
14636+
"code": 3,
14637+
"mfgCode": null,
14638+
"side": "server",
14639+
"type": "int8u",
14640+
"included": 1,
14641+
"storageOption": "RAM",
14642+
"singleton": 0,
14643+
"bounded": 0,
14644+
"defaultValue": "",
14645+
"reportable": 1,
14646+
"minInterval": 1,
14647+
"maxInterval": 65534,
14648+
"reportableChange": 0
14649+
},
1461814650
{
1461914651
"name": "GeneratedCommandList",
1462014652
"code": 65528,
@@ -14772,6 +14804,38 @@
1477214804
"maxInterval": 65534,
1477314805
"reportableChange": 0
1477414806
},
14807+
{
14808+
"name": "StartUpMode",
14809+
"code": 2,
14810+
"mfgCode": null,
14811+
"side": "server",
14812+
"type": "int8u",
14813+
"included": 1,
14814+
"storageOption": "RAM",
14815+
"singleton": 0,
14816+
"bounded": 0,
14817+
"defaultValue": "",
14818+
"reportable": 1,
14819+
"minInterval": 1,
14820+
"maxInterval": 65534,
14821+
"reportableChange": 0
14822+
},
14823+
{
14824+
"name": "OnMode",
14825+
"code": 3,
14826+
"mfgCode": null,
14827+
"side": "server",
14828+
"type": "int8u",
14829+
"included": 1,
14830+
"storageOption": "RAM",
14831+
"singleton": 0,
14832+
"bounded": 0,
14833+
"defaultValue": "",
14834+
"reportable": 1,
14835+
"minInterval": 1,
14836+
"maxInterval": 65534,
14837+
"reportableChange": 0
14838+
},
1477514839
{
1477614840
"name": "GeneratedCommandList",
1477714841
"code": 65528,
@@ -25790,4 +25854,4 @@
2579025854
"parentEndpointIdentifier": null
2579125855
}
2579225856
]
25793-
}
25857+
}

‎examples/energy-management-app/energy-management-common/energy-management-app.zap

+65-1
Original file line numberDiff line numberDiff line change
@@ -4679,6 +4679,38 @@
46794679
"maxInterval": 65534,
46804680
"reportableChange": 0
46814681
},
4682+
{
4683+
"name": "StartUpMode",
4684+
"code": 2,
4685+
"mfgCode": null,
4686+
"side": "server",
4687+
"type": "int8u",
4688+
"included": 1,
4689+
"storageOption": "RAM",
4690+
"singleton": 0,
4691+
"bounded": 0,
4692+
"defaultValue": "",
4693+
"reportable": 1,
4694+
"minInterval": 1,
4695+
"maxInterval": 65534,
4696+
"reportableChange": 0
4697+
},
4698+
{
4699+
"name": "OnMode",
4700+
"code": 3,
4701+
"mfgCode": null,
4702+
"side": "server",
4703+
"type": "int8u",
4704+
"included": 1,
4705+
"storageOption": "RAM",
4706+
"singleton": 0,
4707+
"bounded": 0,
4708+
"defaultValue": "",
4709+
"reportable": 1,
4710+
"minInterval": 1,
4711+
"maxInterval": 65534,
4712+
"reportableChange": 0
4713+
},
46824714
{
46834715
"name": "GeneratedCommandList",
46844716
"code": 65528,
@@ -4836,6 +4868,38 @@
48364868
"maxInterval": 65534,
48374869
"reportableChange": 0
48384870
},
4871+
{
4872+
"name": "StartUpMode",
4873+
"code": 2,
4874+
"mfgCode": null,
4875+
"side": "server",
4876+
"type": "int8u",
4877+
"included": 1,
4878+
"storageOption": "RAM",
4879+
"singleton": 0,
4880+
"bounded": 0,
4881+
"defaultValue": "",
4882+
"reportable": 1,
4883+
"minInterval": 1,
4884+
"maxInterval": 65534,
4885+
"reportableChange": 0
4886+
},
4887+
{
4888+
"name": "OnMode",
4889+
"code": 3,
4890+
"mfgCode": null,
4891+
"side": "server",
4892+
"type": "int8u",
4893+
"included": 1,
4894+
"storageOption": "RAM",
4895+
"singleton": 0,
4896+
"bounded": 0,
4897+
"defaultValue": "",
4898+
"reportable": 1,
4899+
"minInterval": 1,
4900+
"maxInterval": 65534,
4901+
"reportableChange": 0
4902+
},
48394903
{
48404904
"name": "GeneratedCommandList",
48414905
"code": 65528,
@@ -4955,4 +5019,4 @@
49555019
"parentEndpointIdentifier": null
49565020
}
49575021
]
4958-
}
5022+
}

0 commit comments

Comments
 (0)