From: Caisking <3449750381@qq.com> Date: Mon, 27 Nov 2023 09:06:28 +0000 (+0800) Subject: Signed-off-by X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=fa39815bd1bddf0b8e4972e3658ebe81db78e652;p=mirrors%2FFD230.git Signed-off-by --- diff --git a/.deveco/build/brandy/.sconsign38.db.dblite b/.deveco/build/brandy/.sconsign38.db.dblite index bc7c677bc..2dcaf6f90 100644 Binary files a/.deveco/build/brandy/.sconsign38.db.dblite and b/.deveco/build/brandy/.sconsign38.db.dblite differ diff --git a/.deveco/build/project.checksum b/.deveco/build/project.checksum index e170014dd..5896277a0 100644 --- a/.deveco/build/project.checksum +++ b/.deveco/build/project.checksum @@ -1 +1 @@ -5ffc4a57daf22835d2856aed71e3023a8c64c0ab \ No newline at end of file +f2359666e745968bd5d77debdb76b566c2befa1b \ No newline at end of file diff --git a/.deveco/burntool/fwpkgPath.ini b/.deveco/burntool/fwpkgPath.ini index 9908f7db6..be074e967 100644 --- a/.deveco/burntool/fwpkgPath.ini +++ b/.deveco/burntool/fwpkgPath.ini @@ -1 +1 @@ -D:\work\haisi\FD230\code\sdk\tools\pkg\fwpkg\brandy\upload_app.fwpkg \ No newline at end of file +C:\Users\caiking\project\1.haisi\FD230\code\sdk\tools\pkg\fwpkg\brandy\upload_app.fwpkg \ No newline at end of file diff --git a/.deveco/burntool/historyConfig.ini b/.deveco/burntool/historyConfig.ini index 1c568c547..010d5a3df 100644 --- a/.deveco/burntool/historyConfig.ini +++ b/.deveco/burntool/historyConfig.ini @@ -1 +1 @@ -{"serialPortValue":"COM7","baudRateValue":"1000000","stopBitValue":"0","verifyTypeValue":"0"} \ No newline at end of file +{"serialPortValue":"COM8","baudRateValue":"1000000","stopBitValue":"0","verifyTypeValue":"0"} \ No newline at end of file diff --git a/.deveco/deveco.ini b/.deveco/deveco.ini index 611ad21de..5f9e738fc 100644 --- a/.deveco/deveco.ini +++ b/.deveco/deveco.ini @@ -32,7 +32,7 @@ debug_device = CPU CORE|RISC-V|RISC-V monitor_port = monitor_speed = 115200 analysis_compiler_path = ./software/code/sdk/tools/bin/compiler/linx/linx_170/linx-llvm-binary-debug/linx-llvm-binary-release-win-musl/bin/riscv32 -compiler_bin_path = D:\tool\DevTools_CFBB_V1.0.6 +compiler_bin_path = C:\Users\caiking\my_app\DevTools_CFBB_V1.0.6 custom_build_command = brandy-native-js -release -nhso analysis_rec_stats = 1 analysis_mode = 0 @@ -43,3 +43,4 @@ partition_env = brandy partition_type = app partition_board = brandy partition_platform = cfbb +partition_bin = C:\Users\caiking\project\1.haisi\FD230\code\sdk\tools\pkg\fwpkg\brandy\upload_app.fwpkg diff --git a/.vscode/launch.json b/.vscode/launch.json index f44192071..ce6273769 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -9,7 +9,7 @@ "servertype": "jlink", "name": "brandy: DevEco GDB Launch", "executable": "C:/Users/caiking/project/1.haisi/FD230/./software/code/sdk/output/brandy/acore/brandy-liteos/application.elf", - "toolchainBinDir": "", + "toolchainBinDir": "C:/Users/caiking/my_app/DevTools_CFBB_V1.0.6/cc_riscv32_win_env", "projectEnvName": "brandy", "coreDir": "C:/Users/caiking/my_app/DevEco-Device-Tool/core", "preLaunchTask": "deveco: run debug server - brandy", @@ -22,7 +22,7 @@ "servertype": "jlink", "name": "brandy: DevEco GDB Attach", "executable": "C:/Users/caiking/project/1.haisi/FD230/./software/code/sdk/output/brandy/acore/brandy-liteos/application.elf", - "toolchainBinDir": "", + "toolchainBinDir": "C:/Users/caiking/my_app/DevTools_CFBB_V1.0.6/cc_riscv32_win_env", "projectEnvName": "brandy", "coreDir": "C:/Users/caiking/my_app/DevEco-Device-Tool/core", "preLaunchTask": "deveco: run debug server - brandy", diff --git a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_api.a b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_api.a index f7b7b4756..416d4b510 100644 Binary files a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_api.a and b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_api.a differ diff --git a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_core.a b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_core.a index 735273d1d..669a0ce20 100644 Binary files a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_core.a and b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_core.a differ diff --git a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_drv.a b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_drv.a index 08f396b2b..ab26d0f63 100644 Binary files a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_drv.a and b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_drv.a differ diff --git a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_sample.a b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_sample.a index ee2825064..021f35a0d 100644 Binary files a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_sample.a and b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_sample.a differ diff --git a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_vendor.a b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_vendor.a index 71ac4cd90..bfbd65a99 100644 Binary files a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_vendor.a and b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_vendor.a differ diff --git a/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_brandy_sample.a b/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_brandy_sample.a index cdfdabde5..c372a31d4 100644 Binary files a/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_brandy_sample.a and b/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_brandy_sample.a differ diff --git a/code/sdk/interim_binary/brandy/libs/gpu/evb_standard/libgpu.a b/code/sdk/interim_binary/brandy/libs/gpu/evb_standard/libgpu.a index eaf693b2a..82fb8131b 100644 Binary files a/code/sdk/interim_binary/brandy/libs/gpu/evb_standard/libgpu.a and b/code/sdk/interim_binary/brandy/libs/gpu/evb_standard/libgpu.a differ diff --git a/code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_audio_captuer.a b/code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_audio_captuer.a index 3334de6aa..f14dafe3e 100644 Binary files a/code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_audio_captuer.a and b/code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_audio_captuer.a differ diff --git a/code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_player.a b/code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_player.a index 340c06d3f..f8f7b3a14 100644 Binary files a/code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_player.a and b/code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_player.a differ diff --git a/code/sdk/tools/pkg/fwpkg/brandy/tempFiles/application.bin b/code/sdk/tools/pkg/fwpkg/brandy/tempFiles/application.bin index 4f6ab0298..96471036b 100644 Binary files a/code/sdk/tools/pkg/fwpkg/brandy/tempFiles/application.bin and b/code/sdk/tools/pkg/fwpkg/brandy/tempFiles/application.bin differ