Merge #868 into sdk602patch0626 from refs/changes/868/head
author彭磊 <1624952103@qq.com>
Wed, 4 Sep 2024 13:18:16 +0000 (13:18 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Wed, 4 Sep 2024 13:18:16 +0000 (13:18 +0000)
commitacbb5513afd395e6f392525fef5c62e066bcecec
treecddbd2d3e3a5e8b338a62904ef6ec504b815dc42
parent6a27c39e455eac48e8513e8e1eafbce55b064a45
Merge #868 into sdk602patch0626 from refs/changes/868/head

Code review from 彭磊

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

  - 修复BUG #551 &quot;运动,放桌子上不动,卡路里会增加&quot;

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

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

  - 修复BUG &quot;天气 JSON解析错误 导致系统开机死机&quot;

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

  - 适配 DS_ZB25LQ128C_HRT NORFLASH

Signed-off-by: aliyun6865282430 <1624952103@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/868
code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
code/sdk/include/driver/flash/flash_common_config.h
code/sdk/include/driver/flash/flash_config_info.h
code/sdk/include/driver/flash/flash_others_config.h