diff --git a/sw/airborne/lisa/test/lisa_test_adxl345.c b/sw/airborne/lisa/test/lisa_test_adxl345.c index e2d30983b0..bc057e2ffc 100644 --- a/sw/airborne/lisa/test/lisa_test_adxl345.c +++ b/sw/airborne/lisa/test/lisa_test_adxl345.c @@ -21,6 +21,13 @@ * Boston, MA 02111-1307, USA. */ +/* lisa/L lisa/M + * ACC_DRDY PD2 PB2 + * ACC_SS PB12 PB12 + * + */ + + #include #include #include @@ -207,14 +214,14 @@ static inline void main_init_hw( void ) { GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz; GPIO_Init(GPIOB, &GPIO_InitStructure); - /* configure external interrupt exti2 on PD2( accel int ) */ - RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOD | RCC_APB2Periph_AFIO, ENABLE); + /* configure external interrupt exti2 on P(B/D)2( accel int ) */ + RCC_APB2PeriphClockCmd(IMU_ACC_DRDY_RCC_GPIO | RCC_APB2Periph_AFIO, ENABLE); GPIO_InitStructure.GPIO_Pin = GPIO_Pin_2; GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IN_FLOATING; GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz; - GPIO_Init(GPIOD, &GPIO_InitStructure); + GPIO_Init(IMU_ACC_DRDY_GPIO, &GPIO_InitStructure); EXTI_InitTypeDef EXTI_InitStructure; - GPIO_EXTILineConfig(GPIO_PortSourceGPIOD, GPIO_PinSource2); + GPIO_EXTILineConfig(IMU_ACC_DRDY_GPIO_PORTSOURCE, GPIO_PinSource2); EXTI_InitStructure.EXTI_Line = EXTI_Line2; EXTI_InitStructure.EXTI_Mode = EXTI_Mode_Interrupt; EXTI_InitStructure.EXTI_Trigger = EXTI_Trigger_Falling; diff --git a/sw/airborne/lisa/test/lisa_test_adxl345_dma.c b/sw/airborne/lisa/test/lisa_test_adxl345_dma.c index 13add03e2a..56c135e211 100644 --- a/sw/airborne/lisa/test/lisa_test_adxl345_dma.c +++ b/sw/airborne/lisa/test/lisa_test_adxl345_dma.c @@ -215,13 +215,13 @@ static inline void main_init_hw( void ) { GPIO_Init(GPIOB, &GPIO_InitStructure); /* configure external interrupt exti2 on PD2( accel int ) */ - RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOD | RCC_APB2Periph_AFIO, ENABLE); + RCC_APB2PeriphClockCmd(IMU_ACC_DRDY_RCC_GPIO | RCC_APB2Periph_AFIO, ENABLE); GPIO_InitStructure.GPIO_Pin = GPIO_Pin_2; GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IN_FLOATING; GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz; - GPIO_Init(GPIOD, &GPIO_InitStructure); + GPIO_Init(IMU_ACC_DRDY_GPIO, &GPIO_InitStructure); EXTI_InitTypeDef EXTI_InitStructure; - GPIO_EXTILineConfig(GPIO_PortSourceGPIOD, GPIO_PinSource2); + GPIO_EXTILineConfig(IMU_ACC_DRDY_GPIO_PORTSOURCE, GPIO_PinSource2); EXTI_InitStructure.EXTI_Line = EXTI_Line2; EXTI_InitStructure.EXTI_Mode = EXTI_Mode_Interrupt; EXTI_InitStructure.EXTI_Trigger = EXTI_Trigger_Falling; diff --git a/sw/airborne/lisa/test/lisa_test_hmc5843.c b/sw/airborne/lisa/test/lisa_test_hmc5843.c index 1ba1ed2763..1a0de7a5ad 100644 --- a/sw/airborne/lisa/test/lisa_test_hmc5843.c +++ b/sw/airborne/lisa/test/lisa_test_hmc5843.c @@ -27,6 +27,12 @@ #include #include +/* + * lisa/L lisa/M + * mag drdy PB5 PB5 + * + */ + #include BOARD_CONFIG #include "init_hw.h" #include "sys_time.h" diff --git a/sw/airborne/lisa/test/lisa_test_itg3200.c b/sw/airborne/lisa/test/lisa_test_itg3200.c index 47223219b7..3657aaf3c7 100644 --- a/sw/airborne/lisa/test/lisa_test_itg3200.c +++ b/sw/airborne/lisa/test/lisa_test_itg3200.c @@ -21,6 +21,13 @@ * Boston, MA 02111-1307, USA. */ +/* lisa/L lisa/M + * gyro-drdy PC14 + * + * + */ + + #include #include #include