aboutsummaryrefslogtreecommitdiff
path: root/ROMFS
diff options
context:
space:
mode:
authorAnton Babushkin <anton.babushkin@me.com>2014-01-08 15:44:24 +0100
committerAnton Babushkin <anton.babushkin@me.com>2014-01-08 15:44:24 +0100
commit8d7620c3cbe86414b84917350bcc99b65cef9b0d (patch)
tree53214fb17061a4e5c3f3405330f7d8b37e5af500 /ROMFS
parent255db83e9346469ca7da02675a54b753cfd1a074 (diff)
parent94b539dfddc5a2e293f51058ee5bf0d6ffc78406 (diff)
downloadpx4-firmware-8d7620c3cbe86414b84917350bcc99b65cef9b0d.tar.gz
px4-firmware-8d7620c3cbe86414b84917350bcc99b65cef9b0d.tar.bz2
px4-firmware-8d7620c3cbe86414b84917350bcc99b65cef9b0d.zip
Merge branch 'master' into navigator_new_vector
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 39c8384a7..90f2e2b17 100644
--- a/ROMFS/px4fmu_common/init.d/rcS
+++ b/ROMFS/px4fmu_common/init.d/rcS
@@ -223,7 +223,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
@@ -287,6 +289,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