From f55080e9e95cd6010be3ea82fd79b69124f7d174 Mon Sep 17 00:00:00 2001
From: wimalopaan <wilhelm.wm.meier@googlemail.com>
Date: Fri, 7 Jan 2022 20:52:42 +0100
Subject: [PATCH] separated radio_tools and radio_version pages according to
 reusableBuffer

---
 radio/src/gui/colorlcd/radio_tools.h        | 3 ++-
 radio/src/gui/common/stdlcd/radio_tools.cpp | 8 ++++----
 radio/src/opentx.h                          | 7 ++++---
 radio/src/pulses/pxx2.h                     | 1 +
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/radio/src/gui/colorlcd/radio_tools.h b/radio/src/gui/colorlcd/radio_tools.h
index bef8cf5b5..8d4b71bc0 100644
--- a/radio/src/gui/colorlcd/radio_tools.h
+++ b/radio/src/gui/colorlcd/radio_tools.h
@@ -31,7 +31,8 @@ class RadioToolsPage : public PageTab
   void checkEvents() override;
 
  protected:
-  static void rebuild(FormWindow* window);
+  void rebuild(FormWindow* window);
   FormWindow* window = nullptr;
   uint8_t waiting = 0;
+  uint8_t linesCount = 0;
 };
diff --git a/radio/src/gui/common/stdlcd/radio_tools.cpp b/radio/src/gui/common/stdlcd/radio_tools.cpp
index 96a1da9c9..fa44b47e5 100644
--- a/radio/src/gui/common/stdlcd/radio_tools.cpp
+++ b/radio/src/gui/common/stdlcd/radio_tools.cpp
@@ -113,10 +113,10 @@ void menuRadioTools(event_t event)
 #endif
 
 #if defined(INTERNAL_MODULE_PXX2)
-  if (isPXX2ModuleOptionAvailable(reusableBuffer.hardwareAndSettings.modules[INTERNAL_MODULE].information.modelID, MODULE_OPTION_SPECTRUM_ANALYSER))
+  if (isPXX2ModuleOptionAvailable(reusableBuffer.radioTools.modules[INTERNAL_MODULE].information.modelID, MODULE_OPTION_SPECTRUM_ANALYSER))
     addRadioModuleTool(index++, STR_SPECTRUM_ANALYSER_INT, menuRadioSpectrumAnalyser, INTERNAL_MODULE);
 
-  if (isPXX2ModuleOptionAvailable(reusableBuffer.hardwareAndSettings.modules[INTERNAL_MODULE].information.modelID, MODULE_OPTION_POWER_METER))
+  if (isPXX2ModuleOptionAvailable(reusableBuffer.radioTools.modules[INTERNAL_MODULE].information.modelID, MODULE_OPTION_POWER_METER))
     addRadioModuleTool(index++, STR_POWER_METER_INT, menuRadioPowerMeter, INTERNAL_MODULE);
 #endif
 #if defined(HARDWARE_INTERNAL_MODULE) && defined(MULTIMODULE)
@@ -124,11 +124,11 @@ void menuRadioTools(event_t event)
     addRadioModuleTool(index++, STR_SPECTRUM_ANALYSER_INT, menuRadioSpectrumAnalyser, INTERNAL_MODULE);
 #endif
 #if defined(PXX2) || defined(MULTIMODULE)
-  if (isPXX2ModuleOptionAvailable(reusableBuffer.hardwareAndSettings.modules[EXTERNAL_MODULE].information.modelID, MODULE_OPTION_SPECTRUM_ANALYSER) || isModuleMultimodule(EXTERNAL_MODULE))
+  if (isPXX2ModuleOptionAvailable(reusableBuffer.radioTools.modules[EXTERNAL_MODULE].information.modelID, MODULE_OPTION_SPECTRUM_ANALYSER) || isModuleMultimodule(EXTERNAL_MODULE))
     addRadioModuleTool(index++, STR_SPECTRUM_ANALYSER_EXT, menuRadioSpectrumAnalyser, EXTERNAL_MODULE);
 #endif
 #if defined(PXX2)
-  if (isPXX2ModuleOptionAvailable(reusableBuffer.hardwareAndSettings.modules[EXTERNAL_MODULE].information.modelID, MODULE_OPTION_POWER_METER))
+  if (isPXX2ModuleOptionAvailable(reusableBuffer.radioTools.modules[EXTERNAL_MODULE].information.modelID, MODULE_OPTION_POWER_METER))
     addRadioModuleTool(index++, STR_POWER_METER_EXT, menuRadioPowerMeter, EXTERNAL_MODULE);
 #endif
 
diff --git a/radio/src/opentx.h b/radio/src/opentx.h
index dad366ce7..cc08195af 100644
--- a/radio/src/opentx.h
+++ b/radio/src/opentx.h
@@ -970,13 +970,14 @@ union ReusableBuffer
     char id[27];
   } version;
 
-  // moduleOptions, receiverOptions, radioVersion
-  PXX2HardwareAndSettings hardwareAndSettings;
+  PXX2HardwareAndSettings hardwareAndSettings; // radio_version
 
   struct {
     ModuleInformation modules[NUM_MODULES];
-    uint8_t linesCount;
     char msg[64];
+#if !defined(COLORLCD)
+    uint8_t linesCount;
+#endif
   } radioTools;
 
   struct {
diff --git a/radio/src/pulses/pxx2.h b/radio/src/pulses/pxx2.h
index be832e510..742ff8df3 100644
--- a/radio/src/pulses/pxx2.h
+++ b/radio/src/pulses/pxx2.h
@@ -418,6 +418,7 @@ struct PXX2HardwareAndSettings {
   ReceiverSettings receiverSettings;  // when dealing with receiver settings, we
                                       // also need module settings
   char msg[64];
+  uint8_t linesCount;
 };
 
 PXX2ModuleSetup& getPXX2ModuleSetupBuffer();