From a2a88ae8d280a656c3c0ea5170adf1a5205fe740 Mon Sep 17 00:00:00 2001 From: Andre Bernet Date: Mon, 19 Dec 2016 22:03:08 +0100 Subject: [PATCH] [128x64] Fix LS V2 display format --- radio/src/gui/128x64/model_logical_switches.cpp | 4 ++-- radio/src/translations/en.h.txt | 4 +++- radio/src/translations/fr.h.txt | 10 ++++++++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/radio/src/gui/128x64/model_logical_switches.cpp b/radio/src/gui/128x64/model_logical_switches.cpp index 6c7419960..6949cc65b 100644 --- a/radio/src/gui/128x64/model_logical_switches.cpp +++ b/radio/src/gui/128x64/model_logical_switches.cpp @@ -184,7 +184,7 @@ void menuModelLogicalSwitchOne(event_t event) #endif { v2_min = -LIMIT_EXT_PERCENT; v2_max = +LIMIT_EXT_PERCENT; - lcdDrawNumber(CSWONE_2ND_COLUMN, y, cs->v2, LEFT|attr); + drawSourceCustomValue(CSWONE_2ND_COLUMN, y, v1_val, cs->v2, LEFT|attr); } } @@ -288,7 +288,7 @@ void menuModelLogicalSwitches(event_t event) #endif } else { - lcdDrawNumber(CSW_3RD_COLUMN, y, cs->v2, LEFT); + drawSourceCustomValue(CSW_3RD_COLUMN, y, v1, cs->v2, LEFT); } } diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 0a5b4492e..cc26e0845 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -497,8 +497,10 @@ #if defined(PCBHORUS) #define TR_TRIMS_VSRCRAW "\313Rud""\313Ele""\313Thr""\313Ail""\313T5\0""\313T6\0" +#elif defined(CPUARM) + #define TR_TRIMS_VSRCRAW "\313Rud""\313Ele""\313Thr""\313Ail" #else - #define TR_TRIMS_VSRCRAW TR("TrmR""TrmE""TrmT""TrmA", "\313Rud""\313Ele""\313Thr""\313Ail") + #define TR_TRIMS_VSRCRAW "TrmR""TrmE""TrmT""TrmA" #endif #if defined(PCBHORUS) diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 5568144d1..3cc0d75f4 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -505,12 +505,18 @@ #define LEN_VSWITCHES "\003" #define LEN_VSRCRAW "\004" -#define TR_STICKS_VSRCRAW TR("Dir\0""Prf\0""Gaz\0""Ail\0", "\307Dir""\307Prf""\307Gaz""\307Ail") +#if defined(CPUARM) +#define TR_STICKS_VSRCRAW "\307Dir""\307Prf""\307Gaz""\307Ail" +#else +#define TR_STICKS_VSRCRAW "Dir\0""Prf\0""Gaz\0""Ail\0" +#endif #if defined(PCBHORUS) #define TR_TRIMS_VSRCRAW "\313Dir""\313Prf""\313Gaz""\313Ail""\313T5\0""\313T6\0" +#elif defined(CPUARM) + #define TR_TRIMS_VSRCRAW "\313Dir""\313Prf""\313Gaz""\313Ail" #else - #define TR_TRIMS_VSRCRAW TR("TrmD""TrmP""TrmG""TrmA", "\313Dir""\313Prf""\313Gaz""\313Ail") + #define TR_TRIMS_VSRCRAW "TrmD""TrmP""TrmG""TrmA" #endif #if defined(PCBHORUS)