From 333ba769eff38872e2d2b0d0c6fff8e5e6b3cdb8 Mon Sep 17 00:00:00 2001 From: Simon Wilks Date: Thu, 6 Aug 2015 08:23:39 +0200 Subject: [PATCH] Don't use the control surface abbreviation but use the actual channel assignment. --- ...5_vtol_AERT_quad => 13005_vtol_AAERT_quad} | 4 ++-- .../{vtol_AERT.aux.mix => vtol_AAERT.aux.mix} | 22 ++++++++++--------- 2 files changed, 14 insertions(+), 12 deletions(-) rename ROMFS/px4fmu_common/init.d/{13005_vtol_AERT_quad => 13005_vtol_AAERT_quad} (91%) rename ROMFS/px4fmu_common/mixers/{vtol_AERT.aux.mix => vtol_AAERT.aux.mix} (71%) diff --git a/ROMFS/px4fmu_common/init.d/13005_vtol_AERT_quad b/ROMFS/px4fmu_common/init.d/13005_vtol_AAERT_quad similarity index 91% rename from ROMFS/px4fmu_common/init.d/13005_vtol_AERT_quad rename to ROMFS/px4fmu_common/init.d/13005_vtol_AAERT_quad index a3e183a84a7..4b8191f557b 100644 --- a/ROMFS/px4fmu_common/init.d/13005_vtol_AERT_quad +++ b/ROMFS/px4fmu_common/init.d/13005_vtol_AAERT_quad @@ -1,6 +1,6 @@ #!nsh # -# @name Generic AERT with Quad VTOL. +# @name Generic AAERT tailplane airframe with Quad VTOL. # # @type Standard VTOL # @@ -36,7 +36,7 @@ fi set MIXER vtol_quad_x set PWM_OUT 12345678 -set MIXER_AUX vtol_AERT +set MIXER_AUX vtol_AAERT set PWM_AUX_RATE 50 set PWM_AUX_OUT 1234 set PWM_AUX_DISARMED 1000 diff --git a/ROMFS/px4fmu_common/mixers/vtol_AERT.aux.mix b/ROMFS/px4fmu_common/mixers/vtol_AAERT.aux.mix similarity index 71% rename from ROMFS/px4fmu_common/mixers/vtol_AERT.aux.mix rename to ROMFS/px4fmu_common/mixers/vtol_AAERT.aux.mix index 260e60840a4..f3e9c423549 100644 --- a/ROMFS/px4fmu_common/mixers/vtol_AERT.aux.mix +++ b/ROMFS/px4fmu_common/mixers/vtol_AAERT.aux.mix @@ -1,18 +1,14 @@ -Mixer for a horizontal format with X-Quad and tractor AERT plane configuration -============================================================================== +Mixer for an AAERT VTOL +======================= -Motor speed mixer ------------------ -M: 1 -O: 10000 10000 0 -10000 10000 -S: 1 3 0 20000 -10000 -10000 10000 - -Aileron mixers --------------- +Aileron 1 mixer +--------------- M: 1 O: 10000 10000 0 -10000 10000 S: 1 0 -7500 -7500 0 -10000 10000 +Aileron 2 mixer +--------------- M: 1 O: 10000 10000 0 -10000 10000 S: 1 0 -7500 -7500 0 -10000 10000 @@ -28,3 +24,9 @@ Rudder mixer M: 1 O: 10000 10000 0 -10000 10000 S: 1 2 -10000 -10000 0 -10000 10000 + +Throttle mixer +-------------- +M: 1 +O: 10000 10000 0 -10000 10000 +S: 1 3 0 20000 -10000 -10000 10000