fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-07-13 19:40:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into paul_estimator_numeric

Browse Source
This commit is contained in:
Lorenz Meier
2014-03-23 16:58:07 +01:00
parent df11310994 57fdb40a4e
commit a490bd04ee
28 changed files with 265 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/uORB/topics/differential_pressure.h
+3 -2
View File
@@ -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 */
src/modules/uORB/topics/sensor_combined.h
+2
View File
@@ -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 */
};
/**