Skip to content

Commit

Permalink
Update generated profile id and device id in endpoint_config.h (#12612)
Browse files Browse the repository at this point in the history
* Use the correct profileId for examples/tv-app/tv-common/tv-app.zap

* Use the correct profileId for examples/lighting-app/lighting-common/lighting-app.zap

* Use the correct profileId for examples/window-app/common/window-app.zap

* Use the correct profileId for examples/ota-provider-app/ota-provider-common/ota-provider-app.zap

* Use MA-rootdevice for all endpoints of the TV casting app

* Use the correct profileId for examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap

* Use the correct profileId for examples/all-clusters-app/all-clusters-common/all-clusters-app.zap

* Make sure there is no null values for device identifier in examples/temperature-measurement-app/esp32/main/temperature-measurement.za

* Use the correct profileId for examples/lock-app/lock-common/lock-app.zap

* Use the correct device identifier in examples/pump-app/pump-common/pump-app.zap

* Use the correct profileId in examples/thermostat/thermostat-common/thermostat.zap

* Use the correct device identifier in examples/pump-controller-app/pump-controller-common/pump-controller-app.zap

* Use the correct profileId/deviceIdentifier for examples/bridge-app/bridge-common/bridge-app.zap

* Use something that does not convert to null in src/controller/data_model/controller-clusters.zap

* Update ZAP

* Update generated profile id and device id

* Update TestDescriptorCluster.yaml

* Update generated tests
  • Loading branch information
vivien-apple authored and pull[bot] committed Jul 28, 2023
1 parent 1807a54 commit 1789516
Show file tree
Hide file tree
Showing 34 changed files with 1,466 additions and 1,480 deletions.
659 changes: 329 additions & 330 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.zap

Large diffs are not rendered by default.

33 changes: 16 additions & 17 deletions examples/bridge-app/bridge-common/bridge-app.zap
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
],
"endpointTypes": [
{
"name": "Anonymous Endpoint Type",
"deviceTypeName": "Bridge Device",
"deviceTypeCode": 2571,
"deviceTypeProfileId": 43981,
"name": "MA-bridge",
"deviceTypeName": "MA-bridge",
"deviceTypeCode": 14,
"deviceTypeProfileId": 259,
"clusters": [
{
"name": "Descriptor",
Expand Down Expand Up @@ -2863,10 +2863,10 @@
]
},
{
"name": "Anonymous Endpoint Type",
"deviceTypeName": "LO-dimmablelight",
"name": "MA-dimmablelight",
"deviceTypeName": "MA-dimmablelight",
"deviceTypeCode": 257,
"deviceTypeProfileId": 260,
"deviceTypeProfileId": 259,
"clusters": [
{
"name": "Identify",
Expand Down Expand Up @@ -4300,23 +4300,22 @@
],
"endpoints": [
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeName": "MA-bridge",
"endpointTypeIndex": 0,
"profileId": 43981,
"profileId": 259,
"endpointId": 0,
"networkId": 0,
"endpointVersion": null,
"deviceIdentifier": null
"endpointVersion": 1,
"deviceIdentifier": 14
},
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeName": "MA-dimmablelight",
"endpointTypeIndex": 1,
"profileId": "0x0104",
"profileId": 259,
"endpointId": 1,
"networkId": 0,
"endpointVersion": null,
"deviceIdentifier": null
"endpointVersion": 1,
"deviceIdentifier": 257
}
],
"log": []
]
}
43 changes: 21 additions & 22 deletions examples/lighting-app/lighting-common/lighting-app.zap
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
],
"endpointTypes": [
{
"name": "Anonymous Endpoint Type",
"deviceTypeName": "LO-dimmablelight",
"deviceTypeCode": 257,
"deviceTypeProfileId": 260,
"name": "MA-rootdevice",
"deviceTypeName": "MA-rootdevice",
"deviceTypeCode": 22,
"deviceTypeProfileId": 259,
"clusters": [
{
"name": "Identify",
Expand Down Expand Up @@ -3886,10 +3886,10 @@
]
},
{
"name": "Anonymous Endpoint Type",
"deviceTypeName": "LO-dimmablelight",
"name": "MA-dimmablelight",
"deviceTypeName": "MA-dimmablelight",
"deviceTypeCode": 257,
"deviceTypeProfileId": 260,
"deviceTypeProfileId": 259,
"clusters": [
{
"name": "Identify",
Expand Down Expand Up @@ -5961,10 +5961,10 @@
]
},
{
"name": "Anonymous Endpoint Type",
"deviceTypeName": "LO-onofflightswitch",
"name": "MA-onofflightswitch",
"deviceTypeName": "MA-onofflightswitch",
"deviceTypeCode": 259,
"deviceTypeProfileId": 260,
"deviceTypeProfileId": 259,
"clusters": [
{
"name": "Identify",
Expand Down Expand Up @@ -6504,32 +6504,31 @@
],
"endpoints": [
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeName": "MA-rootdevice",
"endpointTypeIndex": 0,
"profileId": "0x0104",
"profileId": 259,
"endpointId": 0,
"networkId": 0,
"endpointVersion": null,
"deviceIdentifier": null
"endpointVersion": 1,
"deviceIdentifier": 22
},
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeName": "MA-dimmablelight",
"endpointTypeIndex": 1,
"profileId": 260,
"profileId": 259,
"endpointId": 1,
"networkId": 0,
"endpointVersion": "",
"deviceIdentifier": null
"endpointVersion": 1,
"deviceIdentifier": 257
},
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeName": "MA-onofflightswitch",
"endpointTypeIndex": 2,
"profileId": 260,
"profileId": 259,
"endpointId": 2,
"networkId": 0,
"endpointVersion": 1,
"deviceIdentifier": 259
}
],
"log": []
]
}
35 changes: 17 additions & 18 deletions examples/lock-app/lock-common/lock-app.zap
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
],
"endpointTypes": [
{
"name": "Anonymous Endpoint Type",
"deviceTypeName": null,
"deviceTypeCode": null,
"deviceTypeProfileId": null,
"name": "MA-rootdevice",
"deviceTypeName": "MA-rootdevice",
"deviceTypeCode": 22,
"deviceTypeProfileId": 259,
"clusters": [
{
"name": "Power Configuration",
Expand Down Expand Up @@ -3942,10 +3942,10 @@
]
},
{
"name": "Anonymous Endpoint Type",
"deviceTypeName": null,
"deviceTypeCode": null,
"deviceTypeProfileId": null,
"name": "MA-doorlock",
"deviceTypeName": "MA-doorlock",
"deviceTypeCode": 10,
"deviceTypeProfileId": 259,
"clusters": [
{
"name": "Power Configuration",
Expand Down Expand Up @@ -5525,23 +5525,22 @@
],
"endpoints": [
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeName": "MA-rootdevice",
"endpointTypeIndex": 0,
"profileId": "0x109",
"profileId": 259,
"endpointId": 0,
"networkId": 0,
"endpointVersion": null,
"deviceIdentifier": null
"endpointVersion": 1,
"deviceIdentifier": 22
},
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeName": "MA-doorlock",
"endpointTypeIndex": 1,
"profileId": 261,
"profileId": 259,
"endpointId": 1,
"networkId": 0,
"endpointVersion": 0,
"deviceIdentifier": null
"endpointVersion": 1,
"deviceIdentifier": 10
}
],
"log": []
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
],
"endpointTypes": [
{
"name": "Anonymous Endpoint Type",
"deviceTypeName": "MA-all-clusters-app",
"deviceTypeCode": 0,
"name": "MA-rootdevice",
"deviceTypeName": "MA-rootdevice",
"deviceTypeCode": 22,
"deviceTypeProfileId": 259,
"clusters": [
{
Expand Down Expand Up @@ -1054,7 +1054,7 @@
"outgoing": 1
},
{
"name": "ApplyUpdateRequestResponse",
"name": "ApplyUpdateResponse",
"code": 4,
"mfgCode": null,
"source": "server",
Expand Down Expand Up @@ -3664,14 +3664,13 @@
],
"endpoints": [
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeName": "MA-rootdevice",
"endpointTypeIndex": 0,
"profileId": 598,
"profileId": 259,
"endpointId": 0,
"networkId": 0,
"endpointVersion": 1,
"deviceIdentifier": null
"deviceIdentifier": 22
}
],
"log": []
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
],
"endpointTypes": [
{
"name": "Anonymous Endpoint Type",
"deviceTypeName": "MA-all-clusters-app",
"deviceTypeCode": 0,
"name": "MA-rootdevice",
"deviceTypeName": "MA-rootdevice",
"deviceTypeCode": 22,
"deviceTypeProfileId": 259,
"clusters": [
{
Expand Down Expand Up @@ -1054,7 +1054,7 @@
"outgoing": 0
},
{
"name": "ApplyUpdateRequestResponse",
"name": "ApplyUpdateResponse",
"code": 4,
"mfgCode": null,
"source": "server",
Expand Down Expand Up @@ -3703,14 +3703,13 @@
],
"endpoints": [
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeName": "MA-rootdevice",
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
"networkId": 0,
"endpointVersion": 1,
"deviceIdentifier": 0
"deviceIdentifier": 22
}
],
"log": []
]
}
17 changes: 8 additions & 9 deletions examples/pump-app/pump-common/pump-app.zap
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
],
"endpointTypes": [
{
"name": "Anonymous Endpoint Type",
"deviceTypeName": "Pump",
"name": "MA-pump",
"deviceTypeName": "MA-pump",
"deviceTypeCode": 771,
"deviceTypeProfileId": 2457,
"clusters": [
Expand Down Expand Up @@ -4144,7 +4144,7 @@
]
},
{
"name": "Anonymous Endpoint Type",
"name": "MA-pump",
"deviceTypeName": "MA-pump",
"deviceTypeCode": 771,
"deviceTypeProfileId": 2457,
Expand Down Expand Up @@ -6009,23 +6009,22 @@
],
"endpoints": [
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeName": "MA-pump",
"endpointTypeIndex": 0,
"profileId": 2457,
"endpointId": 0,
"networkId": 0,
"endpointVersion": 1,
"deviceIdentifier": null
"deviceIdentifier": 771
},
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeName": "MA-pump",
"endpointTypeIndex": 1,
"profileId": 2457,
"endpointId": 1,
"networkId": 0,
"endpointVersion": 1,
"deviceIdentifier": null
"deviceIdentifier": 771
}
],
"log": []
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
],
"endpointTypes": [
{
"name": "Anonymous Endpoint Type",
"deviceTypeName": "Pump Controller",
"name": "MA-pumpcontroller",
"deviceTypeName": "MA-pumpcontroller",
"deviceTypeCode": 772,
"deviceTypeProfileId": 2457,
"clusters": [
Expand Down Expand Up @@ -4144,8 +4144,8 @@
]
},
{
"name": "Anonymous Endpoint Type",
"deviceTypeName": "Pump Controller",
"name": "MA-pumpcontroller",
"deviceTypeName": "MA-pumpcontroller",
"deviceTypeCode": 772,
"deviceTypeProfileId": 2457,
"clusters": [
Expand Down Expand Up @@ -5754,23 +5754,22 @@
],
"endpoints": [
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeName": "MA-pumpcontroller",
"endpointTypeIndex": 0,
"profileId": 2457,
"endpointId": 0,
"networkId": 0,
"endpointVersion": 1,
"deviceIdentifier": null
"deviceIdentifier": 772
},
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeName": "MA-pumpcontroller",
"endpointTypeIndex": 1,
"profileId": 2457,
"endpointId": 1,
"networkId": 0,
"endpointVersion": 1,
"deviceIdentifier": null
"deviceIdentifier": 772
}
],
"log": []
]
}
Loading

0 comments on commit 1789516

Please sign in to comment.