feat: selectable trainer lead wiring for Flysky radios (#7961)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

Author: pfeerick

companion/src/firmwares/boardjson.cpp

@@ -238,6 +238,9 @@ const int BoardJson::getCapability(const Board::Capability capability) const
     case Board::StatusLedColors:
       return m_hardware.status_led_colors;
 
+    case Board::HasTrainerJackCrossover:
+      return m_hardware.trainer_jack_crossover;
+
     case Board::HasStatusLedPwm:
       return m_hardware.status_led_pwm;
 
@@ -1342,6 +1345,12 @@ bool BoardJson::loadFile(Board::Type board, QString hwdefn, InputsTable * inputs
     hardware.cpu_type = o.value("cpu_type").toString().toStdString();
   }
 
+  if (obj.value("trainer").isObject()) {
+    const QJsonObject &o = obj.value("trainer").toObject();
+
+    hardware.trainer_jack_crossover = o.value("trainer_jack_crossover").toBool();
+  }
+
   if (obj.value("identity").isObject()) {
     const QJsonObject &o = obj.value("identity").toObject();
 

companion/src/firmwares/boardjson.h

@@ -133,6 +133,7 @@ class BoardJson
       int has_int_module_support       = 0;
       int sport_max_baudrate           = 0;
       int surface                      = 0;
+      int trainer_jack_crossover       = 0;
       std::string cpu                  = "";
       std::string cpu_type             = "";
     };

companion/src/firmwares/boards.h

@@ -254,6 +254,7 @@ namespace Board {
     HasRTC,
     HasSDCard,
     HasSwitchableJack,
+    HasTrainerJackCrossover,
     HasTrainerModuleCPPM,
     HasTrainerModuleSBUS,
     HasVBat,

companion/src/firmwares/edgetx/yaml_generalsettings.cpp

@@ -263,6 +263,7 @@ Node convert<GeneralSettings>::encode(const GeneralSettings& rhs)
   node["disableTrainerPoweroffAlarm"] = (int)rhs.disableTrainerPoweroffAlarm;
   node["USBMode"] = rhs.usbMode;
   node["usbChargeDisabled"] = (int)rhs.usbChargeDisabled;
+  node["trainerTipOnly"] = rhs.trainerTipOnly;
   node["hatsMode"] = hatsModeLut << rhs.hatsMode;
   node["stickDeadZone"] = rhs.stickDeadZone;
   node["jackMode"] = rhs.jackMode;
@@ -558,6 +559,7 @@ bool convert<GeneralSettings>::decode(const Node& node, GeneralSettings& rhs)
   node["disableTrainerPoweroffAlarm"] >> rhs.disableTrainerPoweroffAlarm;
   node["USBMode"] >> rhs.usbMode;
   node["usbChargeDisabled"] >> rhs.usbChargeDisabled;
+  node["trainerTipOnly"] >> rhs.trainerTipOnly;
   node["hatsMode"] >> hatsModeLut >> rhs.hatsMode;
   node["stickDeadZone"] >> rhs.stickDeadZone;
   node["jackMode"] >> rhs.jackMode;

companion/src/firmwares/generalsettings.h

@@ -319,6 +319,7 @@ class GeneralSettings {
     bool disableTrainerPoweroffAlarm;
     unsigned int usbMode;
     bool usbChargeDisabled;
+    unsigned int trainerTipOnly;
     unsigned int hatsMode;
     unsigned int stickDeadZone;
     unsigned int jackMode;

companion/src/generaledit/hardware.cpp

@@ -225,6 +225,16 @@ HardwarePanel::HardwarePanel(QWidget * parent, GeneralSettings & generalSettings
     addParams();
   }
 
+  if (Boards::getCapability(board, Board::HasTrainerJackCrossover)) {
+    addLabel(tr("Trainer lead"));
+    AutoComboBox *trainerLead = new AutoComboBox(this);
+    trainerLead->addItem(tr("Crossover"), 0);
+    trainerLead->addItem(tr("Standard"), 1);
+    trainerLead->setField(generalSettings.trainerTipOnly, this);
+    params->append(trainerLead);
+    addParams();
+  }
+
   if (firmware->getCapability(BluetoothEnabled)) {
     addLabel(tr("Bluetooth"));
 

radio/src/boards/generic_stm32/trainer_ports.cpp

@@ -29,12 +29,13 @@
 #include "dataconstants.h"
 
 #include "hal.h"
+#include "edgetx.h"
 
 __WEAK void board_trainer_init()
 {
 #if defined(TRAINER_DETECT_GPIO)
   gpio_init(TRAINER_DETECT_GPIO, GPIO_IN_PU, GPIO_PIN_SPEED_LOW);
-#endif  
+#endif
 
   trainer_init();
 }
@@ -63,11 +64,6 @@ static const stm32_pulse_timer_t trainerOutputTimer = {
   .DMA_TC_CallbackPtr = nullptr,
 };
 
-void trainer_init_dsc_out()
-{
-  trainer_init_output(&trainerOutputTimer);
-}
-
 static const stm32_pulse_timer_t trainerInputTimer = {
   .GPIO = TRAINER_IN_GPIO,
   .GPIO_Alternate = TRAINER_GPIO_AF,
@@ -82,6 +78,25 @@ static const stm32_pulse_timer_t trainerInputTimer = {
   .DMA_TC_CallbackPtr = nullptr,
 };
 
+#if defined(TRAINER_JACK_CROSSOVER)
+// Trainer in is on the jack tip and out on the ring, for the crossover lead
+// the radio ships with. A mono lead grounds the ring, so optionally send on
+// the tip (the input pin) as well.
+static_assert(__IS_TRAINER_TIMER_OUT_CHANNEL_SUPPORTED(TRAINER_IN_TIMER_Channel),
+              "Unsupported trainer timer input channel for tip-only output");
+#endif
+
+void trainer_init_dsc_out()
+{
+#if defined(TRAINER_JACK_CROSSOVER)
+  if (g_eeGeneral.trainerTipOnly) {
+    trainer_init_output(&trainerInputTimer);
+    return;
+  }
+#endif
+  trainer_init_output(&trainerOutputTimer);
+}
+
 void trainer_init_dsc_in()
 {
   trainer_init_capture(&trainerInputTimer);

radio/src/boards/hw_defs/el18.json

@@ -404,6 +404,7 @@
     "trainer_timer_irqn": "TIM4_IRQn",
     "trainer_timer_irqhandler": "TIM4_IRQHandler",
     "trainer_gpio_af": "LL_GPIO_AF_2",
-    "trainer_timer_freq": "(PERI1_FREQUENCY * TIMER_MULT_APB1)"
+    "trainer_timer_freq": "(PERI1_FREQUENCY * TIMER_MULT_APB1)",
+    "trainer_jack_crossover": true
   }
 }

radio/src/boards/hw_defs/nb4p.json

@@ -267,6 +267,7 @@
     "trainer_timer_irqn": "TIM4_IRQn",
     "trainer_timer_irqhandler": "TIM4_IRQHandler",
     "trainer_gpio_af": "LL_GPIO_AF_2",
-    "trainer_timer_freq": "(PERI1_FREQUENCY * TIMER_MULT_APB1)"
+    "trainer_timer_freq": "(PERI1_FREQUENCY * TIMER_MULT_APB1)",
+    "trainer_jack_crossover": true
   }
 }

radio/src/boards/hw_defs/nv14.json

@@ -404,6 +404,7 @@
     "trainer_timer_irqn": "TIM4_IRQn",
     "trainer_timer_irqhandler": "TIM4_IRQHandler",
     "trainer_gpio_af": "LL_GPIO_AF_2",
-    "trainer_timer_freq": "(PERI1_FREQUENCY * TIMER_MULT_APB1)"
+    "trainer_timer_freq": "(PERI1_FREQUENCY * TIMER_MULT_APB1)",
+    "trainer_jack_crossover": true
   }
 }