From 485472f7c9102883a1bd1a1c1b7cfcf98690dd43 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Thu, 7 Feb 2019 11:09:19 +0100
Subject: [PATCH] Spectrum analyser working

---
 radio/src/gui/128x64/gui.h                    | 2 +-
 radio/src/gui/128x64/radio_spectrum.cpp       | 7 +++++--
 radio/src/gui/navigation/navigation_xlite.cpp | 1 -
 radio/src/pulses/pulses.cpp                   | 2 +-
 radio/src/pulses/pulses.h                     | 2 +-
 radio/src/pulses/pxx2.cpp                     | 2 +-
 radio/src/telemetry/telemetry.cpp             | 2 +-
 7 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/radio/src/gui/128x64/gui.h b/radio/src/gui/128x64/gui.h
index 73b5d8300..c364cbe4a 100644
--- a/radio/src/gui/128x64/gui.h
+++ b/radio/src/gui/128x64/gui.h
@@ -167,7 +167,7 @@ void check_submenu_simple(event_t event, uint8_t maxrow);
 void title(const char * s);
 #define TITLE(str) title(str)
 
-  #define MENU_TAB(...) const uint8_t mstate_tab[] = __VA_ARGS__
+#define MENU_TAB(...) const uint8_t mstate_tab[] = __VA_ARGS__
 
 #if defined(PCBX7)
 #define MENU_CHECK(tab, menu, lines_count) \
diff --git a/radio/src/gui/128x64/radio_spectrum.cpp b/radio/src/gui/128x64/radio_spectrum.cpp
index 818e28a26..6dc8ea799 100644
--- a/radio/src/gui/128x64/radio_spectrum.cpp
+++ b/radio/src/gui/128x64/radio_spectrum.cpp
@@ -24,9 +24,12 @@ void menuRadioSpectrum(event_t event)
 {
   MENU("SPECTRUM", menuTabGeneral, MENU_RADIO_SPECTRUM, HEADER_LINE, { HEADER_LINE_COLUMNS });
 
-  if (event == EVT_ENTRY) {
+  if (menuEvent) {
+    moduleSettings[INTERNAL_MODULE].mode = MODULE_MODE_NORMAL;
+  }
+  else if (event == EVT_ENTRY) {
     memclear(reusableBuffer.spectrum.bars, sizeof(reusableBuffer.spectrum.bars));
-    moduleSettings[INTERNAL_MODULE].mode = MODULE_MODE_SPECTRUM;
+    moduleSettings[INTERNAL_MODULE].mode = MODULE_MODE_SPECTRUM_ANALYSER;
   }
 
   for (uint8_t i=0; i<LCD_W; i++) {
diff --git a/radio/src/gui/navigation/navigation_xlite.cpp b/radio/src/gui/navigation/navigation_xlite.cpp
index c0210caef..e98c88073 100644
--- a/radio/src/gui/navigation/navigation_xlite.cpp
+++ b/radio/src/gui/navigation/navigation_xlite.cpp
@@ -373,7 +373,6 @@ void check(event_t event, uint8_t curr, const MenuHandlerFunc *menuTab, uint8_t
 
     menuCalibrationState = 0;
     drawScreenIndex(curr, menuTabSize, attr);
-
   }
 
   DISPLAY_PROGRESS_BAR(menuTab ? lcdLastRightPos-2*FW-((curr+1)/10*FWNUM)-2 : 20*FW+1);
diff --git a/radio/src/pulses/pulses.cpp b/radio/src/pulses/pulses.cpp
index d6b623882..61eb25e06 100755
--- a/radio/src/pulses/pulses.cpp
+++ b/radio/src/pulses/pulses.cpp
@@ -293,7 +293,7 @@ void sendPulses(uint8_t port, uint8_t protocol)
 
     case PROTOCOL_CHANNELS_PXX2:
       setupPulsesPXX2(port);
-      scheduleNextMixerCalculation(port, moduleSettings[port].mode == MODULE_MODE_SPECTRUM ? 1 : PXX2_PERIOD);
+      scheduleNextMixerCalculation(port, moduleSettings[port].mode == MODULE_MODE_SPECTRUM_ANALYSER ? 1 : PXX2_PERIOD);
       break;
 
 #if defined(MULTIMODULE)
diff --git a/radio/src/pulses/pulses.h b/radio/src/pulses/pulses.h
index 6b0a39e87..a1b47697c 100644
--- a/radio/src/pulses/pulses.h
+++ b/radio/src/pulses/pulses.h
@@ -74,7 +74,7 @@ enum ModuleSettingsMode
   MODULE_MODE_RANGECHECK,
   MODULE_MODE_BIND,
   MODULE_MODE_REGISTER,
-  MODULE_MODE_SPECTRUM,
+  MODULE_MODE_SPECTRUM_ANALYSER,
 };
 
 PACK(struct ModuleSettings {
diff --git a/radio/src/pulses/pxx2.cpp b/radio/src/pulses/pxx2.cpp
index 9e4826cc9..736bce15a 100644
--- a/radio/src/pulses/pxx2.cpp
+++ b/radio/src/pulses/pxx2.cpp
@@ -136,7 +136,7 @@ bool Pxx2Pulses::setupFrame(uint8_t module)
     result = setupRegisterFrame(module);
   else if (mode == MODULE_MODE_BIND)
     result = setupBindFrame(module);
-  else if (mode == MODULE_MODE_SPECTRUM)
+  else if (mode == MODULE_MODE_SPECTRUM_ANALYSER)
     result = setupSpectrumAnalyser(module);
   else
     setupChannelsFrame(module);
diff --git a/radio/src/telemetry/telemetry.cpp b/radio/src/telemetry/telemetry.cpp
index e1a44a298..f88a216e1 100644
--- a/radio/src/telemetry/telemetry.cpp
+++ b/radio/src/telemetry/telemetry.cpp
@@ -132,7 +132,7 @@ void processBindFrame(uint8_t module, uint8_t * frame)
 
 void processSpectrumFrame(uint8_t module, uint8_t * frame)
 {
-  if (moduleSettings[module].mode != MODULE_MODE_SPECTRUM) {
+  if (moduleSettings[module].mode != MODULE_MODE_SPECTRUM_ANALYSER) {
     return;
   }