ROMFS: exclude mixers on v2 & disable mixer command

The dynamic mixing is now the default
2026-08-01 20:27:57 +08:00 · 2022-08-12 15:07:05 +02:00
parent f0295cf596
commit 715afd27f5
31 changed files with 31 additions and 2 deletions
--- a/ROMFS/px4fmu_common/mixers/AAERTWF.main.mix
+++ b/ROMFS/px4fmu_common/mixers/AAERTWF.main.mix
@@ -1,3 +1,4 @@
+# @board px4_fmu-v2 exclude
 Aileron/rudder/elevator/throttle/wheel/flaps mixer for PX4FMU
 =======================================================

--- a/ROMFS/px4fmu_common/mixers/AAVVTWFF.main.mix
+++ b/ROMFS/px4fmu_common/mixers/AAVVTWFF.main.mix
@@ -1,3 +1,4 @@
+# @board px4_fmu-v2 exclude
 Aileron/v-tail/throttle/wheel/flaps mixer for PX4FMU
 =======================================================

--- a/ROMFS/px4fmu_common/mixers/AAVVTWFF_vtail.main.mix
+++ b/ROMFS/px4fmu_common/mixers/AAVVTWFF_vtail.main.mix
@@ -1,3 +1,4 @@
+# @board px4_fmu-v2 exclude
 Aileron/v-tail/throttle/wheel/flaps mixer for PX4FMU
 =======================================================

--- a/ROMFS/px4fmu_common/mixers/AERT.main.mix
+++ b/ROMFS/px4fmu_common/mixers/AERT.main.mix
@@ -1,3 +1,4 @@
+# @board px4_fmu-v2 exclude
 Aileron/rudder/elevator/throttle mixer for PX4FMU
 ==================================================

@@ -73,4 +74,4 @@ Ch6: Landing gear mixer
 By default pass-through of gear switch

 M: 1
-S: 3 5 10000 10000 0 -10000 10000
+S: 3 5 10000 10000 0 -10000 10000
--- a/ROMFS/px4fmu_common/mixers/AETRFG.main.mix
+++ b/ROMFS/px4fmu_common/mixers/AETRFG.main.mix
@@ -1,3 +1,4 @@
+# @board px4_fmu-v2 exclude
 Aileron/Elevator/Throttle/Rudder/Gear/Flaps mixer
 ==================================================

--- a/ROMFS/px4fmu_common/mixers/CCPM.main.mix
+++ b/ROMFS/px4fmu_common/mixers/CCPM.main.mix
@@ -1,3 +1,4 @@
+# @board px4_fmu-v2 exclude
 Helicopter 120 degree Cyclic-Collective-Pitch Mixing (CCPM) for PX4FMU
 ==================================================

--- a/ROMFS/px4fmu_common/mixers/IO_pass.main.mix
+++ b/ROMFS/px4fmu_common/mixers/IO_pass.main.mix
@@ -1,3 +1,4 @@
+# @board px4_fmu-v2 exclude
 Passthrough mixer for PX4IO
 ============================

--- a/ROMFS/px4fmu_common/mixers/coax.main.mix
+++ b/ROMFS/px4fmu_common/mixers/coax.main.mix
@@ -1,3 +1,4 @@
+# @board px4_fmu-v2 exclude
 Coaxial helicopter mixer
 - Two servomotors act on the swashplate (90 degree angle on the swashplate, decoupled effect on roll and pitch).
 - No collective pitch.
--- a/ROMFS/px4fmu_common/mixers/fw_generic_wing.main.mix
+++ b/ROMFS/px4fmu_common/mixers/fw_generic_wing.main.mix
@@ -1,3 +1,4 @@
+# @board px4_fmu-v2 exclude
 Generic wing mixer
 ===========================

--- a/ROMFS/px4fmu_common/mixers/generic_diff_rover.main.mix
+++ b/ROMFS/px4fmu_common/mixers/generic_diff_rover.main.mix
@@ -1,3 +1,4 @@
+# @board px4_fmu-v2 exclude
 Generic differential-drive rover
 ===========================

--- a/ROMFS/px4fmu_common/mixers/hexa_+.main.mix
+++ b/ROMFS/px4fmu_common/mixers/hexa_+.main.mix
@@ -1,3 +1,4 @@
+# @board px4_fmu-v2 exclude
 # Hexa +

 R: 6+
--- a/ROMFS/px4fmu_common/mixers/hexa_cox.main.mix
+++ b/ROMFS/px4fmu_common/mixers/hexa_cox.main.mix
@@ -1,3 +1,4 @@
+# @board px4_fmu-v2 exclude
 # Hexa coaxial

 R: 6c
--- a/ROMFS/px4fmu_common/mixers/hexa_x.main.mix
+++ b/ROMFS/px4fmu_common/mixers/hexa_x.main.mix
@@ -1,3 +1,4 @@
+# @board px4_fmu-v2 exclude
 # Hexa X

 R: 6x
--- a/ROMFS/px4fmu_common/mixers/mount.aux.mix
+++ b/ROMFS/px4fmu_common/mixers/mount.aux.mix
@@ -1,3 +1,4 @@
+# @board px4_fmu-v2 exclude
 # Mount Mixer (e.g. Gimbal, servo-controlled gimbal, etc...)


--- a/ROMFS/px4fmu_common/mixers/octo_+.main.mix
+++ b/ROMFS/px4fmu_common/mixers/octo_+.main.mix
@@ -1,3 +1,4 @@
+# @board px4_fmu-v2 exclude
 # Octo +

 R: 8+
