Merge fixes

2018-08-30 13:34:13 +02:00
parent 95c035ed73
commit e97cdd00a8
11 changed files with 32 additions and 16 deletions
@@ -1150,7 +1150,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)) {
          lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_R9M_FCC_POWER_VALUES, g_model.moduleData[moduleIdx].pxx.power, LEFT | attr);
          if (attr)
            CHECK_INCDEC_MODELVAR(event, g_model.moduleData[moduleIdx].pxx.power, 0, R9M_FCC_POWER_MAX);