Fixes #2870

2025-07-12 19:10:19 +03:00 · 2015-09-26 07:56:07 +02:00 · 2015-09-26 07:56:07 +02:00 · 1d6adcc25a
commit 1d6adcc25a
parent b48946b3aa
145 changed files with 14 additions and 14 deletions
--- a/companion/src/converteeprom.cpp
+++ b/companion/src/converteeprom.cpp
--- a/companion/src/converteeprom.h
+++ b/companion/src/converteeprom.h
--- a/companion/src/firmwareinterface.cpp
+++ b/companion/src/firmwareinterface.cpp
--- a/companion/src/firmwareinterface.h
+++ b/companion/src/firmwareinterface.h
--- a/companion/src/firmwares/opentx/opentxinterface.cpp
+++ b/companion/src/firmwares/opentx/opentxinterface.cpp
@ -728,7 +728,7 @@ int OpenTxFirmware::getCapability(const Capability capability)
    case HasFailsafe:
      return (IS_ARM(board) ? 32 : 0);
    case NumModules:
-      return (IS_ARM(board) && !IS_9XRPRO(board)) ? 2 : 1;
+      return (IS_ARM(board) ? 2 : 1);
    case HasPPMStart:
      return (IS_ARM(board) ? true : false);
    case HastxCurrentCalibration:
