Commit Graph
11 Commits
Author SHA1 Message Date
Andre Bernet 2a83cffc53 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
2014-02-10 14:47:32 +01:00
Bertrand Songis e27a8bece4 Avoids the "No matching signal" warnings (on_XXX slots seem parsed by
moc)
2014-02-08 18:06:55 +01:00
Andre Bernet f79ae6c39b Falisafe settings fixed, now include decimal (slider removed) and scaled properly taking 1000/1024 ratio to match display on the radio 2014-02-08 13:14:20 +01:00
Andre Bernet 10dc3503c2 Pot warning UI in companion 2014-02-03 21:32:19 +01:00
Andre Bernet 856ffd4ed7 Merge branch 'next' of https://github.com/opentx/opentx into kilrah/Switch_and_pot_warnings
Conflicts:
	companion/src/firmwares/opentx/opentxeeprom.cpp
	radio/src/gui/menu_model.cpp
	radio/src/opentx.cpp
	radio/src/telemetry/frsky.cpp
	radio/src/translations.cpp
	radio/src/translations.h
	radio/src/translations/cz.h.txt
	radio/src/translations/de.h.txt
	radio/src/translations/en.h
	radio/src/translations/es.h.txt
	radio/src/translations/fr.h.txt
	radio/src/translations/it.h.txt
	radio/src/translations/pl.h.txt
	radio/src/translations/pt.h.txt
	radio/src/translations/se.h.txt
2014-02-01 13:19:27 +01:00
Bertrand Songis da2561b672 'next' EEPROM support continued: Timer countdown modes 2014-01-22 15:00:42 +01:00
Andre Bernet b38d278c75 New switch warnings and displayText in companion. Import/export conversions not done yet 2014-01-20 19:26:30 +01:00
Bertrand Songis cedddfe8d2 EEPROM 'next' support. A lot of corrections. 2014-01-13 19:09:05 +01:00
Bertrand Songis e16500de9e Model Setup reworked again! 2013-12-22 17:01:41 +01:00
Bertrand Songis 5b7654e475 StartupSwitches and BeepCenter in ModelSetup rewritten 2013-12-20 19:59:47 +01:00
Bertrand Songis b802bc5db2 ModelEdit window splitted (one file per tab). Templates/Wizard still have to be re-introduced, but in a menu instead of a Model tab 2013-12-19 19:19:44 +01:00