[Telink]: Lock App: Split credential data types to separate NVM arrays

Lock App: Split credential data types to separate NVM arrays Signed-off-by: Misha Tkachenko <misha.tkachenko@telink-semi.com>
s07641069 · Jan 10, 2024 · f5e5c7b · f5e5c7b
1 parent 9c637ec
commit f5e5c7b
Show file tree

Hide file tree

Showing 6 changed files with 212 additions and 109 deletions.
diff --git a/examples/lock-app/telink/Kconfig b/examples/lock-app/telink/Kconfig
@@ -18,15 +18,9 @@ mainmenu "Matter Telink Lock Example Application"
 if BOARD_TLSR9528A_RETENTION || BOARD_TLSR9518ADK80D_RETENTION
 config COMMON_LIBC_MALLOC_ARENA_SIZE
     default 9216
-
-config CHIP_TASK_STACK_SIZE
-    default 11264
 endif
 
-if BOARD_TLSR9528A || BOARD_TLSR9518ADK80D
-config CHIP_TASK_STACK_SIZE
-    default 14336
-endif
+
 
 rsource "../../../config/telink/chip-module/Kconfig.defaults"
 source "Kconfig.zephyr"
diff --git a/examples/lock-app/telink/include/AppConfig.h b/examples/lock-app/telink/include/AppConfig.h
@@ -29,6 +29,9 @@
 #define APP_MAX_YEARDAY_SCHEDULE_PER_USER 10
 #define APP_MAX_HOLYDAY_SCHEDULE_PER_USER 10
 
+#define APP_MAX_CREDENTIALS_TOTAL 100
+#define APP_MAX_SCHEDULES_TOTAL 100
+
 #define APP_DEFAULT_USERS_COUNT 5
 #define APP_DEFAULT_CREDENTIAL_COUNT 5
 #define APP_DEFAULT_WEEKDAY_SCHEDULE_PER_USER_COUNT 5

diff --git a/examples/lock-app/telink/include/LockManager.h b/examples/lock-app/telink/include/LockManager.h
@@ -30,19 +30,19 @@
 
 struct WeekDaysScheduleInfo
 {
-    DlScheduleStatus status;
+    DlScheduleStatus status = DlScheduleStatus::kAvailable;
     EmberAfPluginDoorLockWeekDaySchedule schedule;
 };
 
 struct YearDayScheduleInfo
 {
-    DlScheduleStatus status;
+    DlScheduleStatus status = DlScheduleStatus::kAvailable;
     EmberAfPluginDoorLockYearDaySchedule schedule;
 };
 
 struct HolidayScheduleInfo
 {
-    DlScheduleStatus status;
+    DlScheduleStatus status = DlScheduleStatus::kAvailable;
     EmberAfPluginDoorLockHolidaySchedule schedule;
 };
 

diff --git a/examples/lock-app/telink/include/LockSettingsStorage.h b/examples/lock-app/telink/include/LockSettingsStorage.h
@@ -31,12 +31,18 @@ class LockSettingsStorage : ZephyrConfig
     static const char * kConfigKey_LockUser[APP_MAX_USERS];
     static const char * kConfigKey_LockUserName[APP_MAX_USERS];
     static const char * kConfigKey_UserCredentials[APP_MAX_CREDENTIAL];
-    static const char * kConfigKey_WeekDaySchedules[APP_MAX_WEEKDAY_SCHEDULE_PER_USER];
-    static const char * kConfigKey_YearDaySchedules[APP_MAX_YEARDAY_SCHEDULE_PER_USER];
+    static const char * kConfigKey_WeekDaySchedules[APP_MAX_USERS][APP_MAX_WEEKDAY_SCHEDULE_PER_USER];
+    static const char * kConfigKey_YearDaySchedules[APP_MAX_USERS][APP_MAX_YEARDAY_SCHEDULE_PER_USER];
     static const char * kConfigKey_HolidaySchedules[APP_MAX_HOLYDAY_SCHEDULE_PER_USER];
 
-    static const char * kConfigKey_Credential[kNumCredentialTypes];
-    static const char * kConfigKey_CredentialData[kNumCredentialTypes];
+
+    static const char * kConfigKey_Credential[APP_MAX_CREDENTIAL * APP_MAX_USERS];
+    static const char * kConfigKey_CredentialDataPin[APP_MAX_CREDENTIAL * APP_MAX_USERS];
+    static const char * kConfigKey_CredentialDataFace[APP_MAX_CREDENTIAL * APP_MAX_USERS];
+    static const char * kConfigKey_CredentialDataFingerprint[APP_MAX_CREDENTIAL * APP_MAX_USERS];
+    static const char * kConfigKey_CredentialDataFingerVein[APP_MAX_CREDENTIAL * APP_MAX_USERS];
+    static const char * kConfigKey_CredentialDataRfid[APP_MAX_CREDENTIAL * APP_MAX_USERS];
+
 };
 } // namespace Internal
 } // namespace DeviceLayer