From: Caisking <3449750381@qq.com> Date: Fri, 19 Jul 2024 01:29:15 +0000 (+0800) Subject: Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... X-Git-Tag: release_V1.2.70_20241020_135402~702^2~34 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=ba6f09b5ac7f0ce49eac0354ccb678fe93e1a685;p=mirrors%2FFD230.git Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626 --- ba6f09b5ac7f0ce49eac0354ccb678fe93e1a685 diff --cc code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/galaxy.bin index f0f785531,879b868b5..04df3c9d5 --- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/galaxy.bin +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/galaxy.bin @@@ -1,3 -1,3 +1,3 @@@ version https://git-lfs.github.com/spec/v1 - oid sha256:09cf5e3dbf8523842d4418991516548ebb52fb12aabb1dcc92e53d821b017731 -oid sha256:d648fe0fbe7cad7403a186126eb04b8d3405fd6764a8d21448a8625129b9c28a --size 217079 ++oid sha256:6ba791c5dbbd887f5a7c468c55a3f7338732b618d27cfe0cc67b749a7c8e4464 ++size 277 diff --cc code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/satellite.bin index 21d246a52,5b9578574..62e59bcc8 --- 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 +1,3 @@@ version https://git-lfs.github.com/spec/v1 - oid sha256:87aa20f99c96a5e21c55012eab383770de14af8b301c9145d0d260ae9c33fab6 -oid sha256:080f0ca457c58d293efa8e4e195bb56ee4efc495d566afb8bce802969e8fc2a7 --size 1323490 ++oid sha256:8949ecd2b52899d0a7f7b973a3e72665dfd58278aefff789215ff7268469bd73 ++size 278 diff --cc tools/dial_converter_tool/instance/101/sport.xml index 7cf565887,63b0225bd..39d3d2f98 --- a/tools/dial_converter_tool/instance/101/sport.xml +++ b/tools/dial_converter_tool/instance/101/sport.xml @@@ -1,4 -1,4 +1,8 @@@ ++<<<<<<< HEAD + ++======= + ++>>>>>>> 48353ea12559c269a40dde792d2ad9f1d1e389c1 diff --cc tools/dial_converter_tool/instance/102/kaleidoscope.xml index 24927105e,1adacff27..f9d3d4f61 --- a/tools/dial_converter_tool/instance/102/kaleidoscope.xml +++ b/tools/dial_converter_tool/instance/102/kaleidoscope.xml @@@ -1,4 -1,4 +1,8 @@@ ++<<<<<<< HEAD + ++======= + ++>>>>>>> 48353ea12559c269a40dde792d2ad9f1d1e389c1 diff --cc tools/dial_converter_tool/instance/1028/KUMI.xml index 22a36743f,3b360fa3d..49710bc6b --- a/tools/dial_converter_tool/instance/1028/KUMI.xml +++ b/tools/dial_converter_tool/instance/1028/KUMI.xml @@@ -1,4 -1,4 +1,8 @@@ ++<<<<<<< HEAD + ++======= + ++>>>>>>> 48353ea12559c269a40dde792d2ad9f1d1e389c1 diff --cc tools/dial_converter_tool/instance/103/jellyfish.xml index 6055df057,a007adae6..9adab398a --- a/tools/dial_converter_tool/instance/103/jellyfish.xml +++ b/tools/dial_converter_tool/instance/103/jellyfish.xml @@@ -1,4 -1,4 +1,8 @@@ ++<<<<<<< HEAD + ++======= + ++>>>>>>> 48353ea12559c269a40dde792d2ad9f1d1e389c1 diff --cc tools/dial_converter_tool/instance/104/dog.xml index 0410875fe,6982d9aa5..4407eac3a --- a/tools/dial_converter_tool/instance/104/dog.xml +++ b/tools/dial_converter_tool/instance/104/dog.xml @@@ -1,4 -1,4 +1,8 @@@ ++<<<<<<< HEAD + ++======= + ++>>>>>>> 48353ea12559c269a40dde792d2ad9f1d1e389c1 diff --cc tools/dial_converter_tool/instance/105/kitty.xml index aefeb9258,c316dcf46..9779b74e3 --- a/tools/dial_converter_tool/instance/105/kitty.xml +++ b/tools/dial_converter_tool/instance/105/kitty.xml @@@ -1,12 -1,36 +1,50 @@@ ++<<<<<<< HEAD + + + + + + + + + + + ++======= + + + + + + + + + + + + + + ++>>>>>>> 48353ea12559c269a40dde792d2ad9f1d1e389c1 diff --cc tools/dial_converter_tool/instance/1052/classic.xml index c54d8a2cf,8004ede64..6029c8626 --- a/tools/dial_converter_tool/instance/1052/classic.xml +++ b/tools/dial_converter_tool/instance/1052/classic.xml @@@ -1,4 -1,4 +1,8 @@@ ++<<<<<<< HEAD + ++======= + ++>>>>>>> 48353ea12559c269a40dde792d2ad9f1d1e389c1 diff --cc tools/dial_converter_tool/instance/106/galaxy.xml index 7ff3eafd3,4c664fcc3..e87785798 --- a/tools/dial_converter_tool/instance/106/galaxy.xml +++ b/tools/dial_converter_tool/instance/106/galaxy.xml @@@ -1,4 -1,4 +1,8 @@@ ++<<<<<<< HEAD + ++======= + ++>>>>>>> 48353ea12559c269a40dde792d2ad9f1d1e389c1 diff --cc tools/dial_converter_tool/instance/107/geometry.xml index 68e5a9c29,a631c3865..aa182d994 --- a/tools/dial_converter_tool/instance/107/geometry.xml +++ b/tools/dial_converter_tool/instance/107/geometry.xml @@@ -1,4 -1,4 +1,8 @@@ ++<<<<<<< HEAD + ++======= + ++>>>>>>> 48353ea12559c269a40dde792d2ad9f1d1e389c1 diff --cc tools/dial_converter_tool/instance/108/maomao.xml index a6427516b,ab31a0583..ba4e9e7ff --- a/tools/dial_converter_tool/instance/108/maomao.xml +++ b/tools/dial_converter_tool/instance/108/maomao.xml @@@ -1,4 -1,4 +1,8 @@@ ++<<<<<<< HEAD + ++======= + ++>>>>>>> 48353ea12559c269a40dde792d2ad9f1d1e389c1 diff --cc tools/dial_converter_tool/instance/109/succulents.xml index b09820f57,bfb26e509..6f5c98009 --- a/tools/dial_converter_tool/instance/109/succulents.xml +++ b/tools/dial_converter_tool/instance/109/succulents.xml @@@ -1,4 -1,4 +1,8 @@@ ++<<<<<<< HEAD + ++======= + ++>>>>>>> 48353ea12559c269a40dde792d2ad9f1d1e389c1 diff --cc tools/dial_converter_tool/instance/110/spaceman.xml index 138f10897,f56d43500..d6c37649e --- a/tools/dial_converter_tool/instance/110/spaceman.xml +++ b/tools/dial_converter_tool/instance/110/spaceman.xml @@@ -1,4 -1,4 +1,8 @@@ ++<<<<<<< HEAD + ++======= + ++>>>>>>> 48353ea12559c269a40dde792d2ad9f1d1e389c1 diff --cc tools/dial_converter_tool/instance/111/satellite.xml index eeaf21821,9c9622bfb..d1c347a77 --- a/tools/dial_converter_tool/instance/111/satellite.xml +++ b/tools/dial_converter_tool/instance/111/satellite.xml @@@ -1,5 -1,5 +1,9 @@@ ++<<<<<<< HEAD + ++======= + ++>>>>>>> 48353ea12559c269a40dde792d2ad9f1d1e389c1