From fe717dfcc6be2a86186be04a9fbbbce07a2e1214 Mon Sep 17 00:00:00 2001 From: henn1001 Date: Fri, 18 Sep 2015 18:46:54 +0200 Subject: [PATCH] Fixed IRQ to EXTI3_IRQHandler Changed IRQ functionname - no handler needed --- src/main/drivers/accgyro_spi_mpu6000.c | 7 +++---- src/main/sensors/initialisation.c | 2 +- src/main/target/CC3D/target.h | 1 - 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/drivers/accgyro_spi_mpu6000.c b/src/main/drivers/accgyro_spi_mpu6000.c index b0594bd6f..067fc6074 100644 --- a/src/main/drivers/accgyro_spi_mpu6000.c +++ b/src/main/drivers/accgyro_spi_mpu6000.c @@ -143,8 +143,9 @@ void checkMPU6000DataReady(bool *mpuDataReadyPtr); static bool mpuDataReady; static const mpu6000Config_t *mpu6000Config = NULL; -// -void MPU_DATA_READY_EXTI_Handler(void) + +//void MPU_DATA_READY_EXTI_Handler(void) +void EXTI3_IRQHandler(void) { if (EXTI_GetITStatus(mpu6000Config->exti_line) == RESET) { return; @@ -198,8 +199,6 @@ void configureMPUDataReadyInterruptHandling(void) } #endif - registerExti15_10_CallbackHandler(MPU_DATA_READY_EXTI_Handler); - EXTI_ClearITPendingBit(mpu6000Config->exti_line); EXTI_InitTypeDef EXTIInit; diff --git a/src/main/sensors/initialisation.c b/src/main/sensors/initialisation.c index 87f321b41..8ab765e70 100755 --- a/src/main/sensors/initialisation.c +++ b/src/main/sensors/initialisation.c @@ -149,7 +149,7 @@ const mpu6000Config_t *selectMPU6000Config(void) .exti_port_source = GPIO_PortSourceGPIOA, .exti_pin_source = GPIO_PinSource3, .exti_line = EXTI_Line3, - .exti_irqn = EXTI15_10_IRQn + .exti_irqn = EXTI3_IRQn }; return &CC3DMPU6000Config; #endif diff --git a/src/main/target/CC3D/target.h b/src/main/target/CC3D/target.h index 19e2ee25d..9f23c49cc 100644 --- a/src/main/target/CC3D/target.h +++ b/src/main/target/CC3D/target.h @@ -55,7 +55,6 @@ #define ACC_SPI_MPU6000_ALIGN CW270_DEG // MPU6000 interrupts -#define EXTI15_10_CALLBACK_HANDLER_COUNT 1 // MPU data ready #define USE_MPU_DATA_READY_SIGNAL // External I2C BARO