Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions companion/src/firmwares/boardjson.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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();

Expand Down
1 change: 1 addition & 0 deletions companion/src/firmwares/boardjson.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "";
};
Expand Down
1 change: 1 addition & 0 deletions companion/src/firmwares/boards.h
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,7 @@ namespace Board {
HasRTC,
HasSDCard,
HasSwitchableJack,
HasTrainerJackCrossover,
HasTrainerModuleCPPM,
HasTrainerModuleSBUS,
HasVBat,
Expand Down
2 changes: 2 additions & 0 deletions companion/src/firmwares/edgetx/yaml_generalsettings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions companion/src/firmwares/generalsettings.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 10 additions & 0 deletions companion/src/generaledit/hardware.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"));

Expand Down
27 changes: 21 additions & 6 deletions radio/src/boards/generic_stm32/trainer_ports.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down Expand Up @@ -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,
Expand All @@ -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);
Expand Down
3 changes: 2 additions & 1 deletion radio/src/boards/hw_defs/el18.json
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
3 changes: 2 additions & 1 deletion radio/src/boards/hw_defs/nb4p.json
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
3 changes: 2 additions & 1 deletion radio/src/boards/hw_defs/nv14.json
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
3 changes: 2 additions & 1 deletion radio/src/boards/hw_defs/pa01.json
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,7 @@
"trainer_timer_irqn": "TIM1_CC_IRQn",
"trainer_timer_irqhandler": "TIM1_CC_IRQHandler",
"trainer_gpio_af": "LL_GPIO_AF_1",
"trainer_timer_freq": "(PERI1_FREQUENCY * TIMER_MULT_APB1)"
"trainer_timer_freq": "(PERI1_FREQUENCY * TIMER_MULT_APB1)",
"trainer_jack_crossover": true
}
}
3 changes: 2 additions & 1 deletion radio/src/boards/hw_defs/pl18.json
Original file line number Diff line number Diff line change
Expand Up @@ -390,6 +390,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
}
}
3 changes: 2 additions & 1 deletion radio/src/boards/hw_defs/pl18ev.json
Original file line number Diff line number Diff line change
Expand Up @@ -434,6 +434,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
}
}
3 changes: 2 additions & 1 deletion radio/src/boards/hw_defs/pl18u.json
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,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
}
}
11 changes: 6 additions & 5 deletions radio/src/boards/hw_defs/st16.json
Original file line number Diff line number Diff line change
Expand Up @@ -511,15 +511,16 @@
"usb_gpio_af": "GPIO_AF10"
},
"trainer": {
"trainer_in_gpio": "GPIO_PIN(GPIOE, 5)",
"trainer_in_timer_channel": "LL_TIM_CHANNEL_CH1",
"trainer_out_gpio": "GPIO_PIN(GPIOE, 6)",
"trainer_out_timer_channel": "LL_TIM_CHANNEL_CH2",
"trainer_in_gpio": "GPIO_PIN(GPIOE, 6)",
"trainer_in_timer_channel": "LL_TIM_CHANNEL_CH2",
"trainer_out_gpio": "GPIO_PIN(GPIOE, 5)",
"trainer_out_timer_channel": "LL_TIM_CHANNEL_CH1",
"trainer_timer": "TIM15",
"trainer_timer_irqn": "TIM15_IRQn",
"trainer_timer_irqhandler": "TIM15_IRQHandler",
"trainer_gpio_af": "LL_GPIO_AF_4",
"trainer_timer_freq": "(PERI1_FREQUENCY * TIMER_MULT_APB1)"
"trainer_timer_freq": "(PERI1_FREQUENCY * TIMER_MULT_APB1)",
"trainer_jack_crossover": true
},
"key_lock_combo": [
"KEY_EXIT",
Expand Down
7 changes: 5 additions & 2 deletions radio/src/datastructs_private.h
Original file line number Diff line number Diff line change
Expand Up @@ -1219,13 +1219,16 @@ PACK(struct RadioData {
// Radio level tabs control (global settings)
NOBACKUP(uint8_t modelSelectLayout:2);
NOBACKUP(uint8_t radioThemesDisabled:1);
// 0 = trainer in/out on their own jack contacts (crossover lead, default),
// 1 = both on the tip (mono / straight lead). TRAINER_JACK_CROSSOVER only
NOBACKUP(uint8_t trainerTipOnly:1);
#if defined(USB_CHARGE_CONTROL)
// 0 = charge while USB active (default), 1 = hold the charger off while USB
// is plugged in SD/Joystick/VCP mode
NOBACKUP(uint8_t usbChargeDisabled:1);
NOBACKUP(uint8_t spare:6 SKIP);
NOBACKUP(uint8_t spare:5 SKIP);
#else
NOBACKUP(uint8_t spare:7 SKIP);
NOBACKUP(uint8_t spare:6 SKIP);
#endif
#elif LCD_W == 128
uint8_t invertLCD:1; // Invert B&W LCD display
Expand Down
16 changes: 16 additions & 0 deletions radio/src/gui/colorlcd/radio/radio_hardware.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include "radio_hardware.h"

#include "edgetx.h"
#include "choice.h"
#include "getset_helpers.h"
#include "hal/adc_driver.h"
#include "hw_extmodule.h"
Expand Down Expand Up @@ -165,6 +166,21 @@ const static SetupLineDef setupLines[] = {
new ToggleSwitch(parent, {x, y, 0, 0}, GET_SET_DEFAULT(g_eeGeneral.audioMuteEnable));
}
},
#endif
#if defined(TRAINER_JACK_CROSSOVER)
{
// Trainer jack wiring: crossover lead vs mono / straight lead
STR_DEF(STR_TRAINER_JACK_MODE),
[](Window* parent, coord_t x, coord_t y) {
new Choice(parent, {x, y, 0, 0}, STR_TRAINER_JACK_MODES, 0, 1,
GET_DEFAULT(g_eeGeneral.trainerTipOnly), [=](int32_t newValue) {
g_eeGeneral.trainerTipOnly = newValue;
SET_DIRTY();
// restarted on the new contacts by checkTrainerSettings()
stopTrainer();
});
}
},
#endif
{nullptr, nullptr},
};
Expand Down
3 changes: 2 additions & 1 deletion radio/src/storage/yaml/yaml_datastructs_c14.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,8 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "favMultiMode", 1 ),
YAML_UNSIGNED( "modelSelectLayout", 2 ),
YAML_UNSIGNED( "radioThemesDisabled", 1 ),
YAML_PADDING( 7 ),
YAML_UNSIGNED( "trainerTipOnly", 1 ),
YAML_PADDING( 6 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_ENUM("statusLedError", 2, enum_StatusLedColor, NULL),
YAML_ENUM("statusLedReady", 2, enum_StatusLedColor, NULL),
Expand Down
3 changes: 2 additions & 1 deletion radio/src/storage/yaml/yaml_datastructs_f16.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,8 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "favMultiMode", 1 ),
YAML_UNSIGNED( "modelSelectLayout", 2 ),
YAML_UNSIGNED( "radioThemesDisabled", 1 ),
YAML_PADDING( 7 ),
YAML_UNSIGNED( "trainerTipOnly", 1 ),
YAML_PADDING( 6 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_ENUM("statusLedError", 2, enum_StatusLedColor, NULL),
YAML_ENUM("statusLedReady", 2, enum_StatusLedColor, NULL),
Expand Down
3 changes: 2 additions & 1 deletion radio/src/storage/yaml/yaml_datastructs_gx15.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -498,8 +498,9 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "favMultiMode", 1 ),
YAML_UNSIGNED( "modelSelectLayout", 2 ),
YAML_UNSIGNED( "radioThemesDisabled", 1 ),
YAML_UNSIGNED( "trainerTipOnly", 1 ),
YAML_UNSIGNED( "usbChargeDisabled", 1 ),
YAML_PADDING( 6 ),
YAML_PADDING( 5 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_ENUM("statusLedError", 2, enum_StatusLedColor, NULL),
YAML_ENUM("statusLedReady", 2, enum_StatusLedColor, NULL),
Expand Down
3 changes: 2 additions & 1 deletion radio/src/storage/yaml/yaml_datastructs_h17.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,8 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "favMultiMode", 1 ),
YAML_UNSIGNED( "modelSelectLayout", 2 ),
YAML_UNSIGNED( "radioThemesDisabled", 1 ),
YAML_PADDING( 7 ),
YAML_UNSIGNED( "trainerTipOnly", 1 ),
YAML_PADDING( 6 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_ENUM("statusLedError", 2, enum_StatusLedColor, NULL),
YAML_ENUM("statusLedReady", 2, enum_StatusLedColor, NULL),
Expand Down
3 changes: 2 additions & 1 deletion radio/src/storage/yaml/yaml_datastructs_nb4p.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,8 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "favMultiMode", 1 ),
YAML_UNSIGNED( "modelSelectLayout", 2 ),
YAML_UNSIGNED( "radioThemesDisabled", 1 ),
YAML_PADDING( 7 ),
YAML_UNSIGNED( "trainerTipOnly", 1 ),
YAML_PADDING( 6 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_ENUM("statusLedError", 2, enum_StatusLedColor, NULL),
YAML_ENUM("statusLedReady", 2, enum_StatusLedColor, NULL),
Expand Down
3 changes: 2 additions & 1 deletion radio/src/storage/yaml/yaml_datastructs_nv14.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,8 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "favMultiMode", 1 ),
YAML_UNSIGNED( "modelSelectLayout", 2 ),
YAML_UNSIGNED( "radioThemesDisabled", 1 ),
YAML_PADDING( 7 ),
YAML_UNSIGNED( "trainerTipOnly", 1 ),
YAML_PADDING( 6 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_ARRAY("keyShortcuts", 8, 6, struct_KeyShortcut, NULL),
YAML_ARRAY("qmFavorites", 8, 12, struct_QMFavorite, NULL),
Expand Down
3 changes: 2 additions & 1 deletion radio/src/storage/yaml/yaml_datastructs_pa01.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,8 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "favMultiMode", 1 ),
YAML_UNSIGNED( "modelSelectLayout", 2 ),
YAML_UNSIGNED( "radioThemesDisabled", 1 ),
YAML_PADDING( 7 ),
YAML_UNSIGNED( "trainerTipOnly", 1 ),
YAML_PADDING( 6 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_ENUM("statusLedError", 2, enum_StatusLedColor, NULL),
YAML_ENUM("statusLedReady", 2, enum_StatusLedColor, NULL),
Expand Down
3 changes: 2 additions & 1 deletion radio/src/storage/yaml/yaml_datastructs_pl18.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,8 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "favMultiMode", 1 ),
YAML_UNSIGNED( "modelSelectLayout", 2 ),
YAML_UNSIGNED( "radioThemesDisabled", 1 ),
YAML_PADDING( 7 ),
YAML_UNSIGNED( "trainerTipOnly", 1 ),
YAML_PADDING( 6 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_ENUM("statusLedError", 2, enum_StatusLedColor, NULL),
YAML_ENUM("statusLedReady", 2, enum_StatusLedColor, NULL),
Expand Down
3 changes: 2 additions & 1 deletion radio/src/storage/yaml/yaml_datastructs_pl18u.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,8 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "favMultiMode", 1 ),
YAML_UNSIGNED( "modelSelectLayout", 2 ),
YAML_UNSIGNED( "radioThemesDisabled", 1 ),
YAML_PADDING( 7 ),
YAML_UNSIGNED( "trainerTipOnly", 1 ),
YAML_PADDING( 6 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_ENUM("statusLedError", 2, enum_StatusLedColor, NULL),
YAML_ENUM("statusLedReady", 2, enum_StatusLedColor, NULL),
Expand Down
3 changes: 2 additions & 1 deletion radio/src/storage/yaml/yaml_datastructs_st16.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,8 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "favMultiMode", 1 ),
YAML_UNSIGNED( "modelSelectLayout", 2 ),
YAML_UNSIGNED( "radioThemesDisabled", 1 ),
YAML_PADDING( 7 ),
YAML_UNSIGNED( "trainerTipOnly", 1 ),
YAML_PADDING( 6 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_ENUM("statusLedError", 2, enum_StatusLedColor, NULL),
YAML_ENUM("statusLedReady", 2, enum_StatusLedColor, NULL),
Expand Down
3 changes: 2 additions & 1 deletion radio/src/storage/yaml/yaml_datastructs_t15.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,8 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "favMultiMode", 1 ),
YAML_UNSIGNED( "modelSelectLayout", 2 ),
YAML_UNSIGNED( "radioThemesDisabled", 1 ),
YAML_PADDING( 7 ),
YAML_UNSIGNED( "trainerTipOnly", 1 ),
YAML_PADDING( 6 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_ENUM("statusLedError", 2, enum_StatusLedColor, NULL),
YAML_ENUM("statusLedReady", 2, enum_StatusLedColor, NULL),
Expand Down
3 changes: 2 additions & 1 deletion radio/src/storage/yaml/yaml_datastructs_t15h7.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,8 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "favMultiMode", 1 ),
YAML_UNSIGNED( "modelSelectLayout", 2 ),
YAML_UNSIGNED( "radioThemesDisabled", 1 ),
YAML_PADDING( 7 ),
YAML_UNSIGNED( "trainerTipOnly", 1 ),
YAML_PADDING( 6 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_ENUM("statusLedError", 2, enum_StatusLedColor, NULL),
YAML_ENUM("statusLedReady", 2, enum_StatusLedColor, NULL),
Expand Down
3 changes: 2 additions & 1 deletion radio/src/storage/yaml/yaml_datastructs_t15pro.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,8 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "favMultiMode", 1 ),
YAML_UNSIGNED( "modelSelectLayout", 2 ),
YAML_UNSIGNED( "radioThemesDisabled", 1 ),
YAML_PADDING( 7 ),
YAML_UNSIGNED( "trainerTipOnly", 1 ),
YAML_PADDING( 6 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_ENUM("statusLedError", 2, enum_StatusLedColor, NULL),
YAML_ENUM("statusLedReady", 2, enum_StatusLedColor, NULL),
Expand Down
Loading
Loading