From 8d1d7e92277d398e5ef8fe70e8ca15e98bdc6c07 Mon Sep 17 00:00:00 2001 From: Arthur Bonnaudet Date: Fri, 7 Jun 2024 09:52:01 +0200 Subject: [PATCH] Rename HAVE_DISPLAY_FAST_MODE define HAVE_DISPLAY_FAST_MODE define collided with a define on OS side. --- Makefile.defines | 2 +- lib_nbgl/src/nbgl_layout.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.defines b/Makefile.defines index f0b3ac1c1..48c9885ef 100644 --- a/Makefile.defines +++ b/Makefile.defines @@ -162,7 +162,7 @@ DEFINES += HAVE_SE_EINK_DISPLAY DEFINES += NBGL_PAGE DEFINES += NBGL_USE_CASE DEFINES += SCREEN_SIZE_WALLET -DEFINES += HAVE_DISPLAY_FAST_MODE +DEFINES += HAVE_FAST_HOLD_TO_APPROVE endif # TARGET_FLEX # For other devices, by default NBGL is not used diff --git a/lib_nbgl/src/nbgl_layout.c b/lib_nbgl/src/nbgl_layout.c index c3072bcd8..c81011a48 100644 --- a/lib_nbgl/src/nbgl_layout.c +++ b/lib_nbgl/src/nbgl_layout.c @@ -114,7 +114,7 @@ static uint8_t nbTouchableControls = 0; * STATIC PROTOTYPES **********************/ -#ifdef HAVE_DISPLAY_FAST_MODE +#ifdef HAVE_FAST_HOLD_TO_APPROVE // Unit step in % of touchable progress bar #define HOLD_TO_APPROVE_STEP_PERCENT (7) // Duration in ms the user must hold the progress bar @@ -124,11 +124,11 @@ static uint8_t nbTouchableControls = 0; #else #define HOLD_TO_APPROVE_STEP_PERCENT (25) #define HOLD_TO_APPROVE_STEP_DURATION_MS (400) -#endif // HAVE_DISPLAY_FAST_MODE +#endif // HAVE_FAST_HOLD_TO_APPROVE static inline uint8_t get_hold_to_approve_percent(uint32_t touch_duration) { -#ifdef HAVE_DISPLAY_FAST_MODE +#ifdef HAVE_FAST_HOLD_TO_APPROVE uint8_t current_step_nb = (touch_duration / HOLD_TO_APPROVE_STEP_DURATION_MS); #else uint8_t current_step_nb = (touch_duration / HOLD_TO_APPROVE_STEP_DURATION_MS) + 1;