From d1a60cca8de80a8ecf5fc8a177f19d15cc37e816 Mon Sep 17 00:00:00 2001
From: 3djc <lesitewebdejc@hotmail.com>
Date: Fri, 19 Feb 2021 16:53:01 +0100
Subject: [PATCH 1/4] Multi : support SX1276 power indication and protect
 against unknown options coming from multi

---
 radio/src/gui/128x64/model_setup.cpp  | 4 +++-
 radio/src/gui/212x64/model_setup.cpp  | 3 +++
 radio/src/gui/480x272/model_setup.cpp | 3 +++
 radio/src/gui/gui_common.cpp          | 5 +++++
 radio/src/pulses/modules_helpers.h    | 2 ++
 radio/src/translations/untranslated.h | 2 +-
 6 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp
index 136ab6801..28ca2c0b9 100644
--- a/radio/src/gui/128x64/model_setup.cpp
+++ b/radio/src/gui/128x64/model_setup.cpp
@@ -1544,7 +1544,9 @@ void menuModelSetup(event_t event)
           const uint8_t multi_proto = g_model.moduleData[moduleIdx].getMultiProtocol();
 
           if (status.isValid()) {
-            MultiModuleStatus &status = getMultiModuleStatus(moduleIdx);
+            if (status.optionDisp >= getMaxMultiOptions()) {
+              status.optionDisp = 1; // Unknown options are defaulted to type 1 (basic option)
+            }
             lcdDrawText(INDENT_WIDTH, y, mm_options_strings::options[status.optionDisp]);
             if (attr && status.optionDisp == 2) {
               lcdDrawText(MODEL_SETUP_2ND_COLUMN + 23, y, "RSSI(", LEFT);
diff --git a/radio/src/gui/212x64/model_setup.cpp b/radio/src/gui/212x64/model_setup.cpp
index 5a2d05446..390d55700 100644
--- a/radio/src/gui/212x64/model_setup.cpp
+++ b/radio/src/gui/212x64/model_setup.cpp
@@ -1299,6 +1299,9 @@ void menuModelSetup(event_t event)
          MultiModuleStatus &status = getMultiModuleStatus(moduleIdx);
          const uint8_t multi_proto = g_model.moduleData[EXTERNAL_MODULE].getMultiProtocol();
          if (status.isValid()) {
+           if (status.optionDisp >= getMaxMultiOptions()) {
+             status.optionDisp = 1; // Unknown options are defaulted to type 1 (basic option)
+           }
            lcdDrawText(INDENT_WIDTH, y, mm_options_strings::options[status.optionDisp]);
            if (attr && status.optionDisp == 2) {
              lcdDrawText(MODEL_SETUP_3RD_COLUMN+22, y, "RSSI(", LEFT);
diff --git a/radio/src/gui/480x272/model_setup.cpp b/radio/src/gui/480x272/model_setup.cpp
index cd9974ac5..724f12db4 100644
--- a/radio/src/gui/480x272/model_setup.cpp
+++ b/radio/src/gui/480x272/model_setup.cpp
@@ -1681,6 +1681,9 @@ bool menuModelSetup(event_t event)
           MultiModuleStatus &status = getMultiModuleStatus(moduleIdx);
           const uint8_t multi_proto = g_model.moduleData[moduleIdx].getMultiProtocol();
           if (status.isValid()) {
+            if (status.optionDisp >= getMaxMultiOptions()) {
+              status.optionDisp = 1; // Unknown options are defaulted to type 1 (basic option)
+            }
             lcdDrawText(MENUS_MARGIN_LEFT + INDENT_WIDTH, y, mm_options_strings::options[status.optionDisp]);
             if (attr && status.optionDisp == 2) {
               lcdDrawNumber(LCD_W - 10, y, TELEMETRY_RSSI(), RIGHT, 0, "RSSI(", ")");
diff --git a/radio/src/gui/gui_common.cpp b/radio/src/gui/gui_common.cpp
index 368aac163..0cc14467a 100644
--- a/radio/src/gui/gui_common.cpp
+++ b/radio/src/gui/gui_common.cpp
@@ -997,6 +997,11 @@ const char* mm_options_strings::options[] = {
   STR_MULTI_RFPOWER
 };
 
+const uint8_t getMaxMultiOptions()
+{
+  return DIM(mm_options_strings::options);
+}
+
 const mm_protocol_definition multi_protocols[] = {
 // Protocol as defined in pulses\modules_constants.h, number of sub_protocols - 1, Failsafe supported, Disable channel mapping supported, Subtype string, Option type
   {MODULE_SUBTYPE_MULTI_FLYSKY,     4, false, true,   STR_SUBTYPE_FLYSKY,    nullptr},
diff --git a/radio/src/pulses/modules_helpers.h b/radio/src/pulses/modules_helpers.h
index 0272a3825..b01db972d 100644
--- a/radio/src/pulses/modules_helpers.h
+++ b/radio/src/pulses/modules_helpers.h
@@ -42,6 +42,8 @@ struct mm_options_strings {
   static const char* options[];
 };
 
+const uint8_t getMaxMultiOptions();
+
 struct mm_protocol_definition {
   uint8_t protocol;
   uint8_t maxSubtype;
diff --git a/radio/src/translations/untranslated.h b/radio/src/translations/untranslated.h
index 74735bc7f..2b1c05407 100644
--- a/radio/src/translations/untranslated.h
+++ b/radio/src/translations/untranslated.h
@@ -134,7 +134,7 @@
 #define TR_MULTI_PROTOCOLS             "FlySky\0""Hubsan\0""FrSky\0 ""Hisky\0 ""V2x2\0  ""DSM\0   ""Devo\0  ""YD717\0 ""KN\0    ""SymaX\0 ""SLT\0   ""CX10\0  ""CG023\0 ""Bayang\0""ESky\0  ""MT99XX\0""MJXq\0  ""Shenqi\0""FY326\0 ""Futaba\0""J6 Pro\0""FQ777\0 ""Assan\0 ""Hontai\0""OpenLrs""FlSky2A""Q2x2\0  ""Walkera""Q303\0  ""GW008\0 ""DM002\0 ""Cabell\0""Esky150""H8 3D\0 ""Corona\0""CFlie\0 ""Hitec\0 ""WFly\0  ""Bugs\0  ""BugMini""Traxxas""NCC1701""E01X\0  ""V911S\0 ""GD00X\0 ""V761\0  ""KF606\0 ""Redpine""Potensi""ZSX\0   ""Height\0""Scanner""FrSkyRX""FS2A_RX""HoTT\0  ""FX816\0 ""BayanRX""Pelikan""Tiger\0 ""XK\0    ""XN297DU""FrSkyX2""FrSkyR9""Propel\0""FrSkyL\0""Skyartc""ESky-v2""DSM RX\0""JJRC345""Q90C\0  ""Kyosho\0""RadLink""ExpLRS\0""Realacc""OMP\0   ""M-Link\0""Wfly 2\0""E016Hv2"
 
 #define LEN_MULTI_POWER                "\005"
-#define TR_MULTI_POWER                 "10mW\0""25mW\0""50mW\0""100mW""200mW""300mW""500mW""1W\0  ""2W\0  "
+#define TR_MULTI_POWER                 "1.6mW""2.0mW""2.5mW""3.2mW""4.0mW""5.0mW""6.3mW""7.9mW""10mW\0""13mW\0""16mW\0""20mW\0""25mW\0""32mW\0""40mW\0""50mW\0"
 
 #define LEN_AFHDS3_PROTOCOLS           "\x008"
 #define TR_AFHDS3_PROTOCOLS            "PWM/IBUS""PWM/SBUS""PPM/IBUS""PPM/SBUS"

From 10dadf1f785b5863255ad0f3128d5cbb334bf3d7 Mon Sep 17 00:00:00 2001
From: 3djc <lesitewebdejc@hotmail.com>
Date: Sun, 21 Feb 2021 12:25:47 +0100
Subject: [PATCH 2/4] Multi : improve options support part 1

---
 radio/src/gui/128x64/model_setup.cpp  | 46 ++++++++++-----------------
 radio/src/gui/212x64/model_setup.cpp  | 46 ++++++++++-----------------
 radio/src/gui/480x272/model_setup.cpp | 40 +++++++++--------------
 radio/src/gui/gui_common.cpp          | 19 +++++++++++
 radio/src/gui/gui_common.h            |  1 +
 radio/src/translations.cpp            |  1 +
 radio/src/translations.h              |  1 +
 radio/src/translations/untranslated.h |  3 ++
 8 files changed, 73 insertions(+), 84 deletions(-)

diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp
index 28ca2c0b9..ca60a17af 100644
--- a/radio/src/gui/128x64/model_setup.cpp
+++ b/radio/src/gui/128x64/model_setup.cpp
@@ -1538,43 +1538,29 @@ void menuModelSetup(event_t event)
       {
 #if defined(MULTIMODULE)
         if (MULTIMODULE_PROTOCOL_KNOWN(moduleIdx)) {
+          const char * title = getMultiOptionTitle(moduleIdx);
+
+          lcdDrawText(INDENT_WIDTH, y, title);
+          if (title == STR_MULTI_RFTUNE) {
+            lcdDrawText(MODEL_SETUP_2ND_COLUMN + 23, y, "RSSI(", LEFT);
+            lcdDrawNumber(lcdLastRightPos, y, TELEMETRY_RSSI(), LEFT);
+            lcdDrawText(lcdLastRightPos, y, ")", LEFT);
+          }
+
           int optionValue = g_model.moduleData[moduleIdx].multi.optionValue;
-
-          MultiModuleStatus &status = getMultiModuleStatus(moduleIdx);
           const uint8_t multi_proto = g_model.moduleData[moduleIdx].getMultiProtocol();
-
-          if (status.isValid()) {
-            if (status.optionDisp >= getMaxMultiOptions()) {
-              status.optionDisp = 1; // Unknown options are defaulted to type 1 (basic option)
-            }
-            lcdDrawText(INDENT_WIDTH, y, mm_options_strings::options[status.optionDisp]);
-            if (attr && status.optionDisp == 2) {
-              lcdDrawText(MODEL_SETUP_2ND_COLUMN + 23, y, "RSSI(", LEFT);
-              lcdDrawNumber(lcdLastRightPos, y, TELEMETRY_RSSI(), LEFT);
-              lcdDrawText(lcdLastRightPos, y, ")", LEFT);
-            }
-          }
-          else {
-            const mm_protocol_definition * pdef = getMultiProtocolDefinition(multi_proto);
-            if (pdef->optionsstr) {
-              lcdDrawText(INDENT_WIDTH, y, pdef->optionsstr);
-              if (attr && pdef->optionsstr == STR_MULTI_RFTUNE) {
-                lcdDrawText(MODEL_SETUP_2ND_COLUMN + 23, y, "RSSI(", LEFT);
-                lcdDrawNumber(lcdLastRightPos, y, TELEMETRY_RSSI(), LEFT);
-                lcdDrawText(lcdLastRightPos, y, ")", LEFT);
-              }
-            }
-          }
-
           int8_t min, max;
           getMultiOptionValues(multi_proto, min, max);
 
-          if (multi_proto == MODULE_SUBTYPE_MULTI_FS_AFHDS2A) {
-            lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, 50 + 5 * optionValue, LEFT | attr);
-          }
-          else if (multi_proto == MODULE_SUBTYPE_MULTI_FRSKY_R9) {
+          if (title == STR_MULTI_RFPOWER) {
             lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_MULTI_POWER, optionValue, LEFT | attr);
           }
+          else if (title == STR_MULTI_TELEMETRY) {
+            lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_MULTI_TELEMETRY_MODE, optionValue, LEFT | attr);
+          }
+          else if (multi_proto == MODULE_SUBTYPE_MULTI_FS_AFHDS2A) {
+            lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, 50 + 5 * optionValue, LEFT | attr);
+          }
           else if (multi_proto == MODULE_SUBTYPE_MULTI_DSM2) {
             optionValue = optionValue & 0x01;
             editCheckBox(optionValue, MODEL_SETUP_2ND_COLUMN, y, "", LEFT | attr, event);
diff --git a/radio/src/gui/212x64/model_setup.cpp b/radio/src/gui/212x64/model_setup.cpp
index 390d55700..6c698f53e 100644
--- a/radio/src/gui/212x64/model_setup.cpp
+++ b/radio/src/gui/212x64/model_setup.cpp
@@ -1294,41 +1294,29 @@ void menuModelSetup(event_t event)
 #if defined(MULTIMODULE)
 
        if (MULTIMODULE_PROTOCOL_KNOWN(moduleIdx)) {
+         const char * title = getMultiOptionTitle(moduleIdx);
+
+         lcdDrawText(INDENT_WIDTH, y, title);
+         if (title == STR_MULTI_RFTUNE) {
+           lcdDrawText(MODEL_SETUP_2ND_COLUMN + 23, y, "RSSI(", LEFT);
+           lcdDrawNumber(lcdLastRightPos, y, TELEMETRY_RSSI(), LEFT);
+           lcdDrawText(lcdLastRightPos, y, ")", LEFT);
+         }
+
          int optionValue = g_model.moduleData[moduleIdx].multi.optionValue;
-
-         MultiModuleStatus &status = getMultiModuleStatus(moduleIdx);
-         const uint8_t multi_proto = g_model.moduleData[EXTERNAL_MODULE].getMultiProtocol();
-         if (status.isValid()) {
-           if (status.optionDisp >= getMaxMultiOptions()) {
-             status.optionDisp = 1; // Unknown options are defaulted to type 1 (basic option)
-           }
-           lcdDrawText(INDENT_WIDTH, y, mm_options_strings::options[status.optionDisp]);
-           if (attr && status.optionDisp == 2) {
-             lcdDrawText(MODEL_SETUP_3RD_COLUMN+22, y, "RSSI(", LEFT);
-             lcdDrawNumber(lcdLastRightPos, y, TELEMETRY_RSSI(), LEFT);
-             lcdDrawText(lcdLastRightPos, y, ")", LEFT);
-           }
-         }
-         else {
-           const mm_protocol_definition * pdef = getMultiProtocolDefinition(multi_proto);
-           if (pdef->optionsstr)
-             lcdDrawText(INDENT_WIDTH, y, pdef->optionsstr);
-           if (pdef->optionsstr == STR_MULTI_RFTUNE) {
-             lcdDrawText(MODEL_SETUP_3RD_COLUMN+22, y, "RSSI(", LEFT);
-             lcdDrawNumber(lcdLastRightPos, y, TELEMETRY_RSSI(), LEFT);
-             lcdDrawText(lcdLastRightPos, y, ")", LEFT);
-           }
-         }
-
+         const uint8_t multi_proto = g_model.moduleData[moduleIdx].getMultiProtocol();
          int8_t min, max;
          getMultiOptionValues(multi_proto, min, max);
 
-         if (multi_proto == MODULE_SUBTYPE_MULTI_FS_AFHDS2A) {
-           lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, 50 + 5 * optionValue, LEFT | attr);
-         }
-         else if (multi_proto == MODULE_SUBTYPE_MULTI_FRSKY_R9) {
+         if (title == STR_MULTI_RFPOWER) {
            lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_MULTI_POWER, optionValue, LEFT | attr);
          }
+         else if (title == STR_MULTI_TELEMETRY) {
+           lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_MULTI_TELEMETRY_MODE, optionValue, LEFT | attr);
+         }
+         else if (multi_proto == MODULE_SUBTYPE_MULTI_FS_AFHDS2A) {
+           lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, 50 + 5 * optionValue, LEFT | attr);
+         }
          else if (multi_proto == MODULE_SUBTYPE_MULTI_DSM2) {
            optionValue = optionValue & 0x01;
            editCheckBox(optionValue, MODEL_SETUP_2ND_COLUMN, y, "", LEFT | attr, event);
diff --git a/radio/src/gui/480x272/model_setup.cpp b/radio/src/gui/480x272/model_setup.cpp
index 724f12db4..55566524b 100644
--- a/radio/src/gui/480x272/model_setup.cpp
+++ b/radio/src/gui/480x272/model_setup.cpp
@@ -1676,38 +1676,27 @@ bool menuModelSetup(event_t event)
       {
 #if defined(MULTIMODULE)
         if (MULTIMODULE_PROTOCOL_KNOWN(moduleIdx)) {
+          const char * title = getMultiOptionTitle(moduleIdx);
+
+          lcdDrawText(MENUS_MARGIN_LEFT + INDENT_WIDTH, y, title);
+          if (title == STR_MULTI_RFTUNE) {
+            lcdDrawNumber(LCD_W - 10, y, TELEMETRY_RSSI(), RIGHT, 0, "RSSI(", ")");
+          }
+
           int optionValue = g_model.moduleData[moduleIdx].multi.optionValue;
-
-          MultiModuleStatus &status = getMultiModuleStatus(moduleIdx);
           const uint8_t multi_proto = g_model.moduleData[moduleIdx].getMultiProtocol();
-          if (status.isValid()) {
-            if (status.optionDisp >= getMaxMultiOptions()) {
-              status.optionDisp = 1; // Unknown options are defaulted to type 1 (basic option)
-            }
-            lcdDrawText(MENUS_MARGIN_LEFT + INDENT_WIDTH, y, mm_options_strings::options[status.optionDisp]);
-            if (attr && status.optionDisp == 2) {
-              lcdDrawNumber(LCD_W - 10, y, TELEMETRY_RSSI(), RIGHT, 0, "RSSI(", ")");
-            }
-          }
-          else {
-            const mm_protocol_definition * pdef = getMultiProtocolDefinition(multi_proto);
-            if (pdef->optionsstr) {
-              lcdDrawText(MENUS_MARGIN_LEFT + INDENT_WIDTH, y, pdef->optionsstr);
-              if (attr && pdef->optionsstr == STR_MULTI_RFTUNE) {
-                lcdDrawNumber(LCD_W - 10, y, TELEMETRY_RSSI(), RIGHT, 0, "RSSI(", ")");
-              }
-            }
-          }
-
           int8_t min, max;
           getMultiOptionValues(multi_proto, min, max);
 
-          if (multi_proto == MODULE_SUBTYPE_MULTI_FS_AFHDS2A) {
-            lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, 50 + 5 * optionValue, LEFT | attr);
-          }
-          else if (multi_proto == MODULE_SUBTYPE_MULTI_FRSKY_R9) {
+          if (title == STR_MULTI_RFPOWER) {
             lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_MULTI_POWER, optionValue, LEFT | attr);
           }
+          else if (title == STR_MULTI_TELEMETRY) {
+            lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_MULTI_TELEMETRY_MODE, optionValue, LEFT | attr);
+          }
+          else if (multi_proto == MODULE_SUBTYPE_MULTI_FS_AFHDS2A) {
+            lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, 50 + 5 * optionValue, LEFT | attr);
+          }
           else if (multi_proto == MODULE_SUBTYPE_MULTI_DSM2) {
             optionValue = optionValue & 0x01;
             editCheckBox(optionValue, MODEL_SETUP_2ND_COLUMN, y, LEFT | attr, event);
@@ -1718,6 +1707,7 @@ bool menuModelSetup(event_t event)
             else
               lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, optionValue, LEFT | attr);
           }
+
           if (attr) {
             CHECK_INCDEC_MODELVAR(event, optionValue, min, max);
             if (checkIncDec_Ret) {
diff --git a/radio/src/gui/gui_common.cpp b/radio/src/gui/gui_common.cpp
index 0cc14467a..b493247d5 100644
--- a/radio/src/gui/gui_common.cpp
+++ b/radio/src/gui/gui_common.cpp
@@ -1096,3 +1096,22 @@ void editStickHardwareSettings(coord_t x, coord_t y, int idx, event_t event, Lcd
   else
     lcdDrawMMM(x, y, flags);
 }
+
+#if defined(MULTIMODULE)
+const char* getMultiOptionTitle(uint8_t moduleIdx)
+{
+  MultiModuleStatus &status = getMultiModuleStatus(moduleIdx);
+
+  if (status.isValid()) {
+    if (status.optionDisp >= getMaxMultiOptions()) {
+      status.optionDisp = 1; // Unknown options are defaulted to type 1 (basic option)
+    }
+    return mm_options_strings::options[status.optionDisp];
+  }
+  else {
+    const uint8_t multi_proto = g_model.moduleData[moduleIdx].getMultiProtocol();
+    const mm_protocol_definition * pdef = getMultiProtocolDefinition(multi_proto);
+    return pdef->optionsstr;
+  }
+}
+#endif
diff --git a/radio/src/gui/gui_common.h b/radio/src/gui/gui_common.h
index 8f30a624e..784509378 100644
--- a/radio/src/gui/gui_common.h
+++ b/radio/src/gui/gui_common.h
@@ -318,6 +318,7 @@ inline uint8_t MODULE_OPTION_ROW(uint8_t moduleIdx) {
 }
 
 void editStickHardwareSettings(coord_t x, coord_t y, int idx, event_t event, LcdFlags flags);
+const char* getMultiOptionTitle(uint8_t moduleIdx);
 
 const char * writeScreenshot();
 
diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp
index 455d6490d..94b53d85f 100644
--- a/radio/src/translations.cpp
+++ b/radio/src/translations.cpp
@@ -98,6 +98,7 @@ ISTR(INPUTNAMES);
 #if defined(MULTIMODULE)
 ISTR(MULTI_PROTOCOLS);
 ISTR(MULTI_POWER);
+ISTR(MULTI_TELEMETRY_MODE);
 #endif
 
 #if defined(BLUETOOTH)
diff --git a/radio/src/translations.h b/radio/src/translations.h
index a9131d8a5..3e9ce3216 100644
--- a/radio/src/translations.h
+++ b/radio/src/translations.h
@@ -161,6 +161,7 @@ extern const char STR_R9M_PXX2_RF_PROTOCOLS[];
 extern const char STR_DSM_PROTOCOLS[];
 extern const char STR_MULTI_PROTOCOLS[];
 extern const char STR_MULTI_POWER[];
+extern const char STR_MULTI_TELEMETRY_MODE[];
 extern const char STR_SPORT_MODES[];
 
 #if defined(AFHDS3)
diff --git a/radio/src/translations/untranslated.h b/radio/src/translations/untranslated.h
index 2b1c05407..da0a481c8 100644
--- a/radio/src/translations/untranslated.h
+++ b/radio/src/translations/untranslated.h
@@ -136,6 +136,9 @@
 #define LEN_MULTI_POWER                "\005"
 #define TR_MULTI_POWER                 "1.6mW""2.0mW""2.5mW""3.2mW""4.0mW""5.0mW""6.3mW""7.9mW""10mW\0""13mW\0""16mW\0""20mW\0""25mW\0""32mW\0""40mW\0""50mW\0"
 
+#define LEN_MULTI_TELEMETRY_MODE        "\007"
+#define TR_MULTI_TELEMETRY_MODE        "Off\0   ""On\0    ""Off+Aux""On+Aux\0"
+
 #define LEN_AFHDS3_PROTOCOLS           "\x008"
 #define TR_AFHDS3_PROTOCOLS            "PWM/IBUS""PWM/SBUS""PPM/IBUS""PPM/SBUS"
 

From 5c5683894e8a591c52eefca2db42089f26d0dbb1 Mon Sep 17 00:00:00 2001
From: 3djc <lesitewebdejc@hotmail.com>
Date: Mon, 22 Feb 2021 11:45:28 +0100
Subject: [PATCH 3/4] Multi : improve options support part 2

---
 radio/src/gui/128x64/model_setup.cpp  | 7 +++++++
 radio/src/gui/212x64/model_setup.cpp  | 5 +++++
 radio/src/gui/480x272/model_setup.cpp | 7 +++++++
 radio/src/gui/gui_common.cpp          | 3 ++-
 radio/src/pulses/modules_helpers.h    | 4 ----
 radio/src/translations.cpp            | 2 ++
 radio/src/translations.h              | 2 ++
 radio/src/translations/cz.h.txt       | 1 +
 radio/src/translations/de.h.txt       | 1 +
 radio/src/translations/en.h.txt       | 1 +
 radio/src/translations/es.h.txt       | 1 +
 radio/src/translations/fi.h.txt       | 1 +
 radio/src/translations/fr.h.txt       | 1 +
 radio/src/translations/it.h.txt       | 1 +
 radio/src/translations/nl.h.txt       | 1 +
 radio/src/translations/pl.h.txt       | 1 +
 radio/src/translations/pt.h.txt       | 1 +
 radio/src/translations/se.h.txt       | 1 +
 radio/src/translations/untranslated.h | 3 +++
 19 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp
index ca60a17af..77ce40c42 100644
--- a/radio/src/gui/128x64/model_setup.cpp
+++ b/radio/src/gui/128x64/model_setup.cpp
@@ -1554,6 +1554,8 @@ void menuModelSetup(event_t event)
 
           if (title == STR_MULTI_RFPOWER) {
             lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_MULTI_POWER, optionValue, LEFT | attr);
+            min = 0;
+            max = 15;
           }
           else if (title == STR_MULTI_TELEMETRY) {
             lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_MULTI_TELEMETRY_MODE, optionValue, LEFT | attr);
@@ -1561,6 +1563,11 @@ void menuModelSetup(event_t event)
           else if (multi_proto == MODULE_SUBTYPE_MULTI_FS_AFHDS2A) {
             lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, 50 + 5 * optionValue, LEFT | attr);
           }
+          else if (title == STR_MULTI_WBUS) {
+            lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_MULTI_WBUS_MODE, optionValue, LEFT | attr);
+            min = 0;
+            max = 1;
+          }
           else if (multi_proto == MODULE_SUBTYPE_MULTI_DSM2) {
             optionValue = optionValue & 0x01;
             editCheckBox(optionValue, MODEL_SETUP_2ND_COLUMN, y, "", LEFT | attr, event);
diff --git a/radio/src/gui/212x64/model_setup.cpp b/radio/src/gui/212x64/model_setup.cpp
index 6c698f53e..47796ac79 100644
--- a/radio/src/gui/212x64/model_setup.cpp
+++ b/radio/src/gui/212x64/model_setup.cpp
@@ -1314,6 +1314,11 @@ void menuModelSetup(event_t event)
          else if (title == STR_MULTI_TELEMETRY) {
            lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_MULTI_TELEMETRY_MODE, optionValue, LEFT | attr);
          }
+         else if (title == STR_MULTI_WBUS) {
+           lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_MULTI_WBUS_MODE, optionValue, LEFT | attr);
+           min = 0;
+           max = 1;
+         }
          else if (multi_proto == MODULE_SUBTYPE_MULTI_FS_AFHDS2A) {
            lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, 50 + 5 * optionValue, LEFT | attr);
          }
diff --git a/radio/src/gui/480x272/model_setup.cpp b/radio/src/gui/480x272/model_setup.cpp
index 55566524b..895b406da 100644
--- a/radio/src/gui/480x272/model_setup.cpp
+++ b/radio/src/gui/480x272/model_setup.cpp
@@ -1690,10 +1690,17 @@ bool menuModelSetup(event_t event)
 
           if (title == STR_MULTI_RFPOWER) {
             lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_MULTI_POWER, optionValue, LEFT | attr);
+            min = 0;
+            max = 15;
           }
           else if (title == STR_MULTI_TELEMETRY) {
             lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_MULTI_TELEMETRY_MODE, optionValue, LEFT | attr);
           }
