diff --git a/app/src/app_service/battery_mgr_service.c b/app/src/app_service/battery_mgr_service.c index 948aca8..eb3698a 100644 --- a/app/src/app_service/battery_mgr_service.c +++ b/app/src/app_service/battery_mgr_service.c @@ -101,6 +101,8 @@ void battery_mgr_service_init() { app_timer_create(&battery_state_detect_tmr, APP_TIMER_MODE_REPEATED, module_tmr_cb); m_state = kstandy; + + m_batter_level = _battery_mgr_service_get_battery_level(); } void battery_mgr_service_load() { app_timer_start(battery_state_detect_tmr, APP_TIMER_TICKS(500), NULL); } diff --git a/app/src/app_service/ecg_service/ecg_service.c b/app/src/app_service/ecg_service/ecg_service.c index 831b840..50351da 100644 --- a/app/src/app_service/ecg_service/ecg_service.c +++ b/app/src/app_service/ecg_service/ecg_service.c @@ -260,14 +260,10 @@ void ecg_service_load() { ADS129X_START_RESET(); nrf_delay_ms(1000); ADS129X_REST_SET(); - nrf_delay_ms(100); /* 硬件复位 */ + nrf_delay_ms(30); /* 硬件复位 */ ads129x_send_cmd(ADS129X_COMMAND_SDATAC); /* 软件复位,并停止连续读状态 */ - nrf_delay_ms(100); - ads129x_send_cmd(ADS129X_COMMAND_RESET); - nrf_delay_ms(1000); - ads129x_send_cmd(ADS129X_COMMAND_SDATAC); - nrf_delay_ms(100); + nrf_delay_ms(30); static ads129x_regs_t regcache; ads129x_readback_regs(®cache); @@ -280,9 +276,7 @@ void ecg_service_load() { regcache.rld_sens = 0x20; regcache.loff_sens = 0x03; ads129x_write_regs(®cache); - ads129x_send_cmd(ADS129X_COMMAND_STANDBY); /* 软件复位,并停止连续读状态 */ - nrf_delay_ms(100); - // ads129x_send_cmd(ADS129X_COMMAND_START); /* 软件复位,并停止连续读状态 */ + ads129x_send_cmd(ADS129X_COMMAND_WAKEUP); /* 软件复位,并停止连续读状态 */ } void ecg_service_unload() { /** diff --git a/app/src/one_conduction_main.c b/app/src/one_conduction_main.c index 2c45c73..ea1f098 100644 --- a/app/src/one_conduction_main.c +++ b/app/src/one_conduction_main.c @@ -295,7 +295,7 @@ void on_zapp_ebus_event(void* p_event_data, uint16_t event_size) { * @brief * 延迟1.5s切换到主页面 */ - if (zapp_state_machine_haspassed_ms() >= 1500) { + if (zapp_state_machine_haspassed_ms() >= 2000) { zapp_state_machine_change_state(kstate_mainPage); beep_set_effect(POWER_ON_EFFECT); }