From 48f1ae31dd2fe724bdf06a238283a72459b6c88a Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Sun, 25 Dec 2016 21:27:13 +0100 Subject: [PATCH] Iris: use correct mixer for frame --- posix-configs/SITL/init/ekf2/iris | 2 +- posix-configs/SITL/init/ekf2/multiple_iris | 2 +- posix-configs/SITL/init/lpe/iris | 2 +- posix-configs/SITL/init/lpe/iris_opt_flow | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/posix-configs/SITL/init/ekf2/iris b/posix-configs/SITL/init/ekf2/iris index 276c321ac1..06850bfee9 100644 --- a/posix-configs/SITL/init/ekf2/iris +++ b/posix-configs/SITL/init/ekf2/iris @@ -61,7 +61,7 @@ navigator start ekf2 start mc_pos_control start mc_att_control start -mixer load /dev/pwm_output0 ROMFS/px4fmu_common/mixers/quad_w.main.mix +mixer load /dev/pwm_output0 ROMFS/px4fmu_common/mixers/quad_dc.main.mix mavlink start -u 14556 -r 4000000 mavlink start -u 14557 -r 4000000 -m onboard -o 14540 mavlink stream -r 50 -s POSITION_TARGET_LOCAL_NED -u 14556 diff --git a/posix-configs/SITL/init/ekf2/multiple_iris b/posix-configs/SITL/init/ekf2/multiple_iris index c894392c5e..22a85cc815 100644 --- a/posix-configs/SITL/init/ekf2/multiple_iris +++ b/posix-configs/SITL/init/ekf2/multiple_iris @@ -61,7 +61,7 @@ navigator start ekf2 start mc_pos_control start mc_att_control start -mixer load /dev/pwm_output0 ROMFS/px4fmu_common/mixers/quad_w.main.mix +mixer load /dev/pwm_output0 ROMFS/px4fmu_common/mixers/quad_dc.main.mix mavlink start -u _MAVPORT_ -r 4000000 -o _MAVOPORT_ mavlink start -u _MAVPORT2_ -r 4000000 -m onboard -o _MAVOPORT2_ mavlink stream -r 50 -s POSITION_TARGET_LOCAL_NED -u _MAVPORT_ diff --git a/posix-configs/SITL/init/lpe/iris b/posix-configs/SITL/init/lpe/iris index d212110a96..26f4ecc24b 100644 --- a/posix-configs/SITL/init/lpe/iris +++ b/posix-configs/SITL/init/lpe/iris @@ -64,7 +64,7 @@ attitude_estimator_q start local_position_estimator start mc_pos_control start mc_att_control start -mixer load /dev/pwm_output0 ROMFS/px4fmu_common/mixers/quad_w.main.mix +mixer load /dev/pwm_output0 ROMFS/px4fmu_common/mixers/quad_dc.main.mix mavlink start -u 14556 -r 4000000 mavlink start -u 14557 -r 4000000 -m onboard -o 14540 mavlink stream -r 50 -s POSITION_TARGET_LOCAL_NED -u 14556 diff --git a/posix-configs/SITL/init/lpe/iris_opt_flow b/posix-configs/SITL/init/lpe/iris_opt_flow index f6fc727df0..178eb1465b 100644 --- a/posix-configs/SITL/init/lpe/iris_opt_flow +++ b/posix-configs/SITL/init/lpe/iris_opt_flow @@ -82,7 +82,7 @@ attitude_estimator_q start local_position_estimator start mc_pos_control start mc_att_control start -mixer load /dev/pwm_output0 ROMFS/px4fmu_common/mixers/quad_w.main.mix +mixer load /dev/pwm_output0 ROMFS/px4fmu_common/mixers/quad_dc.main.mix mavlink start -u 14556 -r 2000000 mavlink start -u 14557 -r 2000000 -m onboard -o 14540 mavlink stream -r 80 -s POSITION_TARGET_LOCAL_NED -u 14556