+          else if (title == STR_MULTI_WBUS) {
+            lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_MULTI_WBUS_MODE, optionValue, LEFT | attr);
+            min = 0;
+            max = 1;
+          }
           else if (multi_proto == MODULE_SUBTYPE_MULTI_FS_AFHDS2A) {
             lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, 50 + 5 * optionValue, LEFT | attr);
           }
diff --git a/radio/src/gui/gui_common.cpp b/radio/src/gui/gui_common.cpp
index b493247d5..98048c906 100644
--- a/radio/src/gui/gui_common.cpp
+++ b/radio/src/gui/gui_common.cpp
@@ -994,7 +994,8 @@ const char* mm_options_strings::options[] = {
   STR_MULTI_SERVOFREQ,
   STR_MULTI_MAX_THROW,
   STR_MULTI_RFCHAN,
-  STR_MULTI_RFPOWER
+  STR_MULTI_RFPOWER,
+  STR_MULTI_WBUS
 };
 
 const uint8_t getMaxMultiOptions()
diff --git a/radio/src/pulses/modules_helpers.h b/radio/src/pulses/modules_helpers.h
index b01db972d..b2bd77de4 100644
--- a/radio/src/pulses/modules_helpers.h
+++ b/radio/src/pulses/modules_helpers.h
@@ -673,10 +673,6 @@ inline void getMultiOptionValues(int8_t multi_proto, int8_t & min, int8_t & max)
       min = -1;
       max = 84;
       break;
