版本号：2.1.0.20

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		0x02010013
+#define	APPSWVERSION		0x02010014
 //--------------------------------------------------------------------------------
 
 #define APP_CONFIG_FILE_LATEST_VERSION 0

src/MainTask.c

@@ -306,6 +306,7 @@ static void MainTask(void* arg)
                 UINT8 sleeptime_count=0;
                 RxFlag=0;
                 NVIC_EnableIRQ(PadWakeup1_IRQn);
+                appSetCFUN(0);
                 while(1)
                 {
                     if(!slpManDeepSlpTimerIsRunning(deepslpTimerID))

src/UartTask.c

@@ -147,13 +147,13 @@ static void UartTask(void* arg)
                 }
                 else if(Timer_count%10==0)
                 {
-                    #ifdef USING_PRINTF1
+                    #ifdef USING_PRINTF
                         printf("[%d]Uart Timer 1s:%d,uartReadSuccessFlag:%d\n",__LINE__,Timer_count,uartReadSuccessFlag);
                     #endif
                     if(osMessageQueueGet(UartWriteCmdHandle,&UartWriteData,0,0)==osOK && uartReadSuccessFlag==TRUE)
                     {
                         #ifdef USING_PRINTF
-                            printf("[%d]UartWriteCmdHandle :%x-%X%X\n",__LINE__,UartWriteData.WriteCmd,UartWriteData.Data[0],UartWriteData.Data[1]);
+                            printf("\n[%d]UartWriteCmdHandle :%x-%X%X\n",__LINE__,UartWriteData.WriteCmd,UartWriteData.Data[0],UartWriteData.Data[1]);
                         #endif
                         PROC_UART_STATE_SWITCH(PROCESS_UART_STATE_WRITE);
 						break;
@@ -167,11 +167,11 @@ static void UartTask(void* arg)
 
 				if(UartReadMsg.Header[2]>0)
 				{
-					uartReadSuccessFlag = true;
+					uartReadSuccessFlag = TRUE;
 				}
 				else
 				{
-					uartReadSuccessFlag = false;
+					uartReadSuccessFlag = FALSE;
 				}
 				if(Timer_count-currentTimerCount >= 1)
 				{
@@ -198,7 +198,7 @@ static void UartTask(void* arg)
 						break;
 					}
 				}
-				if(battWorkState ==0x00 && AppNVMData.isBattLocked==TRUE && ((UartReadMsg.data[(0x1B+BATT_CELL_VOL_NUM+BATT_TEMP_NUM+BATT_OTHER_TEMP_NUM)*2+1])&0x03)!=0x02)//try to lock lock the discharge 
+				if(battWorkState ==0x00 && AppNVMData.isBattLocked==TRUE && ((UartReadMsg.data[(0x1B+BATT_CELL_VOL_NUM+BATT_TEMP_NUM+BATT_OTHER_TEMP_NUM)*2+1])&0x03)!=0x02 && uartReadSuccessFlag==TRUE)//try to lock lock the discharge 
 				{
 					#ifdef USING_PRINTF
                         printf("[%d]try to lock:%X-%X\n",__LINE__,AppNVMData.isBattLocked,(UartReadMsg.data[(0x1B+BATT_CELL_VOL_NUM+BATT_TEMP_NUM+BATT_OTHER_TEMP_NUM)*2+1])&0x03);
@@ -208,7 +208,7 @@ static void UartTask(void* arg)
 					UartWriteData.Data[1] = 0x02;
 					osMessageQueuePut(UartWriteCmdHandle,&UartWriteData,0,0);
 				}
-				else if (battWorkState ==0x00 && AppNVMData.isBattLocked==FALSE && ((UartReadMsg.data[(0x1B+BATT_CELL_VOL_NUM+BATT_TEMP_NUM+BATT_OTHER_TEMP_NUM)*2+1])&0x03)!=0x03) // try to unlock
+				else if (battWorkState ==0x00 && AppNVMData.isBattLocked==FALSE && ((UartReadMsg.data[(0x1B+BATT_CELL_VOL_NUM+BATT_TEMP_NUM+BATT_OTHER_TEMP_NUM)*2+1])&0x03)!=0x03 && uartReadSuccessFlag==TRUE) // try to unlock
 				{
 					#ifdef USING_PRINTF
                         printf("[%d]try to unlock:%X-%X\n",__LINE__,AppNVMData.isBattLocked,(UartReadMsg.data[(0x1B+BATT_CELL_VOL_NUM+BATT_TEMP_NUM+BATT_OTHER_TEMP_NUM)*2+1])&0x03);

src/bsp_custom.c

@@ -17,7 +17,7 @@
 #include "Signal.h"
 #if (WDT_FEATURE_ENABLE==1)
 #include "wdt_ec616.h"
-#define WDT_TIMEOUT_VALUE     (20)            // in unit of second, shall be less than 256s
+#define WDT_TIMEOUT_VALUE     (40)            // in unit of second, shall be less than 256s
 #endif
 #ifdef BL_FILE_LOG
 extern uint8_t lockoutState;