Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-06-01 11:06:04 +08:00
Code Issues Actions 16 Packages Projects Releases Wiki Activity

Merge branch 'autostart_cleanup' into navigator_new_vector

Browse Source
This commit is contained in:
Anton Babushkin
2014-01-18 20:45:33 +01:00
parent eb752b57d9 a9e288dfdd
commit d55ef18c7f
2 changed files with 87 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ROMFS/px4fmu_common/init.d/rc.interface
+1 -1
View File
@@ -33,7 +33,7 @@ then
tone_alarm $TUNE_OUT_ERROR tone_alarm $TUNE_OUT_ERROR
fi fi
else else
echo "[init] Mixer not defined echo "[init] Mixer not defined"
tone_alarm $TUNE_OUT_ERROR tone_alarm $TUNE_OUT_ERROR
fi fi
ROMFS/px4fmu_common/init.d/rcS
+7
View File
@@ -241,7 +241,10 @@ then
if [ $HIL == yes ] if [ $HIL == yes ]
then then
set OUTPUT_MODE hil set OUTPUT_MODE hil
if hw_ver compare PX4FMU_V1
then
set FMU_MODE serial set FMU_MODE serial
fi
else else
# Try to get an USB console if not in HIL mode # Try to get an USB console if not in HIL mode
nshterm /dev/ttyACM0 & nshterm /dev/ttyACM0 &
@@ -257,6 +260,9 @@ then
# #
set TTYS1_BUSY no set TTYS1_BUSY no
# If OUTPUT_MODE == none then something is wrong with setup and we shouldn't try to enable output
if [ $OUTPUT_MODE != none ]
then
if [ $OUTPUT_MODE == io ] if [ $OUTPUT_MODE == io ]
then then
echo "[init] Use PX4IO PWM as primary output" echo "[init] Use PX4IO PWM as primary output"
@@ -366,6 +372,7 @@ then
fi fi
fi fi
fi fi
fi
# #
# MAVLink # MAVLink