diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-03-28 10:44:28 +0400 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-03-28 10:44:28 +0400 |
| commit | a991ebd8ca4aa1dc6fd69e307a74be6a93f4e6ff (patch) | |
| tree | 6f96a4c1e8814cb9232b6b1f94a0f7be4d87116e /src/modules/uORB | |
| parent | 83da4ae02dfc61d6a7f80ae40660826fbbca81be (diff) | |
| parent | 9b1de5004c673ebe8bdf68f1b518565cccd6b05b (diff) | |
| download | px4-firmware-a991ebd8ca4aa1dc6fd69e307a74be6a93f4e6ff.tar.gz px4-firmware-a991ebd8ca4aa1dc6fd69e307a74be6a93f4e6ff.tar.bz2 px4-firmware-a991ebd8ca4aa1dc6fd69e307a74be6a93f4e6ff.zip | |
Merge branch 'master' into mpc_local_pos
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 92812efd4..cc25a83c3 100644 --- a/src/modules/uORB/topics/sensor_combined.h +++ b/src/modules/uORB/topics/sensor_combined.h @@ -104,6 +104,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 */ + }; /** |