aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2015-03-25 22:58:25 -0700
committerLorenz Meier <lm@inf.ethz.ch>2015-03-25 22:58:25 -0700
commit8a1cbac683ac58643bc3f17319197ae927c6c23c (patch)
tree71ec30a184049e014f1fd899c95f47d99f86acc6
parent0b26671d62d090eb46854eb251d2bf8c82bfb8e0 (diff)
downloadpx4-firmware-8a1cbac683ac58643bc3f17319197ae927c6c23c.tar.gz
px4-firmware-8a1cbac683ac58643bc3f17319197ae927c6c23c.tar.bz2
px4-firmware-8a1cbac683ac58643bc3f17319197ae927c6c23c.zip
Sensor combined uORB topic: Temperature for all sensors
-rw-r--r--src/modules/uORB/topics/sensor_combined.h11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/modules/uORB/topics/sensor_combined.h b/src/modules/uORB/topics/sensor_combined.h
index ded82adea..a19f3dc10 100644
--- a/src/modules/uORB/topics/sensor_combined.h
+++ b/src/modules/uORB/topics/sensor_combined.h
@@ -83,6 +83,7 @@ struct sensor_combined_s {
int16_t gyro_raw[3]; /**< Raw sensor values of angular velocity */
float gyro_rad_s[3]; /**< Angular velocity in radian per seconds */
unsigned gyro_errcount; /**< Error counter for gyro 0 */
+ float gyro_temp; /**< Temperature of gyro 0 */
int16_t accelerometer_raw[3]; /**< Raw acceleration in NED body frame */
float accelerometer_m_s2[3]; /**< Acceleration in NED body frame, in m/s^2 */
@@ -90,6 +91,7 @@ struct sensor_combined_s {
float accelerometer_range_m_s2; /**< Accelerometer measurement range in m/s^2 */
uint64_t accelerometer_timestamp; /**< Accelerometer timestamp */
unsigned accelerometer_errcount; /**< Error counter for accel 0 */
+ float accelerometer_temp; /**< Temperature of accel 0 */
int16_t magnetometer_raw[3]; /**< Raw magnetic field in NED body frame */
float magnetometer_ga[3]; /**< Magnetic field in NED body frame, in Gauss */
@@ -98,36 +100,43 @@ struct sensor_combined_s {
float magnetometer_cuttoff_freq_hz; /**< Internal analog low pass frequency of sensor */
uint64_t magnetometer_timestamp; /**< Magnetometer timestamp */
unsigned magnetometer_errcount; /**< Error counter for mag 0 */
+ float magnetometer_temp; /**< Temperature of mag 0 */
int16_t gyro1_raw[3]; /**< Raw sensor values of angular velocity */
float gyro1_rad_s[3]; /**< Angular velocity in radian per seconds */
uint64_t gyro1_timestamp; /**< Gyro timestamp */
unsigned gyro1_errcount; /**< Error counter for gyro 1 */
+ float gyro1_temp; /**< Temperature of gyro 1 */
int16_t accelerometer1_raw[3]; /**< Raw acceleration in NED body frame */
float accelerometer1_m_s2[3]; /**< Acceleration in NED body frame, in m/s^2 */
uint64_t accelerometer1_timestamp; /**< Accelerometer timestamp */
unsigned accelerometer1_errcount; /**< Error counter for accel 1 */
+ float accelerometer1_temp; /**< Temperature of accel 1 */
int16_t magnetometer1_raw[3]; /**< Raw magnetic field in NED body frame */
float magnetometer1_ga[3]; /**< Magnetic field in NED body frame, in Gauss */
uint64_t magnetometer1_timestamp; /**< Magnetometer timestamp */
- unsigned magnetometer1_errcount; /**< Error counter for mag 0 */
+ unsigned magnetometer1_errcount; /**< Error counter for mag 1 */
+ float magnetometer1_temp; /**< Temperature of mag 1 */
int16_t gyro2_raw[3]; /**< Raw sensor values of angular velocity */
float gyro2_rad_s[3]; /**< Angular velocity in radian per seconds */
uint64_t gyro2_timestamp; /**< Gyro timestamp */
unsigned gyro2_errcount; /**< Error counter for gyro 1 */
+ float gyro2_temp; /**< Temperature of gyro 1 */
int16_t accelerometer2_raw[3]; /**< Raw acceleration in NED body frame */
float accelerometer2_m_s2[3]; /**< Acceleration in NED body frame, in m/s^2 */
uint64_t accelerometer2_timestamp; /**< Accelerometer timestamp */
unsigned accelerometer2_errcount; /**< Error counter for accel 2 */
+ float accelerometer2_temp; /**< Temperature of accel 2 */
int16_t magnetometer2_raw[3]; /**< Raw magnetic field in NED body frame */
float magnetometer2_ga[3]; /**< Magnetic field in NED body frame, in Gauss */
uint64_t magnetometer2_timestamp; /**< Magnetometer timestamp */
unsigned magnetometer2_errcount; /**< Error counter for mag 2 */
+ float magnetometer2_temp; /**< Temperature of mag 2 */
float baro_pres_mbar; /**< Barometric pressure, already temp. comp. */
float baro_alt_meter; /**< Altitude, already temp. comp. */