Explorar el Código

update for debug

Signed-off-by: FuangCao <cavan.cao@foxmail.com>
FuangCao hace 5 años
padre
commit
771afa52b5
Se han modificado 5 ficheros con 23 adiciones y 3 borrados
  1. 6 1
      Source/app.c
  2. 10 0
      Source/app_end_ctr.c
  3. 1 1
      Source/drv_can.c
  4. 5 0
      Source/drv_io.c
  5. 1 1
      Source/sw_build_info.h

+ 6 - 1
Source/app.c

@@ -8,6 +8,7 @@
 #include "measure_vol.h"
 #include "app_can.h"
 #include "low_power.h"
+#include "app_end_ctr.h"
 
 CB_VAL cb_val_last;
 uint8_t cb_operate_state = CB_BAT_NO;
@@ -1808,11 +1809,15 @@ uint8_t shark_battery_shake_get_raw(void)
 
 uint8_t shark_battery_shake_get(void)
 {
-	if (QD_Dect() == 0) {
+#if 0
+	if (end_ctr_self_ss_new.xl_sta == 0) {
 		return 0;
 	}
 
 	return shark_battery_shake;
+#else
+	return 0;
+#endif
 }
 
 void shark_battery_shake_set(uint8_t mask)

+ 10 - 0
Source/app_end_ctr.c

@@ -374,6 +374,8 @@ int8_t Handle_Can_Ctr_CMD(CAN_FRAME*can_ctr_frame)
 }
 
 extern uint32_t acc12_overloader_times;
+extern uint8_t shark_battery_shake1;
+extern uint8_t shark_battery_shake2;
 
 int8_t Rsp_Can_Ctr_CMD(CAN_FRAME*can_ctr_frame)
 {
@@ -608,8 +610,16 @@ int8_t Rsp_Can_Ctr_CMD(CAN_FRAME*can_ctr_frame)
 					break;
 				}
 				case 6:
+					buf[len++] = shark_battery_shake1;
+					buf[len++] = shark_battery_shake2;
 					buf[len++] = shark_battery_shake_get_raw();
 					break;
+				case 7:
+					shark_battery_shake_clear();
+					shark_battery_shake1 = 0;
+					shark_battery_shake2 = 0;
+					buf[len++] = 0;
+					break;
 				default:
 					buf[len++] = 0;
 					break;

+ 1 - 1
Source/drv_can.c

@@ -173,7 +173,7 @@ void CAN_Config_HW(void)
     can_parameter.auto_wake_up = DISABLE;
     can_parameter.auto_retrans = DISABLE;
     can_parameter.rec_fifo_overwrite = DISABLE;
-    can_parameter.trans_fifo_order = DISABLE;
+    can_parameter.trans_fifo_order = ENABLE;
     can_parameter.working_mode = CAN_NORMAL_MODE;
     can_parameter.resync_jump_width = CAN_BT_SJW_1TQ;
     can_parameter.time_segment_1 = CAN_BT_BS1_5TQ;

+ 5 - 0
Source/drv_io.c

@@ -364,11 +364,15 @@ void EXTI0_IRQHandler(void)
     }
 }
 
+uint8_t shark_battery_shake1;
+uint8_t shark_battery_shake2;
+
 void EXTI1_IRQHandler(void)
 {
 	if (RESET != exti_flag_get(EXTI_1)) {
 		exti_flag_clear(EXTI_1);
 		shark_battery_shake_set(2);
+		shark_battery_shake2++;
 	}
 }
 
@@ -377,6 +381,7 @@ void EXTI2_IRQHandler(void)
 	if (RESET != exti_flag_get(EXTI_2)) {
 		exti_flag_clear(EXTI_2);
 		shark_battery_shake_set(1);
+		shark_battery_shake1++;
 	}
 }
 

+ 1 - 1
Source/sw_build_info.h

@@ -1,3 +1,3 @@
 #pragma once
 
-#define CONFIG_VERSION "PS100XX_V01_0C241436"
+#define CONFIG_VERSION "PS100XX_V01_0C241625"