From 4d313b934efbc2d23cc97af1ec152aa4911ab58e Mon Sep 17 00:00:00 2001 From: 3djc Date: Tue, 10 Dec 2019 09:29:46 +0100 Subject: [PATCH] Use reusable buffer --- radio/src/gui/128x64/model_setup.cpp | 5 ++--- radio/src/gui/212x64/model_setup.cpp | 5 ++--- radio/src/gui/colorlcd/model_setup.cpp | 7 +++---- radio/src/telemetry/multi.h | 1 - 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp index 0c016323e..27e436fae 100644 --- a/radio/src/gui/128x64/model_setup.cpp +++ b/radio/src/gui/128x64/model_setup.cpp @@ -1619,9 +1619,8 @@ void menuModelSetup(event_t event) case ITEM_MODEL_SETUP_EXTERNAL_MODULE_STATUS: { lcdDrawTextAlignedLeft(y, STR_MODULE_STATUS); - char statusText[MULTIMODULE_STATUS_LEN]; - getMultiModuleStatus(moduleIdx).getStatusString(statusText); - lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, statusText); + getMultiModuleStatus(moduleIdx).getStatusString(reusableBuffer.moduleSetup.msg); + lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, reusableBuffer.moduleSetup.msg); break; } #if defined(HARDWARE_INTERNAL_MODULE) diff --git a/radio/src/gui/212x64/model_setup.cpp b/radio/src/gui/212x64/model_setup.cpp index 27dfcbe8e..da9606694 100644 --- a/radio/src/gui/212x64/model_setup.cpp +++ b/radio/src/gui/212x64/model_setup.cpp @@ -1317,9 +1317,8 @@ void menuModelSetup(event_t event) case ITEM_MODEL_SETUP_EXTERNAL_MODULE_STATUS: { lcdDrawTextAlignedLeft(y, STR_MODULE_STATUS); - char statusText[MULTIMODULE_STATUS_LEN]; - getMultiModuleStatus(EXTERNAL_MODULE).getStatusString(statusText); - lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, statusText); + getMultiModuleStatus(EXTERNAL_MODULE).getStatusString(reusableBuffer.moduleSetup.msg); + lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, reusableBuffer.moduleSetup.msg); break; } diff --git a/radio/src/gui/colorlcd/model_setup.cpp b/radio/src/gui/colorlcd/model_setup.cpp index 46c72527f..152d35cf2 100644 --- a/radio/src/gui/colorlcd/model_setup.cpp +++ b/radio/src/gui/colorlcd/model_setup.cpp @@ -36,10 +36,9 @@ class MultimoduleStatus: public StaticText void checkEvents() override { - char statusText[MULTIMODULE_STATUS_LEN] = {}; - getMultiModuleStatus(moduleIdx).getStatusString(statusText); - if (text != statusText) { - setText(statusText); + getMultiModuleStatus(moduleIdx).getStatusString(reusableBuffer.moduleSetup.msg); + if (text != reusableBuffer.moduleSetup.msg) { + setText(reusableBuffer.moduleSetup.msg); invalidate(); } } diff --git a/radio/src/telemetry/multi.h b/radio/src/telemetry/multi.h index 806f7416e..e9b9ada15 100644 --- a/radio/src/telemetry/multi.h +++ b/radio/src/telemetry/multi.h @@ -23,7 +23,6 @@ #define MULTI_BUFFER_SIZE 177 extern uint8_t * Multi_Buffer; -constexpr uint8_t MULTIMODULE_STATUS_LEN = 64; /* Multiprotocol telemetry definition