From c0ee395b6ea72d8c319ee53a476394b00f4eead6 Mon Sep 17 00:00:00 2001 From: Laura Cox <31892318+Laura-Danielle@users.noreply.github.com> Date: Thu, 10 Nov 2022 16:34:00 -0500 Subject: [PATCH] refactor(pipettes): correct a few more bugs in the 96 channel firmware (#496) --- pipettes/firmware/stm32g4xx_it.c | 4 ++++ pipettes/firmware/stm32g4xx_it.h | 5 ++--- pipettes/firmware/utility_gpio.c | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pipettes/firmware/stm32g4xx_it.c b/pipettes/firmware/stm32g4xx_it.c index a1213d8b4..81a5b1c7e 100644 --- a/pipettes/firmware/stm32g4xx_it.c +++ b/pipettes/firmware/stm32g4xx_it.c @@ -122,6 +122,10 @@ void EXTI3_IRQHandler(void) { HAL_GPIO_EXTI_IRQHandler(GPIO_PIN_3); } +void EXTI15_10_IRQHandler(void) { + HAL_GPIO_EXTI_IRQHandler(GPIO_PIN_11); +} + // TODO refer to schematic to check and see that the data ready // pin is the same across values. diff --git a/pipettes/firmware/stm32g4xx_it.h b/pipettes/firmware/stm32g4xx_it.h index 60ce7ed7d..26e291912 100644 --- a/pipettes/firmware/stm32g4xx_it.h +++ b/pipettes/firmware/stm32g4xx_it.h @@ -45,9 +45,8 @@ void DMA1_Channel3_IRQHandler(void); void FDCAN1_IT0_IRQHandler(void); void TIM7_IRQHandler(void); void TIM6_DAC_IRQHandler(void); -void EXTI8_IRQHandler(void); -void EXTI9_IRQHandler(void); -void EXTI15_IRQHandler(void); +void EXTI3_IRQHandler(void); +void EXTI15_10_IRQHandler(void); #ifdef __cplusplus } diff --git a/pipettes/firmware/utility_gpio.c b/pipettes/firmware/utility_gpio.c index 7fc7acedc..340e31a70 100644 --- a/pipettes/firmware/utility_gpio.c +++ b/pipettes/firmware/utility_gpio.c @@ -56,7 +56,7 @@ void limit_switch_gpio_init() { if (pipette_type == NINETY_SIX_CHANNEL) { /* * Right gear -> PC10 - * Left gear -> PB11 + * Left gear -> PB12 * Plunger -> PA4 */ enable_gpio_port(GPIOC); @@ -64,7 +64,7 @@ void limit_switch_gpio_init() { HAL_GPIO_Init(GPIOC, &GPIO_InitStruct); enable_gpio_port(GPIOB); - GPIO_InitStruct.Pin = GPIO_PIN_11; + GPIO_InitStruct.Pin = GPIO_PIN_12; HAL_GPIO_Init(GPIOB, &GPIO_InitStruct); enable_gpio_port(GPIOA);