From 26600d8483ebaa68193f5f928d352f0f5e33e627 Mon Sep 17 00:00:00 2001 From: 3djc Date: Tue, 10 Dec 2019 09:22:56 +0100 Subject: [PATCH] Move to .cpp --- radio/src/gui/128x64/model_setup.cpp | 2 +- radio/src/gui/212x64/model_setup.cpp | 2 +- radio/src/gui/colorlcd/model_setup.cpp | 23 +++++++++++++++++++++++ radio/src/gui/colorlcd/model_setup.h | 25 +------------------------ 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp index 00771538a..0c016323e 100644 --- a/radio/src/gui/128x64/model_setup.cpp +++ b/radio/src/gui/128x64/model_setup.cpp @@ -1619,7 +1619,7 @@ void menuModelSetup(event_t event) case ITEM_MODEL_SETUP_EXTERNAL_MODULE_STATUS: { lcdDrawTextAlignedLeft(y, STR_MODULE_STATUS); - char statusText[64]; + char statusText[MULTIMODULE_STATUS_LEN]; getMultiModuleStatus(moduleIdx).getStatusString(statusText); lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, statusText); break; diff --git a/radio/src/gui/212x64/model_setup.cpp b/radio/src/gui/212x64/model_setup.cpp index 845a3aafe..27dfcbe8e 100644 --- a/radio/src/gui/212x64/model_setup.cpp +++ b/radio/src/gui/212x64/model_setup.cpp @@ -1317,7 +1317,7 @@ void menuModelSetup(event_t event) case ITEM_MODEL_SETUP_EXTERNAL_MODULE_STATUS: { lcdDrawTextAlignedLeft(y, STR_MODULE_STATUS); - char statusText[64]; + char statusText[MULTIMODULE_STATUS_LEN]; getMultiModuleStatus(EXTERNAL_MODULE).getStatusString(statusText); lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, statusText); break; diff --git a/radio/src/gui/colorlcd/model_setup.cpp b/radio/src/gui/colorlcd/model_setup.cpp index cc419fdef..46c72527f 100644 --- a/radio/src/gui/colorlcd/model_setup.cpp +++ b/radio/src/gui/colorlcd/model_setup.cpp @@ -25,6 +25,29 @@ #define SET_DIRTY() storageDirty(EE_MODEL) +class MultimoduleStatus: public StaticText +{ + public: + MultimoduleStatus(Window * parent, const rect_t & rect, uint8_t moduleIdx): + StaticText(parent, rect), + moduleIdx(moduleIdx) + { + } + + void checkEvents() override + { + char statusText[MULTIMODULE_STATUS_LEN] = {}; + getMultiModuleStatus(moduleIdx).getStatusString(statusText); + if (text != statusText) { + setText(statusText); + invalidate(); + } + } + + protected: + uint8_t moduleIdx; +}; + class ChannelFailsafeBargraph: public Window { public: ChannelFailsafeBargraph(Window * parent, const rect_t & rect, uint8_t moduleIdx, uint8_t channel): diff --git a/radio/src/gui/colorlcd/model_setup.h b/radio/src/gui/colorlcd/model_setup.h index a396e502f..94cfcfe30 100644 --- a/radio/src/gui/colorlcd/model_setup.h +++ b/radio/src/gui/colorlcd/model_setup.h @@ -18,30 +18,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" - -class MultimoduleStatus: public StaticText -{ - public: - MultimoduleStatus(Window * parent, const rect_t & rect, uint8_t moduleIdx): - StaticText(parent, rect), - moduleIdx(moduleIdx) - { - } - - void checkEvents() override - { - char statusText[MULTIMODULE_STATUS_LEN] = {}; - getMultiModuleStatus(moduleIdx).getStatusString(statusText); - if (text != statusText) { - setText(statusText); - invalidate(); - } - } - - protected: - uint8_t moduleIdx; -}; +#include "tabsgroup.h" class ModelSetupPage: public PageTab { public: