Merge from captain chen

This commit is contained in:
NeoZng
2023-03-23 18:57:54 +08:00
parent 41d033e3f8
commit 59e21dc25d
19 changed files with 161 additions and 127 deletions

4
.vscode/tasks.json vendored
View File

@@ -15,7 +15,7 @@
{
"label": "download dap",
"type": "shell", // 如果希望在下载前编译,可以把command换成下面的命令
"command":"mingw32-make download_dap", // "mingw32-make -j24 && mingw32-make download_dap",
"command":"mingw32-make download_dap", // "mingw32-make -j24 ; mingw32-make download_dap",
"group": { // 如果没有修改代码,编译任务不会消耗时间,因此推荐使用上面的替换.
"kind": "build",
"isDefault": false,
@@ -24,7 +24,7 @@
{
"label": "download jlink",
"type": "shell",
"command":"mingw32-make download_jlink", // "mingw32-make -j24 && mingw32-make download_dap"
"command":"mingw32-make download_jlink", // "mingw32-make -j24 ; mingw32-make download_dap"
"group": {
"kind": "build",
"isDefault": false,