Merge #1322 into sdk602patch0911 from refs/changes/1322/head

恢复出厂设置添加死机文件路径

* refs/changes/1322/head: (1 commits squashed)

  - 恢复出厂设置添加死机文件路径

Signed-off-by: aliyun6865282430 <1624952103@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1322

diff --git a/code/sdk/drivers/peripheral/utils/custom_utils.c b/code/sdk/drivers/peripheral/utils/custom_utils.c
index 0b57926..ee21c19 100644 (file)
--- a/code/sdk/drivers/peripheral/utils/custom_utils.c
+++ b/code/sdk/drivers/peripheral/utils/custom_utils.c
@@ -2093,12 +2093,14 @@ void uapi_restore_factory_setting(void)
                         "/user/music/recording",
                         "/user/dial/custom_dial/", //自定义表盘
                         "/user/dial/offline_dial/",//离线表盘
+                        EXC_TAR_PATH,        //死机文件
                     };
 
 #else
     char *filebuf[] = {"/system/ConfigModel.json",
                     "/user/userdata",
                     "/system/kvstore",
+                    EXC_TAR_PATH,//死机文件
                     };
 #endif
     for(int i = 0; i < (sizeof(filebuf)/sizeof(filebuf[0])); i++)

diff --git a/code/sdk/drivers/peripheral/utils/custom_utils.h b/code/sdk/drivers/peripheral/utils/custom_utils.h
index e2b9a91..1110753 100644 (file)
--- a/code/sdk/drivers/peripheral/utils/custom_utils.h
+++ b/code/sdk/drivers/peripheral/utils/custom_utils.h
@@ -19,7 +19,11 @@ extern "C" {
 #include "thread_init.h"
 #include "pdu.h"
 
+#ifdef  SINGLE_USER_PARTITION
 #define EXC_TAR_PATH "/user/system/tar"
+#else
+#define EXC_TAR_PATH "/user/tar"
+#endif
 
 #define TASK_PRIORITY_APP           (osPriority_t)(17)
 #define TASK_PRIORITY_LOG           (osPriority_t)(18)