diff --git a/radio/src/gui/128x64/lcd.cpp b/radio/src/gui/128x64/lcd.cpp index e9f46fc8f..3b6acc153 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_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); + } + 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 9601ff2ab..26fb8c150 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_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); + } + 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/strhelpers.cpp b/radio/src/strhelpers.cpp index b25adfb86..018aa6f0b 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_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'; + } + 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);