--- a/ROMFS/px4fmu_common/mixers/octo_cox.main.mix
+++ b/ROMFS/px4fmu_common/mixers/octo_cox.main.mix
@@ -1,3 +1,4 @@
+# @board px4_fmu-v2 exclude
 # Octo coaxial

 R: 8c
--- a/ROMFS/px4fmu_common/mixers/octo_x.main.mix
+++ b/ROMFS/px4fmu_common/mixers/octo_x.main.mix
@@ -1,3 +1,4 @@
+# @board px4_fmu-v2 exclude
 # Octo X

 R: 8x
--- a/ROMFS/px4fmu_common/mixers/pass.aux.mix
+++ b/ROMFS/px4fmu_common/mixers/pass.aux.mix
@@ -1,3 +1,4 @@
+# @board px4_fmu-v2 exclude
 # Manual pass through mixer for servo outputs 1-4

 # AUX1 channel (select RC channel with RC_MAP_AUX1 param)
--- a/ROMFS/px4fmu_common/mixers/quad_+.main.mix
+++ b/ROMFS/px4fmu_common/mixers/quad_+.main.mix
@@ -1,3 +1,4 @@
+# @board px4_fmu-v2 exclude
 Multirotor mixer for PX4FMU
 ===========================

--- a/ROMFS/px4fmu_common/mixers/quad_+_vtol.main.mix
+++ b/ROMFS/px4fmu_common/mixers/quad_+_vtol.main.mix
@@ -1,3 +1,4 @@
+# @board px4_fmu-v2 exclude
 Mixer for Tailsitter with + motor configuration and elevons
 ===========================================================

--- a/ROMFS/px4fmu_common/mixers/quad_dc.main.mix
+++ b/ROMFS/px4fmu_common/mixers/quad_dc.main.mix
@@ -1,3 +1,4 @@
+# @board px4_fmu-v2 exclude
 Multirotor mixer
 ===========================

--- a/ROMFS/px4fmu_common/mixers/quad_h.main.mix
+++ b/ROMFS/px4fmu_common/mixers/quad_h.main.mix
@@ -1,3 +1,4 @@
+# @board px4_fmu-v2 exclude
 Multirotor mixer for PX4FMU
 ===========================

--- a/ROMFS/px4fmu_common/mixers/quad_w.main.mix
+++ b/ROMFS/px4fmu_common/mixers/quad_w.main.mix
@@ -1,3 +1,4 @@
+# @board px4_fmu-v2 exclude
 Multirotor mixer for PX4FMU
 ===========================

--- a/ROMFS/px4fmu_common/mixers/quad_x.main.mix
+++ b/ROMFS/px4fmu_common/mixers/quad_x.main.mix
@@ -1,3 +1,4 @@
+# @board px4_fmu-v2 exclude
 R: 4x

 AUX1 Passthrough
--- a/ROMFS/px4fmu_common/mixers/quad_x_vtol_AAERT.main.mix
+++ b/ROMFS/px4fmu_common/mixers/quad_x_vtol_AAERT.main.mix
@@ -1,3 +1,4 @@
+# @board px4_fmu-v2 exclude
 Mixer for an AAERT VTOL
 =======================

--- a/ROMFS/px4fmu_common/mixers/rover_diff_and_servo.main.mix
+++ b/ROMFS/px4fmu_common/mixers/rover_diff_and_servo.main.mix
@@ -1,3 +1,4 @@
+# @board px4_fmu-v2 exclude
 Generic car mixer (eg DF Robot GPX:Asurada RC Car)
 ===========================

--- a/ROMFS/px4fmu_common/mixers/rover_generic.main.mix
+++ b/ROMFS/px4fmu_common/mixers/rover_generic.main.mix
@@ -1,3 +1,4 @@
+# @board px4_fmu-v2 exclude
 Generic car mixer (eg Traxxas Stampede RC Car)
 ===========================

--- a/ROMFS/px4fmu_common/mixers/tri_y_yaw+.main.mix
+++ b/ROMFS/px4fmu_common/mixers/tri_y_yaw+.main.mix
@@ -1,3 +1,4 @@
+# @board px4_fmu-v2 exclude


 # Tricopter Y-Configuration Mixer
--- a/ROMFS/px4fmu_common/mixers/tri_y_yaw-.main.mix
+++ b/ROMFS/px4fmu_common/mixers/tri_y_yaw-.main.mix
@@ -1,3 +1,4 @@
+# @board px4_fmu-v2 exclude


 # Tricopter Y-Configuration Mixer
--- a/ROMFS/px4fmu_common/mixers/vtol_tailsitter_duo_sat.main.mix
+++ b/ROMFS/px4fmu_common/mixers/vtol_tailsitter_duo_sat.main.mix
@@ -1,3 +1,4 @@
+# @board px4_fmu-v2 exclude
 Tailsitter duo mixer
 ============================

--- a/boards/px4/fmu-v2/default.px4board
+++ b/boards/px4/fmu-v2/default.px4board
@@ -38,7 +38,6 @@ CONFIG_MODULES_SENSORS=y
 CONFIG_SYSTEMCMDS_BL_UPDATE=y
 CONFIG_SYSTEMCMDS_HARDFAULT_LOG=y
 CONFIG_SYSTEMCMDS_MFT=y
-CONFIG_SYSTEMCMDS_MIXER=y
 CONFIG_SYSTEMCMDS_MTD=y
 CONFIG_SYSTEMCMDS_PARAM=y
 CONFIG_SYSTEMCMDS_PWM=y