From 0d9aca84a97852cdaeb6ced09d0c334a36201737 Mon Sep 17 00:00:00 2001 From: 3djc Date: Sat, 16 Jun 2018 19:24:46 +0200 Subject: [PATCH] Fix X7 R9M power line not enabled (#5973) * Do not expect MODULE_R9M_FULLSIZE to be defined for non xlite * Cosmetics --- radio/src/gui/128x64/model_setup.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp index ab2d1660e..7c41a1471 100644 --- a/radio/src/gui/128x64/model_setup.cpp +++ b/radio/src/gui/128x64/model_setup.cpp @@ -1324,14 +1324,14 @@ void menuModelSetup(event_t event) lcdDrawTextAlignedLeft(y, TR_MULTI_RFPOWER); if (IS_MODULE_R9M_FCC(moduleIdx)) { g_model.moduleData[moduleIdx].pxx.power = min((uint8_t)g_model.moduleData[moduleIdx].pxx.power, (uint8_t)R9M_FCC_POWER_MAX); // Lite FCC has only one setting -#if defined(MODULE_R9M_FULLSIZE) - lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_R9M_FCC_POWER_VALUES, g_model.moduleData[moduleIdx].pxx.power, LEFT | attr); - if (attr) - CHECK_INCDEC_MODELVAR_ZERO(event, g_model.moduleData[moduleIdx].pxx.power, R9M_FCC_POWER_MAX); -#else +#if defined(PCBXLITE) && !defined(MODULE_R9M_FULLSIZE) // R9M lite FCC has only one power value, so displayed for info only lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_R9M_FCC_POWER_VALUES, g_model.moduleData[moduleIdx].pxx.power, LEFT); if (attr) REPEAT_LAST_CURSOR_MOVE(); +#else + lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_R9M_FCC_POWER_VALUES, g_model.moduleData[moduleIdx].pxx.power, LEFT | attr); + if (attr) + CHECK_INCDEC_MODELVAR_ZERO(event, g_model.moduleData[moduleIdx].pxx.power, R9M_FCC_POWER_MAX); #endif } else {