diff --git a/README.md b/README.md index b939b5b..4bafaa1 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,8 @@ V3: 3. 添加充电检测 4. 调整UI显示效果 5. 调慢心跳动速度 +V4: + 1. 修改单手唤醒改为双手唤醒 TODO diff --git a/app/config/sdk_config.h b/app/config/sdk_config.h index 54116c9..03e3122 100644 --- a/app/config/sdk_config.h +++ b/app/config/sdk_config.h @@ -7812,7 +7812,7 @@ // NRF_LOG_ENABLED - nrf_log - Logger //========================================================== #ifndef NRF_LOG_ENABLED -#define NRF_LOG_ENABLED 1 +#define NRF_LOG_ENABLED 0 #endif // Log message pool - Configuration of log message pool diff --git a/app/src/basic/version.h b/app/src/basic/version.h index 6b8682a..212eb68 100644 --- a/app/src/basic/version.h +++ b/app/src/basic/version.h @@ -2,7 +2,7 @@ #define CATEGORY "M1001" // 单导联 #define MANUFACTURER_NAME "iflytop" -#define FIRMWARE_VERSION (3) +#define FIRMWARE_VERSION (4) #define BLESTACK_VERSION 1 #define BOOTLOADER_VERSION 1 #define HARDWARE_VERSION (1) diff --git a/app/src/board/board_ecg_sensor.c b/app/src/board/board_ecg_sensor.c index 0b08f15..854d81b 100644 --- a/app/src/board/board_ecg_sensor.c +++ b/app/src/board/board_ecg_sensor.c @@ -16,8 +16,9 @@ static void module_tmr_cb(void *context) { // static uint32_t connecte_state_trigger_cnt = 0; static app_event_t appevent; memset(&appevent, 0, sizeof(appevent)); + // ZLOGI("ecg sensor %d",m_plod_state_connected_state); - if (BoardEcgSensor_plod_get_connected_state()) { + if (!nrf_gpio_pin_read(ECG_PLOD_PIN)) { connecte_state_trigger_cnt++; m_connecte_state_last_trigger_timepoint = znordic_getpower_on_ms(); } else { diff --git a/app/src/one_conduction_main.c b/app/src/one_conduction_main.c index e496e57..686907d 100644 --- a/app/src/one_conduction_main.c +++ b/app/src/one_conduction_main.c @@ -171,7 +171,7 @@ static void app_event_listener(void* p_event_data, uint16_t event_size) { // 导联连接事件触发 --> 切换到开机中页面 - else if (BoardEcgSensor_plod_get_connected_state() && znordic_haspassed_ms(lasttrypoweron_time) >= LOW_BATTERY_REMINDER_DELAY_MS) { + else if (BoardEcgSensor_plod_get_connected_state_after_filter() && znordic_haspassed_ms(lasttrypoweron_time) >= LOW_BATTERY_REMINDER_DELAY_MS) { lasttrypoweron_time = znordic_getpower_on_ms(); if (BoardBattery_get_battery_level() > APP_WORK_BATTERY_LEVEL) { state_machine__change_to_poweroning_state(); @@ -183,7 +183,7 @@ static void app_event_listener(void* p_event_data, uint16_t event_size) { } // 10秒后,如果RTC未被设置过,则进入超低功耗 - else if (ds_cur_state_haspassed_ms() >= 2000) { + else if (ds_cur_state_haspassed_ms() >= 10000) { if (!znordic_rtc_has_setted()) { ENTER_DEEP_SLEEP(); } @@ -434,6 +434,6 @@ void one_conduction_main() { ZERROR_CHECK(app_timer_create(&m_state_machine_driver_tmr, APP_TIMER_MODE_REPEATED, state_machine_driver_tmr_cb)); ZERROR_CHECK(app_timer_start(m_state_machine_driver_tmr, APP_TIMER_TICKS(300), NULL)); - state_machine__change_to_poweroning_state(); + state_machine__change_to_standby_state(); znordic_loop(); }