Skip to content

Commit 38fd9c7

Browse files
satyanaag-silabsjmartinez-silabs
satyanaag-silabs
authored and
jmartinez-silabs
committed
MATTER-3197: fix UMB build failure with latest zap generation with unify 1.5.0
Squashed commit of the following: commit c2c449ebd87ea4235813ba9c1394e0b15f48ebcb Author: sabollim <satyanaag.bollimpalli@silabs.com> Date: Wed Feb 28 14:22:39 2024 +0530 MATTER-3197: remove zap_pregenerated_dir in silabs_examples gn files commit ddb060777b4d6b200fa4e33a3167d9e6ee6d1feb Author: sabollim <satyanaag.bollimpalli@silabs.com> Date: Wed Feb 28 13:01:31 2024 +0530 MATTER-3197: fix UMB build failure with latest zap generation with unify 1.5.0
1 parent 1bc892f commit 38fd9c7

18 files changed

+843
-206
lines changed

‎silabs_examples/unify-matter-bridge/linux/src/tests/unify-matter-bridge-ut/BUILD.gn

-3
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,5 @@ import("${chip_root}/src/app/chip_data_model.gni")
1616

1717
chip_data_model("unify-matter-bridge-ut") {
1818
zap_file = "unify-matter-bridge-ut.zap"
19-
20-
zap_pregenerated_dir =
21-
"${chip_root}/silabs_examples/unify-matter-bridge/linux/zap-generated/unify-matter-bridge-common/zap-generated"
2219
is_server = true
2320
}

‎silabs_examples/unify-matter-bridge/linux/src/tests/unify-matter-bridge-ut/unify-matter-bridge-ut.matter

+25-5
Original file line numberDiff line numberDiff line change
@@ -865,6 +865,10 @@ cluster GeneralDiagnostics = 51 {
865865
kEthernetFault = 6;
866866
}
867867

868+
bitmap Feature : bitmap32 {
869+
kDataModelTest = 0x1;
870+
}
871+
868872
struct NetworkInterface {
869873
char_string<32> name = 0;
870874
boolean isOperational = 1;
@@ -921,10 +925,22 @@ cluster GeneralDiagnostics = 51 {
921925
nullable posix_ms posixTimeMs = 1;
922926
}
923927

928+
request struct PayloadTestRequestRequest {
929+
octet_string<16> enableKey = 0;
930+
int8u value = 1;
931+
int16u count = 2;
932+
}
933+
934+
response struct PayloadTestResponse = 4 {
935+
octet_string payload = 0;
936+
}
937+
924938
/** Provide a means for certification tests to trigger some test-plan-specific events */
925939
command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
926940
/** Take a snapshot of system time and epoch time. */
927941
command TimeSnapshot(): TimeSnapshotResponse = 1;
942+
/** Request a variable length payload response. */
943+
command PayloadTestRequest(PayloadTestRequestRequest): PayloadTestResponse = 3;
928944
}
929945

