Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-08 05:39:09 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix vscode's fumbled merge conflicts

Browse Source
This commit is contained in:
Willy-JL
2024-07-15 23:08:42 +01:00
parent 3852dd430f
commit 33896ef98f
2 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
applications/services/cli/cli_commands.c
View File

@@ -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

7
applications/services/desktop/views/desktop_view_locked.c
View File

@@ -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)