Merge branch 'master'

.vscode/launch.json

@@ -6,7 +6,7 @@
         {
             "name": "Debug-DAP",
             "cwd": "${workspaceRoot}",
-            "executable": "${workspaceRoot}\\build\\${workspaceFolderBasename}.elf", // 要下载到调试器的文件,花括号中的是vscode两个预定义的参数
+            "executable": "${workspaceRoot}\\build\\basic_framework.elf", // 要下载到调试器的文件,花括号中的是vscode两个预定义的参数
             "request": "launch",
             "type": "cortex-debug",
             //使用J-link GDB Server时必须;其他GBD Server时可选（有可能帮助自动选择SVD文件）
@@ -19,14 +19,16 @@
             "configFiles": [
                 "openocd_dap.cfg", // 配置文件已经在根目录提供,若要修改以此类推,openocd的路径下的share/scripts中有各种写好的配置文件
             ],
-            "runToEntryPoint": "main" // 调试时在main函数入口停下
+            "runToEntryPoint": "main", // 调试时在main函数入口停下
             //"preLaunchTask": "build task",//先运行Build任务编译项目,取消注释即可使用
+            //"preLaunchTask": "log", // 调试时同时开启RTT viewer窗口
+            // 若想要在调试前编译并且打开log,可只使用log的prelaunch task并为log任务添加depends on依赖
         },
         // 使用j-link进行调试时的参考配置
         {
             "name": "Debug-Jlink",
             "cwd": "${workspaceFolder}",
-            "executable": "${workspaceRoot}\\build\\${workspaceFolderBasename}.elf",
+            "executable": "${workspaceRoot}\\build\\basic_framework.elf",
             "request": "launch",
             "type": "cortex-debug",
             "device": "STM32F407IG",
@@ -35,7 +37,10 @@
             "servertype": "jlink",
             "interface": "swd",
             "svdFile": "STM32F407.svd",
+            "rtos": "FreeRTOS",
             // "preLaunchTask": "build task",//先运行Build任务,取消注释即可使用
+            //"preLaunchTask": "log", // 调试时同时开启RTT viewer窗口
+            // 若想要在调试前编译并且打开log,可只使用log的prelaunch task并为log任务添加depends on依赖
         },
     ],
 }

.vscode/tasks.json

@@ -14,9 +14,9 @@
         },
         {
             "label": "download dap",
-            "type": "shell",
-            "command": "mingw32-make download_dap",
-            "group": {
+            "type": "shell",               // 如果希望在下载前编译,可以把command换成下面的命令
+            "command":"mingw32-make download_dap", // "mingw32-make -j24 ; mingw32-make download_dap",
+            "group": {                     // 如果没有修改代码,编译任务不会消耗时间,因此推荐使用上面的替换.
                 "kind": "build",
                 "isDefault": false
             }
@@ -24,11 +24,21 @@
         {
             "label": "download jlink",
             "type": "shell",
-            "command": "mingw32-make download_jlink",
+            "command":"mingw32-make download_jlink", // "mingw32-make -j24 ; mingw32-make download_dap"
             "group": {
                 "kind": "build",
                 "isDefault": false
             }
+        },
+        {
+            "label": "log",
+            "type": "shell",
+            "command":"JlinkRTTClient",
+            "args": [],
+            "problemMatcher": [],
+            // "dependsOn":[
+            //     "build task", // 可以添加多个.
+            // ]
         }
     ]
 }