Firmware options (#6583)

Firmware options screen

radio/src/gui/480x272/radio_version.cpp

@@ -19,6 +19,7 @@
  */
 
 #include "opentx.h"
+#include "options.h"
 
 bool menuRadioVersion(event_t event)
 {
@@ -53,5 +54,23 @@ bool menuRadioVersion(event_t event)
   }
 #endif
 
+  coord_t y = MENU_CONTENT_TOP + 5*FH;
+  lcdDrawText(MENUS_MARGIN_LEFT, y, "OPTS:");
+  lcdNextPos = MENUS_MARGIN_LEFT + 64;
+
+  for (uint8_t i=0; options[i]; i++) {
+    const char * option = options[i];
+    coord_t width = getTextWidth(option);
+
+    if((lcdNextPos + 5 + width) > LCD_W) {
+      lcdDrawText(lcdNextPos, y, ",");
+      lcdNextPos = MENUS_MARGIN_LEFT;
+      y += FH;
+    }
+    if (i > 0 && lcdNextPos !=MENUS_MARGIN_LEFT)
+      lcdDrawText(lcdNextPos, y, ", ");
+    lcdDrawText(lcdNextPos, y, option);
+  }
+
   return true;
 }

radio/src/gui/common/stdlcd/radio_hardware.cpp

@@ -176,6 +176,10 @@ enum {
   ITEM_RADIO_HARDWARE_JITTER_FILTER,
   ITEM_RADIO_HARDWARE_RAS,
   ITEM_RADIO_HARDWARE_DEBUG,
+#if defined(EEPROM_RLC)
+  ITEM_RADIO_BACKUP_EEPROM,
+  ITEM_RADIO_FACTORY_RESET,
+#endif
   ITEM_RADIO_HARDWARE_MAX
 };
 
@@ -263,6 +267,17 @@ enum {
   #define HW_SETTINGS_COLUMN2            (HW_SETTINGS_COLUMN1 + 5*FW)
 #endif
 
+#if defined(EEPROM_RLC)
+void onFactoryResetConfirm(const char * result)
+{
+  if (result == STR_OK) {
+    showMessageBox(STR_STORAGE_FORMAT);
+    storageEraseAll(false);
+    NVIC_SystemReset();
+  }
+}
+#endif
+
 void menuRadioHardware(event_t event)
 {
   MENU(STR_HARDWARE, menuTabGeneral, MENU_RADIO_HARDWARE, HEADER_LINE + ITEM_RADIO_HARDWARE_MAX, {
@@ -571,6 +586,22 @@ void menuRadioHardware(event_t event)
             pushMenu(menuRadioDiagKeys);
         }
         break;
+
+      case ITEM_RADIO_BACKUP_EEPROM:
+        lcdDrawText(0, y, BUTTON(STR_EEBACKUP), attr);
+        if (attr && event == EVT_KEY_FIRST(KEY_ENTER)) {
+          s_editMode = EDIT_SELECT_FIELD;
+          eepromBackup();
+        }
+        break;
+
+      case ITEM_RADIO_FACTORY_RESET:
+        lcdDrawText(0, y, BUTTON(STR_FACTORYRESET), attr);
+        if (attr && event == EVT_KEY_FIRST(KEY_ENTER)) {
+          s_editMode = EDIT_SELECT_FIELD;
+          POPUP_CONFIRMATION(STR_CONFIRMRESET, onFactoryResetConfirm);
+        }
+        break;
     }
   }
 }

radio/src/gui/common/stdlcd/radio_version.cpp

@@ -19,6 +19,7 @@
  */
 
 #include "opentx.h"
+#include "options.h"
 
 // TODO duplicated code
 #if defined(ROTARY_ENCODER_NAVIGATION)
@@ -34,6 +35,27 @@
 
 constexpr uint8_t COLUMN2_X = 10 * FW;
 
