From 3b090949c65b5d467f1ed6d936711404fd5ad54b Mon Sep 17 00:00:00 2001 From: zhaohe Date: Tue, 23 Jan 2024 22:23:16 +0800 Subject: [PATCH] update --- .vscode/settings.json | 3 +- app/app.uvoptx | 56 +++++++++++--- app/app.uvprojx | 2 +- app/config/sdk_config.h | 4 +- app/main.c | 7 +- app/src/one_conduction/one_conduction_main.c | 2 +- app/src/three_lead/three_lead_board.c | 110 ++++++++++++++++++++------- libznordic | 2 +- sdk | 2 +- 9 files changed, 141 insertions(+), 47 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 938c9e8..7614177 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -59,6 +59,7 @@ "driver_ssd1306_interface.h": "c", "three_lead_board.h": "c", "znordic.h": "c", - "ads1293.h": "c" + "ads1293.h": "c", + "app_scheduler.h": "c" } } \ No newline at end of file diff --git a/app/app.uvoptx b/app/app.uvoptx index 297e386..39128d0 100644 --- a/app/app.uvoptx +++ b/app/app.uvoptx @@ -152,34 +152,66 @@ 0 0 - 8 + 245 1 -
182640
+
162232
0 0 0 0 0 1 - main.c + .\src\three_lead\three_lead_board.c - \\nrf52833_xxaa\main.c\8 + \\nrf52833_xxaa\src/three_lead/three_lead_board.c\245 1 0 - 18 + 116 1 -
171540
+
168702
0 0 0 0 0 1 - main.c + ..\sdk\external\fatfs\port\diskio_blkdev.c - \\nrf52833_xxaa\main.c\18 + \\nrf52833_xxaa\../sdk/external/fatfs/port/diskio_blkdev.c\116 + + + 2 + 0 + 129 + 1 +
168740
+ 0 + 0 + 0 + 0 + 0 + 1 + ..\sdk\external\fatfs\port\diskio_blkdev.c + + \\nrf52833_xxaa\../sdk/external/fatfs/port/diskio_blkdev.c\129 + + + 3 + 0 + 120 + 1 +
168706
+ 0 + 0 + 0 + 0 + 0 + 1 + ..\sdk\external\fatfs\port\diskio_blkdev.c + + \\nrf52833_xxaa\../sdk/external/fatfs/port/diskio_blkdev.c\120 @@ -744,7 +776,7 @@ nRF_Drivers - 1 + 0 0 0 0 @@ -1468,7 +1500,7 @@ libznordic - 1 + 0 0 0 0 @@ -1488,7 +1520,7 @@ FATFS - 1 + 0 0 0 0 @@ -1528,7 +1560,7 @@ ::Device - 0 + 1 0 0 1 diff --git a/app/app.uvprojx b/app/app.uvprojx index 646c287..4a73a49 100644 --- a/app/app.uvprojx +++ b/app/app.uvprojx @@ -339,7 +339,7 @@ --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=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\ + ..\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\;..\sdk\components\libraries\scheduler diff --git a/app/config/sdk_config.h b/app/config/sdk_config.h index 5da286a..19d9ab7 100644 --- a/app/config/sdk_config.h +++ b/app/config/sdk_config.h @@ -6313,7 +6313,7 @@ #ifndef APP_TIMER_CONFIG_USE_SCHEDULER -#define APP_TIMER_CONFIG_USE_SCHEDULER 0 +#define APP_TIMER_CONFIG_USE_SCHEDULER 1 #endif // APP_TIMER_KEEPS_RTC_ACTIVE - Enable RTC always on @@ -11963,7 +11963,7 @@ // <2=> NRF_SDH_DISPATCH_MODEL_POLLING #ifndef NRF_SDH_DISPATCH_MODEL -#define NRF_SDH_DISPATCH_MODEL 0 +#define NRF_SDH_DISPATCH_MODEL 1 #endif // diff --git a/app/main.c b/app/main.c index 1c7f609..3ff4a93 100644 --- a/app/main.c +++ b/app/main.c @@ -2,11 +2,14 @@ #include "basic/zdatachannel_service.h" #include "znordic.h" // + #include "three_lead\three_lead_board.h" static void test_tx_timer_cb(void* p_context) { ZLOGI("test_tx_timer_cb"); ThreeLeadECG_sdcard_mount(); + uint32_t data; + data = 1; } extern uint32_t g_nrf_log_tx_pin; @@ -14,9 +17,11 @@ APP_TIMER_DEF(m_test_tx_timer); void main() { g_nrf_log_tx_pin = 2; + APP_SCHED_INIT(APP_TIMER_SCHED_EVENT_DATA_SIZE, 20); znordic_init(); + 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_create(&m_test_tx_timer, APP_TIMER_MODE_SINGLE_SHOT, test_tx_timer_cb)); ZERROR_CHECK(app_timer_start(m_test_tx_timer, APP_TIMER_TICKS(100), NULL)); znordic_loop(); } diff --git a/app/src/one_conduction/one_conduction_main.c b/app/src/one_conduction/one_conduction_main.c index e005699..28385be 100644 --- a/app/src/one_conduction/one_conduction_main.c +++ b/app/src/one_conduction/one_conduction_main.c @@ -40,7 +40,7 @@ void on_service_init(void) { } void one_conduction_main() { - znordic_init(); + znordic_init(0, 20); NRF_LOG_INFO("compile time :%s", __TIME__); NRF_LOG_INFO("Version :%d", VERSION); NRF_LOG_INFO("Manufacturer :%s", MANUFACTURER_NAME); diff --git a/app/src/three_lead/three_lead_board.c b/app/src/three_lead/three_lead_board.c index 0d17424..ecee290 100644 --- a/app/src/three_lead/three_lead_board.c +++ b/app/src/three_lead/three_lead_board.c @@ -115,8 +115,7 @@ int16_t ThreeLeadECG_battery_get_adc_val() { * sd card * switch */ - -#define SDCARD_SPI_CS_PIN 20 +#define SDCARD_SPI_CS_PIN 28 #define SDCARD_SPI_MISO_PIN 31 #define SDCARD_SPI_MOSI_PIN 30 #define SDCARD_SPI_SCK_PIN 29 @@ -196,14 +195,40 @@ NRF_BLOCK_DEV_SDC_DEFINE(m_block_dev_sdc, static FATFS fs; void sdcard_test_write_text() { -#define FILE_NAME "IFLYTOP_W_TEST.TXT" - static FIL file; - uint32_t bytes_written; +#define FILE_NAME "/5.TXT" + static FIL file; + uint32_t bytes_written; + static DIR dir; + static FILINFO fno; + + NRF_LOG_INFO("\r\n Listing directory: /"); + FRESULT ff_result = f_opendir(&dir, "/"); + if (ff_result) { + NRF_LOG_INFO("Directory listing failed!"); + return; + } + + do { + ff_result = f_readdir(&dir, &fno); + if (ff_result != FR_OK) { + NRF_LOG_INFO("Directory read failed."); + return; + } + + if (fno.fname[0]) { + if (fno.fattrib & AM_DIR) { + NRF_LOG_RAW_INFO(" %s", (uint32_t)fno.fname); + } else { + NRF_LOG_RAW_INFO("%9lu %s", fno.fsize, (uint32_t)fno.fname); + } + } + } while (fno.fname[0]); + NRF_LOG_RAW_INFO(""); NRF_LOG_INFO("Writing to file " FILE_NAME "..."); - FRESULT ff_result = f_open(&file, FILE_NAME, FA_READ | FA_WRITE | FA_OPEN_APPEND); + ff_result = f_open(&file, FILE_NAME, FA_CREATE_ALWAYS | FA_READ | FA_WRITE | FA_CREATE_NEW); if (ff_result != FR_OK) { - NRF_LOG_INFO("Unable to open or create file: " FILE_NAME "."); + NRF_LOG_INFO("Unable to open or create file: " FILE_NAME ". %d", ff_result); return; } @@ -216,6 +241,29 @@ void sdcard_test_write_text() { (void)f_close(&file); } +bool mountsuc = false; +/** + * @brief 对接 get_fattime + * @return DWORD + */ + +static DWORD get_fattime_0(uint32_t year, uint32_t month, uint32_t day, uint32_t hour, uint32_t min, uint32_t sec) { + // return ((DWORD)(year - 1980) << 25 | (DWORD)month << 21 | (DWORD)day << 16); + DWORD fattime = 0; + fattime |= ((DWORD)(year - 1980) << 25); // 年份从1980年开始 + fattime |= ((DWORD)(month + 1) << 21); // 月份范围是1-12 + fattime |= ((DWORD)day << 16); // 日 + fattime |= ((DWORD)hour << 11); // 时 + fattime |= ((DWORD)min << 5); // 分 + fattime |= ((DWORD)sec / 2); // 秒，以2秒为单位 + + return fattime; +} + +DWORD get_fattime(void) { + return get_fattime_0(2024, 1, 23, 23, 29, 31); + // ((DWORD)(_NORTC_YEAR - 1980) << 25 | (DWORD)_NORTC_MON << 21 | (DWORD)_NORTC_MDAY << 16) +} void ThreeLeadECG_sdcard_mount() { /** @@ -234,27 +282,35 @@ void ThreeLeadECG_sdcard_mount() { * @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); - } - if (disk_state) { - NRF_LOG_INFO("Disk initialization failed. %d", disk_state); - return; - } - NRF_LOG_INFO("Disk initialization succeeded."); - FRESULT ff_result; - ff_result = f_mount(&fs, "", 1); - if (ff_result) { - NRF_LOG_INFO("Mount failed."); - return; + if (!mountsuc) { + 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); + } + if (disk_state) { + NRF_LOG_INFO("Disk initialization failed. %d", disk_state); + return; + } + NRF_LOG_INFO("Disk initialization succeeded."); + FRESULT ff_result; + ff_result = f_mount(&fs, "", 1); + if (ff_result) { + NRF_LOG_INFO("Mount failed."); + return; + } + + uint32_t blocks_per_mb = (1024uL * 1024uL) / m_block_dev_sdc.block_dev.p_ops->geometry(&m_block_dev_sdc.block_dev)->blk_size; + uint32_t capacity = m_block_dev_sdc.block_dev.p_ops->geometry(&m_block_dev_sdc.block_dev)->blk_count / blocks_per_mb; + NRF_LOG_INFO("Capacity: %d MB", capacity); + + mountsuc = true; } + sdcard_test_write_text(); } void ThreeLeadECG_sdcard_umount() { diff --git a/libznordic b/libznordic index fbcd219..326ebab 160000 --- a/libznordic +++ b/libznordic @@ -1 +1 @@ -Subproject commit fbcd219fb95c6c1af8a9c2ee62854dd989d941e8 +Subproject commit 326ebab17be4472520b0b077f59edf09be8e0dda diff --git a/sdk b/sdk index 65387c8..d1b8e44 160000 --- a/sdk +++ b/sdk @@ -1 +1 @@ -Subproject commit 65387c8fdeef99d05d9a2fce75a99df87dda4fb8 +Subproject commit d1b8e44a3b818ea9571baf5efe79b6bd5d295dd2