Changed naming of the mixers to get rid of umbiguity as outputs are actually going to be driven by io, not fmu

Implemented automatic lookup for the .aux.mix file if it exists

26 files changed, 0 insertions, 0 deletions

diff --git a/ROMFS/px4fmu_common/mixers/FMU_AERT.mix b/ROMFS/px4fmu_common/mixers/AERT.main.mix
index 7fed488af..7fed488af 100644
--- a/ROMFS/px4fmu_common/mixers/FMU_AERT.mix
+++ b/ROMFS/px4fmu_common/mixers/AERT.main.mix
diff --git a/ROMFS/px4fmu_common/mixers/FMU_AET.mix b/ROMFS/px4fmu_common/mixers/AET.main.mix
index c73cb2a62..c73cb2a62 100644
--- a/ROMFS/px4fmu_common/mixers/FMU_AET.mix
+++ b/ROMFS/px4fmu_common/mixers/AET.main.mix
diff --git a/ROMFS/px4fmu_common/mixers/FMU_CCPM.mix b/ROMFS/px4fmu_common/mixers/CCPM.main.mix
index 1c45b3e59..1c45b3e59 100644
--- a/ROMFS/px4fmu_common/mixers/FMU_CCPM.mix
+++ b/ROMFS/px4fmu_common/mixers/CCPM.main.mix
diff --git a/ROMFS/px4fmu_common/mixers/FMU_FX79.mix b/ROMFS/px4fmu_common/mixers/FX79.main.mix
index b8879af9e..b8879af9e 100755
--- a/ROMFS/px4fmu_common/mixers/FMU_FX79.mix
+++ b/ROMFS/px4fmu_common/mixers/FX79.main.mix
diff --git a/ROMFS/px4fmu_common/mixers/FMU_Q.mix b/ROMFS/px4fmu_common/mixers/Q.main.mix
index b8ecbc879..b8ecbc879 100644
--- a/ROMFS/px4fmu_common/mixers/FMU_Q.mix
+++ b/ROMFS/px4fmu_common/mixers/Q.main.mix
diff --git a/ROMFS/px4fmu_common/mixers/FMU_RET.mix b/ROMFS/px4fmu_common/mixers/RET.main.mix
index f07c34ac8..f07c34ac8 100644
--- a/ROMFS/px4fmu_common/mixers/FMU_RET.mix
+++ b/ROMFS/px4fmu_common/mixers/RET.main.mix
diff --git a/ROMFS/px4fmu_common/mixers/Viper.mix b/ROMFS/px4fmu_common/mixers/Viper.main.mix
index 5aa3828f2..5aa3828f2 100755
--- a/ROMFS/px4fmu_common/mixers/Viper.mix
+++ b/ROMFS/px4fmu_common/mixers/Viper.main.mix
diff --git a/ROMFS/px4fmu_common/mixers/FMU_X5.mix b/ROMFS/px4fmu_common/mixers/X5.main.mix
index 80e3bac09..80e3bac09 100644
--- a/ROMFS/px4fmu_common/mixers/FMU_X5.mix
+++ b/ROMFS/px4fmu_common/mixers/X5.main.mix
diff --git a/ROMFS/px4fmu_common/mixers/FMU_caipirinha_vtol.mix b/ROMFS/px4fmu_common/mixers/caipirinha_vtol.main.mix
index 5ae0f5588..5ae0f5588 100644
--- a/ROMFS/px4fmu_common/mixers/FMU_caipirinha_vtol.mix
+++ b/ROMFS/px4fmu_common/mixers/caipirinha_vtol.main.mix
diff --git a/ROMFS/px4fmu_common/mixers/FMU_delta.mix b/ROMFS/px4fmu_common/mixers/delta.main.mix
index f0aa6650d..f0aa6650d 100644
--- a/ROMFS/px4fmu_common/mixers/FMU_delta.mix
+++ b/ROMFS/px4fmu_common/mixers/delta.main.mix
diff --git a/ROMFS/px4fmu_common/mixers/easystar.mix b/ROMFS/px4fmu_common/mixers/easystar.main.mix
index 0051ffdbb..0051ffdbb 100644
--- a/ROMFS/px4fmu_common/mixers/easystar.mix
+++ b/ROMFS/px4fmu_common/mixers/easystar.main.mix
diff --git a/ROMFS/px4fmu_common/mixers/FMU_firefly6_elevons.mix b/ROMFS/px4fmu_common/mixers/firefly6.aux.mix
index 9ed6eeed9..9ed6eeed9 100644
--- a/ROMFS/px4fmu_common/mixers/FMU_firefly6_elevons.mix
+++ b/ROMFS/px4fmu_common/mixers/firefly6.aux.mix
diff --git a/ROMFS/px4fmu_common/mixers/FMU_firefly6_rotors.mix b/ROMFS/px4fmu_common/mixers/firefly6.main.mix
index 3e1d9d7a3..3e1d9d7a3 100644
--- a/ROMFS/px4fmu_common/mixers/FMU_firefly6_rotors.mix
+++ b/ROMFS/px4fmu_common/mixers/firefly6.main.mix
diff --git a/ROMFS/px4fmu_common/mixers/FMU_hexa_+.mix b/ROMFS/px4fmu_common/mixers/hexa_+.main.mix
index e608b459f..e608b459f 100644
--- a/ROMFS/px4fmu_common/mixers/FMU_hexa_+.mix
+++ b/ROMFS/px4fmu_common/mixers/hexa_+.main.mix
diff --git a/ROMFS/px4fmu_common/mixers/FMU_hexa_cox.mix b/ROMFS/px4fmu_common/mixers/hexa_cox.main.mix
index 497786feb..497786feb 100644
--- a/ROMFS/px4fmu_common/mixers/FMU_hexa_cox.mix
+++ b/ROMFS/px4fmu_common/mixers/hexa_cox.main.mix
diff --git a/ROMFS/px4fmu_common/mixers/FMU_hexa_x.mix b/ROMFS/px4fmu_common/mixers/hexa_x.main.mix
index 16e6e22f9..16e6e22f9 100644
--- a/ROMFS/px4fmu_common/mixers/FMU_hexa_x.mix
+++ b/ROMFS/px4fmu_common/mixers/hexa_x.main.mix
diff --git a/ROMFS/px4fmu_common/mixers/FMU_octo_+.mix b/ROMFS/px4fmu_common/mixers/octo_+.main.mix
index 397e22086..397e22086 100644
--- a/ROMFS/px4fmu_common/mixers/FMU_octo_+.mix
+++ b/ROMFS/px4fmu_common/mixers/octo_+.main.mix
diff --git a/ROMFS/px4fmu_common/mixers/FMU_octo_cox.mix b/ROMFS/px4fmu_common/mixers/octo_cox.main.mix
index f7845450d..f7845450d 100644
--- a/ROMFS/px4fmu_common/mixers/FMU_octo_cox.mix
+++ b/ROMFS/px4fmu_common/mixers/octo_cox.main.mix
diff --git a/ROMFS/px4fmu_common/mixers/FMU_octo_x.mix b/ROMFS/px4fmu_common/mixers/octo_x.main.mix
index c9a348aa4..c9a348aa4 100644
--- a/ROMFS/px4fmu_common/mixers/FMU_octo_x.mix
+++ b/ROMFS/px4fmu_common/mixers/octo_x.main.mix
diff --git a/ROMFS/px4fmu_common/mixers/phantom.mix b/ROMFS/px4fmu_common/mixers/phantom.main.mix
index 00c37a16c..00c37a16c 100644
--- a/ROMFS/px4fmu_common/mixers/phantom.mix
+++ b/ROMFS/px4fmu_common/mixers/phantom.main.mix
diff --git a/ROMFS/px4fmu_common/mixers/FMU_quad_+.mix b/ROMFS/px4fmu_common/mixers/quad_+.main.mix
index cd9a9cfab..cd9a9cfab 100644
--- a/ROMFS/px4fmu_common/mixers/FMU_quad_+.mix
+++ b/ROMFS/px4fmu_common/mixers/quad_+.main.mix
diff --git a/ROMFS/px4fmu_common/mixers/FMU_quad_v.mix b/ROMFS/px4fmu_common/mixers/quad_v.main.mix
index 520aba635..520aba635 100644
--- a/ROMFS/px4fmu_common/mixers/FMU_quad_v.mix
+++ b/ROMFS/px4fmu_common/mixers/quad_v.main.mix
diff --git a/ROMFS/px4fmu_common/mixers/FMU_quad_w.mix b/ROMFS/px4fmu_common/mixers/quad_w.main.mix
index 58e6af74b..58e6af74b 100644
--- a/ROMFS/px4fmu_common/mixers/FMU_quad_w.mix
+++ b/ROMFS/px4fmu_common/mixers/quad_w.main.mix
diff --git a/ROMFS/px4fmu_common/mixers/FMU_quad_x.mix b/ROMFS/px4fmu_common/mixers/quad_x.main.mix
index fa21c8012..fa21c8012 100644
--- a/ROMFS/px4fmu_common/mixers/FMU_quad_x.mix
+++ b/ROMFS/px4fmu_common/mixers/quad_x.main.mix
diff --git a/ROMFS/px4fmu_common/mixers/skywalker.mix b/ROMFS/px4fmu_common/mixers/skywalker.main.mix
index 04d677e56..04d677e56 100644
--- a/ROMFS/px4fmu_common/mixers/skywalker.mix
+++ b/ROMFS/px4fmu_common/mixers/skywalker.main.mix
diff --git a/ROMFS/px4fmu_common/mixers/wingwing.mix b/ROMFS/px4fmu_common/mixers/wingwing.main.mix
index 08333ba5c..08333ba5c 100644
--- a/ROMFS/px4fmu_common/mixers/wingwing.mix
+++ b/ROMFS/px4fmu_common/mixers/wingwing.main.mix