From 77572b641fa7fbcdb541f3abd0e7b6a22f6d72ea Mon Sep 17 00:00:00 2001 From: zhaohe Date: Fri, 2 Feb 2024 11:20:23 +0800 Subject: [PATCH] update --- app/src/app_ble_service.c | 4 ++-- app/src/device_ctrl_service.c | 13 +++++++++++++ app/src/heart_wave_sample_service.c | 2 +- libznordic | 2 +- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/app/src/app_ble_service.c b/app/src/app_ble_service.c index 2345995..e210a8c 100644 --- a/app/src/app_ble_service.c +++ b/app/src/app_ble_service.c @@ -97,7 +97,7 @@ static void prvf_try_report_sensor_drop_event(uint8_t dropstate0, uint8_t dropst } static void prvf_try_report_sample_end_event() { - sensor_drop_event_report_packet_t* reportpacket = (ify_hrs_packet_t*)m_reportbuf; + ify_hrs_packet_t* reportpacket = (ify_hrs_packet_t*)m_reportbuf; reportpacket->cmd = ify_hrs_report_sample_finish_end; reportpacket->frame_index = 0; reportpacket->frame_type = kifyhrs_pt_report; @@ -143,7 +143,7 @@ void prvf_report_sample_data(uint32_t frameIndex, uint32_t data, uint32_t data2, reportpacket->data[11] = 0; uint16_t sendlen = sizeof(heartrate_report_packet_t) + 4 * 3; - zdatachannel_data_send2(reportbuf, sendlen); + zdatachannel_data_send2(m_reportbuf, sendlen); return; } diff --git a/app/src/device_ctrl_service.c b/app/src/device_ctrl_service.c index b32c398..6f7698c 100644 --- a/app/src/device_ctrl_service.c +++ b/app/src/device_ctrl_service.c @@ -106,6 +106,7 @@ static sample_data_filename_t* cratefilename() { sampledata_file_name.hour = tm.tm_hour; sampledata_file_name.min = tm.tm_min; sampledata_file_name.sec = tm.tm_sec; + return &sampledata_file_name; } static void prvf_change_to_standby_state() { poweroff(); } @@ -164,6 +165,12 @@ static void app_event_listener(void* p_event_data, uint16_t event_size) { // prvf_change_to_sample_state(); // 开始采集 hwss_start_capture(); + + { + static app_event_t event; + event.eventType = kevent_sample_start_event; + AppEvent_pushEvent(&event); + } } } // @@ -199,6 +206,12 @@ static void app_event_listener(void* p_event_data, uint16_t event_size) { // hwss_stop_capture(); // 切换到待机状态 prvf_change_to_ready_state(); + + { + static app_event_t event; + event.eventType = kevent_sample_stop_event; + AppEvent_pushEvent(&event); + } } } } diff --git a/app/src/heart_wave_sample_service.c b/app/src/heart_wave_sample_service.c index 5faa8c5..ffa129a 100644 --- a/app/src/heart_wave_sample_service.c +++ b/app/src/heart_wave_sample_service.c @@ -57,7 +57,7 @@ static uint32_t m_little_frame_index; static uint8_t m_lodstate0; static uint8_t m_lodstate1; -static bool m_drop_state_triggered = false; +volatile static bool m_drop_state_triggered = false; /******************************************************************************* * 函数声明 * diff --git a/libznordic b/libznordic index 05065fd..c031816 160000 --- a/libznordic +++ b/libznordic @@ -1 +1 @@ -Subproject commit 05065fdb3d74e3c973298d5f4f286f9934631637 +Subproject commit c031816fcfca2c27bbe5d3d1996477b7959a8f59