Skip to content

Commit 9d1b151

Browse files
ArekBalysNordicArekBalysNordic
committed
samples: matter: Fix missing OTA requestor device type.
According to Matter 1.4 certification IDM-10.5 test case the device should contain OTA requestor device type on endpoint 0. In all Matter samples there is no such as device type. We need to fix it to pass the certification test case. Signed-off-by: Arkadiusz Balys <[email protected]>
1 parent 64064df commit 9d1b151

File tree

25 files changed

+1994
-105
lines changed

25 files changed

+1994
-105
lines changed

‎applications/matter_bridge/snippets/onoff_plug/bridge.zap‎

Lines changed: 173 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,18 @@
3838
"id": 1,
3939
"name": "MA-rootdevice",
4040
"deviceTypeRef": {
41-
"code": 22,
41+
"code": 18,
4242
"profileId": 259,
43-
"label": "MA-rootdevice",
44-
"name": "MA-rootdevice"
43+
"label": "MA-otarequestor",
44+
"name": "MA-otarequestor"
4545
},
4646
"deviceTypes": [
47+
{
48+
"code": 18,
49+
"profileId": 259,
50+
"label": "MA-otarequestor",
51+
"name": "MA-otarequestor"
52+
},
4753
{
4854
"code": 22,
4955
"profileId": 259,
@@ -52,13 +58,15 @@
5258
}
5359
],
5460
"deviceVersions": [
61+
1,
5562
3
5663
],
5764
"deviceIdentifiers": [
65+
18,
5866
22
5967
],
60-
"deviceTypeName": "MA-rootdevice",
61-
"deviceTypeCode": 22,
68+
"deviceTypeName": "MA-otarequestor",
69+
"deviceTypeCode": 18,
6270
"deviceTypeProfileId": 259,
6371
"clusters": [
6472
{
@@ -165,6 +173,22 @@
165173
"maxInterval": 65534,
166174
"reportableChange": 0
167175
},
176+
{
177+
"name": "EventList",
178+
"code": 65530,
179+
"mfgCode": null,
180+
"side": "server",
181+
"type": "array",
182+
"included": 1,
183+
"storageOption": "External",
184+
"singleton": 0,
185+
"bounded": 0,
186+
"defaultValue": null,
187+
"reportable": 1,
188+
"minInterval": 1,
189+
"maxInterval": 65534,
190+
"reportableChange": 0
191+
},
168192
{
169193
"name": "AttributeList",
170194
"code": 65531,
@@ -335,6 +359,22 @@
335359
"maxInterval": 65534,
336360
"reportableChange": 0
337361
},
362+
{
363+
"name": "EventList",
364+
"code": 65530,
365+
"mfgCode": null,
366+
"side": "server",
367+
"type": "array",
368+
"included": 1,
369+
"storageOption": "External",
370+
"singleton": 0,
371+
"bounded": 0,
372+
"defaultValue": null,
373+
"reportable": 1,
374+
"minInterval": 1,
375+
"maxInterval": 65534,
376+
"reportableChange": 0
377+
},
338378
{
339379
"name": "AttributeList",
340380
"code": 65531,
@@ -697,6 +737,22 @@
697737
"maxInterval": 65534,
698738
"reportableChange": 0
699739
},
740+
{
741+
"name": "EventList",
742+
"code": 65530,
743+
"mfgCode": null,
744+
"side": "server",
745+
"type": "array",
746+
"included": 1,
747+
"storageOption": "External",
748+
"singleton": 1,
749+
"bounded": 0,
750+
"defaultValue": null,
751+
"reportable": 1,
752+
"minInterval": 1,
753+
"maxInterval": 65534,
754+
"reportableChange": 0
755+
},
700756
{
701757
"name": "AttributeList",
702758
"code": 65531,
@@ -934,6 +990,22 @@
934990
"maxInterval": 65534,
935991
"reportableChange": 0
936992
},
993+
{
994+
"name": "EventList",
995+
"code": 65530,
996+
"mfgCode": null,
997+
"side": "server",
998+
"type": "array",
999+
"included": 1,
1000+
"storageOption": "External",
1001+
"singleton": 0,
1002+
"bounded": 0,
1003+
"defaultValue": null,
1004+
"reportable": 1,
1005+
"minInterval": 1,
1006+
"maxInterval": 65534,
1007+
"reportableChange": 0
1008+
},
9371009
{
9381010
"name": "AttributeList",
9391011
"code": 65531,
@@ -1177,6 +1249,22 @@
11771249
"maxInterval": 65534,
11781250
"reportableChange": 0
11791251
},
1252+
{
1253+
"name": "EventList",
1254+
"code": 65530,
1255+
"mfgCode": null,
1256+
"side": "server",
1257+
"type": "array",
1258+
"included": 1,
1259+
"storageOption": "External",
1260+
"singleton": 0,
1261+
"bounded": 0,
1262+
"defaultValue": null,
1263+
"reportable": 1,
1264+
"minInterval": 1,
1265+
"maxInterval": 65534,
1266+
"reportableChange": 0
1267+
},
11801268
{
11811269
"name": "AttributeList",
11821270
"code": 65531,
@@ -1517,6 +1605,22 @@
15171605
"maxInterval": 65534,
15181606
"reportableChange": 0
15191607
},
1608+
{
1609+
"name": "EventList",
1610+
"code": 65530,
1611+
"mfgCode": null,
1612+
"side": "server",
1613+
"type": "array",
1614+
"included": 1,
1615+
"storageOption": "External",
1616+
"singleton": 0,
1617+
"bounded": 0,
1618+
"defaultValue": null,
1619+
"reportable": 1,
1620+
"minInterval": 1,
1621+
"maxInterval": 65534,
1622+
"reportableChange": 0
1623+
},
15201624
{
15211625
"name": "AttributeList",
15221626
"code": 65531,
@@ -1853,6 +1957,22 @@
18531957
"maxInterval": 65534,
18541958
"reportableChange": 0
18551959
},
1960+
{
1961+
"name": "EventList",
1962+
"code": 65530,
1963+
"mfgCode": null,
1964+
"side": "server",
1965+
"type": "array",
1966+
"included": 1,
1967+
"storageOption": "External",
1968+
"singleton": 0,
1969+
"bounded": 0,
1970+
"defaultValue": null,
1971+
"reportable": 1,
1972+
"minInterval": 1,
1973+
"maxInterval": 65534,
1974+
"reportableChange": 0
1975+
},
18561976
{
18571977
"name": "AttributeList",
18581978
"code": 65531,
@@ -2389,6 +2509,22 @@
23892509
"maxInterval": 65534,
23902510
"reportableChange": 0
23912511
},
2512+
{
2513+
"name": "EventList",
2514+
"code": 65530,
2515+
"mfgCode": null,
2516+
"side": "server",
2517+
"type": "array",
2518+
"included": 1,
2519+
"storageOption": "External",
2520+
"singleton": 0,
2521+
"bounded": 0,
2522+
"defaultValue": null,
2523+
"reportable": 1,
2524+
"minInterval": 1,
2525+
"maxInterval": 65534,
2526+
"reportableChange": 0
2527+
},
23922528
{
23932529
"name": "AttributeList",
23942530
"code": 65531,
@@ -2673,6 +2809,22 @@
26732809
"maxInterval": 65534,
26742810
"reportableChange": 0
26752811
},
2812+
{
2813+
"name": "EventList",
2814+
"code": 65530,
2815+
"mfgCode": null,
2816+
"side": "server",
2817+
"type": "array",
2818+
"included": 1,
2819+
"storageOption": "External",
2820+
"singleton": 0,
2821+
"bounded": 0,
2822+
"defaultValue": null,
2823+
"reportable": 1,
2824+
"minInterval": 1,
2825+
"maxInterval": 65534,
2826+
"reportableChange": 0
2827+
},
26762828
{
26772829
"name": "AttributeList",
26782830
"code": 65531,
@@ -2877,6 +3029,22 @@
28773029
"maxInterval": 65534,
28783030
"reportableChange": 0
28793031
},
3032+
{
3033+
"name": "EventList",
3034+
"code": 65530,
3035+
"mfgCode": null,
3036+
"side": "server",
3037+
"type": "array",
3038+
"included": 1,
3039+
"storageOption": "External",
3040+
"singleton": 0,
3041+
"bounded": 0,
3042+
"defaultValue": null,
3043+
"reportable": 1,
3044+
"minInterval": 1,
3045+
"maxInterval": 65534,
3046+
"reportableChange": 0
3047+
},
28803048
{
28813049
"name": "AttributeList",
28823050
"code": 65531,

‎applications/matter_bridge/snippets/onoff_plug/zap-generated/endpoint_config.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1123,7 +1123,7 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE,
11231123
// Array of device types
11241124
#define FIXED_DEVICE_TYPES \
11251125
{ \
1126-
{ 0x00000016, 3 }, { 0x0000000E, 2 }, { 0x0000010A, 3 }, \
1126+
{ 0x00000012, 1 }, { 0x00000016, 3 }, { 0x0000000E, 2 }, { 0x0000010A, 3 }, \
11271127
{ \
11281128
0x00000100, 3 \
11291129
} \
@@ -1132,13 +1132,13 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE,
11321132
// Array of device type offsets
11331133
#define FIXED_DEVICE_TYPE_OFFSETS \
11341134
{ \
1135-
0, 1, 2, 3 \
1135+
0, 2, 3, 4 \
11361136
}
11371137

11381138
// Array of device type lengths
11391139
#define FIXED_DEVICE_TYPE_LENGTHS \
11401140
{ \
1141-
1, 1, 1, 1 \
1141+
2, 1, 1, 1 \
11421142
}
11431143

11441144
// Array of endpoint types supported on each endpoint

0 commit comments

Comments
 (0)