Merge branch 'master' of http://192.168.0.107/bms/BMS_LFP

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);

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();
 	}
 
 }

Project/BMS.uvoptx

@@ -147,6 +147,31 @@
           <Key>UL2CM3</Key>
           <Name>UL2CM3(-S0 -C0 -P0 )  -FN1 -FC1000 -FD20000000 -FF0GD32F3x0 -FL010000 -FS08000000 -FP0($$Device:GD32F330C8$Flash\GD32F3x0.FLM)</Name>
         </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>JL2CM3</Key>
+          <Name>-U81480416 -O78 -S2 -ZTIFSpeedSel5000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO7 -FD20000000 -FC1000 -FN1 -FF0GD32F3x0.FLM -FS08000000 -FL010000 -FP0($$Device:GD32F330C8$Flash\GD32F3x0.FLM)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMRTXEVENTFLAGS</Key>
+          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGTARM</Key>
+          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(1012=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMDBGFLAGS</Key>
+          <Name></Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+          <Name>d</Name>
+        </SetRegEntry>
       </TargetDriverDllRegistry>
       <Breakpoint/>
       <Tracepoint>
@@ -216,7 +241,7 @@
 
   <Group>
     <GroupName>BSP</GroupName>
-    <tvExp>0</tvExp>
+    <tvExp>1</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -316,7 +341,7 @@
 
   <Group>
     <GroupName>GD32F30x_Drivers</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>