v3.23.10 revision

github0null · web-flow · commit 699b0e3fd483 · 2025-07-26T03:00:29.000+08:00
v3.23.10 revision
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,7 +6,7 @@ All notable version changes will be recorded in this file.
 
 ***
 
-### [v3.23.9] revision
+### [v3.23.10] revision
 
 **Improve**:
   - `GNU Arm Toolchain`: Support new mcpu: `cortex-m52, cortex-m55, cortex-m85`.
@@ -15,6 +15,8 @@ All notable version changes will be recorded in this file.
   - `File Options`: Add memory assignment feature for `AC5`, `AC6` toolchain. Thanks the contributor [Deadline039](https://github.com/Deadline039)
   - `File Options GUI`: Update the translation text. Optimize layout.
   - `DebugConfig Generator GUI`: Change gui element width. Sort the option result list.
+  - `AC5/AC6 Assembler`: Support use `<key>=<val>` preprocessor format for AC5/AC6 armasm.
+  - `Makefile Generator`: Improve makefile generator.
 
 **Fix**:
   - `IAR ARM Toolchain`: Miss auto-gen `-I` params for iar assembler.
@@ -23,6 +25,7 @@ All notable version changes will be recorded in this file.
 
 **Change**:
   - `EIDE View Container`: By default, we will collapse the `Operations` view.
+  - `Webpanel Views`: Starting from this version, we will use singleton pattern for `Builder Options View`, `Storage Layout View`, `Cmsis Header Config Wizard`, This means that for each view, only one page can be opened for each project.
 
 ***
 
diff --git a/package.json b/package.json
@@ -36,7 +36,7 @@
     "homepage": "https://em-ide.com",
     "license": "MIT",
     "description": "A mcu development environment for 8051/AVR/STM8/Cortex-M/MIPS/RISC-V",
-    "version": "3.23.9",
+    "version": "3.23.10",
     "preview": false,
     "engines": {
         "vscode": "^1.67.0"
diff --git a/package.nls.json b/package.nls.json
@@ -70,8 +70,8 @@
     "eide.explorer.modify.file.path": "Modify File Path",
     "eide.explorer.modify.exclude_list": "Modify Source File Exclude List",
     "eide.explorer.file.compile": "Compile",
-    "eide.explorer.file.modify.extraArgs": "Modify Compiler Options",
-    "eide.explorer.folder.modify.extraArgs": "Modify Compiler Options",
+    "eide.explorer.file.modify.extraArgs": "Show/Modify Compiler Options",
+    "eide.explorer.folder.modify.extraArgs": "Show/Modify Compiler Options",
 
     "eide.source.show_cmsis_config_wizard": "CMSIS Configuration Wizard",
     "eide.source.show.disassembly": "Show Disassembly",
diff --git a/package.nls.zh-CN.json b/package.nls.zh-CN.json
@@ -70,8 +70,8 @@
     "eide.explorer.modify.file.path": "修改源文件路径",
     "eide.explorer.modify.exclude_list": "修改源文件排除列表",
     "eide.explorer.file.compile": "编译",
-    "eide.explorer.file.modify.extraArgs": "修改此文件的编译器选项",
-    "eide.explorer.folder.modify.extraArgs": "修改此文件夹的编译器选项",
+    "eide.explorer.file.modify.extraArgs": "查看/修改此文件的编译选项",
+    "eide.explorer.folder.modify.extraArgs": "查看/修改此文件夹的编译选项",
 
     "eide.source.show_cmsis_config_wizard": "CMSIS Configuration Wizard",
     "eide.source.show.disassembly": "查看反汇编",
diff --git a/res/data/models/arm.v5.model.json b/res/data/models/arm.v5.model.json
@@ -346,7 +346,11 @@
             ],
             "defines": {
                 "type": "list",
-                "command": "--pd "
+                "command": "--pd ",
+                "mapper": {
+                    "^\\s*([\\w\\$]+)=(.+)": "\"$1 SETA $2\"",
+                    "^\\s*([\\w\\$]+)\\s*$": "\"$1 SETA 1\""
+                }
             },
             "use-microLIB": {
                 "type": "selectable",
diff --git a/res/data/models/arm.v6.model.json b/res/data/models/arm.v6.model.json
@@ -501,7 +501,11 @@
             },
             "defines": {
                 "type": "list",
-                "command": "--pd "
+                "command": "--pd ",
+                "mapper": {
+                    "^\\s*([\\w\\$]+)=(.+)": "\"$1 SETA $2\"",
+                    "^\\s*([\\w\\$]+)\\s*$": "\"$1 SETA 1\""
+                }
             },
             "use-microLIB": {
                 "type": "selectable",
diff --git a/res/tools/darwin/unify_builder/arm64/unify_builder.deps.json b/res/tools/darwin/unify_builder/arm64/unify_builder.deps.json
@@ -7,7 +7,7 @@
   "targets": {
     ".NETCoreApp,Version=v6.0": {},
     ".NETCoreApp,Version=v6.0/osx-arm64": {
-      "unify_builder/3.10.3": {
+      "unify_builder/3.10.4": {
         "dependencies": {
           "CommandLineParser": "2.9.1",
           "ConsoleTableExt": "3.1.9",
@@ -122,7 +122,7 @@
     }
   },
   "libraries": {
-    "unify_builder/3.10.3": {
+    "unify_builder/3.10.4": {
       "type": "project",
       "serviceable": false,
       "sha512": ""
diff --git a/res/tools/darwin/unify_builder/arm64/unify_builder.dll b/res/tools/darwin/unify_builder/arm64/unify_builder.dll
diff --git a/res/tools/darwin/unify_builder/x86_64/unify_builder.deps.json b/res/tools/darwin/unify_builder/x86_64/unify_builder.deps.json
@@ -7,7 +7,7 @@
   "targets": {
     ".NETCoreApp,Version=v6.0": {},
     ".NETCoreApp,Version=v6.0/osx-x64": {
-      "unify_builder/3.10.3": {
+      "unify_builder/3.10.4": {
         "dependencies": {
           "CommandLineParser": "2.9.1",
           "ConsoleTableExt": "3.1.9",
@@ -122,7 +122,7 @@
     }
   },
   "libraries": {
-    "unify_builder/3.10.3": {
+    "unify_builder/3.10.4": {
       "type": "project",
       "serviceable": false,
       "sha512": ""
diff --git a/res/tools/darwin/unify_builder/x86_64/unify_builder.dll b/res/tools/darwin/unify_builder/x86_64/unify_builder.dll
diff --git a/res/tools/linux/unify_builder/unify_builder.deps.json b/res/tools/linux/unify_builder/unify_builder.deps.json
@@ -7,7 +7,7 @@
   "targets": {
     ".NETCoreApp,Version=v6.0": {},
     ".NETCoreApp,Version=v6.0/linux-x64": {
-      "unify_builder/3.10.3": {
+      "unify_builder/3.10.4": {
         "dependencies": {
           "CommandLineParser": "2.9.1",
           "ConsoleTableExt": "3.1.9",
@@ -122,7 +122,7 @@
     }
   },
   "libraries": {
-    "unify_builder/3.10.3": {
+    "unify_builder/3.10.4": {
       "type": "project",
       "serviceable": false,
       "sha512": ""
diff --git a/res/tools/linux/unify_builder/unify_builder.dll b/res/tools/linux/unify_builder/unify_builder.dll
diff --git a/res/tools/win32/unify_builder/unify_builder.deps.json b/res/tools/win32/unify_builder/unify_builder.deps.json
@@ -7,7 +7,7 @@
   "targets": {
     ".NETCoreApp,Version=v6.0": {},
     ".NETCoreApp,Version=v6.0/win-x64": {
-      "unify_builder/3.10.3": {
+      "unify_builder/3.10.4": {
         "dependencies": {
           "CommandLineParser": "2.9.1",
           "ConsoleTableExt": "3.1.9",
@@ -122,7 +122,7 @@
     }
   },
   "libraries": {
-    "unify_builder/3.10.3": {
+    "unify_builder/3.10.4": {
       "type": "project",
       "serviceable": false,
       "sha512": ""
diff --git a/res/tools/win32/unify_builder/unify_builder.dll b/res/tools/win32/unify_builder/unify_builder.dll
diff --git a/res/tools/win32/unify_builder/unify_builder.exe b/res/tools/win32/unify_builder/unify_builder.exe
diff --git a/src/CodeBuilder.ts b/src/CodeBuilder.ts
@@ -1107,14 +1107,10 @@ export class ARMCodeBuilder extends CodeBuilder {
             if (['AC5', 'AC6'].includes(config.toolchain) &&
                 settingManager.IsConvertAxf2Elf() &&
                 options['linker']['$disableOutputTask'] != true) {
-
-                const tool_root_folder = this.project.getToolchainLocation().path;
-                const ouput_path = `\${outDir}${File.sep}${config.name}`;
-                const axf2elf_log = `\${outDir}${File.sep}axf2elf.log`;
-
+                const axf2elf_log = `\${OutDir}/axf2elf.log`;
                 extraCommands.push({
                     name: 'axf to elf',
-                    command: `axf2elf -d "${tool_root_folder}" -i "${ouput_path}.axf" -o "${ouput_path}.elf" > "${axf2elf_log}"`
+                    command: `axf2elf -d "\${ToolchainRoot}" -i "\${OutDir}/\${ProjectName}.axf" -o "\${OutDir}/\${ProjectName}.elf" > "${axf2elf_log}"`
                 });
             }
 
diff --git a/src/WebPanelManager.ts b/src/WebPanelManager.ts
@@ -43,6 +43,10 @@ let _instance: WebPanelManager;
 
 export class WebPanelManager {
 
+    private builderOptionViewRef: Map<string, vscode.WebviewPanel> = new Map();
+    private memoryLayoutViewRef: Map<string, vscode.WebviewPanel> = new Map();
+    private cmsisHeaderViewRef: Map<string, vscode.WebviewPanel> = new Map();
+
     private constructor() {
     }
 
@@ -115,17 +119,25 @@ export class WebPanelManager {
 
     showStorageLayoutView(project: AbstractProject): void {
 
-        const resManager = ResManager.GetInstance();
+        const oldpanel = this.memoryLayoutViewRef.get(project.getUid());
+        if (oldpanel) {
+            oldpanel.reveal();
+            return;
+        }
 
+        const resManager = ResManager.GetInstance();
         const panel = vscode.window.createWebviewPanel('MemoryLayoutView',
             view_str$compile$storageLayout, vscode.ViewColumn.One,
             { enableScripts: true, retainContextWhenHidden: true });
 
+        this.memoryLayoutViewRef.set(project.getUid(), panel);
+
         // set web icon
         panel.iconPath = vscode.Uri.parse(resManager.GetIconByName('Memory_16x.svg').ToUri());
 
         panel.onDidDispose(() => {
-            //TODO
+            console.log(`[eide] onDidDispose memoryLayoutView for ${project.getRootDir().path}`);
+            this.memoryLayoutViewRef.delete(project.getUid());
         });
 
         const compileModel = <ArmBaseCompileConfigModel>project.GetConfiguration().compileConfigModel;
@@ -174,6 +186,12 @@ export class WebPanelManager {
 
     showBuilderOptions(project: AbstractProject): void {
 
+        const oldpanel = this.builderOptionViewRef.get(project.getUid());
+        if (oldpanel) {
+            oldpanel.reveal();
+            return;
+        }
+
         const projectConfig = project.GetConfiguration();
         const resManager = ResManager.GetInstance();
         const htmlFolder = File.fromArray([resManager.GetHTMLDir().path, 'builder_options']);
@@ -191,6 +209,8 @@ export class WebPanelManager {
             panelOptions
         );
 
+        this.builderOptionViewRef.set(project.getUid(), panel);
+
         // init panel data
         panel.iconPath = vscode.Uri.parse(resManager.GetIconByName('Property_16x.svg').ToUri());
 
@@ -232,7 +252,8 @@ export class WebPanelManager {
         }
 
         panel.onDidDispose(() => {
-            // TODO
+            console.log(`[eide] onDidDispose builderOptionView for ${project.getRootDir().path}`);
+            this.builderOptionViewRef.delete(project.getUid());
         });
 
         panel.webview.onDidReceiveMessage(async (data) => {
@@ -305,6 +326,12 @@ export class WebPanelManager {
 
     showCmsisConfigWizard(uri: vscode.Uri): void {
 
+        const oldpanel = this.cmsisHeaderViewRef.get(uri.fsPath);
+        if (oldpanel) {
+            oldpanel.reveal();
+            return;
+        }
+
         // get current encoding for this file
         const fencoding = vscode.workspace.getConfiguration(undefined, uri).get<string>('files.encoding') || 'utf8';
         const inputFile = new File(uri.fsPath);
@@ -348,6 +375,8 @@ export class WebPanelManager {
             panelOptions
         );
 
+        this.cmsisHeaderViewRef.set(uri.fsPath, panel);
+
         // init panel data
         panel.iconPath = vscode.Uri.parse(resManager.GetIconByName('Property_16x.svg').ToUri());
 
@@ -358,7 +387,8 @@ export class WebPanelManager {
         };
 
         panel.onDidDispose(() => {
-            // TODO
+            console.log(`[eide] onDidDispose CmsisConfigWizard for ${uri.fsPath}`);
+            this.cmsisHeaderViewRef.delete(uri.fsPath);
         });
 
         panel.webview.onDidReceiveMessage((data) => {
