diff --git a/README.md b/README.md index 997b0a7..30f1198 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,9 @@ V9: 1.读取头部信息包添加checksum字段,向前兼容 2.修正文件系统读取时,读取的数据长度不正确的问题 3.修正数据上传时,数据长度不正确的问题 - 4. +V10: + 1.修改ify_hrs_protocol版本 + 2.更新SDK版本 测试: 1. 电池电量测试 diff --git a/app/src/basic/version.h b/app/src/basic/version.h index 4d7761f..e911879 100644 --- a/app/src/basic/version.h +++ b/app/src/basic/version.h @@ -2,7 +2,7 @@ #define CATEGORY "M1001" // 单导联 #define MANUFACTURER_NAME "iflytop" -#define FIRMWARE_VERSION (9) +#define FIRMWARE_VERSION (10) #define BLESTACK_VERSION 1 #define BOOTLOADER_VERSION 1 #define HARDWARE_VERSION (1) diff --git a/app/src/ble_cmd_process_service.c b/app/src/ble_cmd_process_service.c index b51b2d3..448d5f5 100644 --- a/app/src/ble_cmd_process_service.c +++ b/app/src/ble_cmd_process_service.c @@ -346,15 +346,15 @@ void ble_cmder_process_rx(uint8_t* rx, int len) { zdatachannel_data_send2(txbuf, sendlen); } - else if (cmd == ify_hrs_cmd_start_capture) { + else if (cmd == ify_hrs_cmd_start_upload_record) { send_error_receipt(rxheader, kifyhrs_ecode_cmd_not_support); } - else if (cmd == ify_hrs_cmd_stop_capture) { + else if (cmd == ify_hrs_cmd_stop_upload_record) { send_error_receipt(rxheader, kifyhrs_ecode_cmd_not_support); } - else if (cmd == ify_hrs_cmd_start_realtime_report) { + else if (cmd == ify_hrs_cmd_start_realtime_preview) { // unsupport cmd int ecode = ble_start_realtime_report(); if (ecode == 0) { @@ -364,7 +364,7 @@ void ble_cmder_process_rx(uint8_t* rx, int len) { } } - else if (cmd == ify_hrs_cmd_stop_realtime_report) { + else if (cmd == ify_hrs_cmd_stop_realtime_preview) { int ecode = ble_stop_realtime_report(); if (ecode == 0) { send_success_receipt(rxheader, 0); diff --git a/ify_hrs_protocol b/ify_hrs_protocol index 3a8a24c..dbeb944 160000 --- a/ify_hrs_protocol +++ b/ify_hrs_protocol @@ -1 +1 @@ -Subproject commit 3a8a24c94c2e5f27b64a4488a9e6da3b61c7f0b0 +Subproject commit dbeb944a12e8f653a0fdb1c273615da51be1094e diff --git a/sdk b/sdk index cbdf2ba..85cbd26 160000 --- a/sdk +++ b/sdk @@ -1 +1 @@ -Subproject commit cbdf2ba8b6fa07b55b17b82f5eb296b12e6f2040 +Subproject commit 85cbd26451dabe41150d375647ccd23b85c42b00