1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-13 03:19:53 +03:00
Commit graph

290 commits

Author SHA1 Message Date
3djc
0a5c3d5969 Merge branch '2.3' into 2.4 2021-04-15 10:48:46 +02:00
3djc
88c476af22 Fix T8 testing 2021-04-15 08:40:17 +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
e1e097d429 Disable commit-tests for AR9X, 9XPRO and SKY9X in synced branch for now 2021-01-26 11:50:47 +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
3djc
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
bf56cb867e
Merge with latest 2.4 2021-01-12 17:21:45 +01:00
Bertrand Songis
a02bf3aa0c
Merge with latest 2.3 2021-01-12 17:16:15 +01:00
3djc
fe475b11b1 Add some language testing to Travis 2021-01-10 10:55:22 +01:00
3djc
87c9cfa610 Update 2021-01-10 08:23:48 +01:00
3djc
e9c9fcda14 Improve build files 2020-12-22 08:53:10 +01:00
3djc
860b50faae Improve build files 2020-12-21 19:28:05 +01:00
3djc
cda66fa13b Fix CN and TW 2020-12-19 09:09:11 +01:00
3djc
7d2178cb5c fix chars continued 2020-12-18 20:37:11 +01:00
3djc
cd589bc28d fix chars 2020-12-17 18:05:19 +01:00
3djc
23e1531c72 patch special chars 2020-11-27 11:18:57 +01:00
3djc
24f93a7cbe
3djc/2.4 add 2.3 pr (#8099) 2020-11-19 16:32:50 +01:00
3djc
7198aaa195 Increase testing coverage 2020-11-15 10:54:16 +01:00
3djc
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
e1e67a9d8c
Add support for radiomaster TX12 (#8080)
* Add tx12 support
2020-11-14 11:48:46 +01:00
Bertrand Songis
42a3198568
Merge with latest 2.3 2020-10-07 21:01:45 +02:00
Anton Haglund
8a93eb8461
Add tool: clang-format.sh (#7940)
Signed-off-by: anton <haglundanton+github@gmail.com>
2020-09-25 12:56:51 +02:00
3djc
0f13580f3d Add missing radios
This fixes #7789
2020-07-03 19:36:15 +02:00
3djc
a2b6150934 Increase travis coverage 2020-06-24 13:31:46 +02:00
Bertrand Songis
8c7a3eabd0
Frsky production script updated. Compilation fixes 2020-06-24 12:42:51 +02:00
Bertrand Songis
77f4c18f4c
Frsky production script updated 2020-06-24 12:14:46 +02:00
3djc
2d01916055
Preliminary T18 support (#7581) 2020-06-22 21:15:47 +02:00
Bertrand Songis
71ec1db9f6
Merge with latest 2.3 2020-06-18 11:14:07 +02:00
Bertrand Songis
2a8c1f914d
FrSky build script updated (new boards added) 2020-06-10 12:16:50 +02:00
3djc
8273c41ae9 Please Travis after font fixes 2020-06-01 19:31:59 +02:00
Bertrand Songis
bddccb9765
Merge with latest 2.3 2020-05-30 11:57:03 +02:00
3djc
c14b5079d3 Add x7 access simu to mac companion 2020-05-06 19:24:48 +02:00
3djc
5c25703142 Further improvements 2020-04-29 20:05:29 +02:00
Bertrand Songis
44e3e34602
Merge with latest 2.3 2020-03-25 12:33:53 +01:00
3djc
c78bd08be3 Adjust CPU usage on nightly server 2020-03-20 08:47:40 +01:00
Bertrand Songis
1e25fba4ba
Merge branch '2.3' into 2.4 2020-03-19 22:17:13 +01:00
3djc
47e70e6277 Radiomaster production firmware build tool 2020-03-19 11:40:34 +01:00
Bertrand Songis
6878ae4a9f
Merge with latest 2.3 2020-03-05 10:43:01 +01:00
Kilrah
8adcd73c18 Force opening CN chars file as utf-8 on Windows 2020-02-24 15:10:41 +01:00
3djc
e96a76ff76 Fix Travis 2020-02-03 07:51:19 +01:00
3djc
b7523d12f0 Fix TX16S compile, and add more radio to Travis 2020-02-03 07:32:31 +01:00
3djc
128265327e Some TX16S related changes 2020-01-31 09:21:34 +01:00
Bertrand Songis
0626b31dfe
Merge with latest 2.3 2020-01-08 16:35:30 +01:00
3djc
462ba50b03 Add internalmulti to T16 simu 2020-01-07 07:25:28 +01:00
3djc
838bd2f6a0
Rework warning (#7264) 2020-01-06 10:38:10 +01:00
3djc
5a9c8edf64
Basics for TBS firmware (#7274) 2020-01-06 10:32:26 +01:00