-    case MODULE_SUBTYPE_MULTI_FRSKY_R9:
-      min = 0;  // 10mW
-      max = 5;  // 300mW
-      break;
     default:
       min = -128;
       max = 127;
diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp
index 94b53d85f..c54248064 100644
--- a/radio/src/translations.cpp
+++ b/radio/src/translations.cpp
@@ -99,6 +99,7 @@ ISTR(INPUTNAMES);
 ISTR(MULTI_PROTOCOLS);
 ISTR(MULTI_POWER);
 ISTR(MULTI_TELEMETRY_MODE);
+ISTR(MULTI_WBUS_MODE);
 #endif
 
 #if defined(BLUETOOTH)
@@ -708,6 +709,7 @@ const char STR_BIND_OK[] = TR_BIND_OK;
 const char STR_MULTI_CUSTOM[] = TR_MULTI_CUSTOM;
 const char STR_MULTI_RFTUNE[] = TR_MULTI_RFTUNE;
 const char STR_MULTI_RFPOWER[]  = TR_MULTI_RFPOWER;
+const char STR_MULTI_WBUS[]  = TR_MULTI_WBUS;
 const char STR_MULTI_TELEMETRY[] = TR_MULTI_TELEMETRY;
 const char STR_MULTI_VIDFREQ[] = TR_MULTI_VIDFREQ;
 const char STR_MULTI_OPTION[] = TR_MULTI_OPTION;
