From 048ce4ac1aa633c5ff2b8e2a898f7c5a73346dfa Mon Sep 17 00:00:00 2001 From: Martin Budden Date: Tue, 10 May 2016 16:26:18 +0100 Subject: [PATCH] Rebase --- src/main/drivers/accgyro.h | 1 - src/main/io/msp.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/drivers/accgyro.h b/src/main/drivers/accgyro.h index c4e894719..e2618dc95 100644 --- a/src/main/drivers/accgyro.h +++ b/src/main/drivers/accgyro.h @@ -17,7 +17,6 @@ #pragma once - typedef struct gyro_s { sensorGyroInitFuncPtr init; // initialize function sensorReadFuncPtr read; // read 3 axis data function diff --git a/src/main/io/msp.c b/src/main/io/msp.c index 7e47a52e7..d19d7ed64 100644 --- a/src/main/io/msp.c +++ b/src/main/io/msp.c @@ -593,7 +593,7 @@ static int processOutCommand(mspPacket_t *cmd, mspPacket_t *reply) case MSP_RAW_IMU: { // Hack scale due to choice of units for sensor data in multiwii - unsigned scale_shift = (acc_1G > 1024) ? 3 : 0; + unsigned scale_shift = (acc.acc_1G > 1024) ? 3 : 0; for (unsigned i = 0; i < 3; i++) sbufWriteU16(dst, accSmooth[i] >> scale_shift); -- 2.11.4.GIT