Browse Source

gpio update

Signed-off-by: huhui <huhui@sharkgulf.com>
huhui 5 years ago
parent
commit
e93a46bc48
2 changed files with 11 additions and 4 deletions
  1. 3 0
      Application/bsp/gpio.h
  2. 8 4
      Application/bsp/irqs.c

+ 3 - 0
Application/bsp/gpio.h

@@ -19,6 +19,9 @@
 #define CS1180_PWR_ENABLE(x) gpio_bit_write(GPIOB,GPIO_PIN_12, x==1?RESET:SET)
 /*detect for CS1180 is ready */
 #define IS_CS1180_READY() !!gpio_input_bit_get(GPIOA, GPIO_PIN_0)
+/*detect hall 1&2 */
+#define IS_HALL1_DETECTED() !gpio_input_bit_get(GPIOC, GPIO_PIN_15)
+#define IS_HALL2_DETECTED() !gpio_input_bit_get(GPIOC, GPIO_PIN_13)
 
 static __inline__ void gpio_mode_input(uint32_t gpio_periph, uint32_t pull_up_down, uint32_t pin){
 	gpio_mode_set(gpio_periph, GPIO_MODE_INPUT, pull_up_down, pin);

+ 8 - 4
Application/bsp/irqs.c

@@ -88,9 +88,10 @@ void EXTI2_3_IRQHandler(void){
 	}	
 }
 
-void __weak ml5238_irq_handler(void){
-
-}
+void __weak ml5238_irq_handler(void){}
+void __weak charger_detect_irq_handler(void){}
+void __weak hall1_detect_irq_handler(void){}
+void __weak hall2_detect_irq_handler(void){}
 
 void EXTI4_15_IRQHandler(void){
 	if(RESET != exti_interrupt_flag_get(EXTI_4)){
@@ -113,7 +114,7 @@ void EXTI4_15_IRQHandler(void){
 	}		
 	if(RESET != exti_interrupt_flag_get(EXTI_10)){
 		exti_interrupt_flag_clear(EXTI_10);
-		ml5238_irq_handler();
+		charger_detect_irq_handler();
 	}
 	if(RESET != exti_interrupt_flag_get(EXTI_11)){
 		exti_interrupt_flag_clear(EXTI_11);
@@ -121,15 +122,18 @@ void EXTI4_15_IRQHandler(void){
 	//ms5238 irq
 	if(RESET != exti_interrupt_flag_get(EXTI_12)){
 		exti_interrupt_flag_clear(EXTI_12);
+		ml5238_irq_handler();
 	}
 	if(RESET != exti_interrupt_flag_get(EXTI_13)){
 		exti_interrupt_flag_clear(EXTI_13);
+		hall2_detect_irq_handler();
 	}
 	if(RESET != exti_interrupt_flag_get(EXTI_14)){
 		exti_interrupt_flag_clear(EXTI_14);
 	}
 	if(RESET != exti_interrupt_flag_get(EXTI_15)){
 		exti_interrupt_flag_clear(EXTI_15);
+		hall1_detect_irq_handler();
 	}
 
 }