From 33896ef98fdcff41f05d322e6eb0df4d04b0b246 Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Mon, 15 Jul 2024 23:08:42 +0100
Subject: [PATCH] Fix vscode's fumbled merge conflicts

---
 applications/services/cli/cli_commands.c               | 10 ----------
 .../services/desktop/views/desktop_view_locked.c       |  7 ++-----
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/applications/services/cli/cli_commands.c b/applications/services/cli/cli_commands.c
index 7599856de..cb0f2ad14 100644
--- a/applications/services/cli/cli_commands.c
+++ b/applications/services/cli/cli_commands.c
@@ -178,16 +178,6 @@ void cli_command_src(Cli* cli, FuriString* args, void* context) {
     printf("https://github.com/Next-Flip/Momentum-Firmware");
 }
 
-void cli_command_src(Cli* cli, FuriString* args, void* context) {
-    // Quality of life feature for people exploring CLI on lab.flipper.net/cli
-    // By Yousef AK
-    UNUSED(cli);
-    UNUSED(args);
-    UNUSED(context);
-
-    printf("https://github.com/Next-Flip/Momentum-Firmware");
-}
-
 #define CLI_COMMAND_LOG_RING_SIZE   2048
 #define CLI_COMMAND_LOG_BUFFER_SIZE 64
 
diff --git a/applications/services/desktop/views/desktop_view_locked.c b/applications/services/desktop/views/desktop_view_locked.c
index 94f7e6920..dbc9e4d80 100644
--- a/applications/services/desktop/views/desktop_view_locked.c
+++ b/applications/services/desktop/views/desktop_view_locked.c
@@ -16,11 +16,8 @@
 #define LOCKED_HINT_TIMEOUT_MS   (3000)
 #define UNLOCKED_HINT_TIMEOUT_MS (2000)
 
-#define DOOR_OFFSET_START (-55)
-#define DOOR_OFFSET_END   (0)
-
-#define DOOR_L_FINAL_POS (0)
-#define DOOR_R_FINAL_POS (60)
+#define COVER_OFFSET_START (-64)
+#define COVER_OFFSET_END   (0)
 
 #define UNLOCK_CNT         (3)
 #define UNLOCK_RST_TIMEOUT (600)