diff --git a/ROMFS/px4fmu_common/mixers/AERT.main.mix b/ROMFS/px4fmu_common/mixers/AERT.main.mix index 7fed488af1..75e82bb00a 100644 --- a/ROMFS/px4fmu_common/mixers/AERT.main.mix +++ b/ROMFS/px4fmu_common/mixers/AERT.main.mix @@ -62,24 +62,3 @@ range. Inputs below zero are treated as zero. M: 1 O: 10000 10000 0 -10000 10000 S: 0 3 0 20000 -10000 -10000 10000 - - -Gimbal / flaps / payload mixer for last four channels, -using the payload control group ------------------------------------------------------ - -M: 1 -O: 10000 10000 0 -10000 10000 -S: 2 0 10000 10000 0 -10000 10000 - -M: 1 -O: 10000 10000 0 -10000 10000 -S: 2 1 10000 10000 0 -10000 10000 - -M: 1 -O: 10000 10000 0 -10000 10000 -S: 2 2 10000 10000 0 -10000 10000 - -M: 1 -O: 10000 10000 0 -10000 10000 -S: 2 3 10000 10000 0 -10000 10000 diff --git a/ROMFS/px4fmu_common/mixers/AET.main.mix b/ROMFS/px4fmu_common/mixers/AET.main.mix index c73cb2a62d..20cb88b916 100644 --- a/ROMFS/px4fmu_common/mixers/AET.main.mix +++ b/ROMFS/px4fmu_common/mixers/AET.main.mix @@ -58,23 +58,3 @@ range. Inputs below zero are treated as zero. M: 1 O: 10000 10000 0 -10000 10000 S: 0 3 0 20000 -10000 -10000 10000 - - -Gimbal / flaps / payload mixer for last four channels ------------------------------------------------------ - -M: 1 -O: 10000 10000 0 -10000 10000 -S: 0 4 10000 10000 0 -10000 10000 - -M: 1 -O: 10000 10000 0 -10000 10000 -S: 0 5 10000 10000 0 -10000 10000 - -M: 1 -O: 10000 10000 0 -10000 10000 -S: 0 6 10000 10000 0 -10000 10000 - -M: 1 -O: 10000 10000 0 -10000 10000 -S: 0 7 10000 10000 0 -10000 10000 diff --git a/ROMFS/px4fmu_common/mixers/AETR.main.mix b/ROMFS/px4fmu_common/mixers/AETR.main.mix index 8bd3613128..004fad8bd7 100644 --- a/ROMFS/px4fmu_common/mixers/AETR.main.mix +++ b/ROMFS/px4fmu_common/mixers/AETR.main.mix @@ -62,23 +62,3 @@ endpoints to suit. M: 1 O: 10000 10000 0 -10000 10000 S: 0 2 10000 10000 0 -10000 10000 - -Gimbal / flaps / payload mixer for last four channels, -using the payload control group ------------------------------------------------------ - -M: 1 -O: 10000 10000 0 -10000 10000 -S: 2 0 10000 10000 0 -10000 10000 - -M: 1 -O: 10000 10000 0 -10000 10000 -S: 2 1 10000 10000 0 -10000 10000 - -M: 1 -O: 10000 10000 0 -10000 10000 -S: 2 2 10000 10000 0 -10000 10000 - -M: 1 -O: 10000 10000 0 -10000 10000 -S: 2 3 10000 10000 0 -10000 10000 diff --git a/ROMFS/px4fmu_common/mixers/Q.main.mix b/ROMFS/px4fmu_common/mixers/Q.main.mix index b8ecbc879f..95a3d226d3 100644 --- a/ROMFS/px4fmu_common/mixers/Q.main.mix +++ b/ROMFS/px4fmu_common/mixers/Q.main.mix @@ -49,22 +49,3 @@ range. Inputs below zero are treated as zero. M: 1 O: 10000 10000 0 -10000 10000 S: 0 3 0 20000 -10000 -10000 10000 - -Gimbal / flaps / payload mixer for last four channels ------------------------------------------------------ - -M: 1 -O: 10000 10000 0 -10000 10000 -S: 0 4 10000 10000 0 -10000 10000 - -M: 1 -O: 10000 10000 0 -10000 10000 -S: 0 5 10000 10000 0 -10000 10000 - -M: 1 -O: 10000 10000 0 -10000 10000 -S: 0 6 10000 10000 0 -10000 10000 - -M: 1 -O: 10000 10000 0 -10000 10000 -S: 0 7 10000 10000 0 -10000 10000 diff --git a/ROMFS/px4fmu_common/mixers/RET.main.mix b/ROMFS/px4fmu_common/mixers/RET.main.mix index f07c34ac8a..95beb8927c 100644 --- a/ROMFS/px4fmu_common/mixers/RET.main.mix +++ b/ROMFS/px4fmu_common/mixers/RET.main.mix @@ -51,23 +51,3 @@ range. Inputs below zero are treated as zero. M: 1 O: 10000 10000 0 -10000 10000 S: 0 3 0 20000 -10000 -10000 10000 - - -Gimbal / payload mixer for last four channels ------------------------------------------------------ - -M: 1 -O: 10000 10000 0 -10000 10000 -S: 0 4 10000 10000 0 -10000 10000 - -M: 1 -O: 10000 10000 0 -10000 10000 -S: 0 5 10000 10000 0 -10000 10000 - -M: 1 -O: 10000 10000 0 -10000 10000 -S: 0 6 10000 10000 0 -10000 10000 - -M: 1 -O: 10000 10000 0 -10000 10000 -S: 0 7 10000 10000 0 -10000 10000 diff --git a/ROMFS/px4fmu_common/mixers/X5.main.mix b/ROMFS/px4fmu_common/mixers/X5.main.mix index 80e3bac09c..4a3093c2e6 100644 --- a/ROMFS/px4fmu_common/mixers/X5.main.mix +++ b/ROMFS/px4fmu_common/mixers/X5.main.mix @@ -47,22 +47,3 @@ range. Inputs below zero are treated as zero. M: 1 O: 10000 10000 0 -10000 10000 S: 0 3 0 20000 -10000 -10000 10000 - -Gimbal / flaps / payload mixer for last four channels ------------------------------------------------------ - -M: 1 -O: 10000 10000 0 -10000 10000 -S: 0 4 10000 10000 0 -10000 10000 - -M: 1 -O: 10000 10000 0 -10000 10000 -S: 0 5 10000 10000 0 -10000 10000 - -M: 1 -O: 10000 10000 0 -10000 10000 -S: 0 6 10000 10000 0 -10000 10000 - -M: 1 -O: 10000 10000 0 -10000 10000 -S: 0 7 10000 10000 0 -10000 10000 diff --git a/ROMFS/px4fmu_common/mixers/delta.main.mix b/ROMFS/px4fmu_common/mixers/delta.main.mix index f0aa6650d9..cb22b74ae5 100644 --- a/ROMFS/px4fmu_common/mixers/delta.main.mix +++ b/ROMFS/px4fmu_common/mixers/delta.main.mix @@ -47,24 +47,3 @@ range. Inputs below zero are treated as zero. M: 1 O: 10000 10000 0 -10000 10000 S: 0 3 0 20000 -10000 -10000 10000 - - -Gimbal / flaps / payload mixer for last four channels ------------------------------------------------------ - -M: 1 -O: 10000 10000 0 -10000 10000 -S: 0 4 10000 10000 0 -10000 10000 - -M: 1 -O: 10000 10000 0 -10000 10000 -S: 0 5 10000 10000 0 -10000 10000 - -M: 1 -O: 10000 10000 0 -10000 10000 -S: 0 6 10000 10000 0 -10000 10000 - -M: 1 -O: 10000 10000 0 -10000 10000 -S: 0 7 10000 10000 0 -10000 10000 - diff --git a/ROMFS/px4fmu_common/mixers/phantom.main.mix b/ROMFS/px4fmu_common/mixers/phantom.main.mix index 00c37a16c1..328073054a 100644 --- a/ROMFS/px4fmu_common/mixers/phantom.main.mix +++ b/ROMFS/px4fmu_common/mixers/phantom.main.mix @@ -46,22 +46,3 @@ range. Inputs below zero are treated as zero. M: 1 O: 10000 10000 0 -10000 10000 S: 0 3 0 20000 -10000 -10000 10000 - -Gimbal / flaps / payload mixer for last four channels ------------------------------------------------------ - -M: 1 -O: 10000 10000 0 -10000 10000 -S: 0 4 10000 10000 0 -10000 10000 - -M: 1 -O: 10000 10000 0 -10000 10000 -S: 0 5 10000 10000 0 -10000 10000 - -M: 1 -O: 10000 10000 0 -10000 10000 -S: 0 6 10000 10000 0 -10000 10000 - -M: 1 -O: 10000 10000 0 -10000 10000 -S: 0 7 10000 10000 0 -10000 10000 diff --git a/ROMFS/px4fmu_common/mixers/quad_h.main.mix b/ROMFS/px4fmu_common/mixers/quad_h.main.mix index 4a177d2ff0..db5e730f2a 100644 --- a/ROMFS/px4fmu_common/mixers/quad_h.main.mix +++ b/ROMFS/px4fmu_common/mixers/quad_h.main.mix @@ -6,7 +6,7 @@ are mixed 100%. R: 4h 10000 10000 10000 0 -Gimbal / payload mixer for last four channels +Gimbal / payload mixer for last three channels ----------------------------------------------------- M: 1 @@ -20,7 +20,3 @@ S: 0 5 10000 10000 0 -10000 10000 M: 1 O: 10000 10000 0 -10000 10000 S: 0 6 10000 10000 0 -10000 10000 - -M: 1 -O: 10000 10000 0 -10000 10000 -S: 0 7 10000 10000 0 -10000 10000 diff --git a/ROMFS/px4fmu_common/mixers/quad_v.main.mix b/ROMFS/px4fmu_common/mixers/quad_v.main.mix index 520aba6359..dd0b88b47b 100644 --- a/ROMFS/px4fmu_common/mixers/quad_v.main.mix +++ b/ROMFS/px4fmu_common/mixers/quad_v.main.mix @@ -6,7 +6,7 @@ are mixed 100%. R: 4v 10000 10000 10000 0 -Gimbal / payload mixer for last four channels +Gimbal / payload mixer for last three channels ----------------------------------------------------- M: 1 @@ -20,7 +20,3 @@ S: 0 5 10000 10000 0 -10000 10000 M: 1 O: 10000 10000 0 -10000 10000 S: 0 6 10000 10000 0 -10000 10000 - -M: 1 -O: 10000 10000 0 -10000 10000 -S: 0 7 10000 10000 0 -10000 10000 diff --git a/ROMFS/px4fmu_common/mixers/quad_w.main.mix b/ROMFS/px4fmu_common/mixers/quad_w.main.mix index 58e6af74ba..4062a341ad 100644 --- a/ROMFS/px4fmu_common/mixers/quad_w.main.mix +++ b/ROMFS/px4fmu_common/mixers/quad_w.main.mix @@ -5,7 +5,7 @@ This file defines a single mixer for a quadrotor with a wide configuration. All R: 4w 10000 10000 10000 0 -Gimbal / payload mixer for last four channels +Gimbal / payload mixer for last three channels ----------------------------------------------------- M: 1 @@ -19,7 +19,3 @@ S: 0 5 10000 10000 0 -10000 10000 M: 1 O: 10000 10000 0 -10000 10000 S: 0 6 10000 10000 0 -10000 10000 - -M: 1 -O: 10000 10000 0 -10000 10000 -S: 0 7 10000 10000 0 -10000 10000 diff --git a/ROMFS/px4fmu_common/mixers/quad_x.main.mix b/ROMFS/px4fmu_common/mixers/quad_x.main.mix index 44992f4f70..3a5d07756e 100644 --- a/ROMFS/px4fmu_common/mixers/quad_x.main.mix +++ b/ROMFS/px4fmu_common/mixers/quad_x.main.mix @@ -8,6 +8,3 @@ S: 0 5 10000 10000 0 -10000 10000 M: 1 O: 10000 10000 0 -10000 10000 S: 0 6 10000 10000 0 -10000 10000 -M: 1 -O: 10000 10000 0 -10000 10000 -S: 0 7 10000 10000 0 -10000 10000 diff --git a/ROMFS/px4fmu_common/mixers/sk450_deadcat.main.mix b/ROMFS/px4fmu_common/mixers/sk450_deadcat.main.mix index 8daf810050..00d71efbaa 100644 --- a/ROMFS/px4fmu_common/mixers/sk450_deadcat.main.mix +++ b/ROMFS/px4fmu_common/mixers/sk450_deadcat.main.mix @@ -5,7 +5,7 @@ This file defines a single mixer for a quadrotor in SK450 DeadCat configuration. R: 4dc 10000 10000 10000 0 -Gimbal / payload mixer for last four channels +Gimbal / payload mixer for last three channels ----------------------------------------------------- M: 1 @@ -19,7 +19,3 @@ S: 0 5 10000 10000 0 -10000 10000 M: 1 O: 10000 10000 0 -10000 10000 S: 0 6 10000 10000 0 -10000 10000 - -M: 1 -O: 10000 10000 0 -10000 10000 -S: 0 7 10000 10000 0 -10000 10000