Skip to content

Commit 1290835

Browse files
bzbarsky-applepull[bot]
authored andcommitted
Add FingerVein to LockDataTypeEnum. (#24988)
Now that https://github.com/CHIP-Specifications/connectedhomeip-spec/pull/6240 is fixed and we have a value defined for it.
1 parent d0bd524 commit 1290835

File tree

13 files changed

+28
-5
lines changed

13 files changed

+28
-5
lines changed

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

+1
Original file line numberDiff line numberDiff line change
@@ -2134,6 +2134,7 @@ server cluster DoorLock = 257 {
21342134
kPin = 6;
21352135
kRfid = 7;
21362136
kFingerprint = 8;
2137+
kFingerVein = 9;
21372138
}
21382139

21392140
enum LockOperationTypeEnum : ENUM8 {

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

+1
Original file line numberDiff line numberDiff line change
@@ -1926,6 +1926,7 @@ server cluster DoorLock = 257 {
19261926
kPin = 6;
19271927
kRfid = 7;
19281928
kFingerprint = 8;
1929+
kFingerVein = 9;
19291930
}
19301931

19311932
enum LockOperationTypeEnum : ENUM8 {

examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter

+1
Original file line numberDiff line numberDiff line change
@@ -1229,6 +1229,7 @@ server cluster DoorLock = 257 {
12291229
kPin = 6;
12301230
kRfid = 7;
12311231
kFingerprint = 8;
1232+
kFingerVein = 9;
12321233
}
12331234

12341235
enum LockOperationTypeEnum : ENUM8 {

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

+1
Original file line numberDiff line numberDiff line change
@@ -1547,6 +1547,7 @@ server cluster DoorLock = 257 {
15471547
kPin = 6;
15481548
kRfid = 7;
15491549
kFingerprint = 8;
1550+
kFingerVein = 9;
15501551
}
15511552

15521553
enum LockOperationTypeEnum : ENUM8 {

examples/lock-app/nxp/zap/lock-app.matter

+1
Original file line numberDiff line numberDiff line change
@@ -1006,6 +1006,7 @@ server cluster DoorLock = 257 {
10061006
kPin = 6;
10071007
kRfid = 7;
10081008
kFingerprint = 8;
1009+
kFingerVein = 9;
10091010
}
10101011

10111012
enum LockOperationTypeEnum : ENUM8 {

src/app/clusters/door-lock-server/door-lock-server.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -3060,9 +3060,10 @@ LockDataTypeEnum DoorLockServer::credentialTypeToLockDataType(CredentialTypeEnum
30603060
case CredentialTypeEnum::kFingerprint:
30613061
return LockDataTypeEnum::kFingerprint;
30623062
case CredentialTypeEnum::kFingerVein:
3063-
return LockDataTypeEnum::kFingerprint;
3063+
return LockDataTypeEnum::kFingerVein;
30643064
case CredentialTypeEnum::kFace:
3065-
// So far there's no distinct data type for face credentials
3065+
// So far there's no distinct data type for face credentials.
3066+
// See https://github.com/CHIP-Specifications/connectedhomeip-spec/issues/6272
30663067
return LockDataTypeEnum::kUnspecified;
30673068
case CredentialTypeEnum::kUnknownEnumValue:
30683069
return LockDataTypeEnum::kUnspecified;

src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml

+1
Original file line numberDiff line numberDiff line change
@@ -521,6 +521,7 @@ limitations under the License.
521521
<item value="6" name="PIN" />
522522
<item value="7" name="RFID" />
523523
<item value="8" name="Fingerprint" />
524+
<item value="9" name="FingerVein" />
524525
</enum>
525526

526527
<enum name="LockOperationTypeEnum" type="ENUM8">

src/controller/data_model/controller-clusters.matter

+1
Original file line numberDiff line numberDiff line change
@@ -2250,6 +2250,7 @@ client cluster DoorLock = 257 {
22502250
kPin = 6;
22512251
kRfid = 7;
22522252
kFingerprint = 8;
2253+
kFingerVein = 9;
22532254
}
22542255

22552256
enum LockOperationTypeEnum : ENUM8 {

src/controller/python/chip/clusters/Objects.py

+2-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/darwin/Framework/CHIP/templates/availability.yaml

+11
Original file line numberDiff line numberDiff line change
@@ -6651,3 +6651,14 @@
66516651
- EventList
66526652
FaultInjection:
66536653
- EventList
6654+
enum values:
6655+
DoorLock:
6656+
LockDataTypeEnum:
6657+
- FingerVein
6658+
removed:
6659+
enum values:
6660+
DoorLock:
6661+
DlLockDataType:
6662+
# This value never existed for this enum name so, don't start
6663+
# exposing it. It's exposed for LockDataTypeEnum
6664+
- FingerVein

src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h

+2-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

zzz_generated/app-common/app-common/zap-generated/cluster-enums.h

+2-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)