From 2f2b5e2ebed905053b26e25e686cc46cfd1d1213 Mon Sep 17 00:00:00 2001 From: Damjan Adamic Date: Thu, 25 Jun 2015 18:38:01 +0200 Subject: [PATCH] Fixed pot and slider names for 9XE --- companion/src/eeprominterface.cpp | 2 +- companion/src/generaledit/calibration.cpp | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/companion/src/eeprominterface.cpp b/companion/src/eeprominterface.cpp index 24d0cdf3f..92aa087fd 100644 --- a/companion/src/eeprominterface.cpp +++ b/companion/src/eeprominterface.cpp @@ -405,7 +405,7 @@ QString AnalogString(int index) { static const QString sticks[] = { QObject::tr("Rud"), QObject::tr("Ele"), QObject::tr("Thr"), QObject::tr("Ail") }; static const QString pots9X[] = { QObject::tr("P1"), QObject::tr("P2"), QObject::tr("P3") }; - static const QString potsTaranisX9E[] = { QObject::tr("S1"), QObject::tr("S2"), QObject::tr("S3"), QObject::tr("S4"), QObject::tr("LS"), QObject::tr("RS"), QObject::tr("LS2"), QObject::tr("RS2") }; + static const QString potsTaranisX9E[] = { QObject::tr("F1"), QObject::tr("F2"), QObject::tr("F3"), QObject::tr("F4"), QObject::tr("S1"), QObject::tr("S2"), QObject::tr("LS"), QObject::tr("RS") }; static const QString potsTaranis[] = { QObject::tr("S1"), QObject::tr("S2"), QObject::tr("S3"), QObject::tr("LS"), QObject::tr("RS") }; if (index < 4) return CHECK_IN_ARRAY(sticks, index); diff --git a/companion/src/generaledit/calibration.cpp b/companion/src/generaledit/calibration.cpp index 59c4023bb..bc024b859 100644 --- a/companion/src/generaledit/calibration.cpp +++ b/companion/src/generaledit/calibration.cpp @@ -34,6 +34,7 @@ void CalibrationPanel::setupPotConfig(int index, QLabel *label, AutoLineEdit *na bool enabled = false; if (IS_TARANIS_X9E(firmware->getBoard()) && index < 4) { + label->setText(RawSource(SOURCE_TYPE_STICK, index+NUM_STICKS).toString()); enabled = true; } else if (IS_TARANIS_PLUS(firmware->getBoard()) && index < 3) { @@ -70,6 +71,10 @@ void CalibrationPanel::setupSliderConfig(int index, QLabel *label, AutoLineEdit enabled = true; } + if (IS_TARANIS_X9E(firmware->getBoard())) { + label->setText(RawSource(SOURCE_TYPE_STICK, index+NUM_STICKS+4).toString()); + } + if (enabled) { type->addItem(tr("None"), GeneralSettings::SLIDER_NONE); type->addItem(tr("Slider with detent"), GeneralSettings::SLIDER_WITH_DETENT);