diff --git a/README.md b/README.md index 9c03556..23e31e8 100644 --- a/README.md +++ b/README.md @@ -105,4 +105,10 @@ README: +``` + +``` +TODO: + 1. 每次蓝牙连接,连接上之后默认关闭预览 + ``` \ No newline at end of file diff --git a/app/src/basic_service/app_event.h b/app/src/basic_service/app_event.h index 587ef3e..5b59483 100644 --- a/app/src/basic_service/app_event.h +++ b/app/src/basic_service/app_event.h @@ -26,6 +26,7 @@ typedef struct { uint8_t* capture_data_cache; // 实时采样数据,数据长度为256字节 struct { uint32_t frameIndex; + uint32_t timestamp; one_frame_t data[LITTLE_DATA_BLOCK_FRAME_NUM]; } little_data_block; } val; diff --git a/app/src/service/ble_cmd_processer/ble_cmd_process_service.c b/app/src/service/ble_cmd_processer/ble_cmd_process_service.c index 76ed49c..3ab5960 100644 --- a/app/src/service/ble_cmd_processer/ble_cmd_process_service.c +++ b/app/src/service/ble_cmd_processer/ble_cmd_process_service.c @@ -78,6 +78,10 @@ void ble_cmder_try_report_one_sample_data(app_event_t* event) { reportpacket->data[i * 4 + 2] = (event->val.little_data_block.data[i] >> 16) & 0xFF; reportpacket->data[i * 4 + 3] = (event->val.little_data_block.data[i] >> 24) & 0xFF; } + reportpacket->data[LITTLE_DATA_BLOCK_FRAME_NUM * 4] = (event->val.little_data_block.timestamp >> 0) & 0xFF; + reportpacket->data[LITTLE_DATA_BLOCK_FRAME_NUM * 4 + 1] = (event->val.little_data_block.timestamp >> 8) & 0xFF; + reportpacket->data[LITTLE_DATA_BLOCK_FRAME_NUM * 4 + 2] = (event->val.little_data_block.timestamp >> 16) & 0xFF; + reportpacket->data[LITTLE_DATA_BLOCK_FRAME_NUM * 4 + 3] = (event->val.little_data_block.timestamp >> 24) & 0xFF; STATIC_ASSERT(sizeof(one_frame_t) == 4); @@ -90,7 +94,7 @@ void ble_cmder_try_report_one_sample_data(app_event_t* event) { // reportpacket->data[8] = (data4 >> 0) & 0xFF; // 第五帧数据 // reportpacket->data[9] = (data4 >> 8) & 0xFF; // 第五帧数据 - uint16_t sendlen = sizeof(heartrate_report_packet_t) + LITTLE_DATA_BLOCK_FRAME_NUM * 4; + uint16_t sendlen = sizeof(heartrate_report_packet_t) + LITTLE_DATA_BLOCK_FRAME_NUM * 4 + 4; zdatachannel_data_send2(reportbuf, sendlen); return; } diff --git a/app/src/service/heart_wave_sample_service/heart_ware_sample_data_mgr.c b/app/src/service/heart_wave_sample_service/heart_ware_sample_data_mgr.c index 0f6334c..ecf7ab1 100644 --- a/app/src/service/heart_wave_sample_service/heart_ware_sample_data_mgr.c +++ b/app/src/service/heart_wave_sample_service/heart_ware_sample_data_mgr.c @@ -57,6 +57,7 @@ static inline void preview_data_trigger_event() { for (uint32_t i = 0; i < LITTLE_DATA_BLOCK_FRAME_NUM; i++) { event.val.little_data_block.data[i] = m_prepare_data_cache[i]; } + event.val.little_data_block.timestamp = znordic_getpower_on_ms(); event.val.little_data_block.frameIndex = m_frame_index - LITTLE_DATA_BLOCK_FRAME_NUM; AppEvent_pushEvent(&event); } diff --git a/app/src/service/heart_wave_sample_service/heart_wave_sample_data_pre_process.c b/app/src/service/heart_wave_sample_service/heart_wave_sample_data_pre_process.c index 367e652..39d3fbc 100644 --- a/app/src/service/heart_wave_sample_service/heart_wave_sample_data_pre_process.c +++ b/app/src/service/heart_wave_sample_service/heart_wave_sample_data_pre_process.c @@ -8,5 +8,5 @@ void hwsd_pre_processer_process(one_frame_t framdata) { // m_displaydata = framdata; } -one_frame_t hwsd_pre_processer_get_display_data() { return m_displaydata; } +one_frame_t hwsd_pre_processer_get_display_data() { return m_displaydata; } one_frame_t hwsd_pre_processer_get_storage_data() { return m_datacache; }