Browse Source

版本号:2.0.0.6,10套量产包发布修改版,修复SleepCount初值问题

CHENJIE-PC\QiXiang_CHENJIE 3 years ago
parent
commit
493805fde4
2 changed files with 5 additions and 5 deletions
  1. 2 2
      inc/app.h
  2. 3 3
      src/MainTask.c

+ 2 - 2
inc/app.h

@@ -43,8 +43,8 @@ extern "C" {
 #define HWVERSION		    0x0102    //硬件主版本,现为V1.2板
 #define	BLSWVERSION		0x01020000    //BootLoader版本号V1.2.0.0
 #define	DRVSWVERSION		0x01040000     //驱动层版本号V1.4.0.0
-//#define	APPSWVERSION		0x01020206     
-#define	APPSWVERSION		0x02000005
+//#define	APPSWVERSION		0x01020207     
+#define	APPSWVERSION		0x02000006
 //--------------------------------------------------------------------------------
 
 #define APP_CONFIG_FILE_LATEST_VERSION 0

+ 3 - 3
src/MainTask.c

@@ -80,7 +80,7 @@ static void MainTask(void* arg)
     UINT32  param;
     slpManSetPmuSleepMode(true,SLP_HIB_STATE,false);
     slpManApplyPlatVoteHandle("MainSlp",&MainSlpHandler);
-    slpManPlatVoteDisableSleep(MainSlpHandler, SLP_SLP1_STATE);
+    slpManPlatVoteDisableSleep(MainSlpHandler, SLP_SLP2_STATE);
     slpManRegisterUsrdefinedBackupCb(appBeforeHib,&inParam,SLPMAN_HIBERNATE_STATE);
     slpManRegisterUsrdefinedRestoreCb(appAfterHib,NULL,SLPMAN_HIBERNATE_STATE);
     slpManRegisterUsrdefinedBackupCb(appBeforeSlp1,NULL,SLPMAN_SLEEP1_STATE);
@@ -215,7 +215,7 @@ static void MainTask(void* arg)
                         printf("[%d]We Can Check Vote Main State, state=%d, cnt=%d\r\n",__LINE__,State,cnt);
                     #endif						
                 }
-                slpManPlatVoteForceEnableSleep(MainSlpHandler, SLP_SLP1_STATE);
+                slpManPlatVoteForceEnableSleep(MainSlpHandler, SLP_SLP2_STATE);
                 if(slpManCheckVoteState(MainSlpHandler, &State, &cnt)==RET_TRUE)
                 {
                     #ifdef USING_PRINTF
@@ -231,7 +231,7 @@ static void MainTask(void* arg)
                     printf("which slpstate can go now :%d \n",slpstate);
                 #endif
                 slpManDeepSlpTimerStart(deepslpTimerID, AppNVMData.sleepTime*1000*60);
-                UINT8 sleeptime_count;
+                UINT8 sleeptime_count=0;
                 while(1)
                 {
                     if(!slpManDeepSlpTimerIsRunning(deepslpTimerID))