fixing cherry-picking divergences

This commit is contained in:
Andreas Bircher
2016-06-16 15:40:01 +02:00
committed by Lorenz Meier
parent 6bd17c7ba4
commit 46ec1e6b95
6 changed files with 57 additions and 75 deletions
+2 -2
View File
@@ -537,7 +537,7 @@ then
# Get FMU driver out of the way
set MIXER_AUX none
set AUX_MODE none
camera_trigger start --pwm
camera_trigger start
fi
fi
@@ -606,7 +606,7 @@ then
# Try to get an USB console
nshterm /dev/ttyACM0 &
else
mavlink start -r 80000 -d /dev/ttyACM0 -m config -x
mavlink start -r 800000 -d /dev/ttyACM0 -m config -x
fi
#