diff options
author | Ban Siesta <bansiesta@gmail.com> | 2015-01-04 10:43:28 +0000 |
---|---|---|
committer | Ban Siesta <bansiesta@gmail.com> | 2015-01-04 10:43:28 +0000 |
commit | 25fc9d791a1faf5d37a6b9a13bd16fafd6a5cf5b (patch) | |
tree | 34f01351e24634e58391ecd82ce8727ec085fa40 /src/modules/position_estimator_inav | |
parent | 4cc7f599d1f29607fae625e26a586d0758f67283 (diff) | |
download | px4-firmware-25fc9d791a1faf5d37a6b9a13bd16fafd6a5cf5b.tar.gz px4-firmware-25fc9d791a1faf5d37a6b9a13bd16fafd6a5cf5b.tar.bz2 px4-firmware-25fc9d791a1faf5d37a6b9a13bd16fafd6a5cf5b.zip |
renaming of gps time to UTC time
Diffstat (limited to 'src/modules/position_estimator_inav')
-rw-r--r-- | src/modules/position_estimator_inav/position_estimator_inav_main.c | 10 |
1 files changed, 5 insertions, 5 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 1962151fa..2f972fc9f 100644 --- a/src/modules/position_estimator_inav/position_estimator_inav_main.c +++ b/src/modules/position_estimator_inav/position_estimator_inav_main.c @@ -282,13 +282,13 @@ int position_estimator_inav_thread_main(int argc, char *argv[]) }; float w_gps_xy = 1.0f; float w_gps_z = 1.0f; - + float corr_vision[3][2] = { { 0.0f, 0.0f }, // N (pos, vel) { 0.0f, 0.0f }, // E (pos, vel) { 0.0f, 0.0f }, // D (pos, vel) }; - + float corr_sonar = 0.0f; float corr_sonar_filtered = 0.0f; @@ -650,13 +650,13 @@ int position_estimator_inav_thread_main(int argc, char *argv[]) x_est[1] = vision.vx; y_est[0] = vision.y; y_est[1] = vision.vy; - /* only reset the z estimate if the z weight parameter is not zero */ + /* only reset the z estimate if the z weight parameter is not zero */ if (params.w_z_vision_p > MIN_VALID_W) { z_est[0] = vision.z; z_est[1] = vision.vz; } - + vision_valid = true; last_vision_x = vision.x; @@ -1166,7 +1166,7 @@ int position_estimator_inav_thread_main(int argc, char *argv[]) if (local_pos.xy_global && local_pos.z_global) { /* publish global position */ global_pos.timestamp = t; - global_pos.time_gps_usec = gps.time_gps_usec; + global_pos.time_utc_usec = gps.time_utc_usec; double est_lat, est_lon; map_projection_reproject(&ref, local_pos.x, local_pos.y, &est_lat, &est_lon); |