diff --git a/.gitmodules b/.gitmodules
index c421e80..50404d1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -12,4 +12,7 @@
url = zwsd@192.168.1.3:p_oximeter/oximeter_libznordic.git
[submodule "protocol"]
path = protocol
- url = zwsd@192.168.1.3:p_oximeter/oximeter_protocol.git
\ No newline at end of file
+ url = zwsd@192.168.1.3:p_oximeter/oximeter_protocol.git
+[submodule "oximeter_ble_server"]
+ path = oximeter_ble_server
+ url = zwsd@192.168.1.3:p_oximeter/oximeter_ble_server.git
diff --git a/.vscode/settings.json b/.vscode/settings.json
index ac9e849..6e445af 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -51,7 +51,7 @@
"app_sdcard.h": "c",
"diskio_blkdev.h": "c",
"three_conduction_main.h": "c",
- "one_conduction_main.h": "c",
+ "app_main.h": "c",
"one_conduction_board.h": "c",
"driver_ssd1306.h": "c",
"driver_ssd1306_font.h": "c",
@@ -218,7 +218,9 @@
"nrf_fstorage.h": "c",
"zdata_statistics.h": "c",
"iflytop_simple_filter.h": "c",
- "state.h": "c"
+ "state.h": "c",
+ "light_ctrl.h": "c",
+ "ble_data_processer_utils.h": "c"
},
"files.encoding": "gbk"
}
\ No newline at end of file
diff --git a/app/app.uvoptx b/app/app.uvoptx
index af01a7a..c8dff8b 100644
--- a/app/app.uvoptx
+++ b/app/app.uvoptx
@@ -398,8 +398,8 @@
0
0
0
- .\src\one_conduction_main.c
- one_conduction_main.c
+ .\src\app_main.c
+ app_main.c
0
0
diff --git a/app/app.uvprojx b/app/app.uvprojx
index 0991492..eeeb51a 100644
--- a/app/app.uvprojx
+++ b/app/app.uvprojx
@@ -394,9 +394,9 @@
.\src\main.c
- one_conduction_main.c
+ app_main.c
1
- .\src\one_conduction_main.c
+ .\src\app_main.c
zapp.c
@@ -4313,9 +4313,9 @@
.\src\main.c
- one_conduction_main.c
+ app_main.c
1
- .\src\one_conduction_main.c
+ .\src\app_main.c
zapp.c
diff --git a/app/src/app_basic_service/basic/event.h b/app/src/app_basic_service/basic/event.h
index 5d1deaa..586650d 100644
--- a/app/src/app_basic_service/basic/event.h
+++ b/app/src/app_basic_service/basic/event.h
@@ -3,7 +3,7 @@
#include
#include "aproject_config/config.h"
-#include "ify_hrs_protocol/heart_rate_sensor_protocol.h"
+#include "protocol/oximeter_ble_protocol.h"
#define ECG_DATA_REPORT_FRAME_NUM 50 // ecg每次上报的帧数
diff --git a/app/src/one_conduction_main.c b/app/src/app_main.c
similarity index 99%
rename from app/src/one_conduction_main.c
rename to app/src/app_main.c
index ddd53e2..355b10f 100644
--- a/app/src/one_conduction_main.c
+++ b/app/src/app_main.c
@@ -2,7 +2,7 @@
#include
#include "aproject_config/config.h"
-#include "ify_hrs_protocol/heart_rate_sensor_protocol.h"
+#include "protocol/oximeter_ble_protocol.h"
#include "zdatachannel_service.h"
//
#include "app_basic_service/device_version_info_mgr.h"
@@ -449,12 +449,12 @@ void on_state_change(state_machine_event_t event, device_state_t state) {
}
}
-void one_conduction_main() {
+void app_main() {
device_info_init();
sn_t sn;
device_info_read_sn(&sn);
- ZLOGI("one_conduction_main %s active:%d", sn.sn, device_info_get_active_flag());
+ ZLOGI("app_main %s active:%d", sn.sn, device_info_get_active_flag());
ZLOG_FLUSH();
zapp_ebus_reg_event_listener(on_zapp_ebus_event);
diff --git a/app/src/one_conduction_main.h b/app/src/app_main.h
similarity index 77%
rename from app/src/one_conduction_main.h
rename to app/src/app_main.h
index 2323c0c..4f960c8 100644
--- a/app/src/one_conduction_main.h
+++ b/app/src/app_main.h
@@ -1,5 +1,5 @@
#pragma once
#include
-void one_conduction_main();
+void app_main();
void one_conduction_process_rx_packet(uint8_t* rx, int len);
diff --git a/app/src/ble_data_processer_utils.c b/app/src/ble_data_processer_utils.c
index 5d40f89..ddd64d8 100644
--- a/app/src/ble_data_processer_utils.c
+++ b/app/src/ble_data_processer_utils.c
@@ -1,6 +1,6 @@
#include "ble_data_processer_utils.h"
-#include "ify_hrs_protocol/heart_rate_sensor_protocol.h"
+#include "protocol/oximeter_ble_protocol.h"
#include "zdatachannel_service.h"
static uint8_t _bletxbuf[BLE_MSG_BUF_SIZE];
diff --git a/app/src/ble_data_processer_utils.h b/app/src/ble_data_processer_utils.h
index d8bf726..d621437 100644
--- a/app/src/ble_data_processer_utils.h
+++ b/app/src/ble_data_processer_utils.h
@@ -2,7 +2,7 @@
#include
#include "app_basic_service/zapp.h"
-#include "ify_hrs_protocol/heart_rate_sensor_protocol.h"
+#include "protocol/oximeter_ble_protocol.h"
#define BLE_MSG_BUF_SIZE 255
extern uint8_t bletxbuf[];
diff --git a/app/src/main.c b/app/src/main.c
index 9af7164..0c7c7d1 100644
--- a/app/src/main.c
+++ b/app/src/main.c
@@ -10,7 +10,7 @@
#include "app_basic_service/zapp.h"
#include "zble_module.h"
#include "zdatachannel_service.h"
-#include "one_conduction_main.h"
+#include "app_main.h"
//
ZDATACHANNEL_DEF(m_zhrs, 2 /*优先级*/, 1 /*client num*/); // 蓝牙服务
/**
@@ -77,7 +77,7 @@ int main() {
/*******************************************************************************
* 设备控制服务初始化 *
*******************************************************************************/
- one_conduction_main();
+ app_main();
/*******************************************************************************
* LOOP *
*******************************************************************************/
diff --git a/oximeter_ble_server b/oximeter_ble_server
new file mode 160000
index 0000000..34a1c92
--- /dev/null
+++ b/oximeter_ble_server
@@ -0,0 +1 @@
+Subproject commit 34a1c922a7336ef7602e1aa54fb04334a3d7274a
diff --git a/protocol b/protocol
index 286f8bb..93ba9db 160000
--- a/protocol
+++ b/protocol
@@ -1 +1 @@
-Subproject commit 286f8bbe136357e72b72f7d3e2a5b0ad64e99710
+Subproject commit 93ba9dbc3fe99c97276ab9737a710911642dc2b8
diff --git a/scripter/build_app.bat b/scripter/build_app.bat
index eb65bbb..e68574e 100644
--- a/scripter/build_app.bat
+++ b/scripter/build_app.bat
@@ -3,11 +3,12 @@
@REM 编译app
call scripter\keil_build.bat app\app.uvprojx app\_build\app.hex
+md output
del output\app_whole.hex
del output\app.zip
-del output\one_lead_ecg_ads1291.zip
-del output\one_lead_ecg_ads1291.hex
+del output\oximeter_ble_client.zip
+del output\oximeter_ble_client.hex
@REM 检查是否编译成功
if not exist app\_build\app.hex (
@@ -59,5 +60,5 @@ del output\settings.hex
del output\app.hex
-copy /y output\app.zip output\one_lead_ecg_ads1291.zip
-copy /y output\app_whole.hex output\one_lead_ecg_ads1291.hex
+copy /y output\app.zip output\oximeter_ble_client.zip
+copy /y output\app_whole.hex output\oximeter_ble_client.hex
diff --git a/tools/one_lead_realtime_report_parser.cpp b/tools/one_lead_realtime_report_parser.cpp
deleted file mode 100644
index 5b7910f..0000000
--- a/tools/one_lead_realtime_report_parser.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-
-#include
-#include
-#include
-#include
-#include