diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-11-28 09:47:29 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-11-28 09:47:29 +0100 |
| commit | 2760d64a007e6a1471a26194c32db7df236b9603 (patch) | |
| tree | 5590e5dafc54645e09bf5dad44d9d7cddc9349ec /src/examples | |
| parent | 946d1203cfbbe522c61d6ed5dc1205c9f809f6f1 (diff) | |
| parent | 22a247ca6760996ccb5f583b032253d4af97ed00 (diff) | |
| download | px4-firmware-2760d64a007e6a1471a26194c32db7df236b9603.tar.gz px4-firmware-2760d64a007e6a1471a26194c32db7df236b9603.tar.bz2 px4-firmware-2760d64a007e6a1471a26194c32db7df236b9603.zip | |
Merge remote-tracking branch 'upstream/master' into dev_ros
Diffstat (limited to 'src/examples')
| -rw-r--r-- | src/examples/flow_position_estimator/flow_position_estimator_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/examples/flow_position_estimator/flow_position_estimator_main.c b/src/examples/flow_position_estimator/flow_position_estimator_main.c index c775428ef..0b8c01f79 100644 --- a/src/examples/flow_position_estimator/flow_position_estimator_main.c +++ b/src/examples/flow_position_estimator/flow_position_estimator_main.c @@ -308,8 +308,8 @@ int flow_position_estimator_thread_main(int argc, char *argv[]) if (vehicle_liftoff || params.debug) { /* copy flow */ - flow_speed[0] = flow.flow_comp_x_m; - flow_speed[1] = flow.flow_comp_y_m; + flow_speed[0] = flow.pixel_flow_x_integral / (flow.integration_timespan / 1e6f) * flow.ground_distance_m; + flow_speed[1] = flow.pixel_flow_y_integral / (flow.integration_timespan / 1e6f) * flow.ground_distance_m; flow_speed[2] = 0.0f; /* convert to bodyframe velocity */ |