+
+void menuRadioFirmwareOptions(event_t event)
+{
+  title(STR_MENU_FIRM_OPTIONS);
+  coord_t y = MENU_HEADER_HEIGHT + 1;
+  lcdNextPos = INDENT_WIDTH;
+  for (uint8_t i=0; options[i]; i++) {
+    const char * option = options[i];
+    coord_t width = getTextWidth(option);
+
+    if((lcdNextPos + 5 + width) > LCD_W) {
+      lcdDrawText(lcdNextPos, y, ",");
+      lcdNextPos = INDENT_WIDTH;
+      y += FH;
+    }
+    if (i > 0 && lcdNextPos !=INDENT_WIDTH)
+      lcdDrawText(lcdNextPos, y, ", ");
+    lcdDrawText(lcdNextPos, y, option);
+  }
+}
+
 #if defined(PXX2)
 void drawPXX2Version(coord_t x, coord_t y, PXX2Version version)
 {
@@ -191,27 +213,15 @@ void menuRadioModulesVersion(event_t event)
 enum MenuRadioVersionItems
 {
   ITEM_RADIO_VERSION_FIRST = HEADER_LINE - 1,
+#if defined(PCBTARANIS) || defined(PCBHORUS)
+  ITEM_RADIO_FIRMWARE_OPTIONS,
+#endif
 #if defined(PXX2)
   ITEM_RADIO_MODULES_VERSION,
-#endif
-#if defined(EEPROM_RLC)
-  ITEM_RADIO_BACKUP_EEPROM,
-  ITEM_RADIO_FACTORY_RESET,
 #endif
   ITEM_RADIO_VERSION_COUNT
 };
 
-#if defined(EEPROM_RLC)
-void onFactoryResetConfirm(const char * result)
-{
-  if (result == STR_OK) {
-    showMessageBox(STR_STORAGE_FORMAT);
-    storageEraseAll(false);
-    NVIC_SystemReset();
-  }
-}
-#endif
-
 void menuRadioVersion(event_t event)
 {
   SIMPLE_MENU(STR_MENUVERSION, menuTabGeneral, MENU_RADIO_VERSION, ITEM_RADIO_VERSION_COUNT);
@@ -228,9 +238,15 @@ void menuRadioVersion(event_t event)
     lcdDrawText(lcdNextPos, y, "---", SMLSIZE);
   y += FH - 1;
 #endif
-
   y += 2;
-
+#if defined(PCBTARANIS) || defined(PCBHORUS)
+  lcdDrawText(INDENT_WIDTH, y, BUTTON(TR_FIRMWARE_OPTIONS), menuVerticalPosition == ITEM_RADIO_FIRMWARE_OPTIONS ? INVERS : 0);
+  y += FH;
+  if (menuVerticalPosition == ITEM_RADIO_FIRMWARE_OPTIONS && event == EVT_KEY_BREAK(KEY_ENTER)) {
+    s_editMode = EDIT_SELECT_FIELD;
+    pushMenu(menuRadioFirmwareOptions);
+  }
+#endif
 #if defined(PXX2)
   lcdDrawText(INDENT_WIDTH, y, BUTTON(TR_MODULES_RX_VERSION), menuVerticalPosition == ITEM_RADIO_MODULES_VERSION ? INVERS : 0);
   y += FH;
@@ -239,20 +255,4 @@ void menuRadioVersion(event_t event)
     pushMenu(menuRadioModulesVersion);
   }
 #endif
-
-#if defined(EEPROM_RLC)
-  lcdDrawText(INDENT_WIDTH, y, BUTTON(STR_EEBACKUP), menuVerticalPosition == ITEM_RADIO_BACKUP_EEPROM ? INVERS : 0);
-  y += FH;
-  if (menuVerticalPosition == ITEM_RADIO_BACKUP_EEPROM && event == EVT_KEY_BREAK(KEY_ENTER)) {
-    s_editMode = EDIT_SELECT_FIELD;
-    eepromBackup();
-  }
-
-  lcdDrawText(INDENT_WIDTH, y, BUTTON(STR_FACTORYRESET), menuVerticalPosition == ITEM_RADIO_FACTORY_RESET ? INVERS : 0);
-  // y += FH;
-  if (menuVerticalPosition == ITEM_RADIO_FACTORY_RESET && event == EVT_KEY_BREAK(KEY_ENTER)) {
-    s_editMode = EDIT_SELECT_FIELD;
-    POPUP_CONFIRMATION(STR_CONFIRMRESET, onFactoryResetConfirm);
-  }
-#endif
 }

