From 7f4617b676cfd6a34ca32679d2771b7eb1ae0a45 Mon Sep 17 00:00:00 2001 From: Martin Budden Date: Sun, 11 Dec 2016 10:40:51 +0000 Subject: [PATCH] Renamed MPU functions to have mpu prefix --- src/main/drivers/accgyro_mpu.c | 4 ++-- src/main/drivers/accgyro_mpu.h | 6 +++--- src/main/drivers/accgyro_mpu3050.c | 2 +- src/main/drivers/accgyro_mpu6050.c | 2 +- src/main/drivers/accgyro_mpu6500.c | 2 +- src/main/drivers/accgyro_spi_icm20689.c | 2 +- src/main/drivers/accgyro_spi_mpu6000.c | 2 +- src/main/drivers/accgyro_spi_mpu6500.c | 2 +- src/main/drivers/accgyro_spi_mpu9250.c | 2 +- src/main/sensors/initialisation.c | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/drivers/accgyro_mpu.c b/src/main/drivers/accgyro_mpu.c index 3f59e2fb9..7c87b8fdd 100644 --- a/src/main/drivers/accgyro_mpu.c +++ b/src/main/drivers/accgyro_mpu.c @@ -75,7 +75,7 @@ static const extiConfig_t *mpuIntExtiConfig = NULL; #define MPU_INQUIRY_MASK 0x7E -mpuDetectionResult_t *detectMpu(const extiConfig_t *configToUse) +mpuDetectionResult_t *mpuDetect(const extiConfig_t *configToUse) { memset(&mpuDetectionResult, 0, sizeof(mpuDetectionResult)); memset(&mpuConfiguration, 0, sizeof(mpuConfiguration)); @@ -334,7 +334,7 @@ void mpuGyroInit(gyroDev_t *gyro) mpuIntExtiInit(gyro); } -bool checkMPUDataReady(gyroDev_t* gyro) +bool mpuCheckDataReady(gyroDev_t* gyro) { bool ret; if (gyro->dataReady) { diff --git a/src/main/drivers/accgyro_mpu.h b/src/main/drivers/accgyro_mpu.h index 2eafe89f0..cb97af5ce 100644 --- a/src/main/drivers/accgyro_mpu.h +++ b/src/main/drivers/accgyro_mpu.h @@ -183,10 +183,10 @@ typedef struct mpuDetectionResult_s { extern mpuDetectionResult_t mpuDetectionResult; -void configureMPUDataReadyInterruptHandling(void); +void mpuConfigureDataReadyInterruptHandling(void); struct gyroDev_s; void mpuGyroInit(struct gyroDev_s *gyro); bool mpuAccRead(int16_t *accData); bool mpuGyroRead(struct gyroDev_s *gyro); -mpuDetectionResult_t *detectMpu(const extiConfig_t *configToUse); -bool checkMPUDataReady(struct gyroDev_s *gyro); +mpuDetectionResult_t *mpuDetect(const extiConfig_t *configToUse); +bool mpuCheckDataReady(struct gyroDev_s *gyro); diff --git a/src/main/drivers/accgyro_mpu3050.c b/src/main/drivers/accgyro_mpu3050.c index 800c128c3..fe4692c20 100644 --- a/src/main/drivers/accgyro_mpu3050.c +++ b/src/main/drivers/accgyro_mpu3050.c @@ -82,7 +82,7 @@ bool mpu3050Detect(gyroDev_t *gyro) gyro->init = mpu3050Init; gyro->read = mpuGyroRead; gyro->temperature = mpu3050ReadTemperature; - gyro->intStatus = checkMPUDataReady; + gyro->intStatus = mpuCheckDataReady; // 16.4 dps/lsb scalefactor gyro->scale = 1.0f / 16.4f; diff --git a/src/main/drivers/accgyro_mpu6050.c b/src/main/drivers/accgyro_mpu6050.c index eb57bc801..35d475a3a 100644 --- a/src/main/drivers/accgyro_mpu6050.c +++ b/src/main/drivers/accgyro_mpu6050.c @@ -106,7 +106,7 @@ bool mpu6050GyroDetect(gyroDev_t *gyro) } gyro->init = mpu6050GyroInit; gyro->read = mpuGyroRead; - gyro->intStatus = checkMPUDataReady; + gyro->intStatus = mpuCheckDataReady; // 16.4 dps/lsb scalefactor gyro->scale = 1.0f / 16.4f; diff --git a/src/main/drivers/accgyro_mpu6500.c b/src/main/drivers/accgyro_mpu6500.c index 295fd815a..a5254ba59 100644 --- a/src/main/drivers/accgyro_mpu6500.c +++ b/src/main/drivers/accgyro_mpu6500.c @@ -94,7 +94,7 @@ bool mpu6500GyroDetect(gyroDev_t *gyro) gyro->init = mpu6500GyroInit; gyro->read = mpuGyroRead; - gyro->intStatus = checkMPUDataReady; + gyro->intStatus = mpuCheckDataReady; // 16.4 dps/lsb scalefactor gyro->scale = 1.0f / 16.4f; diff --git a/src/main/drivers/accgyro_spi_icm20689.c b/src/main/drivers/accgyro_spi_icm20689.c index af432735b..286e2171e 100644 --- a/src/main/drivers/accgyro_spi_icm20689.c +++ b/src/main/drivers/accgyro_spi_icm20689.c @@ -168,7 +168,7 @@ bool icm20689SpiGyroDetect(gyroDev_t *gyro) gyro->init = icm20689GyroInit; gyro->read = mpuGyroRead; - gyro->intStatus = checkMPUDataReady; + gyro->intStatus = mpuCheckDataReady; // 16.4 dps/lsb scalefactor gyro->scale = 1.0f / 16.4f; diff --git a/src/main/drivers/accgyro_spi_mpu6000.c b/src/main/drivers/accgyro_spi_mpu6000.c index 2f0fe9443..67192ecef 100644 --- a/src/main/drivers/accgyro_spi_mpu6000.c +++ b/src/main/drivers/accgyro_spi_mpu6000.c @@ -274,7 +274,7 @@ bool mpu6000SpiGyroDetect(gyroDev_t *gyro) gyro->init = mpu6000SpiGyroInit; gyro->read = mpuGyroRead; - gyro->intStatus = checkMPUDataReady; + gyro->intStatus = mpuCheckDataReady; // 16.4 dps/lsb scalefactor gyro->scale = 1.0f / 16.4f; diff --git a/src/main/drivers/accgyro_spi_mpu6500.c b/src/main/drivers/accgyro_spi_mpu6500.c index b14a9ca93..a6a19f7ad 100755 --- a/src/main/drivers/accgyro_spi_mpu6500.c +++ b/src/main/drivers/accgyro_spi_mpu6500.c @@ -134,7 +134,7 @@ bool mpu6500SpiGyroDetect(gyroDev_t *gyro) gyro->init = mpu6500SpiGyroInit; gyro->read = mpuGyroRead; - gyro->intStatus = checkMPUDataReady; + gyro->intStatus = mpuCheckDataReady; // 16.4 dps/lsb scalefactor gyro->scale = 1.0f / 16.4f; diff --git a/src/main/drivers/accgyro_spi_mpu9250.c b/src/main/drivers/accgyro_spi_mpu9250.c index 81415fac1..8e9253a71 100644 --- a/src/main/drivers/accgyro_spi_mpu9250.c +++ b/src/main/drivers/accgyro_spi_mpu9250.c @@ -229,7 +229,7 @@ bool mpu9250SpiGyroDetect(gyroDev_t *gyro) gyro->init = mpu9250SpiGyroInit; gyro->read = mpuGyroRead; - gyro->intStatus = checkMPUDataReady; + gyro->intStatus = mpuCheckDataReady; // 16.4 dps/lsb scalefactor gyro->scale = 1.0f / 16.4f; diff --git a/src/main/sensors/initialisation.c b/src/main/sensors/initialisation.c index 4e43b50ba..341ca113e 100755 --- a/src/main/sensors/initialisation.c +++ b/src/main/sensors/initialisation.c @@ -91,7 +91,7 @@ bool sensorsAutodetect(const gyroConfig_t *gyroConfig, const extiConfig_t *extiConfig = selectMPUIntExtiConfig(); - mpuDetectionResult_t *mpuDetectionResult = detectMpu(extiConfig); + mpuDetectionResult_t *mpuDetectionResult = mpuDetect(extiConfig); UNUSED(mpuDetectionResult); #endif