From: 罗正yun <1732036298@qq.com> Date: Wed, 29 Nov 2023 07:03:03 +0000 (+0800) Subject: 1 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=abd508ceba775c03fe27e3742edc11f5c2c7fda7;p=mirrors%2FFD230.git 1 --- diff --git a/.deveco/build/brandy/.sconsign38.db.dblite b/.deveco/build/brandy/.sconsign38.db.dblite index 2dcaf6f90..bc7c677bc 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 5896277a0..d0d65e120 100644 --- a/.deveco/build/project.checksum +++ b/.deveco/build/project.checksum @@ -1 +1 @@ -f2359666e745968bd5d77debdb76b566c2befa1b \ No newline at end of file +843d73a9ef1154620ba70713e9615fe407b565d7 \ No newline at end of file diff --git a/.deveco/burntool/fwpkgPath.ini b/.deveco/burntool/fwpkgPath.ini index be074e967..9908f7db6 100644 --- a/.deveco/burntool/fwpkgPath.ini +++ b/.deveco/burntool/fwpkgPath.ini @@ -1 +1 @@ -C:\Users\caiking\project\1.haisi\FD230\code\sdk\tools\pkg\fwpkg\brandy\upload_app.fwpkg \ No newline at end of file +D:\work\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 b27f42a6d..1c568c547 100644 --- a/.deveco/burntool/historyConfig.ini +++ b/.deveco/burntool/historyConfig.ini @@ -1 +1 @@ -{"serialPortValue":"COM6","baudRateValue":"1000000","stopBitValue":"0","verifyTypeValue":"0"} \ No newline at end of file +{"serialPortValue":"COM7","baudRateValue":"1000000","stopBitValue":"0","verifyTypeValue":"0"} \ No newline at end of file diff --git a/.deveco/deveco.ini b/.deveco/deveco.ini index 5f9e738fc..21fd85532 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 = C:\Users\caiking\my_app\DevTools_CFBB_V1.0.6 +compiler_bin_path = D:\tool\DevTools_CFBB_V1.0.6 custom_build_command = brandy-native-js -release -nhso analysis_rec_stats = 1 analysis_mode = 0 diff --git a/.vscode/launch.json b/.vscode/launch.json index ce6273769..a545150f8 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -8,10 +8,10 @@ "DevEcoDebugInitPath": "${workspaceRoot}/.deveco/.debug-cache/brandy", "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": "C:/Users/caiking/my_app/DevTools_CFBB_V1.0.6/cc_riscv32_win_env", + "executable": "D:/work/haisi/FD230/./software/code/sdk/output/brandy/acore/brandy-liteos/application.elf", + "toolchainBinDir": "D:/tool/DevTools_CFBB_V1.0.6/cc_riscv32_win_env", "projectEnvName": "brandy", - "coreDir": "C:/Users/caiking/my_app/DevEco-Device-Tool/core", + "coreDir": "D:/tool/DevEco-Device-Tool/core", "preLaunchTask": "deveco: run debug server - brandy", "internalConsoleOptions": "openOnSessionStart" }, @@ -21,10 +21,10 @@ "DevEcoDebugInitPath": "${workspaceRoot}/.deveco/.debug-cache/brandy", "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": "C:/Users/caiking/my_app/DevTools_CFBB_V1.0.6/cc_riscv32_win_env", + "executable": "D:/work/haisi/FD230/./software/code/sdk/output/brandy/acore/brandy-liteos/application.elf", + "toolchainBinDir": "D:/tool/DevTools_CFBB_V1.0.6/cc_riscv32_win_env", "projectEnvName": "brandy", - "coreDir": "C:/Users/caiking/my_app/DevEco-Device-Tool/core", + "coreDir": "D:/tool/DevEco-Device-Tool/core", "preLaunchTask": "deveco: run debug server - brandy", "internalConsoleOptions": "openOnSessionStart" } diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 36cb2db27..88bfb319c 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -7,13 +7,13 @@ "problemMatcher": [ "$deveco" ], - "command": "C:\\Users\\caiking\\my_app\\DevEco-Device-Tool\\core\\deveco-venv\\Scripts\\hos.exe", + "command": "D:\\tool\\DevEco-Device-Tool\\core\\deveco-venv\\Scripts\\hos.exe", "args": [ "run", "--target", "clean", "--project-dir", - "C:\\Users\\caiking\\project\\1.haisi\\FD230", + "D:\\work\\haisi\\FD230", "--environment", "brandy" ] @@ -24,11 +24,11 @@ "problemMatcher": [ "$deveco" ], - "command": "C:\\Users\\caiking\\my_app\\DevEco-Device-Tool\\core\\deveco-venv\\Scripts\\hos.exe", + "command": "D:\\tool\\DevEco-Device-Tool\\core\\deveco-venv\\Scripts\\hos.exe", "args": [ "run", "--project-dir", - "C:\\Users\\caiking\\project\\1.haisi\\FD230", + "D:\\work\\haisi\\FD230", "--environment", "brandy" ] @@ -39,7 +39,7 @@ "problemMatcher": [ "$deveco" ], - "command": "C:\\Users\\caiking\\my_app\\DevEco-Device-Tool\\core\\deveco-venv\\Scripts\\hos.exe", + "command": "D:\\tool\\DevEco-Device-Tool\\core\\deveco-venv\\Scripts\\hos.exe", "args": [ "run", "--target", @@ -47,7 +47,7 @@ "--target", "buildprog", "--project-dir", - "C:\\Users\\caiking\\project\\1.haisi\\FD230", + "D:\\work\\haisi\\FD230", "--environment", "brandy" ] @@ -58,7 +58,7 @@ "problemMatcher": [ "$deveco" ], - "command": "C:\\Users\\caiking\\my_app\\DevEco-Device-Tool\\core\\deveco-venv\\Scripts\\hos.exe", + "command": "D:\\tool\\DevEco-Device-Tool\\core\\deveco-venv\\Scripts\\hos.exe", "args": [ "run", "--target", @@ -71,13 +71,13 @@ "problemMatcher": [ "$deveco" ], - "command": "C:\\Users\\caiking\\my_app\\DevEco-Device-Tool\\core\\deveco-venv\\Scripts\\hos.exe", + "command": "D:\\tool\\DevEco-Device-Tool\\core\\deveco-venv\\Scripts\\hos.exe", "args": [ "run", "--target", "upload", "--project-dir", - "C:\\Users\\caiking\\project\\1.haisi\\FD230", + "D:\\work\\haisi\\FD230", "--environment", "brandy" ] @@ -88,13 +88,13 @@ "problemMatcher": [ "$deveco" ], - "command": "C:\\Users\\caiking\\my_app\\DevEco-Device-Tool\\core\\deveco-venv\\Scripts\\hos.exe", + "command": "D:\\tool\\DevEco-Device-Tool\\core\\deveco-venv\\Scripts\\hos.exe", "args": [ "run", "--target", "stackAnalysis", "--project-dir", - "C:\\Users\\caiking\\project\\1.haisi\\FD230", + "D:\\work\\haisi\\FD230", "--environment", "brandy" ] @@ -105,13 +105,13 @@ "problemMatcher": [ "$deveco" ], - "command": "C:\\Users\\caiking\\my_app\\DevEco-Device-Tool\\core\\deveco-venv\\Scripts\\hos.exe", + "command": "D:\\tool\\DevEco-Device-Tool\\core\\deveco-venv\\Scripts\\hos.exe", "args": [ "run", "--target", "imageAnalysis", "--project-dir", - "C:\\Users\\caiking\\project\\1.haisi\\FD230", + "D:\\work\\haisi\\FD230", "--environment", "brandy" ] @@ -129,7 +129,7 @@ "endsPattern": "^.*Listening\\son\\sTCP/IP\\sport.*" } }, - "command": "C:\\Users\\caiking\\my_app\\DevEco-Device-Tool\\core\\deveco-venv\\Scripts\\hos.exe", + "command": "D:\\tool\\DevEco-Device-Tool\\core\\deveco-venv\\Scripts\\hos.exe", "args": [ "debug", "--interface=server", diff --git a/code/sdk/application/wearable/nativeapp/nativeui/alarm/include/AlarmPresenter.h b/code/sdk/application/wearable/nativeapp/nativeui/alarm/include/AlarmPresenter.h index fe3283355..0a9dcf29c 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/alarm/include/AlarmPresenter.h +++ b/code/sdk/application/wearable/nativeapp/nativeui/alarm/include/AlarmPresenter.h @@ -89,7 +89,7 @@ constexpr char* ALARM_STATUS[6] = {ALARM_STATUS_ONE, ALARM_STATUS_TWO, ALARM_STA constexpr char* ALARM_CLOCK[6] = {ALARM_CLOCK_ONE, ALARM_CLOCK_TWO, ALARM_CLOCK_THREE, // 闹钟个数最大个数为6个 ALARM_CLOCK_FOUR, ALARM_CLOCK_FIVE, ALARM_CLOCK_SIX}; constexpr char* WEEK_CONTAINER[7] = {SUNDAY, MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY, SATURDAY}; // 日期按钮最大个数为7个 -constexpr char* ALARM_LABELBUTTON[6] ={ALARM_LABELBUTTON_ONE,ALARM_LABELBUTTON_TWO,ALARM_LABELBUTTON_THREE,ALARM_LABELBUTTON_FOUR,ALARM_LABELBUTTON_FIVE,ALARM_LABELBUTTON_SIX}; +constexpr char* ALARM_LABELBUTTON[6] ={ALARM_LABELBUTTON_ONE,ALARM_LABELBUTTON_TWO,ALARM_LABELBUTTON_THREE,ALARM_LABELBUTTON_FOUR,ALARM_LABELBUTTON_FIVE,ALARM_LABELBUTTON_SIX};//编辑按钮最多6个 typedef enum { MAIN_INTERFACE = 0, CHANGE_INTERFACE_CONFIG, 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 1ee34b27c..4c413c14f 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 60fa59edd..898e17a7b 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 41c0be165..ea9ea001a 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 595e79d33..89a82787b 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 3ac147c73..57004295b 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 8e80899c2..81a2a7169 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 04594f39d..aec97b3ca 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 90fa93187..80bb42c05 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 0b56bf5e2..dbbb34c9d 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 3adbae73e..f8da2c66e 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