Skip to content

Commit 62a1313

Browse files
bzbarsky-applebzbarsky-apple
committed
Enable Aliro bits in example lock-app.
Fixes the FeatureMap on the cluster to enable the Aliro bits as well, and correctly marks the parts that are implemented via AttributeAccessInterface.
1 parent 51e47f1 commit 62a1313

File tree

6 files changed

+191
-504
lines changed

6 files changed

+191
-504
lines changed

‎examples/lock-app/lock-common/lock-app.matter

+12-1
Original file line numberDiff line numberDiff line change
@@ -3079,11 +3079,20 @@ endpoint 1 {
30793079
ram attribute wrongCodeEntryLimit default = 3;
30803080
ram attribute userCodeTemporaryDisableTime default = 10;
30813081
ram attribute requirePINforRemoteOperation default = 0;
3082+
callback attribute aliroReaderVerificationKey;
3083+
callback attribute aliroReaderGroupIdentifier;
3084+
callback attribute aliroReaderGroupSubIdentifier;
3085+
callback attribute aliroExpeditedTransactionSupportedProtocolVersions;
3086+
callback attribute aliroGroupResolvingKey;
3087+
callback attribute aliroSupportedBLEUWBProtocolVersions;
3088+
callback attribute aliroBLEAdvertisingVersion;
3089+
callback attribute numberOfAliroCredentialIssuerKeysSupported;
3090+
callback attribute numberOfAliroEndpointKeysSupported;
30823091
callback attribute generatedCommandList;
30833092
callback attribute acceptedCommandList;
30843093
callback attribute eventList;
30853094
callback attribute attributeList;
3086-
ram attribute featureMap default = 0x1DB3;
3095+
ram attribute featureMap default = 0x7DB3;
30873096
ram attribute clusterRevision default = 7;
30883097

30893098
handle command LockDoor;
@@ -3111,6 +3120,8 @@ endpoint 1 {
31113120
handle command GetCredentialStatusResponse;
31123121
handle command ClearCredential;
31133122
handle command UnboltDoor;
3123+
handle command SetAliroReaderConfig;
3124+
handle command ClearAliroReaderConfig;
31143125
}
31153126
}
31163127

‎examples/lock-app/lock-common/lock-app.zap

