update

app/app.uvoptx

@@ -140,7 +140,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>JL2CM3</Key>
-          <Name>-U685384569 -O78 -S2 -ZTIFSpeedSel5000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD20000000 -FC4000 -FN2 -FF0nrf52xxx.flm -FS00 -FL0200000 -FP0($$Device:nRF52833_xxAA$Flash\nrf52xxx.flm) -FF1nrf52xxx_uicr.flm -FS110001000 -FL11000 -FP1($$Device:nRF52833_xxAA$Flash\nrf52xxx_uicr.flm)</Name>
+          <Name>-U150710864 -O78 -S2 -ZTIFSpeedSel5000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD20000000 -FC4000 -FN2 -FF0nrf52xxx.flm -FS00 -FL0200000 -FP0($$Device:nRF52833_xxAA$Flash\nrf52xxx.flm) -FF1nrf52xxx_uicr.flm -FS110001000 -FL11000 -FP1($$Device:nRF52833_xxAA$Flash\nrf52xxx_uicr.flm)</Name>
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
@@ -152,9 +152,9 @@
         <Bp>
           <Number>0</Number>
           <Type>0</Type>
-          <LineNumber>84</LineNumber>
+          <LineNumber>8</LineNumber>
           <EnabledFlag>1</EnabledFlag>
-          <Address>191842</Address>
+          <Address>182640</Address>
           <ByteObject>0</ByteObject>
           <HtxType>0</HtxType>
           <ManyObjects>0</ManyObjects>
@@ -163,39 +163,23 @@
           <BreakIfRCount>1</BreakIfRCount>
           <Filename>main.c</Filename>
           <ExecCommand></ExecCommand>
-          <Expression>\\nrf52833_xxaa\main.c\84</Expression>
+          <Expression>\\nrf52833_xxaa\main.c\8</Expression>
         </Bp>
         <Bp>
           <Number>1</Number>
           <Type>0</Type>
-          <LineNumber>275</LineNumber>
+          <LineNumber>18</LineNumber>
           <EnabledFlag>1</EnabledFlag>
-          <Address>173498</Address>
+          <Address>171540</Address>
           <ByteObject>0</ByteObject>
           <HtxType>0</HtxType>
           <ManyObjects>0</ManyObjects>
           <SizeOfObject>0</SizeOfObject>
           <BreakByAccess>0</BreakByAccess>
           <BreakIfRCount>1</BreakIfRCount>
-          <Filename>D:\workspace\nordic_wp\conduction1_dynamic_electrocardiograph\app\src\board.c</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression>\\nrf52833_xxaa\src/board.c\275</Expression>
-        </Bp>
-        <Bp>
-          <Number>2</Number>
-          <Type>0</Type>
-          <LineNumber>279</LineNumber>
-          <EnabledFlag>1</EnabledFlag>
-          <Address>173540</Address>
-          <ByteObject>0</ByteObject>
-          <HtxType>0</HtxType>
-          <ManyObjects>0</ManyObjects>
-          <SizeOfObject>0</SizeOfObject>
-          <BreakByAccess>0</BreakByAccess>
-          <BreakIfRCount>1</BreakIfRCount>
-          <Filename>D:\workspace\nordic_wp\conduction1_dynamic_electrocardiograph\app\src\board.c</Filename>
+          <Filename>main.c</Filename>
           <ExecCommand></ExecCommand>
-          <Expression>\\nrf52833_xxaa\src/board.c\279</Expression>
+          <Expression>\\nrf52833_xxaa\main.c\18</Expression>
         </Bp>
       </Breakpoint>
       <Tracepoint>

app/main.c

@@ -1,103 +1,22 @@
-#include "one_conduction/one_conduction_main.h"
+#include "basic/zble_module.h"
+#include "basic/zdatachannel_service.h"
+#include "znordic.h"
+//
 #include "three_lead\three_lead_board.h"
 
