aboutsummaryrefslogtreecommitdiff
path: root/src/drivers/drv_mag.h
diff options
context:
space:
mode:
authorJulian Oes <julian@oes.ch>2013-10-11 14:05:11 +0200
committerJulian Oes <julian@oes.ch>2013-10-11 14:05:11 +0200
commit2d23d5fd4ec3a00ae18c63304a3b1b3905d7de66 (patch)
treedfe21bf4ddd3b10e2e92cd3d6be206de5a445616 /src/drivers/drv_mag.h
parent326f241185f45d9e2d4377e8096a8a2f05f65b0d (diff)
parent1306c9de7b946783ff1143bb42a33734e9380e2c (diff)
downloadpx4-firmware-2d23d5fd4ec3a00ae18c63304a3b1b3905d7de66.tar.gz
px4-firmware-2d23d5fd4ec3a00ae18c63304a3b1b3905d7de66.tar.bz2
px4-firmware-2d23d5fd4ec3a00ae18c63304a3b1b3905d7de66.zip
Merge remote-tracking branch 'px4/master' into pwm_ioctls
Conflicts: src/drivers/px4io/px4io.cpp
Diffstat (limited to 'src/drivers/drv_mag.h')
-rw-r--r--src/drivers/drv_mag.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/drivers/drv_mag.h b/src/drivers/drv_mag.h
index 3de5625fd..06107bd3d 100644
--- a/src/drivers/drv_mag.h
+++ b/src/drivers/drv_mag.h
@@ -54,6 +54,7 @@
*/
struct mag_report {
uint64_t timestamp;
+ uint64_t error_count;
float x;
float y;
float z;