Enable PrivacyMode, Remove debug message

Author: erwinpan1

examples/chef/common/clusters/door-lock/chef-lock-endpoint.cpp

@@ -117,13 +117,6 @@ bool LockEndpoint::SetUser(uint16_t userIndex, chip::FabricIndex creator, chip::
                     mEndpointId, userIndex, creator, modifier, static_cast<int>(userName.size()), userName.data(), uniqueId,
                     to_underlying(userStatus), to_underlying(usertype), to_underlying(credentialRule), credentials,
                     static_cast<unsigned int>(totalCredentials));
-    printf("\033[44m Lock App: LockEndpoint::SetUser "
-                    "[endpoint=%d,userIndex=%u,creator=%d,modifier=%d,userName=\"%.*s\",uniqueId=%" PRIx32
-                    ",userStatus=%u,userType=%u,"
-                    "credentialRule=%u,credentials=%p,totalCredentials=%u] \033[0m\n",
-                    mEndpointId, userIndex, creator, modifier, static_cast<int>(userName.size()), userName.data(), uniqueId,
-                    to_underlying(userStatus), to_underlying(usertype), to_underlying(credentialRule), credentials,
-                    static_cast<unsigned int>(totalCredentials));
 
     auto adjustedUserIndex = static_cast<uint16_t>(userIndex - 1);
     if (adjustedUserIndex > mLockUsers.size())
@@ -264,6 +257,7 @@ bool LockEndpoint::SetCredential(uint16_t credentialIndex, chip::FabricIndex cre
         return false;
     }
 
+    // Assign to arrary by credentialIndex. Note: 0 is reserved for programmingPIN only 
     auto & credentialInStorage = mLockCredentials[to_underlying(credentialType)][credentialIndex];
     if (credentialData.size() > DOOR_LOCK_CREDENTIAL_INFO_MAX_DATA_SIZE)
     {
@@ -285,13 +279,6 @@ bool LockEndpoint::SetCredential(uint16_t credentialIndex, chip::FabricIndex cre
                     mEndpointId, credentialIndex, to_underlying(credentialType), credentialInStorage.createdBy,
                     credentialInStorage.modifiedBy);
 
-printf("\033[41m %s, %d \033[0m \n credential=", __func__, __LINE__);
-for (size_t i=0; i < credentialData.size(); i++)
-{
-printf("%c", credentialInStorage.credentialData[i]);
-}
-printf("\n \033[41m %s, %d \033[0m \n", __func__, __LINE__);
-
     return true;
 }
 
@@ -467,13 +454,6 @@ bool LockEndpoint::setLockState(const Nullable<chip::FabricIndex> & fabricIdx, c
         return false;
     }
 
