aboutsummaryrefslogtreecommitdiff
path: root/ROMFS
diff options
context:
space:
mode:
authorRoman Bapst <romanbapst@yahoo.de>2015-01-06 16:29:10 +0100
committerLorenz Meier <lm@inf.ethz.ch>2015-01-06 19:51:04 +0100
commitff932820e341d4eae7e0764719fcbf5555c5da14 (patch)
tree3005f2a9d16f679e540beac18694b8169ba4b0e2 /ROMFS
parent648cb78268b6ce636d8b810c07564e76fedc6089 (diff)
downloadpx4-firmware-ff932820e341d4eae7e0764719fcbf5555c5da14.tar.gz
px4-firmware-ff932820e341d4eae7e0764719fcbf5555c5da14.tar.bz2
px4-firmware-ff932820e341d4eae7e0764719fcbf5555c5da14.zip
use two mixers, one for rotors via px4io and one for elevons via fmu outputs
Diffstat (limited to 'ROMFS')
-rw-r--r--ROMFS/px4fmu_common/mixers/FMU_firefly6_elevons.mix (renamed from ROMFS/px4fmu_common/mixers/FMU_firefly6.mix)7
-rw-r--r--ROMFS/px4fmu_common/mixers/FMU_firefly6_rotors.mix4
2 files changed, 5 insertions, 6 deletions
diff --git a/ROMFS/px4fmu_common/mixers/FMU_firefly6.mix b/ROMFS/px4fmu_common/mixers/FMU_firefly6_elevons.mix
index 598f9f797..9ed6eeed9 100644
--- a/ROMFS/px4fmu_common/mixers/FMU_firefly6.mix
+++ b/ROMFS/px4fmu_common/mixers/FMU_firefly6_elevons.mix
@@ -1,9 +1,4 @@
-# FireFly6 mixer for PX4FMU
-#
-#===========================
-R: 6c 10000 10000 10000 0
-
-# mixer for the elevons
+# mixer for the FireFly6 elevons
M: 2
O: 10000 10000 0 -10000 10000
S: 1 0 7500 7500 0 -10000 10000
diff --git a/ROMFS/px4fmu_common/mixers/FMU_firefly6_rotors.mix b/ROMFS/px4fmu_common/mixers/FMU_firefly6_rotors.mix
new file mode 100644
index 000000000..3e1d9d7a3
--- /dev/null
+++ b/ROMFS/px4fmu_common/mixers/FMU_firefly6_rotors.mix
@@ -0,0 +1,4 @@
+# FireFly6 mixer for PX4FMU
+#
+#===========================
+R: 6c 10000 10000 10000 0