From 4703f22d4e0fa681043a77510903bef56c298b86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beat=20K=C3=BCng?= Date: Tue, 7 Aug 2018 09:54:18 +0200 Subject: [PATCH] mixers: remove unnecessary output settings (reduce flash usage) --- ROMFS/px4fmu_common/mixers/standard_vtol_hitl.main.mix | 6 ++---- ROMFS/px4fmu_common/mixers/tilt_quad.aux.mix | 4 ---- ROMFS/px4fmu_common/mixers/tilt_quad.main.mix | 4 ---- ROMFS/px4fmu_common/mixers/uuv_quad_x.mix | 6 ++---- 4 files changed, 4 insertions(+), 16 deletions(-) diff --git a/ROMFS/px4fmu_common/mixers/standard_vtol_hitl.main.mix b/ROMFS/px4fmu_common/mixers/standard_vtol_hitl.main.mix index 4ac573c47e..29ecd93e26 100644 --- a/ROMFS/px4fmu_common/mixers/standard_vtol_hitl.main.mix +++ b/ROMFS/px4fmu_common/mixers/standard_vtol_hitl.main.mix @@ -1,24 +1,22 @@ Mixer for Standard VTOL (QuadPlane) with motor x configuration (Gazebo HITL) ============================================================================= +# @board px4fmu-v2 exclude + R: 4x 10000 10000 10000 0 # mixer for the pusher/puller throttle M: 1 -O: 10000 10000 0 -10000 10000 S: 1 3 0 20000 -10000 -10000 10000 # mixer for the left aileron M: 1 -O: 10000 10000 0 -10000 10000 S: 1 0 10000 10000 0 -10000 10000 # mixer for the right aileron M: 1 -O: 10000 10000 0 -10000 10000 S: 1 0 -10000 -10000 0 -10000 10000 # mixer for the elevator M: 1 -O: 10000 10000 0 -10000 10000 S: 1 1 10000 10000 0 -10000 10000 diff --git a/ROMFS/px4fmu_common/mixers/tilt_quad.aux.mix b/ROMFS/px4fmu_common/mixers/tilt_quad.aux.mix index bd29db6025..5a58619e96 100644 --- a/ROMFS/px4fmu_common/mixers/tilt_quad.aux.mix +++ b/ROMFS/px4fmu_common/mixers/tilt_quad.aux.mix @@ -11,25 +11,21 @@ This file defines the aux outputs mixer for a Tilt-quadrotor in the + configurat Servo 1 M: 1 -O: 10000 10000 0 -10000 10000 S: 0 1 -1000 -1000 0 -10000 10000 Servo 2 M: 1 -O: 10000 10000 0 -10000 10000 S: 0 1 1000 1000 0 -10000 10000 Servo 3 M: 2 -O: 10000 10000 0 -10000 10000 S: 0 2 -10000 -10000 0 -10000 10000 S: 3 5 10000 10000 0 -10000 10000 Servo 4 M: 2 -O: 10000 10000 0 -10000 10000 S: 0 2 10000 10000 0 -10000 10000 S: 3 5 10000 10000 0 -10000 10000 diff --git a/ROMFS/px4fmu_common/mixers/tilt_quad.main.mix b/ROMFS/px4fmu_common/mixers/tilt_quad.main.mix index a5688d34c7..f5047516d7 100644 --- a/ROMFS/px4fmu_common/mixers/tilt_quad.main.mix +++ b/ROMFS/px4fmu_common/mixers/tilt_quad.main.mix @@ -11,27 +11,23 @@ This file defines the main outputs mixer for a Tilt-quadrotor in the + configura Motor 1 M: 2 -O: 10000 10000 0 -10000 10000 S: 0 1 10000 10000 0 -10000 10000 S: 0 3 10000 10000 0 -10000 10000 Motor 2 M: 2 -O: 10000 10000 0 -10000 10000 S: 0 0 10000 10000 0 -10000 10000 S: 0 3 10000 10000 0 -10000 10000 Motor 3 M: 2 -O: 10000 10000 0 -10000 10000 S: 0 1 -10000 -10000 0 -10000 10000 S: 0 3 10000 10000 0 -10000 10000 Motor 4 M: 2 -O: 10000 10000 0 -10000 10000 S: 0 0 -10000 -10000 0 -10000 10000 S: 0 3 10000 10000 0 -10000 10000 diff --git a/ROMFS/px4fmu_common/mixers/uuv_quad_x.mix b/ROMFS/px4fmu_common/mixers/uuv_quad_x.mix index 9f808e5b6b..f16992f4e8 100644 --- a/ROMFS/px4fmu_common/mixers/uuv_quad_x.mix +++ b/ROMFS/px4fmu_common/mixers/uuv_quad_x.mix @@ -1,23 +1,21 @@ +# @board px4fmu-v2 exclude + M: 4 -O: 10000 10000 0 -10000 10000 S: 0 0 -10000 -10000 0 -10000 10000 S: 0 1 -10000 -10000 0 -10000 10000 S: 0 2 +10000 +10000 0 -10000 10000 S: 0 3 +10000 +10000 0 -10000 10000 M: 4 -O: 10000 10000 0 -10000 10000 S: 0 0 +10000 +10000 0 -10000 10000 S: 0 1 -10000 -10000 0 -10000 10000 S: 0 2 -10000 -10000 0 -10000 10000 S: 0 3 +10000 +10000 0 -10000 10000 M: 4 -O: 10000 10000 0 -10000 10000 S: 0 0 -10000 -10000 0 -10000 10000 S: 0 1 +10000 +10000 0 -10000 10000 S: 0 2 -10000 -10000 0 -10000 10000 S: 0 3 +10000 +10000 0 -10000 10000 M: 4 -O: 10000 10000 0 -10000 10000 S: 0 0 +10000 +10000 0 -10000 10000 S: 0 1 +10000 +10000 0 -10000 10000 S: 0 2 +10000 +10000 0 -10000 10000