-printf("\033[41m %s, %d \033[0m \n pin=", __func__, __LINE__);
-for (size_t i=0; i < pin.Value().size(); i++)
-{
-printf("%c", pin.Value()[i]);
-}
-printf("\n \033[41m %s, %d \033[0m \n", __func__, __LINE__);
-
     // Find the credential so we can make sure it is not absent right away
     auto & pinCredentials = mLockCredentials[to_underlying(CredentialTypeEnum::kPin)];
     auto credential       = std::find_if(pinCredentials.begin(), pinCredentials.end(), [&pin](const LockCredentialInfo & c) {
@@ -627,7 +607,6 @@ bool LockEndpoint::weekDayScheduleForbidsAccess(uint16_t userIndex, bool * haveS
             auto endTime   = s.schedule.endHour * chip::kSecondsPerHour + s.schedule.endMinute * chip::kSecondsPerMinute;
             bool ret = (s.status == DlScheduleStatus::kOccupied && (to_underlying(s.schedule.daysMask) & (1 << calendarTime.tm_wday)) &&
                 startTime <= currentTime && currentTime <= endTime);
-            printf("\033[44m %s, %d, s.status=%d,  ret=%d \033[0m \n", __func__, __LINE__, to_underlying(s.status), static_cast<int>(ret));
             return s.status == DlScheduleStatus::kOccupied && (to_underlying(s.schedule.daysMask) & (1 << calendarTime.tm_wday)) &&
                 startTime <= currentTime && currentTime <= endTime;
         });

examples/chef/common/clusters/door-lock/chef-lock-endpoint.h

@@ -39,7 +39,7 @@ struct YearDayScheduleInfo;
 struct HolidayScheduleInfo;
 
 static constexpr size_t DOOR_LOCK_CREDENTIAL_INFO_MAX_DATA_SIZE = 20;
-static constexpr size_t DOOR_LOCK_CREDENTIAL_INFO_MAX_TYPES     = 6;
+static constexpr size_t DOOR_LOCK_CREDENTIAL_INFO_MAX_TYPES     = 6; // 0: ProgrammingPIN ~ 5: Face
 
 class LockEndpoint
 {

examples/chef/common/clusters/door-lock/chef-lock-manager.cpp

@@ -121,39 +121,41 @@ bool LockManager::InitEndpoint(chip::EndpointId endpointId)
     // priviledged function
     UserTypeEnum usertype = UserTypeEnum::kProgrammingUser;
     CredentialRuleEnum credentialRule = CredentialRuleEnum::kSingle;
-    uint16_t programmingPINCredentialIndex(1); // According to spec, programming PIN
-                                            // should be always indexed as 0
-    uint16_t user1CredentialIndex(2);
-    const CredentialStruct credentials[2] = {
-            {credentialType: CredentialTypeEnum::kProgrammingPIN, credentialIndex: programmingPINCredentialIndex},
-            {credentialType: CredentialTypeEnum::kPin, credentialIndex: user1CredentialIndex}};
-    size_t totalCredentials(2);
+
+    constexpr size_t totalCredentials(2);
+    // According to spec (5.2.6.26.2. CredentialIndex Field), programming PIN credential should be always indexed as 0
+    uint16_t credentialIndex0(0);
+     // 1st non ProgrammingPIN credential should be indexed as 1
+    uint16_t credentialIndex1(1);
+
+    const CredentialStruct credentials[totalCredentials] = {
+            {credentialType: CredentialTypeEnum::kProgrammingPIN, credentialIndex: credentialIndex0},
+            {credentialType: CredentialTypeEnum::kPin, credentialIndex: credentialIndex1}};
+
     if (!SetUser(endpointId, userIndex, creator, modifier, userName, uniqueId, userStatus, usertype, credentialRule, &credentials[0], totalCredentials))
     {
         ChipLogError(Zcl, "Unable to set the User [endpointId=%d]", endpointId);
         return false;
     }
 
     DlCredentialStatus credentialStatus = DlCredentialStatus::kOccupied;
-    uint8_t defaultProgrammingPIN[6]  = { 0x39, 0x39, 0x39, 0x39, 0x39, 0x39 }; // 000000
-    const chip::ByteSpan programmingPINCredentialData(defaultProgrammingPIN);
 
-    if (!SetCredential(endpointId, programmingPINCredentialIndex, creator, modifier, credentialStatus, CredentialTypeEnum::kProgrammingPIN, programmingPINCredentialData))
+    // Set the default user's ProgrammingPIN credential
+    uint8_t defaultProgrammingPIN[6]  = { 0x39, 0x39, 0x39, 0x39, 0x39, 0x39 }; // 000000
+    if (!SetCredential(endpointId, credentialIndex0, creator, modifier, credentialStatus, CredentialTypeEnum::kProgrammingPIN, chip::ByteSpan(defaultProgrammingPIN)))
     {
         ChipLogError(Zcl, "Unable to set the credential - endpoint does not exist or not initialized [endpointId=%d]", endpointId);
         return false;
     }
 
+    // Set the default user's non ProgrammingPIN credential
     uint8_t defaultPin[6]  = { 0x31, 0x32, 0x33, 0x34, 0x35, 0x36 }; // 123456
-    const chip::ByteSpan credentialData(defaultPin);
-
-    if (!SetCredential(endpointId, user1CredentialIndex, creator, modifier, credentialStatus, CredentialTypeEnum::kPin, credentialData))
+    if (!SetCredential(endpointId, credentialIndex1, creator, modifier, credentialStatus, CredentialTypeEnum::kPin, chip::ByteSpan(defaultPin)))
     {
         ChipLogError(Zcl, "Unable to set the credential - endpoint does not exist or not initialized [endpointId=%d]", endpointId);
         return false;
     }
 
-
     ChipLogProgress(Zcl,
                     "Initialized new lock door endpoint "
                     "[id=%d,users=%d,credentials=%d,weekDaySchedulesPerUser=%d,yearDaySchedulesPerUser=%d,"

examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter

@@ -2420,7 +2420,7 @@ endpoint 1 {
     ram      attribute autoRelockTime default = 5;
     ram      attribute soundVolume default = 0;
     ram      attribute operatingMode default = 0;
-    ram      attribute supportedOperatingModes default = 0xFFF6;
+    ram      attribute supportedOperatingModes default = 0xFFFF;
     ram      attribute enableOneTouchLocking default = 0;
     ram      attribute enablePrivacyModeButton default = 0;
     ram      attribute wrongCodeEntryLimit default = 3;

examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap

@@ -3712,7 +3712,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0xFFF6",
+              "defaultValue": "0xFFFF",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -3954,4 +3954,4 @@
       "parentEndpointIdentifier": null
     }
   ]
-}
+}