From a29fe14e065446754abe9e66b0a425de0ec052d2 Mon Sep 17 00:00:00 2001 From: hcj <1224667075@qq.com> Date: Wed, 2 Oct 2024 16:43:17 +0800 Subject: [PATCH] =?utf8?q?=E4=BF=AE=E6=94=B9=E9=80=9A=E8=AE=AF=E5=BD=95?= =?utf8?q?=E6=95=B0=E6=8D=AE=E5=92=8Csos=E6=95=B0=E6=8D=AE=E5=AD=98?= =?utf8?q?=E5=82=A8=20=E7=94=B1=E5=85=B3=E6=9C=BA=E5=AD=98=E5=82=A8?= =?utf8?q?=E6=94=B9=E4=B8=BA=E5=90=8C=E6=AD=A5=E5=AD=98=E5=82=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../service/ble_service/bleservice/bleEvent.c | 22 ++++++++++++++++--- .../drivers/peripheral/utils/custom_utils.c | 4 ++-- 2 files changed, 21 insertions(+), 5 deletions(-) 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 882d37105..c6b1df065 100644 --- a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c +++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c @@ -2154,7 +2154,8 @@ void SetmsgfiltrationCmd(uint16_t cmd,uint8_t *data,uint16_t len,uint8_t *totalD offset+=data_t.len; printf("%s\r\n",data_t.name); filtration_file_updata(&data_t); - } + } + filtration_file_save(); sendBuf[17] = 1; sendBuf[18] = Calculate_CRC(sendBuf,18); @@ -3200,6 +3201,8 @@ bool bin_Check_schedule(uint8_t *data,uint16_t len) } } + + return true; } void APP_send_schedule_Cmd(uint16_t cmd,uint8_t *data,uint16_t len,uint8_t *totalData,uint8_t crcvalue) @@ -3300,6 +3303,9 @@ bool bin_Check_sos(uint8_t *data,uint16_t len) { free(name); } + + ble_sos_data_save(); + return true; } @@ -3589,6 +3595,8 @@ void SetAPPaddressbook(uint16_t cmd,uint8_t *data,uint16_t len,uint8_t *totalDat if(Check_CRC(data,len,crcvalue)) { addressbookToRead((char*)data); + //同步完就写一次 + addressbookTowrite(); value[17] = 0x01; value[18] = Calculate_CRC(value,18); sendBleData(value,19); @@ -6039,6 +6047,7 @@ void type2AE3Data(ble_read_data *buffer_handle,uint8_t *cmd_buf ,uint8_t *data,u case SYN_BASIC_TRANIN_HISTORY_DATA_CMD://同步基础训练历史数据 case SYN_SLEEP_HISTORY_DATA_CMD://睡眠历史数据 case ALARM_CMD://获取手表闹钟//同步闹钟 + readDevDataBle(cmd,data,datalen,totaldata,crcvalue); break; case SET_DMP_MODE_CMD://0X0131 @@ -6108,11 +6117,12 @@ void Send_Sleep_Bin_Data(uint8_t day, uint16_t num) printf("Send_Sleep_Bin_Data file_size : %d \r\n",file_size); data=(char *)malloc(file_size); - + if(data==NULL) { return; } + memset(data,0,file_size); data[0]=sleep_count; @@ -6334,6 +6344,10 @@ void Read_BIN_file_buf_send_bin_Data(uint8_t day,uint32_t pack_size,uint16_t id) //手机app下发读设备数据指令 void readDevDataBle(uint16_t cmd,uint8_t *data,uint16_t len,uint8_t *totalData,uint8_t crcvalue) { + // if() + // { + + // } uint8_t sendBuf[19]; memset(sendBuf,0,19); uint8_t type = cmd/256; @@ -6361,7 +6375,7 @@ void readDevDataBle(uint16_t cmd,uint8_t *data,uint16_t len,uint8_t *totalData,u switch (bleSendTypeID) { case 0x40://同步心率历史数据 - + num=(ble_nus_max_data_len-18); if(num>482)num=482; @@ -6377,6 +6391,8 @@ void readDevDataBle(uint16_t cmd,uint8_t *data,uint16_t len,uint8_t *totalData,u break; case 0x41://同步血氧历史数据 + + num=(ble_nus_max_data_len-18); if(num>482)num=482; if(!Read_Health_BIN_file_buf_send_bin_Data(data[0],num,0x41)) diff --git a/code/sdk/drivers/peripheral/utils/custom_utils.c b/code/sdk/drivers/peripheral/utils/custom_utils.c index c23c40eac..9f5145393 100644 --- a/code/sdk/drivers/peripheral/utils/custom_utils.c +++ b/code/sdk/drivers/peripheral/utils/custom_utils.c @@ -195,9 +195,9 @@ void shutdown_reboot_prejobs_task(void) //保存步数 do_cywee_service_check_msg(CYWEE_SERVICE_CMD_SAVE_DATA,NULL); - addressbookTowrite();//同步数据存储 + // addressbookTowrite();//同步数据存储 - ble_sos_data_save();//同步数据存储 + //ble_sos_data_save();//同步数据存储 //保存信息文件 saveancsdata(); //接收到信息进行保存 -- 2.17.1