From 28576c26cc6159478d5de1b84ad7eb303095ef15 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Tue, 23 Jan 2024 18:23:18 +0800 Subject: [PATCH] update --- app/app.uvoptx | 32 ++------ app/app.uvprojx | 2 +- app/main.c | 105 +++------------------------ app/src/one_conduction/one_conduction_main.c | 16 ---- app/src/three_lead/three_lead_board.c | 26 ++++--- libznordic | 2 +- sdk | 2 +- 7 files changed, 37 insertions(+), 148 deletions(-) diff --git a/app/app.uvoptx b/app/app.uvoptx index dff98f5..297e386 100644 --- a/app/app.uvoptx +++ b/app/app.uvoptx @@ -140,7 +140,7 @@ 0 JL2CM3 - -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) + -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) 0 @@ -152,9 +152,9 @@ 0 0 - 84 + 8 1 -
191842
+
182640
0 0 0 @@ -163,39 +163,23 @@ 1 main.c - \\nrf52833_xxaa\main.c\84 + \\nrf52833_xxaa\main.c\8 1 0 - 275 + 18 1 -
173498
+
171540
0 0 0 0 0 1 - D:\workspace\nordic_wp\conduction1_dynamic_electrocardiograph\app\src\board.c - - \\nrf52833_xxaa\src/board.c\275 - - - 2 - 0 - 279 - 1 -
173540
- 0 - 0 - 0 - 0 - 0 - 1 - D:\workspace\nordic_wp\conduction1_dynamic_electrocardiograph\app\src\board.c + main.c - \\nrf52833_xxaa\src/board.c\279 + \\nrf52833_xxaa\main.c\18 diff --git a/app/app.uvprojx b/app/app.uvprojx index 43757b9..646c287 100644 --- a/app/app.uvprojx +++ b/app/app.uvprojx @@ -337,7 +337,7 @@ 0 --reduce_paths --diag_suppress=1295 --diag_suppress=1 - APP_TIMER_V2 APP_TIMER_V2_RTC1_ENABLED BOARD_PCA10100 CONFIG_GPIO_AS_PINRESET FLOAT_ABI_HARD NRF52833_XXAA NRF_SD_BLE_API_VERSION=7 S140 SOFTDEVICE_PRESENT __HEAP_SIZE=2048 __STACK_SIZE=2048 + APP_TIMER_V2 APP_TIMER_V2_RTC1_ENABLED BOARD_PCA10100 CONFIG_GPIO_AS_PINRESET FLOAT_ABI_HARD NRF52833_XXAA NRF_SD_BLE_API_VERSION=7 S140 SOFTDEVICE_PRESENT __HEAP_SIZE=2048 __STACK_SIZE=4048 ..\sdk\config;..\sdk\components;..\sdk\components\ble\ble_advertising;..\sdk\components\ble\ble_dtm;..\sdk\components\ble\ble_link_ctx_manager;..\sdk\components\ble\ble_racp;..\sdk\components\ble\ble_services\ble_ancs_c;..\sdk\components\ble\ble_services\ble_ans_c;..\sdk\components\ble\ble_services\ble_bas;..\sdk\components\ble\ble_services\ble_bas_c;..\sdk\components\ble\ble_services\ble_cscs;..\sdk\components\ble\ble_services\ble_cts_c;..\sdk\components\ble\ble_services\ble_dfu;..\sdk\components\ble\ble_services\ble_dis;..\sdk\components\ble\ble_services\ble_gls;..\sdk\components\ble\ble_services\ble_hids;..\sdk\components\ble\ble_services\ble_hrs;..\sdk\components\ble\ble_services\ble_hrs_c;..\sdk\components\ble\ble_services\ble_hts;..\sdk\components\ble\ble_services\ble_ias;..\sdk\components\ble\ble_services\ble_ias_c;..\sdk\components\ble\ble_services\ble_lbs;..\sdk\components\ble\ble_services\ble_lbs_c;..\sdk\components\ble\ble_services\ble_lls;..\sdk\components\ble\ble_services\ble_nus;..\sdk\components\ble\ble_services\ble_nus_c;..\sdk\components\ble\ble_services\ble_rscs;..\sdk\components\ble\ble_services\ble_rscs_c;..\sdk\components\ble\ble_services\ble_tps;..\sdk\components\ble\common;..\sdk\components\ble\nrf_ble_gatt;..\sdk\components\ble\nrf_ble_qwr;..\sdk\components\ble\peer_manager;..\sdk\components\boards;..\sdk\components\libraries\atomic;..\sdk\components\libraries\atomic_fifo;..\sdk\components\libraries\atomic_flags;..\sdk\components\libraries\balloc;..\sdk\components\libraries\bootloader\ble_dfu;..\sdk\components\libraries\bsp;..\sdk\components\libraries\button;..\sdk\components\libraries\cli;..\sdk\components\libraries\crc16;..\sdk\components\libraries\crc32;..\sdk\components\libraries\crypto;..\sdk\components\libraries\csense;..\sdk\components\libraries\csense_drv;..\sdk\components\libraries\delay;..\sdk\components\libraries\ecc;..\sdk\components\libraries\experimental_section_vars;..\sdk\components\libraries\experimental_task_manager;..\sdk\components\libraries\fds;..\sdk\components\libraries\fifo;..\sdk\components\libraries\fstorage;..\sdk\components\libraries\gfx;..\sdk\components\libraries\gpiote;..\sdk\components\libraries\hardfault;..\sdk\components\libraries\hci;..\sdk\components\libraries\led_softblink;..\sdk\components\libraries\log;..\sdk\components\libraries\log\src;..\sdk\components\libraries\low_power_pwm;..\sdk\components\libraries\mem_manager;..\sdk\components\libraries\memobj;..\sdk\components\libraries\mpu;..\sdk\components\libraries\mutex;..\sdk\components\libraries\pwm;..\sdk\components\libraries\pwr_mgmt;..\sdk\components\libraries\queue;..\sdk\components\libraries\ringbuf;..\sdk\components\libraries\scheduler;..\sdk\components\libraries\sdcard;..\sdk\components\libraries\slip;..\sdk\components\libraries\sortlist;..\sdk\components\libraries\spi_mngr;..\sdk\components\libraries\stack_guard;..\sdk\components\libraries\strerror;..\sdk\components\libraries\svc;..\sdk\components\libraries\timer;..\sdk\components\libraries\twi_mngr;..\sdk\components\libraries\twi_sensor;..\sdk\components\libraries\uart;..\sdk\components\libraries\usbd;..\sdk\components\libraries\usbd\class\audio;..\sdk\components\libraries\usbd\class\cdc;..\sdk\components\libraries\usbd\class\cdc\acm;..\sdk\components\libraries\usbd\class\hid;..\sdk\components\libraries\usbd\class\hid\generic;..\sdk\components\libraries\usbd\class\hid\kbd;..\sdk\components\libraries\usbd\class\hid\mouse;..\sdk\components\libraries\usbd\class\msc;..\sdk\components\libraries\util;..\sdk\components\nfc\ndef\conn_hand_parser;..\sdk\components\nfc\ndef\conn_hand_parser\ac_rec_parser;..\sdk\components\nfc\ndef\conn_hand_parser\ble_oob_advdata_parser;..\sdk\components\nfc\ndef\conn_hand_parser\le_oob_rec_parser;..\sdk\components\nfc\ndef\connection_handover\ac_rec;..\sdk\components\nfc\ndef\connection_handover\ble_oob_advdata;..\sdk\components\nfc\ndef\connection_handover\ble_pair_lib;..\sdk\components\nfc\ndef\connection_handover\ble_pair_msg;..\sdk\components\nfc\ndef\connection_handover\common;..\sdk\components\nfc\ndef\connection_handover\ep_oob_rec;..\sdk\components\nfc\ndef\connection_handover\hs_rec;..\sdk\components\nfc\ndef\connection_handover\le_oob_rec;..\sdk\components\nfc\ndef\generic\message;..\sdk\components\nfc\ndef\generic\record;..\sdk\components\nfc\ndef\launchapp;..\sdk\components\nfc\ndef\parser\message;..\sdk\components\nfc\ndef\parser\record;..\sdk\components\nfc\ndef\text;..\sdk\components\nfc\ndef\uri;..\sdk\components\nfc\platform;..\sdk\components\nfc\t2t_lib;..\sdk\components\nfc\t2t_parser;..\sdk\components\nfc\t4t_lib;..\sdk\components\nfc\t4t_parser\apdu;..\sdk\components\nfc\t4t_parser\cc_file;..\sdk\components\nfc\t4t_parser\hl_detection_procedure;..\sdk\components\nfc\t4t_parser\tlv;..\sdk\components\softdevice\common;..\sdk\components\softdevice\s140\headers;..\sdk\components\softdevice\s140\headers\nrf52;..\sdk\external\fprintf;..\sdk\external\segger_rtt;..\sdk\external\utf_converter;..\sdk\integration\nrfx;..\sdk\integration\nrfx\legacy;..\sdk\modules\nrfx;..\sdk\modules\nrfx\drivers\include;..\sdk\modules\nrfx\hal;.\config\;.\src\;..\libznordic\include;..\sdk\external\fatfs\port;..\sdk\external\fatfs\src;..\sdk\components\libraries\block_dev;..\sdk\components\libraries\block_dev\sdc\;..\sdk\external\protothreads\;..\sdk\external\protothreads\pt-1.4\ diff --git a/app/main.c b/app/main.c index f617cdd..1c7f609 100644 --- a/app/main.c +++ b/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 diff --git a/app/src/one_conduction/one_conduction_main.c b/app/src/one_conduction/one_conduction_main.c index 439d538..e005699 100644 --- a/app/src/one_conduction/one_conduction_main.c +++ b/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 接收到指令数据 diff --git a/app/src/three_lead/three_lead_board.c b/app/src/three_lead/three_lead_board.c index 4aaa7a0..0d17424 100644 --- a/app/src/three_lead/three_lead_board.c +++ b/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); diff --git a/libznordic b/libznordic index efdb1b5..fbcd219 160000 --- a/libznordic +++ b/libznordic @@ -1 +1 @@ -Subproject commit efdb1b55c3432d3b539fb9fcecb14209874dae0d +Subproject commit fbcd219fb95c6c1af8a9c2ee62854dd989d941e8 diff --git a/sdk b/sdk index 9ff458f..65387c8 160000 --- a/sdk +++ b/sdk @@ -1 +1 @@ -Subproject commit 9ff458fcdef52d2ff06829ec783406af521844da +Subproject commit 65387c8fdeef99d05d9a2fce75a99df87dda4fb8