From ff370ae2158ced66cd428d8acc1e46249510dd25 Mon Sep 17 00:00:00 2001 From: 3djc Date: Thu, 8 Aug 2019 08:47:00 +0200 Subject: [PATCH] Compilation fix --- radio/src/gui/212x64/model_setup.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/radio/src/gui/212x64/model_setup.cpp b/radio/src/gui/212x64/model_setup.cpp index eac5df5ca..947302718 100644 --- a/radio/src/gui/212x64/model_setup.cpp +++ b/radio/src/gui/212x64/model_setup.cpp @@ -249,9 +249,11 @@ void editTimerCountdown(int timerIdx, coord_t y, LcdFlags attr, event_t event) inline uint8_t EXTERNAL_MODULE_MODE_ROWS() { if (isModuleXJT(EXTERNAL_MODULE) || isModuleR9MNonAccess(EXTERNAL_MODULE) || isModuleDSM2(EXTERNAL_MODULE)) return 1; +#if defined(MULTIMODULE) else if (isModuleMultimodule(EXTERNAL_MODULE)) { return 2 + MULTIMODULE_RFPROTO_ROWS(EXTERNAL_MODULE); } +#endif else return 0; } @@ -907,14 +909,14 @@ void menuModelSetup(event_t event) #endif } } -#if POPUP_LEVEL > 1 +#if POPUP_LEVEL > 1 else if (old_editMode > 0) { if (isModuleR9MNonAccess(EXTERNAL_MODULE)) { if (g_model.moduleData[EXTERNAL_MODULE].subType > MODULE_SUBTYPE_R9M_EU) { POPUP_WARNING(STR_R9M_PROTO_FLEX_WARN_LINE1); SET_WARNING_INFO(STR_R9M_PROTO_WARN_LINE2, sizeof(TR_R9M_PROTO_WARN_LINE2) - 1, 0); } -#if POPUP_LEVEL >= 3 +#if POPUP_LEVEL >= 3 else if (g_model.moduleData[EXTERNAL_MODULE].subType == MODULE_SUBTYPE_R9M_EU) { POPUP_WARNING(STR_R9M_PROTO_EU_WARN_LINE1); SET_WARNING_INFO(STR_R9M_PROTO_WARN_LINE2, sizeof(TR_R9M_PROTO_WARN_LINE2) - 1, 0); @@ -923,10 +925,10 @@ void menuModelSetup(event_t event) POPUP_WARNING(STR_R9M_PROTO_FCC_WARN_LINE1); SET_WARNING_INFO(STR_R9M_PROTO_WARN_LINE2, sizeof(TR_R9M_PROTO_WARN_LINE2) - 1, 0); } -#endif +#endif } } -#endif +#endif } break;