Pārlūkot izejas kodu

数据文件存储测试,1.2.1.19测试版本

CHENJIE-PC\QiXiang_CHENJIE 3 gadi atpakaļ
vecāks
revīzija
daf1fe709b
2 mainītis faili ar 18 papildinājumiem un 18 dzēšanām
  1. 1 1
      inc/app.h
  2. 17 17
      src/MainTask.c

+ 1 - 1
inc/app.h

@@ -34,7 +34,7 @@ extern "C" {
 #define HWVERSION		    0x0102    //硬件主版本,现为V1.2板
 #define	BLSWVERSION		0x01020000    //BootLoader版本号V1.2.0.0
 #define	DRVSWVERSION		0x01040000     //驱动层版本号V1.4.0.0
-#define	APPSWVERSION		0x01020112     
+#define	APPSWVERSION		0x01020113     
 
 //--------------------------------------------------------------------------------
 

+ 17 - 17
src/MainTask.c

@@ -93,6 +93,7 @@ static void MainTask(void* arg)
     slpManWakeSrc_e Wakeup_source;
 
 	appGetNVMSavedData();
+    LoadAppDataInfo();
     #ifdef USING_PRINTF1
     UINT8 *pReadAppConfig;
     UINT32 readCount;
@@ -109,6 +110,22 @@ static void MainTask(void* arg)
         printf("%d ",*(pReadAppConfig+i));
     printf("\n");
     #endif
+    #ifdef USING_PRINTF
+    UINT8 *pReadAppData;
+    UINT32 readCount;
+    //AppConfigHeader    AppConfigHr;
+    OSAFILE file;
+    file = OsaFopen(APP_DATAINFO_FILE_NAME,"rb");
+    OsaFseek(file, 0, SEEK_SET);
+    pReadAppData  = OsaAllocZeroMemory(AppDataHr.fileBodySize+3);    
+    readCount = OsaFread(pReadAppData, AppConfigHr.fileBodySize+3, 1, file);
+    printf("AppConfigHr.fileBodySize+4 = %d\n",AppConfigHr.fileBodySize+3);
+    printf("readCount = %d\n",readCount);
+    printf("the config data = \n");
+    for (int i ;i<AppConfigHr.fileBodySize+3;i++)
+        printf("%d ",*(pReadAppData+i));
+    printf("\n");
+    #endif
     if(AppNVMData.AppSwVersion!=APPSWVERSION)
     {
         AppNVMData.HwVersion = HWVERSION;
@@ -117,9 +134,6 @@ static void MainTask(void* arg)
         AppNVMData.AppSwVersion = APPSWVERSION;
         AppNVMData.appDataModify=TRUE;
     }
-
-
-	
     montior_timer = xTimerCreate("montior_timer", 100 / portTICK_RATE_MS, pdTRUE, NULL, montior_timer_callback);
     work_timer = xTimerCreate("work_timer", AppNVMData.wakeupWorkTime*60*1000 / portTICK_RATE_MS, pdTRUE, NULL, work_timer_callback);
 
@@ -327,24 +341,10 @@ static void appAfterSlp2(void *pdata, slpManLpState state)
 static void appGetNVMSavedData(void)
 {
     appLoadConfig();
-
-/*	IH_appChargEndWorkTime = AppNVMData.chargEndWorkTime;
-	IH_appWakeupWorkTime=AppNVMData.wakeupWorkTime;
-	IH_appSleepTime = AppNVMData.sleepTime;
-	IH_isBattLocked = AppNVMData.isBattLocked;
-	MEMCPY(&BattSN, AppNVMData.battSN, BATT_SN_LEN);	
-*/
 }
 
 void appSaveNVMData(void)
 {
-/*
-	AppNVMData.chargEndWorkTime = OH_appChargEndWorkTime;
-    AppNVMData.wakeupWorkTime = OH_appWakeupWorkTime;
-    AppNVMData.sleepTime = OH_appSleepTime ;
-    AppNVMData.isBattLocked = OH_isBattLocked;    
-	MEMCPY( AppNVMData.battSN, &BattSN, BATT_SN_LEN);
-	*/
 	appSaveConfig();
 }