diff --git a/.vscode/settings.json b/.vscode/settings.json index 5464c10..13e620d 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -108,7 +108,8 @@ "nrf_soc.h": "c", "sample_data_manager_service.h": "c", "app_event.h": "c", - "compiler_abstraction.h": "c" + "compiler_abstraction.h": "c", + "ble_nus_c.h": "c" }, "files.encoding": "gbk" } \ No newline at end of file diff --git a/README.md b/README.md index 0f8eb9e..6e6cd79 100644 --- a/README.md +++ b/README.md @@ -2,11 +2,27 @@ ``` -1. 编译bootloader,编译完成后会自动将bootloader.bin拷贝导 ./bootloader/release/目录下/ +# TODO: + 1. 修改蓝牙测试Server程序,测试程序蓝牙名称过滤标志为 iflytop_ble_test_device + 2. 修改蓝牙名称生成规则,规则为,当device_id为0或者全F,蓝牙名称为iflytop_ble_test_device,否则蓝牙名称为产品SN码 + 3. 修改电量检测,电量过低时,指示灯闪烁三下后进入低功耗。 + 3. 电量过低上报低电量事件。电量不足%1时,设备自动断开连接,并关机。 + 4. 设备充电时候,不允许采集。 + 5. 修正回执包错误码 + 6. 心率采集改成由IO中断驱动。 + 7. 开机,蜂鸣器响一声,开始采集,蜂鸣器响一声,结束采集,蜂鸣器响一声。 + 8. 添加心跳检测,1分钟内没有收到心跳包,设备自动断开蓝牙连接。 + 9. 设备断开连接后,停止采集(临时代码) + 10. 添加一条新的开始采集指令,支持定时参数。(或者使用旧的开始采集指令) + 11. 导联断开检测触发后,上报事件(不停止采集),蜂鸣器响三声。 -2. 编译并烧录测试程序(测试程序无bootloader) -3. 编译并烧录应用程序(含bootloader),同时打包好升级的zip +``` + + +``` +规范: + 寄存器(NRF_UICR->CUSTOMER[0],0x10001080) 用于存储设备ID,当设备ID为FFFFFFFF或者0时,表明当前设备为测试程序 ``` \ No newline at end of file diff --git a/app/src/board/board.h b/app/src/board/board.h index 005cf65..8a97ae2 100644 --- a/app/src/board/board.h +++ b/app/src/board/board.h @@ -40,12 +40,14 @@ /******************************************************************************* * 按键 * *******************************************************************************/ -#define BUTTON_PIN 18 +// #define BUTTON_PIN 18 +#define BUTTON_PIN 0 /******************************************************************************* * 蜂鸣器 * *******************************************************************************/ -#define BEEP_PIN 0 +// #define BEEP_PIN 0 +#define BEEP_PIN 18 /******************************************************************************* * 电池电量 * diff --git a/scripter/README.md b/scripter/README.md new file mode 100644 index 0000000..2f90789 --- /dev/null +++ b/scripter/README.md @@ -0,0 +1,3 @@ +nrfjprog --recover +nrfjprog --eraseall -f NRF52 +nrfjprog -f nrf52 --memwr 0x10001208 --val 0x0000005A \ No newline at end of file diff --git a/scripter/build_app.bat b/scripter/build_app.bat index e37f02f..a5a5799 100644 --- a/scripter/build_app.bat +++ b/scripter/build_app.bat @@ -60,7 +60,7 @@ if %errorlevel% neq 0 ( echo EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE exit /b 1 ) -nrfjprog --program app_whole.hex --verify -f NRF52 %烧录% +nrfjprog --program output/app_whole.hex --verify -f NRF52 %烧录% if %errorlevel% neq 0 ( echo EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE echo E 烧录失败 E diff --git a/scripter/unlock.bat b/scripter/unlock.bat new file mode 100644 index 0000000..2f90789 --- /dev/null +++ b/scripter/unlock.bat @@ -0,0 +1,3 @@ +nrfjprog --recover +nrfjprog --eraseall -f NRF52 +nrfjprog -f nrf52 --memwr 0x10001208 --val 0x0000005A \ No newline at end of file diff --git a/sdk b/sdk index 80adec4..ae45a16 160000 --- a/sdk +++ b/sdk @@ -1 +1 @@ -Subproject commit 80adec4d07ebd578ef632efb8a4145dce0eb4adb +Subproject commit ae45a16c26284c5ac8495ae6838d96cf386deb8e