diff --git a/radio/src/translations.h b/radio/src/translations.h
index 3e9ce3216..90112a9f3 100644
--- a/radio/src/translations.h
+++ b/radio/src/translations.h
@@ -162,6 +162,7 @@ extern const char STR_DSM_PROTOCOLS[];
 extern const char STR_MULTI_PROTOCOLS[];
 extern const char STR_MULTI_POWER[];
 extern const char STR_MULTI_TELEMETRY_MODE[];
+extern const char STR_MULTI_WBUS_MODE[];
 extern const char STR_SPORT_MODES[];
 
 #if defined(AFHDS3)
@@ -404,6 +405,7 @@ extern const char STR_MULTI_OPTION[];
 extern const char STR_MULTI_VIDFREQ[];
 extern const char STR_MULTI_RFTUNE[];
 extern const char STR_MULTI_RFPOWER[];
+extern const char STR_MULTI_WBUS[];
 extern const char STR_MULTI_TELEMETRY[];
 extern const char STR_MULTI_AUTOBIND[];
 extern const char STR_DISABLE_CH_MAP[];
diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt
index 59eae1a46..26c96a182 100644
--- a/radio/src/translations/cz.h.txt
+++ b/radio/src/translations/cz.h.txt
@@ -639,6 +639,7 @@
 #define TR_RECEIVER                    "Přijímač"
 #define TR_MULTI_RFTUNE                TR(INDENT "Ladění frek", INDENT "Jemné ladění frek. RF")
 #define TR_MULTI_RFPOWER               "RF power"