radio/src/options.h

@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) OpenTX
+ *
+ * Based on code named
+ *   th9x - http://code.google.com/p/th9x
+ *   er9x - http://code.google.com/p/er9x
+ *   gruvin9x - http://code.google.com/p/gruvin9x
+ *
+ * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+
+#ifndef OPENTX_OPTIONS_H
+#define OPENTX_OPTIONS_H
+
+static const char * options[] = {
+#if defined(AUTOUPDATE)
+  "autoupdate",
+#endif
+#if defined(CROSSFIRE)
+  "crossfire",
+#endif
+#if defined(MODULE_D16_EU_ONLY_SUPPORT)
+  "eu",
+#endif
+#if defined(FAI)
+  "faimode",
+#endif
+#if defined(FAI_CHOICE)
+  "faichoice",
+#endif
+#if defined(R9M_PROTO_FLEX)
+  "flexr9m",
+#endif
+#if !defined(GVARS)
+  "nogvars",
+#endif
+#if defined(HAPTIC) && defined(PCBX9D)
+  "haptic",
+#endif
+#if !defined(HELI)
+  "noheli",
+#endif
+#if defined(HORUS_STICKS)
+  "horussticks",
+#endif
+#if defined(INTERNAL_MODULE_PPM)
+  "internalppm",
+#endif
+#if defined(MULTIMODULE)
+  "multimodule",
+#endif
+#if defined(LUA_MODEL_SCRIPTS)
+  "lua",
+#endif
+#if defined(LUA_COMPILER)
+  "luac",
+#endif
+#if !defined(OVERRIDE_CHANNEL_FUNCTION)
+  "nooverridech",
+#endif
+#if defined(PPM_UNIT_US)
+  "ppmus",
+#endif
+#if defined(NO_RAS)
+  "noras",
+#endif
+#if defined(SHUTDOWN_CONFIRMATION)
+  "shutdownconfirm",
+#endif
+  nullptr //sentinel
+};
+
+#endif //OPENTX_OPTIONS_H

radio/src/translations.cpp

@@ -342,6 +342,7 @@ const char STR_PIN[] = TR_PIN;
 const char STR_UPDATE_RX_OPTIONS[] = TR_UPDATE_RX_OPTIONS;
 const char STR_UPDATE_TX_OPTIONS[] = TR_UPDATE_TX_OPTIONS;
 const char STR_MENU_MODULES_RX_VERSION[] = TR_MENU_MODULES_RX_VERSION;
+const char STR_MENU_FIRM_OPTIONS[]  = TR_MENU_FIRM_OPTIONS;
 const char STR_GYRO[] = TR_GYRO;
 const char STR_STICKS_POTS_SLIDERS[] = TR_STICKS_POTS_SLIDERS;
 const char STR_PWM_STICKS_POTS_SLIDERS[] = TR_PWM_STICKS_POTS_SLIDERS;
@@ -495,6 +496,7 @@ const char STR_FORMULA[] = TR_FORMULA;
 const char STR_CELLINDEX[] = TR_CELLINDEX;
 const char STR_LOGS[] = TR_LOGS;
 const char STR_OPTIONS[] = TR_OPTIONS;
+const char STR_FIRMWARE_OPTIONS[]  = TR_FIRMWARE_OPTIONS;
 const char STR_ALTSENSOR[] = TR_ALTSENSOR;
 const char STR_CELLSENSOR[] = TR_CELLSENSOR;
 const char STR_GPSSENSOR[] = TR_GPSSENSOR;

radio/src/translations.h

@@ -501,6 +501,7 @@ extern const char STR_PIN[];
 extern const char STR_UPDATE_RX_OPTIONS[];
 extern const char STR_UPDATE_TX_OPTIONS[];
 extern const char STR_MENU_MODULES_RX_VERSION[];
+extern const char STR_MENU_FIRM_OPTIONS[];
 extern const char STR_GYRO[];
 extern const char STR_STICKS_POTS_SLIDERS[];
 extern const char STR_PWM_STICKS_POTS_SLIDERS[];
