From: luozheng <1732036298@qq.com> Date: Mon, 24 Mar 2025 09:06:54 +0000 (+0800) Subject: Merge branch 'sdk650' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... X-Git-Tag: leiniao_debug_1.0.0_20250922_020716~408 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F1700%2F1;p=mirrors%2FFD230.git Merge branch 'sdk650' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk650 --- 054e510e21bb798b93cb4a683dc6695527d6a068 diff --cc code/sdk/application/audio/sample_audio_api.h index afdd3d9dd,8d8b6be3e..afdd3d9dd mode 100755,100644..100644 --- a/code/sdk/application/audio/sample_audio_api.h +++ b/code/sdk/application/audio/sample_audio_api.h diff --cc code/sdk/build/config/target_config/brandy/config.py index 8c4257fee,0b51bc144..8c4257fee mode 100755,100644..100644 --- a/code/sdk/build/config/target_config/brandy/config.py +++ b/code/sdk/build/config/target_config/brandy/config.py diff --cc code/sdk/drivers/drivers/driver/audio/source/core/common/include/audio_debug.h index 59dd61497,df78e904f..59dd61497 mode 100755,100644..100644 --- a/code/sdk/drivers/drivers/driver/audio/source/core/common/include/audio_debug.h +++ b/code/sdk/drivers/drivers/driver/audio/source/core/common/include/audio_debug.h diff --cc code/sdk/middleware/chips/brandy/nv/nv_config/include/common.h index 2f3fc7d97,5c13a49a4..2f3fc7d97 mode 100755,100644..100644 --- a/code/sdk/middleware/chips/brandy/nv/nv_config/include/common.h +++ b/code/sdk/middleware/chips/brandy/nv/nv_config/include/common.h diff --cc code/sdk/middleware/chips/brandy/nv/nv_config/include/key_id.h index 266871d66,295291945..266871d66 mode 100755,100644..100644 --- a/code/sdk/middleware/chips/brandy/nv/nv_config/include/key_id.h +++ b/code/sdk/middleware/chips/brandy/nv/nv_config/include/key_id.h diff --cc code/sdk/open_source/7-zip-lzma-sdk/lzma_21.07/C/7zFile.h index a06afbf19,c7a30fc2b..a06afbf19 mode 100755,100644..100644 --- a/code/sdk/open_source/7-zip-lzma-sdk/lzma_21.07/C/7zFile.h +++ b/code/sdk/open_source/7-zip-lzma-sdk/lzma_21.07/C/7zFile.h diff --cc code/sdk/zhihui/config/include/ConfigModel.h index 87d229f4a,602d6ea17..87d229f4a mode 100755,100644..100644 --- a/code/sdk/zhihui/config/include/ConfigModel.h +++ b/code/sdk/zhihui/config/include/ConfigModel.h diff --cc code/sdk/zhihui/config/src/ConfigModel.cpp index 6708317c7,575499947..6708317c7 mode 100755,100644..100644 --- a/code/sdk/zhihui/config/src/ConfigModel.cpp +++ b/code/sdk/zhihui/config/src/ConfigModel.cpp diff --cc code/sdk/zhihui/utils/custom_cmd_service.c index 921e1fafd,9ccffd351..921e1fafd mode 100755,100644..100644 --- a/code/sdk/zhihui/utils/custom_cmd_service.c +++ b/code/sdk/zhihui/utils/custom_cmd_service.c diff --cc code/sdk/zhihui/utils/custom_fileoperate_service.c index 16f8142f3,47e98d635..16f8142f3 mode 100755,100644..100644 --- a/code/sdk/zhihui/utils/custom_fileoperate_service.c +++ b/code/sdk/zhihui/utils/custom_fileoperate_service.c diff --cc code/sdk/zhihui/utils/custom_runtime.c index 90d316f5f,04e1656b8..90d316f5f mode 100755,100644..100644 --- a/code/sdk/zhihui/utils/custom_runtime.c +++ b/code/sdk/zhihui/utils/custom_runtime.c diff --cc code/sdk/zhihui/utils/custom_save_runtime.c index ce43b9bf4,603373e67..ce43b9bf4 mode 100755,100644..100644 --- a/code/sdk/zhihui/utils/custom_save_runtime.c +++ b/code/sdk/zhihui/utils/custom_save_runtime.c diff --cc code/sdk/zhihui/utils/custom_utils.c index 1dbfc5420,984e50a11..1dbfc5420 mode 100755,100644..100644 --- a/code/sdk/zhihui/utils/custom_utils.c +++ b/code/sdk/zhihui/utils/custom_utils.c diff --cc code/sdk/zhihui/utils/custom_utils.h index 1e6777601,ed203beca..1e6777601 mode 100755,100644..100644 --- a/code/sdk/zhihui/utils/custom_utils.h +++ b/code/sdk/zhihui/utils/custom_utils.h diff --cc code/sdk/zhihui/utils/custom_utils_at_cmd.c index f1ec472a0,a2fb652d4..f1ec472a0 mode 100755,100644..100644 --- a/code/sdk/zhihui/utils/custom_utils_at_cmd.c +++ b/code/sdk/zhihui/utils/custom_utils_at_cmd.c diff --cc code/sdk/zhihui/utilscpp/7zFile.cpp index d3eb17dcd,e486901e3..d3eb17dcd mode 100755,100644..100644 --- a/code/sdk/zhihui/utilscpp/7zFile.cpp +++ b/code/sdk/zhihui/utilscpp/7zFile.cpp