930946
/** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
@@ -1310,7 +1326,7 @@ endpoint 0 {
13101326
callback attribute generatedCommandList;
13111327
callback attribute acceptedCommandList;
13121328
callback attribute attributeList;
1313-
ram attribute featureMap default = 0;
1329+
callback attribute featureMap;
13141330
callback attribute clusterRevision;
13151331
}
13161332

@@ -1348,11 +1364,13 @@ endpoint 0 {
13481364
ram attribute reachable default = 1;
13491365
callback attribute uniqueID;
13501366
callback attribute capabilityMinima;
1367+
callback attribute specificationVersion;
1368+
callback attribute maxPathsPerInvoke;
13511369
callback attribute generatedCommandList;
13521370
callback attribute acceptedCommandList;
13531371
callback attribute attributeList;
13541372
ram attribute featureMap default = 0;
1355-
ram attribute clusterRevision default = 2;
1373+
ram attribute clusterRevision default = 3;
13561374
}
13571375

13581376
server cluster LocalizationConfiguration {
@@ -1443,10 +1461,12 @@ endpoint 0 {
14431461
callback attribute generatedCommandList;
14441462
callback attribute acceptedCommandList;
14451463
callback attribute attributeList;
1446-
ram attribute featureMap default = 0;
1447-
ram attribute clusterRevision default = 1;
1464+
callback attribute featureMap;
1465+
callback attribute clusterRevision;
14481466

14491467
handle command TestEventTrigger;
1468+
handle command TimeSnapshot;
1469+
handle command TimeSnapshotResponse;
14501470
}
14511471

14521472
server cluster SoftwareDiagnostics {
@@ -1593,7 +1613,7 @@ endpoint 1 {
15931613
callback attribute generatedCommandList;
15941614
callback attribute acceptedCommandList;
15951615
callback attribute attributeList;
1596-
ram attribute featureMap default = 0;
1616+
callback attribute featureMap;
15971617
callback attribute clusterRevision;
15981618
}
15991619
}

‎silabs_examples/unify-matter-bridge/linux/src/tests/unify-matter-bridge-ut/unify-matter-bridge-ut.zap

+58-11
Original file line numberDiff line numberDiff line change
@@ -187,10 +187,10 @@
187187
"side": "server",
188188
"type": "bitmap32",
189189
"included": 1,
190-
"storageOption": "RAM",
190+
"storageOption": "External",
191191
"singleton": 0,
192192
"bounded": 0,
193-
"defaultValue": "0",
193+
"defaultValue": null,
194194
"reportable": 1,
195195
"minInterval": 1,
196196
"maxInterval": 65534,
@@ -754,6 +754,38 @@
754754
"maxInterval": 65534,
755755
"reportableChange": 0
756756
},
757+
{
758+
"name": "SpecificationVersion",
759+
"code": 21,
760+
"mfgCode": null,
761+
"side": "server",
762+
"type": "int32u",
763+
"included": 1,
764+
"storageOption": "External",
765+
"singleton": 1,
766+
"bounded": 0,
767+
"defaultValue": null,
768+
"reportable": 1,
769+
"minInterval": 1,
770+
"maxInterval": 65534,
771+
"reportableChange": 0
772+
},
773+
{
774+
"name": "MaxPathsPerInvoke",
775+
"code": 22,
776+
"mfgCode": null,
777+
"side": "server",
778+
"type": "int16u",
779+
"included": 1,
780+
"storageOption": "External",
781+
"singleton": 1,
782+
"bounded": 0,
783+
"defaultValue": null,
784+
"reportable": 1,
785+
"minInterval": 1,
786+
"maxInterval": 65534,
787+
"reportableChange": 0
788+
},
757789
{
758790
"name": "GeneratedCommandList",
759791
"code": 65528,
@@ -828,7 +860,7 @@
828860
"storageOption": "RAM",
829861
"singleton": 1,
830862
"bounded": 0,
831-
"defaultValue": "2",
863+
"defaultValue": "3",
832864
"reportable": 1,
833865
"minInterval": 0,
834866
"maxInterval": 65344,
@@ -1669,6 +1701,22 @@
16691701
"source": "client",
16701702
"isIncoming": 1,
16711703
"isEnabled": 1
1704+
},
1705+
{
1706+
"name": "TimeSnapshot",
1707+
"code": 1,
1708+
"mfgCode": null,
1709+
"source": "client",
1710+
"isIncoming": 1,
1711+
"isEnabled": 1
1712+
},
1713+
{
1714+
"name": "TimeSnapshotResponse",
1715+
"code": 2,
1716+
"mfgCode": null,
1717+
"source": "server",
1718+
"isIncoming": 0,
1719+
"isEnabled": 1
16721720
}
16731721
],
16741722
"attributes": [
@@ -1871,10 +1919,10 @@
18711919
"side": "server",
18721920
"type": "bitmap32",
18731921
"included": 1,
1874-
"storageOption": "RAM",
1922+
"storageOption": "External",
18751923
"singleton": 0,
18761924
"bounded": 0,
1877-
"defaultValue": "0",
1925+
"defaultValue": null,
18781926
"reportable": 1,
18791927
"minInterval": 1,
18801928
"maxInterval": 65534,
@@ -1887,10 +1935,10 @@
18871935
"side": "server",
18881936
"type": "int16u",
18891937
"included": 1,
1890-
"storageOption": "RAM",
1938+
"storageOption": "External",
18911939
"singleton": 0,
18921940
"bounded": 0,
1893-
"defaultValue": "1",
1941+
"defaultValue": null,
18941942
"reportable": 1,
18951943
"minInterval": 0,
18961944
"maxInterval": 65344,
@@ -5155,10 +5203,10 @@
51555203
"side": "server",
51565204
"type": "bitmap32",
51575205
"included": 1,
5158-
"storageOption": "RAM",
5206+
"storageOption": "External",
51595207
"singleton": 0,
51605208
"bounded": 0,
5161-
"defaultValue": "0",
5209+
"defaultValue": null,
51625210
"reportable": 1,
51635211
"minInterval": 1,
51645212
"maxInterval": 65534,
@@ -5242,6 +5290,5 @@
52425290
"endpointId": 1,
52435291
"networkId": 0
52445292
}
5245-
],
5246-
"log": []
5293+
]
52475294
}

0 commit comments

Comments
 (0)