From 715afd27f58a89d31aa4289a4b8681fb0e5014e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beat=20K=C3=BCng?= Date: Fri, 12 Aug 2022 15:07:05 +0200 Subject: [PATCH] ROMFS: exclude mixers on v2 & disable mixer command The dynamic mixing is now the default --- ROMFS/px4fmu_common/mixers/AAERTWF.main.mix | 1 + ROMFS/px4fmu_common/mixers/AAVVTWFF.main.mix | 1 + ROMFS/px4fmu_common/mixers/AAVVTWFF_vtail.main.mix | 1 + ROMFS/px4fmu_common/mixers/AERT.main.mix | 3 ++- ROMFS/px4fmu_common/mixers/AETRFG.main.mix | 1 + ROMFS/px4fmu_common/mixers/CCPM.main.mix | 1 + ROMFS/px4fmu_common/mixers/IO_pass.main.mix | 1 + ROMFS/px4fmu_common/mixers/coax.main.mix | 1 + ROMFS/px4fmu_common/mixers/fw_generic_wing.main.mix | 1 + ROMFS/px4fmu_common/mixers/generic_diff_rover.main.mix | 1 + ROMFS/px4fmu_common/mixers/hexa_+.main.mix | 1 + ROMFS/px4fmu_common/mixers/hexa_cox.main.mix | 1 + ROMFS/px4fmu_common/mixers/hexa_x.main.mix | 1 + ROMFS/px4fmu_common/mixers/mount.aux.mix | 1 + ROMFS/px4fmu_common/mixers/octo_+.main.mix | 1 + ROMFS/px4fmu_common/mixers/octo_cox.main.mix | 1 + ROMFS/px4fmu_common/mixers/octo_x.main.mix | 1 + ROMFS/px4fmu_common/mixers/pass.aux.mix | 1 + ROMFS/px4fmu_common/mixers/quad_+.main.mix | 1 + ROMFS/px4fmu_common/mixers/quad_+_vtol.main.mix | 1 + ROMFS/px4fmu_common/mixers/quad_dc.main.mix | 1 + ROMFS/px4fmu_common/mixers/quad_h.main.mix | 1 + ROMFS/px4fmu_common/mixers/quad_w.main.mix | 1 + ROMFS/px4fmu_common/mixers/quad_x.main.mix | 1 + ROMFS/px4fmu_common/mixers/quad_x_vtol_AAERT.main.mix | 1 + ROMFS/px4fmu_common/mixers/rover_diff_and_servo.main.mix | 1 + ROMFS/px4fmu_common/mixers/rover_generic.main.mix | 1 + ROMFS/px4fmu_common/mixers/tri_y_yaw+.main.mix | 1 + ROMFS/px4fmu_common/mixers/tri_y_yaw-.main.mix | 1 + ROMFS/px4fmu_common/mixers/vtol_tailsitter_duo_sat.main.mix | 1 + boards/px4/fmu-v2/default.px4board | 1 - 31 files changed, 31 insertions(+), 2 deletions(-) diff --git a/ROMFS/px4fmu_common/mixers/AAERTWF.main.mix b/ROMFS/px4fmu_common/mixers/AAERTWF.main.mix index 8bd3fd0fa1c..20d4c21d938 100644 --- 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 ======================================================= diff --git a/ROMFS/px4fmu_common/mixers/AAVVTWFF.main.mix b/ROMFS/px4fmu_common/mixers/AAVVTWFF.main.mix index 07070c75359..9a994da0eff 100644 --- 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 ======================================================= diff --git a/ROMFS/px4fmu_common/mixers/AAVVTWFF_vtail.main.mix b/ROMFS/px4fmu_common/mixers/AAVVTWFF_vtail.main.mix index 4baa82a89d8..ad65ca999c5 100644 --- 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 ======================================================= diff --git a/ROMFS/px4fmu_common/mixers/AERT.main.mix b/ROMFS/px4fmu_common/mixers/AERT.main.mix index 9b636cd9eeb..356ff613aef 100644 --- 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 \ No newline at end of file +S: 3 5 10000 10000 0 -10000 10000 diff --git a/ROMFS/px4fmu_common/mixers/AETRFG.main.mix b/ROMFS/px4fmu_common/mixers/AETRFG.main.mix index 4ebf75fdd00..d5cf84219bb 100644 --- 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 ================================================== diff --git a/ROMFS/px4fmu_common/mixers/CCPM.main.mix b/ROMFS/px4fmu_common/mixers/CCPM.main.mix index 311a57285cb..8f7af5aee89 100644 --- 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 ================================================== diff --git a/ROMFS/px4fmu_common/mixers/IO_pass.main.mix b/ROMFS/px4fmu_common/mixers/IO_pass.main.mix index fc5877fbba3..d18e1850e10 100644 --- 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 ============================ diff --git a/ROMFS/px4fmu_common/mixers/coax.main.mix b/ROMFS/px4fmu_common/mixers/coax.main.mix index 0c99dd3b0b1..0a99547e20c 100644 --- 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. diff --git a/ROMFS/px4fmu_common/mixers/fw_generic_wing.main.mix b/ROMFS/px4fmu_common/mixers/fw_generic_wing.main.mix index eedf427f57c..f947698d82a 100644 --- 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 =========================== diff --git a/ROMFS/px4fmu_common/mixers/generic_diff_rover.main.mix b/ROMFS/px4fmu_common/mixers/generic_diff_rover.main.mix index 1efffff300a..d97aeeac0db 100644 --- 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 =========================== diff --git a/ROMFS/px4fmu_common/mixers/hexa_+.main.mix b/ROMFS/px4fmu_common/mixers/hexa_+.main.mix index 599a3d3fa41..383e2d4e638 100644 --- 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+ diff --git a/ROMFS/px4fmu_common/mixers/hexa_cox.main.mix b/ROMFS/px4fmu_common/mixers/hexa_cox.main.mix index a8619d7c15f..c8985dfee20 100644 --- 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 diff --git a/ROMFS/px4fmu_common/mixers/hexa_x.main.mix b/ROMFS/px4fmu_common/mixers/hexa_x.main.mix index be6a25ca57a..2a25a255804 100644 --- 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 diff --git a/ROMFS/px4fmu_common/mixers/mount.aux.mix b/ROMFS/px4fmu_common/mixers/mount.aux.mix index e2c817ee0a3..2b23af6e7a8 100644 --- 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...) diff --git a/ROMFS/px4fmu_common/mixers/octo_+.main.mix b/ROMFS/px4fmu_common/mixers/octo_+.main.mix index 38f0becd4ae..9f443b33f4a 100644 --- 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+ diff --git a/ROMFS/px4fmu_common/mixers/octo_cox.main.mix b/ROMFS/px4fmu_common/mixers/octo_cox.main.mix index a0c99aac58b..c6730d8d86d 100644 --- 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 diff --git a/ROMFS/px4fmu_common/mixers/octo_x.main.mix b/ROMFS/px4fmu_common/mixers/octo_x.main.mix index 1be72094115..6ebd0dee990 100644 --- 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 diff --git a/ROMFS/px4fmu_common/mixers/pass.aux.mix b/ROMFS/px4fmu_common/mixers/pass.aux.mix index 26e991f032b..4615687def1 100644 --- 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) diff --git a/ROMFS/px4fmu_common/mixers/quad_+.main.mix b/ROMFS/px4fmu_common/mixers/quad_+.main.mix index 1708e12dc94..5dfa5a0014b 100644 --- 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 =========================== diff --git a/ROMFS/px4fmu_common/mixers/quad_+_vtol.main.mix b/ROMFS/px4fmu_common/mixers/quad_+_vtol.main.mix index 1fbcb550e9b..34c09c73d39 100644 --- 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 =========================================================== diff --git a/ROMFS/px4fmu_common/mixers/quad_dc.main.mix b/ROMFS/px4fmu_common/mixers/quad_dc.main.mix index 09fc25e82a1..f87a8bf0449 100644 --- 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 =========================== diff --git a/ROMFS/px4fmu_common/mixers/quad_h.main.mix b/ROMFS/px4fmu_common/mixers/quad_h.main.mix index ae65fa09aad..9be41f5c090 100644 --- 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 =========================== diff --git a/ROMFS/px4fmu_common/mixers/quad_w.main.mix b/ROMFS/px4fmu_common/mixers/quad_w.main.mix index 0ab520b8b95..79bba7752f0 100644 --- 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 =========================== diff --git a/ROMFS/px4fmu_common/mixers/quad_x.main.mix b/ROMFS/px4fmu_common/mixers/quad_x.main.mix index 2c887614518..ad676ff3e36 100644 --- 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 diff --git a/ROMFS/px4fmu_common/mixers/quad_x_vtol_AAERT.main.mix b/ROMFS/px4fmu_common/mixers/quad_x_vtol_AAERT.main.mix index 7a89b4f3310..d0f32d91996 100644 --- 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 ======================= diff --git a/ROMFS/px4fmu_common/mixers/rover_diff_and_servo.main.mix b/ROMFS/px4fmu_common/mixers/rover_diff_and_servo.main.mix index 3f707dd21a0..bf00eae8f50 100644 --- 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) =========================== diff --git a/ROMFS/px4fmu_common/mixers/rover_generic.main.mix b/ROMFS/px4fmu_common/mixers/rover_generic.main.mix index fee98ac1def..687896e7229 100644 --- 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) =========================== diff --git a/ROMFS/px4fmu_common/mixers/tri_y_yaw+.main.mix b/ROMFS/px4fmu_common/mixers/tri_y_yaw+.main.mix index 891249c931c..9b0a9b27088 100644 --- 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 diff --git a/ROMFS/px4fmu_common/mixers/tri_y_yaw-.main.mix b/ROMFS/px4fmu_common/mixers/tri_y_yaw-.main.mix index 9e2b10ce39b..d53811142b3 100644 --- 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 diff --git a/ROMFS/px4fmu_common/mixers/vtol_tailsitter_duo_sat.main.mix b/ROMFS/px4fmu_common/mixers/vtol_tailsitter_duo_sat.main.mix index 76b116e5343..55d0f1fe4aa 100644 --- 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 ============================ diff --git a/boards/px4/fmu-v2/default.px4board b/boards/px4/fmu-v2/default.px4board index 22d45c3a5e5..c11fd316886 100644 --- 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