add dynamic debug for cortex-debug

github0null · github0null · commit 62cbf2c667f4 · 2025-09-07T21:58:56.000+08:00
diff --git a/package.json b/package.json
@@ -114,6 +114,12 @@
         "yaml": "^1.10.2"
     },
     "contributes": {
+        "debuggers": [
+            {
+                "type": "eide.cortex-debug",
+                "label": "EIDE (Cortex-Debug)"
+            }
+        ],
         "terminal": {
             "profiles": [
                 {
@@ -541,6 +547,20 @@
             }
         ],
         "commands": [
+            {
+                "command": "eide.debug.start",
+                "category": "eide",
+                "title": "%eide.project.debug.start%",
+                "icon": {
+                    "dark": "./res/icon/Run_16x.svg",
+                    "light": "./res/icon/Run_16x.svg"
+                }
+            },
+            {
+                "command": "eide.refresh.external_tools_index",
+                "category": "eide",
+                "title": "Refresh External Tools Index"
+            },
             {
                 "command": "eide.open.makelibs.cfg",
                 "category": "eide",
@@ -1217,17 +1237,22 @@
                 {
                     "when": "cl.eide.projectActived && config.EIDE.Option.ShowToolbarInEditerTitle",
                     "command": "eide.project.build",
-                    "group": "navigation"
+                    "group": "navigation@1"
                 },
                 {
                     "when": "cl.eide.projectActived && config.EIDE.Option.ShowToolbarInEditerTitle",
-                    "command": "eide.project.clean",
-                    "group": "navigation"
+                    "command": "eide.project.uploadToDevice",
+                    "group": "navigation@2"
                 },
                 {
                     "when": "cl.eide.projectActived && config.EIDE.Option.ShowToolbarInEditerTitle",
-                    "command": "eide.project.uploadToDevice",
-                    "group": "navigation"
+                    "command": "eide.debug.start",
+                    "group": "navigation@3"
+                },
+                {
+                    "when": "cl.eide.projectActived && config.EIDE.Option.ShowToolbarInEditerTitle",
+                    "command": "eide.project.clean",
+                    "group": "navigation@4"
                 }
             ],
             "editor/context": [
@@ -1291,10 +1316,15 @@
                     "when": "viewItem == SOLUTION && view == cl.eide.view.projects"
                 },
                 {
-                    "command": "eide.project.clean",
+                    "command": "eide.debug.start",
                     "group": "inline@4",
                     "when": "viewItem == SOLUTION && view == cl.eide.view.projects"
                 },
+                {
+                    "command": "eide.project.clean",
+                    "group": "inline@5",
+                    "when": "viewItem == SOLUTION && view == cl.eide.view.projects"
+                },
                 {
                     "command": "_cl.eide.project.setActive",
                     "when": "viewItem == SOLUTION && view == cl.eide.view.projects && cl.eide.enable.active",
@@ -1315,6 +1345,11 @@
                     "when": "viewItem == SOLUTION && view == cl.eide.view.projects",
                     "group": "2_build@2"
                 },
+                {
+                    "command": "eide.debug.start",
+                    "when": "viewItem == SOLUTION && view == cl.eide.view.projects",
+                    "group": "2_build@3"
+                },
                 {
                     "command": "eide.project.uploadToDevice",
                     "when": "viewItem == SOLUTION && view == cl.eide.view.projects",
diff --git a/package.nls.json b/package.nls.json
@@ -32,6 +32,7 @@
     "eide.project.modify.files.options": "Show Extra Options Of All Source Files",
     "eide.project.import.ext.project.src.struct": "Import SourceFile Tree From Other Project",
     "eide.project.generate_builder_params": "Generate builder.params",
+    "eide.project.debug.start": "Start Debugging (Cortex-Debug)",
 
     "eide.prj.menus.main.static-check": "Static Check",
     "eide.prj.menus.sub.static-check.cppcheck": "Run Cppcheck",
diff --git a/package.nls.zh-CN.json b/package.nls.zh-CN.json
@@ -32,6 +32,7 @@
     "eide.project.modify.files.options": "查看所有源文件的附加编译参数",
     "eide.project.import.ext.project.src.struct": "从其他 IDE 的项目中导入源文件树",
     "eide.project.generate_builder_params": "生成 builder.params",
+    "eide.project.debug.start": "启动调试(Cortex-Debug)",
 
     "eide.prj.menus.main.static-check": "静态检查",
     "eide.prj.menus.sub.static-check.cppcheck": "执行 Cppcheck",
diff --git a/res/icon/Run_16x.svg b/res/icon/Run_16x.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.icon-canvas-transparent{opacity:0;fill:#f6f6f6}.icon-vs-out{fill:#f6f6f6}.icon-vs-action-green{fill:#388a34}</style><path class="icon-canvas-transparent" d="M16 16H0V0h16v16z" id="canvas"/><path class="icon-vs-out" d="M3 0l10.667 8L3 16V0z" id="outline"/><g id="iconBg"><path class="icon-vs-action-green" d="M4 2v12l8-6-8-6z"/></g></svg>
diff --git a/res/icon/Run_blue_16x.svg b/res/icon/Run_blue_16x.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.icon-canvas-transparent{opacity:0;fill:#f6f6f6}.icon-vs-out{fill:#f6f6f6}.icon-vs-blue{fill:#1ba1e2}</style><path class="icon-canvas-transparent" d="M16 16H0V0h16v16z" id="canvas"/><path class="icon-vs-out" d="M3 0l10.667 8L3 16V0z" id="outline"/><path class="icon-vs-blue" d="M4 2v12l8-6-8-6z" id="iconBg"/></svg>
diff --git a/res/icon/Run_grey_16x.svg b/res/icon/Run_grey_16x.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.st0{fill:#f6f6f6}.st1{fill:#424242}</style><path class="st0" d="M5 2.131L13.803 8 5 13.869V2.131z" id="outline"/><path class="st1" d="M6 4l6 4-6 4V4z" id="icon_x5F_bg"/></svg>
diff --git a/src/GlobalEvents.ts b/src/GlobalEvents.ts
@@ -23,7 +23,7 @@
 */
 
 import * as events from 'events';
-import { Message, ExceptionToMessage, newMessage } from './Message';
+import { Message, ExceptionToMessage, newMessage, MessageType } from './Message';
 
 let _globalEvent: GlobalEvent | undefined;
 
@@ -75,6 +75,9 @@ export class GlobalEvent {
 
     //msg
     static emit(event: 'error', error: Error): boolean;             // 错误弹框（vscode 右下角）
+    /**
+     * @deprecated 已废弃，改用 GlobalEvent.show_msgbox
+     */
     static emit(event: 'msg', msg: Message): boolean;               // 消息弹框（vscode 右下角）
     static emit(event: 'globalLog', msg: Message): boolean;         // 打印日志+换行 -> 输出面板
     static emit(event: 'globalLog.append', log: string): boolean;   // 打印原始日志字串 -> 输出面板
@@ -83,6 +86,14 @@ export class GlobalEvent {
         return GlobalEvent.GetInstance()._emitter.emit(event, args);
     }
 
+    //vscode notify
+    static show_msgbox(type: MessageType, msg: string | Error) {
+        if (msg instanceof Error)
+            return GlobalEvent.GetInstance()._emitter.emit('msg', ExceptionToMessage(msg, type));
+        else
+            return GlobalEvent.GetInstance()._emitter.emit('msg', newMessage(type, msg));
+    }
+
     //log
     static log_info(msg: string) {
         GlobalEvent.GetInstance()._emitter.emit('globalLog', newMessage('Info', msg));
diff --git a/src/HexUploader.ts b/src/HexUploader.ts
@@ -787,7 +787,7 @@ class STLinkUploader extends HexUploader<string[]> {
 
         // run
         let cmd = `${commandLine} ${options.otherCmds || ''}`.trimEnd();
-        if (osType() == 'win32' && exe.noSuffixName.toLowerCase().startsWith('stm32_programmer_cli'))
+        if (osType() == 'win32')
             cmd = 'chcp 437 && ' + cmd; // chcp 437: 去除进度条乱码
 
         this.executeShellCommand(this.toolType, cmd,
diff --git a/src/ResInstaller.ts b/src/ResInstaller.ts
@@ -295,7 +295,7 @@ export class ResInstaller {
         this.locker.delete(name.toLowerCase());
     }
 
-    async refreshExternalToolsIndex() {
+    async refreshExternalToolsIndex(force?: boolean) {
 
         const indexCacheFile = File.from(ResManager.instance().GetTmpDir().path, 'eide_external_tools.index.json');
         const defIdxUrl = 'https://raw.githubusercontent.com/github0null/eide_default_external_tools_index/master/index.json';
@@ -304,6 +304,8 @@ export class ResInstaller {
 
         let cont: string | Error | undefined;
         try {
+            if (force)
+                throw Error();
             if (indexCacheFile.IsFile() && 
                 new Date().getTime() < fs.statSync(indexCacheFile.path).mtime.getTime() + (6 * 3600 * 1000))
                 cont = indexCacheFile.Read();
diff --git a/src/extension.ts b/src/extension.ts
