 richardclliandGitHub
|
2f54a629a2
|
Merge pull request #289 from EdgeTX/2.4
Merge from 2.4 bug fixes
|
2021-06-21 15:45:44 +08:00 |
|
Raphael Coeffic
|
c55d915d56
|
Fixed MPM proto subtype reset on subtype change
|
2021-06-15 06:15:53 +02:00 |
|
Raphael Coeffic
|
33d8267489
|
Merge branch '2.3' into 2.4
# Conflicts:
# radio/src/datastructs.h
|
2021-06-10 17:31:39 +02:00 |
|
Richard Li
|
cc92f25046
|
Fixed NV14 build, added flysky build script and target in build-gh.sh
|
2021-06-09 16:10:45 +08:00 |
|
 Raphael CoefficandRaphael Coeffic
|
f5bc9f2124
|
Added missing include
|
2021-05-29 13:31:50 +02:00 |
|
 Raphael CoefficandRaphael Coeffic
|
343073cfed
|
Set mixer scheduler period to 0 in stopPulsesXxxxModule()
|
2021-05-19 22:22:14 +02:00 |
|
Raphael Coeffic
|
2f5b522413
|
Merge branch '2.3' into 2.4
|
2021-05-16 12:55:21 +02:00 |
|
3djc
|
dfc84a9b85
|
Fix windows compilation
|
2021-05-07 10:58:39 +02:00 |
|
 
|
c06b789f5c
|
Multi module config support (#8438)
* Multi module configuration
Co-authored-by: Pascal Langer <pascal_langer@yahoo.fr>
|
2021-05-05 15:46:29 +02:00 |
|
 Bertrand SongisandGitHub
|
81c7338ab3
|
Merge pull request #8267 from opentx/wismy/racing_mode_rollback
Wismy/racing mode
|
2021-04-16 17:57:10 +02:00 |
|
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 |
|
Bertrand Songis
|
5d131093ef
|
Merge with latest 2.3
|
2021-04-06 09:40:48 +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 |
|
Bertrand Songis
|
ffa14fc85d
|
PXX2 period wrong for external modules!
|
2021-02-11 17:15:10 +01:00 |
|
Bertrand Songis
|
d219397c60
|
Merge remote-tracking branch 'origin/2.3' into wismy/racing_mode_rollback
|
2021-02-08 21:48:31 +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 |
|
Bertrand Songis
|
c5f3445f04
|
All my comments from the PR fixed. Still missing the Companion part
|
2021-02-01 23:03:15 +01:00 |
|
Bertrand Songis
|
72feef3911
|
All my comments from the PR fixed. Still missing the Companion part
|
2021-02-01 23:02:52 +01:00 |
|
3djc
|
2aeb5f7ae6
|
Ensure module are on after model change
|
2021-02-01 08:49:21 +01:00 |
|
WismyYao
|
744bcab0b9
|
enter racing mode by spec function
|
2021-01-30 13:39:09 +08: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 |
|