aboutsummaryrefslogtreecommitdiff
path: root/src/modules/bottle_drop
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2014-08-30 16:44:30 +0200
committerLorenz Meier <lm@inf.ethz.ch>2014-08-30 16:44:30 +0200
commit592f6f2bcb632d6bb86c63b1055560d0c8b526b2 (patch)
tree2fa9767333a3d9b41ac998015e3a986cddb26b2f /src/modules/bottle_drop
parentb53c0d6d7faa24e4ab9988586b8de2b6a6f07ca4 (diff)
downloadpx4-firmware-592f6f2bcb632d6bb86c63b1055560d0c8b526b2.tar.gz
px4-firmware-592f6f2bcb632d6bb86c63b1055560d0c8b526b2.tar.bz2
px4-firmware-592f6f2bcb632d6bb86c63b1055560d0c8b526b2.zip
Revert "Fix drop offset: We want to drop so that the wind carries the bottle into the drop zone"
This reverts commit ef0a0a1a6e86aff79a0fd8829ca5c86244fa39bc.
Diffstat (limited to 'src/modules/bottle_drop')
-rw-r--r--src/modules/bottle_drop/bottle_drop.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/bottle_drop/bottle_drop.cpp b/src/modules/bottle_drop/bottle_drop.cpp
index 65eca1a62..3eec5a879 100644
--- a/src/modules/bottle_drop/bottle_drop.cpp
+++ b/src/modules/bottle_drop/bottle_drop.cpp
@@ -566,8 +566,8 @@ BottleDrop::task_main()
wind_direction_e = wind.windspeed_east / windspeed_norm;
}
- x_drop = x_t - x * wind_direction_n;
- y_drop = y_t - x * wind_direction_e;
+ x_drop = x_t + x * wind_direction_n;
+ y_drop = y_t + x * wind_direction_e;
map_projection_reproject(&ref, x_drop, y_drop, &_drop_position.lat, &_drop_position.lon);
_drop_position.alt = _target_position.alt + _alt_clearance;