diff options
| author | Julian Oes <julian@oes.ch> | 2013-10-11 14:05:11 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2013-10-11 14:05:11 +0200 |
| commit | 2d23d5fd4ec3a00ae18c63304a3b1b3905d7de66 (patch) | |
| tree | dfe21bf4ddd3b10e2e92cd3d6be206de5a445616 /src/drivers/mpu6000/mpu6000.cpp | |
| parent | 326f241185f45d9e2d4377e8096a8a2f05f65b0d (diff) | |
| parent | 1306c9de7b946783ff1143bb42a33734e9380e2c (diff) | |
| download | px4-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/mpu6000/mpu6000.cpp')
| -rw-r--r-- | src/drivers/mpu6000/mpu6000.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/drivers/mpu6000/mpu6000.cpp b/src/drivers/mpu6000/mpu6000.cpp index 14a3571de..70359110e 100644 --- a/src/drivers/mpu6000/mpu6000.cpp +++ b/src/drivers/mpu6000/mpu6000.cpp @@ -1186,7 +1186,7 @@ MPU6000::measure() * Adjust and scale results to m/s^2. */ grb.timestamp = arb.timestamp = hrt_absolute_time(); - + grb.error_count = arb.error_count = 0; // not reported /* * 1) Scale raw value to SI units using scaling from datasheet. |