Merge branch 'next' of https://github.com/opentx/opentx into kilrah/Switch_and_pot_warnings
Conflicts: companion/src/eeprominterface.h companion/src/firmwares/opentx/opentxeeprom.cpp radio/src/opentx.cpp radio/src/translations/es.h.txt radio/src/translations/fr.h.txt
This commit is contained in:
@@ -56,14 +56,13 @@ class ModulePanel : public ModelPanel
|
||||
void on_ppmFrameLength_editingFinished();
|
||||
void on_rxNumber_editingFinished();
|
||||
void on_failsafeMode_currentIndexChanged(int value);
|
||||
void onFailsafeChannelChanged(int value);
|
||||
void onFailsafeSpinChanged(double value);
|
||||
|
||||
private:
|
||||
ModuleData & module;
|
||||
int moduleIdx;
|
||||
Ui::Module *ui;
|
||||
QVector<QSpinBox *> failsafeSpins;
|
||||
QVector<QSlider *> failsafeSliders;
|
||||
QVector<QDoubleSpinBox *> failsafeSpins;
|
||||
};
|
||||
|
||||
class Setup : public ModelPanel
|
||||
|
||||
Reference in New Issue
Block a user