From 2311fff289e44cf371e3d5a1bce1ccc007bba773 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Tue, 7 May 2024 14:46:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=87=AA=E5=8A=A8=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=E8=AE=BE=E5=A4=87=E7=99=BD=E5=90=8D=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/settings.json | 5 ++++- app/main.c | 5 +++++ scripter/build_app.bat | 19 ------------------- sdk | 2 +- 4 files changed, 10 insertions(+), 21 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 2095780..048c7b3 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -188,7 +188,10 @@ "qrs_time_domain_zh.h": "c", "board_eeprom_driver.h": "c", "board_power_mgr.h": "c", - "heart_ware_sample_data_mgr.h": "c" + "heart_ware_sample_data_mgr.h": "c", + "bsp.h": "c", + "boards.h": "c", + "nrf_gpio.h": "c" }, "files.encoding": "gbk" } \ No newline at end of file diff --git a/app/main.c b/app/main.c index fe6b7f2..421092b 100644 --- a/app/main.c +++ b/app/main.c @@ -147,6 +147,9 @@ static char m_target_periph_name0[20] = "M1002"; /**< Name of the device we tr static char m_target_periph_name1[20] = "M1001"; /**< Name of the device we try to connect to. This name is searched in the scan report data*/ static char m_target_periph_name2[20] = "iflytop"; /**< Name of the device we try to connect to. This name is searched in the scan report data*/ static char m_target_periph_name3[20] = "ADS1293"; /**< Name of the device we try to connect to. This name is searched in the scan report data*/ +static char m_target_periph_name4[20] = "IFLYTOP"; /**< Name of the device we try to connect to. This name is searched in the scan report data*/ +static char m_target_periph_name5[20] = "M1003"; /**< Name of the device we try to connect to. This name is searched in the scan report data*/ + static void scan_init(void) { ret_code_t err_code; nrf_ble_scan_init_t init_scan; @@ -166,6 +169,8 @@ static void scan_init(void) { APP_ERROR_CHECK(nrf_ble_scan_filter_set(&m_scan, SCAN_NAME_FILTER, m_target_periph_name1)); APP_ERROR_CHECK(nrf_ble_scan_filter_set(&m_scan, SCAN_NAME_FILTER, m_target_periph_name2)); APP_ERROR_CHECK(nrf_ble_scan_filter_set(&m_scan, SCAN_NAME_FILTER, m_target_periph_name3)); + APP_ERROR_CHECK(nrf_ble_scan_filter_set(&m_scan, SCAN_NAME_FILTER, m_target_periph_name4)); + APP_ERROR_CHECK(nrf_ble_scan_filter_set(&m_scan, SCAN_NAME_FILTER, m_target_periph_name5)); // err_code = nrf_ble_scan_filters_enable(&m_scan, NRF_BLE_SCAN_NAME_FILTER, false); // APP_ERROR_CHECK(err_code); diff --git a/scripter/build_app.bat b/scripter/build_app.bat index 47b8206..fb9083a 100644 --- a/scripter/build_app.bat +++ b/scripter/build_app.bat @@ -13,22 +13,3 @@ if not exist app\_build\app.hex ( echo EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE exit /b 1 ) - -call scripter\keil_flash.bat app\app.uvprojx - -@REM 打包 -@REM mergehex -f hex --merge ^ -@REM res/s140_nrf52_7.2.0_softdevice.hex ^ -@REM app\_build\app.hex ^ -@REM --output output/app_whole.hex - -@REM if %errorlevel% neq 0 ( -@REM echo EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE -@REM echo E 打包失败 -@REM echo EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE -@REM exit /b 1 -@REM ) - -@REM 烧录 -@REM nrfjprog --eraseall -f NRF52 %全擦除% -@REM nrfjprog --program output/dynamic_electrocardiograph_ble_server.hex --verify -f NRF52 %烧录% \ No newline at end of file diff --git a/sdk b/sdk index 85cbd26..9015b0f 160000 --- a/sdk +++ b/sdk @@ -1 +1 @@ -Subproject commit 85cbd26451dabe41150d375647ccd23b85c42b00 +Subproject commit 9015b0ff6dd4e5783577b5d0f83cb2c207dc2c0b