aboutsummaryrefslogtreecommitdiff
path: root/ROMFS
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2014-01-07 22:42:09 +0100
committerLorenz Meier <lm@inf.ethz.ch>2014-01-07 22:42:09 +0100
commitab407a82bad3da5c7f4912f78dd69d466a4b4e0d (patch)
tree3e069225e4a438acd65f511527f0720beac626de /ROMFS
parent138b2890c4a874a82aff33df8e5ea37bd3a74e35 (diff)
parentc463fde0b95eb07a5f2792032d24fbda8626b808 (diff)
downloadpx4-firmware-ab407a82bad3da5c7f4912f78dd69d466a4b4e0d.tar.gz
px4-firmware-ab407a82bad3da5c7f4912f78dd69d466a4b4e0d.tar.bz2
px4-firmware-ab407a82bad3da5c7f4912f78dd69d466a4b4e0d.zip
Merge branch 'master' into mount_tests
Diffstat (limited to 'ROMFS')
-rw-r--r--ROMFS/px4fmu_common/init.d/rcS11
1 files changed, 10 insertions, 1 deletions
diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS
index f122921c5..66cb3f237 100644
--- a/ROMFS/px4fmu_common/init.d/rcS
+++ b/ROMFS/px4fmu_common/init.d/rcS
@@ -213,7 +213,9 @@ then
# 7000 .. 7999 Hexa +
# 8000 .. 8999 Octo X
# 9000 .. 9999 Octo +
- # 10000 .. 19999 Wide arm / H frame
+ # 10000 .. 10999 Wide arm / H frame
+ # 11000 .. 11999 Hexa Cox
+ # 12000 .. 12999 Octo Cox
if param compare SYS_AUTOSTART 4008 8
then
@@ -277,6 +279,13 @@ then
sh /etc/init.d/rc.octo
set MODE custom
fi
+
+ if param compare SYS_AUTOSTART 12001
+ then
+ set MIXER /etc/mixers/FMU_octo_cox.mix
+ sh /etc/init.d/rc.octo
+ set MODE custom
+ fi
if param compare SYS_AUTOSTART 10015 15
then