Skip to content

Commit

Permalink
Add a device type metadata table in Darwin codegen. (#29926)
Browse files Browse the repository at this point in the history
* 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.
  • Loading branch information
bzbarsky-apple authored Oct 25, 2023
1 parent 9d876c5 commit 38e459b
Show file tree
Hide file tree
Showing 21 changed files with 847 additions and 53 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6869,14 +6869,18 @@ endpoint 2 {
}
}
endpoint 65534 {
device type ma_secondary_network_commissioning = 61442, version 1;
device type ma_secondary_network_commissioning = 4293984258, version 1;


server cluster Descriptor {
callback attribute deviceTypeList;
callback attribute serverList;
callback attribute clientList;
callback attribute partsList;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 0;
callback attribute clusterRevision default = 2;
}
Expand All @@ -6890,6 +6894,10 @@ endpoint 65534 {
callback attribute lastNetworkingStatus;
callback attribute lastNetworkID;
callback attribute lastConnectErrorValue;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
callback attribute featureMap default = 0;
callback attribute clusterRevision default = 1;

Expand Down
136 changes: 132 additions & 4 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
Original file line number Diff line number Diff line change
Expand Up @@ -21352,14 +21352,14 @@
"id": 4,
"name": "Anonymous Endpoint Type",
"deviceTypeRef": {
"code": 61442,
"code": 4293984258,
"profileId": 259,
"label": "MA-secondary-network-commissioning",
"name": "MA-secondary-network-commissioning"
},
"deviceTypes": [
{
"code": 61442,
"code": 4293984258,
"profileId": 259,
"label": "MA-secondary-network-commissioning",
"name": "MA-secondary-network-commissioning"
Expand All @@ -21369,10 +21369,10 @@
1
],
"deviceIdentifiers": [
61442
4293984258
],
"deviceTypeName": "MA-secondary-network-commissioning",
"deviceTypeCode": 61442,
"deviceTypeCode": 4293984258,
"deviceTypeProfileId": 259,
"clusters": [
{
Expand Down Expand Up @@ -21447,6 +21447,70 @@
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "GeneratedCommandList",
"code": 65528,
"mfgCode": null,
"side": "server",
"type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "AcceptedCommandList",
"code": 65529,
"mfgCode": null,
"side": "server",
"type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "EventList",
"code": 65530,
"mfgCode": null,
"side": "server",
"type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
"side": "server",
"type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "FeatureMap",
"code": 65532,
Expand Down Expand Up @@ -21691,6 +21755,70 @@
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "GeneratedCommandList",
"code": 65528,
"mfgCode": null,
"side": "server",
"type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "AcceptedCommandList",
"code": 65529,
"mfgCode": null,
"side": "server",
"type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "EventList",
"code": 65530,
"mfgCode": null,
"side": "server",
"type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
"side": "server",
"type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "FeatureMap",
"code": 65532,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5022,14 +5022,18 @@ endpoint 2 {
}
}
endpoint 65534 {
device type ma_secondary_network_commissioning = 61442, version 1;
device type ma_secondary_network_commissioning = 4293984258, version 1;


server cluster Descriptor {
callback attribute deviceTypeList;
callback attribute serverList;
callback attribute clientList;
callback attribute partsList;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 0;
callback attribute clusterRevision default = 1;
}
Expand All @@ -5043,6 +5047,10 @@ endpoint 65534 {
callback attribute lastNetworkingStatus;
callback attribute lastNetworkID;
callback attribute lastConnectErrorValue;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
callback attribute featureMap default = 0;
callback attribute clusterRevision default = 1;

Expand Down
Loading

0 comments on commit 38e459b

Please sign in to comment.