From 910fc28dcec51ee8568cde2af2c4f7eee8c1fa6e Mon Sep 17 00:00:00 2001 From: 3djc Date: Tue, 10 Apr 2018 11:40:45 +0200 Subject: [PATCH] Rework BL behavior for Horus (#5813) --- radio/src/gui/480x272/radio_setup.cpp | 3 +-- radio/src/targets/horus/board.h | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/radio/src/gui/480x272/radio_setup.cpp b/radio/src/gui/480x272/radio_setup.cpp index 60e1c026a..30fa16d8a 100644 --- a/radio/src/gui/480x272/radio_setup.cpp +++ b/radio/src/gui/480x272/radio_setup.cpp @@ -360,8 +360,7 @@ bool menuRadioSetup(event_t event) case ITEM_SETUP_BACKLIGHT_MODE: lcdDrawText(MENUS_MARGIN_LEFT, y, STR_MODE); - if (attr & INVERS) g_eeGeneral.backlightMode = checkIncDec(event, g_eeGeneral.backlightMode, e_backlight_mode_keys, e_backlight_mode_on, EE_GENERAL); - lcdDrawTextAtIndex(RADIO_SETUP_2ND_COLUMN, y, STR_VBLMODE, g_eeGeneral.backlightMode, attr); + g_eeGeneral.backlightMode = editChoice(RADIO_SETUP_2ND_COLUMN, y, STR_VBLMODE, g_eeGeneral.backlightMode, e_backlight_mode_off, e_backlight_mode_on, attr, event); break; case ITEM_SETUP_FLASH_BEEP: diff --git a/radio/src/targets/horus/board.h b/radio/src/targets/horus/board.h index ac79502e9..40cf97744 100644 --- a/radio/src/targets/horus/board.h +++ b/radio/src/targets/horus/board.h @@ -465,7 +465,7 @@ void backlightEnable(uint8_t dutyCycle); #define BACKLIGHT_LEVEL_MIN 46 #endif #define BACKLIGHT_ENABLE() backlightEnable(unexpectedShutdown ? BACKLIGHT_LEVEL_MAX : BACKLIGHT_LEVEL_MAX-g_eeGeneral.backlightBright) -#define BACKLIGHT_DISABLE() backlightEnable(unexpectedShutdown ? BACKLIGHT_LEVEL_MAX : (g_eeGeneral.blOffBright == BACKLIGHT_LEVEL_MIN) ? 0 : g_eeGeneral.blOffBright) +#define BACKLIGHT_DISABLE() backlightEnable(unexpectedShutdown ? BACKLIGHT_LEVEL_MAX : ((g_eeGeneral.blOffBright == BACKLIGHT_LEVEL_MIN) && (g_eeGeneral.backlightMode != e_backlight_mode_off)) ? 0 : g_eeGeneral.blOffBright) #define isBacklightEnabled() true #if !defined(SIMU)