V3.0.0.5 修改状态转换Bug

inc/AppConfig.h

@@ -13,7 +13,7 @@
 #define DATA_MODULE_TYPE            (1)                 //1表示NB模块，2表示4G cat1
 #define EOLSTATE                    (0)                 //1表示下线检测跳过，使用默认值，0表示使用下线检测
 #define DEFAULT_SN                  "RLTEST00000000002" //默认上传的SN编码
-#define	APPSWVERSION		        0x03000004          //数据模块软件版本号
+#define	APPSWVERSION		        0x03000005          //数据模块软件版本号
 
 #define TCP_ADD                     "iotp.fast-fun.cn"  //数据上传的地址
 #define TCP_PORT					8712                //数据上传的端口

src/AppFunc.c

@@ -12,39 +12,40 @@
 void BattWorkDelayFunc(UINT8 battWorkCurrentState)
 {
 	static UINT16 workDelayCounter = 0;
+	printf("[%d]%x-%x-%d\n",__LINE__,battWorkState,BattWorkStateDelay,workDelayCounter);
 	if(battWorkCurrentState==BATT_IDLE_SYM&&BattWorkStateDelay==BATT_DISCHARGE_SYM)//从放电转静置 10s延时
 	{
 		workDelayCounter++;
 		if(workDelayCounter>=10)
 		{
-			workDelayCounter==0;
+			workDelayCounter=0;
 			BattWorkStateDelay = battWorkCurrentState;
 		}
 	}
-	else if(battWorkCurrentState==BATT_IDLE_SYM&&BattWorkStateDelay==BATT_CHARGE_SYM)//从充电转静置1min延时
+	else if(battWorkCurrentState==BATT_IDLE_SYM&&BattWorkStateDelay==BATT_CHARGE_SYM)//从充电转静置10s延时
 	{
 		workDelayCounter++;
-		if(workDelayCounter>=60)
+		if(workDelayCounter>=10)
 		{
-			workDelayCounter==0;
+			workDelayCounter=0;
 			BattWorkStateDelay = battWorkCurrentState;
 		}
 	}
-	else if(battWorkCurrentState==BATT_DISCHARGE_SYM)//从 充电或者静置 转放电 1s延时
+	else if(battWorkCurrentState==BATT_DISCHARGE_SYM&&BattWorkStateDelay!=BATT_DISCHARGE_SYM)//从 充电或者静置 转放电 1s延时
 	{
 		workDelayCounter++;
 		if(workDelayCounter>=1)
 		{
-			workDelayCounter==0;
+			workDelayCounter=0;
 			BattWorkStateDelay = battWorkCurrentState;
 		}
 	}
-	else if(battWorkCurrentState==BATT_CHARGE_SYM)//从 放电或者静置 转充电 1min延时
+	else if(battWorkCurrentState==BATT_CHARGE_SYM&&BattWorkStateDelay!=BATT_CHARGE_SYM)//从 放电或者静置 转充电 30s延时
 	{
 		workDelayCounter++;
-		if(workDelayCounter>=60)
+		if(workDelayCounter>=30)
 		{
-			workDelayCounter==0;
+			workDelayCounter=0;
 			BattWorkStateDelay = battWorkCurrentState;
 		}
 	}

src/AppTaskUart.c

@@ -79,7 +79,7 @@ static void UartTask(void* arg)
 				Uart_Cmd_Control(UartWriteCmdHandle,UartWriteData,UartAnswerData);//电池锁定，继电器锁定，加热控制
                 if(TimeCounter%10==0 && gProcess_app==WORK)
                 {
-					#ifdef USING_PRINTF
+					#ifdef USING_PRINTF1
 						printf("Uart work begin:%02x\n",PadInterrupt);
 					#endif
                     if(osMessageQueueGet(UartWriteCmdHandle,&UartWriteData,0,0)==osOK&&UartRecvFlag==1)