@@ -754,6 +755,7 @@ extern const char STR_FORMULA[];
 extern const char STR_CELLINDEX[];
 extern const char STR_LOGS[];
 extern const char STR_OPTIONS[];
+extern const char STR_FIRMWARE_OPTIONS[];
 extern const char STR_ALTSENSOR[];
 extern const char STR_CELLSENSOR[];
 extern const char STR_GPSSENSOR[];

radio/src/translations/cz.h.txt

@@ -771,6 +771,7 @@
 #define TR_UPDATE_TX_OPTIONS           "Uložit nastavení?"
 #define TR_MODULES_RX_VERSION          "Verze modulu a RX"
 #define TR_MENU_MODULES_RX_VERSION     "VERZE MODULU A RX"
+#define TR_MENU_FIRM_OPTIONS           "FIRMWARE OPTIONS"
 #define TR_GYRO                        "Gyro"
 #define TR_STICKS_POTS_SLIDERS         "páky/pot./slidery"
 #define TR_PWM_STICKS_POTS_SLIDERS     "PWM páky/Pot./slidery"
@@ -1160,6 +1161,7 @@
 #define TR_CELLINDEX                   "Článek"
 #define TR_LOGS                        "Logovat"
 #define TR_OPTIONS                     "Možnosti"
+#define TR_FIRMWARE_OPTIONS            "Firmware options"
 
 #define TR_ALTSENSOR                   "Senzor výšky"
 #define TR_CELLSENSOR                  "Senzor článků"

radio/src/translations/de.h.txt

@@ -782,6 +782,7 @@
 #define TR_UPDATE_TX_OPTIONS           "Update TX options?"
 #define TR_MODULES_RX_VERSION          "Modules / RX version"
 #define TR_MENU_MODULES_RX_VERSION     "MODULES / RX VERSION"
+#define TR_MENU_FIRM_OPTIONS           "FIRMWARE OPTIONS"
 #define TR_GYRO                        "Gyro"
 #define TR_STICKS_POTS_SLIDERS         "Sticks/Pots/Sliders"
 #define TR_PWM_STICKS_POTS_SLIDERS     "PWM Sticks/Pots/Sliders"
@@ -1167,6 +1168,7 @@
 #define TR_CELLINDEX           "Zellenindex"
 #define TR_LOGS                "Log Daten"
 #define TR_OPTIONS             "Optionen"
+#define TR_FIRMWARE_OPTIONS    "Firmware options"
 
 #define TR_ALTSENSOR           "Höhen Sensor"
 #define TR_CELLSENSOR          "Zellen Sensor"

radio/src/translations/en.h.txt

@@ -773,6 +773,7 @@
 #define TR_UPDATE_TX_OPTIONS           "Update TX options?"
 #define TR_MODULES_RX_VERSION          "Modules / RX version"
 #define TR_MENU_MODULES_RX_VERSION     "MODULES / RX VERSION"
+#define TR_MENU_FIRM_OPTIONS           "FIRMWARE OPTIONS"
 #define TR_GYRO                        "Gyro"
 #define TR_STICKS_POTS_SLIDERS         "Sticks/Pots/Sliders"
 #define TR_PWM_STICKS_POTS_SLIDERS     "PWM Sticks/Pots/Sliders"
@@ -1161,6 +1162,7 @@
 #define TR_CELLINDEX                   "Cell index"
 #define TR_LOGS                        "Logs"
 #define TR_OPTIONS                     "Options"
+#define TR_FIRMWARE_OPTIONS            "Firmware options"
 
 #define TR_ALTSENSOR                   "Alt sensor"
 #define TR_CELLSENSOR                  "Cell sensor"

radio/src/translations/es.h.txt

@@ -797,6 +797,7 @@
 #define TR_UPDATE_TX_OPTIONS           "Update TX options?"
 #define TR_MODULES_RX_VERSION          "Modules / RX version"
 #define TR_MENU_MODULES_RX_VERSION     "MODULES / RX VERSION"
