V5

README.md

@@ -9,7 +9,9 @@ V3:
     5. 调慢心跳动速度
 V4:
     1. 修改单手唤醒改为双手唤醒
-
+V5:
+    1. 在系统启动的初期就初始化看门狗
+    2. 优化静态功耗到300ua
 
 TODO
 0. 支持无线升级，修改SN码  OK
@@ -39,3 +41,8 @@ TODO
 3. 检查各个延时时间是否正确
 
 ...
+
+
+```
+单导:休眠527ua
+```

app/src/basic/version.h

@@ -2,7 +2,7 @@
 #define CATEGORY "M1001" // 데돔젬
 #define MANUFACTURER_NAME "iflytop"
 
-#define FIRMWARE_VERSION (4)
+#define FIRMWARE_VERSION (5)
 #define BLESTACK_VERSION 1
 #define BOOTLOADER_VERSION 1
 #define HARDWARE_VERSION (1)

app/src/board/board_ecg_sensor.c

@@ -56,6 +56,7 @@ int16_t BoardEcgSensor_plod_get_connected_state_after_filter() { return plod_sta
 int16_t BoardEcgSensor_plod_state_has_disconnected_ms() { return plod_state_has_disconnected_ms(); }
 
 int16_t BoardEcgSensor_set_sence_state() {
+  nrf_gpio_cfg_default(ECG_NLOD_PIN);
   nrf_gpio_cfg_sense_input(ECG_PLOD_PIN, NRF_GPIO_PIN_PULLUP, NRF_GPIO_PIN_SENSE_LOW);
   return 0;
 }

app/src/board/board_light_ctrl.c

@@ -97,7 +97,6 @@ static void BoardLight_effect_tmr_handler(void* p_context) {  //
 
 void BoardLight_Init() {
   ZERROR_CHECK(app_timer_create(&m_green_light_effect_tmr, APP_TIMER_MODE_REPEATED, BoardLight_effect_tmr_handler));
-  APP_ERROR_CHECK(nrfx_pwm_init(&light_ctrl.driver, &light_ctrl.config, NULL));
 }
 static bool m_boardlight_loaded = false;
 
@@ -106,6 +105,7 @@ void BoardLight_load() {
   //   return;
   // }
   // m_boardlight_loaded = true;
+  nrfx_pwm_init(&light_ctrl.driver, &light_ctrl.config, NULL);
   BoardLight_setGreenLightState(false);
 }
 void BoardLight_unload() {
@@ -114,6 +114,7 @@ void BoardLight_unload() {
   // }
   m_boardlight_loaded = false;
   BoardLight_setGreenLightEffect(kLightEffect_close);
+  nrfx_pwm_uninit(&light_ctrl.driver);
 }
 
 void BoardLight_setGreenLightEffect(LightEffect_t effect) {

app/src/one_conduction_board.c

@@ -60,6 +60,11 @@ void SingleLeadECG_screen_init() {
 }
 
 void SingleLeadECG_screen_deinit() {
+
+  nrf_gpio_cfg_default(SCREEN_RESET_PIN);
+  nrf_gpio_cfg_default(SCREEN_POWER_PIN);
+  nrf_gpio_cfg_default(SCREEN_A0PIN);
+
   ssd1306_basic_deinit();
   nrf_drv_spi_uninit(&m_screen_spi);
 }

app/src/one_conduction_main.c

@@ -416,12 +416,12 @@ void one_conduction_main() {
   BoardBattery_init();
   BoardEcgSensor_init();
   BoardLight_Init();
-  BoardLight_load();
-
   BoardBattery_load();
 #if 1
   if (BoardBattery_get_battery_level() < APP_WORK_BATTERY_LEVEL) {
+    BoardLight_load();
     BoardLight_blockFlash(3, 100);
+    BoardLight_unload();
     // 系统进入深度睡眠,进入深度睡眠前，使能唤醒引脚
     app_timer_pause();
     nrf_delay_ms(LOW_BATTERY_REMINDER_DELAY_MS);
@@ -429,7 +429,7 @@ void one_conduction_main() {
   }
 #endif
 
-  wd_init();
+  // wd_init();
 
   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));

libznordic

@@ -1 +1 @@
-Subproject commit 52d18110e10b67278d7eafad5a88cb01a7395137
+Subproject commit a5cc5239adb61162d87d7109c9e6710d70c58d36