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/uORB | |
| 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/uORB')
| -rw-r--r-- | src/modules/uORB/topics/differential_pressure.h | 5 | ||||
| -rw-r--r-- | src/modules/uORB/topics/sensor_combined.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/modules/uORB/topics/differential_pressure.h b/src/modules/uORB/topics/differential_pressure.h index 5d94d4288..3592c023c 100644 --- a/src/modules/uORB/topics/differential_pressure.h +++ b/src/modules/uORB/topics/differential_pressure.h @@ -54,8 +54,9 @@ struct differential_pressure_s { uint64_t timestamp; /**< microseconds since system boot, needed to integrate */ uint64_t error_count; - float differential_pressure_pa; /**< Differential pressure reading */ - float max_differential_pressure_pa; /**< Maximum differential pressure reading */ + float differential_pressure_pa; /**< Differential pressure reading */ + float differential_pressure_filtered_pa; /**< Low pass filtered differential pressure reading */ + float max_differential_pressure_pa; /**< Maximum differential pressure reading */ float voltage; /**< Voltage from analog airspeed sensors (voltage divider already compensated) */ float temperature; /**< Temperature provided by sensor */ diff --git a/src/modules/uORB/topics/sensor_combined.h b/src/modules/uORB/topics/sensor_combined.h index 628977656..fa3367de9 100644 --- a/src/modules/uORB/topics/sensor_combined.h +++ b/src/modules/uORB/topics/sensor_combined.h @@ -105,6 +105,8 @@ struct sensor_combined_s { float differential_pressure_pa; /**< Airspeed sensor differential pressure */ uint64_t differential_pressure_timestamp; /**< Last measurement timestamp */ + float differential_pressure_filtered_pa; /**< Low pass filtered airspeed sensor differential pressure reading */ + }; /** |