diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-03-23 16:58:07 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-03-23 16:58:07 +0100 |
| commit | a490bd04eefc795b63e13d867fc8844f5b438d6e (patch) | |
| tree | 04bb2b954a242180511d9fba64039dbaef6dd9e6 /src/modules/sensors/sensors.cpp | |
| parent | df11310994fc983bc9faab54d107be81aa133ce3 (diff) | |
| parent | 57fdb40a4efb943b0b14593b314ea2f887215d68 (diff) | |
| download | px4-firmware-a490bd04eefc795b63e13d867fc8844f5b438d6e.tar.gz px4-firmware-a490bd04eefc795b63e13d867fc8844f5b438d6e.tar.bz2 px4-firmware-a490bd04eefc795b63e13d867fc8844f5b438d6e.zip | |
Merge branch 'master' into paul_estimator_numeric
Diffstat (limited to 'src/modules/sensors/sensors.cpp')
| -rw-r--r-- | src/modules/sensors/sensors.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/modules/sensors/sensors.cpp b/src/modules/sensors/sensors.cpp index 12ed55480..ebaa6b3aa 100644 --- a/src/modules/sensors/sensors.cpp +++ b/src/modules/sensors/sensors.cpp @@ -1031,10 +1031,11 @@ Sensors::diff_pres_poll(struct sensor_combined_s &raw) raw.differential_pressure_pa = _diff_pres.differential_pressure_pa; raw.differential_pressure_timestamp = _diff_pres.timestamp; + raw.differential_pressure_filtered_pa = _diff_pres.differential_pressure_filtered_pa; - _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, + _airspeed.timestamp = _diff_pres.timestamp; + _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); /* announce the airspeed if needed, just publish else */ |