Skip to content

Commit 5aeae51

Browse files
authored
Conformance energy managment - Fix for#36827 (#37813)
* Added OTA Requestor Device * Removing Un-conformant attribute * Update Device versions * Other fixes
1 parent bf9ef44 commit 5aeae51

File tree

2 files changed

+17
-7
lines changed

2 files changed

+17
-7
lines changed

examples/energy-management-app/energy-management-common/energy-management-app.matter

+4-3
Original file line numberDiff line numberDiff line change
@@ -2576,7 +2576,8 @@ provisional cluster DeviceEnergyManagementMode = 159 {
25762576
}
25772577

25782578
endpoint 0 {
2579-
device type ma_rootdevice = 22, version 1;
2579+
device type ma_rootdevice = 22, version 3;
2580+
device type ma_otarequestor = 18, version 1;
25802581

25812582
binding cluster OtaSoftwareUpdateProvider;
25822583

@@ -2786,8 +2787,8 @@ endpoint 0 {
27862787
endpoint 1 {
27872788
device type ma_powersource = 17, version 1;
27882789
device type ma_electricalsensor = 1296, version 1;
2789-
device type energy_evse = 1292, version 1;
2790-
device type device_energy_management = 1293, version 1;
2790+
device type energy_evse = 1292, version 2;
2791+
device type device_energy_management = 1293, version 2;
27912792

27922793

27932794
server cluster Identify {

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

+13-4
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,22 @@
5151
"label": "MA-rootdevice",
5252
"name": "MA-rootdevice",
5353
"deviceTypeOrder": 0
54+
},
55+
{
56+
"code": 18,
57+
"profileId": 259,
58+
"label": "MA-otarequestor",
59+
"name": "MA-otarequestor",
60+
"deviceTypeOrder": 1
5461
}
5562
],
5663
"deviceVersions": [
64+
3,
5765
1
5866
],
5967
"deviceIdentifiers": [
60-
22
68+
22,
69+
18
6170
],
6271
"deviceTypeName": "MA-rootdevice",
6372
"deviceTypeCode": 22,
@@ -1606,7 +1615,7 @@
16061615
"storageOption": "External",
16071616
"singleton": 0,
16081617
"bounded": 0,
1609-
"defaultValue": null,
1618+
"defaultValue": "",
16101619
"reportable": 1,
16111620
"minInterval": 1,
16121621
"maxInterval": 65534,
@@ -2561,9 +2570,9 @@
25612570
}
25622571
],
25632572
"deviceVersions": [
2573+
2,
25642574
1,
2565-
1,
2566-
1,
2575+
2,
25672576
1
25682577
],
25692578
"deviceIdentifiers": [

0 commit comments

Comments
 (0)