aboutsummaryrefslogtreecommitdiff
path: root/apps/sdlog/sdlog_ringbuffer.h
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2013-01-09 16:37:45 +0100
committerLorenz Meier <lm@inf.ethz.ch>2013-01-09 16:37:45 +0100
commit16e49c447d788c73535a6dd36474673cbf9b8e4f (patch)
tree5d9770de8c0450108a3c425352ae7e662a2add38 /apps/sdlog/sdlog_ringbuffer.h
parente1a6f1b9107c67179c9499e252c16ed6ea4bc2da (diff)
downloadpx4-firmware-16e49c447d788c73535a6dd36474673cbf9b8e4f.tar.gz
px4-firmware-16e49c447d788c73535a6dd36474673cbf9b8e4f.tar.bz2
px4-firmware-16e49c447d788c73535a6dd36474673cbf9b8e4f.zip
Added support for battery voltage and differential pressure to logging and plot script
Diffstat (limited to 'apps/sdlog/sdlog_ringbuffer.h')
-rw-r--r--apps/sdlog/sdlog_ringbuffer.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/apps/sdlog/sdlog_ringbuffer.h b/apps/sdlog/sdlog_ringbuffer.h
index 68fff3a91..f7fc0d450 100644
--- a/apps/sdlog/sdlog_ringbuffer.h
+++ b/apps/sdlog/sdlog_ringbuffer.h
@@ -54,6 +54,8 @@ struct sdlog_sysvector {
float control[4]; /**< roll, pitch, yaw [-1..1], thrust [0..1] */
float actuators[8]; /**< motor 1-8, in motor units (PWM: 1000-2000,AR.Drone: 0-512) */
float vbat; /**< battery voltage in [volt] */
+ float bat_current; /**< battery discharge current */
+ float bat_discharged; /**< discharged energy in mAh */
float adc[3]; /**< remaining auxiliary ADC ports [volt] */
float local_position[3]; /**< tangent plane mapping into x,y,z [m] */
int32_t gps_raw_position[3]; /**< latitude [degrees] north, longitude [degrees] east, altitude above MSL [millimeter] */
@@ -62,6 +64,9 @@ struct sdlog_sysvector {
float vicon[6]; /**< Vicon ground truth x, y, z and roll, pitch, yaw */
float control_effective[4]; /**< roll, pitch, yaw [-1..1], thrust [0..1] */
float flow[6]; /**< flow raw x, y, flow metric x, y, flow ground dist, flow quality */
+ float diff_pressure; /**< differential pressure */
+ float ind_airspeed; /**< indicated airspeed */
+ float true_airspeed; /**< true airspeed */
};
#pragma pack(pop)