Signed-off-by: FuangCao <cavan.cao@foxmail.com>
@@ -1 +1 @@
-PS100XX_V10_11081839
+PS100XX_V10_11082122
@@ -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;
}
@@ -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;
@@ -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;
@@ -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,3 +1,3 @@
#pragma once
-#define CONFIG_VERSION "PS100XX_V10_11081839"
+#define CONFIG_VERSION "PS100XX_V10_11082122"