piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity
4,324 Commits 2 Branches 0 Tags
220e9f3e97f709fca71f704cff589868df2db87c
Commit Graph
770 Commits
Author SHA1 Message Date
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 3a2e9e7c2e Fixes #1074 2014-05-10 23:30:28 +02:00
bsongis 41571d4a74 Fixes #1065 - Companion part 2014-05-09 17:11:31 +02:00
Andre Bernet fdb9871a25 Add more targets to simu with default options that allow for checking most menus 2014-05-07 13:01:43 +02:00
Damjan Adamic c5a526f3b3 Merge branch 'next' 2014-05-05 22:49:44 +02:00
Damjan Adamic 77bafb5364 Converted CR back to CRLF. SmartGit did this to me previously when merging. 2014-05-05 22:41:33 +02:00
Damjan Adamic 5316931fa1 Merge branch 'next' 2014-05-05 22:37:04 +02:00
Damjan Adamic 61addd3d4e Merge branch 'next' 2014-05-05 22:13:24 +02:00
Damjan Adamic b9ee1d5dee Sorted fade times for printPhases() 2014-05-05 21:51:56 +02:00
Damjan Adamic 97bbdd3be1 More compaction of printInputs() 2014-05-05 21:04:50 +02:00
Damjan Adamic b9b4e441e7 renamed printExpo() to printInputs() and compacted code, output is the same. 2014-05-05 21:02:26 +02:00
Damjan Adamic 809a3cfd60 Added "Alt+S" shortcut to start model simulation 2014-05-05 20:25:41 +02:00
bsongis 50774a9018 Cosmetics 2014-05-05 16:35:51 +02:00
bsongis f3f9f46742 100mAh will be now the step for telemetry bars (and logical switches on 
stock 9x)
 2014-05-05 16:35:41 +02:00
bsongis f178748090 Fixes #986 
Fixes #1058
 2014-05-05 16:07:07 +02:00
bsongis 934961e999 Fixes #1056 2014-05-05 12:27:29 +02:00
bsongis 2810323cc7 10200mAh as a maximum for Consumption in Telemetry Bars 2014-05-05 10:53:59 +02:00
Damjan Adamic 1f3e67f912 Telemetry for Taranis print improvement 2014-05-04 19:52:26 +02:00
Damjan Adamic fe719686d9 Special Functions print improvement 2014-05-04 18:37:58 +02:00
Damjan Adamic 7027d809c1 Logical switches print improvement 2014-05-04 18:21:03 +02:00
Damjan Adamic 0fc8a5e2f2 Reenabled Ctrl+P shortcut for "print model" 2014-05-04 18:08:55 +02:00
Damjan Adamic 8787dd05cd Many improvements of print dialog. Some minor changes in mixes and inputs formatting. 2014-05-04 10:37:49 +02:00
Bertrand Songis 667453d48c Merge pull request #1053 from opentx/driver33/PL_TR 
translation fixes
 2014-05-03 13:02:09 +02:00
Bertrand Songis 1485713f84 Merge pull request #1051 from opentx/mhotar/cz_translations 
cz translations
 2014-05-03 13:01:59 +02:00
Jacek Drewniak cb0b6f1c18 translation fixes 2014-05-03 12:42:07 +02:00
bsongis 573858552c Fixes #1052 2014-05-03 11:26:44 +02:00
mhotar 8799e370f2 cz translations 2014-05-02 23:00:54 +02:00
Andre Bernet 0440bc6f34 French translations 2014-05-02 20:11:01 +02:00
Andre Bernet 219e0ef5d5 Better location for stick reverse as mapping is shown above 2014-05-02 20:07:11 +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
bsongis 72d0f2e6f6 Fixes #1043 2014-05-02 11:04:57 +02:00
Kjell Kernen a3b47625f5 This commit removes the direct use of QSettings from the simulator and replaces it with references to the protected global variable g 2014-05-01 20:08:29 +02:00
Bertrand Songis 7b835b37b3 Merge pull request #1038 from opentx/projectkk2glider/mixes_and_inputs_display 
Projectkk2glider/mixes and inputs display
 2014-05-01 10:33:32 +02:00
Damjan Adamic b092607553 Save/restore of simulator switches, fixes #1034 2014-05-01 09:46:38 +02:00
Damjan Adamic 88e7ad4b8c Better display of inputs with assigned name 2014-04-30 23:16:49 +02:00
Damjan Adamic 1a6906bbb3 Input name missing from mixer sources 2014-04-30 22:58:54 +02:00
bsongis 168ec19ef4 Fixes #1036 2014-04-30 22:10:01 +02:00
Damjan Adamic 6b1afde47e bugfix: commit 5c8504add6 broke importing of trim values for FM0 - they were all set to zero. 2014-04-30 21:20:07 +02:00
bsongis 3cd070ee38 Cosmetics 2014-04-30 20:10:45 +02:00
bsongis e2cfaf6742 Fixes #1031 2014-04-30 16:12:53 +02:00
Damjan Adamic 926ad88b73 Hided "popup enabled" checkbox for FM>0. They have taken precious space and severely limited width of GVAR names filed. 2014-04-29 20:06:25 +02:00
Damjan Adamic 8baa2b3887 Bug: setting gvar to "same as flight mode X" caused endless loop if X > current flight mode 2014-04-29 19:59:24 +02:00
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
Kjell Kernen 09d9bcf59a Replaced hard coded switches with Bertrands new defines 2014-04-29 15:42:41 +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