Merge fixes

2018-08-30 13:34:13 +02:00
parent 95c035ed73
commit e97cdd00a8
11 changed files with 32 additions and 16 deletions
@@ -1212,7 +1212,7 @@ void menuModelSetup(event_t event)
        uint8_t moduleIdx = CURRENT_MODULE_EDITED(k);
        if (isModuleR9M(moduleIdx)) {
          lcdDrawTextAlignedLeft(y, TR_MULTI_RFPOWER);
-          if (IS_MODULE_R9M_FCC_VARIANT(moduleIdx)) {
+          if (isModuleR9M_FCC_VARIANT(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(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);