Fix vscode's fumbled merge conflicts

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

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)