From 4b704164814cb7bd1aa638644db725d86fc266e4 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Tue, 16 Apr 2019 22:11:05 +0200 Subject: [PATCH] Compilation fixes --- radio/src/gui/480x272/topbar.cpp | 4 ++-- radio/src/tests/frsky.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/radio/src/gui/480x272/topbar.cpp b/radio/src/gui/480x272/topbar.cpp index 7160dc59a..8cf6cf9f0 100644 --- a/radio/src/gui/480x272/topbar.cpp +++ b/radio/src/gui/480x272/topbar.cpp @@ -98,8 +98,8 @@ void drawTopBar() // lcdDrawSolidVerticalLine(batt_icon_x+FW+13, BAR_Y+2, 5); // Rx battery - if (g_model.frsky.voltsSource) { // TODO should not be in frsky struct - TelemetryItem & item = telemetryItems[g_model.frsky.voltsSource-1]; + if (g_model.voltsSource) { + TelemetryItem & item = telemetryItems[g_model.voltsSource-1]; if (item.isAvailable()) { int32_t value = item.value; TelemetrySensor & sensor = g_model.telemetrySensors[g_model.frsky.altitudeSource-1]; diff --git a/radio/src/tests/frsky.cpp b/radio/src/tests/frsky.cpp index 0c5f2263f..72aa0f133 100644 --- a/radio/src/tests/frsky.cpp +++ b/radio/src/tests/frsky.cpp @@ -310,8 +310,8 @@ TEST(FrSkySPORT, frskySetCellVoltage) //display test lcdClear(); -#if !defined(COLORLCD) - g_model.frsky.voltsSource = FRSKY_VOLTS_SOURCE_A1; +#if defined(PCBX9) + g_model.voltsSource = FRSKY_VOLTS_SOURCE_A1; #endif } @@ -390,8 +390,8 @@ TEST(FrSkySPORT, frskySetCellVoltageTwoSensors) //display test lcdClear(); -#if !defined(COLORLCD) - g_model.frsky.voltsSource = FRSKY_VOLTS_SOURCE_A1; +#if defined(PCBX9) + g_model.voltsSource = FRSKY_VOLTS_SOURCE_A1; #endif }