Commit Graph
9346 Commits
Author SHA1 Message Date
Bertrand Songis 5cb1ed87d8 Merge branch 'multi_module_next' of https://github.com/schwabe/opentx into schwabe-multi_module_next 2016-04-01 23:02:05 +02:00
Andre Bernet 1f303ec995 Merge pull request #3368 from opentx/kilrah/antennaselection
[Horus] Internal module antenna selection support
2016-04-01 19:38:05 +04:00
Andre Bernet 36316ecf4c Merge branch 'next' into kilrah/antennaselection
# Conflicts:
#	radio/src/translations/de.h.txt
#	radio/src/translations/it.h.txt
#	radio/src/translations/pt.h.txt
#	radio/src/translations/se.h.txt
2016-04-01 19:37:10 +04:00
Andre Bernet 555f6510b2 WDT at 500ms. Needs thorough checking 2016-04-01 18:58:29 +04:00
Andre Bernet 3c39893bca [Horus] 8-bit source index, really? (#3393) 2016-04-01 18:22:32 +04:00
Andre Bernet 5f86e87ae2 [Horus] Only 4 topbar zones now we have the fixed icons 2016-04-01 17:36:15 +04:00
Andre Bernet c5e95c9730 [Horus] Linear icons and name fix for L1/L2 (#3393) 2016-04-01 12:10:06 +04:00
Andre Bernet 75977b6b6d [Horus] Enable SWR warning 2016-04-01 11:48:53 +04:00
Andre Bernet 09780a07ff Merge pull request #3395 from opentx/kilrah/taranis_gpio
GPIO speed reduction for Taranis
2016-04-01 11:15:58 +04:00
Andre Bernet 54cb3de46e Merge branch 'next' into kilrah/taranis_gpio 2016-04-01 11:13:30 +04:00
Damjan Adamic 009eaa3893 Cmake compiler optimization flags fixed, now release build uses -Os instead of -O3 which is cmake's default. 2016-03-31 18:06:57 +02:00
Andre Bernet 02dfff319f [Horus] Cosmetics 2016-03-31 16:51:20 +04:00
Andre Bernet 3d4f3611b0 Merge branch 'next' into kilrah/antennaselection
# Conflicts:
#	radio/src/translations/de.h.txt
#	radio/src/translations/es.h.txt
#	radio/src/translations/it.h.txt
#	radio/src/translations/pt.h.txt
#	radio/src/translations/se.h.txt
2016-03-31 15:11:12 +04:00
Bertrand Songis 1f54c61e41 Dockerfile fixes ported to 'next' 2016-03-30 23:14:17 +02:00
Bertrand Songis 3c1221452a Taranis bootloader Makefile removed (CMake now) 2016-03-30 22:47:25 +02:00
Bertrand Songis e4d820b11e Dockerfile cosmetics 2016-03-30 18:51:42 +02:00
Andre Bernet 7076889e1a Channel range fix 2016-03-30 20:27:59 +04:00
Andre Bernet 438f81aef9 Reorganize / clarify board types by relevance 2016-03-30 20:14:37 +04:00
Bertrand Songis 4382445123 Cosmetics 2016-03-30 07:56:02 +02:00
Bertrand Songis 5f10deb182 Merge pull request #3391 from schwabe/fix_audio_osx
Make sound work in OS X
2016-03-29 22:49:14 +02:00
Bertrand Songis 9fb5416ac9 Makefile removed as it doesn't work anymore. CMake is used instead. 2016-03-29 22:40:29 +02:00
Bertrand Songis 791a2e5f75 PPM_UNIT = PERCENT_PREC1 by default (as in 2.1) 2016-03-29 22:30:38 +02:00
Bertrand Songis 9cd9616ece OVERRIDE_CHANNEL_FUNCTION = YES by default (as in 2.1) 2016-03-29 22:27:27 +02:00
Bertrand Songis 3f4cae8cb1 PPM_UNIT = PERCENT_PREC1 by default (as in 2.1) 2016-03-29 22:25:56 +02:00
Arne Schwabe a2e5efa6c7 Make simulator sound functional again in OS X (and probably Linux)
The radio/src/simu/CMakeLists.txt was missing the SDL defines/includes required for SDL audio
2016-03-29 22:13:18 +02:00
Arne Schwabe 2ad644d793 Add horus support for multi pulses (untested, following DSM2) 2016-03-29 21:41:15 +02:00
Arne Schwabe c09c3e0a2b Do not backup the multi module struct 2016-03-29 21:41:15 +02:00
Arne Schwabe 5d19adb1eb Copy strings for multimode support from en.h.txt to other languages 2016-03-29 21:41:15 +02:00
Arne Schwabe 96c64f2895 Add german translations for multi module
(Also fix C++11 suffix error when compiling on OS X/clang)
2016-03-29 21:41:15 +02:00
Arne Schwabe 0dc2f60e09 Add german translations for multi module
(Also fix C++11 suffix error when compiling on OS X/clang)
2016-03-29 21:41:15 +02:00
Arne Schwabe 99c7e3f0ad Add FY326 protocol 2016-03-29 21:41:15 +02:00
Arne Schwabe f86dc6b156 Implement DSM2/DSMX frame format options 2016-03-29 21:41:15 +02:00
Arne Schwabe 9de6e09c09 Implement autobind and low power setting and specifying a custom protocol for the multi module
Specifying a custom prtocol is useful if OpenTX firmware is older than the multi module firmware
and the protocol in question is not yet in the protocol list of the OpenTX firmware.
2016-03-29 21:41:15 +02:00
Arne Schwabe 119e413a6d Multi module support for Taranis
Reuse some of the DSM2 routines to avoid code duplication.

This first version only implements the protocol on the Taranis. (and not

Telemetry code is currently untested and will not work (Polarity mismatch). The main protocols to use telemetry are FrSky protocols and not a high priority on the Taranis.

Patch v3: Fix myeeprom.h, include option value in menu.
Patch v4: Fix identing, name substructs of modeldata
2016-03-29 21:41:14 +02:00
Arne Schwabe c788ad6add Move ppm related options into own struct
This allows to have the ppm related options in a union with a other module protocol specific options for the multi module.
2016-03-29 21:41:14 +02:00
Bertrand Songis 2e6570e209 New script to check AVR firmware size, as it seems it increased over time in the 'next' branch ... 2016-03-29 21:35:46 +02:00
Bertrand Songis 9762656ad0 Merge pull request #3388 from schwabe/datacopy_backup_union
Also backup members inside unions,
2016-03-29 21:31:25 +02:00
Bertrand Songis f2eadf0ff0 [Horus] Introduction of a button to remove an existing view 2016-03-29 20:09:24 +02:00
Arne Schwabe 90f67cd5ef Fix crash of simulator if directory does not exist. 2016-03-29 19:04:24 +02:00
Bertrand Songis 41b1e1c9bc Merge pull request #3390 from schwabe/companion_osx_build
Fix companion build on OS X
2016-03-29 19:03:06 +02:00
Arne Schwabe fb5feb8a91 Fix companion build on OS X 2016-03-29 18:11:50 +02:00
Arne Schwabe 86076bbf32 Also backup members inside unions,
the code is a bit more complicated since unions can have structs or simple types. Also change Telemetry sensor to be a struct, since a class with all public is identical to a struct in C++
2016-03-29 16:05:32 +02:00
Damjan Adamic c24219cbcd Merge pull request #3389 from schwabe/fix_travis
Fix travis (clang 3.8 -> 3.9)
2016-03-29 16:04:10 +02:00
Arne Schwabe 38dbfd130a Fix travis (clang 3.8 -> 3.9) 2016-03-29 15:17:01 +02:00
Bertrand Songis a6a07e9714 [Horus] Speedup when switching from the main view to any other menu 2016-03-28 23:18:32 +02:00
Bertrand Songis ed30b5a8ed [Horus] USB icon only displayed when USB plugged 2016-03-28 23:17:55 +02:00
Bertrand Songis 83a7859f6f Cosmetics 2016-03-28 23:17:20 +02:00
Bertrand Songis 6a2e26272e [Horus] Unused code removed 2016-03-28 23:16:22 +02:00
Bertrand Songis be1526a86d Cosmetics 2016-03-28 20:57:01 +02:00
Bertrand Songis 554f230696 Prevent from using the internal module when there is a Crossfire module plugged into the bay 2016-03-28 20:56:48 +02:00