--- a/companion/src/flasheepromdialog.cpp
+++ b/companion/src/flasheepromdialog.cpp
--- a/companion/src/flasheepromdialog.h
+++ b/companion/src/flasheepromdialog.h
--- a/companion/src/flasheepromdialog.ui
+++ b/companion/src/flasheepromdialog.ui
--- a/companion/src/flashfirmwaredialog.cpp
+++ b/companion/src/flashfirmwaredialog.cpp
--- a/companion/src/flashfirmwaredialog.h
+++ b/companion/src/flashfirmwaredialog.h
--- a/companion/src/flashfirmwaredialog.ui
+++ b/companion/src/flashfirmwaredialog.ui
--- a/companion/src/helpers_html.cpp
+++ b/companion/src/helpers_html.cpp
--- a/companion/src/helpers_html.h
+++ b/companion/src/helpers_html.h
--- a/companion/src/images/originals/scripts/addblackoutline.sh
+++ b/companion/src/images/originals/scripts/addblackoutline.sh
--- a/companion/src/images/originals/scripts/makeblue.sh
+++ b/companion/src/images/originals/scripts/makeblue.sh
--- a/companion/src/images/originals/scripts/makewhite.sh
+++ b/companion/src/images/originals/scripts/makewhite.sh
--- a/companion/src/process_copy.cpp
+++ b/companion/src/process_copy.cpp
--- a/companion/src/process_copy.h
+++ b/companion/src/process_copy.h
--- a/companion/src/process_flash.cpp
+++ b/companion/src/process_flash.cpp
--- a/companion/src/process_flash.h
+++ b/companion/src/process_flash.h
--- a/companion/src/process_sync.cpp
+++ b/companion/src/process_sync.cpp
--- a/companion/src/process_sync.h
+++ b/companion/src/process_sync.h
--- a/companion/src/progressdialog.cpp
+++ b/companion/src/progressdialog.cpp
--- a/companion/src/progressdialog.h
+++ b/companion/src/progressdialog.h
--- a/companion/src/progressdialog.ui
+++ b/companion/src/progressdialog.ui
--- a/companion/src/progresswidget.cpp
+++ b/companion/src/progresswidget.cpp
--- a/companion/src/progresswidget.h
+++ b/companion/src/progresswidget.h
--- a/companion/src/progresswidget.ui
+++ b/companion/src/progresswidget.ui
--- a/companion/src/radiointerface.cpp
+++ b/companion/src/radiointerface.cpp
--- a/companion/src/radiointerface.h
+++ b/companion/src/radiointerface.h
--- a/companion/src/releasenotesdialog.cpp
+++ b/companion/src/releasenotesdialog.cpp
--- a/companion/src/releasenotesdialog.h
+++ b/companion/src/releasenotesdialog.h
--- a/companion/src/releasenotesfirmwaredialog.cpp
+++ b/companion/src/releasenotesfirmwaredialog.cpp
--- a/companion/src/releasenotesfirmwaredialog.h
+++ b/companion/src/releasenotesfirmwaredialog.h
--- a/companion/src/shared/autolineedit.h
+++ b/companion/src/shared/autolineedit.h
--- a/companion/src/translations/companion_es.ts
+++ b/companion/src/translations/companion_es.ts
--- a/companion/targets/windows/simulator-vs.nsi.in
+++ b/companion/targets/windows/simulator-vs.nsi.in
--- a/doc/lua-reference-guide.tex
+++ b/doc/lua-reference-guide.tex
--- a/radio/src/bitmaps/9X/about.png
+++ b/radio/src/bitmaps/9X/about.png
--- a/radio/src/bitmaps/9X/asterisk.xbm
+++ b/radio/src/bitmaps/9X/asterisk.xbm
--- a/radio/src/bitmaps/9X/splash.xbm
+++ b/radio/src/bitmaps/9X/splash.xbm
--- a/radio/src/bitmaps/Taranis/.gitignore
+++ b/radio/src/bitmaps/Taranis/.gitignore
--- a/radio/src/bitmaps/Taranis/about.png
+++ b/radio/src/bitmaps/Taranis/about.png
--- a/radio/src/bitmaps/Taranis/asterisk.png
+++ b/radio/src/bitmaps/Taranis/asterisk.png
--- a/radio/src/bitmaps/Taranis/icons.png
+++ b/radio/src/bitmaps/Taranis/icons.png
--- a/radio/src/bitmaps/Taranis/lock.png
+++ b/radio/src/bitmaps/Taranis/lock.png
--- a/radio/src/bitmaps/Taranis/shutdown.png
+++ b/radio/src/bitmaps/Taranis/shutdown.png
--- a/radio/src/bitmaps/Taranis/sleep.png
+++ b/radio/src/bitmaps/Taranis/sleep.png
--- a/radio/src/bitmaps/Taranis/splash.png
+++ b/radio/src/bitmaps/Taranis/splash.png
--- a/radio/src/bitmaps/sticks.xbm
+++ b/radio/src/bitmaps/sticks.xbm
--- a/radio/src/gui/9X/gui.h
+++ b/radio/src/gui/9X/gui.h
--- a/radio/src/gui/9X/helpers.cpp
+++ b/radio/src/gui/9X/helpers.cpp
--- a/radio/src/gui/9X/lcd.cpp
+++ b/radio/src/gui/9X/lcd.cpp
--- a/radio/src/gui/9X/lcd.h
+++ b/radio/src/gui/9X/lcd.h
--- a/radio/src/gui/9X/menu_general.cpp
+++ b/radio/src/gui/9X/menu_general.cpp
--- a/radio/src/gui/9X/menu_general_calib.cpp
+++ b/radio/src/gui/9X/menu_general_calib.cpp
--- a/radio/src/gui/9X/menu_general_diaganas.cpp
+++ b/radio/src/gui/9X/menu_general_diaganas.cpp
--- a/radio/src/gui/9X/menu_general_diagkeys.cpp
+++ b/radio/src/gui/9X/menu_general_diagkeys.cpp
--- a/radio/src/gui/9X/menu_general_hardware.cpp
+++ b/radio/src/gui/9X/menu_general_hardware.cpp
--- a/radio/src/gui/9X/menu_general_sdmanager.cpp
+++ b/radio/src/gui/9X/menu_general_sdmanager.cpp
--- a/radio/src/gui/9X/menu_general_setup.cpp
+++ b/radio/src/gui/9X/menu_general_setup.cpp
--- a/radio/src/gui/9X/menu_general_trainer.cpp
+++ b/radio/src/gui/9X/menu_general_trainer.cpp
--- a/radio/src/gui/9X/menu_general_version.cpp
+++ b/radio/src/gui/9X/menu_general_version.cpp
--- a/radio/src/gui/9X/menu_model.cpp
+++ b/radio/src/gui/9X/menu_model.cpp
--- a/radio/src/gui/9X/menu_model_heli.cpp
+++ b/radio/src/gui/9X/menu_model_heli.cpp
--- a/radio/src/gui/9X/menu_model_setup.cpp
+++ b/radio/src/gui/9X/menu_model_setup.cpp
@ -79,7 +79,7 @@ enum menuModelSetupItems {
  ITEM_MODEL_EXTERNAL_MODULE_OUTPUT_TYPE,
 #endif
  ITEM_MODEL_EXTERNAL_MODULE_FAILSAFE,
-#if defined(PCBSKY9X) && !defined(REVA) && !defined(REVX)
+#if defined(PCBSKY9X) && !defined(REVA)
  ITEM_MODEL_EXTRA_MODULE_LABEL,
  ITEM_MODEL_EXTRA_MODULE_CHANNELS,
  ITEM_MODEL_EXTRA_MODULE_BIND,
@ -102,7 +102,7 @@ enum menuModelSetupItems {
 #define MODEL_SETUP_RANGE_OFS         4*FW+3
 #define MODEL_SETUP_SET_FAILSAFE_OFS  7*FW-2
-#if defined(PCBSKY9X) && !defined(REVA) && !defined(REVX)
+#if defined(PCBSKY9X) && !defined(REVA)
  #define CURRENT_MODULE_EDITED(k)         (k>=ITEM_MODEL_EXTRA_MODULE_LABEL ? EXTRA_MODULE : EXTERNAL_MODULE)
 #else
  #define CURRENT_MODULE_EDITED(k)         (EXTERNAL_MODULE)
@ -116,7 +116,7 @@ void menuModelSetup(uint8_t event)
  #define IS_D8_RX(x)                       (g_model.moduleData[x].rfProtocol == RF_PROTO_D8)
  #define EXTERNAL_MODULE_CHANNELS_ROWS()   IF_EXTERNAL_MODULE_ON(IS_MODULE_DSM2(EXTERNAL_MODULE) ? (uint8_t)0 : (uint8_t)1)
  #define EXTERNAL_MODULE_SETTINGS_ROWS()   (IS_MODULE_XJT(EXTERNAL_MODULE) && IS_D8_RX(EXTERNAL_MODULE)) ? (uint8_t)1 : (IS_MODULE_PPM(EXTERNAL_MODULE) || IS_MODULE_XJT(EXTERNAL_MODULE) || IS_MODULE_DSM2(EXTERNAL_MODULE)) ? (uint8_t)2 : HIDDEN_ROW
-#if defined(PCBSKY9X) && defined(REVX)
+#if defined(PCBSKY9X) && !defined(REVX)
  #define OUTPUT_TYPE_ROWS()                (IS_MODULE_PPM(EXTERNAL_MODULE) ? (uint8_t)0 : HIDDEN_ROW) ,
 #else
  #define OUTPUT_TYPE_ROWS() 
@ -128,7 +128,7 @@ void menuModelSetup(uint8_t event)
  #define MODEL_SETUP_MAX_LINES             (1+ITEM_MODEL_SETUP_MAX)
  #define POT_WARN_ITEMS()                  ((g_model.nPotsToWarn >> 6) ? (uint8_t)NUM_POTS : (uint8_t)0)
  #define TIMER_ROWS                        2, 0, CASE_PERSISTENT_TIMERS(0) 0, 0
-#if (defined(PCBSKY9X) && !defined(REVA) && !defined(REVX))
+#if (defined(PCBSKY9X) && !defined(REVA))
  #define EXTRA_MODULE_ROWS                 LABEL(ExtraModule), 1, 2,
 #else
  #define EXTRA_MODULE_ROWS
@ -485,7 +485,7 @@ void menuModelSetup(uint8_t event)
        break;
 #endif
-#if defined(PCBSKY9X) && !defined(REVX)
+#if defined(PCBSKY9X)
      case ITEM_MODEL_EXTRA_MODULE_LABEL:
        lcd_putsLeft(y, "RF Port 2 (PPM)");
        break;
@ -530,7 +530,7 @@ void menuModelSetup(uint8_t event)
        break;
 #endif
-#if defined(PCBSKY9X) && !defined(REVX)
+#if defined(PCBSKY9X)
      case ITEM_MODEL_EXTRA_MODULE_CHANNELS:
 #endif
 #if defined(CPUARM)
@ -562,7 +562,7 @@ void menuModelSetup(uint8_t event)
      }
 #endif
-#if defined(PCBSKY9X) && !defined(REVX)
+#if defined(PCBSKY9X)
      case ITEM_MODEL_EXTRA_MODULE_BIND:
 #endif
 #if defined(CPUARM)
--- a/radio/src/gui/9X/menus.cpp
+++ b/radio/src/gui/9X/menus.cpp
--- a/radio/src/gui/9X/menus.h
+++ b/radio/src/gui/9X/menus.h
--- a/radio/src/gui/9X/navigation.cpp
+++ b/radio/src/gui/9X/navigation.cpp
--- a/radio/src/gui/9X/popups.cpp
+++ b/radio/src/gui/9X/popups.cpp
--- a/radio/src/gui/9X/splash.cpp
+++ b/radio/src/gui/9X/splash.cpp
--- a/radio/src/gui/9X/view_about.cpp
+++ b/radio/src/gui/9X/view_about.cpp
--- a/radio/src/gui/9X/view_mavlink.cpp
+++ b/radio/src/gui/9X/view_mavlink.cpp
--- a/radio/src/gui/9X/view_mavlink.h
+++ b/radio/src/gui/9X/view_mavlink.h
--- a/radio/src/gui/9X/view_statistics.cpp
+++ b/radio/src/gui/9X/view_statistics.cpp
--- a/radio/src/gui/9X/view_telemetry.cpp
+++ b/radio/src/gui/9X/view_telemetry.cpp
--- a/radio/src/gui/9X/view_text.cpp
+++ b/radio/src/gui/9X/view_text.cpp
--- a/radio/src/gui/9X/widgets.cpp
+++ b/radio/src/gui/9X/widgets.cpp
--- a/radio/src/gui/Taranis/fonts.cpp
+++ b/radio/src/gui/Taranis/fonts.cpp
--- a/radio/src/gui/Taranis/gui.h
+++ b/radio/src/gui/Taranis/gui.h
--- a/radio/src/gui/Taranis/helpers.cpp
+++ b/radio/src/gui/Taranis/helpers.cpp
--- a/radio/src/gui/Taranis/lcd.cpp
+++ b/radio/src/gui/Taranis/lcd.cpp
--- a/radio/src/gui/Taranis/lcd.h
+++ b/radio/src/gui/Taranis/lcd.h
--- a/radio/src/gui/Taranis/menu_general.cpp
+++ b/radio/src/gui/Taranis/menu_general.cpp
--- a/radio/src/gui/Taranis/menu_general_calib.cpp
+++ b/radio/src/gui/Taranis/menu_general_calib.cpp
--- a/radio/src/gui/Taranis/menu_general_diaganas.cpp
+++ b/radio/src/gui/Taranis/menu_general_diaganas.cpp
--- a/radio/src/gui/Taranis/menu_general_diagkeys.cpp
+++ b/radio/src/gui/Taranis/menu_general_diagkeys.cpp
--- a/radio/src/gui/Taranis/menu_general_hardware.cpp
+++ b/radio/src/gui/Taranis/menu_general_hardware.cpp
--- a/radio/src/gui/Taranis/menu_general_sdmanager.cpp
+++ b/radio/src/gui/Taranis/menu_general_sdmanager.cpp
--- a/radio/src/gui/Taranis/menu_general_setup.cpp
+++ b/radio/src/gui/Taranis/menu_general_setup.cpp
--- a/radio/src/gui/Taranis/menu_general_trainer.cpp
+++ b/radio/src/gui/Taranis/menu_general_trainer.cpp
--- a/radio/src/gui/Taranis/menu_general_version.cpp
+++ b/radio/src/gui/Taranis/menu_general_version.cpp
--- a/radio/src/gui/Taranis/menu_model.cpp
+++ b/radio/src/gui/Taranis/menu_model.cpp
--- a/radio/src/gui/Taranis/menu_model_custom_scripts.cpp
+++ b/radio/src/gui/Taranis/menu_model_custom_scripts.cpp
--- a/radio/src/gui/Taranis/menu_model_flightmodes.cpp
+++ b/radio/src/gui/Taranis/menu_model_flightmodes.cpp
--- a/radio/src/gui/Taranis/menu_model_gvars.cpp
+++ b/radio/src/gui/Taranis/menu_model_gvars.cpp
--- a/radio/src/gui/Taranis/menu_model_heli.cpp
+++ b/radio/src/gui/Taranis/menu_model_heli.cpp
--- a/radio/src/gui/Taranis/menu_model_limits.cpp
+++ b/radio/src/gui/Taranis/menu_model_limits.cpp
--- a/radio/src/gui/Taranis/menu_model_logical_switches.cpp
+++ b/radio/src/gui/Taranis/menu_model_logical_switches.cpp
--- a/radio/src/gui/Taranis/menus.cpp
+++ b/radio/src/gui/Taranis/menus.cpp
--- a/Show more
+++ b/Show more