diff options
| author | Andrew Tridgell <tridge@samba.org> | 2014-07-11 22:21:53 +1000 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-12 16:27:39 +0200 |
| commit | 8a3a87331da2077cd1da4c3da8fe2743f188a4a4 (patch) | |
| tree | 5bce9260dd8c4182f7d5062208d8a7053ff2e8f9 /src/drivers/mpu6000 | |
| parent | 20cd5026d817a4f17b96906d1c93fc3cbaa498dd (diff) | |
| download | px4-firmware-8a3a87331da2077cd1da4c3da8fe2743f188a4a4.tar.gz px4-firmware-8a3a87331da2077cd1da4c3da8fe2743f188a4a4.tar.bz2 px4-firmware-8a3a87331da2077cd1da4c3da8fe2743f188a4a4.zip | |
mpu6000: fixed internal/external mixup in pointers
Thanks to Emile for spotting this!
Conflicts:
mavlink/include/mavlink/v1.0
Diffstat (limited to 'src/drivers/mpu6000')
| -rw-r--r-- | src/drivers/mpu6000/mpu6000.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/drivers/mpu6000/mpu6000.cpp b/src/drivers/mpu6000/mpu6000.cpp index 5668b0865..1b3a96a0d 100644 --- a/src/drivers/mpu6000/mpu6000.cpp +++ b/src/drivers/mpu6000/mpu6000.cpp @@ -1442,7 +1442,7 @@ void start(bool external_bus, enum Rotation rotation) { int fd; - MPU6000 **g_dev_ptr = external_bus?&g_dev_int:&g_dev_ext; + MPU6000 **g_dev_ptr = external_bus?&g_dev_ext:&g_dev_int; const char *path_accel = external_bus?MPU_DEVICE_PATH_ACCEL_EXT:MPU_DEVICE_PATH_ACCEL; const char *path_gyro = external_bus?MPU_DEVICE_PATH_GYRO_EXT:MPU_DEVICE_PATH_GYRO; @@ -1595,7 +1595,7 @@ reset(bool external_bus) void info(bool external_bus) { - MPU6000 **g_dev_ptr = external_bus?&g_dev_int:&g_dev_ext; + MPU6000 **g_dev_ptr = external_bus?&g_dev_ext:&g_dev_int; if (*g_dev_ptr == nullptr) errx(1, "driver not running"); |