+#define TR_MENU_FIRM_OPTIONS           "FIRMWARE OPTIONS"
 #define TR_GYRO                        "Gyro"
 #define TR_STICKS_POTS_SLIDERS         "Sticks/Pots/Sliders"
 #define TR_PWM_STICKS_POTS_SLIDERS     "PWM Sticks/Pots/Sliders"
@@ -1182,6 +1183,7 @@
 #define TR_CELLINDEX           "Cell index"
 #define TR_LOGS                "Logs"
 #define TR_OPTIONS             "Options"
+#define TR_FIRMWARE_OPTIONS    "Firmware options"
 
 #define TR_ALTSENSOR           "Alt sensor"
 #define TR_CELLSENSOR          "Cell sensor"

radio/src/translations/fi.h.txt

@@ -790,6 +790,7 @@
 #define TR_UPDATE_TX_OPTIONS           "Update TX options?"
 #define TR_MODULES_RX_VERSION          "Modules / RX version"
 #define TR_MENU_MODULES_RX_VERSION     "MODULES / RX VERSION"
+#define TR_MENU_FIRM_OPTIONS           "FIRMWARE OPTIONS"
 #define TR_GYRO                        "Gyro"
 #define TR_STICKS_POTS_SLIDERS         "Sticks/Pots/Sliders"
 #define TR_PWM_STICKS_POTS_SLIDERS     "PWM Sticks/Pots/Sliders"
@@ -1175,6 +1176,7 @@
 #define TR_CELLINDEX           "Cell index"
 #define TR_LOGS                "Logs"
 #define TR_OPTIONS             "Options"
+#define TR_FIRMWARE_OPTIONS    "Firmware options"
 
 #define TR_ALTSENSOR           "Alt sensor"
 #define TR_CELLSENSOR          "Cell sensor"

radio/src/translations/fr.h.txt

@@ -793,6 +793,7 @@
 #define TR_UPDATE_TX_OPTIONS           "Update TX options?"
 #define TR_MODULES_RX_VERSION          "Modules / RX version"
 #define TR_MENU_MODULES_RX_VERSION     "MODULES / RX VERSION"
+#define TR_MENU_FIRM_OPTIONS           "FIRMWARE OPTIONS"
 #define TR_GYRO                        "Gyro"
 #define TR_STICKS_POTS_SLIDERS         "Sticks/Pots/Sliders"
 #define TR_PWM_STICKS_POTS_SLIDERS     "PWM Sticks/Pots/Sliders"
@@ -1184,6 +1185,7 @@
 #define TR_CELLINDEX                   "Index élem."
 #define TR_LOGS                        "Logs"
 #define TR_OPTIONS                     "Options"
+#define TR_FIRMWARE_OPTIONS            "Firmware options"
 
 #define TR_ALTSENSOR                   "Capteur Alt"
 #define TR_CELLSENSOR                  "Capteur Elém"

radio/src/translations/it.h.txt

@@ -791,6 +791,7 @@
 #define TR_UPDATE_TX_OPTIONS           "Update TX options?"
 #define TR_MODULES_RX_VERSION          "Modules / RX version"
 #define TR_MENU_MODULES_RX_VERSION     "MODULES / RX VERSION"
+#define TR_MENU_FIRM_OPTIONS           "FIRMWARE OPTIONS"
 #define TR_GYRO                        "Gyro"
 #define TR_STICKS_POTS_SLIDERS         "Sticks/Pots/Sliders"
 #define TR_PWM_STICKS_POTS_SLIDERS     "PWM Sticks/Pots/Sliders"
@@ -1176,6 +1177,7 @@
 #define TR_CELLINDEX           "Indice cella"
 #define TR_LOGS                "Logs"
 #define TR_OPTIONS             "Opzioni"
+#define TR_FIRMWARE_OPTIONS    "Firmware options"
 
 #define TR_ALTSENSOR           "Sensore Alt"
 #define TR_CELLSENSOR          "Sensore Cell"

radio/src/translations/nl.h.txt

@@ -780,6 +780,7 @@ TR_GYR_VSRCRAW
 #define TR_UPDATE_TX_OPTIONS           "Update TX options?"
 #define TR_MODULES_RX_VERSION          "Modules / RX version"
 #define TR_MENU_MODULES_RX_VERSION     "MODULES / RX VERSION"
