zhaohe 1 year ago
parent
commit
76e78b03f0
  1. 2
      README.md
  2. 2
      app/src/basic/version.h
  3. 8
      app/src/heart_wave_sample_service.c
  4. 15559
      release/V20/three_lead_ecg_v20.hex
  5. BIN
      release/V20/three_lead_ecg_v20.zip

2
README.md

@ -1,6 +1,8 @@
# three_lead_ecg_v2 # three_lead_ecg_v2
``` ```
V20:
1. 添加ADS1293配置回读检测
V19: V19:
1. 什么都没有更新,只不过V18存在多个版本,所以重新命名为V19 1. 什么都没有更新,只不过V18存在多个版本,所以重新命名为V19
V18: V18:

2
app/src/basic/version.h

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

8
app/src/heart_wave_sample_service.c

@ -95,6 +95,7 @@ static uint8_t m_ads1293_raw_lod_state1;
volatile static bool m_drop_state_triggered = false; volatile static bool m_drop_state_triggered = false;
static uint32_t m_capture_start_s; static uint32_t m_capture_start_s;
static bool m_ads1293_loadfail = false;
LPFilter lowpassfilter[3]; LPFilter lowpassfilter[3];
MedianFilter_t medianFilter[3]; MedianFilter_t medianFilter[3];
@ -237,7 +238,8 @@ static void ads1293_spi_writereg_and_check(ads1293_t *ads, uint8_t addr, uint8_t
} }
ads1293_spi_writereg_and_readbak(ads, addr, data, &readbak); ads1293_spi_writereg_and_readbak(ads, addr, data, &readbak);
if (readbak != data) { if (readbak != data) {
ZLOGE("ads_%d write %x failed,w:%x readbak:%x\n", ads->id, addr, data, readbak);
ZLOGE("ads_%d write reg 0x%x failed\n", ads->id, addr);
m_ads1293_loadfail = true;
} }
} }
@ -369,6 +371,7 @@ static void update_lod_error() {
} }
static void ads1293_init() { static void ads1293_init() {
m_ads1293_loadfail = false;
/******************************************************************************* /*******************************************************************************
* SPI³õʼ»¯ * * SPI³õʼ»¯ *
*******************************************************************************/ *******************************************************************************/
@ -528,6 +531,7 @@ void hwss_unload(void) {
uint32_t hwss_started_has_passed_s(void) { return znordic_getpower_on_s() - m_capture_start_s; } uint32_t hwss_started_has_passed_s(void) { return znordic_getpower_on_s() - m_capture_start_s; }
void hwss_start_capture(void) { void hwss_start_capture(void) {
ZASSERT(!m_ads1293_loadfail);
nrf_gpio_cfg_input(LINE_DET_PIN, NRF_GPIO_PIN_PULLUP); nrf_gpio_cfg_input(LINE_DET_PIN, NRF_GPIO_PIN_PULLUP);
m_drop_state_triggered = false; m_drop_state_triggered = false;
@ -603,7 +607,5 @@ 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); }
uint8_t hwss_get_original_drop_state0() { return m_ads1293_raw_lod_state0; } uint8_t hwss_get_original_drop_state0() { return m_ads1293_raw_lod_state0; }
uint8_t hwss_get_original_drop_state1() { return m_ads1293_raw_lod_state1; } uint8_t hwss_get_original_drop_state1() { return m_ads1293_raw_lod_state1; }

15559
release/V20/three_lead_ecg_v20.hex
File diff suppressed because it is too large
View File

BIN
release/V20/three_lead_ecg_v20.zip

Loading…
Cancel
Save