Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-23 00:05:33 +03:00
Code Issues Wiki Activity

Merge branch 'port-changes' of https://github.com/ledvinap/cleanflight into ledvinap-port-changes

Browse source 
Conflicts:
	src/main/blackbox/blackbox.c
	src/main/io/serial.c
This commit is contained in:
Dominic Clifton 2015-03-09 22:23:04 +01:00
commit bce6c6722c
25 changed files with 162 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/main.c
View file

@ -175,7 +175,7 @@ void init(void)
ledInit();
#ifdef SPEKTRUM_BIND
#ifdef SPEKTRUM_BIND
if (feature(FEATURE_RX_SERIAL)) {
switch (masterConfig.rxConfig.serialrx_provider) {
case SERIALRX_SPEKTRUM1024: