diff --git a/ROMFS/px4fmu_common/mixers/CMakeLists.txt b/ROMFS/px4fmu_common/mixers/CMakeLists.txt index 72e8dd5a3c..2662bdd72a 100644 --- a/ROMFS/px4fmu_common/mixers/CMakeLists.txt +++ b/ROMFS/px4fmu_common/mixers/CMakeLists.txt @@ -75,7 +75,6 @@ px4_add_romfs_files( quad_x_can.main.mix quad_x.main.mix quad_x_vtol.main.mix - quad_x_vtol_sim.main.mix stampede.main.mix tri_y_yaw-.main.mix tri_y_yaw+.main.mix diff --git a/ROMFS/px4fmu_common/mixers/quad_x_vtol.main.mix b/ROMFS/px4fmu_common/mixers/quad_x_vtol.main.mix index 689d677109..cb63bbe351 100644 --- a/ROMFS/px4fmu_common/mixers/quad_x_vtol.main.mix +++ b/ROMFS/px4fmu_common/mixers/quad_x_vtol.main.mix @@ -6,8 +6,6 @@ are mixed 100%. R: 4x 10000 10000 10000 0 -Z: - # left elevon M: 2 S: 1 0 5000 5000 0 -10000 10000 @@ -17,7 +15,3 @@ S: 1 1 5000 5000 0 -10000 10000 M: 2 S: 1 0 5000 5000 0 -10000 10000 S: 1 1 -5000 -5000 0 -10000 10000 - -# mixer for the virtual elevator -M: 1 -S: 1 1 10000 10000 0 -10000 10000 diff --git a/ROMFS/px4fmu_common/mixers/quad_x_vtol_sim.main.mix b/ROMFS/sitl/mixers/quad_x_vtol.main.mix similarity index 100% rename from ROMFS/px4fmu_common/mixers/quad_x_vtol_sim.main.mix rename to ROMFS/sitl/mixers/quad_x_vtol.main.mix diff --git a/posix-configs/SITL/init/ekf2/tailsitter b/posix-configs/SITL/init/ekf2/tailsitter index 70aca9a37c..88a1bec8cc 100644 --- a/posix-configs/SITL/init/ekf2/tailsitter +++ b/posix-configs/SITL/init/ekf2/tailsitter @@ -63,7 +63,7 @@ mc_att_control start fw_pos_control_l1 start fw_att_control start wind_estimator start -mixer load /dev/pwm_output0 ROMFS/px4fmu_common/mixers/quad_x_vtol_sim.main.mix +mixer load /dev/pwm_output0 ROMFS/sitl/mixers/quad_x_vtol.main.mix mavlink start -x -u 14556 -r 2000000 mavlink start -x -u 14557 -r 2000000 -m onboard -o 14540 mavlink stream -r 80 -s POSITION_TARGET_LOCAL_NED -u 14556