Browse Source

【V2.3.0.47】 46基础上修改了默认值,增加网络重启记录

CHENJIE-PC\QiXiang_CHENJIE 3 years ago
parent
commit
7f23e42001
4 changed files with 29 additions and 25 deletions
  1. 1 1
      inc/app.h
  2. 3 0
      src/MainTask.c
  3. 23 23
      src/Signal.c
  4. 2 1
      src/UartTask.c

+ 1 - 1
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		0x0203002E
+#define	APPSWVERSION		0x0203002F
 // #define	APPSWVERSION		0x02030000
 //#define	APPSWVERSION		0x0201000E
 //--------------------------------------------------------------------------------

+ 3 - 0
src/MainTask.c

@@ -207,6 +207,9 @@ static void MainTask(void* arg)
                     {
                         appSaveDataInfo();
                     }
+                    #ifdef DEBUGLOG
+                        Debug_printf("404\n");
+                    #endif
                     appSetCFUN(0);
                     osDelay(1000);
                     EC_SystemReset();

+ 23 - 23
src/Signal.c

@@ -33,23 +33,23 @@ UINT16	COMOutTable[29]	=	{
 		};
 
 //declear the UINT8 vars
-UINT8	battCellTemp[8] = {0xFF};
-UINT8	MOSTemp = 0xFF;
-UINT8	packTemp = 0xFF;
-UINT8	fastChargeTemp = 0xFF;
-UINT8	normalChargeTemp = 0xFF;
-UINT8	heatTemp1 = 0xFF;
-UINT8	heatTemp2 = 0xFF;
-UINT8	nbReservedTemp1 = 0xFF;
-UINT8	nbReservedTemp2 = 0xFF;
-UINT8	maxCellTemp = 0xFF;
-UINT8	minCellTemp = 0xFF;
-UINT8	battSOC = 0xFF;
-UINT8	battSOH = 0xFF;
+UINT8	battCellTemp[8] = {0x00};
+UINT8	MOSTemp = 0x00;
+UINT8	packTemp = 0x00;
+UINT8	fastChargeTemp = 0x00;
+UINT8	normalChargeTemp = 0x00;
+UINT8	heatTemp1 = 0x00;
+UINT8	heatTemp2 = 0x00;
+UINT8	nbReservedTemp1 = 0x00;
+UINT8	nbReservedTemp2 = 0x00;
+UINT8	maxCellTemp = 0x00;
+UINT8	minCellTemp = 0x00;
+UINT8	battSOC = 0x00;
+UINT8	battSOH = 0x00;
 UINT8	battWorkState = 0x00;
-UINT8	bmsSwVersion = 0xFF;
-UINT8	bmsHwVersion = 0xFF;
-UINT8	battMOSSwitchState = 0xFF;
+UINT8	bmsSwVersion = 0x00;
+UINT8	bmsHwVersion = 0x00;
+UINT8	battMOSSwitchState = 0x00;
 UINT8	battHeatEnableState = 0x00;
 UINT8   RelayControlState = 0x00;
 UINT8	BuzzerControl = 0x00;
@@ -61,20 +61,20 @@ UINT8   BattWorkStateDelay  = 0x00;
 UINT8   HeatForceControl = 0x00;
 UINT8   AvgBattTemp = 0x00;
 //declear the UINT16 vars
-UINT16	battCellU[28] = {0xFFFF};
+UINT16	battCellU[28] = {0x00};
 UINT16	minCellVol = 0;
 UINT16	maxCellVol = 0;
-UINT16	battPackVol = 0xFFFF;
-UINT16	battI = 0xFFFF;
-UINT16	nbHwVersion = 0xFFFF;
+UINT16	battPackVol = 0x00;
+UINT16	battI = 0x00;
+UINT16	nbHwVersion = 0x00;
 UINT8 Lockstatus = 0;
 UINT8 Error_count=0;
 INT16 xzyDataSend[3] = {0};
 
 //declear the UINT32 vars
-UINT32	battWarningState = 0xFFFFFFFF;
-UINT32	nbSwVersion = 0xFFFFFFFF;
-UINT32	battBalanceoInfo = 0xFFFFFFFF;
+UINT32	battWarningState = 0x00;
+UINT32	nbSwVersion = 0x00;
+UINT32	battBalanceoInfo = 0x00;
 UINT32  BattRemainCap = 0x00;
 UINT32  Battdesigncap =0x00;
 UINT32  battProtectState =0x00; 

+ 2 - 1
src/UartTask.c

@@ -301,6 +301,7 @@ static void UartTask(void* arg)
 					}
 					osMutexRelease(Error_Mutex);
 					UartErrorCounter = 5;
+					uartBattInfoDecode(UartReadMsg.data);
 				}
                 PROC_UART_STATE_SWITCH(PROCESS_UART_STATE_IDLE);
 				#ifdef USING_PRINTF1
@@ -791,7 +792,7 @@ UINT8 Uart_DataRecv_func(Uart_Read_Msg_Type Uart_Read_Msg_Fun,UINT8* Uart_Recv_B
                       ARM_USART_PARITY_NONE |
                       ARM_USART_STOP_BITS_1 |
                       ARM_USART_FLOW_CONTROL_NONE, 9600);
-            memset(Uart_Recv_Buffer_Fun,0xff,Data_Len);
+            memset(Uart_Recv_Buffer_Fun,0x00,Data_Len);
             return 0;
         }
     }