From 2792ad2fa4e270977eaf301aa9ba68a40b140501 Mon Sep 17 00:00:00 2001 From: Peter Feerick Date: Sat, 12 Feb 2022 20:38:55 +1000 Subject: [PATCH] fix: TX12 bootloader contrast too dark, and SE/SF could not be set 3POS (#1548) * fix: SE and SF could not be set 3POS *Somebody* (me) forgot ternary operator only compares two value in #1303 * fix: TX12 default contrast is too high There is no 'perfect' value due to manufacturing variance, but 25 is simply too high, and 15 a bit too low. --- radio/src/gui/common/stdlcd/radio_hardware.cpp | 8 +++++--- radio/src/targets/taranis/board.h | 4 +++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/radio/src/gui/common/stdlcd/radio_hardware.cpp b/radio/src/gui/common/stdlcd/radio_hardware.cpp index 08ae0e16c..a17f264e5 100644 --- a/radio/src/gui/common/stdlcd/radio_hardware.cpp +++ b/radio/src/gui/common/stdlcd/radio_hardware.cpp @@ -206,9 +206,11 @@ enum { #define SWITCH_TYPE_MAX(sw) ((MIXSRC_SF - MIXSRC_FIRST_SWITCH == sw || MIXSRC_SH - MIXSRC_FIRST_SWITCH == sw) ? SWITCH_2POS : SWITCH_3POS) #elif defined(RADIO_ZORRO) #define SWITCH_TYPE_MAX(sw) ((MIXSRC_SB - MIXSRC_FIRST_SWITCH == sw || MIXSRC_SC - MIXSRC_FIRST_SWITCH == sw) ? SWITCH_3POS : SWITCH_2POS) -#elif defined(RADIO_TX12) || defined(RADIO_T8) - #define SWITCH_TYPE_MAX(sw) ((MIXSRC_SA - MIXSRC_FIRST_SWITCH == sw || MIXSRC_SD - MIXSRC_FIRST_SWITCH == sw || \ - MIXSRC_SI - MIXSRC_FIRST_SWITCH == sw || MIXSRC_SJ - MIXSRC_FIRST_SWITCH) ? SWITCH_2POS : SWITCH_3POS) +#elif defined(RADIO_T8) + #define SWITCH_TYPE_MAX(sw) ((MIXSRC_SA - MIXSRC_FIRST_SWITCH == sw || MIXSRC_SD - MIXSRC_FIRST_SWITCH == sw) ? SWITCH_2POS : SWITCH_3POS) +#elif defined(RADIO_TX12) + #define SWITCH_TYPE_MAX(sw) (((MIXSRC_SA - MIXSRC_FIRST_SWITCH == sw || MIXSRC_SD - MIXSRC_FIRST_SWITCH == sw) || \ + (MIXSRC_SI - MIXSRC_FIRST_SWITCH == sw || MIXSRC_SJ - MIXSRC_FIRST_SWITCH == sw)) ? SWITCH_2POS : SWITCH_3POS) #elif defined(RADIO_T12) #define SWITCH_TYPE_MAX(sw) ((MIXSRC_SG - MIXSRC_FIRST_SWITCH == sw || MIXSRC_SH - MIXSRC_FIRST_SWITCH == sw) ? SWITCH_2POS : SWITCH_3POS) #else diff --git a/radio/src/targets/taranis/board.h b/radio/src/targets/taranis/board.h index 1c8a55c84..e79a92492 100644 --- a/radio/src/targets/taranis/board.h +++ b/radio/src/targets/taranis/board.h @@ -976,7 +976,9 @@ void fsLedOn(uint8_t); #define IS_LCD_RESET_NEEDED() true #define LCD_CONTRAST_MIN 10 #define LCD_CONTRAST_MAX 30 -#if defined(RADIO_TX12) || defined(RADIO_TPRO) || defined(RADIO_FAMILY_JUMPER_T12) || defined(RADIO_TPRO) +#if defined(RADIO_TX12) + #define LCD_CONTRAST_DEFAULT 20 +#elif defined(RADIO_TPRO) || defined(RADIO_FAMILY_JUMPER_T12) || defined(RADIO_TPRO) #define LCD_CONTRAST_DEFAULT 25 #else #define LCD_CONTRAST_DEFAULT 15