From 37b0dab9dadadfa8d39fb0af491526680c832175 Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Thu, 27 Apr 2017 20:31:00 +0200 Subject: [PATCH] Add RAS to X7 analogs screen (#4865) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add RAS to X7 analogs screen * Also fix SWR->RAS in simulator UI * Only display RAS for external XJT module The „this is almost useless but I have done the work, now it stays commit“ --- companion/src/simulation/telemetrysimu.ui | 2 +- radio/src/gui/128x64/radio_diaganas.cpp | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/companion/src/simulation/telemetrysimu.ui b/companion/src/simulation/telemetrysimu.ui index fbc909e2a..3ad9ae83e 100644 --- a/companion/src/simulation/telemetrysimu.ui +++ b/companion/src/simulation/telemetrysimu.ui @@ -528,7 +528,7 @@ Timestamp - SWR + RAS diff --git a/radio/src/gui/128x64/radio_diaganas.cpp b/radio/src/gui/128x64/radio_diaganas.cpp index 61ea3b46e..da1e83bed 100644 --- a/radio/src/gui/128x64/radio_diaganas.cpp +++ b/radio/src/gui/128x64/radio_diaganas.cpp @@ -65,6 +65,11 @@ void menuRadioDiagAnalogs(event_t event) #if defined(PCBX7) lcdDrawTextAlignedLeft(MENU_HEADER_HEIGHT + 1 + (NUM_STICKS+NUM_POTS+NUM_SLIDERS+1)/2 * FH + 2, STR_BATT_CALIB); putsVolts(LEN_CALIB_FIELDS*FW+FW, MENU_HEADER_HEIGHT + 1 + (NUM_STICKS+NUM_POTS+NUM_SLIDERS+1)/2 * FH + 2, getBatteryVoltage(), (menuVerticalPosition==HEADER_LINE ? INVERS | (s_editMode > 0 ? BLINK : 0) : 0) | PREC2 | LEFT); + // SWR + if(IS_MODULE_XJT(EXTERNAL_MODULE)) { + lcdDrawTextAlignedLeft(MENU_HEADER_HEIGHT + 1 + (NUM_STICKS+NUM_POTS+NUM_SLIDERS+1)/2 * FH + 1 * FH + 2, "RAS"); + lcdDrawNumber(LEN_CALIB_FIELDS*FW+FW, MENU_HEADER_HEIGHT + 1 + (NUM_STICKS+NUM_POTS+NUM_SLIDERS+1)/2 * FH + 1 * FH + 2, telemetryData.swr.value, LEFT); + } #elif defined(PCBSKY9X) lcdDrawTextAlignedLeft(MENU_HEADER_HEIGHT+1+4*FH, STR_BATT_CALIB); static int32_t adcBatt;