diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-01-28 15:13:14 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-01-28 15:13:14 +0100 |
| commit | 9c355d280eb379c72df636c1d47e5b14ae3e3e6e (patch) | |
| tree | e224a00b8bd506e2a78cad6886262c9968cb9bc5 /src/modules/fixedwing_pos_control | |
| parent | ac77fe9c27d7253b01805ff94d3e0f8e21017709 (diff) | |
| download | px4-firmware-9c355d280eb379c72df636c1d47e5b14ae3e3e6e.tar.gz px4-firmware-9c355d280eb379c72df636c1d47e5b14ae3e3e6e.tar.bz2 px4-firmware-9c355d280eb379c72df636c1d47e5b14ae3e3e6e.zip | |
Merged beta into mavlink rework branch
Diffstat (limited to 'src/modules/fixedwing_pos_control')
| -rw-r--r-- | src/modules/fixedwing_pos_control/fixedwing_pos_control_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/fixedwing_pos_control/fixedwing_pos_control_main.c b/src/modules/fixedwing_pos_control/fixedwing_pos_control_main.c index 73df3fb9e..888dd0942 100644 --- a/src/modules/fixedwing_pos_control/fixedwing_pos_control_main.c +++ b/src/modules/fixedwing_pos_control/fixedwing_pos_control_main.c @@ -299,7 +299,7 @@ int fixedwing_pos_control_thread_main(int argc, char *argv[]) orb_copy(ORB_ID(vehicle_global_position_setpoint), global_setpoint_sub, &global_setpoint); start_pos = global_pos; //for now using the current position as the startpoint (= approx. last waypoint because the setpoint switch occurs at the waypoint) global_sp_updated_set_once = true; - psi_track = get_bearing_to_next_waypoint((double)global_pos.lat / (double)1e7d, (double)global_pos.lon / (double)1e7d, + psi_track = get_bearing_to_next_waypoint(global_pos.lat, global_pos.lon, (double)global_setpoint.lat / (double)1e7d, (double)global_setpoint.lon / (double)1e7d); printf("next wp direction: %0.4f\n", (double)psi_track); |