From 871302a1b1caddb29f9def616525cec2aeb0a9df Mon Sep 17 00:00:00 2001 From: 3djc Date: Tue, 15 Aug 2017 10:49:59 +0200 Subject: [PATCH 1/3] 128x64 and 212x64 --- radio/src/gui/128x64/lcd.cpp | 10 +++++++++- radio/src/gui/212x64/lcd.cpp | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/radio/src/gui/128x64/lcd.cpp b/radio/src/gui/128x64/lcd.cpp index be35b6e6d..d4cb6cb18 100644 --- a/radio/src/gui/128x64/lcd.cpp +++ b/radio/src/gui/128x64/lcd.cpp @@ -914,9 +914,17 @@ void drawSource(coord_t x, coord_t y, uint32_t idx, LcdFlags att) else if (idx <= MIXSRC_LAST_GVAR) { drawStringWithIndex(x, y, STR_GV, idx-MIXSRC_GVAR1+1, att); } - else if (idx < MIXSRC_FIRST_TELEM) { + 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) { + 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); + } + else { + lcdDrawTextAtIndex(x, y, STR_VSRCRAW, idx-MIXSRC_Rud+1-MAX_LOGICAL_SWITCHES-MAX_TRAINER_CHANNELS-MAX_OUTPUT_CHANNELS-MAX_GVARS, att); + } + } else { idx -= MIXSRC_FIRST_TELEM; div_t qr = div(idx, 3); diff --git a/radio/src/gui/212x64/lcd.cpp b/radio/src/gui/212x64/lcd.cpp index 2711ca934..e07fee4f2 100644 --- a/radio/src/gui/212x64/lcd.cpp +++ b/radio/src/gui/212x64/lcd.cpp @@ -646,9 +646,17 @@ void drawSource(coord_t x, coord_t y, uint32_t idx, LcdFlags att) else if (idx <= MIXSRC_LAST_GVAR) { drawStringWithIndex(x, y, STR_GV, idx-MIXSRC_GVAR1+1, att); } - else if (idx < MIXSRC_FIRST_TELEM) { + 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) { + 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); + } + else { + lcdDrawTextAtIndex(x, y, STR_VSRCRAW, idx-MIXSRC_Rud+1-MAX_LOGICAL_SWITCHES-MAX_TRAINER_CHANNELS-MAX_OUTPUT_CHANNELS-MAX_GVARS, att); + } + } else { idx -= MIXSRC_FIRST_TELEM; div_t qr = div(idx, 3); From bf600140d3671dfc9768a9cbcddfd356bdbf546e Mon Sep 17 00:00:00 2001 From: 3djc Date: Tue, 15 Aug 2017 10:55:15 +0200 Subject: [PATCH 2/3] 480x272 --- radio/src/strhelpers.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/radio/src/strhelpers.cpp b/radio/src/strhelpers.cpp index b25adfb86..745a7b549 100644 --- a/radio/src/strhelpers.cpp +++ b/radio/src/strhelpers.cpp @@ -379,9 +379,18 @@ char * getSourceString(char * dest, mixsrc_t idx) else if (idx <= MIXSRC_LAST_GVAR) { strAppendStringWithIndex(dest, STR_GV, idx - MIXSRC_GVAR1 + 1); } - else if (idx < MIXSRC_FIRST_TELEM) { + 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) { + 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'; + } + else { + getStringAtIndex(dest, STR_VSRCRAW, idx-MIXSRC_Rud+1-MAX_LOGICAL_SWITCHES-MAX_TRAINER_CHANNELS-MAX_OUTPUT_CHANNELS-MAX_GVARS); + } + } else { idx -= MIXSRC_FIRST_TELEM; div_t qr = div(idx, 3); From 8cb7031cf6fcfc964dbb5e5034fef088359bb75b Mon Sep 17 00:00:00 2001 From: 3djc Date: Tue, 15 Aug 2017 17:02:51 +0200 Subject: [PATCH 3/3] 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';