Commit Graph
31 Commits
Author SHA1 Message Date
bsongis bf7919bd8d Issue #731 - Conversion issues (Inputs) fixed 2014-03-03 12:24:42 +01:00
bsongis cac6314ce1 Issue #767 - Companion part 2014-03-01 22:18:43 +01:00
bsongis 3215346a1b Issue #767 - Extra Pot (S3) support 2014-03-01 18:54:08 +01:00
bsongis 86c0678273 cppcheck experiment. A couple of memory leaks fixed 2014-02-26 16:10:12 +01:00
Bertrand Songis 9ade773618 Merge remote-tracking branch 'origin/next' into
bsongis/Issue713_more_custom_functions

Conflicts:
	radio/src/.gitignore
	radio/src/opentx.cpp
2014-02-21 14:26:11 +01:00
Kjell Kernen 5842bc8473 First merge problem fixed (there are more) 2014-02-20 22:33:41 +01:00
Kjell Kernen 58d8a99511 Merge branch 'origin/next'
Conflicts:
	companion/src/eeprominterface.cpp
	companion/src/firmwares/opentx/opentxinterface.cpp
	companion/src/mainwindow.cpp
	companion/src/simulatordialog.cpp
	companion/src/xsimulatordialog.cpp
2014-02-20 21:37:51 +01:00
Kjell Kernen 80ef2b8d38 All function names changed to a consistent standard.
Cleaned up indentation of appdata.h
2014-02-19 14:01:34 +01:00
Kjell Kernen da68c593cf Changed every single QSetting in Companion.
Next step: Function renaming
2014-02-18 23:48:57 +01:00
Bertrand Songis fbd0744431 Issue #713 - 64 custom functions instead of 32. 8chars only filenames in
PlayTrack function
2014-02-18 22:46:30 +01:00
Bertrand Songis 0d76f2461a Issue #515 fixed. Standalone Qt based simu added. xsimulatordialog and
simulatordialog merged
2014-02-14 18:34:01 +01:00
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 08a37b77e7 Renaming started ... who wants to continue? 2014-02-08 08:38:06 +01:00
Bertrand Songis 46fe25fd24 Companion typos 2014-02-05 22:32:54 +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 8ef1456fe9 EEPROM support in Companion for the 6pos pots on Taranis 2014-01-31 17:19:21 +01:00
Bertrand Songis ce2b033ccb Issue #469 fixed (Telemetry tab in Companion rewritten - 20% code
removed). More tests needed!
2014-01-31 09:40:34 +01:00
Bertrand Songis 932553e403 Merge branch 'next' into kilrah/FAS_Offset_compensation
Conflicts:
	companion/src/modeledit/telemetry.cpp
2014-01-23 16:31:09 +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 439cabe83c Another code reduction. Settings are now stored in "OpenTX/Companion",
instead of "companion/companion"
2014-01-20 16:50:06 +01:00
Romolo Manfredini 0d394ca7c6 References to companion9x were still present 2014-01-20 14:42:22 +01:00
Bertrand Songis 1a00145b1d A couple of other fixes 2014-01-20 13:47:42 +01:00
Bertrand Songis 11e83de0d3 Support of inputs / mixes from 'next' continued. More duplicated code
removed.
2014-01-17 15:46:19 +01:00
Andre Bernet bea9c74243 Companion support for FAS offset, Persistent mAh and Altitude in top bar 2014-01-15 20:40:53 +01:00
Bertrand Songis 888895b60b Corrections on Curves in MixerDialog and ExpoDialog (introduction of
CurveGroup to share code)
2014-01-15 11:50:00 +01:00
Bertrand Songis cedddfe8d2 EEPROM 'next' support. A lot of corrections. 2014-01-13 19:09:05 +01:00
Bertrand Songis 9a2b668956 GvarsOfsNum (er9x) removed 2014-01-09 18:53:35 +01:00
Bertrand Songis 57f9489d81 EEPROM import bugfixing 2014-01-07 19:33:29 +01:00
Bertrand Songis 3b59d07724 Support of current EEPROM inside Companion. Some more code around
EEPROMS export removed (needed to be fixed, so I preferred to remove in
the same commit).
2014-01-07 17:57:42 +01:00