borisbstyle
2e81bd0628
Merge pull request #2151 from basdelfos/kissfc-remap-dma-tim17
...
Allow remap motor output to PWM6 on KISS FC with DSHOT enabled
2017-01-17 23:24:01 +01:00
Bas Delfos
afd848e425
Enabled REMAP_TIM17_DMA for KISS FC to use PWM6 as spare motor output
2017-01-17 23:10:46 +01:00
Michael Keller
b3c5980683
Merge pull request #2149 from mikeller/remove_tinybeef3_default_features
...
Removed unsupported default features from TINYBEEF3 target.
2017-01-18 02:30:09 +13:00
mikeller
01b4614656
Removed unsupported default features from TINYBEEF3 target.
2017-01-18 02:28:24 +13:00
Michael Keller
043d858cda
Merge pull request #2148 from mikeller/increase_msp_version
...
Increase MSP version.
2017-01-18 01:21:58 +13:00
mikeller
934fb84202
Increase MSP version.
2017-01-18 01:21:04 +13:00
blckmn
f541a10a5c
Added define for turning on MSP on first UART when option set for custom build.
...
command line for custom firmware: make NAZE OPTIONS=USE_MSP_UART
2017-01-17 13:39:25 +11:00
borisbstyle
704b12f297
Fix FPV angle mix
2017-01-17 00:03:35 +01:00
borisbstyle
b314c36b81
Minor tidy processRcCommand
2017-01-16 22:53:02 +01:00
borisbstyle
5a68276784
Merge branch 'master' of https://github.com/betaflight/betaflight
2017-01-16 22:44:48 +01:00
J Blackman
e539200e67
Merge pull request #2143 from betaflight/fix-transponder-hardfault
...
Prevent hard-fault when no IO available for transponder.
2017-01-17 08:00:41 +11:00
Hydra
3c29725672
Prevent hard-fault when no IO available for transponder.
...
This cleans up the transponder api too.
2017-01-16 19:27:20 +00:00
Michael Keller
cd156dd685
Merge pull request #2141 from mikeller/change_aioracerf3_motor_timer
...
Fixes for AIORACERF3 target.
2017-01-17 08:12:52 +13:00
mikeller
720db640ae
Fixes for AIORACERF3 target.
2017-01-17 08:08:37 +13:00
J Blackman
b7caf6f85e
Merge pull request #2139 from jflyper/bfdev-remove-merge-artifact
...
Remove merge artifacts
2017-01-17 05:02:47 +11:00
jflyper
50d21cd991
Remove merge artifacts
2017-01-17 02:56:53 +09:00
borisbstyle
80f9e9dcb9
Merge pull request #2137 from raphaelcoeffic/tramp-vtx-common
...
tramp: implemented VTX common interface.
2017-01-16 17:33:00 +01:00
borisbstyle
663206debf
Merge pull request #2136 from AndersHoglund/fic_cppcheck_issues
...
Fix cppcheck error, uninitialized var.
2017-01-16 17:26:42 +01:00
Raphael Coeffic
1768c1fda8
tramp: implemented VTX_COMMON interface.
2017-01-16 17:18:10 +01:00
Anders Hoglund
69e898a5f2
Fix cppcheck error, uninitialized var.
2017-01-16 16:52:39 +01:00
borisbstyle
94aa14889e
Bump EEPROM and MSP
2017-01-16 16:24:49 +01:00
borisbstyle
584d96ba19
Merge pull request #2135 from jflyper/bfdev-displayport-adjustable-column
...
DISPLAYPORT+CMS: Add displayPortProfile
2017-01-16 16:21:19 +01:00
borisbstyle
bbfb8775c8
Merge pull request #2114 from jflyper/bfdev-vtx-abstraction-1
...
VTX abstraction (testing)
2017-01-16 16:19:05 +01:00
jflyper
2e0e4562be
Fix power table lookup issue
2017-01-17 00:14:09 +09:00
jflyper
f565138101
Touch-ups
2017-01-16 22:59:33 +09:00
jflyper
1d8018f547
Rebase + touch-up
...
Includes fix for SmartAudio CMS behavior
2017-01-16 22:32:59 +09:00
borisbstyle
b60bc0a2e1
Merge pull request #2106 from raphaelcoeffic/tramp-raf
...
IRC Tramp VTX support (continued)
2017-01-16 13:25:07 +01:00
borisbstyle
bbbcc62196
Add softserial back to NAZE target
2017-01-16 12:36:23 +01:00
Raphael Coeffic
9681929f98
tramp: re-enabled temperature support
...
Temps have been measured right on the STM32F031G6 located on the surface of the Tramp and seem to be quite accurate. Above 104C, it starts to trickle the power down.
2017-01-16 12:00:36 +01:00
jflyper
d33977a506
Add displayPortProfile
2017-01-16 19:37:40 +09:00
borisbstyle
149ec6df85
Merge pull request #2119 from raphaelcoeffic/cms_osd_pid
...
added PID OSD elements to CMS
2017-01-16 10:57:15 +01:00
borisbstyle
2bf484c960
Merge pull request #2134 from AndersHoglund/cc3d_vcp_startup
...
Moved enabling of USB interpt after USB_init, for F1 and F3.
2017-01-16 10:56:54 +01:00
Anders Hoglund
08f7a372b7
Moved enabling of USB interpt after USB_init, for F1 and F3.
2017-01-16 10:16:17 +01:00
borisbstyle
7acaf05b15
Merge pull request #2130 from blckmn/patch
...
Ensure sport portOptions is initialised.
2017-01-16 07:54:27 +01:00
blckmn
82efaba226
Moving portOptions declaration
2017-01-16 13:24:38 +11:00
blckmn
258ae30210
Ensure sport portOptions is initialised.
2017-01-16 12:55:00 +11:00
Raphael Coeffic
47bbd46c88
added conditional debug (TRAMP_DEBUG)
2017-01-15 23:26:08 +01:00
Raphael Coeffic
af72b761b5
fixed pre-processor directives (continued)
2017-01-15 23:18:38 +01:00
Michael Keller
a096b72b68
Merge pull request #2125 from mikeller/fix_unused_variable_warning
...
Fixed 'unused variable' warning in 'fc_msp'.
2017-01-16 07:43:22 +13:00
Raphael Coeffic
99cff4a875
some clean-up work (@ledvinap comments)
2017-01-15 18:34:14 +01:00
Raphael Coeffic
07659576b1
fixed pre-processor directives
2017-01-15 14:11:49 +01:00
mikeller
10d475c3c9
Fixed 'unused variable' warning in 'fc_msp'.
2017-01-16 00:40:46 +13:00
Raphael Coeffic
c29f8a79ed
use separate serial functions for SmartAudio and Tramp.
2017-01-15 12:22:18 +01:00
Raphael Coeffic
56c8fb0183
re-enabled VTX_SMARTAUDIO
2017-01-15 12:21:51 +01:00
Raphael Coeffic
c74e4f9a5c
fixed missing include
2017-01-15 12:20:39 +01:00
Raphael Coeffic
dddd09ae87
tramp: moved common definitions to vtx_common
2017-01-15 11:59:44 +01:00
jflyper
b1e1c7ef7b
Some changes to "When" changes take effect.
2017-01-15 16:06:38 +09:00
Michael Keller
8c571aff9e
Merge pull request #2104 from mikeller/add_support_for_multiple_inverters
...
Added support for multiple serial inverters.
2017-01-15 14:14:50 +13:00
Michael Keller
e80c104c04
Merge pull request #2102 from mikeller/remove_midrc_validation
...
Remove validation for 'mid_rc', since it is not done in MSP_SET_RX_CONFIG.
2017-01-15 14:14:30 +13:00
Michael Keller
3d26421e7e
Merge pull request #2098 from mikeller/cleanup_minimal_diff_dump
...
Cleaned up output of diff / dump when CLI_MINIMAL_VERBOSITY is on.
2017-01-15 14:14:16 +13:00