aboutsummaryrefslogtreecommitdiff
path: root/src/modules/sensors/sensors.cpp
diff options
context:
space:
mode:
authorThomas Gubler <thomasgubler@gmail.com>2014-03-21 13:35:01 +0100
committerThomas Gubler <thomasgubler@gmail.com>2014-03-21 13:35:01 +0100
commit70b3a851941c4cb6e57684035751c03a909a60fb (patch)
tree5d3010b2828c4bd93e1e622ef9b4ca3ac2f657b2 /src/modules/sensors/sensors.cpp
parentbe349b989a7a716a4e8d5ff4143f79124d7abc76 (diff)
parentbc451eef4b92e21f575ad0b695d869f7316df2ce (diff)
downloadpx4-firmware-70b3a851941c4cb6e57684035751c03a909a60fb.tar.gz
px4-firmware-70b3a851941c4cb6e57684035751c03a909a60fb.tar.bz2
px4-firmware-70b3a851941c4cb6e57684035751c03a909a60fb.zip
Merge branch 'diff_press_filter' into diff_press_filter_use
Conflicts: src/modules/sensors/sensors.cpp
Diffstat (limited to 'src/modules/sensors/sensors.cpp')
-rw-r--r--src/modules/sensors/sensors.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/modules/sensors/sensors.cpp b/src/modules/sensors/sensors.cpp
index d62177c85..c1e2da7ef 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_filtered_pa);
_airspeed.true_airspeed_m_s = calc_true_airspeed(_diff_pres.differential_pressure_filtered_pa + raw.baro_pres_mbar * 1e2f,
raw.baro_pres_mbar * 1e2f, raw.baro_temp_celcius - PCB_TEMP_ESTIMATE_DEG);