From cdaf68e0ed1db84c6c66198570dde25bc4a90e5d Mon Sep 17 00:00:00 2001 From: Peter Feerick Date: Fri, 28 Jul 2023 21:33:37 +1000 Subject: [PATCH] feat(128): Swap modelname for timer1 if defined (#3856) --- radio/src/gui/128x64/lcd.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/radio/src/gui/128x64/lcd.cpp b/radio/src/gui/128x64/lcd.cpp index 9446ad308f1..2c4ff3def6d 100644 --- a/radio/src/gui/128x64/lcd.cpp +++ b/radio/src/gui/128x64/lcd.cpp @@ -627,13 +627,14 @@ void lcdDrawFilledRect(coord_t x, coord_t y, coord_t w, coord_t h, uint8_t pat, void drawTelemetryTopBar() { - drawModelName(0, 0, g_model.header.name, g_eeGeneral.currModel, 0); - uint8_t att = (IS_TXBATT_WARNING() ? BLINK : 0); - putsVBat(10*FW-1,0,att); if (g_model.timers[0].mode) { - att = (timersStates[0].val<0 ? BLINK : 0); - drawTimer(13*FW+2, 0, timersStates[0].val, att, att); + uint8_t att = (timersStates[0].val<0 ? BLINK : 0); + drawTimer(0, 0, timersStates[0].val, att, att); + } else { + drawModelName(0, 0, g_model.header.name, g_eeGeneral.currModel, 0); } + uint8_t att = (IS_TXBATT_WARNING() ? BLINK : 0); + putsVBat(10*FW-1,0,att); #if defined(RTCLOCK) drawRtcTime(17*FW+3, 0, LEFT|TIMEBLINK); #endif