From 8cb7031cf6fcfc964dbb5e5034fef088359bb75b Mon Sep 17 00:00:00 2001 From: 3djc Date: Tue, 15 Aug 2017 17:02:51 +0200 Subject: [PATCH] Cosmetics based on Bertrand's commments --- radio/src/gui/128x64/lcd.cpp | 2 +- radio/src/gui/212x64/lcd.cpp | 2 +- radio/src/strhelpers.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/radio/src/gui/128x64/lcd.cpp b/radio/src/gui/128x64/lcd.cpp index d4cb6cb18..05aa6c303 100644 --- a/radio/src/gui/128x64/lcd.cpp +++ b/radio/src/gui/128x64/lcd.cpp @@ -917,7 +917,7 @@ void drawSource(coord_t x, coord_t y, uint32_t idx, LcdFlags att) else if (idx < MIXSRC_FIRST_TIMER) { lcdDrawTextAtIndex(x, y, STR_VSRCRAW, idx-MIXSRC_Rud+1-MAX_LOGICAL_SWITCHES-MAX_TRAINER_CHANNELS-MAX_OUTPUT_CHANNELS-MAX_GVARS, att); } - else if (idx < MIXSRC_FIRST_TELEM) { + else if (idx <= MIXSRC_LAST_TIMER) { if(ZEXIST(g_model.timers[idx-MIXSRC_FIRST_TIMER].name)) { lcdDrawSizedText(x, y, g_model.timers[idx-MIXSRC_FIRST_TIMER].name, LEN_TIMER_NAME, ZCHAR|att); } diff --git a/radio/src/gui/212x64/lcd.cpp b/radio/src/gui/212x64/lcd.cpp index e07fee4f2..a6d795b8e 100644 --- a/radio/src/gui/212x64/lcd.cpp +++ b/radio/src/gui/212x64/lcd.cpp @@ -649,7 +649,7 @@ void drawSource(coord_t x, coord_t y, uint32_t idx, LcdFlags att) else if (idx < MIXSRC_FIRST_TIMER) { lcdDrawTextAtIndex(x, y, STR_VSRCRAW, idx-MIXSRC_Rud+1-MAX_LOGICAL_SWITCHES-MAX_TRAINER_CHANNELS-MAX_OUTPUT_CHANNELS-MAX_GVARS, att); } - else if (idx < MIXSRC_FIRST_TELEM) { + else if (idx <= MIXSRC_LAST_TIMER) { if(ZEXIST(g_model.timers[idx-MIXSRC_FIRST_TIMER].name)) { lcdDrawSizedText(x, y, g_model.timers[idx-MIXSRC_FIRST_TIMER].name, LEN_TIMER_NAME, ZCHAR|att); } diff --git a/radio/src/strhelpers.cpp b/radio/src/strhelpers.cpp index 745a7b549..018aa6f0b 100644 --- a/radio/src/strhelpers.cpp +++ b/radio/src/strhelpers.cpp @@ -382,7 +382,7 @@ char * getSourceString(char * dest, mixsrc_t idx) else if (idx < MIXSRC_FIRST_TIMER) { getStringAtIndex(dest, STR_VSRCRAW, idx-MIXSRC_Rud+1-MAX_LOGICAL_SWITCHES-MAX_TRAINER_CHANNELS-MAX_OUTPUT_CHANNELS-MAX_GVARS); } - else if (idx < MIXSRC_FIRST_TELEM) { + else if (idx <= MIXSRC_LAST_TIMER) { if(ZEXIST(g_model.timers[idx-MIXSRC_FIRST_TIMER].name)) { zchar2str(dest,g_model.timers[idx-MIXSRC_FIRST_TIMER].name, LEN_TIMER_NAME); dest[LEN_TIMER_NAME] = '\0';