Merge #126 into xts_origin from refs/changes/126/head 127/target/1 128/target/1
author胡传军 <1224667075@qq.com>
Mon, 6 May 2024 06:55:24 +0000 (06:55 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Mon, 6 May 2024 06:55:24 +0000 (06:55 +0000)
commitbdabc2a003c2672618e019185b8738adbf5e1e86
tree7770b52ba3f61f5abbf50815c3958a52533bf66c
parentee8a2b07738562cbea65a387bedc9441c35c0f1c
Merge #126 into xts_origin from refs/changes/126/head

Code review from 胡传军

* refs/changes/126/head: (6 commits squashed)

  - 将strtok改为strtok_r

  - Merge branch &#39;xts_origin&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

  - 基础训练记录同步

  - Merge branch &#39;xts_origin&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

  - Merge branch &#39;xts_origin&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

  - 增加蓝牙设置闹钟和获取闹钟

Signed-off-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/126
code/sdk/application/wearable/service/ble_service/blemoder/CMakeLists.txt
code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp
code/sdk/application/wearable/service/ble_service/blemoder/bletest.h
code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c