diff --git a/src/frsky.cpp b/src/frsky.cpp index 932404533..a8e568c36 100644 --- a/src/frsky.cpp +++ b/src/frsky.cpp @@ -1402,12 +1402,13 @@ void menuTelemetryFrsky(uint8_t event) xcoord_t pos[]={0, 63, 128}; #endif if (field >= TELEM_TM1 && field <= TELEM_TM2) { - uint8_t x = (i==3 ? pos_footer[j] : pos_main[j]); + xcoord_t x = (i==3 ? pos_footer[j] : pos_main[j]); putsTime(x, 1+FH+2*FH*i, value, att, att); #if defined(PCBX9D) lcd_putsiAtt(j?pos[j]+2:0, 1+FH+2*FH*i, STR_VTELEMCHNS, field, SMLSIZE); -#endif +#else lcd_putsiAtt(j?pos[j]+2:0, 1+FH+2*FH*i, STR_VTELEMCHNS, field-TELEM_TM1+TELEM_T1, 0); +#endif if(i==3) lcd_putsiAtt(j?pos[j]+2:0, 1+FH+2*FH*i, STR_VTELEMCHNS, field, 0); } diff --git a/src/lcd.cpp b/src/lcd.cpp index 7ccba7a19..bedc7a9f0 100644 --- a/src/lcd.cpp +++ b/src/lcd.cpp @@ -684,14 +684,16 @@ void lcdDrawTelemetryTopBar() { putsModelName(0, 0, g_model.name, g_eeGeneral.currModel, 0); uint8_t att = (g_vbat100mV < g_eeGeneral.vBatWarn ? BLINK : 0); - putsVBat(18*FW,0,att); + putsVBat(16*FW+2,0,att); if (g_model.timers[0].mode) { att = (s_timerState[0]==TMR_BEEPING ? BLINK : 0); - putsTime(24*FW, 0, s_timerVal[0], att, att); + putsTime(22*FW, 0, s_timerVal[0], att, att); +lcd_putsiAtt(18*FW+2, 1, STR_VTELEMCHNS, TELEM_TM1, SMLSIZE); } if (g_model.timers[1].mode) { att = (s_timerState[1]==TMR_BEEPING ? BLINK : 0); putsTime(31*FW, 0, s_timerVal[1], att, att); +lcd_putsiAtt(27*FW+2, 1, STR_VTELEMCHNS, TELEM_TM2, SMLSIZE); } lcd_invert_line(0); }