|
@@ -69,7 +69,9 @@ void appLoadConfig(void);
|
|
|
void appSaveConfig(void);
|
|
|
static void appGetNVMSavedData(void);
|
|
|
void appSaveNVMData(void);
|
|
|
-
|
|
|
+static void setDefaultAppDataInfo(void);
|
|
|
+static void LoadAppDataInfo(void);
|
|
|
+static void appSaveDataInfo(void);
|
|
|
//主线程任务区
|
|
|
static void MainTask(void* arg)
|
|
|
{
|
|
@@ -174,6 +176,10 @@ static void MainTask(void* arg)
|
|
|
{
|
|
|
appSaveNVMData();
|
|
|
}
|
|
|
+ if(AppDataInfo.appDataModify)
|
|
|
+ {
|
|
|
+ appSaveDataInfo();
|
|
|
+ }
|
|
|
osDelay(5000);
|
|
|
if(NB_Fota_update_flag)
|
|
|
{
|
|
@@ -642,7 +648,7 @@ static void appSaveDataInfo(void)
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
-void LoadAppDataInfo(void)
|
|
|
+static void LoadAppDataInfo(void)
|
|
|
{
|
|
|
OSAFILE fp = PNULL;
|
|
|
UINT32 readCount = 0;
|
|
@@ -688,7 +694,17 @@ void LoadAppDataInfo(void)
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
-
|
|
|
+ setDefaultAppDataInfo();
|
|
|
+ readCount = OsaFread(pReadAppConfig, AppDataHr.fileBodySize, 1, fp);
|
|
|
+ //crcCheck = OsaCalcCrcValue((UINT8 *)pReadAppConfig, sizeof(AppNVMData));
|
|
|
+ readtimes = 0;
|
|
|
+ while (readtimes<=5 && readCount != 1)
|
|
|
+ {
|
|
|
+ readtimes++;
|
|
|
+ readCount = OsaFread(pReadAppConfig, AppConfigHr.fileBodySize, 1, fp);
|
|
|
+ //crcCheck = OsaCalcCrcValue((UINT8 *)pReadAppConfig, sizeof(AppNVMData));
|
|
|
+ }
|
|
|
+ appSaveDataInfo();
|
|
|
}
|
|
|
OsaFclose(fp);
|
|
|
return;
|