'next' EEPROM support continued. Altitude in Top Bar

This commit is contained in:
Bertrand Songis
2014-01-21 21:36:43 +01:00
parent 3d91abbd5b
commit 9e1139c4e3
2 changed files with 9 additions and 8 deletions
@@ -1688,8 +1688,7 @@ class FrskyField: public StructField {
Append(new UnsignedField<8>(frsky.usrProto)); Append(new UnsignedField<8>(frsky.usrProto));
if (version >= 216) { if (version >= 216) {
Append(new UnsignedField<7>(frsky.voltsSource)); Append(new UnsignedField<7>(frsky.voltsSource));
// TODO altitude displayed Append(new BoolField<1>(frsky.altitudeDisplayed));
Append(new SpareBitsField<1>());
} }
else { else {
Append(new UnsignedField<8>(frsky.voltsSource)); Append(new UnsignedField<8>(frsky.voltsSource));
+8 -6
View File
@@ -371,16 +371,19 @@ void TelemetryPanel::setup()
if (!GetEepromInterface()->getCapability(HasAltitudeSel)) { if (!GetEepromInterface()->getCapability(HasAltitudeSel)) {
ui->AltitudeGPS_ChkB->hide(); ui->AltitudeGPS_ChkB->hide();
} else { }
else {
ui->AltitudeGPS_ChkB->setChecked(model.frsky.FrSkyGpsAlt); ui->AltitudeGPS_ChkB->setChecked(model.frsky.FrSkyGpsAlt);
} }
int varioCap=GetEepromInterface()->getCapability(HasVario);
// if (IS_TARANIS(GetEepromInterface()->getBoard())) { if (IS_TARANIS(GetEepromInterface()->getBoard())) {
if (false) {
ui->AltitudeToolbar_ChkB->setChecked(model.frsky.altitudeDisplayed); ui->AltitudeToolbar_ChkB->setChecked(model.frsky.altitudeDisplayed);
} else { }
else {
ui->AltitudeToolbar_ChkB->hide(); ui->AltitudeToolbar_ChkB->hide();
} }
int varioCap = GetEepromInterface()->getCapability(HasVario);
if (!varioCap) { if (!varioCap) {
ui->varioLimitMax_DSB->hide(); ui->varioLimitMax_DSB->hide();
ui->varioLimitMinOff_ChkB->hide(); ui->varioLimitMinOff_ChkB->hide();
@@ -649,7 +652,6 @@ void TelemetryPanel::on_AltitudeGPS_ChkB_toggled(bool checked)
if (lock) return; if (lock) return;
model.frsky.FrSkyGpsAlt = checked; model.frsky.FrSkyGpsAlt = checked;
emit modified(); emit modified();
//AltitudeGPS_CB
} }
void TelemetryPanel::on_AltitudeToolbar_ChkB_toggled(bool checked) void TelemetryPanel::on_AltitudeToolbar_ChkB_toggled(bool checked)