From: 袁清梦 <3449750381@qq.com> Date: Fri, 28 Jun 2024 09:31:25 +0000 (+0000) Subject: Merge #405 into sdk602patch0521 from refs/changes/405/head X-Git-Tag: release_V1.2.70_20241020_135402~895^2~22^2~1 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=6125ded4dc6eed0598ff03fc98117d2f5317ea59;p=mirrors%2FFD230.git Merge #405 into sdk602patch0521 from refs/changes/405/head Code review from 袁清梦 * refs/changes/405/head: (3 commits squashed) - 增加恢复出厂设置AT AT^RESTORE - Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521 - Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521 Signed-off-by: Caisking <3449750381@qq.com> Reviewed-by: snickersun@163.com Merged-by: snickersun@163.com CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/405 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/rtcservice/src/rtc_at_cmd.cpp b/code/sdk/application/wearable/fd230app/nativeui/rtcservice/src/rtc_at_cmd.cpp index 6f0b4b0cb..1ae2202be 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/rtcservice/src/rtc_at_cmd.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/rtcservice/src/rtc_at_cmd.cpp @@ -12,6 +12,7 @@ extern "C" #include "string.h" #include "rtc_at_cmd.h" #include "graphic_service_wrapper.h" +#include "custom_utils.h" #define ARRAY_COUNT(array) (sizeof(array) / sizeof(array[0])) #define RTCTEST_MAX_ARGC 8 @@ -22,7 +23,7 @@ extern "C" static bool printf_set = false; // bool is_rtc_print_enabled = true; static int ConvertCmdToParam(uint8_t *para, uint32_t paraLen, - uint8_t argv[RTCTEST_MAX_ARGC][RTCTEST_MAX_ARGV_LEN], uint32_t *argc) + uint8_t argv[RTCTEST_MAX_ARGC][RTCTEST_MAX_ARGV_LEN], uint32_t *argc) { uint32_t pos = 0; *argc = 0; @@ -96,10 +97,22 @@ extern "C" } return ERRCODE_SUCC; } + static uint32_t rtc_restore_factory_settings(uint8_t *para, uint32_t paraLen, char *strCommonCmd) + { + UNUSED(para); + UNUSED(paraLen); + UNUSED(strCommonCmd); + + // 执行恢复出厂设置的操作 + uapi_restore_factory_setting(); + + PRINT("Restoring Factory Settings...\n"); + return ERRCODE_SUCC; + } static const at_cmd_table_t g_rtc_cmd[] = { {(char *)"AT^RTCTEST", rtc_do_test, (char *)"enable"}, - {(char *)"AT^RTCTEST", rtc_do_test, (char *)"disable"}, + {(char *)"AT^RESTORE", rtc_restore_factory_settings, NULL}, }; at_cmd_table_t *get_rtc_cmd_table(uint32_t *cmd_count)