diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-06-30 16:32:32 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-06-30 16:32:32 +0200 |
| commit | ad4411bfc1894c8a9ca42f563f7bf8207b39e7c1 (patch) | |
| tree | c3e01dc3b0e5e96bdc8c8fab3e4d1927997018e2 /src | |
| parent | d45d204691531dc3ba9b1ba2f397409938d184dd (diff) | |
| download | px4-firmware-ad4411bfc1894c8a9ca42f563f7bf8207b39e7c1.tar.gz px4-firmware-ad4411bfc1894c8a9ca42f563f7bf8207b39e7c1.tar.bz2 px4-firmware-ad4411bfc1894c8a9ca42f563f7bf8207b39e7c1.zip | |
Fix line endings for patch
Diffstat (limited to 'src')
| -rw-r--r-- | src/modules/position_estimator_inav/position_estimator_inav_main.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/modules/position_estimator_inav/position_estimator_inav_main.c b/src/modules/position_estimator_inav/position_estimator_inav_main.c index 488b53453..5b312941e 100644 --- a/src/modules/position_estimator_inav/position_estimator_inav_main.c +++ b/src/modules/position_estimator_inav/position_estimator_inav_main.c @@ -478,7 +478,11 @@ int position_estimator_inav_thread_main(int argc, char *argv[]) float flow_dt = flow_prev > 0 ? (flow.flow_timestamp - flow_prev) * 1e-6f : 0.1f; flow_prev = flow.flow_timestamp; - if (flow.ground_distance_m > 0.31f && flow.ground_distance_m < 4.0f && att.R[2][2] > 0.7f && (fabsf(flow.ground_distance_m - sonar_prev) > FLT_EPSILON)) { + if ((flow.ground_distance_m > 0.31f) && + (flow.ground_distance_m < 4.0f) && + (att.R[2][2] > 0.7f) && + (fabsf(flow.ground_distance_m - sonar_prev) > FLT_EPSILON)) { + sonar_time = t; sonar_prev = flow.ground_distance_m; corr_sonar = flow.ground_distance_m + surface_offset + z_est[0]; |