set parrallel voltage to 0.5v

Signed-off-by: FuangCao <cavan.cao@foxmail.com>

Project/version.txt

@@ -1 +1 @@
-PS100XX_V11_11151805
+PS100XX_V11_11151938

Source/app.c

@@ -381,7 +381,7 @@ static shark_bool shark_battery_check_parrallel(u8 operate)
 		return shark_false;
 	}
 
-	return SHARK_BOOL(IS_CHARGE_IN());
+	return IS_CHARGE_IN();
 }
 
 static u8 shark_battery_switch_auto(u8 operate)

Source/app.h

@@ -15,7 +15,7 @@
 
 //#define BATTERY_RESISTANCE_OHM    (0.1F)
 #define PARRALLEL_DELTA_VOL    	  (2500)
-#define PARRALLEL_BL_DELTA_VOL    (100)
+#define PARRALLEL_BL_DELTA_VOL    (500)
 
 #define CHARGE_DELAY_TIME_OUT_COUNT   (10000)
 

Source/app_end_ctr.c

@@ -505,7 +505,7 @@ int8_t Rsp_Can_Ctr_CMD(CAN_FRAME*can_ctr_frame)
 					buf[len++] = 0;
 					break;
 				case 3:
-					shark_printf_enabled = SHARK_BOOL(buf[len]);
+					shark_printf_enabled = buf[len];
 					if (shark_printf_enabled) {
 						println("log enabled");
 					}
@@ -522,6 +522,7 @@ int8_t Rsp_Can_Ctr_CMD(CAN_FRAME*can_ctr_frame)
 				case 5:
 					buf[len++] = sub_bms_info_1.packet_common.bms_status;
 					buf[len++] = sub_bms_info_2.packet_common.bms_status;
+					println("%d %d %d %d", shark_battery_get_capacity1(), shark_battery_get_capacity2(), shark_battery_get_voltage1(), shark_battery_get_voltage2());
 					break;
 				case 6:
 					buf[len++] = cb_operate_state;

Source/app_rs485_1.c

@@ -496,19 +496,19 @@ shark_bool shark_battery_check_power(SUB_BMS_INFO *info, shark_battery_power_t p
 {
 	switch (power) {
 	case SHARK_BATT_POWER_SMALL:
-		return SHARK_BOOL((info->packet_common.bms_status & BMS_POWER_SMALL) == BMS_POWER_SMALL);
+		return (info->packet_common.bms_status & BMS_POWER_SMALL) == BMS_POWER_SMALL;
 
 	case SHARK_BATT_POWER_FULL:
-		return SHARK_BOOL((info->packet_common.bms_status & BMS_POWER_FULL) == BMS_POWER_FULL);
+		return(info->packet_common.bms_status & BMS_POWER_FULL) == BMS_POWER_FULL;
 
 	case SHARK_BATT_POWER_ALL:
-		return SHARK_BOOL((info->packet_common.bms_status & BMS_POWER_ALL) == BMS_POWER_ALL);
+		return (info->packet_common.bms_status & BMS_POWER_ALL) == BMS_POWER_ALL;
 
 	case SHARK_BATT_POWER_ANY:
 		return shark_true;
 
 	default:
-		return SHARK_BOOL((info->packet_common.bms_status & BMS_POWER_ALL) == 0);
+		return (info->packet_common.bms_status & BMS_POWER_ALL) == 0;
 	}
 }
 

Source/drv_io.c

@@ -111,11 +111,11 @@ void ACC2_Enable(uint8_t on)
 
 	println("acc2: %d", on);
 
-	shark_bms_acc2_enabled = SHARK_BOOL(on);
+	shark_bms_acc2_enabled = on;
 	shark_bms_acc2_error_times = 0;
 	shark_bms_acc2_work_times = 0;
 
-	shark_bms_set_vgs(SHARK_BMS_VGS_ACC2, SHARK_BOOL(on));
+	shark_bms_set_vgs(SHARK_BMS_VGS_ACC2, on);
 	gpio_bit_write(GPIO_PORT_ACC2_EN, GPIO_PIN_ACC2_EN, (bit_status) on);
 }
 

Source/sw_build_info.h

@@ -1,3 +1,3 @@
 #pragma once
 
-#define CONFIG_VERSION "PS100XX_V11_11151805"
+#define CONFIG_VERSION "PS100XX_V11_11151938"