diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-03-21 13:33:19 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-03-21 13:33:19 +0100 |
| commit | bc451eef4b92e21f575ad0b695d869f7316df2ce (patch) | |
| tree | 42eb3552554eb4dd68a3f348c91d84d74283de55 /src/modules/sensors/sensors.cpp | |
| parent | d2a74dff673e2d3f49fc98dea601be753bd18416 (diff) | |
| parent | 057bcf3172f3c8d1bab561e7e4cad14977cd74d0 (diff) | |
| download | px4-firmware-bc451eef4b92e21f575ad0b695d869f7316df2ce.tar.gz px4-firmware-bc451eef4b92e21f575ad0b695d869f7316df2ce.tar.bz2 px4-firmware-bc451eef4b92e21f575ad0b695d869f7316df2ce.zip | |
Merge remote-tracking branch 'upstream/master' into diff_press_filter
Conflicts:
src/drivers/meas_airspeed/meas_airspeed.cpp
Diffstat (limited to 'src/modules/sensors/sensors.cpp')
| -rw-r--r-- | src/modules/sensors/sensors.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/modules/sensors/sensors.cpp b/src/modules/sensors/sensors.cpp index 4ee04d462..177f21667 100644 --- a/src/modules/sensors/sensors.cpp +++ b/src/modules/sensors/sensors.cpp @@ -1031,6 +1031,7 @@ Sensors::diff_pres_poll(struct sensor_combined_s &raw) raw.differential_pressure_filtered_pa = _diff_pres.differential_pressure_filtered_pa; raw.differential_pressure_counter++; + _airspeed.timestamp = hrt_absolute_time(); _airspeed.indicated_airspeed_m_s = calc_indicated_airspeed(_diff_pres.differential_pressure_pa); _airspeed.true_airspeed_m_s = calc_true_airspeed(_diff_pres.differential_pressure_pa + raw.baro_pres_mbar * 1e2f, raw.baro_pres_mbar * 1e2f, raw.baro_temp_celcius - PCB_TEMP_ESTIMATE_DEG); |