Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_GPS: fix implicit conversion warning from float to double

This commit is contained in:
Pierre Kancir 2017-03-17 11:27:23 +01:00 committed by Tom Pittenger
parent 33f91b5af5
commit afb488c627
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/AP_GPS/AP_GPS.cpp
View File

@ -1457,7 +1457,7 @@ void AP_GPS::calc_blended_state(void)
double temp_time_0 = 0.0;
for (uint8_t i=0; i<GPS_MAX_RECEIVERS; i++) {
if (_blend_weights[i] > 0.0f) {
temp_time_0 += (double)state[i].time_week_ms * _blend_weights[i];
temp_time_0 += (double)state[i].time_week_ms * (double)_blend_weights[i];
}
}
state[GPS_BLENDED_INSTANCE].time_week_ms = (uint32_t)temp_time_0;
@ -1468,8 +1468,8 @@ void AP_GPS::calc_blended_state(void)
double temp_time_2 = 0.0;
for (uint8_t i=0; i<GPS_MAX_RECEIVERS; i++) {
if (_blend_weights[i] > 0.0f) {
temp_time_1 += (double)timing[i].last_fix_time_ms * _blend_weights[i];
temp_time_2 += (double)timing[i].last_message_time_ms * _blend_weights[i];
temp_time_1 += (double)timing[i].last_fix_time_ms * (double) _blend_weights[i];
temp_time_2 += (double)timing[i].last_message_time_ms * (double)_blend_weights[i];
_blended_lag_sec += get_lag(i) * _blended_lag_sec;
}
}