From ff932820e341d4eae7e0764719fcbf5555c5da14 Mon Sep 17 00:00:00 2001 From: Roman Bapst Date: Tue, 6 Jan 2015 16:29:10 +0100 Subject: [PATCH] use two mixers, one for rotors via px4io and one for elevons via fmu outputs --- .../mixers/{FMU_firefly6.mix => FMU_firefly6_elevons.mix} | 7 +------ ROMFS/px4fmu_common/mixers/FMU_firefly6_rotors.mix | 4 ++++ 2 files changed, 5 insertions(+), 6 deletions(-) rename ROMFS/px4fmu_common/mixers/{FMU_firefly6.mix => FMU_firefly6_elevons.mix} (70%) create mode 100644 ROMFS/px4fmu_common/mixers/FMU_firefly6_rotors.mix diff --git a/ROMFS/px4fmu_common/mixers/FMU_firefly6.mix b/ROMFS/px4fmu_common/mixers/FMU_firefly6_elevons.mix similarity index 70% rename from ROMFS/px4fmu_common/mixers/FMU_firefly6.mix rename to ROMFS/px4fmu_common/mixers/FMU_firefly6_elevons.mix index 598f9f797d..9ed6eeed91 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 0000000000..3e1d9d7a34 --- /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