diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-04-05 09:03:23 -0700 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-04-05 09:03:23 -0700 |
| commit | be6c0d2ece235077f067f4db10689b8ad3d9c5b1 (patch) | |
| tree | 21a42edb73c6dc401f817df5b84876e656c672b6 /src/modules/uORB | |
| parent | 3e5f0813a88817418cc259a5574372e5edca0432 (diff) | |
| parent | a1a4013d02ca7ec3f62c6c3f2e4b95181f365c35 (diff) | |
| download | px4-firmware-be6c0d2ece235077f067f4db10689b8ad3d9c5b1.tar.gz px4-firmware-be6c0d2ece235077f067f4db10689b8ad3d9c5b1.tar.bz2 px4-firmware-be6c0d2ece235077f067f4db10689b8ad3d9c5b1.zip | |
Merge pull request #803 from PX4/airspeed_scaling
Airspeed scaling
Diffstat (limited to 'src/modules/uORB')
| -rw-r--r-- | src/modules/uORB/topics/airspeed.h | 5 | ||||
| -rw-r--r-- | src/modules/uORB/topics/differential_pressure.h | 9 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/modules/uORB/topics/airspeed.h b/src/modules/uORB/topics/airspeed.h index a3da3758f..d2ee754cd 100644 --- a/src/modules/uORB/topics/airspeed.h +++ b/src/modules/uORB/topics/airspeed.h @@ -52,9 +52,10 @@ * Airspeed */ struct airspeed_s { - uint64_t timestamp; /**< microseconds since system boot, needed to integrate */ + uint64_t timestamp; /**< microseconds since system boot, needed to integrate */ float indicated_airspeed_m_s; /**< indicated airspeed in meters per second, -1 if unknown */ - float true_airspeed_m_s; /**< true airspeed in meters per second, -1 if unknown */ + float true_airspeed_m_s; /**< true airspeed in meters per second, -1 if unknown */ + float air_temperature_celsius; /**< air temperature in degrees celsius, -1000 if unknown */ }; /** diff --git a/src/modules/uORB/topics/differential_pressure.h b/src/modules/uORB/topics/differential_pressure.h index ff88b04c6..01e14cda9 100644 --- a/src/modules/uORB/topics/differential_pressure.h +++ b/src/modules/uORB/topics/differential_pressure.h @@ -52,13 +52,14 @@ * Differential pressure. */ struct differential_pressure_s { - uint64_t timestamp; /**< microseconds since system boot, needed to integrate */ - uint64_t error_count; + uint64_t timestamp; /**< Microseconds since system boot, needed to integrate */ + uint64_t error_count; /**< Number of errors detected by driver */ float differential_pressure_pa; /**< Differential pressure reading */ + float differential_pressure_raw_pa; /**< Raw differential pressure reading (may be negative) */ 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, -1000.0f if unknown */ + float voltage; /**< Voltage from analog airspeed sensors (voltage divider already compensated) */ + float temperature; /**< Temperature provided by sensor, -1000.0f if unknown */ }; |