aboutsummaryrefslogtreecommitdiff
path: root/ROMFS
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2014-03-23 13:42:27 +0100
committerLorenz Meier <lm@inf.ethz.ch>2014-03-23 13:42:27 +0100
commit15bab106b7202543bbbebd5b48fafe73edfa7b80 (patch)
treeaadc508ef134b5ad977800cea29835c91aeebefd /ROMFS
parentdf11310994fc983bc9faab54d107be81aa133ce3 (diff)
parent87dfdef69b016a0fe88070c7e2fc63375f560b1d (diff)
downloadpx4-firmware-15bab106b7202543bbbebd5b48fafe73edfa7b80.tar.gz
px4-firmware-15bab106b7202543bbbebd5b48fafe73edfa7b80.tar.bz2
px4-firmware-15bab106b7202543bbbebd5b48fafe73edfa7b80.zip
Merge branch 'master' of github.com:PX4/Firmware into paul_estimator_numeric
Diffstat (limited to 'ROMFS')
-rw-r--r--ROMFS/px4fmu_common/init.d/2103_skyhunter_18005
-rw-r--r--ROMFS/px4fmu_common/init.d/3033_wingwing2
-rw-r--r--ROMFS/px4fmu_common/init.d/rc.autostart6
3 files changed, 12 insertions, 1 deletions
diff --git a/ROMFS/px4fmu_common/init.d/2103_skyhunter_1800 b/ROMFS/px4fmu_common/init.d/2103_skyhunter_1800
new file mode 100644
index 000000000..9bc0262d8
--- /dev/null
+++ b/ROMFS/px4fmu_common/init.d/2103_skyhunter_1800
@@ -0,0 +1,5 @@
+#!nsh
+
+sh /etc/init.d/rc.fw_defaults
+
+set MIXER FMU_AET
diff --git a/ROMFS/px4fmu_common/init.d/3033_wingwing b/ROMFS/px4fmu_common/init.d/3033_wingwing
index 7ff381d97..6e1a531cf 100644
--- a/ROMFS/px4fmu_common/init.d/3033_wingwing
+++ b/ROMFS/px4fmu_common/init.d/3033_wingwing
@@ -27,7 +27,7 @@ then
param set FW_PR_IMAX 0.2
param set FW_PR_P 0.06
param set FW_RR_FF 0.6
- param set FW_RR_IMA 0.2
+ param set FW_RR_IMAX 0.2
param set FW_RR_P 0.09
param set FW_THR_CRUISE 0.65
fi
diff --git a/ROMFS/px4fmu_common/init.d/rc.autostart b/ROMFS/px4fmu_common/init.d/rc.autostart
index 4ae6a2794..5ec735d39 100644
--- a/ROMFS/px4fmu_common/init.d/rc.autostart
+++ b/ROMFS/px4fmu_common/init.d/rc.autostart
@@ -68,6 +68,12 @@ then
set MODE custom
fi
+if param compare SYS_AUTOSTART 2103 103
+then
+ sh /etc/init.d/2103_skyhunter_1800
+ set MODE custom
+fi
+
#
# Flying wing
#