Skip to content

Commit a089b43

Browse files
committed
- 移除自动生成Cortex-Debug配置
- 增加右键菜单:生成 Cortex-Debug 配置模板
1 parent 902f219 commit a089b43

File tree

6 files changed

+21
-10
lines changed

6 files changed

+21
-10
lines changed

package.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -887,6 +887,10 @@
887887
"light": "./res/icon/SwitchSourceOrTarget_16x.svg"
888888
}
889889
},
890+
{
891+
"command": "_cl.eide.project.genDebugConfigTemplate",
892+
"title": "%eide.flash.gen.dbgconf%"
893+
},
890894
{
891895
"command": "_cl.eide.project.fetchShellFlasher",
892896
"title": "%eide.flash.fetch-shell-flasher%",
@@ -1452,6 +1456,11 @@
14521456
"group": "inline",
14531457
"when": "viewItem == UPLOAD_OPTION || viewItem == UPLOAD_OPTION_Shell && view == cl.eide.view.projects"
14541458
},
1459+
{
1460+
"command": "_cl.eide.project.genDebugConfigTemplate",
1461+
"when": "viewItem == SOLUTION || viewItem == UPLOAD_OPTION || viewItem == UPLOAD_OPTION_Shell && view == cl.eide.view.projects",
1462+
"group": "5_group@3"
1463+
},
14551464
{
14561465
"command": "_cl.eide.project.fetchShellFlasher",
14571466
"group": "inline",

package.nls.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,16 @@
8080
"eide.package.install": "Install CMSIS Chip Package",
8181
"eide.package.install.cmsis": "Install CMSIS Header Files",
8282
"eide.package.remove": "Uninstall Chip Support Package",
83-
"eide.package.select.device": "Choose Device",
83+
"eide.package.select.device": "Select Device",
8484
"eide.package.comp.install": "Install Component",
8585
"eide.package.comp.uninstall": "Uninstall Component",
8686

87-
"eide.builder.switch": "Choose Toolchain",
87+
"eide.builder.switch": "Select Toolchain",
8888
"eide.builder.config": "Configure Toolchain",
8989
"eide.builder.setup-toolchain-prefix": "Setup Compiler Prefix",
9090

91-
"eide.flash.switch": "Choose Flasher",
91+
"eide.flash.switch": "Select Flasher",
92+
"eide.flash.gen.dbgconf": "Generate Cortex-Debug Configuration",
9293
"eide.flash.fetch-shell-flasher": "Install Shell Flasher Script From Remote Repository",
9394

9495
"eide.deps.include.show": "Display All Include Paths",

package.nls.zh-CN.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@
8282
"eide.builder.setup-toolchain-prefix": "设置编译器前缀",
8383

8484
"eide.flash.switch": "切换烧录器",
85+
"eide.flash.gen.dbgconf": "生成 Cortex-Debug 配置模板",
8586
"eide.flash.fetch-shell-flasher": "从云端安装 Shell 烧录脚本",
8687

8788
"eide.deps.include.show": "显示所有包含路径",

src/EIDEProject.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2545,9 +2545,6 @@ $(OUT_DIR):
25452545
return; // exit, because this event will trigger 'update debug config' operations
25462546
}
25472547
}
2548-
2549-
// update debug config after uploader changed
2550-
this.updateDebugConfig();
25512548
}
25522549
});
25532550
}
@@ -2667,7 +2664,7 @@ $(OUT_DIR):
26672664
}
26682665

26692666
protected onUploaderChanged() {
2670-
this.updateDebugConfig(); // update debug config after uploader changed
2667+
//TODO
26712668
}
26722669

26732670
protected abstract onComponentUpdate(updateList: ComponentUpdateItem[]): void;

src/EIDEProjectExplorer.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4182,9 +4182,6 @@ export class ProjectExplorer implements CustomConfigurationProvider {
41824182
// start build
41834183
codeBuilder.build(options);
41844184

4185-
// update debug configuration
4186-
prj.updateDebugConfig();
4187-
41884185
setTimeout(() => {
41894186
this._buildLock = false;
41904187
}, 500);
@@ -6862,6 +6859,11 @@ export class ProjectExplorer implements CustomConfigurationProvider {
68626859
}
68636860
}
68646861

6862+
async genDebugConfigTemplate(item: ProjTreeItem) {
6863+
const project = this.dataProvider.GetProjectByIndex(item.val.projectIndex);
6864+
project.updateDebugConfig();
6865+
}
6866+
68656867
private prev_click_info: ItemClickInfo | undefined = undefined;
68666868

68676869
private async OnTreeItemClick(item: ProjTreeItem) {

src/extension.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,7 @@ export async function activate(context: vscode.ExtensionContext) {
228228
subscriptions.push(vscode.commands.registerCommand('_cl.eide.project.modifyUploadConfig', (item) => projectExplorer.ModifyUploadConfig(item)));
229229
subscriptions.push(vscode.commands.registerCommand('_cl.eide.project.switchUploader', (item) => projectExplorer.switchUploader(item)));
230230
subscriptions.push(vscode.commands.registerCommand('_cl.eide.project.fetchShellFlasher', (item) => projectExplorer.fetchShellFlasher(item)));
231+
subscriptions.push(vscode.commands.registerCommand('_cl.eide.project.genDebugConfigTemplate', (item) => projectExplorer.genDebugConfigTemplate(item)));
231232

232233
// project deps
233234
subscriptions.push(vscode.commands.registerCommand('_cl.eide.project.addIncludeDir', (item) => projectExplorer.AddIncludeDir(item.val.projectIndex)));

0 commit comments

Comments
 (0)