From e6febd1cff3ea32d92ab95d23cd7a3978a5ed74c Mon Sep 17 00:00:00 2001
From: 0xFEEDC0DE64 <daniel@brunner.ninja>
Date: Mon, 25 May 2020 22:42:12 +0200
Subject: [PATCH] menu cleanups

---
 src/displays/gametrakcalibratedisplay.h       |  2 +-
 .../menus/boardcomputerhardwaresettingsmenu.h | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/displays/gametrakcalibratedisplay.h b/src/displays/gametrakcalibratedisplay.h
index 72a40fc..3ad9457 100644
--- a/src/displays/gametrakcalibratedisplay.h
+++ b/src/displays/gametrakcalibratedisplay.h
@@ -49,7 +49,7 @@ void GametrakCalibrateDisplay::initScreen()
     tft.setTextFont(4);
     tft.setTextColor(TFT_YELLOW);
 
-    tft.drawString(TEXT_CALIBRATE, 5, 5, 4);
+    tft.drawString(TEXT_GAMETRAKCALIBRATE, 5, 5, 4);
 
     tft.fillRect(0, 34, tft.width(), 3, TFT_WHITE);
 
diff --git a/src/displays/menus/boardcomputerhardwaresettingsmenu.h b/src/displays/menus/boardcomputerhardwaresettingsmenu.h
index 8520a3d..fb64712 100644
--- a/src/displays/menus/boardcomputerhardwaresettingsmenu.h
+++ b/src/displays/menus/boardcomputerhardwaresettingsmenu.h
@@ -64,7 +64,21 @@ using BremsMaxChangeScreen = makeComponent<
     BackActionInterface<SwitchScreenAction<BoardcomputerHardwareSettingsMenu>>,
     SwitchScreenAction<BoardcomputerHardwareSettingsMenu>
 >;
+
 #ifdef FEATURE_GAMETRAK
+struct GametrakXText : public virtual TextInterface {
+public:
+    String text() const override { return String{"gametrakX: "} + raw_gametrakX + ": " + gametrakX; }
+};
+struct GametrakYText : public virtual TextInterface {
+public:
+    String text() const override { return String{"gametrakY: "} + raw_gametrakY + ": " + gametrakY; }
+};
+struct GametrakDistText : public virtual TextInterface {
+public:
+    String text() const override { return String{"gametrakDist: "} + raw_gametrakDist + ": " + gametrakDist; }
+};
+
 using GametrakXMinChangeScreen = makeComponent<
     ChangeValueDisplay<int16_t>,
     StaticText<TEXT_SETGAMETRAKXMIN>,
@@ -123,6 +137,10 @@ class BoardcomputerHardwareSettingsMenu :
         makeComponent<MenuItem, StaticText<TEXT_SETBREMSMIN>,        SwitchScreenAction<BremsMinChangeScreen>>,
         makeComponent<MenuItem, StaticText<TEXT_SETBREMSMAX>,        SwitchScreenAction<BremsMaxChangeScreen>>,
 #ifdef FEATURE_GAMETRAK
+        makeComponent<MenuItem, StaticText<nullptr>,                 DummyAction>,
+        makeComponent<MenuItem, GametrakXText,                       DisabledColor, StaticFont<2>, DummyAction>,
+        makeComponent<MenuItem, GametrakYText,                       DisabledColor, StaticFont<2>, DummyAction>,
+        makeComponent<MenuItem, GametrakDistText,                    DisabledColor, StaticFont<2>, DummyAction>,
         makeComponent<MenuItem, StaticText<TEXT_GAMETRAKCALIBRATE>,  SwitchScreenAction<GametrakCalibrateDisplay>>,
         makeComponent<MenuItem, StaticText<TEXT_SETGAMETRAKXMIN>,    SwitchScreenAction<GametrakXMinChangeScreen>>,
         makeComponent<MenuItem, StaticText<TEXT_SETGAMETRAKXMAX>,    SwitchScreenAction<GametrakXMaxChangeScreen>>,
@@ -131,6 +149,7 @@ class BoardcomputerHardwareSettingsMenu :
         makeComponent<MenuItem, StaticText<TEXT_SETGAMETRAKDISTMIN>, SwitchScreenAction<GametrakDistMinChangeScreen>>,
         makeComponent<MenuItem, StaticText<TEXT_SETGAMETRAKDISTMAX>, SwitchScreenAction<GametrakDistMaxChangeScreen>>,
 #endif
+        makeComponent<MenuItem, StaticText<nullptr>,                 DummyAction>,
         makeComponent<MenuItem, StaticText<TEXT_SWAPSCREENBYTES>,    ToggleBoolAction, CheckboxIcon, SwapScreenBytesAccessor>,
         makeComponent<MenuItem, StaticText<TEXT_BACK>,               SwitchScreenAction<SettingsMenu>, StaticMenuItemIcon<&icons::back>>
     >