diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-02-16 17:07:02 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-02-16 17:07:02 +0100 |
| commit | 8016032a40aaab55fc1d48d1a092cb00d5da92d0 (patch) | |
| tree | 09b8a96ebf6e8c6ca3d66a04ae85a92ebbcba139 /src/examples/fixedwing_control/main.c | |
| parent | 30612eb32d1acd3139e28254bb0b7e793826a343 (diff) | |
| parent | 5bb004a7113484a5461c07af31d51b3579a8596e (diff) | |
| download | px4-firmware-8016032a40aaab55fc1d48d1a092cb00d5da92d0.tar.gz px4-firmware-8016032a40aaab55fc1d48d1a092cb00d5da92d0.tar.bz2 px4-firmware-8016032a40aaab55fc1d48d1a092cb00d5da92d0.zip | |
Merged beta into paul_estimator
Diffstat (limited to 'src/examples/fixedwing_control/main.c')
| -rw-r--r-- | src/examples/fixedwing_control/main.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/examples/fixedwing_control/main.c b/src/examples/fixedwing_control/main.c index b286e0007..067d77364 100644 --- a/src/examples/fixedwing_control/main.c +++ b/src/examples/fixedwing_control/main.c @@ -181,11 +181,7 @@ void control_heading(const struct vehicle_global_position_s *pos, const struct v * Calculate heading error of current position to desired position */ - /* - * PX4 uses 1e7 scaled integers to represent global coordinates for max resolution, - * so they need to be scaled by 1e7 and converted to IEEE double precision floating point. - */ - float bearing = get_bearing_to_next_waypoint(pos->lat/1e7d, pos->lon/1e7d, sp->lat/1e7d, sp->lon/1e7d); + float bearing = get_bearing_to_next_waypoint(pos->lat, pos->lon, sp->lat, sp->lon); /* calculate heading error */ float yaw_err = att->yaw - bearing; |