优化恢复出厂设置

diff --git a/code/sdk/drivers/boards/brandy_evb/board_config/board_evb.h b/code/sdk/drivers/boards/brandy_evb/board_config/board_evb.h
index 1073ee7..6427ec6 100755 (executable)
--- a/code/sdk/drivers/boards/brandy_evb/board_config/board_evb.h
+++ b/code/sdk/drivers/boards/brandy_evb/board_config/board_evb.h
@@ -173,7 +173,7 @@ const hal_pio_config_t g_pio_function_config[PIN_MAX_NUMBER] = {
     { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_DOWN, HAL_PIO_IE_DISABLE },    // S_AGPIO_L17 HX3507_INT   not use
     { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_DOWN, HAL_PIO_IE_DISABLE },    // S_AGPIO_L18  VDDEN  //暂时无用，采用VDDIO 默认开启 EXt V3.0 EXt V1.8
     { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_DOWN, HAL_PIO_IE_DISABLE },  // S_AGPIO_L19  G_INT2  //暂时不用 
-    { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_DOWN, HAL_PIO_IE_DISABLE },  // S_AGPIO_L19  G_INT2  //暂时不用 
+
 
     { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_DISABLE }, // S_AGPIO_L20  0.2C_CHRG
     { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_DISABLE },    // S_AGPIO_L21  NTC_VDD_ON 给低打开 NTC上拉电源

diff --git a/code/sdk/drivers/peripheral/utils/custom_utils.c b/code/sdk/drivers/peripheral/utils/custom_utils.c
index 7dbb666..2688857 100644 (file)
--- a/code/sdk/drivers/peripheral/utils/custom_utils.c
+++ b/code/sdk/drivers/peripheral/utils/custom_utils.c
@@ -1501,12 +1501,15 @@ void gsensor_get_single_data(gsenson_t *t)
     get_gsonsen_xyz(t);
 }
 
+#include <sys/stat.h>
+
 int removeFilesInFolder(const char *folderPath) 
 {
     DIR *dir;
     struct dirent *entry;
+    struct stat s_buf;
+    int ret = 0;
 
-    // 打开目录
     dir = opendir(folderPath);
     if (dir == NULL) 
     {
@@ -1514,49 +1517,39 @@ int removeFilesInFolder(const char *folderPath)
         return -1;
     }
 
-    // 遍历目录中的文件
     while ((entry = readdir(dir)) != NULL) 
     {
-        // 忽略当前目录和父目录
         if (strcmp(entry->d_name, ".") != 0 && strcmp(entry->d_name, "..") != 0) 
         {
-            // 构造文件的完整路径
             char filePath[64];
             snprintf(filePath, sizeof(filePath), "%s/%s", folderPath, entry->d_name);
-
-            // 删除文件
-            if (remove(filePath) != 0) 
-            {
-                return -1;
-            }
+            stat(filePath,&s_buf);
+            if(S_ISDIR(s_buf.st_mode))
+                ret = removeFilesInFolder(filePath);
+            else
+                ret = remove(filePath);
+            if(ret != 0)
+                PRINT("%s remove failed !!! \r\n",filePath);
+            else
+                PRINT("%s remove succeed !!! \r\n",filePath);
         }
     }
-    // 关闭目录
+
     closedir(dir);
-    return 0;
+    return ret;
 }
 
-
-#include <sys/stat.h>
-
 void uapi_delete_files(void)
 {
-    char *filebuf[9] = {"/system/ConfigModel.json",
-                        "/user/userdata/health/",
-                        "/user/userdata/sport/",
-                        "/user/userdata/sport/TrainingData/",
-                        "/user/userdata/sport/Activty/",
-                        "/user/userdata/callog.bin",
-                        "/user/userdata/alarmclock",
-                        "/user/userdata/recording/",
-                        "/user/userdata/addressbook.bin"
+    char *filebuf[2] = {"/system/ConfigModel.json",
+                        "/user/userdata",
                         };
 
     
        struct stat s_buf;
 
     int ret = 0;
-    for(int i = 0; i < 9 ; i++)
+    for(int i = 0; i < 2 ; i++)
     {
         if(access(filebuf[i], F_OK) == -1)
         {
@@ -1575,6 +1568,7 @@ void uapi_delete_files(void)
     }
 }
 
+
 #include "driver/calendar.h"
 
 uint32_t uapi_calendar_store_date(void)