diff --git a/src/lcd.cpp b/src/lcd.cpp index 0ea718666..47598466d 100644 --- a/src/lcd.cpp +++ b/src/lcd.cpp @@ -432,6 +432,7 @@ void putsStrIdx(uint8_t x, uint8_t y, const pm_char *str, uint8_t idx, uint8_t a { lcd_putsAtt(x, y, str, att & ~BSS); // TODO use something else than BSS for LEADING0 lcd_outdezNAtt(lcd_lastPos, y, idx, att|LEFT, 2); + if (att&TWO_DOTS) lcd_putc(lcd_lastPos, y, ':'); } void putsChnRaw(uint8_t x, uint8_t y, uint8_t idx, uint8_t att) diff --git a/src/lcd.h b/src/lcd.h index 1fbe6fb77..26ca25551 100644 --- a/src/lcd.h +++ b/src/lcd.h @@ -75,6 +75,7 @@ /* other flags */ #define NO_UNIT UNSIGN #define SHRT_TM_MODE LEFT +#define TWO_DOTS LEFT extern uint8_t displayBuf[DISPLAY_W*DISPLAY_H/8]; extern uint8_t lcd_lastPos; diff --git a/src/main_views.cpp b/src/main_views.cpp index 126b13dc7..63ef6009e 100644 --- a/src/main_views.cpp +++ b/src/main_views.cpp @@ -93,12 +93,6 @@ void doMainScreenGrphics() } #if defined(FRSKY) -void displayA1A2(uint8_t x, uint8_t y, uint8_t idx) -{ - lcd_puts(x, y, PSTR("A :")); - lcd_putc(x+FW, y, '1'+idx); -} - void displayRssiLine() { lcd_hline(0, 54, 128, 0); // separator @@ -420,7 +414,7 @@ void menuMainView(uint8_t event) for (uint8_t i=0; i<2; i++) { if (g_model.frsky.channels[i].ratio) { blink = (FRSKY_alarmRaised(i) ? INVERS : 0); - displayA1A2(x0, 2*FH, i); + putsStrIdx(x0, 2*FH, STR_A, i+1, TWO_DOTS); x0 += 3*FW; putsTelemetryChannel(x0, 2*FH, i, frskyTelemetry[i].value, blink|DBLSIZE|LEFT); putsTelemetryChannel(x0+FW, 3*FH, i, frskyTelemetry[i].min, 0); @@ -432,25 +426,22 @@ void menuMainView(uint8_t event) #ifdef FRSKY_HUB // Cells voltage - // TODO only display used cells! - lcd_putsLeft( 5*FH-3, PSTR("V1=\004V2=\004V3=")) ; - lcd_putsLeft( 6*FH-3, PSTR("V4=\004V5=\004V6=")); { uint8_t x, y; - x = 6*FW; - y = 6*FH-3; + x = 3*FW; + y = 5*FH-3; for (uint8_t k=0; k