Commit Graph
729 Commits
Author SHA1 Message Date
Andre Bernet 7fc1372f8f Some fields were broken for REV4a and REVPLUS 2014-04-29 16:17:16 +02:00
Andre Bernet 09295d377d Simu now simulates REVPLUS 2014-04-29 16:16:30 +02:00
Andre Bernet 91c84dbb65 Color slider for backlight SF in companion 2014-04-29 16:16:07 +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
Kjell Kernen d4d19269ee Merge pull request #1024 from opentx/dvogonen/add_companion_selectable_functions_993
Swedish Companion translation update
2014-04-28 23:48:20 +02:00
Kjell Kernen 30bc786e08 Swedish Companion translation update 2014-04-28 23:43:41 +02:00
Andre Bernet 565aa29c48 Throttle cut wizard option was setting 0% 2014-04-28 23:11:05 +02:00
Kjell Kernen cee6523774 Merge pull request #1020 from opentx/dvogonen/add_companion_selectable_functions_993
Dvogonen/add companion selectable functions 993
2014-04-28 23:03:49 +02:00
Andre Bernet 1a39317c2d Fix #1023 2014-04-28 22:50:25 +02:00
Andre Bernet 937481d761 Haptic in Taranis simu 2014-04-28 22:37:06 +02:00
Kjell Kernen 833585002b Forgot these files in last commit 2014-04-28 15:43:10 +02:00
Kjell Kernen d4362e5e62 Wizard option handliong working and ready for merge into next. 2014-04-28 15:42:31 +02:00
Andre Bernet d612f5609f Text view uses fixed font 2014-04-27 23:39:55 +02:00
Kjell Kernen 8781b522d8 Added Wizard GUI for two model options ( Throttle Cut and Throttle Timer).
The wizard option data is not yet added to the mixer. That is the next step.
2014-04-27 22:47:18 +02:00
Kjell Kernen 3980f42b3d Merge pull request #1009 from opentx/mhotar/cz_translations
Mhotar/cz translations
2014-04-27 21:57:46 +02:00
bsongis 812242f010 Fixes #1011 2014-04-25 22:10:56 +02:00
mhotar 07149f516f cz translations wip 2014-04-24 00:07:27 +02:00
Andre Bernet c22ee587cd Enable haptic fields for Taranis, add option for revisions < REVPLUS 2014-04-23 21:58:19 +02:00
Damjan Adamic 5d2aacb7d1 Fixes missing icons in menus and buttons on Fedora 20 2014-04-23 19:37:36 +02:00
Andre Bernet dfead504f7 Backlight color in SFs for REVPLUS
100 steps instead of 255, should be enough...
2014-04-23 17:31:09 +02:00
Andre Bernet 496f3c3793 Missing translation 2014-04-23 16:25:12 +02:00
Andre Bernet 57d541efc1 Backlight color support in companion 2014-04-23 15:31:12 +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
mhotar 00a5819f3a cz translations wip 2014-04-23 00:01:28 +02:00
Andre Bernet 2ff45dd73c Remove stray voice language dropdown when not applicable 2014-04-22 16:38:43 +02:00
Andre Bernet 7bb54201cb Typos
French translations
2014-04-22 15:06:20 +02:00
Kjell Kernen 542ec36579 German and Finninsh translation files updated with lupdate to produce new files for translation. 2014-04-22 01:06:26 +02:00
Kjell Kernen 03a4221fe6 Swedish translation of Companion updated. 2014-04-22 01:05:27 +02:00
Kjell Kernen 198bcebabf Finnish Companion translation updated by Janne Huuskonen 2014-04-22 00:37:28 +02:00
Kjell Kernen 85a79b6819 German Companion translation updated by Hrenz 2014-04-22 00:36:45 +02:00
Bertrand Songis be5ed503be Merge pull request #999 from projectkk2glider/mixes_tab_dragdrop_bug_issue_997
Improvement of inputs and mixers tabs in companion
2014-04-21 13:01:37 +02:00
Damjan Adamic a6ad130df7 Reverted commit 8c5fc3a01f (which prevented moving second mixer to the first line) 2014-04-21 12:22:25 +02:00
bsongis 5a06c42bca CompareDialog deleted just after creation 2014-04-21 08:27:37 +02:00
Damjan Adamic 3d35273f4f Merge branch 'upstream/next' 2014-04-20 22:17:25 +02:00
Damjan Adamic 27600ba37e Cosmetic changes 2014-04-20 22:12:55 +02:00
Damjan Adamic fc92ad3a86 Prevent drag&drop between inputs and mixers 2014-04-20 21:29:08 +02:00
Damjan Adamic 65521d96d4 Code refactoring
Added documentation
2014-04-20 19:06:55 +02:00
Damjan Adamic b70586bd9f Reverted to original code (both work) 2014-04-20 18:31:54 +02:00
Damjan Adamic a8c828f105 Corrected list items width (long items were wrapping)
Refactored inputs tab, same system as mixes tab (grouping of lines)
Fixed incorrect spacing for first list item
2014-04-20 18:27:28 +02:00
Damjan Adamic 0e7b420b71 Code cleanup 2014-04-20 15:40:40 +02:00
Damjan Adamic 95e7f7915b Better implementation, spacing now correct, drag&drop working.
Inputs tab still needs spaces converted to &nbsp;
2014-04-20 14:22:54 +02:00
Damjan Adamic 3df9fcb67a Working, but drawing is not perfect 2014-04-20 13:21:28 +02:00
bsongis 352066c7d1 Merge bug in AppPreferencesDialog: Cancel button broken! 2014-04-20 09:45:18 +02:00
Andre Bernet 2eed4ea8e2 Main window position restored (fix #996) 2014-04-19 20:49:11 +02:00
mhotar 17c0032451 Merge remote-tracking branch 'origin/next' into mhotar/cz_translations 2014-04-19 18:23:23 +02:00
bsongis 22dde8014c Too early from this one 2014-04-19 08:52:18 +02:00