Split diff pressure and airspeed.

This commit is contained in:
Simon Wilks
2013-04-19 16:20:40 +02:00
parent c5a453cd18
commit df6976c8d6
7 changed files with 80 additions and 93 deletions
+3
View File
@@ -122,6 +122,9 @@ ORB_DEFINE(optical_flow, struct optical_flow_s);
#include "topics/omnidirectional_flow.h"
ORB_DEFINE(omnidirectional_flow, struct omnidirectional_flow_s);
#include "topics/airspeed.h"
ORB_DEFINE(airspeed, struct airspeed_s);
#include "topics/differential_pressure.h"
ORB_DEFINE(differential_pressure, struct differential_pressure_s);
+4 -7
View File
@@ -49,16 +49,13 @@
*/
/**
* Differential pressure and airspeed
* Differential pressure.
*/
struct differential_pressure_s {
uint64_t timestamp; /**< microseconds since system boot, needed to integrate */
float static_pressure_mbar; /**< Static / environment pressure */
float differential_pressure_mbar; /**< Differential pressure reading */
float temperature_celcius; /**< ambient temperature in celcius, -1 if unknown */
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 voltage; /**< Voltage from the airspeed sensor (voltage divider already compensated) */
float differential_pressure_pa; /**< Differential pressure reading */
float voltage; /**< Voltage from analog airspeed sensors (voltage divider already compensated) */
};
/**
+2
View File
@@ -103,6 +103,8 @@ struct sensor_combined_s {
float mcu_temp_celcius; /**< Internal temperature measurement of MCU */
uint32_t baro_counter; /**< Number of raw baro measurements taken */
float differential_pressure_pa; /**< Airspeed sensor differential pressure */
uint32_t differential_pressure_counter; /**< Number of raw differential pressure measurements taken */
};
/**