Commit Graph
122 Commits
Author SHA1 Message Date
Raphael CoefficandRaphael Coeffic fcf9683f2d NAVIGATION_HORUS does not exist anymore
Use COLORLCD instead.
2021-05-06 12:55:59 +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 84387e7e0f Cosmetics 2021-04-05 11:16:17 +02:00
3djc e3082756c9 Merge branch '2.3' into 3djc/2.3-synced 2021-03-14 10:51:46 +01:00
3djc 71d3f19249 Cosmetcis 2021-02-25 16:17:51 +01:00
3djc 10dadf1f78 Multi : improve options support part 1 2021-02-21 12:25:47 +01:00
Bertrand Songis a02bf3aa0c Merge with latest 2.3 2021-01-12 17:16:15 +01:00
3djc 885bd9ceb9 Merge branch 'mixer-scheduler-squash-rebase' into 3djc/2.3-synced 2020-12-21 19:33:07 +01:00
3djc fbe294c378 Fix multi subprotocol sometimes not showing 2020-12-12 11:02:35 +01:00
Raphael Coeffic 02660c763a mixer scheduler 2020-12-09 07:24:27 +01:00
Bertrand Songis 2e4a93b968 Warning fix 2020-12-08 09:49:04 +01: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
JakubandGitHub 527d9d6793 Fixed output configuration for AFHDS3 (#8020) 2020-10-16 16:36:54 +02:00
Bertrand Songis 42a3198568 Merge with latest 2.3 2020-10-07 21:01:45 +02:00
DanielGeAandGitHub 869f8127ec Add cursor to custom curves - Closes #6399 (#7707)
Add cursor to custom curves
Refactor functions declaration
Cosmetics
2020-09-22 17:49:15 +02:00
3djcandGitHub 3dfb27f220 Add rx num handling to CRSF (#7881) 2020-08-28 17:01:13 +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
JakubandGitHub 5bf197439a Support of FRM302 module. (#7533)
AFHDS3 support added
2020-06-22 16:44:35 +02:00
Bertrand Songis 71ec1db9f6 Merge with latest 2.3 2020-06-18 11:14:07 +02:00
Bertrand SongisandGitHub 463910c903 Bsongis/navigation issue internal module receiver row (#7726)
Navigation issue (212x64, when internal module is XJT D8): invisible cursor on "Receiver" row
2020-06-15 11:12:52 +02:00
Bertrand Songis 9f41e81fc9 Compilation fix when no multimodule on X9D+ 2020-06-09 11:10:02 +02:00
Bertrand Songis f6ddfb7597 9XR-PRO navigation fixes 2020-06-01 15:24:04 +02:00
Bertrand Songis bddccb9765 Merge with latest 2.3 2020-05-30 11:57:03 +02:00
3djc 76821ea93c Multi RX needs bind button too 2020-05-14 13:06:06 +02:00
3djcandGitHub 9c632b582d Streamline multi interface (#7524) 2020-04-21 14:53:33 +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
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
3djc 0f0779b56a Fix winbox compile 2019-12-18 15:27:02 +01:00
3djc 42adcdef87 Fix compilation with MULTI=NO 2019-12-18 11:35:56 +01:00
Bertrand Songis 4c484017a4 Merge from 2.3 2019-12-05 09:29:11 +01:00
3djcandBertrand Songis 7597195229 Improve multi (#7136)
Improve multi
2019-12-03 16:37:14 +01:00
3djcandGitHub 3a7e006635 Support new Multi 1.3 features (#7077) 2019-11-15 16:20:24 +01:00
Bertrand Songis 071116afeb Merge with latest 2.3 2019-11-07 15:04:45 +01:00
Bertrand Songis 9b05060a1a Fixes #7036 2019-11-07 12:22:35 +01:00
Bertrand Songis 7bad66db1c Latest libopenui updates 2019-10-11 19:44:06 +02: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
Bertrand SongisandGitHub aee77ed9e9 Navigation code shared and improved (#6923) 2019-10-10 14:03:49 +02:00
3djcandBertrand Songis 5a317d7ba8 Prevent conflict with trainer on external module (#6846)
Prevent conflict with trainer on external module
2019-10-01 15:01:21 +02:00
Raphael CoefficandRaphael Coeffic 6b12010473 Add T16 support
Added support for:
- T16 radio
- internal multi-protocol module.
- flashing internal and external multi-protocol modules.

Many thx to:
- goebish, for the hardware support.
- qba667, for the original patches for the internal multi-protocol support (UI and serial com).
2019-09-24 22:12:13 +02:00
Bertrand Songis 9e83c5d10f Merge against latest 2.3 2019-09-17 13:28:42 +02:00
Bertrand SongisandGitHub 6c530c6f7b External antenna configuration: proposal for #4285 (#6656)
External antenna configuration
2019-09-06 11:26:18 +02:00
Bertrand SongisandGitHub 13dee00eed Bsongis/rssi from 2 different modules (#6711)
RSSI from 2 different modules
2019-09-05 17:24:48 +02:00
3djc 345d80cd94 Fix multimodule custom 2019-09-01 14:47:47 +02:00
3djc 7e34198d56 Fix multimodule column issue 2019-09-01 14:44:11 +02:00
Bertrand SongisandGitHub 2d4e98d15d Bsongis/ram saving (#6685)
RAM saving. Stacks reduced to have some more RAM available than 2.2 on all boards
2019-08-30 15:46:57 +02:00
Bertrand Songis 3f9a863b00 Telemetry screen cosmetics 2019-08-29 11:51:11 +02:00
Bertrand Songis f4f8893ae9 New UI merged 2019-08-28 20:50:14 +02:00