diff --git a/README.md b/README.md index d9c6c24..362f89d 100644 --- a/README.md +++ b/README.md @@ -249,17 +249,17 @@ TODO: ``` 任务: - 16. 解决断开连接,再次唤醒,屏幕无显示的BUG OK + 16. 解决断开连接,再次唤醒,屏幕无显示的BUG OK TESTOK 1. 提取休眠时间到宏配置中 OK - 9. 支持数据实时上报 OK + 9. 支持数据实时上报 OK TEST1/2OK,有数据,但数据是否正确,校验起来不方便 12. 支持数据上传 OK TESTOK 15. 检查设备状态 OK TESTOK - 14. 支持掉落事件 OK + 14. 支持掉落事件 OK TESTOK 6. 支持电池电量采集 8. 采集完30秒,蜂鸣器滴一声,采集完成,蜂鸣器滴一声 16. 调整UI位置 - 11. 死机后一直重启的BUG + 11. 死机后一直重启的BUG OK -------------------------------------------------------------- 2. UI添加蓝牙状态 3. UI添加上传状态 diff --git a/app/src/one_conduction/ble_cmd_process_service.c b/app/src/one_conduction/ble_cmd_process_service.c index 2d94377..a2485a4 100644 --- a/app/src/one_conduction/ble_cmd_process_service.c +++ b/app/src/one_conduction/ble_cmd_process_service.c @@ -72,8 +72,9 @@ void ble_cmder_try_report_one_sample_data(uint32_t frameIndex, uint16_t data) { reportpacket->data[0] = (data >> 0) & 0xFF; reportpacket->data[1] = (data >> 8) & 0xFF; reportpacket->data[2] = 0; + reportpacket->data[3] = 0; - uint16_t sendlen = sizeof(heartrate_report_packet_t) + 3; + uint16_t sendlen = sizeof(heartrate_report_packet_t) + 4; zdatachannel_data_send2(reportbuf, sendlen); return; } @@ -230,9 +231,9 @@ static void send_error_receipt(ify_hrs_packet_t* rxpacket, int32_t errorcode) { zdatachannel_data_send2(txbuf, sendlen); } -static void send_success_receipt(ify_hrs_packet_t* rxpacket) { +static void send_success_receipt(ify_hrs_packet_t* rxpacket, int32_t emptydatasize) { ify_hrs_packet_t* txheader = (ify_hrs_packet_t*)txbuf; - uint16_t sendlen = sizeof(ify_hrs_packet_t); + uint16_t sendlen = sizeof(ify_hrs_packet_t) + emptydatasize; txheader->cmd = rxpacket->cmd; txheader->frame_index = rxpacket->frame_index; @@ -335,7 +336,7 @@ void ble_cmder_process_rx(uint8_t* rx, int len) { // unsupport cmd int ecode = ble_start_realtime_report(); if (ecode == 0) { - send_success_receipt(rxheader); + send_success_receipt(rxheader,8);//凑8个字节,使这个回执的字节长度同上报包长度一致,方便调试 } else { send_error_receipt(rxheader, ecode); } @@ -344,7 +345,7 @@ void ble_cmder_process_rx(uint8_t* rx, int len) { else if (cmd == ify_hrs_cmd_stop_realtime_report) { int ecode = ble_stop_realtime_report(); if (ecode == 0) { - send_success_receipt(rxheader); + send_success_receipt(rxheader,0); } else { send_error_receipt(rxheader, ecode); } @@ -399,7 +400,7 @@ void ble_cmder_process_rx(uint8_t* rx, int len) { int ecode = sample_data_mgr_delete_file(&filename); if (ecode == 0) { - send_success_receipt(rxheader); + send_success_receipt(rxheader,0); } else { send_error_receipt(rxheader, kifyhrs_ecode_unkown_error); }