From 1cc59f4298d93f244cfec7ac61e41e086c5f03b5 Mon Sep 17 00:00:00 2001 From: 3djc Date: Sat, 11 Mar 2017 10:23:52 +0100 Subject: [PATCH] X7 review telem bars screen (#4580) * SMLSIZE version * Leave existing code untouched for non arm * Fine tune rect * bars title in SMLSIZE and v centered --- radio/src/gui/128x64/view_telemetry.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/radio/src/gui/128x64/view_telemetry.cpp b/radio/src/gui/128x64/view_telemetry.cpp index 9674fd026..c9747f241 100644 --- a/radio/src/gui/128x64/view_telemetry.cpp +++ b/radio/src/gui/128x64/view_telemetry.cpp @@ -37,17 +37,25 @@ void displayRssiLine() if (TELEMETRY_STREAMING()) { lcdDrawSolidHorizontalLine(0, 55, 128, 0); // separator uint8_t rssi; -#if !defined(CPUARM) +#if defined(CPUARM) + rssi = min((uint8_t)99, TELEMETRY_RSSI()); + lcdDrawNumber(LCD_W/2 -2, STATUS_BAR_Y, rssi, LEADING0 | RIGHT | SMLSIZE, 2); + lcdDrawText(lcdLastLeftPos,STATUS_BAR_Y, "RSSI : ", RIGHT | SMLSIZE); + lcdDrawRect(65, 57, 38, 7); + uint8_t v = 4*rssi/11; + lcdDrawFilledRect(66+36-v, 58, v, 5, (rssi < getRssiAlarmValue(0)) ? DOTTED : SOLID); +#else rssi = min((uint8_t)99, telemetryData.rssi[1].value); lcdDrawTextAlignedLeft(STATUS_BAR_Y, STR_TX); lcdDrawNumber(4*FW+1, STATUS_BAR_Y, rssi, LEADING0, 2); lcdDrawRect(BAR_LEFT+1, 57, 38, 7); lcdDrawFilledRect(BAR_LEFT+1, 58, 4*rssi/11, 5, (rssi < getRssiAlarmValue(0)) ? DOTTED : SOLID); -#endif + rssi = min((uint8_t)99, TELEMETRY_RSSI()); lcdDrawText(104, STATUS_BAR_Y, STR_RX); lcdDrawNumber(105+4*FW, STATUS_BAR_Y, rssi, LEADING0, 2); lcdDrawRect(65, 57, 38, 7); uint8_t v = 4*rssi/11; lcdDrawFilledRect(66+36-v, 58, v, 5, (rssi < getRssiAlarmValue(0)) ? DOTTED : SOLID); +#endif } else { lcdDrawText(7*FW, STATUS_BAR_Y, STR_NODATA, BLINK); @@ -236,7 +244,7 @@ bool displayGaugesTelemetryScreen(FrSkyScreenData & screen) if (source && barMax > barMin) { uint8_t y = barHeight+6+i*(barHeight+6); #if defined(CPUARM) - drawSource(0, y+barHeight-5, source, 0); + drawSource(0, y+barHeight/2-3, source, SMLSIZE); #else lcdDrawTextAtIndex(0, y+barHeight-5, STR_VTELEMCHNS, source, 0); #endif