-int main(void) { one_conduction_main(); }
-
-#if 0
-
-ZDATACHANNEL_DEF(m_zhrs, 2 /*回调事件优先级*/, 1 /*client num*/);
-APP_TIMER_DEF(m_test_tx_timer);
-
-static const char* hex2str(const uint8_t* data, int32_t len) {
-  static char rx[64] = {0};
-  memset(rx, 0, sizeof(rx));
-  for (int32_t i = 0; i < len; i++) {
-    sprintf(rx + i * 2, "%02X", data[i]);
-  }
-  return rx;
-}
-
-void zdatachannel_data_handler(zdatachannel_evt_t* p_evt) {
-  /**
-   * @brief 接收到指令数据
-   */
-  if (p_evt->type == ZDATACHANNEL_EVT_RX_DATA) {
-    ZLOGI("rx:%s", hex2str(p_evt->params.rx_data.p_data, p_evt->params.rx_data.length));
-  }
-}
-
-static void ble_evt_handler(ble_evt_t const* p_ble_evt, void* p_context) {
-  switch (p_ble_evt->header.evt_id) {
-    case BLE_GAP_EVT_CONNECTED:
-      ZLOGI("Connected");
-      break;
-
-    case BLE_GAP_EVT_DISCONNECTED:
-      ZLOGI("Disconnected");
-      // zble_module_start_adv();
-      break;
-  }
-}
-
-void on_service_init(void) {
-  /**
-   * @brief 数据通道初始化
-   */
-  ZLOGI("init zdatachannel service");
-  zdatachannel_init_t zdatachannle_init;
-  memset(&zdatachannle_init, 0, sizeof(zdatachannle_init));
-  zdatachannle_init.data_handler = zdatachannel_data_handler;
-  ZERROR_CHECK(zdatachannel_init(&m_zhrs, &zdatachannle_init));
-}
-
 static void test_tx_timer_cb(void* p_context) {
-  // static uint32_t data;
-  // uint16_t        txlen = 4;
-  // data++;
-  // zdatachannel_data_send((uint8_t*)&data, &txlen);
-
-  // ZLOGI("adc channel %d %d", adc_module_heart_elect_channel_read_val(), adc_module_battery_channel_read_val());
   ZLOGI("test_tx_timer_cb");
-  NVIC_SystemReset();
-  // board_spi_transfer_test();
-  // uint8_t data[] = {0xAA, 0xBB};
-  // board_i2c_write(0x3C, data, 2);
-  // fatfs_test_write();
+  ThreeLeadECG_sdcard_mount();
 }
 
-static void board_init() {
-  // adc_module_init();
-  // adc_module_battery_channel_init(NRF_SAADC_INPUT_VDD);
-  // adc_module_heart_elect_channel_init(NRF_SAADC_INPUT_AIN2);
-
-  // board_spi_init();
-  // board_i2c_init();
-}
+extern uint32_t g_nrf_log_tx_pin;
+APP_TIMER_DEF(m_test_tx_timer);
 
