From eb927f4be2c0321e23a0ada78e2eab86f822c7d9 Mon Sep 17 00:00:00 2001 From: 3djc Date: Mon, 9 Dec 2019 17:17:48 +0100 Subject: [PATCH] Temporary use RADIO24 and MODELS24 to ease wip --- radio/src/gui/colorlcd/model_setup.cpp | 3 +-- radio/src/sdcard.h | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/radio/src/gui/colorlcd/model_setup.cpp b/radio/src/gui/colorlcd/model_setup.cpp index 9e778267d..a0ca44edb 100644 --- a/radio/src/gui/colorlcd/model_setup.cpp +++ b/radio/src/gui/colorlcd/model_setup.cpp @@ -570,8 +570,7 @@ class ModuleWindow : public FormGroup { // Multimodule status new StaticText(this, grid.getLabelSlot(true), STR_MODULE_STATUS); char statusText[64] = {}; - #warning "multimodule adaptations needed" - // multiModuleStatus.getStatusString(statusText); + getMultiModuleStatus(moduleIdx).getStatusString(statusText); new StaticText(this, grid.getFieldSlot(), statusText); // Multimodule sync diff --git a/radio/src/sdcard.h b/radio/src/sdcard.h index d864b2b58..2474178fb 100644 --- a/radio/src/sdcard.h +++ b/radio/src/sdcard.h @@ -28,8 +28,8 @@ #include "opentx.h" #define ROOT_PATH "/" -#define MODELS_PATH ROOT_PATH "MODELS" // no trailing slash = important -#define RADIO_PATH ROOT_PATH "RADIO" // no trailing slash = important +#define MODELS_PATH ROOT_PATH "MODELS24" // no trailing slash = important //TODO Temporary while working on both 2.3 and 2.4 +#define RADIO_PATH ROOT_PATH "RADIO24" // no trailing slash = important #define LOGS_PATH ROOT_PATH "LOGS" #define SCREENSHOTS_PATH ROOT_PATH "SCREENSHOTS" #define SOUNDS_PATH ROOT_PATH "SOUNDS/en"