+#define TR_MULTI_WBUS                  "Output"
 #define TR_MULTI_TELEMETRY             "Telemetrie"
 #define TR_MULTI_VIDFREQ               TR(INDENT "Freq. videa", INDENT "Frekvence videa")
 #define TR_RFPOWER                     "Výkon RF"
diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt
index fb36f0021..1e8d7ce96 100644
--- a/radio/src/translations/de.h.txt
+++ b/radio/src/translations/de.h.txt
@@ -641,6 +641,7 @@
   #define TR_RECEIVER                    "Empfänger"
 #define TR_MULTI_RFTUNE        			TR(INDENT "RF Freq.", INDENT "RF Freq. Feintuning")
 #define TR_MULTI_RFPOWER               "RF power"
+#define TR_MULTI_WBUS                  "Output"
 #define TR_MULTI_TELEMETRY             "Telemetry"
 #define TR_MULTI_VIDFREQ       			TR(INDENT "Vid. Freq.", INDENT "Video Frequenz")
 #define TR_RFPOWER              		"RF Power"
diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt
index f66e99a33..3ec8c1e31 100644
--- a/radio/src/translations/en.h.txt
+++ b/radio/src/translations/en.h.txt
@@ -640,6 +640,7 @@
   #define TR_RECEIVER                  "Receiver"
 #define TR_MULTI_RFTUNE                TR("Freq tune", "RF Freq. fine tune")
 #define TR_MULTI_RFPOWER               "RF power"
