Add jack config to companion

This commit is contained in:
Kilrah
2018-11-03 16:56:51 +01:00
committed by Bertrand Songis
parent 8ffff76632
commit 8ab05f89c3
7 changed files with 1021 additions and 972 deletions
+2 -1
View File
@@ -146,7 +146,8 @@ enum Capability {
HasMixerExpo, HasMixerExpo,
HasBatMeterRange, HasBatMeterRange,
DangerousFunctions, DangerousFunctions,
HasModelCategories HasModelCategories,
HasSwitchableJack
}; };
class EEPROMInterface class EEPROMInterface
@@ -102,6 +102,7 @@ class GeneralSettings {
bool disableAlarmWarning; bool disableAlarmWarning;
bool disableRssiPoweroffAlarm; bool disableRssiPoweroffAlarm;
unsigned int usbMode; unsigned int usbMode;
unsigned int jackMode;
BeeperMode hapticMode; BeeperMode hapticMode;
unsigned int stickMode; // TODO enum unsigned int stickMode; // TODO enum
int timezone; int timezone;
@@ -3702,7 +3702,8 @@ OpenTxGeneralData::OpenTxGeneralData(GeneralSettings & generalData, Board::Type
internalField.Append(new BoolField<1>(this, generalData.jitterFilter)); internalField.Append(new BoolField<1>(this, generalData.jitterFilter));
internalField.Append(new BoolField<1>(this, generalData.disableRssiPoweroffAlarm)); internalField.Append(new BoolField<1>(this, generalData.disableRssiPoweroffAlarm));
internalField.Append(new UnsignedField<2>(this, generalData.usbMode)); internalField.Append(new UnsignedField<2>(this, generalData.usbMode));
internalField.Append(new SpareBitsField<3>(this)); internalField.Append(new UnsignedField<2>(this, generalData.jackMode));
internalField.Append(new SpareBitsField<1>(this));
} }
else { else {
internalField.Append(new SpareBitsField<7>(this)); internalField.Append(new SpareBitsField<7>(this));
@@ -713,6 +713,8 @@ int OpenTxFirmware::getCapability(::Capability capability)
return id.contains("danger") ? 1 : 0; return id.contains("danger") ? 1 : 0;
case HasModelCategories: case HasModelCategories:
return IS_HORUS(board); return IS_HORUS(board);
case HasSwitchableJack:
return IS_TARANIS_XLITES(board);
default: default:
return 0; return 0;
} }
+18 -1
View File
@@ -151,13 +151,21 @@ ui(new Ui::GeneralSetup)
ui->adjustRTC->hide(); ui->adjustRTC->hide();
} }
if (IS_STM32(firmware->getBoard())){ if (IS_STM32(firmware->getBoard())) {
ui->usbModeCB->setCurrentIndex(generalSettings.usbMode); ui->usbModeCB->setCurrentIndex(generalSettings.usbMode);
} }
else { else {
ui->usbModeLabel->hide(); ui->usbModeLabel->hide();
ui->usbModeCB->hide(); ui->usbModeCB->hide();
} }
if (firmware->getCapability(HasSwitchableJack)) {
ui->jackModeCB->setCurrentIndex(generalSettings.jackMode);
}
else {
ui->jackModeLabel->hide();
ui->jackModeCB->hide();
}
if (!firmware->getCapability(OptrexDisplay)) { if (!firmware->getCapability(OptrexDisplay)) {
ui->label_displayType->hide(); ui->label_displayType->hide();
@@ -353,6 +361,15 @@ void GeneralSetupPanel::on_usbModeCB_currentIndexChanged(int index)
} }
} }
void GeneralSetupPanel::on_jackModeCB_currentIndexChanged(int index)
{
if (!lock) {
generalSettings.jackMode = ui->jackModeCB->currentIndex();
emit modified();
}
}
void GeneralSetupPanel::on_backlightColor_SL_valueChanged() void GeneralSetupPanel::on_backlightColor_SL_valueChanged()
{ {
if (!lock) { if (!lock) {
+1
View File
@@ -60,6 +60,7 @@ class GeneralSetupPanel : public GeneralPanel
void on_hapticLengthCB_currentIndexChanged(int index); void on_hapticLengthCB_currentIndexChanged(int index);
void on_backlightswCB_currentIndexChanged(int index); void on_backlightswCB_currentIndexChanged(int index);
void on_usbModeCB_currentIndexChanged(int index); void on_usbModeCB_currentIndexChanged(int index);
void on_jackModeCB_currentIndexChanged(int index);
void on_backlightColor_SL_valueChanged(); void on_backlightColor_SL_valueChanged();
void on_mavbaud_CB_currentIndexChanged(int index); void on_mavbaud_CB_currentIndexChanged(int index);
void on_voiceLang_CB_currentIndexChanged(int index); void on_voiceLang_CB_currentIndexChanged(int index);
File diff suppressed because it is too large Load Diff