diff --git a/.vscode/settings.json b/.vscode/settings.json index 95c7c53..bd23f72 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -89,9 +89,9 @@ "stdarg.h": "c", "nrf_uarte.h": "c", "heart_rate_sensor_protocol.h": "c", - "ble_cmd_process_service.h": "c", + "service/ble_cmd_processer/ble_cmd_process_service.h": "c", "heart_wave_sample_service.h": "c", - "basic/device_version_info_mgr.h": "c", + "basic_service/device_version_info_mgr.h": "c", "nrf_uart.h": "c", "ads_cfg.h": "c", "sdk_config.h": "c", @@ -103,11 +103,11 @@ "board_battery_state.h": "c", "board_sdcard_driver.h": "c", "board_button.h": "c", - "app_event_distribute.h": "c", + "basic_service/app_event_distribute.h": "c", "board_beep_ctrl.h": "c", "nrf_soc.h": "c", "sample_data_manager_service.h": "c", - "app_event.h": "c", + "basic_service/app_event.h": "c", "compiler_abstraction.h": "c", "ble_nus_c.h": "c", "device_version_info_mgr.h": "c", @@ -115,7 +115,7 @@ "filter.h": "c", "filters.h": "c", "nrfx_rtc.h": "c", - "device_state.h": "c", + "basic_service/device_state.h": "c", "board_adc_module_ctrl.h": "c", "board_ecg_sensor.h": "c", "board_light_ctrl.h": "c", @@ -191,7 +191,15 @@ "heart_ware_sample_data_mgr.h": "c", "time.h": "c", "nrf_gpio.h": "c", - "nrf_drv_clock.h": "c" + "nrf_drv_clock.h": "c", + "ads1291_type.h": "c", + "qrs.h": "c", + "app_event.h": "c", + "app_event_distribute.h": "c", + "nrf_bootloader_info.h": "c", + "ble_cmd_process_service.h": "c", + "storage_service.h": "c", + "board_ssd1306_interface.h": "c" }, "files.encoding": "gbk" } \ No newline at end of file diff --git a/app/app.uvoptx b/app/app.uvoptx index b3d3821..30b741f 100644 --- a/app/app.uvoptx +++ b/app/app.uvoptx @@ -386,8 +386,8 @@ 0 0 0 - .\src\heart_wave_sample_service.c - heart_wave_sample_service.c + .\src\one_conduction_main.c + one_conduction_main.c 0 0 @@ -398,8 +398,8 @@ 0 0 0 - .\src\app_event_distribute.c - app_event_distribute.c + .\src\main.c + main.c 0 0 @@ -410,8 +410,8 @@ 0 0 0 - .\src\basic\m24m02\m24m02.c - m24m02.c + .\src\board\board_beep_ctrl.c + board_beep_ctrl.c 0 0 @@ -422,8 +422,8 @@ 0 0 0 - .\src\basic\ssd1306\driver_ssd1306.c - driver_ssd1306.c + .\src\board\board_adc_module_ctrl.c + board_adc_module_ctrl.c 0 0 @@ -434,8 +434,8 @@ 0 0 0 - .\src\basic\ssd1306\driver_ssd1306_basic.c - driver_ssd1306_basic.c + .\src\board\board_battery_state.c + board_battery_state.c 0 0 @@ -446,8 +446,8 @@ 0 0 0 - .\src\basic\ssd1306\fontlib.c - fontlib.c + .\src\board\board_ecg_sensor.c + board_ecg_sensor.c 0 0 @@ -458,8 +458,8 @@ 0 0 0 - .\src\basic\ssd1306\wave_drawer.c - wave_drawer.c + .\src\board\board_light_ctrl.c + board_light_ctrl.c 0 0 @@ -470,8 +470,8 @@ 0 0 0 - .\src\ble_cmd_process_service.c - ble_cmd_process_service.c + .\src\board\board_ssd1306_interface.c + board_ssd1306_interface.c 0 0 @@ -482,8 +482,8 @@ 0 0 0 - .\src\device_controler.c - device_controler.c + .\src\board\board_eeprom_driver.c + board_eeprom_driver.c 0 0 @@ -494,8 +494,8 @@ 0 0 0 - .\src\device_state.c - device_state.c + .\src\board\board_power_mgr.c + board_power_mgr.c 0 0 @@ -506,8 +506,8 @@ 0 0 0 - .\src\display_manager.c - display_manager.c + .\src\basic_service\device_state.c + device_state.c 0 0 @@ -518,8 +518,8 @@ 0 0 0 - .\src\one_conduction_main.c - one_conduction_main.c + .\src\basic_service\device_version_info_mgr.c + device_version_info_mgr.c 0 0 @@ -530,8 +530,8 @@ 0 0 0 - .\src\sample_data_manager.c - sample_data_manager.c + .\src\board\ssd1306\driver_ssd1306.c + driver_ssd1306.c 0 0 @@ -542,8 +542,8 @@ 0 0 0 - .\src\zeeprom_fs.c - zeeprom_fs.c + .\src\board\ssd1306\driver_ssd1306_basic.c + driver_ssd1306_basic.c 0 0 @@ -554,8 +554,8 @@ 0 0 0 - .\src\basic\device_version_info_mgr.c - device_version_info_mgr.c + .\src\board\ssd1306\fontlib.c + fontlib.c 0 0 @@ -566,8 +566,8 @@ 0 0 0 - .\src\main.c - main.c + .\src\board\ssd1306\wave_drawer.c + wave_drawer.c 0 0 @@ -578,8 +578,8 @@ 0 0 0 - .\src\board\board_beep_ctrl.c - board_beep_ctrl.c + .\src\service\ble_cmd_processer\ble_cmd_process_service.c + ble_cmd_process_service.c 0 0 @@ -590,8 +590,8 @@ 0 0 0 - .\src\board\board_adc_module_ctrl.c - board_adc_module_ctrl.c + .\src\service\display_mgr\display_manager.c + display_manager.c 0 0 @@ -602,8 +602,8 @@ 0 0 0 - .\src\board\board_battery_state.c - board_battery_state.c + .\src\service\heart_wave_sample_service\heart_ware_sample_data_mgr.c + heart_ware_sample_data_mgr.c 0 0 @@ -614,8 +614,8 @@ 0 0 0 - .\src\board\board_ecg_sensor.c - board_ecg_sensor.c + .\src\service\heart_wave_sample_service\heart_wave_sample_data_pre_process.c + heart_wave_sample_data_pre_process.c 0 0 @@ -626,8 +626,8 @@ 0 0 0 - .\src\board\board_light_ctrl.c - board_light_ctrl.c + .\src\service\heart_wave_sample_service\heart_wave_sample_service.c + heart_wave_sample_service.c 0 0 @@ -638,8 +638,8 @@ 0 0 0 - .\src\basic\FIR.c - FIR.c + .\src\service\storage\sample_data_manager.c + sample_data_manager.c 0 0 @@ -650,8 +650,8 @@ 0 0 0 - .\src\basic\HC_Chen_detect.c - HC_Chen_detect.c + .\src\service\storage\zeeprom_fs.c + zeeprom_fs.c 0 0 @@ -662,104 +662,8 @@ 0 0 0 - .\src\basic\So_Chen_detect.c - So_Chen_detect.c - 0 - 0 - - - 1 - 26 - 1 - 0 - 0 - 0 - .\src\basic\adaptive_algorithm.c - adaptive_algorithm.c - 0 - 0 - - - 1 - 27 - 1 - 0 - 0 - 0 - .\src\basic\Pan_Tompkins_detect.c - Pan_Tompkins_detect.c - 0 - 0 - - - 1 - 28 - 1 - 0 - 0 - 0 - .\src\basic\qrs_time_domain_zh.c - qrs_time_domain_zh.c - 0 - 0 - - - 1 - 29 - 1 - 0 - 0 - 0 - .\src\board\board_ssd1306_interface.c - board_ssd1306_interface.c - 0 - 0 - - - 1 - 30 - 1 - 0 - 0 - 0 - .\src\board\board_eeprom_driver.c - board_eeprom_driver.c - 0 - 0 - - - 1 - 31 - 1 - 0 - 0 - 0 - .\src\board\board_power_mgr.c - board_power_mgr.c - 0 - 0 - - - 1 - 32 - 1 - 0 - 0 - 0 - .\src\heart_ware_sample_data_mgr.c - heart_ware_sample_data_mgr.c - 0 - 0 - - - 1 - 33 - 1 - 0 - 0 - 0 - .\src\heart_wave_sample_data_pre_process.c - heart_wave_sample_data_pre_process.c + .\src\basic_service\app_event_distribute.c + app_event_distribute.c 0 0 @@ -773,7 +677,7 @@ 0 2 - 34 + 26 1 0 0 @@ -793,7 +697,7 @@ 0 3 - 35 + 27 1 0 0 @@ -805,7 +709,7 @@ 3 - 36 + 28 1 0 0 @@ -825,7 +729,7 @@ 0 4 - 37 + 29 1 0 0 @@ -845,7 +749,7 @@ 0 5 - 38 + 30 1 0 0 @@ -857,7 +761,7 @@ 5 - 39 + 31 1 0 0 @@ -869,7 +773,7 @@ 5 - 40 + 32 1 0 0 @@ -881,7 +785,7 @@ 5 - 41 + 33 1 0 0 @@ -893,7 +797,7 @@ 5 - 42 + 34 1 0 0 @@ -905,7 +809,7 @@ 5 - 43 + 35 1 0 0 @@ -917,7 +821,7 @@ 5 - 44 + 36 1 0 0 @@ -929,7 +833,7 @@ 5 - 45 + 37 1 0 0 @@ -949,7 +853,7 @@ 0 6 - 46 + 38 1 0 0 @@ -963,13 +867,13 @@ nRF_Drivers - 0 + 1 0 0 0 7 - 47 + 39 1 0 0 @@ -981,7 +885,7 @@ 7 - 48 + 40 1 0 0 @@ -993,7 +897,7 @@ 7 - 49 + 41 1 0 0 @@ -1005,7 +909,7 @@ 7 - 50 + 42 1 0 0 @@ -1017,7 +921,7 @@ 7 - 51 + 43 1 0 0 @@ -1029,7 +933,7 @@ 7 - 52 + 44 1 0 0 @@ -1041,7 +945,7 @@ 7 - 53 + 45 1 0 0 @@ -1053,7 +957,7 @@ 7 - 54 + 46 1 0 0 @@ -1065,7 +969,7 @@ 7 - 55 + 47 1 0 0 @@ -1077,7 +981,7 @@ 7 - 56 + 48 1 0 0 @@ -1089,7 +993,7 @@ 7 - 57 + 49 1 0 0 @@ -1101,7 +1005,7 @@ 7 - 58 + 50 1 0 0 @@ -1113,7 +1017,7 @@ 7 - 59 + 51 1 0 0 @@ -1125,7 +1029,7 @@ 7 - 60 + 52 1 0 0 @@ -1137,7 +1041,7 @@ 7 - 61 + 53 1 0 0 @@ -1149,7 +1053,7 @@ 7 - 62 + 54 1 0 0 @@ -1161,7 +1065,7 @@ 7 - 63 + 55 1 0 0 @@ -1173,7 +1077,7 @@ 7 - 64 + 56 1 0 0 @@ -1185,7 +1089,7 @@ 7 - 65 + 57 1 0 0 @@ -1197,7 +1101,7 @@ 7 - 66 + 58 1 0 0 @@ -1217,7 +1121,7 @@ 0 8 - 67 + 59 1 0 0 @@ -1229,7 +1133,7 @@ 8 - 68 + 60 1 0 0 @@ -1241,7 +1145,7 @@ 8 - 69 + 61 1 0 0 @@ -1253,7 +1157,7 @@ 8 - 70 + 62 1 0 0 @@ -1265,7 +1169,7 @@ 8 - 71 + 63 1 0 0 @@ -1277,7 +1181,7 @@ 8 - 72 + 64 1 0 0 @@ -1289,7 +1193,7 @@ 8 - 73 + 65 1 0 0 @@ -1301,7 +1205,7 @@ 8 - 74 + 66 1 0 0 @@ -1313,7 +1217,7 @@ 8 - 75 + 67 1 0 0 @@ -1325,7 +1229,7 @@ 8 - 76 + 68 1 0 0 @@ -1337,7 +1241,7 @@ 8 - 77 + 69 1 0 0 @@ -1349,7 +1253,7 @@ 8 - 78 + 70 1 0 0 @@ -1361,7 +1265,7 @@ 8 - 79 + 71 1 0 0 @@ -1373,7 +1277,7 @@ 8 - 80 + 72 1 0 0 @@ -1385,7 +1289,7 @@ 8 - 81 + 73 1 0 0 @@ -1397,7 +1301,7 @@ 8 - 82 + 74 1 0 0 @@ -1409,7 +1313,7 @@ 8 - 83 + 75 1 0 0 @@ -1421,7 +1325,7 @@ 8 - 84 + 76 1 0 0 @@ -1433,7 +1337,7 @@ 8 - 85 + 77 1 0 0 @@ -1445,7 +1349,7 @@ 8 - 86 + 78 1 0 0 @@ -1457,7 +1361,7 @@ 8 - 87 + 79 1 0 0 @@ -1469,7 +1373,7 @@ 8 - 88 + 80 1 0 0 @@ -1481,7 +1385,7 @@ 8 - 89 + 81 1 0 0 @@ -1493,7 +1397,7 @@ 8 - 90 + 82 1 0 0 @@ -1505,7 +1409,7 @@ 8 - 91 + 83 1 0 0 @@ -1517,7 +1421,7 @@ 8 - 92 + 84 1 0 0 @@ -1529,7 +1433,7 @@ 8 - 93 + 85 1 0 0 @@ -1549,7 +1453,7 @@ 0 9 - 94 + 86 1 0 0 @@ -1561,7 +1465,7 @@ 9 - 95 + 87 1 0 0 @@ -1573,7 +1477,7 @@ 9 - 96 + 88 1 0 0 @@ -1585,7 +1489,7 @@ 9 - 97 + 89 1 0 0 @@ -1597,7 +1501,7 @@ 9 - 98 + 90 1 0 0 @@ -1609,7 +1513,7 @@ 9 - 99 + 91 1 0 0 @@ -1629,7 +1533,7 @@ 0 10 - 100 + 92 1 0 0 @@ -1641,7 +1545,7 @@ 10 - 101 + 93 1 0 0 @@ -1653,7 +1557,7 @@ 10 - 102 + 94 1 0 0 @@ -1673,7 +1577,7 @@ 0 11 - 103 + 95 1 0 0 @@ -1685,7 +1589,7 @@ 11 - 104 + 96 1 0 0 @@ -1697,7 +1601,7 @@ 11 - 105 + 97 1 0 0 @@ -1717,7 +1621,7 @@ 0 12 - 106 + 98 1 0 0 @@ -1729,7 +1633,7 @@ 12 - 107 + 99 1 0 0 @@ -1741,7 +1645,7 @@ 12 - 108 + 100 1 0 0 @@ -1761,7 +1665,7 @@ 0 13 - 109 + 101 1 0 0 @@ -1773,7 +1677,7 @@ 13 - 110 + 102 1 0 0 @@ -1793,7 +1697,7 @@ 0 14 - 111 + 103 1 0 0 @@ -1805,7 +1709,7 @@ 14 - 112 + 104 1 0 0 @@ -1817,7 +1721,7 @@ 14 - 113 + 105 1 0 0 @@ -1829,7 +1733,7 @@ 14 - 114 + 106 1 0 0 diff --git a/app/app.uvprojx b/app/app.uvprojx index df1da2f..fa261df 100644 --- a/app/app.uvprojx +++ b/app/app.uvprojx @@ -339,7 +339,7 @@ --reduce_paths --diag_suppress=1295 --diag_suppress=1 --diag_suppress=174 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_PCA10100 FLOAT_ABI_HARD NRF52833_XXAA NRF_SD_BLE_API_VERSION=7 S140 SOFTDEVICE_PRESENT __HEAP_SIZE=5120 __STACK_SIZE=5120 - ..\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;..\sdk\components\libraries\svc;..\sdk\components\libraries\bootloader\dfu;..\sdk\components\libraries\bootloader\ble_dfu;..\sdk\components\libraries\bootloader\ + ..\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;..\sdk\components\libraries\svc;..\sdk\components\libraries\bootloader\dfu;..\sdk\components\libraries\bootloader\ble_dfu;..\sdk\components\libraries\bootloader\;..\ @@ -357,7 +357,7 @@ --cpreproc_opts=-DAPP_TIMER_V2,-DAPP_TIMER_V2_RTC1_ENABLED,-DBOARD_PCA10100,-DFLOAT_ABI_HARD,-DNRF52833_XXAA,-DNRF_SD_BLE_API_VERSION=7,-DS140,-DSOFTDEVICE_PRESENT,-D__HEAP_SIZE=2048,-D__STACK_SIZE=2048 APP_TIMER_V2 APP_TIMER_V2_RTC1_ENABLED BOARD_PCA10100 FLOAT_ABI_HARD NRF52833_XXAA NRF_SD_BLE_API_VERSION=7 S140 SOFTDEVICE_PRESENT __HEAP_SIZE=5120 __STACK_SIZE=5120 - ..\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\ + ..\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\;..\..\ @@ -389,164 +389,124 @@ .\config\sdk_config.h - heart_wave_sample_service.c - 1 - .\src\heart_wave_sample_service.c - - - app_event_distribute.c - 1 - .\src\app_event_distribute.c - - - m24m02.c - 1 - .\src\basic\m24m02\m24m02.c - - - driver_ssd1306.c + one_conduction_main.c 1 - .\src\basic\ssd1306\driver_ssd1306.c + .\src\one_conduction_main.c - driver_ssd1306_basic.c + main.c 1 - .\src\basic\ssd1306\driver_ssd1306_basic.c + .\src\main.c - fontlib.c + board_beep_ctrl.c 1 - .\src\basic\ssd1306\fontlib.c + .\src\board\board_beep_ctrl.c - wave_drawer.c + board_adc_module_ctrl.c 1 - .\src\basic\ssd1306\wave_drawer.c + .\src\board\board_adc_module_ctrl.c - ble_cmd_process_service.c + board_battery_state.c 1 - .\src\ble_cmd_process_service.c + .\src\board\board_battery_state.c - device_controler.c + board_ecg_sensor.c 1 - .\src\device_controler.c + .\src\board\board_ecg_sensor.c - device_state.c + board_light_ctrl.c 1 - .\src\device_state.c + .\src\board\board_light_ctrl.c - display_manager.c + board_ssd1306_interface.c 1 - .\src\display_manager.c + .\src\board\board_ssd1306_interface.c - one_conduction_main.c + board_eeprom_driver.c 1 - .\src\one_conduction_main.c + .\src\board\board_eeprom_driver.c - sample_data_manager.c + board_power_mgr.c 1 - .\src\sample_data_manager.c + .\src\board\board_power_mgr.c - zeeprom_fs.c + device_state.c 1 - .\src\zeeprom_fs.c + .\src\basic_service\device_state.c device_version_info_mgr.c 1 - .\src\basic\device_version_info_mgr.c - - - main.c - 1 - .\src\main.c - - - board_beep_ctrl.c - 1 - .\src\board\board_beep_ctrl.c - - - board_adc_module_ctrl.c - 1 - .\src\board\board_adc_module_ctrl.c - - - board_battery_state.c - 1 - .\src\board\board_battery_state.c - - - board_ecg_sensor.c - 1 - .\src\board\board_ecg_sensor.c + .\src\basic_service\device_version_info_mgr.c - board_light_ctrl.c + driver_ssd1306.c 1 - .\src\board\board_light_ctrl.c + .\src\board\ssd1306\driver_ssd1306.c - FIR.c + driver_ssd1306_basic.c 1 - .\src\basic\FIR.c + .\src\board\ssd1306\driver_ssd1306_basic.c - HC_Chen_detect.c + fontlib.c 1 - .\src\basic\HC_Chen_detect.c + .\src\board\ssd1306\fontlib.c - So_Chen_detect.c + wave_drawer.c 1 - .\src\basic\So_Chen_detect.c + .\src\board\ssd1306\wave_drawer.c - adaptive_algorithm.c + ble_cmd_process_service.c 1 - .\src\basic\adaptive_algorithm.c + .\src\service\ble_cmd_processer\ble_cmd_process_service.c - Pan_Tompkins_detect.c + display_manager.c 1 - .\src\basic\Pan_Tompkins_detect.c + .\src\service\display_mgr\display_manager.c - qrs_time_domain_zh.c + heart_ware_sample_data_mgr.c 1 - .\src\basic\qrs_time_domain_zh.c + .\src\service\heart_wave_sample_service\heart_ware_sample_data_mgr.c - board_ssd1306_interface.c + heart_wave_sample_data_pre_process.c 1 - .\src\board\board_ssd1306_interface.c + .\src\service\heart_wave_sample_service\heart_wave_sample_data_pre_process.c - board_eeprom_driver.c + heart_wave_sample_service.c 1 - .\src\board\board_eeprom_driver.c + .\src\service\heart_wave_sample_service\heart_wave_sample_service.c - board_power_mgr.c + sample_data_manager.c 1 - .\src\board\board_power_mgr.c + .\src\service\storage\sample_data_manager.c - heart_ware_sample_data_mgr.c + zeeprom_fs.c 1 - .\src\heart_ware_sample_data_mgr.c + .\src\service\storage\zeeprom_fs.c - heart_wave_sample_data_pre_process.c + app_event_distribute.c 1 - .\src\heart_wave_sample_data_pre_process.c + .\src\basic_service\app_event_distribute.c @@ -4318,164 +4278,124 @@ .\config\sdk_config.h - heart_wave_sample_service.c - 1 - .\src\heart_wave_sample_service.c - - - app_event_distribute.c - 1 - .\src\app_event_distribute.c - - - m24m02.c - 1 - .\src\basic\m24m02\m24m02.c - - - driver_ssd1306.c + one_conduction_main.c 1 - .\src\basic\ssd1306\driver_ssd1306.c + .\src\one_conduction_main.c - driver_ssd1306_basic.c + main.c 1 - .\src\basic\ssd1306\driver_ssd1306_basic.c + .\src\main.c - fontlib.c + board_beep_ctrl.c 1 - .\src\basic\ssd1306\fontlib.c + .\src\board\board_beep_ctrl.c - wave_drawer.c + board_adc_module_ctrl.c 1 - .\src\basic\ssd1306\wave_drawer.c + .\src\board\board_adc_module_ctrl.c - ble_cmd_process_service.c + board_battery_state.c 1 - .\src\ble_cmd_process_service.c + .\src\board\board_battery_state.c - device_controler.c + board_ecg_sensor.c 1 - .\src\device_controler.c + .\src\board\board_ecg_sensor.c - device_state.c + board_light_ctrl.c 1 - .\src\device_state.c + .\src\board\board_light_ctrl.c - display_manager.c + board_ssd1306_interface.c 1 - .\src\display_manager.c + .\src\board\board_ssd1306_interface.c - one_conduction_main.c + board_eeprom_driver.c 1 - .\src\one_conduction_main.c + .\src\board\board_eeprom_driver.c - sample_data_manager.c + board_power_mgr.c 1 - .\src\sample_data_manager.c + .\src\board\board_power_mgr.c - zeeprom_fs.c + device_state.c 1 - .\src\zeeprom_fs.c + .\src\basic_service\device_state.c device_version_info_mgr.c 1 - .\src\basic\device_version_info_mgr.c - - - main.c - 1 - .\src\main.c - - - board_beep_ctrl.c - 1 - .\src\board\board_beep_ctrl.c - - - board_adc_module_ctrl.c - 1 - .\src\board\board_adc_module_ctrl.c - - - board_battery_state.c - 1 - .\src\board\board_battery_state.c - - - board_ecg_sensor.c - 1 - .\src\board\board_ecg_sensor.c + .\src\basic_service\device_version_info_mgr.c - board_light_ctrl.c + driver_ssd1306.c 1 - .\src\board\board_light_ctrl.c + .\src\board\ssd1306\driver_ssd1306.c - FIR.c + driver_ssd1306_basic.c 1 - .\src\basic\FIR.c + .\src\board\ssd1306\driver_ssd1306_basic.c - HC_Chen_detect.c + fontlib.c 1 - .\src\basic\HC_Chen_detect.c + .\src\board\ssd1306\fontlib.c - So_Chen_detect.c + wave_drawer.c 1 - .\src\basic\So_Chen_detect.c + .\src\board\ssd1306\wave_drawer.c - adaptive_algorithm.c + ble_cmd_process_service.c 1 - .\src\basic\adaptive_algorithm.c + .\src\service\ble_cmd_processer\ble_cmd_process_service.c - Pan_Tompkins_detect.c + display_manager.c 1 - .\src\basic\Pan_Tompkins_detect.c + .\src\service\display_mgr\display_manager.c - qrs_time_domain_zh.c + heart_ware_sample_data_mgr.c 1 - .\src\basic\qrs_time_domain_zh.c + .\src\service\heart_wave_sample_service\heart_ware_sample_data_mgr.c - board_ssd1306_interface.c + heart_wave_sample_data_pre_process.c 1 - .\src\board\board_ssd1306_interface.c + .\src\service\heart_wave_sample_service\heart_wave_sample_data_pre_process.c - board_eeprom_driver.c + heart_wave_sample_service.c 1 - .\src\board\board_eeprom_driver.c + .\src\service\heart_wave_sample_service\heart_wave_sample_service.c - board_power_mgr.c + sample_data_manager.c 1 - .\src\board\board_power_mgr.c + .\src\service\storage\sample_data_manager.c - heart_ware_sample_data_mgr.c + zeeprom_fs.c 1 - .\src\heart_ware_sample_data_mgr.c + .\src\service\storage\zeeprom_fs.c - heart_wave_sample_data_pre_process.c + app_event_distribute.c 1 - .\src\heart_wave_sample_data_pre_process.c + .\src\basic_service\app_event_distribute.c diff --git a/app/config/sdk_config.h b/app/config/sdk_config.h index 25cdb27..2651555 100644 --- a/app/config/sdk_config.h +++ b/app/config/sdk_config.h @@ -7719,7 +7719,7 @@ #ifndef NRF_FPRINTF_DOUBLE_ENABLED -#define NRF_FPRINTF_DOUBLE_ENABLED 0 +#define NRF_FPRINTF_DOUBLE_ENABLED 1 #endif // diff --git a/app/src/app_event.h b/app/src/app_event.h deleted file mode 100644 index cc128f6..0000000 --- a/app/src/app_event.h +++ /dev/null @@ -1 +0,0 @@ -#include "device_state.h" \ No newline at end of file diff --git a/app/src/board/board.h b/app/src/aproject_config/config.h similarity index 76% rename from app/src/board/board.h rename to app/src/aproject_config/config.h index 937cc3a..9acfc73 100644 --- a/app/src/board/board.h +++ b/app/src/aproject_config/config.h @@ -1,5 +1,19 @@ #pragma once +/*********************************************************************************************************************** + * 设备信息配置 * + ***********************************************************************************************************************/ + +#define CATEGORY "M1001" // 单导联 +#define MANUFACTURER_NAME "iflytop" + +#define FIRMWARE_VERSION (10) +#define BLESTACK_VERSION 1 +#define BOOTLOADER_VERSION 1 +#define HARDWARE_VERSION (1) + +#define APP_COMPANY_IDENTIFIER 0xFFFF + /******************************************************************************* * BEEP * *******************************************************************************/ diff --git a/app/src/basic/device_version_info_mgr.h b/app/src/basic/device_version_info_mgr.h deleted file mode 100644 index f523659..0000000 --- a/app/src/basic/device_version_info_mgr.h +++ /dev/null @@ -1,14 +0,0 @@ -#pragma once -#include "znordic.h" - -typedef struct { - uint8_t sn[14]; -} sn_t; - -void device_info_read_sn(sn_t *sn); -const char *device_info_read_sn_str(); - -uint16_t device_info_read_blestack_version(void); -uint16_t device_info_read_bootloader_version(void); -uint16_t device_info_read_firmware_version(void); -uint16_t device_info_read_hardware_version(void); \ No newline at end of file diff --git a/app/src/basic/m24m02/m24m02.c b/app/src/basic/m24m02/m24m02.c deleted file mode 100644 index e69de29..0000000 diff --git a/app/src/basic/m24m02/m24m02.h b/app/src/basic/m24m02/m24m02.h deleted file mode 100644 index e69de29..0000000 diff --git a/app/src/basic/version.h b/app/src/basic/version.h deleted file mode 100644 index e911879..0000000 --- a/app/src/basic/version.h +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once -#define CATEGORY "M1001" // 单导联 -#define MANUFACTURER_NAME "iflytop" - -#define FIRMWARE_VERSION (10) -#define BLESTACK_VERSION 1 -#define BOOTLOADER_VERSION 1 -#define HARDWARE_VERSION (1) - -// https://www.bluetooth.com/specifications/assigned-numbers/ -// #define APP_COMPANY_IDENTIFIER 0x0059 /**< Company identifier for Nordic Semiconductor ASA. as per www.bluetooth.org. */ -#define APP_COMPANY_IDENTIFIER 0xFFFF /**< Company identifier for Nordic Semiconductor ASA. as per www.bluetooth.org. */ diff --git a/app/src/device_state.h b/app/src/basic_service/app_event.h similarity index 80% rename from app/src/device_state.h rename to app/src/basic_service/app_event.h index 5d1e3c6..0c4d493 100644 --- a/app/src/device_state.h +++ b/app/src/basic_service/app_event.h @@ -2,7 +2,7 @@ #include #include -#include "board/board.h" +#include "aproject_config/config.h" typedef enum { kplod_connected_event = 0, // 导联连接事件 kplod_disconnected_event, // 导联断开事件 @@ -74,17 +74,3 @@ static const char* device_state_to_str(device_state_t ds) { } } -void app_event_process_cb(void* p_event_data, uint16_t event_size); - -void ds_change_to_state(device_state_t state); -uint32_t ds_cur_state_haspassed_ms(); -device_state_t ds_now_state(); - -typedef struct { - bool is_over30s; -} sample_capture_state_t; - -sample_capture_state_t* sample_capture_state_get(); - -void sample_capture_state_reset(); -void sample_capture_state_set_is_over30s(bool over30s); diff --git a/app/src/app_event_distribute.c b/app/src/basic_service/app_event_distribute.c similarity index 87% rename from app/src/app_event_distribute.c rename to app/src/basic_service/app_event_distribute.c index 07a00a6..a30938e 100644 --- a/app/src/app_event_distribute.c +++ b/app/src/basic_service/app_event_distribute.c @@ -1,6 +1,6 @@ -#include "app_event_distribute.h" +#include "basic_service/app_event_distribute.h" -#include "app_event.h" +#include "basic_service/app_event.h" #include "app_scheduler.h" static AppEventListener m_listener[10]; diff --git a/app/src/app_event_distribute.h b/app/src/basic_service/app_event_distribute.h similarity index 89% rename from app/src/app_event_distribute.h rename to app/src/basic_service/app_event_distribute.h index 7f22132..2a004ae 100644 --- a/app/src/app_event_distribute.h +++ b/app/src/basic_service/app_event_distribute.h @@ -2,7 +2,7 @@ #include #include -#include "app_event.h" +#include "basic_service/app_event.h" typedef void (*app_event_listener_t)(void* p_event_data, uint16_t event_size); diff --git a/app/src/device_state.c b/app/src/basic_service/device_state.c similarity index 100% rename from app/src/device_state.c rename to app/src/basic_service/device_state.c diff --git a/app/src/basic_service/device_state.h b/app/src/basic_service/device_state.h new file mode 100644 index 0000000..6c6d7c9 --- /dev/null +++ b/app/src/basic_service/device_state.h @@ -0,0 +1,18 @@ +#pragma once +#include +#include + +#include "aproject_config/config.h" +#include "basic_service/app_event.h" +void ds_change_to_state(device_state_t state); +uint32_t ds_cur_state_haspassed_ms(); +device_state_t ds_now_state(); + +typedef struct { + bool is_over30s; +} sample_capture_state_t; + +sample_capture_state_t* sample_capture_state_get(); + +void sample_capture_state_reset(); +void sample_capture_state_set_is_over30s(bool over30s); diff --git a/app/src/basic/device_version_info_mgr.c b/app/src/basic_service/device_version_info_mgr.c similarity index 93% rename from app/src/basic/device_version_info_mgr.c rename to app/src/basic_service/device_version_info_mgr.c index ccf0cce..dc31614 100644 --- a/app/src/basic/device_version_info_mgr.c +++ b/app/src/basic_service/device_version_info_mgr.c @@ -1,9 +1,8 @@ #include "device_version_info_mgr.h" -#include "board/board.h" +#include "aproject_config/config.h" #include "zble_module.h" // -#include "version.h" #include "znordic.h" void device_info_read_sn(sn_t *sn) { uint32_t lot = NRF_UICR->CUSTOMER[0]; diff --git a/app/src/basic_service/device_version_info_mgr.h b/app/src/basic_service/device_version_info_mgr.h new file mode 100644 index 0000000..00f9abb --- /dev/null +++ b/app/src/basic_service/device_version_info_mgr.h @@ -0,0 +1,16 @@ +#pragma once +#include "znordic.h" + + + +typedef struct { + uint8_t sn[14]; +} sn_t; + +void device_info_read_sn(sn_t *sn); +const char *device_info_read_sn_str(); + +uint16_t device_info_read_blestack_version(void); +uint16_t device_info_read_bootloader_version(void); +uint16_t device_info_read_firmware_version(void); +uint16_t device_info_read_hardware_version(void); \ No newline at end of file diff --git a/app/src/board/ads1291/ads1291.c b/app/src/board/ads1291/ads1291.c new file mode 100644 index 0000000..556b9fa --- /dev/null +++ b/app/src/board/ads1291/ads1291.c @@ -0,0 +1,133 @@ +#include "ads1291.h" + +#include "ads1291_type.h" + +/** @addtogroup ADS1292R + * @{ + */ +/* Private typedef -----------------------------------------------------------*/ +typedef struct { + uint8_t id; /* id，ads1292r固定为0x73 ads1291 0x52 */ + uint8_t cfg1; /* 设置寄存器 */ + uint8_t cfg2; /* 设置寄存器 */ + uint8_t loff; /* 导联 */ + uint8_t ch1set; /* 通道一设置 */ + uint8_t ch2set; /* 通道二设置 */ + uint8_t rld_sens; /* 右腿驱动 */ + uint8_t loff_sens; /* 导联 */ + uint8_t loff_stat; /* 导联 */ + uint8_t resp1; /* 呼吸 */ + uint8_t resp2; /* 呼吸 */ + uint8_t gpio; /* gpio1，2的控制 */ +} ads1292r_regs_s; + +/* Private define ------------------------------------------------------------*/ + +/* Private macro -------------------------------------------------------------*/ + +/* Private variables ---------------------------------------------------------*/ +/* 局部全局变量，包含ads1292寄存器默认值 */ +static ads1292r_regs_s ads1292r_reg = { + /* 默认参数 */ + 0x73, /* 默认地址0x73 */ + 0x02, /* 连续转换，500sps采样率 */ + 0x80, /* 导联脱落比较器关，内部参考电压关，2.42v参考电压，晶振输出关，测试信号关，测试信号频率为0HZ */ + 0x10, /* 脱落比较器正端阈值为95%，负端为5%，引出模式电流大小6na，频率为0HZ */ + 0x00, /* 通道一关闭，6倍增益，正常电极输入 */ + 0x00, /* 通道二关闭，6倍增益，正常电极输入 */ + 0x00, /* 未启用 */ + 0x00, /* 未启用 */ + 0x00, /* fmod为clk四分频，其他未用 */ + 0x02, /* 呼吸相关配置 */ + 0x03, /* 呼吸相关配置 */ + 0x0c /* gpio1、2皆为输入模式 */ +}; +/* Private function prototypes -----------------------------------------------*/ + +/* Private functions ---------------------------------------------------------*/ + +/* Exported functions --------------------------------------------------------*/ +/* 不必要，尽量不要对外开放以下函数，最好设置成static类型 */ + +/* ads1292r发送指令 */ +uint8_t ads1292r_send_cmd(uint8_t cmd) { + uint8_t rx = 0; + + ADS1292_CS_RESET(); /* 选中设备 */ + port_delay_us(100); + + rx = port_spi_transmit_receive(cmd); + + port_delay_us(100); + ADS1292_CS_SET(); /* 释放设备 */ + + return rx; +} + +/* ads1292r读写寄存器，自动根据指令类型区分读和写操作 */ +uint8_t ads1292r_rw_reg(uint8_t cmd, uint8_t data) { + uint8_t rx = 0; + + ADS1292_CS_RESET(); /* 选中设备 */ + port_delay_us(1); + + port_spi_transmit_receive(cmd); /* 发送读写指令 */ + port_spi_transmit_receive(0X00); /* 只写一个数据 */ + + if ((cmd & ADS1292R_COMMAND_RREG) == ADS1292R_COMMAND_RREG) /* 判断指令类型 */ + rx = port_spi_transmit_receive(0X00); /* 返回寄存器值 */ + else + rx = port_spi_transmit_receive(data); /* 写入数值 */ + + port_delay_us(1); + ADS1292_CS_SET(); /* 释放设备 */ + + return rx; +} + +/* 从指定寄存器开始读写一定数量的寄存器 */ +void ads1292r_write_multiregs(uint8_t reg, uint8_t *ch, uint8_t size) { + uint8_t i; + + ADS1292_CS_RESET(); /* 选中设备 */ + port_delay_us(100); + + port_spi_transmit_receive(ADS1292R_COMMAND_WREG | reg); + port_delay_us(100); + port_spi_transmit_receive(size - 1); + + for (i = 0; i < size; i++) { + port_delay_us(100); + port_spi_transmit_receive(*ch); + ch++; + } + + port_delay_us(100); + ADS1292_CS_SET(); +} + +/* 从指定寄存器开始读写一定数量的寄存器 */ +void ads1292r_read_multiregs(uint8_t reg, uint8_t *ch, uint8_t size) { + uint8_t i; + + ADS1292_CS_RESET(); /* 选中设备 */ + port_delay_us(100); + + port_spi_transmit_receive(ADS1292R_COMMAND_RREG | reg); + port_delay_us(100); + port_spi_transmit_receive(size - 1); + + for (i = 0; i < size; i++) { + port_delay_us(100); + *ch = port_spi_transmit_receive(0); + ch++; + } + + port_delay_us(100); + ADS1292_CS_SET(); +} + +uint8_t ads1292r_init(uint8_t timeout); +void ads1292r_normal_adc_start(void); +void ads1292r_test_adc_start(void); +void ads1292r_get_value(uint8_t *ad_buf); diff --git a/app/src/board/ads1291/ads1291.h b/app/src/board/ads1291/ads1291.h new file mode 100644 index 0000000..daac12f --- /dev/null +++ b/app/src/board/ads1291/ads1291.h @@ -0,0 +1,28 @@ +#ifndef __ADS1292R_H +#define __ADS1292R_H + +#ifdef __cplusplus +extern "C" { +#endif +#include +uint8_t ads1292r_init(uint8_t timeout); + +/** @brief 开启双通道正常模式采样，用于心电采集 + * @details 500sps，6倍增益，调用该函数后需调用读函数，读取ad数据 + * @retval NONE + */ +void ads1292r_normal_adc_start(void); + +/** @brief 开启双测试信号adc转换。 + * @details 500sps，6倍增益，1HZ方波，调用该函数后需调用读函数，读取ad数据 + * @retval NONE + */ +void ads1292r_test_adc_start(void); + +void ads1292r_get_value(uint8_t *ad_buf); + +#ifdef __cplusplus +} +#endif + +#endif /* __ADS1292R_H */ diff --git a/app/src/board/ads1291/ads1291_type.h b/app/src/board/ads1291/ads1291_type.h new file mode 100644 index 0000000..3b7089f --- /dev/null +++ b/app/src/board/ads1291/ads1291_type.h @@ -0,0 +1,330 @@ +/** + ****************************************************************************** + * @file : ads1291_typ.h + * @brief : ads1291相关数据类型定义 + * @details : 寄存器标、命令表、 + * @author : + * @date : 2020/9/2 + * @version : V0.1 + * @copyright : Copyright (C) + ****************************************************************************** + * @attention + * NONE + ****************************************************************************** + * @verbatim + * 修改历史: + * 1. 日期：2020/9/2 + * 作者：Charmander + * 修改： + * @endverbatim + ****************************************************************************** + */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __ADS1292_TYP_H +#define __ADS1292_TYP_H + +#ifdef __cplusplus +extern "C" { +#endif + +/** @defgroup ADS1291_TYP ADS1291 TYP + * @{ + */ +/* Exported types ------------------------------------------------------------*/ +/** @addtogroup ADS1291_TYP_Exported_types ADS1291 TYP Exported types + * @{ + */ + +/** @brief 寄存器地址枚举 + * @details 11个寄存器 + */ +typedef enum { + ADS1291_REG_ID = 0x00, + ADS1291_REG_CONFIG1 = 0x01, + ADS1291_REG_CONFIG2 = 0x02, + ADS1291_REG_LOFF = 0x03, + ADS1291_REG_CH1SET = 0x04, + ADS1291_REG_CH2SET = 0x05, + ADS1291_REG_RLDSENS = 0x06, + ADS1291_REG_LOFFSENS = 0x07, + ADS1291_REG_LOFFSTAT = 0x08, + ADS1291_REG_RESP1 = 0x09, + ADS1291_REG_RESP2 = 0x0A, + ADS1291_REG_GPIO = 0x0B +} ADS1291_REG_E; + +/** + * @} + */ + +/** @addtogroup ADS1291_TYP_Exported_constants ADS1291 TYP Exported constants + * @brief 一下内容也可以全部由位域+枚举实现，考虑到不是所有编译器都支持， + * 采用宏+掩码方式实现。 + * @{ + */ + +/* Exported constants --------------------------------------------------------*/ +#define ADS1291_REG_SIZE_MAX 12 /* ADS1291寄存器数量 */ + +/** @addtogroup ADS1291_TYP_REG_CONTENT ADS1291 TYP Exported content + * @brief 各寄存器内容 + * @{ + */ +/* 芯片ID */ +#define ADS1291_ID 0x73 + +/* 属于ADS1291_REG_CONFIG1的寄存器设置 */ +#define ADS1291_SINGLE_SHOT_OFF 0 /* 连续转换模式,默认 */ +#define ADS1291_SINGLE_SHOT_ON 1 /* 单次转换模式 */ +/* 采样率，该模块采用fclk为512k，0分频模式，其他配置下采样率会改变 */ +#define ADS1291_OVERSAMPLING_125SPS 0 +#define ADS1291_OVERSAMPLING_250SPS 1 +#define ADS1291_OVERSAMPLING_500SPS 2 /* 默认 */ +#define ADS1291_OVERSAMPLING_1000SPS 3 +#define ADS1291_OVERSAMPLING_2000SPS 4 +#define ADS1291_OVERSAMPLING_4000SPS 5 +#define ADS1291_OVERSAMPLING_8000SPS 6 +#define ADS1291_OVERSAMPLING_NONESPS 7 + +/* 属于ADS1291_REG_CONFIG2的寄存器设置 */ +#define ADS1291_PDB_LOFF_COMP_OFF 0 /* 导联脱落比较器关，默认 */ +#define ADS1291_PDB_LOFF_COMP_ON 1 /* 导联脱落比较器开 */ +#define ADS1291_PDB_REFBUF_OFF 0 /* 内部参考电压关，默认 */ +#define ADS1291_PDB_REFBUF_ON 1 /* 内部参考电压开 */ +#define ADS1291_VREF_2420MV 0 /* 选择参考电压为2.42v，默认 */ +#define ADS1291_VREF_4033MV 1 /* 选择参考电压为4.033v */ +#define ADS1291_CLK_OUTPUT_OFF 0 /* 时钟输出关，默认 */ +#define ADS1291_CLK_OUTPUT_ON 1 /* 时钟输出开 */ +#define ADS1291_INT_TEST_OFF 0 /* 内部测试电压关，默认 */ +#define ADS1291_INT_TEST_ON 1 /* 内部测试电压开 */ +#define ADS1291_INT_FREQ_DC 0 /* 直流，默认 */ +#define ADS1291_INT_FREQ_AC 1 /* 1HZ方波 */ + +/* 属于ADS1291_REG_LOFF的寄存器设置 */ + +/* 属于ADS1291_REG_CH1SET，与ADS1291_REG_CH2SET的寄存器设置 */ +#define ADS1291_CHx_OFF 1 /* 禁止使用通道一 */ +#define ADS1291_CHx_ON 0 /* 使用通道一，默认 */ + +#define ADS1291_GAIN_6 0 /* 使用通道一6倍增益，默认 */ +#define ADS1291_GAIN_1 1 /* 使用通道一1倍增益 */ +#define ADS1291_GAIN_2 2 /* 使用通道一2倍增益 */ +#define ADS1291_GAIN_3 3 /* 使用通道一3倍增益 */ +#define ADS1291_GAIN_4 4 /* 使用通道一4倍增益 */ +#define ADS1291_GAIN_8 5 /* 使用通道一8倍增益 */ +#define ADS1291_GAIN_12 6 /* 使用通道一12倍增益 */ +/* 选择通道一的输入 */ +#define ADS1291_CHx_INPUT_NORMAL 0 /* 正常电极输入，默认 */ +#define ADS1291_CHx_INPUT_SHORTED 1 /* 短路，测偏执用 */ +#define ADS1291_CHx_INPUT_RLD 2 /* 右腿驱动 */ +/* For channel 1, (MVDDP – MVDDN) is [0.5(AVDD + AVSS)]; for channel 2, (MVDDP – MVDDN) is DVDD / 4. */ +/* For channel 2,VDD / 2 for supply measurement */ +#define ADS1291_CHx_INPUT_MVDD 3 +#define ADS1291_CHx_INPUT_TEMP 4 /* 板载温度 */ +#define ADS1291_CHx_INPUT_TEST 5 /* 内部测试信号 */ +#define ADS1291_CHx_INPUT_RLDDRP 6 +#define ADS1291_CHx_INPUT_RLDDRM 7 +#define ADS1291_CHx_INPUT_RLDDRPM 8 +#define ADS1291_CHx_INPUT_ROUTE 9 /* 连接到通道三 */ +#define ADS1291_CHx_INPUT_RESERVED 10 /* 预留 */ + +/* 属于ADS1291_REG_RLDSENS的寄存器设置 */ +#define ADS1291_CHOP_FREQ_DIV4 3 /* PGA斩波频率未fMOD/4 */ +#define ADS1291_PDB_RLD_OFF 0 /* 右腿驱动电源关，默认 */ +#define ADS1291_PDB_RLD_ON 1 /* 右腿驱动电源开 */ +#define ADS1291_PDB_RLD_SENSE_OFF 0 /* 右腿驱动导联脱落检测关，默认 */ +#define ADS1291_PDB_RLD_SENSE_ON 1 /* 右腿驱动导联脱落检测开 */ +#define ADS1291_RLD2N_OFF 0 /* 通道二负极为右腿输入关，默认 */ +#define ADS1291_RLD2N_ON 1 /* 通道二负极为右腿输入开 */ +#define ADS1291_RLD2P_OFF 0 /* 通道二正极为右腿输入关，默认 */ +#define ADS1291_RLD2P_ON 1 /* 通道二正极为右腿输入开 */ +#define ADS1291_RLD1N_OFF 0 /* 通道一负极为右腿输入关，默认 */ +#define ADS1291_RLD1N_ON 1 /* 通道一负极为右腿输入开 */ +#define ADS1291_RLD1P_OFF 0 /* 通道一正极为右腿输入关，默认 */ +#define ADS1291_RLD1P_ON 1 /* 通道一正极为右腿输入开 */ + +/* 属于ADS1291_REG_LOFFSENS的寄存器设置 */ +#define ADS1291_FLIP2_OFF 0 /* 导联脱落检测通道二电流方向关，默认 */ +#define ADS1291_FLIP2_ON 1 /* 导联脱落检测通道二电流方向开 */ +#define ADS1291_FLIP1_OFF 0 /* 导联脱落检测通道一电流方向关，默认 */ +#define ADS1291_FLIP1_ON 1 /* 导联脱落检测通道一电流方向开 */ +#define ADS1291_LOFF2N_OFF 0 /* 通道二负极导联脱落检测关，默认 */ +#define ADS1291_LOFF2N_ON 1 /* 通道二负极导联脱落检测开 */ +#define ADS1291_LOFF2P_OFF 0 /* 通道二正极导联脱落检测关，默认 */ +#define ADS1291_LOFF2P_ON 1 /* 通道二正极导联脱落检测开 */ +#define ADS1291_LOFF1N_OFF 0 /* 通道一负极导联脱落检测关，默认 */ +#define ADS1291_LOFF1N_ON 1 /* 通道一负极导联脱落检测开 */ +#define ADS1291_LOFF1P_OFF 0 /* 通道一正极导联脱落检测关，默认 */ +#define ADS1291_LOFF1P_ON 1 /* 通道一正极导联脱落检测开 */ + +/* 属于ADS1291_REG_LOFFSTAT的寄存器设置 */ +#define ADS1291_CLK_DIV4 0 /* 0 = fMOD = fCLK / 4 (default, use when fCLK = 512 kHz) */ +#define ADS1291_CLK_DIV16 1 /* 1 = fMOD = fCLK / 16 (use when fCLK = 2.048 MHz) */ + +/* 属于ADS1291_REG_RESP1的寄存器设置 */ +#define ADS1291_DEMOD_EN1_OFF 0 /* 通道一上的呼吸解调电路关，默认 */ +#define ADS1291_DEMOD_EN1_ON 1 /* 通道一上的呼吸解调电路开 */ +#define ADS1291_DEMOD_EN_OFF 0 /* 通道一上的呼吸调制电路关，默认 */ +#define ADS1291_DEMOD_EN_ON 1 /* 通道一上的呼吸调制电路开 */ +#define ADS1291_RESPPH_0 0 /* 解调信号相位偏移0，默认 */ +#define ADS1291_RESPPH_135 0x0c /* 解调信号相位偏移135度 */ +#define ADS1291_RESP_CTRL_INT 0 /* 内部呼吸内部时钟，默认 */ +#define ADS1291_RESP_CTRL_EXT 1 /* 内部呼吸外部时钟 */ + +/* 属于ADS1291_REG_RESP2的寄存器设置 */ +#define ADS1291_CALIB_ON_OFF 0 /* 校准关，默认 */ +#define ADS1291_CALIB_ON_ON 1 /* 校准开 */ +#define ADS1291_RESP_FREQ_36 0 /* 通道一上的呼吸调制电路关，默认 */ +#define ADS1291_RESP_FREQ_64 1 /* 通道一上的呼吸调制电路开 */ +#define ADS1291_RLDREF_EXT 0 /* 右腿驱动参考电压选择外部反馈，默认 */ +#define ADS1291_RLDREF_INT 1 /* 右腿驱动参考电压选择内部信号 */ + +/* 属于ADS1291_REG_GPIO的寄存器设置 */ +/** + * @} + */ + +/** @addtogroup ADS1291_TYP_REG_MASK ADS1291 TYP Reg Mask + * @brief 各寄存器值与位置掩码，被ADS1291_GET_BITS与ADS1291_SET_BITS函数调用 + * @{ + */ +#define ADS1291_ID_POS 0 +#define ADS1291_ID_MASK 0xFF + +#define ADS1291_SINGLE_SHOT_POS 7 +#define ADS1291_SINGLE_SHOT_MASK 0x80 +#define ADS1291_DR_POS 0 +#define ADS1291_DR_MASK 0x07 + +#define ADS1291_PDB_LOFF_COMP_POS 6 +#define ADS1291_PDB_LOFF_COMP_MASK 0x40 +#define ADS1291_PDB_REFBUF_POS 5 +#define ADS1291_PDB_REFBUF_MASK 0x20 +#define ADS1291_VREF_4V_POS 4 +#define ADS1291_VREF_4V_MASK 0x10 +#define ADS1291_CLK_EN_POS 3 +#define ADS1291_CLK_EN_MASK 0x80 +#define ADS1291_INT_TEST_POS 1 +#define ADS1291_INT_TEST_MASK 0x02 +#define ADS1291_INT_FREQ_POS 0 +#define ADS1291_INT_FREQ_MASK 0x01 + +#define ADS1291_PDx_POS 7 +#define ADS1291_PDx_MASK 0x80 +#define ADS1291_GAINx_POS 4 +#define ADS1291_GAINx_MASK 0x70 +#define ADS1291_MUXx_POS 0 +#define ADS1291_MUXx_MASK 0x0F + +#define ADS1291_CHOP_POS 6 +#define ADS1291_CHOP_MASK 0xC0 +#define ADS1291_PDB_RLD_POS 5 +#define ADS1291_PDB_RLD_MASK 0x20 +#define ADS1291_RLD_LOFF_SENSE_POS 4 +#define ADS1291_RLD_LOFF_SENSE_MASK 0x10 +#define ADS1291_RLD2N_POS 3 +#define ADS1291_RLD2N_MASK 0x08 +#define ADS1291_RLD2P_POS 2 +#define ADS1291_RLD2P_MASK 0x04 +#define ADS1291_RLD1N_POS 1 +#define ADS1291_RLD1N_MASK 0x02 +#define ADS1291_RLD1P_POS 0 +#define ADS1291_RLD1P_MASK 0x01 + +#define ADS1291_FLIP2_POS 5 +#define ADS1291_FLIP2_MASK 0x20 +#define ADS1291_FLIP1_POS 4 +#define ADS1291_FLIP1_MASK 0x10 +#define ADS1291_LOFF2N_POS 3 +#define ADS1291_LOFF2N_MASK 0x08 +#define ADS1291_LOFF2P_POS 2 +#define ADS1291_LOFF2P_MASK 0x04 +#define ADS1291_LOFFN_POS 1 +#define ADS1291_LOFF1N_MASK 0x02 +#define ADS1291_LOFF1P_POS 0 +#define ADS1291_LOFF1P_MASK 0x01 + +#define ADS1291_CLK_DIV_POS 6 +#define ADS1291_CLK_DIV_MASK 0x40 + +#define ADS1291_RESP_DEMOD_EN1_POS 7 +#define ADS1291_RESP_DEMOD_EN1_MASK 0x80 +#define ADS1291_RESP_MOD_EN_POS 6 +#define ADS1291_RESP_MOD_EN_MASK 0x40 +#define ADS1291_RESP_PH_POS 2 +#define ADS1291_RESP_PH_MASK 0x3c +#define ADS1291_RESP_CTRL_POS 0 +#define ADS1291_RESP_CTRL_MASK 0x01 + +#define ADS1291_CALIB_ON_POS 7 +#define ADS1291_CALIB_ON_MASK 0x80 +#define ADS1291_RESP_FREQ_POS 2 +#define ADS1291_RESP_FREQ_MASK 0x04 +#define ADS1291_RLDREF_INT_POS 1 +#define ADS1291_RLDREF_INT_MASK 0x02 + +/** + * @} + */ + +/** @addtogroup ADS1291_TYP_COMMAND ADS1291 TYP COMMAND + * @brief 命令 + * @{ + */ +/* System Commands */ +#define ADS1291_COMMAND_WAKEUP 0x02 +#define ADS1291_COMMAND_STANDBY 0x04 +#define ADS1291_COMMAND_RESET 0x06 +#define ADS1291_COMMAND_START 0x08 +#define ADS1291_COMMAND_STOP 0x0A +#define ADS1291_COMMAND_OFFSETCAL 0x1A + +/* Data Read Commands */ +#define ADS1291_COMMAND_RDATAC 0x10 +#define ADS1291_COMMAND_SDATAC 0x11 +#define ADS1291_COMMAND_RDATA 0x12 + +/* Register Read Commands，最后5位为读写的地址 */ +#define ADS1291_COMMAND_RREG 0x20 +#define ADS1291_COMMAND_WREG 0x40 +/** + * @} + */ + +/** + * @} + */ + +/** + * @} + */ + +/* Exported macro ------------------------------------------------------------*/ +/** @brief 读取ADS1291的指定寄存器的指定位 + * @details + * @param[in] bitname 位名字 + * @param[in] reg 寄存器名字 + * @retval 该位的值 + */ +#define ADS1291_GET_BITS(bitname, reg) ((reg & bitname##_MASK) >> bitname##_POS) + +/** @brief 设置ADS1291的指定寄存器的指定位 + * @details + * @param[in] reg 寄存器名字 + * @param[in] bitname 位名字 + * @param[in] val 要设置的值 + * @retval NONE + */ +#define ADS1291_SET_BITS(reg, bitname, val) ((reg & ~bitname##_MASK) | ((val << bitname##_POS) & bitname##_MASK)) +/* Exported functions --------------------------------------------------------*/ + +/** + * @} + */ + +#ifdef __cplusplus +} +#endif + +#endif /* __ADS1292_TYP_H */ diff --git a/app/src/board/ads1291/ads1292r_typ.h b/app/src/board/ads1291/ads1292r_typ.h deleted file mode 100644 index 8c3d47d..0000000 --- a/app/src/board/ads1291/ads1292r_typ.h +++ /dev/null @@ -1,337 +0,0 @@ -/** - ****************************************************************************** - * @file : ads1292r_typ.h - * @brief : ads1292r相关数据类型定义 - * @details : 寄存器标、命令表、 - * @author : - * @date : 2020/9/2 - * @version : V0.1 - * @copyright : Copyright (C) - ****************************************************************************** - * @attention - * NONE - ****************************************************************************** - * @verbatim - * 修改历史: - * 1. 日期：2020/9/2 - * 作者：Charmander - * 修改： - * @endverbatim - ****************************************************************************** - */ - -/* Define to prevent recursive inclusion -------------------------------------*/ -#ifndef __ADS1292_TYP_H -#define __ADS1292_TYP_H - -#ifdef __cplusplus -extern "C" { -#endif - - - -/** @defgroup ADS1292R_TYP ADS1292R TYP - * @{ - */ -/* Exported types ------------------------------------------------------------*/ -/** @addtogroup ADS1292R_TYP_Exported_types ADS1292R TYP Exported types - * @{ - */ - -/** @brief 寄存器地址枚举 - * @details 11个寄存器 - */ -typedef enum -{ - ADS1292R_REG_ID = 0x00 , - ADS1292R_REG_CONFIG1 = 0x01 , - ADS1292R_REG_CONFIG2 = 0x02 , - ADS1292R_REG_LOFF = 0x03 , - ADS1292R_REG_CH1SET = 0x04 , - ADS1292R_REG_CH2SET = 0x05 , - ADS1292R_REG_RLDSENS = 0x06 , - ADS1292R_REG_LOFFSENS = 0x07 , - ADS1292R_REG_LOFFSTAT = 0x08 , - ADS1292R_REG_RESP1 = 0x09 , - ADS1292R_REG_RESP2 = 0x0A , - ADS1292R_REG_GPIO = 0x0B -}ADS1292R_REG_E ; - -/** - * @} - */ - -/** @addtogroup ADS1292R_TYP_Exported_constants ADS1292R TYP Exported constants - * @brief 一下内容也可以全部由位域+枚举实现，考虑到不是所有编译器都支持， - * 采用宏+掩码方式实现。 - * @{ - */ - -/* Exported constants --------------------------------------------------------*/ -#define ADS1292R_REG_SIZE_MAX 12 /* ADS1292R寄存器数量 */ - -/** @addtogroup ADS1292R_TYP_REG_CONTENT ADS1292R TYP Exported content - * @brief 各寄存器内容 - * @{ - */ -/* 芯片ID */ -#define ADS1292R_ID 0x73 - -/* 属于ADS1292R_REG_CONFIG1的寄存器设置 */ -#define ADS1292R_SINGLE_SHOT_OFF 0 /* 连续转换模式,默认 */ -#define ADS1292R_SINGLE_SHOT_ON 1 /* 单次转换模式 */ -/* 采样率，该模块采用fclk为512k，0分频模式，其他配置下采样率会改变 */ -#define ADS1292R_OVERSAMPLING_125SPS 0 -#define ADS1292R_OVERSAMPLING_250SPS 1 -#define ADS1292R_OVERSAMPLING_500SPS 2 /* 默认 */ -#define ADS1292R_OVERSAMPLING_1000SPS 3 -#define ADS1292R_OVERSAMPLING_2000SPS 4 -#define ADS1292R_OVERSAMPLING_4000SPS 5 -#define ADS1292R_OVERSAMPLING_8000SPS 6 -#define ADS1292R_OVERSAMPLING_NONESPS 7 - -/* 属于ADS1292R_REG_CONFIG2的寄存器设置 */ -#define ADS1292R_PDB_LOFF_COMP_OFF 0 /* 导联脱落比较器关，默认 */ -#define ADS1292R_PDB_LOFF_COMP_ON 1 /* 导联脱落比较器开 */ -#define ADS1292R_PDB_REFBUF_OFF 0 /* 内部参考电压关，默认 */ -#define ADS1292R_PDB_REFBUF_ON 1 /* 内部参考电压开 */ -#define ADS1292R_VREF_2420MV 0 /* 选择参考电压为2.42v，默认 */ -#define ADS1292R_VREF_4033MV 1 /* 选择参考电压为4.033v */ -#define ADS1292R_CLK_OUTPUT_OFF 0 /* 时钟输出关，默认 */ -#define ADS1292R_CLK_OUTPUT_ON 1 /* 时钟输出开 */ -#define ADS1292R_INT_TEST_OFF 0 /* 内部测试电压关，默认 */ -#define ADS1292R_INT_TEST_ON 1 /* 内部测试电压开 */ -#define ADS1292R_INT_FREQ_DC 0 /* 直流，默认 */ -#define ADS1292R_INT_FREQ_AC 1 /* 1HZ方波 */ - -/* 属于ADS1292R_REG_LOFF的寄存器设置 */ - -/* 属于ADS1292R_REG_CH1SET，与ADS1292R_REG_CH2SET的寄存器设置 */ -#define ADS1292R_CHx_OFF 1 /* 禁止使用通道一 */ -#define ADS1292R_CHx_ON 0 /* 使用通道一，默认 */ - -#define ADS1292R_GAIN_6 0 /* 使用通道一6倍增益，默认 */ -#define ADS1292R_GAIN_1 1 /* 使用通道一1倍增益 */ -#define ADS1292R_GAIN_2 2 /* 使用通道一2倍增益 */ -#define ADS1292R_GAIN_3 3 /* 使用通道一3倍增益 */ -#define ADS1292R_GAIN_4 4 /* 使用通道一4倍增益 */ -#define ADS1292R_GAIN_8 5 /* 使用通道一8倍增益 */ -#define ADS1292R_GAIN_12 6 /* 使用通道一12倍增益 */ -/* 选择通道一的输入 */ -#define ADS1292R_CHx_INPUT_NORMAL 0 /* 正常电极输入，默认 */ -#define ADS1292R_CHx_INPUT_SHORTED 1 /* 短路，测偏执用 */ -#define ADS1292R_CHx_INPUT_RLD 2 /* 右腿驱动 */ -/* For channel 1, (MVDDP – MVDDN) is [0.5(AVDD + AVSS)]; for channel 2, (MVDDP – MVDDN) is DVDD / 4. */ -/* For channel 2,VDD / 2 for supply measurement */ -#define ADS1292R_CHx_INPUT_MVDD 3 -#define ADS1292R_CHx_INPUT_TEMP 4 /* 板载温度 */ -#define ADS1292R_CHx_INPUT_TEST 5 /* 内部测试信号 */ -#define ADS1292R_CHx_INPUT_RLDDRP 6 -#define ADS1292R_CHx_INPUT_RLDDRM 7 -#define ADS1292R_CHx_INPUT_RLDDRPM 8 -#define ADS1292R_CHx_INPUT_ROUTE 9 /* 连接到通道三 */ -#define ADS1292R_CHx_INPUT_RESERVED 10 /* 预留 */ - -/* 属于ADS1292R_REG_RLDSENS的寄存器设置 */ -#define ADS1292R_CHOP_FREQ_DIV4 3 /* PGA斩波频率未fMOD/4 */ -#define ADS1292R_PDB_RLD_OFF 0 /* 右腿驱动电源关，默认 */ -#define ADS1292R_PDB_RLD_ON 1 /* 右腿驱动电源开 */ -#define ADS1292R_PDB_RLD_SENSE_OFF 0 /* 右腿驱动导联脱落检测关，默认 */ -#define ADS1292R_PDB_RLD_SENSE_ON 1 /* 右腿驱动导联脱落检测开 */ -#define ADS1292R_RLD2N_OFF 0 /* 通道二负极为右腿输入关，默认 */ -#define ADS1292R_RLD2N_ON 1 /* 通道二负极为右腿输入开 */ -#define ADS1292R_RLD2P_OFF 0 /* 通道二正极为右腿输入关，默认 */ -#define ADS1292R_RLD2P_ON 1 /* 通道二正极为右腿输入开 */ -#define ADS1292R_RLD1N_OFF 0 /* 通道一负极为右腿输入关，默认 */ -#define ADS1292R_RLD1N_ON 1 /* 通道一负极为右腿输入开 */ -#define ADS1292R_RLD1P_OFF 0 /* 通道一正极为右腿输入关，默认 */ -#define ADS1292R_RLD1P_ON 1 /* 通道一正极为右腿输入开 */ - -/* 属于ADS1292R_REG_LOFFSENS的寄存器设置 */ -#define ADS1292R_FLIP2_OFF 0 /* 导联脱落检测通道二电流方向关，默认 */ -#define ADS1292R_FLIP2_ON 1 /* 导联脱落检测通道二电流方向开 */ -#define ADS1292R_FLIP1_OFF 0 /* 导联脱落检测通道一电流方向关，默认 */ -#define ADS1292R_FLIP1_ON 1 /* 导联脱落检测通道一电流方向开 */ -#define ADS1292R_LOFF2N_OFF 0 /* 通道二负极导联脱落检测关，默认 */ -#define ADS1292R_LOFF2N_ON 1 /* 通道二负极导联脱落检测开 */ -#define ADS1292R_LOFF2P_OFF 0 /* 通道二正极导联脱落检测关，默认 */ -#define ADS1292R_LOFF2P_ON 1 /* 通道二正极导联脱落检测开 */ -#define ADS1292R_LOFF1N_OFF 0 /* 通道一负极导联脱落检测关，默认 */ -#define ADS1292R_LOFF1N_ON 1 /* 通道一负极导联脱落检测开 */ -#define ADS1292R_LOFF1P_OFF 0 /* 通道一正极导联脱落检测关，默认 */ -#define ADS1292R_LOFF1P_ON 1 /* 通道一正极导联脱落检测开 */ - -/* 属于ADS1292R_REG_LOFFSTAT的寄存器设置 */ -#define ADS1292R_CLK_DIV4 0 /* 0 = fMOD = fCLK / 4 (default, use when fCLK = 512 kHz) */ -#define ADS1292R_CLK_DIV16 1 /* 1 = fMOD = fCLK / 16 (use when fCLK = 2.048 MHz) */ - -/* 属于ADS1292R_REG_RESP1的寄存器设置 */ -#define ADS1292R_DEMOD_EN1_OFF 0 /* 通道一上的呼吸解调电路关，默认 */ -#define ADS1292R_DEMOD_EN1_ON 1 /* 通道一上的呼吸解调电路开 */ -#define ADS1292R_DEMOD_EN_OFF 0 /* 通道一上的呼吸调制电路关，默认 */ -#define ADS1292R_DEMOD_EN_ON 1 /* 通道一上的呼吸调制电路开 */ -#define ADS1292R_RESPPH_0 0 /* 解调信号相位偏移0，默认 */ -#define ADS1292R_RESPPH_135 0x0c /* 解调信号相位偏移135度 */ -#define ADS1292R_RESP_CTRL_INT 0 /* 内部呼吸内部时钟，默认 */ -#define ADS1292R_RESP_CTRL_EXT 1 /* 内部呼吸外部时钟 */ - -/* 属于ADS1292R_REG_RESP2的寄存器设置 */ -#define ADS1292R_CALIB_ON_OFF 0 /* 校准关，默认 */ -#define ADS1292R_CALIB_ON_ON 1 /* 校准开 */ -#define ADS1292R_RESP_FREQ_36 0 /* 通道一上的呼吸调制电路关，默认 */ -#define ADS1292R_RESP_FREQ_64 1 /* 通道一上的呼吸调制电路开 */ -#define ADS1292R_RLDREF_EXT 0 /* 右腿驱动参考电压选择外部反馈，默认 */ -#define ADS1292R_RLDREF_INT 1 /* 右腿驱动参考电压选择内部信号 */ - -/* 属于ADS1292R_REG_GPIO的寄存器设置 */ -/** - * @} - */ - -/** @addtogroup ADS1292R_TYP_REG_MASK ADS1292R TYP Reg Mask - * @brief 各寄存器值与位置掩码，被ADS1292R_GET_BITS与ADS1292R_SET_BITS函数调用 - * @{ - */ -#define ADS1292R_ID_POS 0 -#define ADS1292R_ID_MASK 0xFF - -#define ADS1292R_SINGLE_SHOT_POS 7 -#define ADS1292R_SINGLE_SHOT_MASK 0x80 -#define ADS1292R_DR_POS 0 -#define ADS1292R_DR_MASK 0x07 - -#define ADS1292R_PDB_LOFF_COMP_POS 6 -#define ADS1292R_PDB_LOFF_COMP_MASK 0x40 -#define ADS1292R_PDB_REFBUF_POS 5 -#define ADS1292R_PDB_REFBUF_MASK 0x20 -#define ADS1292R_VREF_4V_POS 4 -#define ADS1292R_VREF_4V_MASK 0x10 -#define ADS1292R_CLK_EN_POS 3 -#define ADS1292R_CLK_EN_MASK 0x80 -#define ADS1292R_INT_TEST_POS 1 -#define ADS1292R_INT_TEST_MASK 0x02 -#define ADS1292R_INT_FREQ_POS 0 -#define ADS1292R_INT_FREQ_MASK 0x01 - -#define ADS1292R_PDx_POS 7 -#define ADS1292R_PDx_MASK 0x80 -#define ADS1292R_GAINx_POS 4 -#define ADS1292R_GAINx_MASK 0x70 -#define ADS1292R_MUXx_POS 0 -#define ADS1292R_MUXx_MASK 0x0F - -#define ADS1292R_CHOP_POS 6 -#define ADS1292R_CHOP_MASK 0xC0 -#define ADS1292R_PDB_RLD_POS 5 -#define ADS1292R_PDB_RLD_MASK 0x20 -#define ADS1292R_RLD_LOFF_SENSE_POS 4 -#define ADS1292R_RLD_LOFF_SENSE_MASK 0x10 -#define ADS1292R_RLD2N_POS 3 -#define ADS1292R_RLD2N_MASK 0x08 -#define ADS1292R_RLD2P_POS 2 -#define ADS1292R_RLD2P_MASK 0x04 -#define ADS1292R_RLD1N_POS 1 -#define ADS1292R_RLD1N_MASK 0x02 -#define ADS1292R_RLD1P_POS 0 -#define ADS1292R_RLD1P_MASK 0x01 - -#define ADS1292R_FLIP2_POS 5 -#define ADS1292R_FLIP2_MASK 0x20 -#define ADS1292R_FLIP1_POS 4 -#define ADS1292R_FLIP1_MASK 0x10 -#define ADS1292R_LOFF2N_POS 3 -#define ADS1292R_LOFF2N_MASK 0x08 -#define ADS1292R_LOFF2P_POS 2 -#define ADS1292R_LOFF2P_MASK 0x04 -#define ADS1292R_LOFFN_POS 1 -#define ADS1292R_LOFF1N_MASK 0x02 -#define ADS1292R_LOFF1P_POS 0 -#define ADS1292R_LOFF1P_MASK 0x01 - -#define ADS1292R_CLK_DIV_POS 6 -#define ADS1292R_CLK_DIV_MASK 0x40 - -#define ADS1292R_RESP_DEMOD_EN1_POS 7 -#define ADS1292R_RESP_DEMOD_EN1_MASK 0x80 -#define ADS1292R_RESP_MOD_EN_POS 6 -#define ADS1292R_RESP_MOD_EN_MASK 0x40 -#define ADS1292R_RESP_PH_POS 2 -#define ADS1292R_RESP_PH_MASK 0x3c -#define ADS1292R_RESP_CTRL_POS 0 -#define ADS1292R_RESP_CTRL_MASK 0x01 - -#define ADS1292R_CALIB_ON_POS 7 -#define ADS1292R_CALIB_ON_MASK 0x80 -#define ADS1292R_RESP_FREQ_POS 2 -#define ADS1292R_RESP_FREQ_MASK 0x04 -#define ADS1292R_RLDREF_INT_POS 1 -#define ADS1292R_RLDREF_INT_MASK 0x02 - -/** - * @} - */ - -/** @addtogroup ADS1292R_TYP_COMMAND ADS1292R TYP COMMAND - * @brief 命令 - * @{ - */ -/* System Commands */ -#define ADS1292R_COMMAND_WAKEUP 0x02 -#define ADS1292R_COMMAND_STANDBY 0x04 -#define ADS1292R_COMMAND_RESET 0x06 -#define ADS1292R_COMMAND_START 0x08 -#define ADS1292R_COMMAND_STOP 0x0A -#define ADS1292R_COMMAND_OFFSETCAL 0x1A - -/* Data Read Commands */ -#define ADS1292R_COMMAND_RDATAC 0x10 -#define ADS1292R_COMMAND_SDATAC 0x11 -#define ADS1292R_COMMAND_RDATA 0x12 - -/* Register Read Commands，最后5位为读写的地址 */ -#define ADS1292R_COMMAND_RREG 0x20 -#define ADS1292R_COMMAND_WREG 0x40 -/** - * @} - */ - -/** - * @} - */ - -/** - * @} - */ - -/* Exported macro ------------------------------------------------------------*/ -/** @brief 读取ADS1292R的指定寄存器的指定位 - * @details - * @param[in] bitname 位名字 - * @param[in] reg 寄存器名字 - * @retval 该位的值 - */ -#define ADS1292R_GET_BITS(bitname, reg) ((reg & bitname##_MASK) >> bitname##_POS) - -/** @brief 设置ADS1292R的指定寄存器的指定位 - * @details - * @param[in] reg 寄存器名字 - * @param[in] bitname 位名字 - * @param[in] val 要设置的值 - * @retval NONE - */ -#define ADS1292R_SET_BITS(reg, bitname, val) ((reg & ~bitname##_MASK) \ - | ((val << bitname##_POS) & bitname##_MASK)) -/* Exported functions --------------------------------------------------------*/ - - -/** - * @} - */ - -#ifdef __cplusplus -} -#endif - -#endif /* __ADS1292_TYP_H */ - - diff --git a/app/src/board/board_adc_module_ctrl.h b/app/src/board/board_adc_module_ctrl.h index 28b27a1..49d2dc3 100644 --- a/app/src/board/board_adc_module_ctrl.h +++ b/app/src/board/board_adc_module_ctrl.h @@ -3,7 +3,7 @@ #include #include -#include "board/board.h" +#include "aproject_config/config.h" #include "znordic.h" void BoardAdc_init(); diff --git a/app/src/board/board_battery_state.c b/app/src/board/board_battery_state.c index c4ac135..55e8ae9 100644 --- a/app/src/board/board_battery_state.c +++ b/app/src/board/board_battery_state.c @@ -1,7 +1,7 @@ #include "board_battery_state.h" -#include "app_event.h" +#include "basic_service/app_event.h" #include "board_adc_module_ctrl.h" /******************************************************************************* * Battery * diff --git a/app/src/board/board_battery_state.h b/app/src/board/board_battery_state.h index df44b76..54825c6 100644 --- a/app/src/board/board_battery_state.h +++ b/app/src/board/board_battery_state.h @@ -3,7 +3,7 @@ #include #include -#include "board/board.h" +#include "aproject_config/config.h" #include "znordic.h" void BoardBattery_init(); diff --git a/app/src/board/board_beep_ctrl.h b/app/src/board/board_beep_ctrl.h index 6aef541..70cc354 100644 --- a/app/src/board/board_beep_ctrl.h +++ b/app/src/board/board_beep_ctrl.h @@ -3,7 +3,7 @@ #include #include -#include "board/board.h" +#include "aproject_config/config.h" #include "znordic.h" typedef enum { diff --git a/app/src/board/board_ecg_sensor.c b/app/src/board/board_ecg_sensor.c index 0406900..48d19c0 100644 --- a/app/src/board/board_ecg_sensor.c +++ b/app/src/board/board_ecg_sensor.c @@ -1,7 +1,6 @@ #include "board_ecg_sensor.h" -#include "ads1291/ads1292r_typ.h" -#include "app_event_distribute.h" +#include "basic_service/app_event_distribute.h" #include "board_adc_module_ctrl.h" #if 0 @@ -64,7 +63,7 @@ int16_t BoardEcgSensor_set_sence_state() { } #endif - +#if 0 void BoardEcgSensor_load() {} void BoardEcgSensor_unload() {} @@ -167,12 +166,12 @@ uint8_t ads1292r_rw_reg(uint8_t cmd, uint8_t data) { return rx; } -#define port_delay_ms nrf_delay_ms -#define port_delay_us nrf_delay_us +#define port_delay_ms nrf_delay_ms +#define port_delay_us nrf_delay_us #define ADS1292_START_RESET() nrf_gpio_pin_clear(ADS1291_START_PIN) -#define ADS1292_START_SET() nrf_gpio_pin_set(ADS1291_START_PIN) -#define ADS1292_REST_RESET() nrf_gpio_pin_clear(ADS1291_PWDN_PIN) -#define ADS1292_REST_SET() nrf_gpio_pin_set(ADS1291_PWDN_PIN) +#define ADS1292_START_SET() nrf_gpio_pin_set(ADS1291_START_PIN) +#define ADS1292_REST_RESET() nrf_gpio_pin_clear(ADS1291_PWDN_PIN) +#define ADS1292_REST_SET() nrf_gpio_pin_set(ADS1291_PWDN_PIN) uint8_t ads1292r_send_cmd(uint8_t cmd) { uint8_t rx = 0; @@ -187,6 +186,7 @@ uint8_t ads1292r_send_cmd(uint8_t cmd) { return rx; } +void znrf_serial_tx(char const * p_buffer, size_t len); void BoardEcgSensor_init() { /** @@ -195,8 +195,6 @@ void BoardEcgSensor_init() { ads1291_init(); - - ADS1292_CS_SET(); ADS1292_REST_RESET(); @@ -214,11 +212,26 @@ void BoardEcgSensor_init() { nrf_gpio_pin_set(ADS1291_PWDN_PIN); nrf_delay_ms(2000); - + char txdata[]= {1,2,3,4}; while (true) /* 识别芯片型号，1291:0x52 */ { uint8_t id = ads1292r_rw_reg(ADS1292R_COMMAND_RREG | ADS1292R_REG_ID, 0); - ZLOGI("ads1292r id:%x", id); + znrf_serial_tx(txdata,4); + znordic_force_flush_log(); nrf_delay_ms(1000); } } + +#endif + +void BoardEcgSensor_init() {} +void BoardEcgSensor_load() {} +void BoardEcgSensor_unload() {} + +int16_t BoardEcgSensor_nlod_get_connected_state() { return 0; } +int16_t BoardEcgSensor_plod_get_connected_state() { return 0; } +int16_t BoardEcgSensor_plod_get_connected_state_after_filter() { return 0; } +int16_t BoardEcgSensor_plod_state_has_disconnected_ms() { return 0; } + +int16_t BoardEcgSensor_plod_get_ecg_val() { return 0; } +int16_t BoardEcgSensor_set_sence_state() { return 0; } diff --git a/app/src/board/board_ecg_sensor.h b/app/src/board/board_ecg_sensor.h index 9fbc59b..74ab33c 100644 --- a/app/src/board/board_ecg_sensor.h +++ b/app/src/board/board_ecg_sensor.h @@ -3,7 +3,7 @@ #include #include -#include "board/board.h" +#include "aproject_config/config.h" #include "znordic.h" void BoardEcgSensor_init(); diff --git a/app/src/board/board_eeprom_driver.c b/app/src/board/board_eeprom_driver.c index 30ce9da..e1948a5 100644 --- a/app/src/board/board_eeprom_driver.c +++ b/app/src/board/board_eeprom_driver.c @@ -14,8 +14,6 @@ #include "nrf_drv_wdt.h" #include "nrf_gpio.h" // -#include "basic/ssd1306/driver_ssd1306.h" -#include "basic/ssd1306/driver_ssd1306_basic.h" #define EEPROM_I2C_SCL_M 15 // I2C SCL引脚 #define EEPROM_I2C_SDA_M 17 // I2C SDA引脚 diff --git a/app/src/board/board_light_ctrl.c b/app/src/board/board_light_ctrl.c index 06c6a50..0bc64ea 100644 --- a/app/src/board/board_light_ctrl.c +++ b/app/src/board/board_light_ctrl.c @@ -1,6 +1,5 @@ #include "board_light_ctrl.h" - -#include "board.h" +#include "aproject_config/config.h" #include "znordic.h" #include "nrf_gpio.h" diff --git a/app/src/board/board_light_ctrl.h b/app/src/board/board_light_ctrl.h index f307f28..31ed0a4 100644 --- a/app/src/board/board_light_ctrl.h +++ b/app/src/board/board_light_ctrl.h @@ -3,7 +3,7 @@ #include #include -#include "board/board.h" +#include "aproject_config/config.h" typedef enum { kLightEffect_unset, diff --git a/app/src/board/board_ssd1306_interface.c b/app/src/board/board_ssd1306_interface.c index 8349517..f914fb6 100644 --- a/app/src/board/board_ssd1306_interface.c +++ b/app/src/board/board_ssd1306_interface.c @@ -2,7 +2,6 @@ #include -#include "basic/ssd1306/driver_ssd1306_interface.h" #include "znordic.h" // #include "app_timer.h" @@ -11,8 +10,9 @@ #include "nrf_delay.h" #include "nrf_gpio.h" // -#include "basic/ssd1306/driver_ssd1306.h" -#include "basic/ssd1306/driver_ssd1306_basic.h" +#include "ssd1306/driver_ssd1306.h" +#include "ssd1306/driver_ssd1306_basic.h" +#include "ssd1306/driver_ssd1306_interface.h" #define SCREEN_SPI_INSTANCE 0 #define SCREEN_RESET_PIN 20 diff --git a/app/src/board/board_ssd1306_interface.h b/app/src/board/board_ssd1306_interface.h index bb746db..bbb2c9b 100644 --- a/app/src/board/board_ssd1306_interface.h +++ b/app/src/board/board_ssd1306_interface.h @@ -6,6 +6,10 @@ #include #include "znordic.h" +#include "board/ssd1306/driver_ssd1306.h" +#include "board/ssd1306/driver_ssd1306_basic.h" +#include "board/ssd1306/wave_drawer.h" + void board_screen_init(); void board_screen_deinit(); diff --git a/app/src/basic/ssd1306/driver_ssd1306.c b/app/src/board/ssd1306/driver_ssd1306.c similarity index 100% rename from app/src/basic/ssd1306/driver_ssd1306.c rename to app/src/board/ssd1306/driver_ssd1306.c diff --git a/app/src/basic/ssd1306/driver_ssd1306.h b/app/src/board/ssd1306/driver_ssd1306.h similarity index 100% rename from app/src/basic/ssd1306/driver_ssd1306.h rename to app/src/board/ssd1306/driver_ssd1306.h diff --git a/app/src/basic/ssd1306/driver_ssd1306_basic.c b/app/src/board/ssd1306/driver_ssd1306_basic.c similarity index 100% rename from app/src/basic/ssd1306/driver_ssd1306_basic.c rename to app/src/board/ssd1306/driver_ssd1306_basic.c diff --git a/app/src/basic/ssd1306/driver_ssd1306_basic.h b/app/src/board/ssd1306/driver_ssd1306_basic.h similarity index 100% rename from app/src/basic/ssd1306/driver_ssd1306_basic.h rename to app/src/board/ssd1306/driver_ssd1306_basic.h diff --git a/app/src/basic/ssd1306/driver_ssd1306_font.h b/app/src/board/ssd1306/driver_ssd1306_font.h similarity index 100% rename from app/src/basic/ssd1306/driver_ssd1306_font.h rename to app/src/board/ssd1306/driver_ssd1306_font.h diff --git a/app/src/basic/ssd1306/driver_ssd1306_interface.h b/app/src/board/ssd1306/driver_ssd1306_interface.h similarity index 100% rename from app/src/basic/ssd1306/driver_ssd1306_interface.h rename to app/src/board/ssd1306/driver_ssd1306_interface.h diff --git a/app/src/basic/ssd1306/fontlib.c b/app/src/board/ssd1306/fontlib.c similarity index 100% rename from app/src/basic/ssd1306/fontlib.c rename to app/src/board/ssd1306/fontlib.c diff --git a/app/src/basic/ssd1306/fontlib.h b/app/src/board/ssd1306/fontlib.h similarity index 100% rename from app/src/basic/ssd1306/fontlib.h rename to app/src/board/ssd1306/fontlib.h diff --git a/app/src/basic/ssd1306/wave_drawer.c b/app/src/board/ssd1306/wave_drawer.c similarity index 100% rename from app/src/basic/ssd1306/wave_drawer.c rename to app/src/board/ssd1306/wave_drawer.c diff --git a/app/src/basic/ssd1306/wave_drawer.h b/app/src/board/ssd1306/wave_drawer.h similarity index 100% rename from app/src/basic/ssd1306/wave_drawer.h rename to app/src/board/ssd1306/wave_drawer.h diff --git a/app/src/config.h b/app/src/config.h deleted file mode 100644 index 3977535..0000000 --- a/app/src/config.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include "board/board.h" \ No newline at end of file diff --git a/app/src/device_controler.c b/app/src/device_controler.c deleted file mode 100644 index e69de29..0000000 diff --git a/app/src/device_controler.h b/app/src/device_controler.h deleted file mode 100644 index e69de29..0000000 diff --git a/app/src/display_manager_res.h b/app/src/display_manager_res.h deleted file mode 100644 index 15109eb..0000000 --- a/app/src/display_manager_res.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#include - - diff --git a/app/src/heart_ware_sample_data_mgr.h b/app/src/heart_ware_sample_data_mgr.h deleted file mode 100644 index 24a7e9b..0000000 --- a/app/src/heart_ware_sample_data_mgr.h +++ /dev/null @@ -1,9 +0,0 @@ -#pragma once -#include - -#include "app_event.h" -#include "app_event_distribute.h" -#include "nrfx_timer.h" - -void hwsd_mgr_push_one_frame(one_frame_t data); -void hwsd_mgr_reset_buffer(); \ No newline at end of file diff --git a/app/src/heart_wave_sample_data_pre_process.c b/app/src/heart_wave_sample_data_pre_process.c deleted file mode 100644 index 984b197..0000000 --- a/app/src/heart_wave_sample_data_pre_process.c +++ /dev/null @@ -1,107 +0,0 @@ -#include "heart_wave_sample_data_pre_process.h" - -/*********************************************************************************************************************** - * ALGO * - ***********************************************************************************************************************/ - -typedef struct { - float value; - float efectiveFactor; -} filter_t; - -typedef struct { - float coef[2]; - float v_out[2]; -} LPFilter; -#define PI 3.14159265358979323846f - -static float Filter(filter_t* filter, float newInput) { - float newv = ((float)filter->value * (1.0f - filter->efectiveFactor)) + ((float)newInput * filter->efectiveFactor); - filter->value = newv; - return newv; -} - -void LPFilter_Init(LPFilter* filter, float cutoffFreqHz, float sampleTimeS) { - float RC = 0.0; - RC = 1.0 / (2 * PI * cutoffFreqHz); - filter->coef[0] = sampleTimeS / (sampleTimeS + RC); - filter->coef[1] = RC / (sampleTimeS + RC); - - filter->v_out[0] = 0.0; - filter->v_out[1] = 0.0; -} - -float LPFilter_Update(LPFilter* filter, float v_in) { - filter->v_out[1] = filter->v_out[0]; - filter->v_out[0] = (filter->coef[0] * v_in) + (filter->coef[1] * filter->v_out[1]); - - return (filter->v_out[0]); -} - -/** - * @brief 放大显示数据 - * - * @param val - * @param valcener - * @param amp - * @return float - */ -static float amp_display_val(uint16_t val, uint16_t valcener, float amp) { - float valf = (float)val - valcener; - valf = valf * amp; - valf += valcener; - - if (valf >= 100) { - valf = 100; - } - - if (valf <= 0) { - valf = 0; - } - return valf; -} - -uint16_t getRecommendedMagnification() { - // return 0; - uint16_t max = QRS_getMaxValueLastVal(); - if (max == 0) { - return 15; - } - // 3750.0f - if (max <= (3750 / 2)) { - return 15; - } - float af = (3750 / 2) / (max - 3750 / 2); - if (af > 15) { - return 15; - } - return af; -} - -/*********************************************************************************************************************** - * VAR * - ***********************************************************************************************************************/ -static one_frame_t m_datacache; -static one_frame_t m_displaydata; -filter_t m_filter = {0, 0.8}; -LPFilter m_lpfilter_01; -LPFilter m_lpfilter_02; - -void hwsd_pre_processer_init() { QRS_resetBuf(); } -void hwsd_pre_processer_process(one_frame_t framdata) { // - m_datacache = framdata; - m_displaydata = framdata; - /******************************************************************************* - * 显示数据计算并赋值 * - *******************************************************************************/ - // QRS_getMaxValueLastVal(); - // float lowpassf_val = LPFilter_Update(&m_lpfilter_01, framdata); - // QRS_processData(lowpassf_val); - // float val_af100 = (float)lowpassf_val / 3750.0f * 100; // 参考电压为3.6v,但信号范围为3.3v - // val_af100 = amp_val(val_af100, 50, getRecommendedMagnification()); - // val_af100 = LPFilter_Update(&m_lpfilter_02, val_af100); - // m_displaydata = m_datacache; -} - -uint16_t hwsd_pre_processer_get_display_data() { return m_displaydata; } -one_frame_t hwsd_pre_processer_get_storage_data() { return m_datacache; } diff --git a/app/src/main.c b/app/src/main.c index a949336..d1e9149 100644 --- a/app/src/main.c +++ b/app/src/main.c @@ -6,10 +6,10 @@ #include #include // -#include "app_event.h" -#include "app_event_distribute.h" -#include "basic/device_version_info_mgr.h" -#include "board/board.h" +#include "basic_service/app_event.h" +#include "basic_service/app_event_distribute.h" +#include "basic_service/device_version_info_mgr.h" +#include "aproject_config/config.h" #include "zble_module.h" #include "zdatachannel_service.h" // diff --git a/app/src/one_conduction_main.c b/app/src/one_conduction_main.c index 26145f7..3352b45 100644 --- a/app/src/one_conduction_main.c +++ b/app/src/one_conduction_main.c @@ -1,19 +1,21 @@ #include -#include "app_event.h" -#include "app_event_distribute.h" -#include "basic/device_version_info_mgr.h" -#include "ble_cmd_process_service.h" +#include "basic_service/app_event.h" +#include "basic_service/app_event_distribute.h" +#include "basic_service/device_version_info_mgr.h" +// #include "board/board_adc_module_ctrl.h" #include "board/board_battery_state.h" #include "board/board_beep_ctrl.h" #include "board/board_ecg_sensor.h" #include "board/board_light_ctrl.h" #include "board/board_power_mgr.h" -#include "config.h" -#include "display_manager.h" -#include "heart_wave_sample_service.h" -#include "sample_data_manager.h" +// +#include "service/ble_cmd_processer/ble_cmd_process_service.h" +#include "service/display_mgr/display_manager.h" +#include "service/heart_wave_sample_service/heart_wave_sample_service.h" +#include "service/storage/storage_service.h" + #include "zble_module.h" #include "zdatachannel_service.h" #include "znordic.h" diff --git a/app/src/ble_cmd_process_service.c b/app/src/service/ble_cmd_processer/ble_cmd_process_service.c similarity index 98% rename from app/src/ble_cmd_process_service.c rename to app/src/service/ble_cmd_processer/ble_cmd_process_service.c index 23b039f..f6a97ff 100644 --- a/app/src/ble_cmd_process_service.c +++ b/app/src/service/ble_cmd_processer/ble_cmd_process_service.c @@ -1,13 +1,14 @@ #include "ble_cmd_process_service.h" -#include "../../ify_hrs_protocol/heart_rate_sensor_protocol.h" -#include "basic/device_version_info_mgr.h" -#include "board/board.h" +#include "aproject_config/config.h" +// +#include "ify_hrs_protocol/heart_rate_sensor_protocol.h" +// +#include "basic_service/device_version_info_mgr.h" #include "board/board_battery_state.h" #include "board/board_ecg_sensor.h" -#include "config.h" - -#include "sample_data_manager.h" +#include "service/storage/storage_service.h" +// #include "zble_module.h" #include "zdatachannel_service.h" diff --git a/app/src/ble_cmd_process_service.h b/app/src/service/ble_cmd_processer/ble_cmd_process_service.h similarity index 93% rename from app/src/ble_cmd_process_service.h rename to app/src/service/ble_cmd_processer/ble_cmd_process_service.h index 889044d..1b9658c 100644 --- a/app/src/ble_cmd_process_service.h +++ b/app/src/service/ble_cmd_processer/ble_cmd_process_service.h @@ -1,6 +1,6 @@ #pragma once -#include "device_state.h" +#include "basic_service/device_state.h" void ble_cmder_init(); void ble_cmder_uninit(); diff --git a/app/src/display_manager.c b/app/src/service/display_mgr/display_manager.c similarity index 99% rename from app/src/display_manager.c rename to app/src/service/display_mgr/display_manager.c index 34cd303..a886363 100644 --- a/app/src/display_manager.c +++ b/app/src/service/display_mgr/display_manager.c @@ -4,12 +4,9 @@ // #include -#include "basic/ssd1306/driver_ssd1306.h" -#include "basic/ssd1306/driver_ssd1306_basic.h" -#include "basic/ssd1306/wave_drawer.h" #include "board/board_battery_state.h" #include "board/board_ssd1306_interface.h" -#include "config.h" +#include "aproject_config/config.h" #include "font.h" PageState_t g_pageState; diff --git a/app/src/display_manager.h b/app/src/service/display_mgr/display_manager.h similarity index 100% rename from app/src/display_manager.h rename to app/src/service/display_mgr/display_manager.h diff --git a/app/src/font.h b/app/src/service/display_mgr/font.h similarity index 100% rename from app/src/font.h rename to app/src/service/display_mgr/font.h diff --git a/app/src/heart_ware_sample_data_mgr.c b/app/src/service/heart_wave_sample_service/heart_ware_sample_data_mgr.c similarity index 96% rename from app/src/heart_ware_sample_data_mgr.c rename to app/src/service/heart_wave_sample_service/heart_ware_sample_data_mgr.c index f28c7a0..0f6334c 100644 --- a/app/src/heart_ware_sample_data_mgr.c +++ b/app/src/service/heart_wave_sample_service/heart_ware_sample_data_mgr.c @@ -1,8 +1,6 @@ -#include "app_event.h" -#include "app_event_distribute.h" -#include "basic/qrs_time_domain_zh.h" +#include "basic_service/app_event.h" +#include "basic_service/app_event_distribute.h" #include "board/board_ecg_sensor.h" -#include "heart_wave_sample_service.h" #include "nrfx_timer.h" static uint32_t m_frame_index = 0; // 帧绝对序号 diff --git a/app/src/service/heart_wave_sample_service/heart_ware_sample_data_mgr.h b/app/src/service/heart_wave_sample_service/heart_ware_sample_data_mgr.h new file mode 100644 index 0000000..71c04f3 --- /dev/null +++ b/app/src/service/heart_wave_sample_service/heart_ware_sample_data_mgr.h @@ -0,0 +1,9 @@ +#pragma once +#include + +#include "basic_service/app_event.h" +#include "basic_service/app_event_distribute.h" +#include "nrfx_timer.h" + +void hwsd_mgr_push_one_frame(one_frame_t data); +void hwsd_mgr_reset_buffer(); \ No newline at end of file diff --git a/app/src/service/heart_wave_sample_service/heart_wave_sample_data_pre_process.c b/app/src/service/heart_wave_sample_service/heart_wave_sample_data_pre_process.c new file mode 100644 index 0000000..53b0497 --- /dev/null +++ b/app/src/service/heart_wave_sample_service/heart_wave_sample_data_pre_process.c @@ -0,0 +1,12 @@ +#include "heart_wave_sample_data_pre_process.h" +static one_frame_t m_datacache; +static one_frame_t m_displaydata; + +void hwsd_pre_processer_init() {} +void hwsd_pre_processer_process(one_frame_t framdata) { // + m_datacache = framdata; + m_displaydata = framdata; +} + +uint16_t hwsd_pre_processer_get_display_data() { return m_displaydata; } +one_frame_t hwsd_pre_processer_get_storage_data() { return m_datacache; } diff --git a/app/src/heart_wave_sample_data_pre_process.h b/app/src/service/heart_wave_sample_service/heart_wave_sample_data_pre_process.h similarity index 86% rename from app/src/heart_wave_sample_data_pre_process.h rename to app/src/service/heart_wave_sample_service/heart_wave_sample_data_pre_process.h index bb594e4..a188a77 100644 --- a/app/src/heart_wave_sample_data_pre_process.h +++ b/app/src/service/heart_wave_sample_service/heart_wave_sample_data_pre_process.h @@ -1,7 +1,7 @@ #pragma once #include -#include "app_event.h" +#include "basic_service/app_event.h" void hwsd_pre_processer_init(); void hwsd_pre_processer_process(one_frame_t framdata); diff --git a/app/src/heart_wave_sample_service.c b/app/src/service/heart_wave_sample_service/heart_wave_sample_service.c similarity index 95% rename from app/src/heart_wave_sample_service.c rename to app/src/service/heart_wave_sample_service/heart_wave_sample_service.c index bb65c00..e2e9dc3 100644 --- a/app/src/heart_wave_sample_service.c +++ b/app/src/service/heart_wave_sample_service/heart_wave_sample_service.c @@ -1,8 +1,7 @@ #include "heart_wave_sample_service.h" -#include "app_event.h" -#include "app_event_distribute.h" -#include "basic/qrs_time_domain_zh.h" +#include "basic_service/app_event.h" +#include "basic_service/app_event_distribute.h" #include "board/board_ecg_sensor.h" #include "heart_ware_sample_data_mgr.h" #include "heart_wave_sample_data_pre_process.h" @@ -79,6 +78,6 @@ float hwss_read_val(void) { return val; } float hwss_read_heart_rate(void) { // - return QRS_getHeartRate(); + return 0; } int hwss_has_captured_time_ms() { return (znordic_getpower_on_s() - m_start_capture_tp) * 1000; } diff --git a/app/src/heart_wave_sample_service.h b/app/src/service/heart_wave_sample_service/heart_wave_sample_service.h similarity index 100% rename from app/src/heart_wave_sample_service.h rename to app/src/service/heart_wave_sample_service/heart_wave_sample_service.h diff --git a/app/src/sample_data_manager.c b/app/src/service/storage/sample_data_manager.c similarity index 99% rename from app/src/sample_data_manager.c rename to app/src/service/storage/sample_data_manager.c index 04c5204..6e90080 100644 --- a/app/src/sample_data_manager.c +++ b/app/src/service/storage/sample_data_manager.c @@ -4,6 +4,7 @@ #include "zeeprom_fs.h" #include "znordic.h" +#include "aproject_config/config.h" static sample_data_fileinfo_t fileinfocache[MAX_FILE_NUM * 2]; static uint8_t fileinfocache_count = 0; diff --git a/app/src/sample_data_manager.h b/app/src/service/storage/sample_data_manager.h similarity index 97% rename from app/src/sample_data_manager.h rename to app/src/service/storage/sample_data_manager.h index 5c34fd1..3a70e22 100644 --- a/app/src/sample_data_manager.h +++ b/app/src/service/storage/sample_data_manager.h @@ -2,7 +2,7 @@ #include #include -#include "config.h" +#include "aproject_config/config.h" #include "zeeprom_fs.h" void sample_data_mgr_init(); diff --git a/app/src/service/storage/storage_service.h b/app/src/service/storage/storage_service.h new file mode 100644 index 0000000..895d343 --- /dev/null +++ b/app/src/service/storage/storage_service.h @@ -0,0 +1,3 @@ +#pragma once +#include "sample_data_manager.h" +#include "zeeprom_fs.h" diff --git a/app/src/zeeprom_fs.c b/app/src/service/storage/zeeprom_fs.c similarity index 100% rename from app/src/zeeprom_fs.c rename to app/src/service/storage/zeeprom_fs.c diff --git a/app/src/zeeprom_fs.h b/app/src/service/storage/zeeprom_fs.h similarity index 100% rename from app/src/zeeprom_fs.h rename to app/src/service/storage/zeeprom_fs.h diff --git a/app/src/basic/FIR.c b/bak/FIR.c similarity index 100% rename from app/src/basic/FIR.c rename to bak/FIR.c diff --git a/app/src/basic/FIR.h b/bak/FIR.h similarity index 100% rename from app/src/basic/FIR.h rename to bak/FIR.h diff --git a/app/src/basic/HC_Chen_detect.c b/bak/HC_Chen_detect.c similarity index 100% rename from app/src/basic/HC_Chen_detect.c rename to bak/HC_Chen_detect.c diff --git a/app/src/basic/HC_Chen_detect.h b/bak/HC_Chen_detect.h similarity index 100% rename from app/src/basic/HC_Chen_detect.h rename to bak/HC_Chen_detect.h diff --git a/app/src/basic/Pan_Tompkins_detect.c b/bak/Pan_Tompkins_detect.c similarity index 100% rename from app/src/basic/Pan_Tompkins_detect.c rename to bak/Pan_Tompkins_detect.c diff --git a/app/src/basic/Pan_Tompkins_detect.h b/bak/Pan_Tompkins_detect.h similarity index 100% rename from app/src/basic/Pan_Tompkins_detect.h rename to bak/Pan_Tompkins_detect.h diff --git a/app/src/basic/QRS.h b/bak/QRS.h similarity index 100% rename from app/src/basic/QRS.h rename to bak/QRS.h diff --git a/app/src/basic/So_Chen_detect.c b/bak/So_Chen_detect.c similarity index 100% rename from app/src/basic/So_Chen_detect.c rename to bak/So_Chen_detect.c diff --git a/app/src/basic/So_Chen_detect.h b/bak/So_Chen_detect.h similarity index 100% rename from app/src/basic/So_Chen_detect.h rename to bak/So_Chen_detect.h diff --git a/app/src/basic/adaptive_algorithm.c b/bak/adaptive_algorithm.c similarity index 100% rename from app/src/basic/adaptive_algorithm.c rename to bak/adaptive_algorithm.c diff --git a/app/src/basic/adaptive_algorithm.h b/bak/adaptive_algorithm.h similarity index 100% rename from app/src/basic/adaptive_algorithm.h rename to bak/adaptive_algorithm.h diff --git a/app/src/basic/qrs_time_domain_zh.c b/bak/qrs_time_domain_zh.c similarity index 100% rename from app/src/basic/qrs_time_domain_zh.c rename to bak/qrs_time_domain_zh.c diff --git a/app/src/basic/qrs_time_domain_zh.h b/bak/qrs_time_domain_zh.h similarity index 100% rename from app/src/basic/qrs_time_domain_zh.h rename to bak/qrs_time_domain_zh.h diff --git a/libznordic b/libznordic index c7adce2..6000f28 160000 --- a/libznordic +++ b/libznordic @@ -1 +1 @@ -Subproject commit c7adce2fba7f404c4076a440b520b733c70df89c +Subproject commit 6000f285863c7979f08800f2aa6de8db96c99df4 diff --git a/sdk b/sdk index 5d4b797..1d34e6a 160000 --- a/sdk +++ b/sdk @@ -1 +1 @@ -Subproject commit 5d4b7977455415a88f3a8bd62dc4213f1edc0b37 +Subproject commit 1d34e6ac316c27dc0e1149835d5f1ad53e074c88