+#define TR_MULTI_WBUS                  "Output"
 #define TR_MULTI_TELEMETRY             "Telemetry"
 #define TR_MULTI_VIDFREQ               TR("Vid. freq.", "Video frequency")
 #define TR_RFPOWER                     "RF Power"
diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt
index 0e5fa3dc7..31a0b8afc 100644
--- a/radio/src/translations/es.h.txt
+++ b/radio/src/translations/es.h.txt
@@ -642,6 +642,7 @@
 #define TR_RECEIVER                    "Receptor"
 #define TR_MULTI_RFTUNE                TR("Sint.freq.", "RF Freq. sint.fina")
 #define TR_MULTI_RFPOWER               "RF power"
+#define TR_MULTI_WBUS                  "Output"
 #define TR_MULTI_TELEMETRY             "Telemetría"
 #define TR_MULTI_VIDFREQ               TR("Freq.vídeo", "Frecuencia vídeo")
 #define TR_RFPOWER                     "RF Power"
diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt
index 0bd9c954f..1158806f0 100644
--- a/radio/src/translations/fi.h.txt
+++ b/radio/src/translations/fi.h.txt
@@ -658,6 +658,7 @@
 #define TR_RECEIVER            "Receiver"
 #define TR_MULTI_RFTUNE        TR("Freq tune", "RF Freq. fine tune")
 #define TR_MULTI_RFPOWER               "RF power"
