Commit Graph
124 Commits
Author SHA1 Message Date
Raphael Coeffic 36bddfb8d2 [color] MPM options: use static options rather than the dynamic ones
This is necessary until a broader solution is found to display real-time info coming from the MPM.
2021-07-19 13:10:53 +02:00
Raphael CoefficandRaphael Coeffic 90bd1b6329 Unify throttle source check/conversion code 2021-07-14 13:54:12 +02:00
3djc efa8f5520b Merge fixes 2021-04-08 14:20:25 +02:00
3djc 70d24506da Merge branch '2.3' into 2.4
# Conflicts:
#	radio/src/fonts/480x272/font_dblsize.png
#	radio/src/fonts/480x272/font_xxlsize.png
#	radio/src/gui/128x64/model_setup.cpp
#	radio/src/gui/128x64/radio_setup.cpp
#	radio/src/gui/480x272/model_receiver_options.cpp
#	radio/src/gui/480x272/model_setup.cpp
#	radio/src/gui/480x272/radio_calibration.cpp
#	radio/src/gui/480x272/radio_hardware.cpp
#	radio/src/gui/common/stdlcd/draw_functions.cpp
#	radio/src/gui/gui_common.cpp
#	radio/src/keys.h
#	radio/src/lua/interface.cpp
#	radio/src/pulses/afhds3.h
#	radio/src/rtos.h
#	radio/src/switches.cpp
#	radio/src/targets/common/arm/stm32/aux_serial_driver.cpp
#	radio/src/targets/horus/CMakeLists.txt
#	radio/src/targets/horus/lcd_driver.cpp
#	radio/src/targets/horus/startup_stm32f42_43xxx.s
#	radio/src/targets/taranis/CMakeLists.txt
#	radio/src/telemetry/crossfire.h
#	radio/src/telemetry/multi.cpp
#	radio/src/translations.cpp
#	radio/src/translations/it.h.txt
#	radio/src/translations/untranslated.h
#	radio/util/font2png.py
#	tools/commit-tests.sh
2021-04-08 11:42:28 +02:00
3djc 71d3f19249 Cosmetcis 2021-02-25 16:17:51 +01:00
3djc 5c5683894e Multi : improve options support part 2 2021-02-22 11:45:28 +01:00
3djc 10dadf1f78 Multi : improve options support part 1 2021-02-21 12:25:47 +01:00
3djc d1a60cca8d Multi : support SX1276 power indication and protect against unknown options coming from multi 2021-02-19 16:53:01 +01:00
Bertrand Songis a02bf3aa0c Merge with latest 2.3 2021-01-12 17:16:15 +01:00
MRC3742andGitHub 6da4766e56 MPM Updates (#8197) 2021-01-04 20:27:52 +01:00
Bertrand Songis bae86dc85f Fix 2021-01-04 16:44:26 +01:00
MRC3742andGitHub 014c408698 Updates for MPM version 1.3.1.79 (#8158)
Thanks @MRC3742 !
2020-12-11 16:50:56 +01:00
Danieland3djc 0c2358d35a Delete REa switch from SKY9X 2020-12-10 13:40:53 +01:00
Daniel 3b410fca4f Delete REa switch from SKY9X 2020-12-07 09:48:58 +00:00
3djcGitHub3djc <Th1sisfmyofmyo>
87cd9047b1 2.4 continued (#8092)
Quite a bit of work on 2.4

Co-authored-by: 3djc <Th1sisfmyofmyo>
2020-11-14 14:55:37 +04:00
3djc 9272029ec2 Fix TX16S compilation when both BT and externalaccessmod are defined 2020-10-23 22:03:51 +02:00
Bertrand Songis 42a3198568 Merge with latest 2.3 2020-10-07 21:01:45 +02:00
3djc d349479cd2 Fix possible EM on TX16S 2020-10-04 18:34:54 +02:00
3djcandGitHub 205ac7a21d Ghost support (#7900) 2020-08-28 15:54:51 +02:00
DanielGeAandGitHub ac9f510005 Check model is off before changing model - Fixes #7715 (#7719)
Check model is off before changing model
2020-07-31 16:27:31 +02:00
3djcandGitHub 0eb203e827 Tx16s sbus in (#7787)
Enable SBUS trainer input
2020-07-07 15:56:18 +02:00
3djc b50ec5355a Multi DSM string clarification 2020-07-04 10:41:16 +02:00
MRC3742andGitHub 7b01eb0722 Updates for MPM version 1.3.1.24 (#7779) 2020-06-29 07:05:29 +02:00
3djcandGitHub 2d01916055 Preliminary T18 support (#7581) 2020-06-22 21:15:47 +02:00
JakubandGitHub 5bf197439a Support of FRM302 module. (#7533)
AFHDS3 support added
2020-06-22 16:44:35 +02:00
3djc 7906c777ba Fix trainer (needs review) 2020-06-19 09:29:25 +02:00
Bertrand Songis 71ec1db9f6 Merge with latest 2.3 2020-06-18 11:14:07 +02:00
MRC3742andGitHub af58426261 Update MPM to 1.3.1.9 (#7682) 2020-06-15 11:38:55 +02:00
Bertrand Songis bddccb9765 Merge with latest 2.3 2020-05-30 11:57:03 +02:00
MRC3742andGitHub 14cd03a93a Additional MPM 1.3.1.1 support updates (#7635) 2020-05-26 07:30:57 +02:00
3djc 0e84377bf7 Update some multi strings 2020-05-08 15:44:29 +02:00
3djc 114fd2c4f3 Better sky9x fix 2020-04-28 16:13:17 +02:00
3djc a1a266093d improve fix 2020-04-25 15:52:30 +02:00
3djc 650acb6c8b Fix 2020-04-25 15:48:26 +02:00
3djcandGitHub 9c632b582d Streamline multi interface (#7524) 2020-04-21 14:53:33 +02:00
5e2fc7f1ae Multi: Enable D8, D16v1 and D16v2.1 TX clone mode (#7516)
* Clone mode

* Switch table from octal to hex

* Revert change to octal as requested by 3djc

* Changing to Cloned to please 3djc ;-)

* Minimum Multi version: 1.3.0.87

* Cosmetics

* Cosmetics

* Add cloned to X2

Co-authored-by: Pascal Langer <planger@mathworks.com>
Co-authored-by: 3djc <lesitewebdejc@hotmail.com>
2020-04-13 11:39:59 +02:00
c11b565f03 Support for Multi FrSky 2.1.x (#7472)
* FRSKY X2.1 support

* String fixes

* Cosmetics

* Improve 128 multi GUI

* Improve 128 internal multi GUI

* Improve 1212 multi GUI

* Fix

* Adjust multi upgrade version warning

* Cosmetics

* Cosmetics

* Cosmetics

Co-authored-by: Kilrah <kilrah@andrebernet.ch>
2020-03-29 21:02:29 +02:00
3djcandGitHub 2fb3d977a9 Trainer UI (#7423)
Trainer UI
2020-03-06 15:47:34 +01:00
Bertrand Songis 0626b31dfe Merge with latest 2.3 2020-01-08 16:35:30 +01:00
ea11335273 D16 bind option (#7218)
D16  bind option, and several fixes that give MULTI live data priority vs OpenTX stored multi definitions

Co-authored-by: pascallanger <pascal_langer@yahoo.fr>
2019-12-27 09:42:13 +01:00
Bertrand SongisandGitHub 4249c04742 Bsongis/trainer sbus x9e (#7227)
Fixex #5636
2019-12-23 11:10:19 +01:00
3djc 4b11cd4dc7 FlySky is not a valid external module 2019-12-15 11:13:17 +01:00
Bertrand Songis 4c484017a4 Merge from 2.3 2019-12-05 09:29:11 +01:00
pascallangerandBertrand Songis b50c977dc9 Add TXRSSI and TXLQI sensors to FrSky D8/D16/LBT when using MULTI (#7128)
Add TXRSSI and TXLQI sensors to FrSky D8/D16/LBT when using MULTI
2019-12-03 16:46:12 +01:00
3djcandGitHub 3a7e006635 Support new Multi 1.3 features (#7077) 2019-11-15 16:20:24 +01:00
3djc 3586fbb4a1 Test fix #7078 2019-11-12 15:14:01 +01:00
Bertrand Songis 071116afeb Merge with latest 2.3 2019-11-07 15:04:45 +01:00
Bertrand Songis 3f0ce109ad Fixes #7027 2019-11-07 13:39:38 +01:00
Bertrand Songis 9b05060a1a Fixes #7036 2019-11-07 12:22:35 +01:00
Raphael Coefficand3djc 54bb04f049 New multi protocols (#6920)
* New Multi protocols

Scanner
FrSkyX RX
Flyskys AFHDS2A RX

* Skip Multi/Scanner protocol

* added new protocols in companion
2019-10-10 15:29:39 +02:00