@@ -51,4 +51,5 @@ extern UINT16 ErrorNum[5];//故障代码
extern UINT8 TcpSendLen;
extern osMutexId_t Error_Mutex;
-
+//测试
+extern UINT8 SOC1;
@@ -81,4 +81,5 @@ UINT8 TcpSendLen = 0;
UINT16 ErrorNum[5]={0};
osMutexId_t Error_Mutex = NULL;
+UINT8 SOC1 = 0;
@@ -609,7 +609,7 @@ static void TcpDataInfoAssembleSend()
UINT8 *SendBuffer = NULL;
UINT8 BufferLen = 0;
UINT8 rbuf[20];
- sprintf((char *)rbuf,"%d,%d,%x",AppDataInfo.AccMileage,BattRemainCap,battProtectState);//累计里程,剩余容量,保护状态
+ sprintf((char *)rbuf,"%d,%d,%d,%d,%d",AppDataInfo.AccMileage,BattRemainCap,battProtectState,battSOC,SOC1);//累计里程,剩余容量,保护状态
BufferLen = strlen(rbuf);
SendBuffer = malloc(BufferLen+sizeof(DebugMsgInfo));
memcpy(SendBuffer+sizeof(DebugMsgInfo)-1, rbuf,BufferLen);
@@ -448,7 +448,7 @@ static BOOL uartBattInfoDecode(UINT8* dataPtr)
battHeatEnableState = dataPtr[(0x1C+BATT_CELL_VOL_NUM+TEMP_NUM)*2+1]&0x01;
//SOC问题紧急修复
- UINT8 SOC1 = 0;
+
static UINT8 SOC_counter=0;
SOC1 = (battPackVol*45-27000)/100;
if((battSOC - SOC1>10)&&(battPackVol>500)&&(battPackVol<900))