[Telink]: Refactor Lock App

Added storage to save user credentials, fixed test DRLK-2.10 Signed-off-by: Misha Tkachenko <[email protected]>
s07641069 · Nov 6, 2023 · db864f1 · db864f1
1 parent a3735f4
commit db864f1
Show file tree

Hide file tree

Showing 9 changed files with 322 additions and 489 deletions.
diff --git a/examples/lock-app/telink/CMakeLists.txt b/examples/lock-app/telink/CMakeLists.txt
@@ -77,6 +77,7 @@ target_sources(app PRIVATE
                src/AppTask.cpp
                src/ZclCallbacks.cpp
                src/LockManager.cpp
+               src/LockSettingsStorage.cpp
                ${TELINK_COMMON}/common/src/mainCommon.cpp
                ${TELINK_COMMON}/common/src/AppTaskCommon.cpp
                ${TELINK_COMMON}/util/src/LEDWidget.cpp

diff --git a/examples/lock-app/telink/include/AppConfig.h b/examples/lock-app/telink/include/AppConfig.h
@@ -20,6 +20,13 @@
 
 // ---- Lock Example App Config ----
 
+
+#define APP_DEFAULT_USERS_COUNT 5
+#define APP_DEFAULT_CREDENTIAL_COUNT 5
+#define APP_DEFAULT_WEEKDAY_SCHEDULE_PER_USER_COUNT 5
+#define APP_DEFAULT_YEARDAY_SCHEDULE_PER_USER_COUNT 5
+#define APP_DEFAULT_HOLYDAY_SCHEDULE_PER_USER_COUNT 5
+
 #define APP_USE_EXAMPLE_START_BUTTON 1
 #define APP_USE_BLE_START_BUTTON 0
 #define APP_USE_THREAD_START_BUTTON 0

diff --git a/examples/lock-app/telink/include/AppTask.h b/examples/lock-app/telink/include/AppTask.h
@@ -19,7 +19,7 @@
 #pragma once
 
 #include "AppTaskCommon.h"
-// #include "BoltLockManager.h"
+#include "AppConfig.h"
 #include "LockManager.h"
 
 #define APP_ERROR_EVENT_QUEUE_FAILED CHIP_APPLICATION_ERROR(0x01)
@@ -51,4 +51,3 @@ inline AppTask & GetAppTask(void)
 {
     return AppTask::sAppTask;
 }
-CHIP_ERROR InitDoorLockHandler();
diff --git a/examples/lock-app/telink/include/LockManager.h b/examples/lock-app/telink/include/LockManager.h
@@ -141,8 +141,11 @@ class LockManager
     CHIP_ERROR Init(chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlLockState> state,
                     TelinkDoorLock::LockInitParams::LockParam lockParam, StateChangeCallback callback);
 
+    bool LockAction(int32_t appSource, Action_t aAction, OperationSource source, chip::EndpointId endpointId);
+
     bool LockAction(int32_t appSource, Action_t aAction, OperationSource source, chip::EndpointId endpointId,
-                    const Nullable<chip::FabricIndex> & fabricIdx = NullNullable, const Nullable<chip::NodeId> & nodeId = NullNullable, 
+                    OperationErrorEnum & err, const Nullable<chip::FabricIndex> & fabricIdx = NullNullable,
+                    const Nullable<chip::NodeId> & nodeId = NullNullable,
                     const Optional<chip::ByteSpan> & pinCode = NullNullable);
 
     bool IsLocked() const { return mState == State_t::kState_LockCompleted; }
@@ -199,8 +202,8 @@ class LockManager
     k_timer mActuatorTimer                   = {};
 
     bool setLockState(chip::EndpointId endpointId, DlLockState lockState, OperationSource source,
-                    const Nullable<chip::FabricIndex> & fabricIdx, const Nullable<chip::NodeId> & nodeId, 
-                    const Optional<chip::ByteSpan> & pin);
+                    OperationErrorEnum & err, const Nullable<chip::FabricIndex> & fabricIdx,
+                    const Nullable<chip::NodeId> & nodeId, const Optional<chip::ByteSpan> & pin);
 
     static void ActuatorTimerEventHandler(k_timer * timer);
     static void ActuatorAppEventHandler(const AppEvent & event);

diff --git a/examples/lock-app/telink/include/LockSettingsStorage.h b/examples/lock-app/telink/include/LockSettingsStorage.h
@@ -0,0 +1,21 @@
+#include <../Zephyr/ZephyrConfig.h>
+
+namespace chip {
+namespace DeviceLayer {
+namespace Internal {
+
+    class LockSettingsStorage: ZephyrConfig
+    {
+        public:
+        static const ZephyrConfig::Key kConfigKey_LockUser;
+        static const ZephyrConfig::Key kConfigKey_Credential;
+        static const ZephyrConfig::Key kConfigKey_LockUserName;
+        static const ZephyrConfig::Key kConfigKey_CredentialData;
+        static const ZephyrConfig::Key kConfigKey_UserCredentials;
+        static const ZephyrConfig::Key kConfigKey_WeekDaySchedules;
+        static const ZephyrConfig::Key kConfigKey_YearDaySchedules;
+        static const ZephyrConfig::Key kConfigKey_HolidaySchedules;
+    };
+}
+}
+}