2.3.0.23 - SOC问题临时修复版本

inc/Signal.h

@@ -52,4 +52,5 @@ extern UINT8 	TcpSendLen;
 
 extern osMutexId_t Error_Mutex;
 //测试
-extern UINT8 SOC1;
+extern UINT8 SOC1;
+extern UINT8 SOC2;

inc/app.h

@@ -51,7 +51,7 @@ extern "C" {
 #define	BLSWVERSION		0x01020000    //BootLoader版本号V1.2.0.0
 #define	DRVSWVERSION		0x01050000     //驱动层版本号V1.4.0.0  驱动层1.5.0.0，增加了三轴
 //#define	APPSWVERSION		0x01020209     
-#define	APPSWVERSION		0x02030016
+#define	APPSWVERSION		0x02030017
 //#define	APPSWVERSION		0x0201000E
 //--------------------------------------------------------------------------------
 

src/Signal.c

@@ -82,4 +82,5 @@ UINT16 ErrorNum[5]={0};
 
 osMutexId_t Error_Mutex = NULL;
 //测试
-UINT8 SOC1 = 0;
+UINT8 SOC1 = 0;
+UINT8 SOC2 = 0;

src/TcpTask.c

@@ -609,7 +609,7 @@ static void TcpDataInfoAssembleSend()
         UINT8 *SendBuffer = NULL;
         UINT8 BufferLen = 0;
         UINT8 rbuf[50];
-        sprintf((char *)rbuf,"%d,%d,%x,%d,%d",AppDataInfo.AccMileage,BattRemainCap,battProtectState,battSOC,SOC1);//累计里程，剩余容量，保护状态
+        sprintf((char *)rbuf,"%x,%x,%x,%d,%d",AppDataInfo.AccMileage,BattRemainCap,battProtectState,SOC2,SOC1);//累计里程，剩余容量，保护状态
         BufferLen  = strlen(rbuf);
         SendBuffer = malloc(BufferLen+sizeof(DebugMsgInfo));
         memcpy(SendBuffer+sizeof(DebugMsgInfo)-1, rbuf,BufferLen);

src/UartTask.c

@@ -437,6 +437,7 @@ static BOOL uartBattInfoDecode(UINT8* dataPtr)
     }
 	battWarningState = (dataPtr[(0x09+BATT_CELL_VOL_NUM+TEMP_NUM)*2+0]<<16) | (dataPtr[(0x0A+BATT_CELL_VOL_NUM+TEMP_NUM)*2+0] << 8) |(dataPtr[(0x0A+BATT_CELL_VOL_NUM+TEMP_NUM)*2+1]);
     battSOC = dataPtr[(0x0B+BATT_CELL_VOL_NUM+TEMP_NUM)*2+1];
+	SOC2 = dataPtr[(0x0B+BATT_CELL_VOL_NUM+TEMP_NUM)*2+1];
     battSOH = dataPtr[(0x0C+BATT_CELL_VOL_NUM+TEMP_NUM)*2+1];
 	Battdesigncap = (dataPtr[(0x0E+BATT_CELL_VOL_NUM+TEMP_NUM)*2])<<24|(dataPtr[(0x0E+BATT_CELL_VOL_NUM+TEMP_NUM)*2+1])<<16|(dataPtr[(0x0F+BATT_CELL_VOL_NUM+TEMP_NUM)*2])<<8|(dataPtr[(0x0F+BATT_CELL_VOL_NUM+TEMP_NUM)*2+1]);
 	BattRemainCap = (dataPtr[(0x12+BATT_CELL_VOL_NUM+TEMP_NUM)*2])<<24|(dataPtr[(0x12+BATT_CELL_VOL_NUM+TEMP_NUM)*2+1])<<16|(dataPtr[(0x13+BATT_CELL_VOL_NUM+TEMP_NUM)*2])<<8|(dataPtr[(0x13+BATT_CELL_VOL_NUM+TEMP_NUM)*2+1]);