Преглед на файлове

power down when no battery

Signed-off-by: FuangCao <cavan.cao@foxmail.com>
FuangCao преди 5 години
родител
ревизия
13c1c9d592
променени са 6 файла, в които са добавени 14 реда и са изтрити 5 реда
  1. 1 1
      Project/version.txt
  2. 4 0
      Source/app.c
  3. 4 0
      Source/app_end_ctr.c
  4. 1 1
      Source/app_rs485_1.c
  5. 3 2
      Source/delay.c
  6. 1 1
      Source/sw_build_info.h

+ 1 - 1
Project/version.txt

@@ -1 +1 @@
-PS100XX_V10_11081839
+PS100XX_V10_11082122

+ 4 - 0
Source/app.c

@@ -377,6 +377,10 @@ static u8 shark_battery_switch_auto(u8 operate)
 	sub_bms_info_2.state = SHARK_BATT_STATE_IDLE;
 
 	if (shark_battery_set_power(SHARK_BATT_POWER_FULL, SHARK_BATT_POWER_FULL, SHARK_BATT_MASK_BOTH) == SHARK_BATT_MASK_NONE) {
+		if (shark_battery_detect() == SHARK_BATT_MASK_NONE) {
+			Power_On_Normal(0, 2);
+		}
+
 		return CB_BAT_NO;
 	}
 

+ 4 - 0
Source/app_end_ctr.c

@@ -621,6 +621,10 @@ int8_t Rsp_Can_Ctr_CMD(CAN_FRAME*can_ctr_frame)
 					len += sizeof(shark_bms_acc2_oc_times);
 					shark_bms_acc2_oc_times = 0;
 					break;
+				case 9:
+					memcpy(buf + len, &shark_mseconds, sizeof(shark_mseconds));
+					len += sizeof(shark_mseconds);
+					break;
 				default:
 					buf[len++] = 0;
 					break;

+ 1 - 1
Source/app_rs485_1.c

@@ -781,7 +781,7 @@ shark_battery_mask_t shark_battery_detect(void)
 
 	shark_battery_serial_wait_ready();
 
-	for (times = 0; times < 3; times++) {
+	for (times = 0; times < 5; times++) {
 		u64 time = shark_get_time() + 200;
 
 		sub_bms_info_1.sub_bms_cmd.operate = OP_READ_INFO;

+ 3 - 2
Source/delay.c

@@ -16,11 +16,12 @@
 #include "low_power.h"
 #include "hardware_test.h"
 
-uint64_t shark_mseconds;
+u64 shark_mseconds;
+
 uint32_t utc_seconds = 1505216210;// 2017/9/12  19:37:50
 uint16_t s_ms ;
 
-uint64_t shark_get_time_safe(void)
+u64 shark_get_time_safe(void)
 {
 	u64 time = shark_mseconds;
 	fwdgt_counter_reload();

+ 1 - 1
Source/sw_build_info.h

@@ -1,3 +1,3 @@
 #pragma once
 
-#define CONFIG_VERSION "PS100XX_V10_11081839"
+#define CONFIG_VERSION "PS100XX_V10_11082122"