support install CMSIS Common Driver Interface

Author: github0null

package.json

@@ -763,6 +763,11 @@
                 "command": "_cl.eide.project.installCmsisLibs",
                 "title": "Install CMSIS Core Libs"
             },
+            {
+                "command": "_cl.eide.project.installCmsisDriverInterface",
+                "category": "eide",
+                "title": "Install CMSIS Common Driver Interface"
+            },
             {
                 "command": "_cl.eide.project.addSrcDir",
                 "title": "%eide.explorer.root.add.folder%",
@@ -1250,6 +1255,10 @@
                     "command": "_cl.eide.project.installCmsisLibs",
                     "when": "viewItem == PACK && view == cl.eide.view.projects"
                 },
+                {
+                    "command": "_cl.eide.project.installCmsisDriverInterface",
+                    "when": "viewItem == PACK && view == cl.eide.view.projects"
+                },
                 {
                     "command": "_cl.eide.project.setActive",
                     "when": "viewItem == SOLUTION && view == cl.eide.view.projects && cl.eide.enable.active"

res/data/cmsis_driver_interface_v5_9_0.7z

@@ -1627,32 +1627,37 @@ export abstract class AbstractProject implements CustomConfigurationProvider, Pr
         return dupList;
     }
 
-    installCMSISHeaders() {
+    installCmsisSourceCodePack(pList: { name: string; zippath: string; exportIncs?: string[] } []) {
 
-        const packList = ResManager.GetInstance().getCMSISHeaderPacks();
-        if (packList.length === 0) {
-            GlobalEvent.emit('msg', newMessage('Info', 'Not found available libraries !'));
+        if (pList.length == 0) {
             return;
         }
 
         const doneList: string[] = [];
 
-        for (const packZipFile of packList) {
+        for (const packInfo of pList) {
 
-            const outDir = File.fromArray([this.GetRootDir().path, '.cmsis', packZipFile.noSuffixName]);
+            const outDir = File.fromArray([this.GetRootDir().path, '.cmsis', packInfo.name]);
             const rePath = this.ToRelativePath(outDir.path) || outDir.path;
 
             if (outDir.IsDir()) {
-                GlobalEvent.emit('msg', newMessage('Warning', `'${rePath}' directory is already exists !, Aborted !`));
-                return;
+                GlobalEvent.emit('globalLog', newMessage('Warning', `'${rePath}' directory is already exists !, Aborted !`));
+                continue;
             }
 
             outDir.CreateDir(true);
             const compresser = new SevenZipper(ResManager.GetInstance().Get7zDir());
-            compresser.UnzipSync(packZipFile, outDir);
+            compresser.UnzipSync(new File(packInfo.zippath), outDir);
 
             // add to include folder
-            this.addIncludePaths([outDir.path]);
+            if (packInfo.exportIncs) {
+                const incLi = packInfo.exportIncs.map(p => {
+                    let path = p.trim();
+                    if (path == '.') path = '';
+                    return path ? (outDir.path + File.sep + path) : outDir.path;
+                });
+                this.addIncludePaths(incLi);
+            }
 
             doneList.push(rePath);
         }

src/EIDEProject.ts

@@ -5668,10 +5668,10 @@ export class ProjectExplorer implements CustomConfigurationProvider {
     }
 
     private install_lock: boolean = false;
-    async installCmsisSourcePack(item: ProjTreeItem, type: 'header' | 'lib') {
+    async installCmsisSourcePack(item: ProjTreeItem, type: 'header' | 'lib' | 'idrv') {
 
         if (this.install_lock) {
-            GlobalEvent.emit('msg', newMessage('Warning', 'Operation is busy !'));
+            GlobalEvent.emit('msg', newMessage('Warning', 'Operation is in pending !'));
             return;
         }
 
@@ -5681,10 +5681,34 @@ export class ProjectExplorer implements CustomConfigurationProvider {
 
             const prj = this.dataProvider.GetProjectByIndex(item.val.projectIndex);
             if (prj) {
-                if (type == 'header') {
-                    prj.installCMSISHeaders();
-                } else if (type == 'lib') {
-                    prj.installCmsisLibs();
+                switch (type) {
+                    case 'header':
+                        prj.installCmsisSourceCodePack(
+                            ResManager.GetInstance().getCMSISHeaderPacks().map(f => {
+                                return {
+                                    name: f.noSuffixName,
+                                    zippath: f.path,
+                                    exportIncs: ['.']
+                                }
+                            }));
+                        break;
+                    case 'lib':
+                        prj.installCmsisLibs();
+                        break;
+                    case 'idrv':
+                        prj.installCmsisSourceCodePack([
+                            {
+                                name: 'driver',
+                                zippath: [ResManager.instance().GetAppDataDir().path, 'cmsis_driver_interface_v5_9_0.7z'].join(File.sep),
+                                exportIncs: [
+                                    'Include',
+                                    'VIO/Include'
+                                ]
+                            }
+                        ]);
+                        break;
+                    default:
+                        break;
                 }
             }
 

src/EIDEProjectExplorer.ts

@@ -209,12 +209,14 @@ export async function activate(context: vscode.ExtensionContext) {
     subscriptions.push(vscode.commands.registerCommand('_cl.eide.project.source.modify.path', (item) => projectExplorer.openYamlConfig(item, 'src-path-cfg')));
 
     // package
-    subscriptions.push(vscode.commands.registerCommand('_cl.eide.project.installCMSISHeaders', (item) => projectExplorer.installCmsisSourcePack(item, 'header')));
-    subscriptions.push(vscode.commands.registerCommand('_cl.eide.project.installCmsisLibs', (item) => projectExplorer.installCmsisSourcePack(item, 'lib')));
     subscriptions.push(vscode.commands.registerCommand('_cl.eide.project.removePackage', (item) => projectExplorer.UninstallKeilPackage(item)));
     subscriptions.push(vscode.commands.registerCommand('_cl.eide.project.addPackage', (item) => projectExplorer.InstallKeilPackage(item.val.projectIndex)));
     subscriptions.push(vscode.commands.registerCommand('_cl.eide.project.exportXml', (item) => projectExplorer.ExportKeilXml(item.val.projectIndex)));
     subscriptions.push(vscode.commands.registerCommand('_cl.eide.project.setDevice', (item) => projectExplorer.SetDevice(item.val.projectIndex)));
+    // - cmsis core packages
+    subscriptions.push(vscode.commands.registerCommand('_cl.eide.project.installCMSISHeaders', (item) => projectExplorer.installCmsisSourcePack(item, 'header')));
+    subscriptions.push(vscode.commands.registerCommand('_cl.eide.project.installCmsisLibs', (item) => projectExplorer.installCmsisSourcePack(item, 'lib')));
+    subscriptions.push(vscode.commands.registerCommand('_cl.eide.project.installCmsisDriverInterface', (item) => projectExplorer.installCmsisSourcePack(item, 'idrv')));
 
     // builder
     subscriptions.push(vscode.commands.registerCommand('_cl.eide.project.modifyCompileConfig', (item) => projectExplorer.ModifyCompileConfig(item)));