update

app/src/ble_cmd_process_service.c

@@ -56,7 +56,7 @@ int ble_stop_realtime_report() {
   m_realtime_report_state = false;
   return 0;
 }
-void ble_cmder_try_report_one_sample_data(uint32_t frameIndex, uint16_t data0, uint16_t data1, uint16_t data2, uint16_t data3) {
+void ble_cmder_try_report_one_sample_data(uint32_t frameIndex, uint16_t data0, uint16_t data1, uint16_t data2, uint16_t data3,uint16_t data4) {
   if (!m_realtime_report_state) {
     return;
   }
@@ -75,8 +75,10 @@ void ble_cmder_try_report_one_sample_data(uint32_t frameIndex, uint16_t data0, u
   reportpacket->data[5] = (data2 >> 8) & 0xFF;  // 第三帧数据
   reportpacket->data[6] = (data3 >> 0) & 0xFF;  // 第四帧数据
   reportpacket->data[7] = (data3 >> 8) & 0xFF;  // 第四帧数据
+  reportpacket->data[8] = (data4 >> 0) & 0xFF;  // 第五帧数据
+  reportpacket->data[9] = (data4 >> 8) & 0xFF;  // 第五帧数据
 
-  uint16_t sendlen = sizeof(heartrate_report_packet_t) + 8;
+  uint16_t sendlen = sizeof(heartrate_report_packet_t) + 10;
   zdatachannel_data_send2(reportbuf, sendlen);
   return;
 }

app/src/ble_cmd_process_service.h

@@ -9,7 +9,7 @@ void ble_cmder_process_rx(uint8_t* rx, int len);
 void ble_cmder_start_adv();
 void ble_cmder_stop_adv();
 
-void ble_cmder_try_report_one_sample_data(uint32_t frameIndex, uint16_t data0, uint16_t data1, uint16_t data2, uint16_t data3);
+void ble_cmder_try_report_one_sample_data(uint32_t frameIndex, uint16_t data0, uint16_t data1, uint16_t data2, uint16_t data3,uint16_t data4);
 void ble_cmder_try_report_sensor_drop_event(uint8_t dropstate0, uint8_t dropstate1);
 void ble_cmder_report_upload_finish_event(uint32_t sumcheckcode);
 void ble_cmder_report_sample_finish_event();

app/src/board/board.h

@@ -23,4 +23,4 @@
 
 #define ENABLE_SLEEP
 
-#define LITTLE_DATA_BLOCK_FRAME_NUM 4  // 每次多少帧上报一次
+#define LITTLE_DATA_BLOCK_FRAME_NUM 5  // 每次多少帧上报一次

app/src/heart_wave_sample_service.c

@@ -88,6 +88,7 @@ static inline void prvf_light_block_trigger_event() {
     event.val.little_data_block.data[i].data = m_sensor_little_frame_cache[i].data;
   }
   event.val.little_data_block.frameIndex = m_frame_index - LITTLE_DATA_BLOCK_FRAME_NUM;
+  ZLOGI("%d", event.val.little_data_block.frameIndex);
   AppEvent_pushEvent(&event);
 }
 
@@ -165,11 +166,13 @@ void hwss_start_capture(void) {
   m_start_capture_tp = znordic_getpower_on_s();
   swap_buffer();
   m_frame_index = 0;
+  prvf_light_block_cache_clear();
   nrfx_timer_enable(&m_timer);
 }
 void hwss_stop_capture(void) {
   nrfx_timer_disable(&m_timer);
   m_frame_index = 0;
+  prvf_light_block_cache_clear();
 }
 
 float hwss_read_val(void) {

app/src/one_conduction_main.c

@@ -1,6 +1,7 @@
 #include <math.h>
 
 #include "app_event.h"
+#include "app_event_distribute.h"
 #include "ble_cmd_process_service.h"
 #include "config.h"
 #include "display_manager.h"
@@ -11,7 +12,6 @@
 #include "zdatachannel_service.h"
 #include "znordic.h"
 #include "znordic_device_info_mgr.h"
-#include "app_event_distribute.h"
 
 /*******************************************************************************
  *                                   GLOBAL                                    *
@@ -333,12 +333,19 @@ static void app_event_listener(void* p_event_data, uint16_t event_size) {
       }
     } else if (p_event->eventType == kevent_capture_little_data_block_event) {
       // µ¥Ö¡ÊµÊ±Éϱ¨
-      ZASSERT(LITTLE_DATA_BLOCK_FRAME_NUM == 4);
-      ble_cmder_try_report_one_sample_data(p_event->val.little_data_block.frameIndex,    //
-                                           p_event->val.little_data_block.data[0].data,  //
-                                           p_event->val.little_data_block.data[1].data,  //
-                                           p_event->val.little_data_block.data[2].data,  //
-                                           p_event->val.little_data_block.data[3].data   //
+      ZASSERT(LITTLE_DATA_BLOCK_FRAME_NUM == 5);
+      // 12,345
+      // ble_cmder_try_report_one_sample_data(p_event->val.little_data_block.frameIndex,    //
+      //                                      p_event->val.little_data_block.data[0].data,  //
+      //                                      p_event->val.little_data_block.data[1].data,  //
+      //                                      p_event->val.little_data_block.data[2].data,  //
+      //                                      p_event->val.little_data_block.data[3].data   //
+      ble_cmder_try_report_one_sample_data(p_event->val.little_data_block.frameIndex,  //
+                                           12345,                                      //
+                                           12346,                                      //
+                                           12347,                                      //
+                                           12348,                                      //
+                                           12349                                       //
       );
     } else if (p_event->eventType == kplod_disconnected_event || !m_plod_state_connected_state) {
       /*******************************************************************************