From: luozheng <1732036298@qq.com> Date: Mon, 14 Oct 2024 03:27:48 +0000 (+0800) Subject: Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... X-Git-Tag: release_V1.2.70_20241020_135402~60 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=4c4c54362217f13fc3dce3cac0ff55a72717bf92;p=mirrors%2FFD230.git Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911 --- 4c4c54362217f13fc3dce3cac0ff55a72717bf92 diff --cc code/sdk/drivers/peripheral/utils/custom_fileoperate_service.c index fc360387b,846ffe689..5618eaab4 --- a/code/sdk/drivers/peripheral/utils/custom_fileoperate_service.c +++ b/code/sdk/drivers/peripheral/utils/custom_fileoperate_service.c @@@ -43,8 -43,7 +43,9 @@@ #include "sleep/include/SleepModelC.h" +#include "player/include/PlayersModelC.h" + + #include "mmc5603_hal.h" typedef struct { uint8_t cmd; @@@ -131,9 -130,16 +132,19 @@@ static void custom_fileoperate_service_ case CUSTOM_FILEOPERATE_MSG_TYPE_NAPDATA_READ: custom_read_nap_data(); break; + case CUSTOM_FILEOPERATE_MSG_TYPE_SLEEPMODLE_UPDATE: + custom_sleep_model_updata(); + break; + case CUSTOM_FILEOPERATE_MSG_TYPE_MMCDATA_SAVE: + mmc5603_savePara_infile(); + break; + case CUSTOM_FILEOPERATE_MSG_TYPE_MMCDATA_READ: + mmc5603_readPara_infile(); + break; + + case CUSTOM_FILEOPERATE_MSG_TYPE_MUSICNAME_READ: + custom_setUpListCase(); + break; default: PRINT("Unknown CUSTOM_FILE_OPERATE_MSG cmd 0x%02X \r\n", mail.cmd); break; diff --cc code/sdk/drivers/peripheral/utils/custom_utils.h index 305df570e,2e0f80558..67a51a20d --- a/code/sdk/drivers/peripheral/utils/custom_utils.h +++ b/code/sdk/drivers/peripheral/utils/custom_utils.h @@@ -241,9 -241,12 +241,14 @@@ errcode_t do_custom_cmd_service_check_m #define CUSTOM_FILEOPERATE_MSG_TYPE_NAPDATA_SAVE 0x06//小睡数据 #define CUSTOM_FILEOPERATE_MSG_TYPE_SLEEPDATA_READ 0x07 //读取睡眠时间 - #define CUSTOM_FILEOPERATE_MSG_TYPE_NAPDATA_READ 0x08 //读取小睡数据 - #define CUSTOM_FILEOPERATE_MSG_TYPE_MUSICNAME_READ 0x09 //读取音乐文件名 + #define CUSTOM_FILEOPERATE_MSG_TYPE_NAPDATA_READ 0x08 //读取小睡数据 + #define CUSTOM_FILEOPERATE_MSG_TYPE_SLEEPMODLE_UPDATE 0x09//更新睡眠model数据 + + #define CUSTOM_FILEOPERATE_MSG_TYPE_MMCDATA_SAVE 0x0A //存储指南针数据 + #define CUSTOM_FILEOPERATE_MSG_TYPE_MMCDATA_READ 0x0B //读取指南针数据 + ++#define CUSTOM_FILEOPERATE_MSG_TYPE_MUSICNAME_READ 0x0C //读取音乐文件名 + errcode_t uapi_custom_fileoperate_service_init(void); errcode_t do_custom_fileoperate_service_check_msg(int cmd, void *params, int paramlen);