From 9a155fef81a92ea93edb39f95de8f3a7585353ec Mon Sep 17 00:00:00 2001
From: philmoz <philmoz@users.noreply.github.com>
Date: Thu, 21 Dec 2023 20:08:26 +1100
Subject: [PATCH] fix(MT12): Incorrect scrolling in radio setup menu (#4447)

---
 radio/src/gui/128x64/radio_setup.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/radio/src/gui/128x64/radio_setup.cpp b/radio/src/gui/128x64/radio_setup.cpp
index abf6fb0a6..bc26d1238 100644
--- a/radio/src/gui/128x64/radio_setup.cpp
+++ b/radio/src/gui/128x64/radio_setup.cpp
@@ -44,7 +44,7 @@ const unsigned char sticks[]  = {
   #define CASE_BATTGRAPH(x)
 #endif
 
-#if !defined(SURFACE_RTADIO)
+#if !defined(SURFACE_RADIO)
 #define CASE_TX_MODE(x) x,
 #else
 #define CASE_TX_MODE(x)
@@ -107,10 +107,8 @@ enum {
   CASE_JACK_DETECT(ITEM_RADIO_SETUP_JACK_MODE)
   ITEM_RADIO_SETUP_RX_CHANNEL_ORD,
   CASE_ROTARY_ENCODER(ITEM_RADIO_SETUP_ROTARY_ENC_MODE)
-#if !defined(SURFACE_RADIO)
-  ITEM_RADIO_SETUP_STICK_MODE_LABELS,
-  ITEM_RADIO_SETUP_STICK_MODE,
-#endif
+  CASE_TX_MODE(ITEM_RADIO_SETUP_STICK_MODE_LABELS)
+  CASE_TX_MODE(ITEM_RADIO_SETUP_STICK_MODE)
   ITEM_VIEW_OPTIONS_LABEL,
   ITEM_VIEW_OPTIONS_RADIO_TAB,
   ITEM_VIEW_OPTIONS_GF,
@@ -204,8 +202,8 @@ void menuRadioSetup(event_t event)
     0,
     0, // USB mode
     CASE_JACK_DETECT(0) // Jack mode
+    0, // Channel order
     CASE_ROTARY_ENCODER(0)
-    0,
     CASE_TX_MODE(LABEL(TX_MODE))
     CASE_TX_MODE(0)
     LABEL(ViewOptions),