From 7c0249c37dde4319697ac69df1c4ba79386c023f Mon Sep 17 00:00:00 2001 From: zhaohe Date: Tue, 30 Jan 2024 11:21:05 +0800 Subject: [PATCH] update --- README.md | 25 +++++++++++++++++++++++++ app/src/one_conduction/config.h | 4 +++- app/src/one_conduction/one_conduction_main.c | 5 ++--- app/src/one_conduction/one_conduction_main.h | 3 ++- 4 files changed, 32 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 0b421f4..9ca4b6d 100644 --- a/README.md +++ b/README.md @@ -245,4 +245,29 @@ TODO: 4. 采样时不支持记录查询相关指令 5. 不支持删除采样记录 +``` + +``` +任务: + 16. 解决断开连接,再次唤醒,屏幕无显示的BUG OK + 1. 提取休眠时间到宏配置中 OK + 9. 支持数据上报 + 12. 支持数据上传 + 6. 支持电池电量采集 + 8. 采集完30秒,蜂鸣器滴一声,采集完成,蜂鸣器滴一声 + 13. 支持低电量事件 + 14. 支持掉落事件 + 15. 检查设备状态 + + 2. UI添加蓝牙状态 + 3. UI添加上传状态 + 4. UI添加心率计算 + 5. UI添加心脏跳动效果 + 7. 校准电池电量采集 + 10. 添加OTA支持 + 11. 数据掉电不丢失 + + + + ``` \ No newline at end of file diff --git a/app/src/one_conduction/config.h b/app/src/one_conduction/config.h index d809ee6..49ad5b4 100644 --- a/app/src/one_conduction/config.h +++ b/app/src/one_conduction/config.h @@ -16,4 +16,6 @@ #define MAX_FILE_NUM 10 #define SAMPLE_RATE 200 -#define SAMPLE_PRECISION 12 \ No newline at end of file +#define SAMPLE_PRECISION 12 + +#define AUTOMATIC_SLEEP_TIME 15000 \ No newline at end of file diff --git a/app/src/one_conduction/one_conduction_main.c b/app/src/one_conduction/one_conduction_main.c index 1921e16..eca1066 100644 --- a/app/src/one_conduction/one_conduction_main.c +++ b/app/src/one_conduction/one_conduction_main.c @@ -136,6 +136,7 @@ static void power_off() { SingleLeadECG_adc_module_deinit(); ble_cmder_stop_adv(); ZERROR_CHECK(app_timer_stop(m_state_machine_driver_tmr)); + m_poweronflag = false; } /******************************************************************************* * 状态切换方法 * @@ -222,7 +223,7 @@ void app_event_process_cb(void* p_event_data, uint16_t event_size) { if (!zdatachannel_is_connected() && // !plod_state_is_connected() && // plod_state_has_disconnected_ms() >= 3000 && // - ds_cur_state_haspassed_ms() >= 15000) { + ds_cur_state_haspassed_ms() >= AUTOMATIC_SLEEP_TIME) { state_machine__change_to_standby_state(); } @@ -363,8 +364,6 @@ void zdatachannel_data_handler(zdatachannel_evt_t* p_evt) { * @brief */ if (p_evt->type == ZDATACHANNEL_EVT_RX_DATA) { - // ZLOGI("rx:%s:%d", hex2str(p_evt->params.rx_data.p_data, p_evt->params.rx_data.length), p_evt->params.rx_data.length); - // NRF_LOG_HEXDUMP_INFO(p_evt->params.rx_data.p_data, p_evt->params.rx_data.length); ble_cmder_process_rx((uint8_t*)p_evt->params.rx_data.p_data, p_evt->params.rx_data.length); } } diff --git a/app/src/one_conduction/one_conduction_main.h b/app/src/one_conduction/one_conduction_main.h index 92c6329..e245aa9 100644 --- a/app/src/one_conduction/one_conduction_main.h +++ b/app/src/one_conduction/one_conduction_main.h @@ -1,3 +1,4 @@ #pragma once -void one_conduction_main(); \ No newline at end of file + +void one_conduction_main();