From: DXY <1731678236@qq.com> Date: Sat, 11 May 2024 09:46:51 +0000 (+0800) Subject: Merge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into... X-Git-Tag: release_V1.2.70_20241020_135402~1108^2~12 X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=bd1987f17ac6f70d69afd901afe773722e0c37f2;p=mirrors%2FFD230.git Merge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into xts_origin --- bd1987f17ac6f70d69afd901afe773722e0c37f2 diff --cc code/sdk/application/wearable/service/ble_service/bleservice/bleService.c index 5a035fbc6,ef167b77a..bbe557fe7 --- a/code/sdk/application/wearable/service/ble_service/bleservice/bleService.c +++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleService.c @@@ -35,7 -35,8 +35,9 @@@ extern "C" #include "hidService.h" #include "factorytestService.h" #include "ppgBleService.h" +#include "build_version.h" + #include "custom_runtime.h" + // extern void bts_data_to_uuid_len2(uint16_t uuid_data, bt_uuid_t *out_uuid); // extern void bts_init_128bit_uuid(const bt_uuid_t *uuid); // #include "ble_hid_take_photo_server.h"