aboutsummaryrefslogtreecommitdiff
path: root/ROMFS/px4fmu_common
diff options
context:
space:
mode:
authorAnton Babushkin <anton.babushkin@me.com>2014-03-06 17:44:10 +0400
committerAnton Babushkin <anton.babushkin@me.com>2014-03-06 17:44:10 +0400
commit25faf1b8f8716323233d6f966aac65e0c9e8d61a (patch)
tree17d005aa23216a3243f6d29748818597823b5fb0 /ROMFS/px4fmu_common
parenta897c97d955de4873aea1f01f65cab11faab2d3a (diff)
downloadpx4-firmware-25faf1b8f8716323233d6f966aac65e0c9e8d61a.tar.gz
px4-firmware-25faf1b8f8716323233d6f966aac65e0c9e8d61a.tar.bz2
px4-firmware-25faf1b8f8716323233d6f966aac65e0c9e8d61a.zip
ardrone: minor fixes
Diffstat (limited to 'ROMFS/px4fmu_common')
-rw-r--r--ROMFS/px4fmu_common/init.d/4008_ardrone2
-rw-r--r--ROMFS/px4fmu_common/init.d/rcS8
2 files changed, 5 insertions, 5 deletions
diff --git a/ROMFS/px4fmu_common/init.d/4008_ardrone b/ROMFS/px4fmu_common/init.d/4008_ardrone
index 39fe66234..0f98f7b6c 100644
--- a/ROMFS/px4fmu_common/init.d/4008_ardrone
+++ b/ROMFS/px4fmu_common/init.d/4008_ardrone
@@ -32,4 +32,4 @@ fi
set OUTPUT_MODE ardrone
set USE_IO no
-set MIXER skip \ No newline at end of file
+set MIXER skip
diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS
index 7b9ae0995..b1cd919f7 100644
--- a/ROMFS/px4fmu_common/init.d/rcS
+++ b/ROMFS/px4fmu_common/init.d/rcS
@@ -284,7 +284,7 @@ then
fi
if [ $OUTPUT_MODE == fmu -o $OUTPUT_MODE = ardrone ]
then
- echo "[init] Use FMU PWM as primary output"
+ echo "[init] Use FMU as primary output"
if fmu mode_$FMU_MODE
then
echo "[init] FMU mode_$FMU_MODE started"
@@ -299,7 +299,7 @@ then
then
set TTYS1_BUSY yes
fi
- if [ $FMU_MODE == pwm_gpio ]
+ if [ $FMU_MODE == pwm_gpio -o $OUTPUT_MODE == ardrone ]
then
set TTYS1_BUSY yes
fi
@@ -372,7 +372,7 @@ then
then
set TTYS1_BUSY yes
fi
- if [ $FMU_MODE == pwm_gpio ]
+ if [ $FMU_MODE == pwm_gpio -o $OUTPUT_MODE == ardrone ]
then
set TTYS1_BUSY yes
fi
@@ -392,7 +392,7 @@ then
mavlink start -b 230400 -d /dev/ttyACM0
usleep 5000
else
- if [ $TTYS1_BUSY == yes -o $OUTPUT_MODE == ardrone ]
+ if [ $TTYS1_BUSY == yes ]
then
# Start MAVLink on ttyS0, because FMU ttyS1 pins configured as something else
mavlink start -d /dev/ttyS0