Add Face to LockDataTypeEnum. (#25144)

Now that https://github.com/CHIP-Specifications/connectedhomeip-spec/pull/6274 is fixed and we have a value defined for it.
project-chip · Jan 26, 2024 · cce14aa · cce14aa
1 parent a774bae
commit cce14aa
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 8 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
@@ -2135,6 +2135,7 @@ server cluster DoorLock = 257 {
     kRfid = 7;
     kFingerprint = 8;
     kFingerVein = 9;
+    kFace = 10;
   }
 
   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
@@ -1927,6 +1927,7 @@ server cluster DoorLock = 257 {
     kRfid = 7;
     kFingerprint = 8;
     kFingerVein = 9;
+    kFace = 10;
   }
 
   enum LockOperationTypeEnum : ENUM8 {

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

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

diff --git a/examples/lock-app/nxp/zap/lock-app.matter b/examples/lock-app/nxp/zap/lock-app.matter
@@ -1007,6 +1007,7 @@ server cluster DoorLock = 257 {
     kRfid = 7;
     kFingerprint = 8;
     kFingerVein = 9;
+    kFace = 10;
   }
 
   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
@@ -3046,9 +3046,7 @@ LockDataTypeEnum DoorLockServer::credentialTypeToLockDataType(CredentialTypeEnum
     case CredentialTypeEnum::kFingerVein:
         return LockDataTypeEnum::kFingerVein;
     case CredentialTypeEnum::kFace:
-        // So far there's no distinct data type for face credentials.
-        // See https://github.com/CHIP-Specifications/connectedhomeip-spec/issues/6272
-        return LockDataTypeEnum::kUnspecified;
+        return LockDataTypeEnum::kFace;
     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
@@ -522,6 +522,7 @@ limitations under the License.
         <item value="7" name="RFID" />
         <item value="8" name="Fingerprint" />
         <item value="9" name="FingerVein" />
+        <item value="10" name="Face" />
     </enum>
 
     <enum name="LockOperationTypeEnum" type="ENUM8">

diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
@@ -2251,6 +2251,7 @@ client cluster DoorLock = 257 {
     kRfid = 7;
     kFingerprint = 8;
     kFingerVein = 9;
+    kFace = 10;
   }
 
   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
@@ -6696,6 +6696,7 @@
           DoorLock:
               LockDataTypeEnum:
                   - FingerVein
+                  - Face
           DiagnosticLogs:
               IntentEnum:
                   - EndUserSupport
@@ -6759,9 +6760,10 @@
       enum values:
           DoorLock:
               DlLockDataType:
-                  # This value never existed for this enum name so, don't start
-                  # exposing it.  It's exposed for LockDataTypeEnum
+                  # These values never existed for this enum name so, don't
+                  # start exposing them.  They're exposed for LockDataTypeEnum
                   - FingerVein
+                  - Face
   renames:
       attributes:
           TimeSynchronization:

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