diff options
author | Thomas Gubler <thomasgubler@gmail.com> | 2013-12-05 10:53:41 +0100 |
---|---|---|
committer | Thomas Gubler <thomasgubler@gmail.com> | 2013-12-05 10:53:41 +0100 |
commit | b86161dd4518b0f1052609e7ea9db737cd041ee3 (patch) | |
tree | a17efa7fc45abc5f7ee5788ad6da420ac7d5da0a /src/modules/mavlink | |
parent | f73988cee9ed2c87342d11e41f19d749e2e4c117 (diff) | |
parent | 264ef47197432d2cc1372cabf93c3bd7a52df0aa (diff) | |
download | px4-firmware-b86161dd4518b0f1052609e7ea9db737cd041ee3.tar.gz px4-firmware-b86161dd4518b0f1052609e7ea9db737cd041ee3.tar.bz2 px4-firmware-b86161dd4518b0f1052609e7ea9db737cd041ee3.zip |
Merge remote-tracking branch 'upstream/master' into fw_autoland_att_tecs_navigator
Conflicts:
src/modules/mavlink/missionlib.c
src/systemcmds/tests/module.mk
Diffstat (limited to 'src/modules/mavlink')
-rw-r--r-- | src/modules/mavlink/missionlib.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/modules/mavlink/missionlib.c b/src/modules/mavlink/missionlib.c index a7f9a6acf..5845429db 100644 --- a/src/modules/mavlink/missionlib.c +++ b/src/modules/mavlink/missionlib.c @@ -301,7 +301,7 @@ void mavlink_missionlib_current_waypoint_changed(uint16_t index, float param1, // sp.lon = wpm->waypoints[last_setpoint_index].y * 1e7f; // sp.altitude = wpm->waypoints[last_setpoint_index].z; // sp.altitude_is_relative = false; - // sp.yaw = (wpm->waypoints[last_setpoint_index].param4 / 180.0f) * M_PI_F - M_PI_F; + // sp.yaw = _wrap_pi(wpm->waypoints[last_setpoint_index].param4 / 180.0f * M_PI_F); // set_special_fields(wpm->waypoints[last_setpoint_index].param1, // wpm->waypoints[last_setpoint_index].param2, // wpm->waypoints[last_setpoint_index].param3, @@ -317,7 +317,7 @@ void mavlink_missionlib_current_waypoint_changed(uint16_t index, float param1, // sp.lon = wpm->waypoints[next_setpoint_index].y * 1e7f; // sp.altitude = wpm->waypoints[next_setpoint_index].z; // sp.altitude_is_relative = false; - // sp.yaw = (wpm->waypoints[next_setpoint_index].param4 / 180.0f) * M_PI_F - M_PI_F; + // sp.yaw = _wrap_pi(wpm->waypoints[next_setpoint_index].param4 / 180.0f * M_PI_F); // set_special_fields(wpm->waypoints[next_setpoint_index].param1, // wpm->waypoints[next_setpoint_index].param2, // wpm->waypoints[next_setpoint_index].param3, @@ -343,7 +343,7 @@ void mavlink_missionlib_current_waypoint_changed(uint16_t index, float param1, sp.lon = param6_lon_y * 1e7f; sp.altitude = param7_alt_z; sp.altitude_is_relative = true; - sp.yaw = (param4 / 180.0f) * M_PI_F - M_PI_F; + sp.yaw = _wrap_pi(param4 / 180.0f * M_PI_F); set_special_fields(param1, param2, param3, param4, command, &sp); /* Initialize publication if necessary */ @@ -364,7 +364,7 @@ void mavlink_missionlib_current_waypoint_changed(uint16_t index, float param1, sp.x = param5_lat_x; sp.y = param6_lon_y; sp.z = param7_alt_z; - sp.yaw = (param4 / 180.0f) * M_PI_F - M_PI_F; + sp.yaw = _wrap_pi(param4 / 180.0f * M_PI_F); /* Initialize publication if necessary */ if (local_position_setpoint_pub < 0) { |