Browse Source

版本号:2.1.0.12,新增电池包设计容量调试信息上报

CHENJIE-PC\QiXiang_CHENJIE 3 years ago
parent
commit
449d27ba8e
5 changed files with 5 additions and 4 deletions
  1. 1 1
      inc/Signal.h
  2. 1 1
      inc/app.h
  3. 1 1
      src/MainTask.c
  4. 1 0
      src/Signal.c
  5. 1 1
      src/UartTask.c

+ 1 - 1
inc/Signal.h

@@ -47,7 +47,7 @@ extern UINT8 Error_count;
 extern	UINT32	battWarningState;
 extern	UINT32	nbSwVersion;
 extern	UINT32	battBalanceoInfo;
-
+extern  UINT32  Battdesigncap;
 
 extern UINT16   ErrorNum[5];//故障代码
 extern UINT8 	TcpSendLen;

+ 1 - 1
inc/app.h

@@ -52,7 +52,7 @@ extern "C" {
 #define	DRVSWVERSION		0x01050000     //驱动层版本号V1.4.0.0  驱动层1.5.0.0,增加了三轴
 //#define	APPSWVERSION		0x01020209     
 //#define	APPSWVERSION		0x02000103
-#define	APPSWVERSION		0x0201000B
+#define	APPSWVERSION		0x0201000C
 //--------------------------------------------------------------------------------
 
 #define APP_CONFIG_FILE_LATEST_VERSION 0

+ 1 - 1
src/MainTask.c

@@ -300,7 +300,7 @@ static void MainTask(void* arg)
                     printf("which slpstate can go now :%d \n",slpstate);
                 #endif
                 #ifdef DEBUGLOG
-                    Debug_printf("slp-%d,%d,%d\n",slpstate,AppDataInfo.AccMileage,AppDataInfo.SysReStart);
+                    Debug_printf("slp-%d,%d,%d,%d\n",slpstate,AppDataInfo.AccMileage,AppDataInfo.SysReStart,Battdesigncap);
                 #endif
                 slpManDeepSlpTimerStart(deepslpTimerID, AppNVMData.sleepTime*1000*60);
                 UINT8 sleeptime_count=0;

+ 1 - 0
src/Signal.c

@@ -78,6 +78,7 @@ UINT32	battWarningState = 0xFFFFFFFF;
 UINT32	nbSwVersion = 0xFFFFFFFF;
 UINT32	battBalanceoInfo = 0xFFFFFFFF;
 
+UINT32 Battdesigncap =0xFFFFFFFF;
 //Tcp
 UINT8 	TcpSendLen = 0;
 

+ 1 - 1
src/UartTask.c

@@ -360,10 +360,10 @@ 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];
     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]);
 	battPackVol =((dataPtr[(0x18+BATT_CELL_VOL_NUM+TEMP_NUM)*2])<<8|(dataPtr[(0x18+BATT_CELL_VOL_NUM+TEMP_NUM)*2+1]))/10;  //uint 100mV
 	maxCellVol = (dataPtr[(0x19+BATT_CELL_VOL_NUM+TEMP_NUM)*2] << 8) | dataPtr[(0x19+BATT_CELL_VOL_NUM+TEMP_NUM)*2 + 1];
 	minCellVol = (dataPtr[(0x1A+BATT_CELL_VOL_NUM+TEMP_NUM)*2] << 8) | dataPtr[(0x1A+BATT_CELL_VOL_NUM+TEMP_NUM)*2 + 1];
-
     battHeatEnableState = dataPtr[(0x1C+BATT_CELL_VOL_NUM+TEMP_NUM)*2+1]&0x01;
 
 	maxCellTemp = 0x00;