-int main(void) {
+void main() {
+  g_nrf_log_tx_pin = 2;
   znordic_init();
-  NRF_LOG_INFO("compile time :%s", __TIME__);
-  NRF_LOG_INFO("Version      :%d", VERSION);
-  NRF_LOG_INFO("Manufacturer :%s", MANUFACTURER_NAME);
-
-  static zble_module_cfg_t cfg =  //
-      {
-          .deviceName      = "iflytop_test_ble",
-          .on_service_init = on_service_init,
-      };
-  zble_module_init(&cfg);
-  board_init();
-  // fatfs_init();
-
-  NRF_SDH_BLE_OBSERVER(m_ble_observer, 3, ble_evt_handler, NULL);
-
-  // ZERROR_CHECK(app_timer_create(&m_test_tx_timer, APP_TIMER_MODE_REPEATED, test_tx_timer_cb));
-  // ZERROR_CHECK(app_timer_start(m_test_tx_timer, APP_TIMER_TICKS(100), NULL));
-
-  // pwm_trigger();
-  // wd_init();
-
-  zble_module_start_adv();
+  NRF_LOG_INFO("compile time :%s %d", __TIME__, APP_TIMER_TICKS(100));
+  ZERROR_CHECK(app_timer_create(&m_test_tx_timer, APP_TIMER_MODE_REPEATED, test_tx_timer_cb));
+  ZERROR_CHECK(app_timer_start(m_test_tx_timer, APP_TIMER_TICKS(100), NULL));
   znordic_loop();
 }
-#endif

app/src/one_conduction/one_conduction_main.c

@@ -17,22 +17,6 @@ static const char* hex2str(const uint8_t* data, int32_t len) {
   return rx;
 }
 
-/*******************************************************************************
- *                                     CB                                      *
- *******************************************************************************/
-
-// static void ble_evt_handler(ble_evt_t const* p_ble_evt, void* p_context) {
-//   switch (p_ble_evt->header.evt_id) {
-//     case BLE_GAP_EVT_CONNECTED:
-//       ZLOGI("Connected");
-//       break;
-
-//     case BLE_GAP_EVT_DISCONNECTED:
-//       ZLOGI("Disconnected");
-//       break;
-//   }
-// }
-
 void zdatachannel_data_handler(zdatachannel_evt_t* p_evt) {
   /**
    * @brief 接收到指令数据

app/src/three_lead/three_lead_board.c

@@ -115,15 +115,11 @@ int16_t ThreeLeadECG_battery_get_adc_val() {
  * sd card
  * switch
  */
-#define SDC_SCK_PIN  29  ///< SDC serial clock (SCK) pin.
-#define SDC_MOSI_PIN 30  ///< SDC serial data in (DI) pin.
-#define SDC_MISO_PIN 31  ///< SDC serial data out (DO) pin.
-#define SDC_CS_PIN   20  ///< SDC chip select (CS) pin.
-
-#define SDCARD_SPI_CS_PIN                     8
-#define SDCARD_SPI_MISO_PIN                   7
-#define SDCARD_SPI_MOSI_PIN                   6
-#define SDCARD_SPI_SCK_PIN                    5
+
+#define SDCARD_SPI_CS_PIN                     20
+#define SDCARD_SPI_MISO_PIN                   31
+#define SDCARD_SPI_MOSI_PIN                   30
+#define SDCARD_SPI_SCK_PIN                    29
 #define SDCARD_USBDRIVER_IC_JUNCTION_CTRL_PIN 5
 #define SDCARD_USBDRIVER_IC_RESET_PIN         5
 #define SDCARD_POWER_CTRL_PIN                 5
@@ -230,14 +226,20 @@ void ThreeLeadECG_sdcard_mount() {
    *  4. 初始化SPI引脚，驱动flash
    */
 
-  ThreeLeadECG_sdcard_flash_power_ctrl(false);
-  ThreeLeadECG_sdcard_connect2_ext_usb_sdcard_driver_ic(false);
-  ThreeLeadECG_sdcard_flash_power_ctrl(true);
+  // ThreeLeadECG_sdcard_flash_power_ctrl(false);
+  // ThreeLeadECG_sdcard_connect2_ext_usb_sdcard_driver_ic(false);
+  // ThreeLeadECG_sdcard_flash_power_ctrl(true);
 
   /**
    * @brief
    *  1. 初始化SPI引脚，驱动flash
    */
+
+  static diskio_blkdev_t drives[] =  //
+      {DISKIO_BLOCKDEV_CONFIG(NRF_BLOCKDEV_BASE_ADDR(m_block_dev_sdc, block_dev), NULL)};
+
+  diskio_blockdev_register(drives, ARRAY_SIZE(drives));
+
   DSTATUS disk_state = STA_NOINIT;
   for (uint32_t retries = 3; retries && disk_state; --retries) {
     disk_state = disk_initialize(0);

libznordic

@@ -1 +1 @@
-Subproject commit efdb1b55c3432d3b539fb9fcecb14209874dae0d
+Subproject commit fbcd219fb95c6c1af8a9c2ee62854dd989d941e8

sdk

@@ -1 +1 @@
-Subproject commit 9ff458fcdef52d2ff06829ec783406af521844da
+Subproject commit 65387c8fdeef99d05d9a2fce75a99df87dda4fb8