Browse Source

update

master
zhaohe 1 year ago
parent
commit
7f6751acc7
  1. 6
      README.md
  2. 1
      app/src/basic_service/app_event.h
  3. 6
      app/src/service/ble_cmd_processer/ble_cmd_process_service.c
  4. 1
      app/src/service/heart_wave_sample_service/heart_ware_sample_data_mgr.c
  5. 2
      app/src/service/heart_wave_sample_service/heart_wave_sample_data_pre_process.c

6
README.md

@ -105,4 +105,10 @@ README:
```
```
TODO:
1. 每次蓝牙连接,连接上之后默认关闭预览
```

1
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;

6
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;
}

1
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);
}

2
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; }
Loading…
Cancel
Save