From 4799ab49c70d4c089e51473951f72aa69656de3b Mon Sep 17 00:00:00 2001 From: zhaohe Date: Fri, 9 Feb 2024 13:18:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=80=E5=A7=8B=E9=87=87?= =?UTF-8?q?=E9=9B=86=E7=BB=93=E6=9D=9F=E9=87=87=E9=9B=86=E8=9C=82=E9=B8=A3?= =?UTF-8?q?=E5=99=A8=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/c_cpp_properties.json | 413 ++++++++++++++---------------------- README.md | 11 +- app/config/sdk_config.h | 4 +- app/src/board/board_battery_state.c | 16 +- app/src/board/board_beep_ctrl.c | 14 +- app/src/board/board_beep_ctrl.h | 2 + app/src/device_ctrl_service.c | 25 ++- tools/0_bin_parse.exe | Bin 2736544 -> 2736544 bytes tools/text2bin.exe | Bin 2754599 -> 2754599 bytes tools/upload_packet_parser.exe | Bin 2794075 -> 2794075 bytes 10 files changed, 203 insertions(+), 282 deletions(-) diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index a4b657d..09c0cb3 100644 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -3,273 +3,168 @@ { "name": "nrf52833_xxaa", "includePath": [ - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\dynamic_electrocardiograph_ble_server\\config", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\ble\\ble_advertising", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\ble\\ble_db_discovery", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\ble\\ble_dtm", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\ble\\ble_racp", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\ble\\ble_services\\ble_ancs_c", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\ble\\ble_services\\ble_ans_c", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\ble\\ble_services\\ble_bas", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\ble\\ble_services\\ble_bas_c", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\ble\\ble_services\\ble_cscs", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\ble\\ble_services\\ble_cts_c", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\ble\\ble_services\\ble_dfu", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\ble\\ble_services\\ble_dis", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\ble\\ble_services\\ble_gls", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\ble\\ble_services\\ble_hids", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\ble\\ble_services\\ble_hrs", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\ble\\ble_services\\ble_hrs_c", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\ble\\ble_services\\ble_hts", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\ble\\ble_services\\ble_ias", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\ble\\ble_services\\ble_ias_c", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\ble\\ble_services\\ble_lbs", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\ble\\ble_services\\ble_lbs_c", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\ble\\ble_services\\ble_lls", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\ble\\ble_services\\ble_nus", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\ble\\ble_services\\ble_nus_c", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\ble\\ble_services\\ble_rscs", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\ble\\ble_services\\ble_rscs_c", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\ble\\ble_services\\ble_tps", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\ble\\common", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\ble\\nrf_ble_gatt", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\ble\\nrf_ble_gq", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\ble\\nrf_ble_qwr", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\ble\\nrf_ble_scan", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\ble\\peer_manager", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\boards", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\atomic", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\atomic_fifo", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\balloc", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\bootloader\\ble_dfu", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\bsp", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\button", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\cli", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\crc16", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\crc32", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\crypto", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\csense", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\csense_drv", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\delay", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\ecc", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\experimental_section_vars", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\experimental_task_manager", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\fds", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\fifo", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\fstorage", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\gfx", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\gpiote", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\hardfault", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\hci", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\led_softblink", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\log", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\log\\src", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\low_power_pwm", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\mem_manager", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\memobj", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\mpu", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\mutex", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\pwm", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\pwr_mgmt", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\queue", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\ringbuf", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\scheduler", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\sdcard", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\slip", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\sortlist", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\spi_mngr", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\stack_guard", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\strerror", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\svc", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\timer", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\twi_mngr", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\twi_sensor", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\uart", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\usbd", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\usbd\\class\\audio", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\usbd\\class\\cdc", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\usbd\\class\\cdc\\acm", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\usbd\\class\\hid", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\usbd\\class\\hid\\generic", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\usbd\\class\\hid\\kbd", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\usbd\\class\\hid\\mouse", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\usbd\\class\\msc", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\util", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\nfc\\ndef\\conn_hand_parser", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\nfc\\ndef\\conn_hand_parser\\ac_rec_parser", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\nfc\\ndef\\conn_hand_parser\\ble_oob_advdata_parser", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\nfc\\ndef\\conn_hand_parser\\le_oob_rec_parser", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\nfc\\ndef\\connection_handover\\ac_rec", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\nfc\\ndef\\connection_handover\\ble_oob_advdata", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\nfc\\ndef\\connection_handover\\ble_pair_lib", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\nfc\\ndef\\connection_handover\\ble_pair_msg", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\nfc\\ndef\\connection_handover\\common", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\nfc\\ndef\\connection_handover\\ep_oob_rec", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\nfc\\ndef\\connection_handover\\hs_rec", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\nfc\\ndef\\connection_handover\\le_oob_rec", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\nfc\\ndef\\generic\\message", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\nfc\\ndef\\generic\\record", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\nfc\\ndef\\launchapp", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\nfc\\ndef\\parser\\message", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\nfc\\ndef\\parser\\record", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\nfc\\ndef\\text", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\nfc\\ndef\\uri", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\nfc\\platform", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\nfc\\t2t_lib", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\nfc\\t2t_parser", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\nfc\\t4t_lib", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\nfc\\t4t_parser\\apdu", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\nfc\\t4t_parser\\cc_file", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\nfc\\t4t_parser\\hl_detection_procedure", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\nfc\\t4t_parser\\tlv", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\softdevice\\common", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\softdevice\\s122\\headers", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\softdevice\\s122\\headers\\nrf52", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\external\\fprintf", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\external\\segger_rtt", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\external\\utf_converter", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\integration\\nrfx", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\integration\\nrfx\\legacy", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\modules\\nrfx", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\modules\\nrfx\\drivers\\include", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\modules\\nrfx\\hal", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\config", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\dynamic_electrocardiograph_ble_server", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\modules\\nrfx\\soc", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\modules\\nrfx\\drivers\\src", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\modules\\nrfx\\drivers\\src\\prs" + "libznordic\\include", + "sdk/external/fatfs/src/", + "sdk/external/fatfs/src/", + "sdk/external/fatfs/port/", + "sdk/components/libraries/block_dev/sdc/", + "sdk/components/libraries/block_dev/", + "sdk\\config", + "app\\src", + "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", + "app\\config\\", + "app\\config", + "app", + "sdk\\modules\\nrfx\\soc", + "sdk\\modules\\nrfx\\drivers\\src", + "sdk\\modules\\nrfx\\drivers\\src\\prs", + "sdk\\modules\\nrfx\\mdk\\", + "sdk\\components\\toolchain\\cmsis\\include\\", + "sdk\\components\\libraries\\bootloader\\" ], "defines": [ + "BL_SETTINGS_ACCESS_ONLY", + "NRF_DFU_SVCI_ENABLED", + "NRF_DFU_TRANSPORT_BLE=1", + "CONFIG_NFCT_PINS_AS_GPIOS", "APP_TIMER_V2", "APP_TIMER_V2_RTC1_ENABLED", - "BOARD_QING_FENG_NRF52833", - "CONFIG_GPIO_AS_PINRESET", + "BOARD_PCA10100", "FLOAT_ABI_HARD", "NRF52833_XXAA", - "NRF_SD_BLE_API_VERSION=8", - "S122", + "NRF_SD_BLE_API_VERSION=7", + "S140", "SOFTDEVICE_PRESENT", "__HEAP_SIZE=2048", - "__STACK_SIZE=2048", - "__CC_ARM", - "__arm__", - "__align(x)=", - "__ALIGNOF__(x)=", - "__alignof__(x)=", - "__asm(x)=", - "__forceinline=", - "__restrict=", - "__global_reg(n)=", - "__inline=", - "__int64=long long", - "__INTADDR__(expr)=0", - "__irq=", - "__packed=", - "__pure=", - "__smc(n)=", - "__svc(n)=", - "__svc_indirect(n)=", - "__svc_indirect_r7(n)=", - "__value_in_regs=", - "__weak=", - "__writeonly=", - "__declspec(x)=", - "__attribute__(x)=", - "__nonnull__(x)=", - "__register=", - "__breakpoint(x)=", - "__cdp(x,y,z)=", - "__clrex()=", - "__clz(x)=0U", - "__current_pc()=0U", - "__current_sp()=0U", - "__disable_fiq()=", - "__disable_irq()=", - "__dmb(x)=", - "__dsb(x)=", - "__enable_fiq()=", - "__enable_irq()=", - "__fabs(x)=0.0", - "__fabsf(x)=0.0f", - "__force_loads()=", - "__force_stores()=", - "__isb(x)=", - "__ldrex(x)=0U", - "__ldrexd(x)=0U", - "__ldrt(x)=0U", - "__memory_changed()=", - "__nop()=", - "__pld(...)=", - "__pli(...)=", - "__qadd(x,y)=0", - "__qdbl(x)=0", - "__qsub(x,y)=0", - "__rbit(x)=0U", - "__rev(x)=0U", - "__return_address()=0U", - "__ror(x,y)=0U", - "__schedule_barrier()=", - "__semihost(x,y)=0", - "__sev()=", - "__sqrt(x)=0.0", - "__sqrtf(x)=0.0f", - "__ssat(x,y)=0", - "__strex(x,y)=0U", - "__strexd(x,y)=0", - "__strt(x,y)=", - "__swp(x,y)=0U", - "__usat(x,y)=0U", - "__wfe()=", - "__wfi()=", - "__yield()=", - "__vfp_status(x,y)=0" - ], - "intelliSenseMode": "${default}" - }, - { - "name": "flash_s122_nrf52_8.0.0_softdevice", - "includePath": [ - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\dynamic_electrocardiograph_ble_server\\config", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\config", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\dynamic_electrocardiograph_ble_server", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\boards", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\bsp", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\external\\utf_converter", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\ble\\common", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\ble\\ble_db_discovery", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\ble\\nrf_ble_gatt", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\ble\\nrf_ble_gq", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\ble\\nrf_ble_scan", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\integration\\nrfx\\legacy", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\modules\\nrfx\\soc", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\modules\\nrfx\\drivers\\src", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\modules\\nrfx\\drivers\\src\\prs", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\button", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\util", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\fifo", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\scheduler", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\timer", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\uart", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\hardfault", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\atomic_fifo", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\atomic", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\balloc", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\external\\fprintf", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\memobj", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\pwr_mgmt", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\queue", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\ringbuf", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\experimental_section_vars", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\sortlist", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\strerror", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\libraries\\log\\src", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\external\\segger_rtt", - "d:\\workspace\\nordic_wp\\three_lead_ecg_v2\\sdk\\components\\softdevice\\common" - ], - "defines": [ - "__HEAP_SIZE=2048", - "__STACK_SIZE=2048", + "__STACK_SIZE=4096", "__CC_ARM", "__arm__", "__align(x)=", diff --git a/README.md b/README.md index 8b50563..639c56e 100644 --- a/README.md +++ b/README.md @@ -55,8 +55,8 @@ TODO2: 4. 充电插入唤醒设备 OK 5. 蓝牙连接 OK 6. 指令测试 OK - 7. 采集中导联脱落蜂鸣器响 OK - 8. 采集中导联脱落事件上报 OK + 7. 采集中导联单个脱落蜂鸣器响 OK + 8. 采集中导联单个脱落脱落事件上报 OK 2. 采集上报测试 （OK1/2）OK 3. 未采集，蓝牙断开，自动休眠测试 2）OK @@ -64,6 +64,13 @@ TODO2: 4. 电池电量检测测试 5. 记录读取测试 6. 导联掉落测试 OK + 7. 佩戴人员离开手机蓝牙断开，再恢复蓝牙连接。OK + 8. 开始采集测试通过。 OK + 9. 使能Report测试通过。 OK + + 7. 采集中导联单个脱落蜂鸣器响 OK + 8. 采集中导联单个脱落脱落事件上报 OK + BUG: diff --git a/app/config/sdk_config.h b/app/config/sdk_config.h index 908361c..c380b27 100644 --- a/app/config/sdk_config.h +++ b/app/config/sdk_config.h @@ -7734,7 +7734,7 @@ // NRF_LOG_BACKEND_RTT_ENABLED - nrf_log_backend_rtt - Log RTT backend //========================================================== #ifndef NRF_LOG_BACKEND_RTT_ENABLED -#define NRF_LOG_BACKEND_RTT_ENABLED 0 +#define NRF_LOG_BACKEND_RTT_ENABLED 1 #endif // NRF_LOG_BACKEND_RTT_TEMP_BUFFER_SIZE - Size of buffer for partially processed strings. // Size of the buffer is a trade-off between RAM usage and processing. @@ -7812,7 +7812,7 @@ // NRF_LOG_ENABLED - nrf_log - Logger //========================================================== #ifndef NRF_LOG_ENABLED -#define NRF_LOG_ENABLED 0 +#define NRF_LOG_ENABLED 1 #endif // Log message pool - Configuration of log message pool diff --git a/app/src/board/board_battery_state.c b/app/src/board/board_battery_state.c index d1e486e..d565a46 100644 --- a/app/src/board/board_battery_state.c +++ b/app/src/board/board_battery_state.c @@ -30,7 +30,9 @@ int16_t BoardBattery_get_battery_level() { static const float maxv = 4.0; static const float minv = 3.3; - float voltage = BoardBattery_get_adc_val() / 4096.0 * 3.3 / 2.0 * 3; + int16_t rawval = BoardBattery_get_adc_val(); + //TODO:使用参考电压3.6算出的最终电压数值是和硬件一致的，这里不知道原因为啥。 + float voltage = rawval / 4096.0 * 3.6 / 2.0 * 3; if (voltage > maxv) voltage = maxv; if (voltage < minv) voltage = minv; @@ -41,12 +43,12 @@ int16_t BoardBattery_get_battery_level() { } else if (percent_int > 100) { percent_int = 100; } - - // if (percent_int < 10 && percent_int != 0) { - // percent_int = 3; - // } else { - // percent_int = percent_int / 10 * 10; - // } + // ZLOGI("%d voltage:%d, percent:%d",rawval, (int)voltage, percent_int); + // // if (percent_int < 10 && percent_int != 0) { + // // percent_int = 3; + // // } else { + // // percent_int = percent_int / 10 * 10; + // // } return percent_int; // return percent_int; } diff --git a/app/src/board/board_beep_ctrl.c b/app/src/board/board_beep_ctrl.c index 2ed6b13..bbf08ce 100644 --- a/app/src/board/board_beep_ctrl.c +++ b/app/src/board/board_beep_ctrl.c @@ -40,7 +40,19 @@ static void beep_tmr_handler(void *context) { app_timer_stop(m_beep_tmr); m_beep_effect = kBoardBeepEffect_none; } - } else if (m_beep_effect == kBoardBeepEffect_threeShortBeep) { + } + + else if (m_beep_effect == kBoardBeepEffect_oneShortLongBeep) { + if (m_beep_cnt == 0) { + BoardBeepCtrl_set(true); + } else if (m_beep_cnt >= 6) { + BoardBeepCtrl_set(false); + app_timer_stop(m_beep_tmr); + m_beep_effect = kBoardBeepEffect_none; + } + } + + else if (m_beep_effect == kBoardBeepEffect_threeShortBeep) { if (m_beep_cnt < 6) { if (m_beep_cnt % 2 == 0) { BoardBeepCtrl_set(true); diff --git a/app/src/board/board_beep_ctrl.h b/app/src/board/board_beep_ctrl.h index 28d8a11..6aef541 100644 --- a/app/src/board/board_beep_ctrl.h +++ b/app/src/board/board_beep_ctrl.h @@ -10,6 +10,8 @@ typedef enum { kBoardBeepEffect_none = 0, // 响一声 kBoardBeepEffect_oneShortBeep, + // 响一声长鸣 + kBoardBeepEffect_oneShortLongBeep, // 响三声 kBoardBeepEffect_threeShortBeep, // 持续短鸣报警 diff --git a/app/src/device_ctrl_service.c b/app/src/device_ctrl_service.c index 6634b73..07045d9 100644 --- a/app/src/device_ctrl_service.c +++ b/app/src/device_ctrl_service.c @@ -181,15 +181,18 @@ static void app_event_listener(void* p_event_data, uint16_t event_size) { // // else if (m_device_state == kdevice_state_ready) { - if (!zble_module_is_connected() && DeviceCtrl_cur_state_haspassed_ms() > APP_AUTO_SLEEP_TIMEOUT_MS) { - ZLOGI("auto sleep"); - prvf_change_to_standby_state(); - } else if (zble_module_is_connected() && zdatachannel_last_rx_data_haspassed_s() >= BLE_UNCONNECTED_OVERTIME_S) { - ZLOGI("auto sleep because ble unconnected"); - prvf_change_to_standby_state(); - } else if (BoardBattery_get_battery_level() < APP_LOW_BATTERY_LIMIT) { - ZLOGI("auto sleep because low battery"); - prvf_change_to_standby_state(); + + if (DeviceCtrl_cur_state_haspassed_ms() > 3000) { + if (!zble_module_is_connected() && DeviceCtrl_cur_state_haspassed_ms() > APP_AUTO_SLEEP_TIMEOUT_MS) { + ZLOGI("auto sleep"); + prvf_change_to_standby_state(); + } else if (zble_module_is_connected() && zdatachannel_last_rx_data_haspassed_s() >= BLE_UNCONNECTED_OVERTIME_S) { + ZLOGI("auto sleep because ble unconnected"); + prvf_change_to_standby_state(); + } else if (BoardBattery_get_battery_level() < APP_LOW_BATTERY_LIMIT) { + ZLOGI("auto sleep because low battery"); + prvf_change_to_standby_state(); + } } if (event->eventType == kevent_start_sample_cmd_event) { @@ -211,7 +214,7 @@ static void app_event_listener(void* p_event_data, uint16_t event_size) { // AppEvent_pushEvent(&event); } - BoardBeepCtrl_setEffect(kBoardBeepEffect_oneShortBeep); + BoardBeepCtrl_setEffect(kBoardBeepEffect_oneShortLongBeep); } } // @@ -266,7 +269,7 @@ static void app_event_listener(void* p_event_data, uint16_t event_size) { // event.eventType = kevent_sample_stop_event; AppEvent_pushEvent(&event); } - BoardBeepCtrl_setEffect(kBoardBeepEffect_oneShortBeep); + BoardBeepCtrl_setEffect(kBoardBeepEffect_oneShortLongBeep); } } } diff --git a/tools/0_bin_parse.exe b/tools/0_bin_parse.exe index 6ab5c19f2f0829e2864855379983e8f63672b7fd..dd3fbaab01b9a4bed01f999ddfaa586be2d5dbe6 100644 GIT binary patch delta 146 zcmWN=w+TW~06KHa@vKN-14Z~y=R diff --git a/tools/text2bin.exe b/tools/text2bin.exe index 8affedab3a85282c9d8938d622994bb5ccdb8906..0d3d78c3c90e2518b3fef4b67f2f690bdc0731d4 100644 GIT binary patch delta 149 zcmWN=#|gp!06=1-#!UY5Rt>_5GS=g;$T4dd5M z3^2qT=COc9jIe}dtY8&u7-Jn9*u)mLv4dUgVIK!L#1W2hf>WH~92c125?8p!4Q_FV MdpzLr>**5x0CM6+*Z=?k delta 149 zcmWN=w++Go002SR1e0@)CWl>MCyJL4mFa1y%mR$S5@ggMM(0gG6|GFGsPHLPO;o7loOcCd>*?Bf83IKnYbaEddW;{ul$;|kZf!7c7^ Nj|V*B>Ek(h{{Y-dNLc^? delta 149 zcmWN=w++Go002SR!aEK!u;{>NT!#OT6!X>V7jT_wJ N4)=J#