From c173c403b2e76f4b2e623d8ac9e2031128f1e383 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Sat, 7 Dec 2019 17:31:43 +0100
Subject: [PATCH] Cosmetics

---
 .../src/gui/colorlcd/radio_spectrum_analyser.cpp  | 15 ++++++++++-----
 radio/src/gui/colorlcd/radio_spectrum_analyser.h  |  7 ++++---
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/radio/src/gui/colorlcd/radio_spectrum_analyser.cpp b/radio/src/gui/colorlcd/radio_spectrum_analyser.cpp
index d28d612bb..dfb13d576 100644
--- a/radio/src/gui/colorlcd/radio_spectrum_analyser.cpp
+++ b/radio/src/gui/colorlcd/radio_spectrum_analyser.cpp
@@ -93,8 +93,8 @@ class SpectrumScaleWindow: public Window
       // Draw text scale
       for (uint32_t frequency =
         ((reusableBuffer.spectrumAnalyser.freq - reusableBuffer.spectrumAnalyser.span / 2) / 10000000) * 10000000 + 10000000;; frequency += 10000000) {
-        int offset = frequency - (reusableBuffer.spectrumAnalyser.freq - reusableBuffer.spectrumAnalyser.span / 2);
-        int x = offset / reusableBuffer.spectrumAnalyser.step;
+        offset = frequency - (reusableBuffer.spectrumAnalyser.freq - reusableBuffer.spectrumAnalyser.span / 2);
+        x = offset / reusableBuffer.spectrumAnalyser.step;
         if (x >= LCD_W - 1)
           break;
         if ((frequency / 1000000) % 2 == 0) {
@@ -187,9 +187,10 @@ RadioSpectrumAnalyser::RadioSpectrumAnalyser(uint8_t moduleIdx) :
   Page(ICON_RADIO_TOOLS),
   moduleIdx(moduleIdx)
 {
-  start();
+  init();
   buildHeader(&header);
   buildBody(&body);
+  start();
 }
 
 void RadioSpectrumAnalyser::buildHeader(Window * window)
@@ -204,7 +205,7 @@ void RadioSpectrumAnalyser::buildBody(FormWindow * window)
   new SpectrumFooterWindow(window, {0, SPECTRUM_HEIGHT + SCALE_HEIGHT, LCD_W, window->height() - SPECTRUM_HEIGHT - SCALE_HEIGHT}, moduleIdx);
 }
 
-void RadioSpectrumAnalyser::start()
+void RadioSpectrumAnalyser::init()
 {
 #if defined(INTERNAL_MODULE_MULTI)
   if (moduleIdx == INTERNAL_MODULE && g_model.moduleData[INTERNAL_MODULE].type == MODULE_TYPE_NONE) {
@@ -212,6 +213,7 @@ void RadioSpectrumAnalyser::start()
       setModuleType(INTERNAL_MODULE, MODULE_TYPE_MULTIMODULE);
     }
 #endif
+
   if (isModuleR9MAccess(moduleIdx)) {
     reusableBuffer.spectrumAnalyser.spanDefault = 20;
     reusableBuffer.spectrumAnalyser.spanMax = 40;
@@ -237,9 +239,12 @@ void RadioSpectrumAnalyser::start()
   reusableBuffer.spectrumAnalyser.track = reusableBuffer.spectrumAnalyser.freq;
   reusableBuffer.spectrumAnalyser.step = reusableBuffer.spectrumAnalyser.span / LCD_W;
   reusableBuffer.spectrumAnalyser.dirty = true;
-  moduleState[moduleIdx].mode = MODULE_MODE_SPECTRUM_ANALYSER;
 }
 
+void RadioSpectrumAnalyser::start()
+{
+  moduleState[moduleIdx].mode = MODULE_MODE_SPECTRUM_ANALYSER;
+}
 
 void RadioSpectrumAnalyser::stop()
 {
diff --git a/radio/src/gui/colorlcd/radio_spectrum_analyser.h b/radio/src/gui/colorlcd/radio_spectrum_analyser.h
index 3a6dd73f9..ccca50e48 100644
--- a/radio/src/gui/colorlcd/radio_spectrum_analyser.h
+++ b/radio/src/gui/colorlcd/radio_spectrum_analyser.h
@@ -26,15 +26,16 @@
 class RadioSpectrumAnalyser: public Page
 {
   public:
-    RadioSpectrumAnalyser(uint8_t moduleIdx);
+    explicit RadioSpectrumAnalyser(uint8_t moduleIdx);
 
   protected:
+    uint8_t moduleIdx;
+
     void buildHeader(Window * window);
     void buildBody(FormWindow * window);
+    void init();
     void start();
     void stop();
-
-    uint8_t moduleIdx;
 };
 
 #endif // _RADIO_SPECTRUM_ANALYSER_H