Commit Graph
1965 Commits
Author SHA1 Message Date
3djc e3082756c9 Merge branch '2.3' into 3djc/2.3-synced 2021-03-14 10:51:46 +01:00
RistoandGitHub 7940515a48 telemetry dir pin init missed oType def
Added missing OType definition to telemetry direction pin.
2021-03-13 22:43:26 +01:00
RistoandGitHub 1a4eb0636e Minor comment fix in hal.h (#8361)
Minor comment fix in hal.h for AUX_SERIAL_PWR_GPIO_PIN port and pin.
2021-03-13 17:57:53 +01:00
Bertrand Songis 889f645c1a pushEvent insteado of putEvent 2021-03-12 11:07:31 +01:00
3djcandGitHub b60ba23f1f M-Link telemetry (#8281) 2021-03-10 19:13:36 +01:00
3djc 7613f72ec5 Tidy up 2021-03-10 16:54:01 +01:00
3djc 9b02d354d6 Tidy up 2021-03-09 17:07:32 +01:00
Bertrand Songis bd93dbf1a4 Possibility to remove the fields wrapping within the same form 2021-02-23 12:12:36 +01:00
Bertrand Songis 880ca3db60 Slide improved (keep the energy for multipages scroll) 2021-02-23 10:44:51 +01:00
3djc 41459f180c Merge branch '2.3' into 3djc/2.3-synced 2021-02-16 18:12:56 +01:00
Daniel b9b5ee8a9d Add switch I X9D+2019 2021-02-06 14:58:34 +01:00
Bertrand SongisandGitHub 36469498b0 Merge pull request #8172 from opentx/dgatf/trim_simu_bug
Remove retry timer for set trim on simulator
2021-02-02 16:24:22 +01:00
Bertrand SongisandGitHub 3a2093edaf Merge pull request #8264 from olliw42/owpr-trainersbusfifo
Remove superfluous trainerSbusFifo
2021-02-02 15:15:32 +01:00
3djc 68e0d130d0 Fix some trainer modes missing on Horus 2021-01-31 09:00:32 +01:00
olliw42 452f7b6c6a remove superfluous trainerSbusFifo in aux_serial_driver & horus/trainer_driver 2021-01-31 07:51:41 +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
3djcandGitHub 753842fbaf Jumper T-Lite support (#8230) 2021-01-25 15:36:32 +01:00
3djc 84bb693a53 Fix #if/#endif position (thx Olliw42) 2021-01-24 16:13:45 +01:00
Kilrah 14343ea37c Better battery settings for T-Lite/T8 based on design 2021-01-24 10:06:12 +01:00
3djc 9559f34630 Cosmetics 2021-01-21 13:02:06 +01:00
Daniel ef1fea95f2 Remove retry timer for set trim 2021-01-21 09:24:12 +01:00
3djc d7c53fa3a4 Improve serial LUA 2021-01-20 18:14:28 +01:00
3djc 274a7e96d4 Cosmetics 2021-01-20 08:12:15 +01:00
3djc be4c3c2824 Compilation fix 2021-01-19 16:35:55 +01:00
3djc b90cfb7675 Cosmetics 2021-01-19 16:14:46 +01:00
3djcandGitHub c38e513c7e Allow setting serial baurate for LUA (#8228) 2021-01-19 14:57:45 +01:00
3djc af946f1064 Merge branch '2.3' into 3djc/2.3-synced 2021-01-19 09:29:44 +01:00
3djc 8fcc4f7247 Cosmetics 2021-01-18 17:37:50 +01:00
3djc ea6fec611f Fixes
(cherry picked from commit 17e272412e)
2021-01-16 09:05:32 +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 17e272412e Fixes 2021-01-15 18:01:16 +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
3djc 8207413747 Compile fix 2021-01-12 18:00:36 +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 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
Bertrand Songis 00f462d8b5 Cosmetics 2021-01-06 17:42:33 +01:00
Bertrand Songis 7e0272dfde Cosmetics 2021-01-06 17:42:00 +01:00
Bertrand Songis b8c8407be2 Cosmetics 2021-01-06 17:38:27 +01:00
Bertrand SongisandGitHub 8bf4090ad3 Telemetry driver stubs (#8196) 2021-01-04 21:25:42 +01:00
Bertrand SongisandGitHub 2f3349114a Merge pull request #8164 from opentx/bsongis/8159_reboot
Fixes #8159
2021-01-04 17:38:44 +01:00
3djcandGitHub 08e5834433 Use OpenTX VID/PID for USB joystick (#8195) 2021-01-04 10:51:02 +01:00
3djc d583f7536c Fix compilation 2020-12-29 17:25:09 +01:00
3djc 4fabf51864 Fix compilation 2020-12-29 16:31:13 +01:00
3djc 885bd9ceb9 Merge branch 'mixer-scheduler-squash-rebase' into 3djc/2.3-synced 2020-12-21 19:33:07 +01:00
Daniel afe406ec2d Reduce trim timer delay on simulator 2020-12-20 16:35:44 +00:00
3djc bab16c912b Fix DMA SBUS trainer on colorlcd 2020-12-20 13:54:12 +01:00
3djc 7d2178cb5c fix chars continued 2020-12-18 20:37:11 +01:00
Bertrand Songis a95df47384 Fixes #8159
Still not tested, but it doesn't reboot anymore
2020-12-14 19:41:14 +01:00