Merge #984 into sdk602patch0626 from refs/changes/984/head 985/target/1 986/target/1 987/target/1
author彭磊 <1624952103@qq.com>
Wed, 18 Sep 2024 09:52:53 +0000 (09:52 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Wed, 18 Sep 2024 09:52:53 +0000 (09:52 +0000)
commit99d95b3f893b6d0710fd1b81b258f01dc3620125
tree51eb88170af639aea658ed67bb11b009aaca8110
parent8ad4e3c10d3983cc3e9d9b86884763504fa4c644
Merge #984 into sdk602patch0626 from refs/changes/984/head

Code review from 彭磊

* refs/changes/984/head: (5 commits squashed)

  - 修复g_chipinfo_map映射关系填写错误BUG

  - 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

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

  - 重新打开宏“CYWEE_MAC_ACTIVE” ,修复回退导致的BUG 优。化cywee开机读取密钥

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/984
code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepModel.cpp
code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
code/sdk/build/config/target_config/brandy/config.py
code/sdk/drivers/peripheral/cywee/src/main_dml.c
code/sdk/drivers/peripheral/utils/custom_utils.c
code/sdk/drivers/peripheral/utils/custom_utils.h