1
author罗正yun <1732036298@qq.com>
Wed, 29 Nov 2023 07:03:03 +0000 (15:03 +0800)
committer罗正yun <1732036298@qq.com>
Wed, 29 Nov 2023 07:03:03 +0000 (15:03 +0800)
18 files changed:
.deveco/build/brandy/.sconsign38.db.dblite
.deveco/build/project.checksum
.deveco/burntool/fwpkgPath.ini
.deveco/burntool/historyConfig.ini
.deveco/deveco.ini
.vscode/launch.json
.vscode/tasks.json
code/sdk/application/wearable/nativeapp/nativeui/alarm/include/AlarmPresenter.h
code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_api.a
code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_core.a
code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_drv.a
code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_sample.a
code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_vendor.a
code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_brandy_sample.a
code/sdk/interim_binary/brandy/libs/gpu/evb_standard/libgpu.a
code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_audio_captuer.a
code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_player.a
code/sdk/tools/pkg/fwpkg/brandy/tempFiles/application.bin

index 2dcaf6f..bc7c677 100644 (file)
Binary files a/.deveco/build/brandy/.sconsign38.db.dblite and b/.deveco/build/brandy/.sconsign38.db.dblite differ
index 5896277..d0d65e1 100644 (file)
@@ -1 +1 @@
-f2359666e745968bd5d77debdb76b566c2befa1b
\ No newline at end of file
+843d73a9ef1154620ba70713e9615fe407b565d7
\ No newline at end of file
index be074e9..9908f7d 100644 (file)
@@ -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
index b27f42a..1c568c5 100644 (file)
@@ -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
index 5f9e738..21fd855 100644 (file)
@@ -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
index ce62737..a545150 100644 (file)
@@ -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"
         },
             "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"
         }
index 36cb2db..88bfb31 100644 (file)
@@ -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"
             ]
             "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",
             "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"
             ]
             "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"
             ]
             "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"
             ]
                     "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",
index fe32833..0a9dcf2 100644 (file)
@@ -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,
index 1ee34b2..4c413c1 100644 (file)
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
index 60fa59e..898e17a 100644 (file)
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
index 41c0be1..ea9ea00 100644 (file)
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
index 595e79d..89a8278 100644 (file)
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
index 3ac147c..5700429 100644 (file)
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
index 8e80899..81a2a71 100644 (file)
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
index 04594f3..aec97b3 100644 (file)
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
index 90fa931..80bb42c 100644 (file)
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
index 0b56bf5..dbbb34c 100644 (file)
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
index 3adbae7..f8da2c6 100644 (file)
Binary files a/code/sdk/tools/pkg/fwpkg/brandy/tempFiles/application.bin and b/code/sdk/tools/pkg/fwpkg/brandy/tempFiles/application.bin differ