+#define TR_MULTI_WBUS                  "Output"
 #define TR_MULTI_TELEMETRY     "Telemetry"
 #define TR_MULTI_VIDFREQ       TR("Vid. freq.", "Video frequency")
 #define TR_RFPOWER       "RF Power"
diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt
index fb818f7e8..5e59ba68d 100644
--- a/radio/src/translations/fr.h.txt
+++ b/radio/src/translations/fr.h.txt
@@ -661,6 +661,7 @@
 #define TR_RECEIVER                    "Récept."
 #define TR_MULTI_RFTUNE                TR(INDENT "Ajust.fréq", INDENT "Ajustement fréq.")
 #define TR_MULTI_RFPOWER               "RF power"
+#define TR_MULTI_WBUS                  "Output"
 #define TR_MULTI_TELEMETRY             "Télémétrie"
 #define TR_MULTI_VIDFREQ               TR(INDENT "Fréq. vidéo", INDENT "Fréquence vidéo")
 #define TR_RFPOWER                     TR("Puiss. RF", "Puissance RF")
diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt
index 9a0785a1e..2e08ac45d 100644
--- a/radio/src/translations/it.h.txt
+++ b/radio/src/translations/it.h.txt
@@ -660,6 +660,7 @@
 #define TR_RECEIVER            "Ricevente"
 #define TR_MULTI_RFTUNE        TR("Tune RF", "Tune fine Freq. RF")
 #define TR_MULTI_RFPOWER               "RF power"
+#define TR_MULTI_WBUS                  "Output"
 #define TR_MULTI_TELEMETRY     "Telemetria"
 #define TR_MULTI_VIDFREQ       TR("Freq. video", "Frequenza video")
 #define TR_RFPOWER             "Potenza RF"
diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt
index 13f567589..f9a2be448 100644
--- a/radio/src/translations/nl.h.txt
+++ b/radio/src/translations/nl.h.txt
@@ -646,6 +646,7 @@
 #define TR_RECEIVER            "Receiver"
 #define TR_MULTI_RFTUNE        TR("Freq tune", "RF Freq. fine tune")
 #define TR_MULTI_RFPOWER               "RF power"
+#define TR_MULTI_WBUS                  "Output"
 #define TR_MULTI_TELEMETRY     "Telemetry"
 #define TR_MULTI_VIDFREQ       TR("Vid. freq.", "Video frequency")
 #define TR_RFPOWER       "RF Power"
diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt
index bf59714cf..200072288 100644
--- a/radio/src/translations/pl.h.txt
+++ b/radio/src/translations/pl.h.txt
@@ -659,6 +659,7 @@
   #define TR_RECEIVER          INDENT "Receiver"
 #define TR_MULTI_RFTUNE        TR("Freq tune", "RF Freq. fine tune")
 #define TR_MULTI_RFPOWER               "RF power"
+#define TR_MULTI_WBUS                  "Output"
 #define TR_MULTI_TELEMETRY             "Telemetry"
 #define TR_MULTI_VIDFREQ       TR("Vid. freq.", "Video frequency")
 #define TR_RFPOWER       "RF Power"
diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt
index 8c794822e..0d1d597ac 100644
--- a/radio/src/translations/pt.h.txt
+++ b/radio/src/translations/pt.h.txt
@@ -661,6 +661,7 @@
 #define TR_SYNCMENU            "Sync [MENU]"
 #define TR_MULTI_RFTUNE        TR("Freq tune", "RF Freq. fine tune")
 #define TR_MULTI_RFPOWER               "RF power"
+#define TR_MULTI_WBUS                  "Output"
 #define TR_MULTI_TELEMETRY     "Telemetry"
 #define TR_MULTI_VIDFREQ       TR("Vid. freq.", "Video frequency")
 #define TR_RFPOWER       "RF Power"
diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt
index 54c081eb3..c3d3267d3 100644
--- a/radio/src/translations/se.h.txt
+++ b/radio/src/translations/se.h.txt
@@ -659,6 +659,7 @@
 #define TR_SYNCMENU            "Synk [MENU]"
 #define TR_MULTI_RFTUNE        TR("Freq tune", "RF Freq. fine tune")
 #define TR_MULTI_RFPOWER               "RF power"
+#define TR_MULTI_WBUS                  "Output"
 #define TR_MULTI_TELEMETRY     "Telemetry"
 #define TR_MULTI_VIDFREQ       TR("Vid. freq.", "Video frequency")
 #define TR_RFPOWER             "RF Power"
diff --git a/radio/src/translations/untranslated.h b/radio/src/translations/untranslated.h
index da0a481c8..a758b1a31 100644
--- a/radio/src/translations/untranslated.h
+++ b/radio/src/translations/untranslated.h
@@ -136,6 +136,9 @@
 #define LEN_MULTI_POWER                "\005"
 #define TR_MULTI_POWER                 "1.6mW""2.0mW""2.5mW""3.2mW""4.0mW""5.0mW""6.3mW""7.9mW""10mW\0""13mW\0""16mW\0""20mW\0""25mW\0""32mW\0""40mW\0""50mW\0"
 
+#define LEN_MULTI_WBUS_MODE            "\004"
+#define TR_MULTI_WBUS_MODE             "WBUS""PPM\0"
+
 #define LEN_MULTI_TELEMETRY_MODE        "\007"
 #define TR_MULTI_TELEMETRY_MODE        "Off\0   ""On\0    ""Off+Aux""On+Aux\0"
 

From 71d3f1924918c18bb9803bcd03d6e982243f2ef4 Mon Sep 17 00:00:00 2001
From: 3djc <lesitewebdejc@hotmail.com>
Date: Thu, 25 Feb 2021 16:17:51 +0100
Subject: [PATCH 4/4] Cosmetcis

---
 radio/src/gui/gui_common.cpp | 2 +-
 radio/src/gui/gui_common.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/radio/src/gui/gui_common.cpp b/radio/src/gui/gui_common.cpp
index 98048c906..1bd84b21e 100644
--- a/radio/src/gui/gui_common.cpp
+++ b/radio/src/gui/gui_common.cpp
@@ -1099,7 +1099,7 @@ void editStickHardwareSettings(coord_t x, coord_t y, int idx, event_t event, Lcd
 }
 
 #if defined(MULTIMODULE)
-const char* getMultiOptionTitle(uint8_t moduleIdx)
+const char * getMultiOptionTitle(uint8_t moduleIdx)
 {
   MultiModuleStatus &status = getMultiModuleStatus(moduleIdx);
 
diff --git a/radio/src/gui/gui_common.h b/radio/src/gui/gui_common.h
index 784509378..e55c16581 100644
--- a/radio/src/gui/gui_common.h
+++ b/radio/src/gui/gui_common.h
@@ -318,7 +318,7 @@ inline uint8_t MODULE_OPTION_ROW(uint8_t moduleIdx) {
 }
 
 void editStickHardwareSettings(coord_t x, coord_t y, int idx, event_t event, LcdFlags flags);
-const char* getMultiOptionTitle(uint8_t moduleIdx);
+const char * getMultiOptionTitle(uint8_t moduleIdx);
 
 const char * writeScreenshot();