+#define TR_MENU_FIRM_OPTIONS           "FIRMWARE OPTIONS"
 #define TR_GYRO                        "Gyro"
 #define TR_STICKS_POTS_SLIDERS         "Sticks/Pots/Sliders"
 #define TR_PWM_STICKS_POTS_SLIDERS     "PWM Sticks/Pots/Sliders"
@@ -1170,6 +1171,7 @@ TR_GYR_VSRCRAW
 #define TR_CELLINDEX           "Cel index"
 #define TR_LOGS                "Log Data"
 #define TR_OPTIONS             "Opties"
+#define TR_FIRMWARE_OPTIONS    "Firmware options"
 
 #define TR_ALTSENSOR           "Hoogte Sensor"
 #define TR_CELLSENSOR          "Cellen Sensor"

radio/src/translations/pl.h.txt

@@ -791,6 +791,7 @@
 #define TR_UPDATE_TX_OPTIONS           "Update TX options?"
 #define TR_MODULES_RX_VERSION          "Modules / RX version"
 #define TR_MENU_MODULES_RX_VERSION     "MODULES / RX VERSION"
+#define TR_MENU_FIRM_OPTIONS           "FIRMWARE OPTIONS"
 #define TR_GYRO                        "Gyro"
 #define TR_STICKS_POTS_SLIDERS         "Sticks/Pots/Sliders"
 #define TR_PWM_STICKS_POTS_SLIDERS     "PWM Sticks/Pots/Sliders"
@@ -1176,6 +1177,7 @@
 #define TR_CELLINDEX           "Cell index"
 #define TR_LOGS                "Logi"
 #define TR_OPTIONS             "Opcje  "
+#define TR_FIRMWARE_OPTIONS    "Firmware options"
 
 #define TR_ALTSENSOR           "Alt sensor"
 #define TR_CELLSENSOR          "Cell sensor"

radio/src/translations/pt.h.txt

@@ -781,6 +781,7 @@
 #define TR_UPDATE_TX_OPTIONS           "Update TX options?"
 #define TR_MODULES_RX_VERSION          "Modules / RX version"
 #define TR_MENU_MODULES_RX_VERSION     "MODULES / RX VERSION"
+#define TR_MENU_FIRM_OPTIONS           "FIRMWARE OPTIONS"
 #define TR_GYRO                        "Gyro"
 #define TR_STICKS_POTS_SLIDERS         "Sticks/Pots/Sliders"
 #define TR_PWM_STICKS_POTS_SLIDERS     "PWM Sticks/Pots/Sliders"
@@ -1166,6 +1167,7 @@
 #define TR_CELLINDEX           "Cell index"
 #define TR_LOGS                "Logs"
 #define TR_OPTIONS             "Options"
+#define TR_FIRMWARE_OPTIONS    "Firmware options"
 
 #define TR_ALTSENSOR           "Alt sensor"
 #define TR_CELLSENSOR          "Cell sensor"

radio/src/translations/se.h.txt

@@ -790,6 +790,7 @@
 #define TR_UPDATE_TX_OPTIONS           "Update TX options?"
 #define TR_MODULES_RX_VERSION          "Modules / RX version"
 #define TR_MENU_MODULES_RX_VERSION     "MODULES / RX VERSION"
+#define TR_MENU_FIRM_OPTIONS           "FIRMWARE OPTIONS"
 #define TR_GYRO                        "Gyro"
 #define TR_STICKS_POTS_SLIDERS         "Sticks/Pots/Sliders"
 #define TR_PWM_STICKS_POTS_SLIDERS     "PWM Sticks/Pots/Sliders"
@@ -1176,6 +1177,7 @@
 #define TR_CELLINDEX           "Cell index"
 #define TR_LOGS                "Logga"
 #define TR_OPTIONS             "Options"
+#define TR_FIRMWARE_OPTIONS    "Firmware options"
 
 #define TR_ALTSENSOR           "Höjdsensor"
 #define TR_CELLSENSOR          "Cell sensor"