Commit Graph
554 Commits
Author SHA1 Message Date
3djc 0a5c3d5969 Merge branch '2.3' into 2.4 2021-04-15 10:48:46 +02:00
3djc b1812ce90c Fix T8 2021-04-15 09:42:41 +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 92fb19d89c Cosmetics 2021-04-05 17:40:55 +02:00
3djc cff8109d5a Cosmetics 2021-04-05 17:38:10 +02:00
3djc 78dd516069 Allow PCBSKY9X compilation 2021-04-04 19:00:01 +02:00
3djc e3082756c9 Merge branch '2.3' into 3djc/2.3-synced 2021-03-14 10:51:46 +01:00
3djc 5c5683894e Multi : improve options support part 2 2021-02-22 11:45:28 +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
3djc 41459f180c Merge branch '2.3' into 3djc/2.3-synced 2021-02-16 18:12:56 +01:00
3djc e4b64b1d0e Fix compilation 2021-02-12 07:03:14 +01:00
3djc bdf9e630ca Improve 2021-02-11 17:27:53 +01:00
3djc b78b457234 Please Travis 2021-02-05 13:17:54 +01:00
3djc 26a5dfe13e Merge branch '2.3' into 3djc/fix-modelchange-module-power 2021-02-03 11:50:30 +01:00
3djc f1e957e466 Improve 2021-02-03 10:42:04 +01:00
3djc 2aeb5f7ae6 Ensure module are on after model change 2021-02-01 08:49:21 +01:00
3djc a706622d99 Fix multi per channel failsafe 2021-01-29 14:55:57 +01:00
3djc 2cdbaba716 Merge branch '2.3' into 3djc/2.3-synced
# Conflicts:
#	radio/src/pulses/pulses.cpp
2021-01-26 11:22:58 +01:00
3djc af946f1064 Merge branch '2.3' into 3djc/2.3-synced 2021-01-19 09:29:44 +01:00
Kilrah c34ed67343 Merge branch '2.3' into 3djc/T-Lite
# Conflicts:
#	companion/src/firmwares/boards.h
#	companion/src/firmwares/opentx/opentxeeprom.h
#	radio/src/gui/common/stdlcd/radio_hardware.cpp
#	radio/src/targets/common/arm/stm32/adc_driver.cpp
#	radio/src/targets/common/arm/stm32/bootloader/CMakeLists.txt
#	radio/src/targets/taranis/board.h
#	radio/src/targets/taranis/hal.h
#	radio/src/targets/taranis/keys_driver.cpp
#	radio/src/targets/taranis/lcd_driver_spi.cpp
2021-01-15 20:17:02 +01:00
3djcandGitHub 1f01fa6d47 Radiomaster T8 (#8219) 2021-01-15 17:19:25 +01:00
3djc 84c86f718b Jumper TLite support 2021-01-14 13:30:54 +01:00
Bertrand Songis a02bf3aa0c Merge with latest 2.3 2021-01-12 17:16:15 +01:00
3djc 65dd3a91c2 Merge branch '2.3' into 3djc/2.3-synced
# Conflicts:
#	CREDITS.txt
#	radio/src/targets/sky9x/board.h
2021-01-08 17:50:20 +01:00
MRC3742andGitHub 6da4766e56 MPM Updates (#8197) 2021-01-04 20:27:52 +01:00
3djc 885bd9ceb9 Merge branch 'mixer-scheduler-squash-rebase' into 3djc/2.3-synced 2020-12-21 19:33:07 +01:00
MRC3742andGitHub 014c408698 Updates for MPM version 1.3.1.79 (#8158)
Thanks @MRC3742 !
2020-12-11 16:50:56 +01:00
Raphael Coeffic 1c33efac9f fixed AFHDS3 taranis external module 2020-12-09 07:24:28 +01:00
Raphael Coeffic e2fb0522cd fixed pxx1 driver 2020-12-09 07:24:28 +01:00
Raphael Coeffic e00224fea1 fix SBUS rate adjustment 2020-12-09 07:24:27 +01:00
Raphael Coeffic 931743af44 init_intmodule_heartbeat 2020-12-09 07:24:27 +01:00
Raphael Coeffic 8247a05438 debugging crsfshot... 2020-12-09 07:24:27 +01:00
Raphael Coeffic 02660c763a mixer scheduler 2020-12-09 07:24:27 +01:00
Bertrand Songis 27abd4e7d5 XJT Lite telemetry broken 2020-12-08 10:35:58 +01:00
3djc 2dfa8a80ab Fix Ghost menu glitch 2020-11-22 13:52:56 +01:00
3djcandGitHub 88d480e453 Ghost menu basic handling (#8108) 2020-11-22 08:20:41 +01:00
3djcandGitHub 24f93a7cbe 3djc/2.4 add 2.3 pr (#8099) 2020-11-19 16:32:50 +01:00
3djcandGitHub 27e19552c6 Ghost is using LQY for RSSI (#8085)
* Ghost is using LQY for RSSI
2020-11-14 14:57:57 +01:00
3djcandGitHub 4c96dbad4e Add Ghost module config tool (#8090)
* Ghost menu handling
2020-11-14 14:57:33 +01:00
3djcandGitHub c95d1b81ad Handles PPM center with Ghost (#8077) 2020-11-07 12:57:52 +01:00
Bertrand Songis 42a3198568 Merge with latest 2.3 2020-10-07 21:01:45 +02:00
3djc 4db89d5244 Fix #7997 Ext multi spectrum not starting 2020-10-07 10:33:33 +02:00
3djcandGitHub adcdf70f3f Fix X9D 2019 (#7987) 2020-10-04 08:22:26 +02:00
WismyYaoandGitHub b4d8504577 Wismy/fport2 (#7956)
Add Fport2 option
RX6R/RX4R/G-RX8/G-RX6/RXSR  OTA support
2020-09-22 17:44:54 +02:00
3djcandGitHub 159a891ab4 Asym ghost support (#7910) 2020-09-05 08:24:07 +02:00
pascallangerandGitHub 200116257c Changes to allow Lua to access DSM Forward Programming (#7913) 2020-09-02 21:13:58 +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
3djc a58771e2b7 Allow displaying modelID and/or Bind/Range sperately 2020-08-17 10:17:09 +02:00