Skip to content

Commit 38e459b

Browse files
bzbarsky-applebzbarsky-apple
authored
Add a device type metadata table in Darwin codegen. (#29926)
* Add a device type metadata table in Darwin codegen. The changes in device type XML were to clearly mark our test device types as having a test vendor id. The .zap files were updated with those new device type IDs, but this also has some noise in the .zap file, apparently. * Regenerate generated files.
1 parent 9d876c5 commit 38e459b

File tree

21 files changed

+847
-53
lines changed

21 files changed

+847
-53
lines changed

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

+9-1
Original file line numberDiff line numberDiff line change
@@ -6869,14 +6869,18 @@ endpoint 2 {
68696869
}
68706870
}
68716871
endpoint 65534 {
6872-
device type ma_secondary_network_commissioning = 61442, version 1;
6872+
device type ma_secondary_network_commissioning = 4293984258, version 1;
68736873

68746874

68756875
server cluster Descriptor {
68766876
callback attribute deviceTypeList;
68776877
callback attribute serverList;
68786878
callback attribute clientList;
68796879
callback attribute partsList;
6880+
callback attribute generatedCommandList;
6881+
callback attribute acceptedCommandList;
6882+
callback attribute eventList;
6883+
callback attribute attributeList;
68806884
ram attribute featureMap default = 0;
68816885
callback attribute clusterRevision default = 2;
68826886
}
@@ -6890,6 +6894,10 @@ endpoint 65534 {
68906894
callback attribute lastNetworkingStatus;
68916895
callback attribute lastNetworkID;
68926896
callback attribute lastConnectErrorValue;
6897+
callback attribute generatedCommandList;
6898+
callback attribute acceptedCommandList;
6899+
callback attribute eventList;
6900+
callback attribute attributeList;
68936901
callback attribute featureMap default = 0;
68946902
callback attribute clusterRevision default = 1;
68956903

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

+132-4
Original file line numberDiff line numberDiff line change
@@ -21352,14 +21352,14 @@
2135221352
"id": 4,
2135321353
"name": "Anonymous Endpoint Type",
2135421354
"deviceTypeRef": {
21355-
"code": 61442,
21355+
"code": 4293984258,
2135621356
"profileId": 259,
2135721357
"label": "MA-secondary-network-commissioning",
2135821358
"name": "MA-secondary-network-commissioning"
2135921359
},
2136021360
"deviceTypes": [
2136121361
{
21362-
"code": 61442,
21362+
"code": 4293984258,
2136321363
"profileId": 259,
2136421364
"label": "MA-secondary-network-commissioning",
2136521365
"name": "MA-secondary-network-commissioning"
@@ -21369,10 +21369,10 @@
2136921369
1
2137021370
],
2137121371
"deviceIdentifiers": [
21372-
61442
21372+
4293984258
2137321373
],
2137421374
"deviceTypeName": "MA-secondary-network-commissioning",
21375-
"deviceTypeCode": 61442,
21375+
"deviceTypeCode": 4293984258,
2137621376
"deviceTypeProfileId": 259,
2137721377
"clusters": [
2137821378
{
@@ -21447,6 +21447,70 @@
2144721447
"maxInterval": 65534,
2144821448
"reportableChange": 0
2144921449
},
21450+
{
21451+
"name": "GeneratedCommandList",
21452+
"code": 65528,
21453+
"mfgCode": null,
21454+
"side": "server",
21455+
"type": "array",
21456+
"included": 1,
21457+
"storageOption": "External",
21458+
"singleton": 0,
21459+
"bounded": 0,
21460+
"defaultValue": "",
21461+
"reportable": 1,
21462+
"minInterval": 1,
21463+
"maxInterval": 65534,
21464+
"reportableChange": 0
21465+
},
21466+
{
21467+
"name": "AcceptedCommandList",
21468+
"code": 65529,
21469+
"mfgCode": null,
21470+
"side": "server",
21471+
"type": "array",
21472+
"included": 1,
21473+
"storageOption": "External",
21474+
"singleton": 0,
21475+
"bounded": 0,
21476+
"defaultValue": "",
21477+
"reportable": 1,
21478+
"minInterval": 1,
21479+
"maxInterval": 65534,
21480+
"reportableChange": 0
21481+
},
21482+
{
21483+
"name": "EventList",
21484+
"code": 65530,
21485+
"mfgCode": null,
21486+
"side": "server",
21487+
"type": "array",
21488+
"included": 1,
21489+
"storageOption": "External",
21490+
"singleton": 0,
21491+
"bounded": 0,
21492+
"defaultValue": "",
21493+
"reportable": 1,
21494+
"minInterval": 1,
21495+
"maxInterval": 65534,
21496+
"reportableChange": 0
21497+
},
21498+
{
21499+
"name": "AttributeList",
21500+
"code": 65531,
21501+
"mfgCode": null,
21502+
"side": "server",
21503+
"type": "array",
21504+
"included": 1,
21505+
"storageOption": "External",
21506+
"singleton": 0,
21507+
"bounded": 0,
21508+
"defaultValue": "",
21509+
"reportable": 1,
21510+
"minInterval": 1,
21511+
"maxInterval": 65534,
21512+
"reportableChange": 0
21513+
},
2145021514
{
2145121515
"name": "FeatureMap",
2145221516
"code": 65532,
@@ -21691,6 +21755,70 @@
2169121755
"maxInterval": 65534,
2169221756
"reportableChange": 0
2169321757
},
21758+
{
21759+
"name": "GeneratedCommandList",
21760+
"code": 65528,
21761+
"mfgCode": null,
21762+
"side": "server",
21763+
"type": "array",
21764+
"included": 1,
21765+
"storageOption": "External",
21766+
"singleton": 0,
21767+
"bounded": 0,
21768+
"defaultValue": "",
21769+
"reportable": 1,
21770+
"minInterval": 1,
21771+
"maxInterval": 65534,
21772+
"reportableChange": 0
21773+
},
21774+
{
21775+
"name": "AcceptedCommandList",
21776+
"code": 65529,
21777+
"mfgCode": null,
21778+
"side": "server",
21779+
"type": "array",
21780+
"included": 1,
21781+
"storageOption": "External",
21782+
"singleton": 0,
21783+
"bounded": 0,
21784+
"defaultValue": "",
21785+
"reportable": 1,
21786+
"minInterval": 1,
21787+
"maxInterval": 65534,
21788+
"reportableChange": 0
21789+
},
21790+
{
21791+
"name": "EventList",
21792+
"code": 65530,
21793+
"mfgCode": null,
21794+
"side": "server",
21795+
"type": "array",
21796+
"included": 1,
21797+
"storageOption": "External",
21798+
"singleton": 0,
21799+
"bounded": 0,
21800+
"defaultValue": "",
21801+
"reportable": 1,
21802+
"minInterval": 1,
21803+
"maxInterval": 65534,
21804+
"reportableChange": 0
21805+
},
21806+
{
21807+
"name": "AttributeList",
21808+
"code": 65531,
21809+
"mfgCode": null,
21810+
"side": "server",
21811+
"type": "array",
21812+
"included": 1,
21813+
"storageOption": "External",
21814+
"singleton": 0,
21815+
"bounded": 0,
21816+
"defaultValue": "",
21817+
"reportable": 1,
21818+
"minInterval": 1,
21819+
"maxInterval": 65534,
21820+
"reportableChange": 0
21821+
},
2169421822
{
2169521823
"name": "FeatureMap",
2169621824
"code": 65532,

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

+9-1
Original file line numberDiff line numberDiff line change
@@ -5022,14 +5022,18 @@ endpoint 2 {
50225022
}
50235023
}
50245024
endpoint 65534 {
5025-
device type ma_secondary_network_commissioning = 61442, version 1;
5025+
device type ma_secondary_network_commissioning = 4293984258, version 1;
50265026

50275027

50285028
server cluster Descriptor {
50295029
callback attribute deviceTypeList;
50305030
callback attribute serverList;
50315031
callback attribute clientList;
50325032
callback attribute partsList;
5033+
callback attribute generatedCommandList;
5034+
callback attribute acceptedCommandList;
5035+
callback attribute eventList;
5036+
callback attribute attributeList;
50335037
ram attribute featureMap default = 0;
50345038
callback attribute clusterRevision default = 1;
50355039
}
@@ -5043,6 +5047,10 @@ endpoint 65534 {
50435047
callback attribute lastNetworkingStatus;
50445048
callback attribute lastNetworkID;
50455049
callback attribute lastConnectErrorValue;
5050+
callback attribute generatedCommandList;
5051+
callback attribute acceptedCommandList;
5052+
callback attribute eventList;
5053+
callback attribute attributeList;
50465054
callback attribute featureMap default = 0;
50475055
callback attribute clusterRevision default = 1;
50485056

0 commit comments

Comments
 (0)