Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TC-IDM-10.5: Device type conformance - Add #34424

Merged
merged 11 commits into from
Jul 26, 2024
Merged

TC-IDM-10.5: Device type conformance - Add #34424

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
563946c
TC-IDM-10.5: Device type conformance - Add
cecille Jul 19, 2024
4b10819
Restyled by autopep8
restyled-commits Jul 19, 2024
be752d6
Restyled by isort
restyled-commits Jul 19, 2024
51edb79
Add OTA requestor device type to door lock
cecille Jul 20, 2024
0e6d6eb
add test to CI
cecille Jul 20, 2024
4c1f585
linter
cecille Jul 20, 2024
b4bde38
OTA requestor isn't hooked up, remove
cecille Jul 22, 2024
6625f3d
Merge branch 'master' into device_type_test
cecille Jul 23, 2024
bab1932
Revert "OTA requestor isn't hooked up, remove"
cecille Jul 23, 2024
d8cb909
Revert "Add OTA requestor device type to door lock"
cecille Jul 23, 2024
6170f0a
Remove from CI until door lock OTA is sorted.
cecille Jul 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions examples/lock-app/lock-common/lock-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2502,6 +2502,7 @@ cluster DoorLock = 257 {
endpoint 0 {
device type ma_rootdevice = 22, version 1;
device type ma_powersource = 17, version 1;
device type ma_otarequestor = 18, version 1;
cecille marked this conversation as resolved.
Show resolved Hide resolved

binding cluster OtaSoftwareUpdateProvider;

Expand Down Expand Up @@ -2575,6 +2576,10 @@ endpoint 0 {
ram attribute updatePossible default = 1;
ram attribute updateState default = 0;
ram attribute updateStateProgress default = 0;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 1;

Expand Down
136 changes: 112 additions & 24 deletions examples/lock-app/lock-common/lock-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,18 @@
"id": 1,
"name": "MA-rootdevice",
"deviceTypeRef": {
"code": 17,
"code": 18,
"profileId": 259,
"label": "MA-powersource",
"name": "MA-powersource"
"label": "MA-otarequestor",
"name": "MA-otarequestor"
},
"deviceTypes": [
{
"code": 18,
"profileId": 259,
"label": "MA-otarequestor",
"name": "MA-otarequestor"
},
{
"code": 17,
"profileId": 259,
Expand All @@ -58,15 +64,17 @@
}
],
"deviceVersions": [
1,
1,
1
],
"deviceIdentifiers": [
18,
17,
22
],
"deviceTypeName": "MA-powersource",
"deviceTypeCode": 17,
"deviceTypeName": "MA-otarequestor",
"deviceTypeCode": 18,
"deviceTypeProfileId": 259,
"clusters": [
{
Expand Down Expand Up @@ -104,7 +112,7 @@
"singleton": 0,
"bounded": 0,
"defaultValue": null,
"reportable": 1,
"reportable": 0,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
Expand All @@ -120,7 +128,7 @@
"singleton": 0,
"bounded": 0,
"defaultValue": null,
"reportable": 1,
"reportable": 0,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
Expand All @@ -136,7 +144,7 @@
"singleton": 0,
"bounded": 0,
"defaultValue": null,
"reportable": 1,
"reportable": 0,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
Expand Down Expand Up @@ -258,7 +266,7 @@
"singleton": 0,
"bounded": 0,
"defaultValue": null,
"reportable": 1,
"reportable": 0,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
Expand All @@ -274,7 +282,7 @@
"singleton": 0,
"bounded": 0,
"defaultValue": null,
"reportable": 1,
"reportable": 0,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
Expand Down Expand Up @@ -460,7 +468,7 @@
"singleton": 1,
"bounded": 0,
"defaultValue": null,
"reportable": 1,
"reportable": 0,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
Expand All @@ -476,7 +484,7 @@
"singleton": 1,
"bounded": 0,
"defaultValue": null,
"reportable": 1,
"reportable": 0,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
Expand All @@ -492,7 +500,7 @@
"singleton": 1,
"bounded": 0,
"defaultValue": null,
"reportable": 1,
"reportable": 0,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
Expand All @@ -508,7 +516,7 @@
"singleton": 1,
"bounded": 0,
"defaultValue": null,
"reportable": 1,
"reportable": 0,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
Expand All @@ -524,7 +532,7 @@
"singleton": 1,
"bounded": 0,
"defaultValue": null,
"reportable": 1,
"reportable": 0,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
Expand All @@ -540,7 +548,7 @@
"singleton": 1,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
"reportable": 0,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
Expand All @@ -556,7 +564,7 @@
"singleton": 1,
"bounded": 0,
"defaultValue": null,
"reportable": 1,
"reportable": 0,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
Expand All @@ -572,7 +580,7 @@
"singleton": 1,
"bounded": 0,
"defaultValue": null,
"reportable": 1,
"reportable": 0,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
Expand All @@ -588,7 +596,7 @@
"singleton": 1,
"bounded": 0,
"defaultValue": null,
"reportable": 1,
"reportable": 0,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
Expand All @@ -604,7 +612,7 @@
"singleton": 1,
"bounded": 0,
"defaultValue": null,
"reportable": 1,
"reportable": 0,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
Expand All @@ -620,7 +628,7 @@
"singleton": 1,
"bounded": 0,
"defaultValue": null,
"reportable": 1,
"reportable": 0,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
Expand Down Expand Up @@ -956,6 +964,22 @@
}
],
"attributes": [
{
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
"side": "client",
"type": "bitmap32",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "ClusterRevision",
"code": 65533,
Expand Down Expand Up @@ -1056,6 +1080,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 @@ -1132,7 +1220,7 @@
"singleton": 0,
"bounded": 0,
"defaultValue": "en-US",
"reportable": 1,
"reportable": 0,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
Expand All @@ -1148,7 +1236,7 @@
"singleton": 0,
"bounded": 0,
"defaultValue": null,
"reportable": 1,
"reportable": 0,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
Expand Down Expand Up @@ -2249,7 +2337,7 @@
"singleton": 0,
"bounded": 0,
"defaultValue": null,
"reportable": 1,
"reportable": 0,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
Expand Down
Loading
Loading