+161-1
Original file line numberDiff line numberDiff line change
@@ -5851,6 +5851,22 @@
58515851
"source": "client",
58525852
"isIncoming": 1,
58535853
"isEnabled": 1
5854+
},
5855+
{
5856+
"name": "SetAliroReaderConfig",
5857+
"code": 40,
5858+
"mfgCode": null,
5859+
"source": "client",
5860+
"isIncoming": 1,
5861+
"isEnabled": 1
5862+
},
5863+
{
5864+
"name": "ClearAliroReaderConfig",
5865+
"code": 41,
5866+
"mfgCode": null,
5867+
"source": "client",
5868+
"isIncoming": 1,
5869+
"isEnabled": 1
58545870
}
58555871
],
58565872
"attributes": [
@@ -6270,6 +6286,150 @@
62706286
"maxInterval": 65534,
62716287
"reportableChange": 0
62726288
},
6289+
{
6290+
"name": "AliroReaderVerificationKey",
6291+
"code": 128,
6292+
"mfgCode": null,
6293+
"side": "server",
6294+
"type": "octet_string",
6295+
"included": 1,
6296+
"storageOption": "External",
6297+
"singleton": 0,
6298+
"bounded": 0,
6299+
"defaultValue": "",
6300+
"reportable": 1,
6301+
"minInterval": 1,
6302+
"maxInterval": 65534,
6303+
"reportableChange": 0
6304+
},
6305+
{
6306+
"name": "AliroReaderGroupIdentifier",
6307+
"code": 129,
6308+
"mfgCode": null,
6309+
"side": "server",
6310+
"type": "octet_string",
6311+
"included": 1,
6312+
"storageOption": "External",
6313+
"singleton": 0,
6314+
"bounded": 0,
6315+
"defaultValue": "",
6316+
"reportable": 1,
6317+
"minInterval": 1,
6318+
"maxInterval": 65534,
6319+
"reportableChange": 0
6320+
},
6321+
{
6322+
"name": "AliroReaderGroupSubIdentifier",
6323+
"code": 130,
6324+
"mfgCode": null,
6325+
"side": "server",
6326+
"type": "octet_string",
6327+
"included": 1,
6328+
"storageOption": "External",
6329+
"singleton": 0,
6330+
"bounded": 0,
6331+
"defaultValue": "",
6332+
"reportable": 1,
6333+
"minInterval": 1,
6334+
"maxInterval": 65534,
6335+
"reportableChange": 0
6336+
},
6337+
{
6338+
"name": "AliroExpeditedTransactionSupportedProtocolVersions",
6339+
"code": 131,
6340+
"mfgCode": null,
6341+
"side": "server",
6342+
"type": "array",
6343+
"included": 1,
6344+
"storageOption": "External",
6345+
"singleton": 0,
6346+
"bounded": 0,
6347+
"defaultValue": "",
6348+
"reportable": 1,
6349+
"minInterval": 1,
6350+
"maxInterval": 65534,
6351+
"reportableChange": 0
6352+
},
6353+
{
6354+
"name": "AliroGroupResolvingKey",
6355+
"code": 132,
6356+
"mfgCode": null,
6357+
"side": "server",
6358+
"type": "octet_string",
6359+
"included": 1,
6360+
"storageOption": "External",
6361+
"singleton": 0,
6362+
"bounded": 0,
6363+
"defaultValue": "",
6364+
"reportable": 1,
6365+
"minInterval": 1,
6366+
"maxInterval": 65534,
6367+
"reportableChange": 0
6368+
},
6369+
{
6370+
"name": "AliroSupportedBLEUWBProtocolVersions",
6371+
"code": 133,
6372+
"mfgCode": null,
6373+
"side": "server",
6374+
"type": "array",
6375+
"included": 1,
6376+
"storageOption": "External",
6377+
"singleton": 0,
6378+
"bounded": 0,
6379+
"defaultValue": "",
6380+
"reportable": 1,
6381+
"minInterval": 1,
6382+
"maxInterval": 65534,
6383+
"reportableChange": 0
6384+
},
6385+
{
6386+
"name": "AliroBLEAdvertisingVersion",
6387+
"code": 134,
6388+
"mfgCode": null,
6389+
"side": "server",
6390+
"type": "int8u",
6391+
"included": 1,
6392+
"storageOption": "External",
6393+
"singleton": 0,
6394+
"bounded": 0,
6395+
"defaultValue": "",
6396+
"reportable": 1,
6397+
"minInterval": 1,
6398+
"maxInterval": 65534,
6399+
"reportableChange": 0
6400+
},
6401+
{
6402+
"name": "NumberOfAliroCredentialIssuerKeysSupported",
6403+
"code": 135,
6404+
"mfgCode": null,
6405+
"side": "server",
6406+
"type": "int16u",
6407+
"included": 1,
6408+
"storageOption": "External",
6409+
"singleton": 0,
6410+
"bounded": 0,
6411+
"defaultValue": "",
6412+
"reportable": 1,
6413+
"minInterval": 1,
6414+
"maxInterval": 65534,
6415+
"reportableChange": 0
6416+
},
6417+
{
6418+
"name": "NumberOfAliroEndpointKeysSupported",
6419+
"code": 136,
6420+
"mfgCode": null,
6421+
"side": "server",
6422+
"type": "int16u",
6423+
"included": 1,
6424+
"storageOption": "External",
6425+
"singleton": 0,
6426+
"bounded": 0,
6427+
"defaultValue": "",
6428+
"reportable": 1,
6429+
"minInterval": 1,
6430+
"maxInterval": 65534,
6431+
"reportableChange": 0
6432+
},
62736433
{
62746434
"name": "GeneratedCommandList",
62756435
"code": 65528,
@@ -6344,7 +6504,7 @@
63446504
"storageOption": "RAM",
63456505
"singleton": 0,
63466506
"bounded": 0,
6347-
"defaultValue": "0x1DB3",
6507+
"defaultValue": "0x7DB3",
63486508
"reportable": 1,
63496509
"minInterval": 1,
63506510
"maxInterval": 65534,

‎src/app/zap-templates/zcl/zcl-with-test-extensions.json

+9
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,15 @@
211211
"CurrentMode",
212212
"FeatureMap"
213213
],
214+
"Door Lock": [
215+
"AliroReaderVerificationKey",
216+
"AliroReaderGroupIdentifier",
217+
"AliroReaderGroupSubIdentifier",
218+
"AliroGroupResolvingKey",
219+
"AliroBLEAdvertisingVersion",
220+
"NumberOfAliroCredentialIssuerKeysSupported",
221+
"NumberOfAliroEndpointKeysSupported"
222+
],
214223
"Energy EVSE": [
215224
"State",
216225
"SupplyState",

‎src/app/zap-templates/zcl/zcl.json

+9
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,15 @@
209209
"CurrentMode",
210210
"FeatureMap"
211211
],
212+
"Door Lock": [
213+
"AliroReaderVerificationKey",
214+
"AliroReaderGroupIdentifier",
215+
"AliroReaderGroupSubIdentifier",
216+
"AliroGroupResolvingKey",
217+
"AliroBLEAdvertisingVersion",
218+
"NumberOfAliroCredentialIssuerKeysSupported",
219+
"NumberOfAliroEndpointKeysSupported"
220+
],
212221
"Energy EVSE": [
213222
"State",
214223
"SupplyState",

0 commit comments

Comments
 (0)