V17

README.md

@@ -1,6 +1,10 @@
 # three_lead_ecg_v2
 
 ```
+V17:
+    1.支持从文件中读取ECG配置
+    2.修改当设备ID和批次为0时的蓝牙名称
+
 V16:
     1.修改心率采样IO init，和IO uinit的位置
 
@@ -109,4 +113,10 @@ BUG:
     寄存器(NRF_UICR->CUSTOMER[0],0x10001080) 用于存储设备ID，当设备ID为FFFFFFFF或者0时，表明当前设备为测试程序
 
 
+```
+
+```
+批次寄存器地址:  10001080 00000001 0
+设备ID寄存器地址:10001084 00000001 1
+
 ```

app/src/basic/device_version_info_mgr.c

@@ -16,7 +16,7 @@ void device_info_read_sn(sn_t *sn) {
   static char sn_str[15];
   sprintf(sn_str, CATEGORY "%04d%05d", lot, id);
   if (lot == 0 || id == 0 || lot == 0xffffffff || id == 0xffffffff) {
-    sprintf(sn_str, "iflytop_test");
+    sprintf(sn_str, CATEGORY"000000000");
   }
   memcpy(sn->sn, sn_str, sizeof(sn->sn));
 }

app/src/basic/version.h

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

app/src/heart_wave_sample_service.c

@@ -404,15 +404,17 @@ static void ads1293_init() {
 
   // ads1293_spi_writereg(&m_ads1293_0, TI_ADS1293_CONFIG_REG, 0);
 
-  // ads1293_load_cfg(&m_ads1293_0);
-  // ads1293_load_cfg(&m_ads1293_1);
-
-  for (uint16_t i = 0; i < ZARRAY_SIZE(m_prvads0cfg); i++) {
-    ads1293_spi_writereg_and_check(&m_ads1293_0, m_prvads0cfg[i].add, m_prvads0cfg[i].data);
-  }
-  for (uint16_t i = 0; i < ZARRAY_SIZE(m_prvads1cfg); i++) {
-    ads1293_spi_writereg_and_check(&m_ads1293_1, m_prvads1cfg[i].add, m_prvads1cfg[i].data);
-  }
+  SampleDataMgr_changeToLocalMode();
+  ads1293_load_cfg(&m_ads1293_0);
+  ads1293_load_cfg(&m_ads1293_1);
+  SampleDataMgr_changeToExtMode();
+
+  // for (uint16_t i = 0; i < ZARRAY_SIZE(m_prvads0cfg); i++) {
+  //   ads1293_spi_writereg_and_check(&m_ads1293_0, m_prvads0cfg[i].add, m_prvads0cfg[i].data);
+  // }
+  // for (uint16_t i = 0; i < ZARRAY_SIZE(m_prvads1cfg); i++) {
+  //   ads1293_spi_writereg_and_check(&m_ads1293_1, m_prvads1cfg[i].add, m_prvads1cfg[i].data);
+  // }
 
   /**
    * @brief READYÒý½ÅÖжϳõʼ»¯