Commit Graph
70 Commits
Author SHA1 Message Date
Andre Bernet 3b441a7765 Sync text with other firmwares 2014-06-02 11:26:17 +02:00
Damjan Adamic 6d384759ae Removed MixesWithoutExpo capability. Added missing files for previous commit. 2014-06-01 16:13:06 +02:00
bsongis 4acef445a3 Companion Vario Sources were not in line with the firmware 2014-05-31 08:16:13 +02:00
bsongis db75471f21 RxBatt now configurable in Companion 2014-05-25 21:20:14 +02:00
Andre Bernet b0e0403904 lua option in companion 2014-05-23 12:16:41 +02:00
Andre Bernet 8334641a8e 2.0 has no more templates on Taranis 2014-05-23 11:28:55 +02:00
bsongis 73faca60d7 OpenTX 2.0 downloads from Companion should be working now 2014-05-20 14:53:59 +02:00
bsongis b3a6556e0b Taranis REV4a support removed as nobody doesn't still use it (developers
have now a Taranis Plus board inside their REV4a case). Compilation
server for 'next' is now next.open-tx.org
2014-05-20 10:44:36 +02:00
bsongis ef15ccf321 Companion bugfixes 2014-05-16 23:02:31 +02:00
bsongis 92e7182740 Sky9x modules settings updated in Companion 2014-05-16 18:32:28 +02:00
bsongis 836cc95570 Thanks Jenkins! 2014-05-16 17:59:01 +02:00
bsongis 61224e7207 Merge remote-tracking branch 'origin/next' into bsongis/9XR-PRO_port
Conflicts:
	companion/src/eeprominterface.cpp
	companion/src/eeprominterface.h
	companion/src/firmwares/opentx/opentxeeprom.cpp
	companion/src/firmwares/opentx/opentxinterface.cpp
	companion/src/firmwares/opentx/opentxinterface.h
	companion/src/mdichild.cpp
	radio/src/Makefile
2014-05-11 22:48:48 +02:00
bsongis 220e9f3e97 Merge remote-tracking branch 'origin/next' into TaranisPlus
Conflicts:
	companion/src/generaledit.cpp
	companion/src/generaledit.ui
	radio/src/gui/menu_general.cpp
2014-05-11 14:41:03 +02:00
bsongis f178748090 Fixes #986
Fixes #1058
2014-05-05 16:07:07 +02:00
Andre Bernet 1a43b6d353 Merge branch 'bsongis/Issue660' into next
Conflicts:
	companion/src/firmwares/opentx/opentxinterface.cpp
2014-05-02 14:44:24 +02:00
Andre Bernet 3b4053d850 Companion support - DON'T FORGET COMPILE SCRIPT! 2014-05-02 14:40:18 +02:00
Andre Bernet 0ffd0c8e0b Merge branch 'next' of https://github.com/opentx/opentx into TaranisPlus
Conflicts:
	companion/src/firmwares/opentx/opentxinterface.cpp
	radio/src/haptic.cpp
	radio/src/targets/gruvin9x/board_gruvin9x.h
	radio/src/targets/mega2560/board_mega2560.h
	radio/src/targets/sky9x/board_sky9x.h
	radio/src/targets/stock/board_stock.h
	radio/src/targets/taranis/board_taranis.h
	radio/src/targets/taranis/haptic_driver.cpp
2014-04-29 15:13:05 +02:00
bsongis 08284a69e6 Switches constants properly defined in Companion 2014-04-29 08:55:19 +02:00
bsongis 866e321b1a Haptic, HapticMode and HapticStrength capabilities merged in Companion 2014-04-29 07:30:55 +02:00
Bertrand Songis 24cbbad82b Merge pull request #1015 from opentx/kilrah/haptic
Haptic for Taranis
2014-04-29 07:16:04 +02:00
Andre Bernet 1a39317c2d Fix #1023 2014-04-28 22:50:25 +02:00
Andre Bernet c22ee587cd Enable haptic fields for Taranis, add option for revisions < REVPLUS 2014-04-23 21:58:19 +02:00
Andre Bernet e3955159a2 Enable haptic fields for Taranis, add option for revisions < REVPLUS 2014-04-23 15:03:17 +02:00
Andre Bernet 5ad4543d91 Taranis Plus support in companion - DON'T FORGET COMPILE SCRIPT 2014-04-23 14:43:57 +02:00
bsongis c5ac19a054 Refactoring FirmwareInterface / EepromInterface 2014-04-18 16:27:27 +02:00
bsongis 2a7a0f0a47 One Dump remained active 2014-04-16 11:45:41 +02:00
Andre Bernet 02e45c5eea Translation/typo cleanup finished 2014-04-16 11:07:07 +02:00
projectkk2glider 4ccbc13f6a Merge branch 'upstream/next' 2014-04-16 09:34:14 +02:00
bsongis f47cd81108 ExtraChannels Capacity removed 2014-04-16 07:27:39 +02:00
Damjan Adamic 7f7c722429 More cosmetic changes 2014-04-15 18:53:00 +02:00
Damjan Adamic 4850541002 Fixes suggested by Bertrand 2014-04-15 18:47:47 +02:00
Damjan Adamic df954ae483 Fixed many memory leaks 2014-04-14 20:25:17 +02:00
bsongis ed3bc66ea1 Many little differences in logical switches (telemetry sources) between
Companion and the FW (especially on 9x stock board)
2014-04-10 12:35:58 +02:00
Andre Bernet 0075f20ae4 Module/protocol combinations were wrong in companion 2014-04-03 20:35:57 +02:00
bsongis 09fc2af254 Taranis has 32 curves, only 16 were shown in Companion 2014-03-26 09:29:05 +01:00
bsongis 95c8f460a3 Issue #855 fixed 2014-03-26 08:49:34 +01:00
Andre Bernet 01912356bf A megaton of non-OpenTX UI elements and relations removed in general settings 2014-03-23 13:07:32 +01:00
bsongis 8662a4ec68 Merge issues 2014-03-03 16:50:32 +01:00
bsongis a18953f6a2 Merge remote-tracking branch 'origin/next' into bsongis/9XR-PRO_port
Conflicts:
	companion/src/avroutputdialog.cpp
	companion/src/burnconfigdialog.cpp
	companion/src/eeprominterface.cpp
	companion/src/eeprominterface.h
	companion/src/firmwares/opentx/opentxinterface.cpp
	companion/src/helpers.cpp
	radio/src/gui/menu_general.cpp
	radio/src/opentx.cpp
2014-03-03 16:41:41 +01:00
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