From: SnickerSun Date: Thu, 24 Oct 2024 04:07:35 +0000 (+0800) Subject: 更新漏掉的update.fwpkg 文件路径修改 X-Git-Tag: fd230_release_V1.3.102~193^2~2 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=7bb9b39fd79e4ef24c4bf78121faf7c57878b742;p=mirrors%2FFD230.git 更新漏掉的update.fwpkg 文件路径修改 --- diff --git a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c index 7330aad0d..3b8e54a7b 100644 --- a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c +++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c @@ -6825,8 +6825,13 @@ errcode_t decode_ota_data(ble_read_data *buffer_handle,uint8_t *data,uint16_t da buffer_handle->file_recv_stat.lrcvalue = 0; if (buffer_handle->file_recv_stat.file_type == 1) { +#ifdef SINGLE_USER_PARTITION buffer_handle->file_recv_stat.file = fopen("/user/update/update.fwpkg","w+"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"create file /user/update/update.fwpkg %X\n",buffer_handle->file_recv_stat.file); +#else + buffer_handle->file_recv_stat.file = fopen("/update/update.fwpkg","w+"); WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"create file /update/update.fwpkg %X\n",buffer_handle->file_recv_stat.file); +#endif } else if (buffer_handle->file_recv_stat.file_type == 2) @@ -8055,9 +8060,13 @@ errcode_t handle_recv_file(ble_read_data *buffer_handle,uint8_t *data, uint16_t buffer_handle->file_recv_stat.lrcvalue = 0; if (buffer_handle->file_recv_stat.file_type == 1) { +#ifdef SINGLE_USER_PARTITION buffer_handle->file_recv_stat.file = fopen("/user/update/update.fwpkg","w+"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"create file /user/update/update.fwpkg %X\n",buffer_handle->file_recv_stat.file); +#else + buffer_handle->file_recv_stat.file = fopen("/update/update.fwpkg","w+"); WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"create file /update/update.fwpkg %X\n",buffer_handle->file_recv_stat.file); - +#endif } else if (buffer_handle->file_recv_stat.file_type == 2) { diff --git a/code/sdk/application/wearable/service/msg_center/src/ota/msg_center_ota.cpp b/code/sdk/application/wearable/service/msg_center/src/ota/msg_center_ota.cpp index 0663f0a31..ca43a62bc 100644 --- a/code/sdk/application/wearable/service/msg_center/src/ota/msg_center_ota.cpp +++ b/code/sdk/application/wearable/service/msg_center/src/ota/msg_center_ota.cpp @@ -36,8 +36,13 @@ extern uint8_t g_auto_ota_mac_tmp[]; #define unused(var) (void)(var) #endif -/* 固定升级包文件长度, "/user/update.fwpkg"*/ -#define UPGRADE_FILE_LEN 19 +/* 固定升级包文件长度, "/user/update/update.fwpkg"*/ +#ifdef SINGLE_USER_PARTITION +#define UPGRADE_FILE_PATH "/user/update/update.fwpkg" +#else +#define UPGRADE_FILE_PATH "/update/update.fwpkg" +#endif +#define UPGRADE_FILE_LEN strlen(UPGRADE_FILE_PATH) static errcode_t msg_center_ota_upgrade_request_call_back(bool is_finished, uintptr_t usr_data) { @@ -45,7 +50,7 @@ static errcode_t msg_center_ota_upgrade_request_call_back(bool is_finished, uint errcode_t ret = ERRCODE_SUCC; /* 目的端升级路径,建议固定 */ uint32_t package_len = 0; - const char *file_name = "/user/update.fwpkg"; + const char *file_name = UPGRADE_FILE_PATH; FILE *fp = fopen(file_name, "rb"); if (fp == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_MSG_CENTER, "open %s fail.\r\n", file_name); @@ -135,7 +140,7 @@ static errcode_t msg_center_src_send_file_start(transmit_type_t transmit_type, d void msg_center_ota_upgrade_start(void) { - const char *file_name = "/user/update.fwpkg"; + const char *file_name = UPGRADE_FILE_PATH; uint32_t total_size; errcode_t ret; FILE *fp = fopen(file_name, "rb");