From: 袁清梦 <3449750381@qq.com> Date: Wed, 16 Oct 2024 09:08:41 +0000 (+0000) Subject: Merge #1195 into sdk602patch0911 from refs/changes/1195/head X-Git-Tag: release_V1.2.70_20241020_135402~33^2 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=08085c238c90b5256165571d332f719b9862f27c;p=mirrors%2FFD230.git Merge #1195 into sdk602patch0911 from refs/changes/1195/head Code review from 袁清梦 * refs/changes/1195/head: (17 commits squashed) - 训练:优化配速表心率表的存储 - 表盘:水母表盘更新 - 表盘:小狗表盘更新 - 表盘;小猫表盘更新 - 表盘:星空表盘更新 - 表盘:绿叶表盘更新 - 表盘:宇航员表盘更新 - 表盘:卫星表盘更新 - 表盘:飞鸟表盘更新 - 表盘:更新晨曦智影与镜影行者 - 表盘:自定义表盘电池坐标优化 - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911 - 心率:修改心率检测增加最多60秒长亮屏。测量出来正常息屏。 - 系统:修改数字英语的字符串使用默认语言,防止其他语言显示异常;修改部分未适配字符串显示默认中文,防止切换语言消失字符 - 表盘:优化运动表盘 - 系统:更新默认表盘 - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911 Signed-off-by: Caisking <3449750381@qq.com> Reviewed-by: snickersun@163.com Merged-by: snickersun@163.com CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1195 --- diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/birdie.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/birdie.bin index f9fdfab46..ba927c9c5 100644 --- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/birdie.bin +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/birdie.bin @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5509eb40b25f2839bff6dd4496ae740308e17e12c36cd470db502ca0ac8dcbcb -size 1523772 +oid sha256:e33ef37d83f48fca4a1500e8a59b6b5d0f8b3ee708b813cc4ed6262c60f8a97b +size 1523474 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/satellite.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/satellite.bin index 49ac2ea86..3007ad890 100644 --- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/satellite.bin +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/satellite.bin @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:690bfc69798ef34fff6a24cf66999755987d6597b4983d2cd91aa2c27a99b911 -size 1316336 +oid sha256:5aa7ae09ae15f81dcb695f3e5ff627c2c5876893c7f8cee1590b7bd4acfd064f +size 1316038