diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-11-13 19:39:04 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-11-13 19:39:04 +0100 |
| commit | 2116966b1e481c20eee3fe95f1d8d9671fafc1f2 (patch) | |
| tree | 38ae6a96f21c14a89dba93351f2d18a1a4cb9ed0 /src/modules | |
| parent | 2444b68a0a2c75bd52af07c12bd1aa2192bd63e0 (diff) | |
| parent | 03162f5f0dd616d7c03f0781cb209e8af9fdae99 (diff) | |
| download | px4-firmware-2116966b1e481c20eee3fe95f1d8d9671fafc1f2.tar.gz px4-firmware-2116966b1e481c20eee3fe95f1d8d9671fafc1f2.tar.bz2 px4-firmware-2116966b1e481c20eee3fe95f1d8d9671fafc1f2.zip | |
Merge branch 'yaw_auto_failsafe' of github.com:PX4/Firmware
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/multirotor_pos_control/multirotor_pos_control.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/modules/multirotor_pos_control/multirotor_pos_control.c b/src/modules/multirotor_pos_control/multirotor_pos_control.c index 36dd370fb..3d23d0c09 100644 --- a/src/modules/multirotor_pos_control/multirotor_pos_control.c +++ b/src/modules/multirotor_pos_control/multirotor_pos_control.c @@ -471,7 +471,10 @@ static int multirotor_pos_control_thread_main(int argc, char *argv[]) } else { local_pos_sp.z = local_pos.ref_alt - global_pos_sp.altitude; } - att_sp.yaw_body = global_pos_sp.yaw; + /* update yaw setpoint only if value is valid */ + if (isfinite(global_pos_sp.yaw) && fabsf(global_pos_sp.yaw) < M_TWOPI) { + att_sp.yaw_body = global_pos_sp.yaw; + } mavlink_log_info(mavlink_fd, "[mpc] new sp: %.7f, %.7f (%.2f, %.2f)", (double)sp_lat, sp_lon, (double)local_pos_sp.x, (double)local_pos_sp.y); |