From 9ffa5a665a2ac8b887cbd9383eab1947137f0def Mon Sep 17 00:00:00 2001
From: Helen Oleynikova <helenoleynikova@gmail.com>
Date: Wed, 5 Mar 2014 10:56:58 +0100
Subject: Set the mavlink port settings back to ttyS1 by default.

---
 ROMFS/px4fmu_common/init.d/rcS | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'ROMFS/px4fmu_common')

diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS
index af78162ed..1baac0eb3 100644
--- a/ROMFS/px4fmu_common/init.d/rcS
+++ b/ROMFS/px4fmu_common/init.d/rcS
@@ -387,7 +387,7 @@ then
 		mavlink start -b 230400 -d /dev/ttyACM0 
 		usleep 5000
 	else
-		if [ $TTYS1_BUSY == yes ]
+		if [ $TTYS1_BUSY == yes -o $ARDRONE == yes]
 		then
 			# Start MAVLink on ttyS0, because FMU ttyS1 pins configured as something else
 			mavlink start -d /dev/ttyS0
@@ -397,10 +397,8 @@ then
 			set EXIT_ON_END yes
 		else
 			# Start MAVLink on default port: ttyS1
-			mavlink start -d /dev/ttyS0
+			mavlink start
 			usleep 5000
-
-			set EXIT_ON_END yes
 		fi
 	fi
 	
-- 
cgit v1.2.3