V15

README.md

@@ -1,6 +1,8 @@
 # three_lead_ecg_v2
 
 ```
+V15:
+    1.继续优化功耗到3.1ma
 
 V14:
     1.优化功耗

app/config/sdk_config.h

@@ -3468,7 +3468,7 @@
  
 
 #ifndef NRFX_SAADC_CONFIG_LP_MODE
-#define NRFX_SAADC_CONFIG_LP_MODE 0
+#define NRFX_SAADC_CONFIG_LP_MODE 1
 #endif
 
 // <o> NRFX_SAADC_CONFIG_IRQ_PRIORITY  - Interrupt priority

app/src/basic/version.h

@@ -2,7 +2,7 @@
 #define CATEGORY "M1002" // Èýµ¼Áª
 #define MANUFACTURER_NAME "iflytop"
 
-#define FIRMWARE_VERSION (14)
+#define FIRMWARE_VERSION (15)
 #define BLESTACK_VERSION 1
 #define BOOTLOADER_VERSION 1
 #define HARDWARE_VERSION (1)

app/src/board/board_sdcard_driver.c

@@ -169,4 +169,21 @@ void Board_sdcardConnectToInternal() {
   m_connectTo = kConnectToInternal;
 }
 
-BoardSdcardConnectTo_t Board_sdcardGetConnectTo() { return m_connectTo; }
+BoardSdcardConnectTo_t Board_sdcardGetConnectTo() { return m_connectTo; }
+
+void Board_sdcardUnInit() {
+  /**
+   * @brief SDCARD
+   */
+  nrf_gpio_cfg_default(SDCARD_SPI_SCK_PIN);
+  nrf_gpio_cfg_default(SDCARD_SPI_CS_PIN);
+  nrf_gpio_cfg_default(SDCARD_SPI_MISO_PIN);
+  nrf_gpio_cfg_default(SDCARD_SPI_MOSI_PIN);
+
+  nrf_gpio_cfg_default(SDCARD_USBDRIVER_IC_JUNCTION_CTRL_NOE_PIN);
+  nrf_gpio_cfg_default(SDCARD_USBDRIVER_IC_RESET_PIN);
+  nrf_gpio_cfg_default(SDCARD_POWER_CTRL_PIN);
+
+  znrf_gpio_cfg_output(SDCARD_POWER_CTRL_PIN, NRF_GPIO_PIN_PULLUP);
+  nrf_gpio_pin_write(SDCARD_POWER_CTRL_PIN, 1);
+}

app/src/board/board_sdcard_driver.h

@@ -12,6 +12,7 @@ typedef enum {
 } BoardSdcardConnectTo_t;
 
 void Board_sdcardInit();  // main中初始化一遍
+void Board_sdcardUnInit();  // main中初始化一遍
 
 void Board_sdcardConnectToExt();       // SD卡连接到外部SD卡读卡器
 void Board_sdcardConnectToInternal();  // SD卡连接到单片机

app/src/device_ctrl_service.c

@@ -83,10 +83,11 @@ static void poweroff() {
   BoardBattery_unload();
   BoardButton_unload();
   SampleDataMgr_unloadDriver();
-  // hwss_unload();
+  hwss_unload();
   DeviceCtrl_change_to_state(kdevice_state_standby);
   zble_module_stop_adv();
   zble_module_disconnect();
+
   // sd_ble_gap_disconnect()
   // 进入深度睡眠前，使能唤醒引脚
 
@@ -105,6 +106,8 @@ static void poweron() {
   DeviceCtrl_change_to_state(kdevice_state_ready);
   zble_module_start_adv();
   BoardLight_setGreenLightEffect(kLightEffect_quickFlash);
+  hwss_load();
+
   m_ispoweron = true;
 }
 
@@ -203,7 +206,7 @@ static void app_event_listener(void* p_event_data, uint16_t event_size) {  //
       ZLOGI("start sample");
       // SD卡连接到单片机
       SampleDataMgr_changeToLocalMode();
-      hwss_load();
+      // hwss_load();
       // 创建文件
       m_sample_data_fd = SampleDataMgr_open(cratefilename(), kwrflag_write_only);
       ZASSERT(m_sample_data_fd > 0);
@@ -264,7 +267,7 @@ static void app_event_listener(void* p_event_data, uint16_t event_size) {  //
       // 停止采集
       hwss_stop_capture();
       // 卸载心电采集服务
-      hwss_unload();
+      // hwss_unload();
       // 切换到待机状态
       prvf_change_to_ready_state();
 
@@ -313,7 +316,6 @@ void DeviceCtrl_init() {
   // 心电采集服务初始化
   hwss_init();
 
-  // BoardLight_blockFlash(3, 100);
   BoardBattery_load();
   if (BoardBattery_get_battery_level() < APP_LOW_BATTERY_POWER_ON_LIMIT) {
     BoardLight_load();

app/src/heart_wave_sample_service.c

@@ -392,8 +392,8 @@ static void ads1293_init() {
   ads1293_spi_init(&m_ads1293_0, ads1293_spi_tx_rx_0);
   ads1293_spi_init(&m_ads1293_1, ads1293_spi_tx_rx_1);
 
-  ads1293_spi_writereg(&m_ads1293_0, TI_ADS1293_CONFIG_REG, 0);
-  ads1293_spi_writereg(&m_ads1293_1, TI_ADS1293_CONFIG_REG, 0);
+  ads1293_spi_writereg(&m_ads1293_0, TI_ADS1293_CONFIG_REG, 6);
+  ads1293_spi_writereg(&m_ads1293_1, TI_ADS1293_CONFIG_REG, 6);
 
   m_ads1293_driver_is_inited = true;
 
@@ -402,7 +402,7 @@ static void ads1293_init() {
   revid = ads1293_spi_readreg(&m_ads1293_1, TI_ADS1293_REVID_REG);
   ZLOGI("ads1293_1 revid: %d\n", revid);
 
-  ads1293_spi_writereg(&m_ads1293_0, TI_ADS1293_CONFIG_REG, 0);
+  // ads1293_spi_writereg(&m_ads1293_0, TI_ADS1293_CONFIG_REG, 0);
 
   // ads1293_load_cfg(&m_ads1293_0);
   // ads1293_load_cfg(&m_ads1293_1);
@@ -620,6 +620,9 @@ void hwss_stop_capture(void) {
     nrf_gpio_pin_set(ADS1293_SPI_CS1_PIN);
 #endif
   }
+
+  nrf_gpio_cfg_default(ADS1293_READY_PIN);
+  nrf_gpio_cfg_default(LINE_DET_PIN);
 }
 
 bool hwss_is_capturing(void) { return m_work_flag; }
@@ -627,7 +630,4 @@ bool hwss_is_capturing(void) { return m_work_flag; }
 uint8_t hwss_get_drop_state0() { return m_lodstate0; }
 uint8_t hwss_get_drop_state1() { return m_lodstate1; }
 
-
-bool hwss_line_detect_get_state(){
-  return !nrf_gpio_pin_read(LINE_DET_PIN);
-}
+bool hwss_line_detect_get_state() { return !nrf_gpio_pin_read(LINE_DET_PIN); }

app/src/sample_data_manager_service.c

@@ -72,7 +72,7 @@ void SampleDataMgr_loadDriver() {
   // donothing
 }
 void SampleDataMgr_unloadDriver() {
-  // donothin
+  Board_sdcardUnInit();
 }
 typedef struct {
   uint8_t  filename[8];