Allow 'None' openocd cfg

Author: github0null

src/DebugConfigGenerator.ts

@@ -196,18 +196,22 @@ class CortexDebugConfigProvider extends IDebugConfigProvider {
 
                 else if ('openocd' == debugConfig.servertype) {
                     const openocdConf = <OpenOCDFlashOptions>JSON.parse(JSON.stringify(prjConfig.uploadConfig));
+                    const cfgs: string[] = [];
 
-                    if (!openocdConf.interface.startsWith('${workspaceFolder}/')) {
-                        openocdConf.interface = `interface/${openocdConf.interface}`;
+                    if (openocdConf.interface) {
+                        if (!openocdConf.interface.startsWith('${workspaceFolder}/')) {
+                            openocdConf.interface = `interface/${openocdConf.interface}`;
+                        }
+                        cfgs.push(`${openocdConf.interface}.cfg`);
                     }
-                    if (!openocdConf.target.startsWith('${workspaceFolder}/')) {
-                        openocdConf.target = `target/${openocdConf.target}`;
+                    if (openocdConf.target) {
+                        if (!openocdConf.target.startsWith('${workspaceFolder}/')) {
+                            openocdConf.target = `target/${openocdConf.target}`;
+                        }
+                        cfgs.push(`${openocdConf.target}.cfg`);
                     }
 
-                    debugConfig.configFiles = [
-                        `${openocdConf.interface}.cfg`,
-                        `${openocdConf.target}.cfg`
-                    ];
+                    debugConfig.configFiles = cfgs;
                 }
 
                 else if ('jlink' == debugConfig.servertype) {

src/EIDEProjectModules.ts

@@ -2638,7 +2638,9 @@ class OpenOCDUploadModel extends UploadConfigModel<OpenOCDFlashOptions> {
     private getConfigList(configClass: string): { name: string, isInWorkspace?: boolean; }[] | undefined {
 
         const openocdExe = new File(SettingManager.GetInstance().getOpenOCDExePath());
-        const resultList: { name: string, isInWorkspace?: boolean; }[] = [];
+        const resultList: { name: string, isInWorkspace?: boolean; }[] = [
+            { name: '' } // None
+        ];
 
         // find in workspace
         const wsFolder = WorkspaceManager.getInstance().getWorkspaceRoot();
@@ -2679,11 +2681,18 @@ class OpenOCDUploadModel extends UploadConfigModel<OpenOCDFlashOptions> {
             case 'target':
             case 'interface':
                 return this.getConfigList(key)?.map((item) => {
-                    return {
-                        label: `${item.name}.cfg`,
-                        val: item.isInWorkspace ? `\${workspaceFolder}/${item.name}` : item.name,
-                        description: item.isInWorkspace ? 'in workspace' : undefined
-                    };
+                    if (item.name.trim() == '') {
+                        return {
+                            label: 'None',
+                            val: item.name
+                        };
+                    } else {
+                        return {
+                            label: `${item.name}.cfg`,
+                            val: item.isInWorkspace ? `\${workspaceFolder}/${item.name}` : item.name,
+                            description: item.isInWorkspace ? 'in workspace' : undefined
+                        };
+                    }
                 });
             default:
                 return super.GetSelectionList(key);

src/HexUploader.ts

@@ -947,23 +947,26 @@ class OpenOCDUploader extends HexUploader<string[]> {
 
         const commands: string[] = [];
 
-        const interfaceFileName = option.interface.startsWith('${workspaceFolder}/')
-            ? option.interface.replace('${workspaceFolder}/', '') : `interface/${option.interface}`;
-
-        const targetFileName = option.target.startsWith('${workspaceFolder}/')
-            ? option.target.replace('${workspaceFolder}/', '') : `target/${option.target}`;
-
         const wsFolder = WorkspaceManager.getInstance().getWorkspaceRoot();
         if (wsFolder) {
             commands.push(
                 `-s "${wsFolder.path}"`
             );
         }
 
-        commands.push(
-            `-f ${interfaceFileName}.cfg`,
-            `-f ${targetFileName}.cfg`,
-        );
+        const addConfig = (typ: 'interface' | 'target', fname: string) => {
+            if (fname.trim() != '') {
+                let fpath: string = fname.startsWith('${workspaceFolder}/')
+                    ? fname.replace('${workspaceFolder}/', '')
+                    : `${typ}/${fname}`;
+                let cfg = `-f ${fpath}.cfg`;
+                if (!commands.includes(cfg))
+                    commands.push(cfg);
+            }
+        };
+
+        addConfig('interface', option.interface);
+        addConfig('target', option.target);
 
         programs.forEach(file => {
             if (/\.bin$/i.test(file.path)) {