piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

feat(bw): add 'Model quick select' option (#6688)

Browse Source
This commit is contained in:
philmoz
2025-10-19 12:30:20 +10:00
committed by GitHub
parent 993739737f
commit 75e8566623
28 changed files with 83 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/firmwares/edgetx/yaml_generalsettings.cpp
+1 -1
View File
@@ -256,8 +256,8 @@ Node convert<GeneralSettings>::encode(const GeneralSettings& rhs)
node["varioRepeat"] = rhs.varioRepeat;
node["backgroundVolume"] = rhs.backgroundVolume + 2;
node["dontPlayHello"] = (int)rhs.dontPlayHello;
node["modelQuickSelect"] = (int)rhs.modelQuickSelect;
if (hasColorLcd) {
node["modelQuickSelect"] = (int)rhs.modelQuickSelect;
node["modelSelectLayout"] = rhs.modelSelectLayout;
node["labelSingleSelect"] = rhs.labelSingleSelect;
node["labelMultiMode"] = rhs.labelMultiMode;
companion/src/generaledit/generalsetup.cpp
+2 -3
View File
@@ -527,16 +527,15 @@ void GeneralSetupPanel::setValues()
ui->startSoundCB->setChecked(!generalSettings.dontPlayHello);
ui->modelQuickSelect_CB->setChecked(generalSettings.modelQuickSelect);
if (Boards::getCapability(board, Board::HasColorLcd)) {
ui->modelQuickSelect_CB->setChecked(generalSettings.modelQuickSelect);
ui->modelSelectLayout_CB->setCurrentIndex(generalSettings.modelSelectLayout);
ui->labelSingleSelect_CB->setCurrentIndex(generalSettings.labelSingleSelect);
ui->labelMultiMode_CB->setCurrentIndex(generalSettings.labelMultiMode);
ui->favMultiMode_CB->setCurrentIndex(generalSettings.favMultiMode);
showLabelSelectOptions();
} else {
ui->label_modelQuickSelect->hide();
ui->modelQuickSelect_CB->hide();
ui->label_modelSelectLayout->hide();
ui->modelSelectLayout_CB->hide();
ui->label_labelSingleSelect->hide();
radio/src/datastructs_private.h
+6 -5
View File
@@ -937,8 +937,7 @@ PACK(struct TrainerData {
#if defined(COLORLCD)
#define EXTRA_GENERAL_FIELDS \
NOBACKUP(char currModelFilename[LEN_MODEL_FILENAME+1]); \
NOBACKUP(uint8_t modelQuickSelect:1); \
NOBACKUP(uint8_t blOffBright:7); \
NOBACKUP(uint8_t blOffBright); \
NOBACKUP(char bluetoothName[LEN_BLUETOOTH_NAME]);
#else
#define EXTRA_GENERAL_FIELDS \
@@ -1113,13 +1112,15 @@ PACK(struct RadioData {
NOBACKUP(uint8_t disableTrainerPoweroffAlarm:1);
NOBACKUP(uint8_t disablePwrOnOffHaptic:1);
NOBACKUP(uint8_t modelQuickSelect:1);
#if defined(COLORLCD)
NOBACKUP(uint8_t spare:6 SKIP);
NOBACKUP(uint8_t spare:5 SKIP);
#elif LCD_W == 128
uint8_t invertLCD:1; // Invert B&W LCD display
NOBACKUP(uint8_t spare:3 SKIP);
NOBACKUP(uint8_t spare:2 SKIP);
#else
NOBACKUP(uint8_t spare:4 SKIP);
NOBACKUP(uint8_t spare:3 SKIP);
#endif
NOBACKUP(uint8_t pwrOffIfInactive);
radio/src/gui/128x64/model_select.cpp
+2
View File
@@ -42,6 +42,8 @@ void onModelSelectMenu(const char * result)
return;
}
selectModel(sub);
if (g_eeGeneral.modelQuickSelect && result == STR_SELECT_MODEL)
popMenu();
}
else if (result == STR_COPY_MODEL) {
s_copyMode = COPY_MODE;
radio/src/gui/128x64/radio_setup.cpp
+9
View File
@@ -89,6 +89,7 @@ enum {
CASE_PWR_BUTTON_PRESS(ITEM_RADIO_SETUP_PWR_OFF_SPEED)
CASE_PWR_BUTTON_PRESS(ITEM_RADIO_SETUP_PWR_AUTO_OFF)
CASE_HAPTIC(ITEM_RADIO_SETUP_PWR_ON_OFF_HAPTIC)
ITEM_MODEL_QUICK_SELECT,
CASE_PXX2(ITEM_RADIO_SETUP_OWNER_ID)
CASE_GPS(ITEM_RADIO_SETUP_LABEL_GPS)
CASE_GPS(ITEM_RADIO_SETUP_TIMEZONE)
@@ -220,6 +221,7 @@ void menuRadioSetup(event_t event)
CASE_PWR_BUTTON_PRESS(0)
CASE_PWR_BUTTON_PRESS(0)
CASE_HAPTIC(0) // power on/off haptic
0, // Model quick select
CASE_PXX2(0) /* owner registration ID */
// GPS
CASE_GPS(LABEL(GPS))
@@ -631,6 +633,13 @@ void menuRadioSetup(event_t event)
}
#endif
case ITEM_MODEL_QUICK_SELECT:
lcdDrawTextAlignedLeft(y, STR_MODEL_QUICK_SELECT);
g_eeGeneral.modelQuickSelect =
editCheckBox(g_eeGeneral.modelQuickSelect, LCD_W - 9, y,
nullptr, attr, event);
break;
#if defined(PXX2)
case ITEM_RADIO_SETUP_OWNER_ID:
lcdDrawTextAlignedLeft(y, STR_OWNER_ID);
radio/src/gui/212x64/model_select.cpp
+2
View File
@@ -33,6 +33,8 @@ void onModelSelectMenu(const char * result)
return;
}
selectModel(sub);
if (g_eeGeneral.modelQuickSelect && result == STR_SELECT_MODEL)
popMenu();
}
else if (result == STR_COPY_MODEL) {
s_copyMode = COPY_MODE;
radio/src/gui/212x64/radio_setup.cpp
+9
View File
@@ -85,6 +85,7 @@ enum MenuRadioSetupItems {
CASE_PWR_BUTTON_PRESS(ITEM_RADIO_SETUP_PWR_OFF_SPEED)
CASE_PWR_BUTTON_PRESS(ITEM_RADIO_SETUP_PWR_AUTO_OFF)
CASE_HAPTIC(ITEM_RADIO_SETUP_PWR_ON_OFF_HAPTIC)
ITEM_MODEL_QUICK_SELECT,
#if defined(PXX2)
ITEM_RADIO_SETUP_OWNER_ID,
#endif
@@ -218,6 +219,7 @@ void menuRadioSetup(event_t event)
CASE_PWR_BUTTON_PRESS(0) // pwr off speed
CASE_PWR_BUTTON_PRESS(0) // pwr auto off
CASE_HAPTIC(0) // power on/off haptic
0, // Model quick select
CASE_PXX2(0) // owner registration ID
// GPS
CASE_GPS(LABEL(GPS))
@@ -599,6 +601,13 @@ void menuRadioSetup(event_t event)
}
#endif
case ITEM_MODEL_QUICK_SELECT:
lcdDrawTextAlignedLeft(y, STR_MODEL_QUICK_SELECT);
g_eeGeneral.modelQuickSelect =
editCheckBox(g_eeGeneral.modelQuickSelect, RADIO_SETUP_2ND_COLUMN, y,
nullptr, attr, event);
break;
#if defined(GPS)
case ITEM_RADIO_SETUP_LABEL_GPS:
lcdDrawTextAlignedLeft(y, STR_GPS);
radio/src/storage/yaml/yaml_datastructs_128x64.cpp
+2 -1
View File
@@ -379,8 +379,9 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "modelTelemetryDisabled", 1 ),
YAML_UNSIGNED( "disableTrainerPoweroffAlarm", 1 ),
YAML_UNSIGNED( "disablePwrOnOffHaptic", 1 ),
YAML_UNSIGNED( "modelQuickSelect", 1 ),
YAML_UNSIGNED( "invertLCD", 1 ),
YAML_PADDING( 3 ),
YAML_PADDING( 2 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_END
};
radio/src/storage/yaml/yaml_datastructs_f16.cpp
+3 -3
View File
@@ -378,8 +378,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_ARRAY("switchConfig", 32, 20, struct_switchDef, switchIsActive),
YAML_ARRAY("flexSwitches", 0, MAX_FLEX_SWITCHES, struct_flexSwitch, flex_sw_valid),
YAML_STRING("currModelFilename", 17),
YAML_UNSIGNED( "modelQuickSelect", 1 ),
YAML_UNSIGNED( "blOffBright", 7 ),
YAML_UNSIGNED( "blOffBright", 8 ),
YAML_STRING("bluetoothName", 10),
YAML_STRING("ownerRegistrationID", 8),
YAML_CUSTOM("rotEncDirection",r_rotEncDirection,nullptr),
@@ -406,7 +405,8 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "modelTelemetryDisabled", 1 ),
YAML_UNSIGNED( "disableTrainerPoweroffAlarm", 1 ),
YAML_UNSIGNED( "disablePwrOnOffHaptic", 1 ),
YAML_PADDING( 6 ),
YAML_UNSIGNED( "modelQuickSelect", 1 ),
YAML_PADDING( 5 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_END
};
radio/src/storage/yaml/yaml_datastructs_gx12.cpp
+2 -1
View File
@@ -403,8 +403,9 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "modelTelemetryDisabled", 1 ),
YAML_UNSIGNED( "disableTrainerPoweroffAlarm", 1 ),
YAML_UNSIGNED( "disablePwrOnOffHaptic", 1 ),
YAML_UNSIGNED( "modelQuickSelect", 1 ),
YAML_UNSIGNED( "invertLCD", 1 ),
YAML_PADDING( 3 ),
YAML_PADDING( 2 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_END
};
radio/src/storage/yaml/yaml_datastructs_nb4p.cpp
+3 -3
View File
@@ -371,8 +371,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_ARRAY("switchConfig", 32, 20, struct_switchDef, switchIsActive),
YAML_ARRAY("flexSwitches", 0, MAX_FLEX_SWITCHES, struct_flexSwitch, flex_sw_valid),
YAML_STRING("currModelFilename", 17),
YAML_UNSIGNED( "modelQuickSelect", 1 ),
YAML_UNSIGNED( "blOffBright", 7 ),
YAML_UNSIGNED( "blOffBright", 8 ),
YAML_STRING("bluetoothName", 10),
YAML_STRING("ownerRegistrationID", 8),
YAML_CUSTOM("rotEncDirection",r_rotEncDirection,nullptr),
@@ -397,7 +396,8 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "modelTelemetryDisabled", 1 ),
YAML_UNSIGNED( "disableTrainerPoweroffAlarm", 1 ),
YAML_UNSIGNED( "disablePwrOnOffHaptic", 1 ),
YAML_PADDING( 6 ),
YAML_UNSIGNED( "modelQuickSelect", 1 ),
YAML_PADDING( 5 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_END
};
radio/src/storage/yaml/yaml_datastructs_nv14.cpp
+3 -3
View File
@@ -378,8 +378,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_ARRAY("switchConfig", 32, 20, struct_switchDef, switchIsActive),
YAML_ARRAY("flexSwitches", 0, MAX_FLEX_SWITCHES, struct_flexSwitch, flex_sw_valid),
YAML_STRING("currModelFilename", 17),
YAML_UNSIGNED( "modelQuickSelect", 1 ),
YAML_UNSIGNED( "blOffBright", 7 ),
YAML_UNSIGNED( "blOffBright", 8 ),
YAML_STRING("bluetoothName", 10),
YAML_STRING("ownerRegistrationID", 8),
YAML_CUSTOM("rotEncDirection",r_rotEncDirection,nullptr),
@@ -404,7 +403,8 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "modelTelemetryDisabled", 1 ),
YAML_UNSIGNED( "disableTrainerPoweroffAlarm", 1 ),
YAML_UNSIGNED( "disablePwrOnOffHaptic", 1 ),
YAML_PADDING( 6 ),
YAML_UNSIGNED( "modelQuickSelect", 1 ),
YAML_PADDING( 5 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_END
};
radio/src/storage/yaml/yaml_datastructs_pa01.cpp
+3 -3
View File
@@ -401,8 +401,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_ARRAY("switchConfig", 80, 20, struct_switchDef, switchIsActive),
YAML_ARRAY("flexSwitches", 0, MAX_FLEX_SWITCHES, struct_flexSwitch, flex_sw_valid),
YAML_STRING("currModelFilename", 17),
YAML_UNSIGNED( "modelQuickSelect", 1 ),
YAML_UNSIGNED( "blOffBright", 7 ),
YAML_UNSIGNED( "blOffBright", 8 ),
YAML_STRING("bluetoothName", 10),
YAML_STRING("ownerRegistrationID", 8),
YAML_CUSTOM("rotEncDirection",r_rotEncDirection,nullptr),
@@ -428,7 +427,8 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "modelTelemetryDisabled", 1 ),
YAML_UNSIGNED( "disableTrainerPoweroffAlarm", 1 ),
YAML_UNSIGNED( "disablePwrOnOffHaptic", 1 ),
YAML_PADDING( 6 ),
YAML_UNSIGNED( "modelQuickSelect", 1 ),
YAML_PADDING( 5 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_END
};
radio/src/storage/yaml/yaml_datastructs_pl18.cpp
+3 -3
View File
@@ -378,8 +378,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_ARRAY("switchConfig", 32, 20, struct_switchDef, switchIsActive),
YAML_ARRAY("flexSwitches", 0, MAX_FLEX_SWITCHES, struct_flexSwitch, flex_sw_valid),
YAML_STRING("currModelFilename", 17),
YAML_UNSIGNED( "modelQuickSelect", 1 ),
YAML_UNSIGNED( "blOffBright", 7 ),
YAML_UNSIGNED( "blOffBright", 8 ),
YAML_STRING("bluetoothName", 10),
YAML_STRING("ownerRegistrationID", 8),
YAML_CUSTOM("rotEncDirection",r_rotEncDirection,nullptr),
@@ -404,7 +403,8 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "modelTelemetryDisabled", 1 ),
YAML_UNSIGNED( "disableTrainerPoweroffAlarm", 1 ),
YAML_UNSIGNED( "disablePwrOnOffHaptic", 1 ),
YAML_PADDING( 6 ),
YAML_UNSIGNED( "modelQuickSelect", 1 ),
YAML_PADDING( 5 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_END
};
radio/src/storage/yaml/yaml_datastructs_pl18u.cpp
+3 -3
View File
@@ -371,8 +371,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_ARRAY("switchConfig", 32, 20, struct_switchDef, switchIsActive),
YAML_ARRAY("flexSwitches", 0, MAX_FLEX_SWITCHES, struct_flexSwitch, flex_sw_valid),
YAML_STRING("currModelFilename", 17),
YAML_UNSIGNED( "modelQuickSelect", 1 ),
YAML_UNSIGNED( "blOffBright", 7 ),
YAML_UNSIGNED( "blOffBright", 8 ),
YAML_STRING("bluetoothName", 10),
YAML_STRING("ownerRegistrationID", 8),
YAML_CUSTOM("rotEncDirection",r_rotEncDirection,nullptr),
@@ -397,7 +396,8 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "modelTelemetryDisabled", 1 ),
YAML_UNSIGNED( "disableTrainerPoweroffAlarm", 1 ),
YAML_UNSIGNED( "disablePwrOnOffHaptic", 1 ),
YAML_PADDING( 6 ),
YAML_UNSIGNED( "modelQuickSelect", 1 ),
YAML_PADDING( 5 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_END
};
radio/src/storage/yaml/yaml_datastructs_st16.cpp
+3 -3
View File
@@ -401,8 +401,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_ARRAY("switchConfig", 80, 20, struct_switchDef, switchIsActive),
YAML_ARRAY("flexSwitches", 0, MAX_FLEX_SWITCHES, struct_flexSwitch, flex_sw_valid),
YAML_STRING("currModelFilename", 17),
YAML_UNSIGNED( "modelQuickSelect", 1 ),
YAML_UNSIGNED( "blOffBright", 7 ),
YAML_UNSIGNED( "blOffBright", 8 ),
YAML_STRING("bluetoothName", 10),
YAML_STRING("ownerRegistrationID", 8),
YAML_CUSTOM("rotEncDirection",r_rotEncDirection,nullptr),
@@ -428,7 +427,8 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "modelTelemetryDisabled", 1 ),
YAML_UNSIGNED( "disableTrainerPoweroffAlarm", 1 ),
YAML_UNSIGNED( "disablePwrOnOffHaptic", 1 ),
YAML_PADDING( 6 ),
YAML_UNSIGNED( "modelQuickSelect", 1 ),
YAML_PADDING( 5 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_END
};
radio/src/storage/yaml/yaml_datastructs_t15.cpp
+3 -3
View File
@@ -386,8 +386,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_ARRAY("switchConfig", 32, 20, struct_switchDef, switchIsActive),
YAML_ARRAY("flexSwitches", 0, MAX_FLEX_SWITCHES, struct_flexSwitch, flex_sw_valid),
YAML_STRING("currModelFilename", 17),
YAML_UNSIGNED( "modelQuickSelect", 1 ),
YAML_UNSIGNED( "blOffBright", 7 ),
YAML_UNSIGNED( "blOffBright", 8 ),
YAML_STRING("bluetoothName", 10),
YAML_STRING("ownerRegistrationID", 8),
YAML_CUSTOM("rotEncDirection",r_rotEncDirection,nullptr),
@@ -414,7 +413,8 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "modelTelemetryDisabled", 1 ),
YAML_UNSIGNED( "disableTrainerPoweroffAlarm", 1 ),
YAML_UNSIGNED( "disablePwrOnOffHaptic", 1 ),
YAML_PADDING( 6 ),
YAML_UNSIGNED( "modelQuickSelect", 1 ),
YAML_PADDING( 5 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_END
};
radio/src/storage/yaml/yaml_datastructs_t15pro.cpp
+3 -3
View File
@@ -401,8 +401,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_ARRAY("switchConfig", 80, 20, struct_switchDef, switchIsActive),
YAML_ARRAY("flexSwitches", 0, MAX_FLEX_SWITCHES, struct_flexSwitch, flex_sw_valid),
YAML_STRING("currModelFilename", 17),
YAML_UNSIGNED( "modelQuickSelect", 1 ),
YAML_UNSIGNED( "blOffBright", 7 ),
YAML_UNSIGNED( "blOffBright", 8 ),
YAML_STRING("bluetoothName", 10),
YAML_STRING("ownerRegistrationID", 8),
YAML_CUSTOM("rotEncDirection",r_rotEncDirection,nullptr),
@@ -428,7 +427,8 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "modelTelemetryDisabled", 1 ),
YAML_UNSIGNED( "disableTrainerPoweroffAlarm", 1 ),
YAML_UNSIGNED( "disablePwrOnOffHaptic", 1 ),
YAML_PADDING( 6 ),
YAML_UNSIGNED( "modelQuickSelect", 1 ),
YAML_PADDING( 5 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_END
};
radio/src/storage/yaml/yaml_datastructs_t20.cpp
+2 -1
View File
@@ -388,8 +388,9 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "modelTelemetryDisabled", 1 ),
YAML_UNSIGNED( "disableTrainerPoweroffAlarm", 1 ),
YAML_UNSIGNED( "disablePwrOnOffHaptic", 1 ),
YAML_UNSIGNED( "modelQuickSelect", 1 ),
YAML_UNSIGNED( "invertLCD", 1 ),
YAML_PADDING( 3 ),
YAML_PADDING( 2 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_END
};
radio/src/storage/yaml/yaml_datastructs_tpro.cpp
+2 -1
View File
@@ -388,8 +388,9 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "modelTelemetryDisabled", 1 ),
YAML_UNSIGNED( "disableTrainerPoweroffAlarm", 1 ),
YAML_UNSIGNED( "disablePwrOnOffHaptic", 1 ),
YAML_UNSIGNED( "modelQuickSelect", 1 ),
YAML_UNSIGNED( "invertLCD", 1 ),
YAML_PADDING( 3 ),
YAML_PADDING( 2 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_END
};
radio/src/storage/yaml/yaml_datastructs_tx15.cpp
+3 -3
View File
@@ -401,8 +401,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_ARRAY("switchConfig", 80, 20, struct_switchDef, switchIsActive),
YAML_ARRAY("flexSwitches", 0, MAX_FLEX_SWITCHES, struct_flexSwitch, flex_sw_valid),
YAML_STRING("currModelFilename", 17),
YAML_UNSIGNED( "modelQuickSelect", 1 ),
YAML_UNSIGNED( "blOffBright", 7 ),
YAML_UNSIGNED( "blOffBright", 8 ),
YAML_STRING("bluetoothName", 10),
YAML_STRING("ownerRegistrationID", 8),
YAML_CUSTOM("rotEncDirection",r_rotEncDirection,nullptr),
@@ -428,7 +427,8 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "modelTelemetryDisabled", 1 ),
YAML_UNSIGNED( "disableTrainerPoweroffAlarm", 1 ),
YAML_UNSIGNED( "disablePwrOnOffHaptic", 1 ),
YAML_PADDING( 6 ),
YAML_UNSIGNED( "modelQuickSelect", 1 ),
YAML_PADDING( 5 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_END
};
radio/src/storage/yaml/yaml_datastructs_x10.cpp
+3 -3
View File
@@ -377,8 +377,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_ARRAY("switchConfig", 32, 20, struct_switchDef, switchIsActive),
YAML_ARRAY("flexSwitches", 0, MAX_FLEX_SWITCHES, struct_flexSwitch, flex_sw_valid),
YAML_STRING("currModelFilename", 17),
YAML_UNSIGNED( "modelQuickSelect", 1 ),
YAML_UNSIGNED( "blOffBright", 7 ),
YAML_UNSIGNED( "blOffBright", 8 ),
YAML_STRING("bluetoothName", 10),
YAML_STRING("ownerRegistrationID", 8),
YAML_CUSTOM("rotEncDirection",r_rotEncDirection,nullptr),
@@ -405,7 +404,8 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "modelTelemetryDisabled", 1 ),
YAML_UNSIGNED( "disableTrainerPoweroffAlarm", 1 ),
YAML_UNSIGNED( "disablePwrOnOffHaptic", 1 ),
YAML_PADDING( 6 ),
YAML_UNSIGNED( "modelQuickSelect", 1 ),
YAML_PADDING( 5 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_END
};
radio/src/storage/yaml/yaml_datastructs_x9d.cpp
+2 -1
View File
@@ -379,7 +379,8 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "modelTelemetryDisabled", 1 ),
YAML_UNSIGNED( "disableTrainerPoweroffAlarm", 1 ),
YAML_UNSIGNED( "disablePwrOnOffHaptic", 1 ),
YAML_PADDING( 4 ),
YAML_UNSIGNED( "modelQuickSelect", 1 ),
YAML_PADDING( 3 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_END
};
radio/src/storage/yaml/yaml_datastructs_x9dp2019.cpp
+2 -1
View File
@@ -379,7 +379,8 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "modelTelemetryDisabled", 1 ),
YAML_UNSIGNED( "disableTrainerPoweroffAlarm", 1 ),
YAML_UNSIGNED( "disablePwrOnOffHaptic", 1 ),
YAML_PADDING( 4 ),
YAML_UNSIGNED( "modelQuickSelect", 1 ),
YAML_PADDING( 3 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_END
};
radio/src/storage/yaml/yaml_datastructs_x9e.cpp
+2 -1
View File
@@ -379,7 +379,8 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "modelTelemetryDisabled", 1 ),
YAML_UNSIGNED( "disableTrainerPoweroffAlarm", 1 ),
YAML_UNSIGNED( "disablePwrOnOffHaptic", 1 ),
YAML_PADDING( 4 ),
YAML_UNSIGNED( "modelQuickSelect", 1 ),
YAML_PADDING( 3 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_END
};
radio/src/storage/yaml/yaml_datastructs_xlite.cpp
+2 -1
View File
@@ -379,8 +379,9 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "modelTelemetryDisabled", 1 ),
YAML_UNSIGNED( "disableTrainerPoweroffAlarm", 1 ),
YAML_UNSIGNED( "disablePwrOnOffHaptic", 1 ),
YAML_UNSIGNED( "modelQuickSelect", 1 ),
YAML_UNSIGNED( "invertLCD", 1 ),
YAML_PADDING( 3 ),
YAML_PADDING( 2 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_END
};
radio/src/storage/yaml/yaml_datastructs_xlites.cpp
+2 -1
View File
@@ -383,8 +383,9 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "modelTelemetryDisabled", 1 ),
YAML_UNSIGNED( "disableTrainerPoweroffAlarm", 1 ),
YAML_UNSIGNED( "disablePwrOnOffHaptic", 1 ),
YAML_UNSIGNED( "modelQuickSelect", 1 ),
YAML_UNSIGNED( "invertLCD", 1 ),
YAML_PADDING( 3 ),
YAML_PADDING( 2 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_END
};
radio/src/translations/string_list.h
+1 -1
View File
@@ -843,7 +843,6 @@ STR(WIDGET_TIMER)
STR(WIDGET_VALUE)
STR(LEFT_STICK)
STR(SHOW_MIXER_MONITORS)
STR(MODEL_QUICK_SELECT)
STR(LOADING)
STR(DELETE_THEME)
STR(SAVE_THEME)
@@ -893,6 +892,7 @@ STR(BLOFFBRIGHTNESS)
STR(KEYS_BACKLIGHT)
#endif
STR(MODEL_QUICK_SELECT)
STR(TIMEZONE)
STR(ADJUST_RTC)
STR(GPS)