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.
project-chip · Jun 27, 2023 · 2365769 · 2365769
1 parent d7e923c
commit 2365769
Show file tree

Hide file tree

Showing 13 changed files with 28 additions and 5 deletions.
diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
@@ -2134,6 +2134,7 @@ server cluster DoorLock = 257 {
     kPin = 6;
     kRfid = 7;
     kFingerprint = 8;
+    kFingerVein = 9;
   }
 
   enum LockOperationTypeEnum : ENUM8 {

diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
@@ -1926,6 +1926,7 @@ server cluster DoorLock = 257 {
     kPin = 6;
     kRfid = 7;
     kFingerprint = 8;
+    kFingerVein = 9;
   }
 
   enum LockOperationTypeEnum : ENUM8 {

diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
@@ -1229,6 +1229,7 @@ server cluster DoorLock = 257 {
     kPin = 6;
     kRfid = 7;
     kFingerprint = 8;
+    kFingerVein = 9;
   }
 
   enum LockOperationTypeEnum : ENUM8 {

diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter
@@ -1547,6 +1547,7 @@ server cluster DoorLock = 257 {
     kPin = 6;
     kRfid = 7;
     kFingerprint = 8;
+    kFingerVein = 9;
   }
 
   enum LockOperationTypeEnum : ENUM8 {

diff --git a/examples/lock-app/nxp/zap/lock-app.matter b/examples/lock-app/nxp/zap/lock-app.matter
@@ -1006,6 +1006,7 @@ server cluster DoorLock = 257 {
     kPin = 6;
     kRfid = 7;
     kFingerprint = 8;
+    kFingerVein = 9;
   }
 
   enum LockOperationTypeEnum : ENUM8 {

diff --git a/src/app/clusters/door-lock-server/door-lock-server.cpp b/src/app/clusters/door-lock-server/door-lock-server.cpp
@@ -3060,9 +3060,10 @@ LockDataTypeEnum DoorLockServer::credentialTypeToLockDataType(CredentialTypeEnum
     case CredentialTypeEnum::kFingerprint:
         return LockDataTypeEnum::kFingerprint;
     case CredentialTypeEnum::kFingerVein:
-        return LockDataTypeEnum::kFingerprint;
+        return LockDataTypeEnum::kFingerVein;
     case CredentialTypeEnum::kFace:
-        // So far there's no distinct data type for face credentials
+        // So far there's no distinct data type for face credentials.
+        // See https://github.com/CHIP-Specifications/connectedhomeip-spec/issues/6272
         return LockDataTypeEnum::kUnspecified;
     case CredentialTypeEnum::kUnknownEnumValue:
         return LockDataTypeEnum::kUnspecified;

diff --git a/src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml
@@ -521,6 +521,7 @@ limitations under the License.
         <item value="6" name="PIN" />
         <item value="7" name="RFID" />
         <item value="8" name="Fingerprint" />
+        <item value="9" name="FingerVein" />
     </enum>
 
     <enum name="LockOperationTypeEnum" type="ENUM8">

diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
@@ -2250,6 +2250,7 @@ client cluster DoorLock = 257 {
     kPin = 6;
     kRfid = 7;
     kFingerprint = 8;
+    kFingerVein = 9;
   }
 
   enum LockOperationTypeEnum : ENUM8 {

diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py
diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml
@@ -6651,3 +6651,14 @@
               - EventList
           FaultInjection:
               - EventList
+      enum values:
+          DoorLock:
+              LockDataTypeEnum:
+                  - FingerVein
+  removed:
+      enum values:
+          DoorLock:
+              DlLockDataType:
+                  # This value never existed for this enum name so, don't start
+                  # exposing it.  It's exposed for LockDataTypeEnum
+                  - FingerVein
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h