From 668174dd53ea91c223f27508ffabd25e503b7186 Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Wed, 10 Nov 2021 09:02:24 +0100
Subject: [PATCH] Use RSSI dialog for ACCESS as well

---
 radio/src/gui/colorlcd/model_setup.cpp | 42 ++++++++++++--------------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/radio/src/gui/colorlcd/model_setup.cpp b/radio/src/gui/colorlcd/model_setup.cpp
index 284d39424..68aa82f01 100644
--- a/radio/src/gui/colorlcd/model_setup.cpp
+++ b/radio/src/gui/colorlcd/model_setup.cpp
@@ -514,8 +514,6 @@ class TrainerModuleWindow : public FormGroup
 #endif
 };
 
-
-
 class ModuleWindow : public FormGroup {
   public:
     ModuleWindow(FormWindow * parent, const rect_t &rect, uint8_t moduleIdx) :
@@ -1124,18 +1122,7 @@ class ModuleWindow : public FormGroup {
                   resetPulsesAFHDS2();
                 }
 #endif
-                auto rssiDialog = new DynamicMessageDialog(
-                    this, "Range Test",
-                    [=]() {
-                      char buf[16];
-                      sprintf(buf, "%d db", (int)TELEMETRY_RSSI());
-                      return std::string(buf);
-                    },
-                    "RSSI:", 50,
-                    COLOR_THEME_SECONDARY1 | CENTERED | FONT(BOLD) | FONT(XL));
-                rssiDialog->setCloseHandler([this]() {
-                  rangeButton->check(false);
-                  moduleState[moduleIdx].mode = MODULE_MODE_NORMAL;
+                startRSSIDialog([]() {
 #if defined(AFHDS2)
                   if (isModuleFlySky(moduleIdx)) {
                     resetPulsesAFHDS2();
@@ -1204,20 +1191,12 @@ class ModuleWindow : public FormGroup {
             }
             else {
               moduleState[moduleIdx].mode = MODULE_MODE_RANGECHECK;
+              startRSSIDialog();
               return 1;
             }
         });
 
         grid.nextLine();
-
-        new StaticText(this, grid.getLabelSlot(true), TR_OPTIONS, 0,
-                       COLOR_THEME_PRIMARY1);
-        auto options = new TextButton(this, grid.getFieldSlot(2, 0), TR_SET);
-        options->setPressHandler([=]() {
-            new ModuleOptions(this, moduleIdx);
-            return 0;
-          });
-        grid.nextLine();
       }
 #endif
 
@@ -1268,6 +1247,23 @@ class ModuleWindow : public FormGroup {
       par->adjustInnerHeight();
     }
 
+    void startRSSIDialog(std::function<void()> closeHandler = nullptr)
+    {
+      auto rssiDialog = new DynamicMessageDialog(
+          parent, "Range Test",
+          [=]() {
+            return std::to_string((int)TELEMETRY_RSSI()) + std::string(" db");
+          },
+          "RSSI:", 50,
+          COLOR_THEME_SECONDARY1 | CENTERED | FONT(BOLD) | FONT(XL));
+
+      rssiDialog->setCloseHandler([this, closeHandler]() {
+        rangeButton->check(false);
+        moduleState[moduleIdx].mode = MODULE_MODE_NORMAL;
+        if (closeHandler) closeHandler();
+      });
+    }
+
     void checkEvents() override
     {
       if (isModuleFailsafeAvailable(moduleIdx) != hasFailsafe