Merge pull request #10 from eclipse-cdt-cloud/update

Update
eclipse-cdt-cloud · Oct 21, 2023 · f806f20 · f806f20
2 parents 7f2dd7f + 86e1554
commit f806f20
Show file tree

Hide file tree

Showing 30 changed files with 951 additions and 1,574 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -8,7 +8,7 @@ assignees: ''
 ---
 
 <!-- Prior to creating a bug report, please review
-existing issues at https://github.com/cortex-debug/svd-viewer/issues
+existing issues at https://github.com/eclipse-cdt-cloud/vscode-svd-viewer/issues
 to avoid creating duplicates.
 -->
 

diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -10,7 +10,7 @@ assignees: ''
 Type: Feature Request
 
 <!-- Prior to creating a feature request, please review
-existing issues at https://github.com/cortex-debug/svd-viewer/issues
+existing issues at https://github.com/eclipse-cdt-cloud/vscode-svd-viewer/issues
 to avoid creating duplicates.
 -->
 

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -64,7 +64,7 @@ jobs:
           node-version: 14.x
       - name: Publish
         run: |
-          npx ovsx@0.8.0 publish -i artifacts/*/*.vsix -p ${{secrets.OPEN_VSX_TOKEN}}
+          npx ovsx publish -i artifacts/*/*.vsix -p ${{secrets.OPEN_VSX_TOKEN}}
 
   publish-vscode-marketplace:
     needs: build

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## [v1.1.3] - 2023-10-21
+
+### New Features
+
+- Synced with peripheral-viewer
+
 ## [v1.1.1] - 2023-01-30
 
 ### New Features

diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ Standalone SVD Viewer extension extracted from [cortex-debug](https://github.com
 
 The SVD Viewer extension uses [System View Description](http://www.keil.com/pack/doc/CMSIS/SVD/html/index.html) (SVD) files to display information about the selected part, including the Cortex Peripherals view.
 
-Choose one of the following methods to specify your SVD file in your launch configuration:
+Choose one of the following methods to specify your SVD file in your `launch.json` configuration(s):
 
 ### Use the CMSIS pack asset service
 

diff --git a/images/icon.png b/images/icon.png
diff --git a/media/cdtcloud.png b/media/cdtcloud.png
diff --git a/package.json b/package.json
@@ -2,16 +2,26 @@
   "name": "svd-viewer",
   "displayName": "SVD Viewer",
   "description": "Standalone SVD Viewer extension extracted from cortex-debug",
-  "version": "1.2.3",
+  "version": "1.3.0",
   "preview": true,
-  "publisher": "cortex-debug",
-  "author": "Rob Moran <[email protected]>",
+  "publisher": "eclipse-cdt",
+  "author": "marus25",
+  "contributors": [
+    {
+      "name": "Rob Moran",
+      "email": "[email protected]",
+      "url": "https://github.com/thegecko"
+    },
+    {
+      "name": "haneefdm"
+    }
+  ],
   "license": "MIT",
   "main": "dist/desktop/extension.js",
   "browser": "dist/browser/extension.js",
-  "repository": "https://github.com/cortex-debug/svd-viewer",
-  "qna": "https://github.com/cortex-debug/svd-viewer/issues",
-  "icon": "images/icon.png",
+  "repository": "https://github.com/eclipse-cdt-cloud/vscode-svd-viewer",
+  "qna": "https://github.com/eclipse-cdt-cloud/vscode-svd-viewer/issues",
+  "icon": "media/cdtcloud.png",
   "engines": {
     "vscode": "^1.63.2"
   },
@@ -25,7 +35,6 @@
     "watch": "webpack -w",
     "lint": "eslint . --ext .ts,.tsx",
     "package": "vsce package --yarn",
-    "browser": "vscode-test-web --extensionDevelopmentPath=.",
     "serve": "serve --cors -p 9000"
   },
   "dependencies": {
@@ -37,19 +46,18 @@
     "@types/node": "^12.20.0",
     "@types/vscode": "^1.63.2",
     "@types/xml2js": "^0.4.9",
-    "@typescript-eslint/eslint-plugin": "^4.28.0",
-    "@typescript-eslint/parser": "^4.28.0",
-    "@vscode/test-web": "^0.0.24",
+    "@typescript-eslint/eslint-plugin": "^5.49.0",
+    "@typescript-eslint/parser": "^5.49.0",
+    "@vscode/debugprotocol": "^1.59.0",
+    "@vscode/vsce": "^2.17.0",
     "buffer": "^6.0.3",
-    "eslint": "^7.29.0",
+    "eslint": "^8.33.0",
     "path-browserify": "1.0.1",
     "serve": "^14.0.1",
     "stream-browserify": "^3.0.0",
     "timers-browserify": "^2.0.12",
     "ts-loader": "^9.2.6",
-    "typescript": "^3.9.6",
-    "vsce": "^2.6.4",
-    "vscode-debugprotocol": "^1.51.0",
+    "typescript": "^4.9.4",
     "webpack": "^5.70.0",
     "webpack-cli": "4.9.1"
   },
@@ -98,11 +106,6 @@
         "command": "svd-viewer.svd.refreshAll",
         "title": "Refresh All",
         "icon": "$(refresh)"
-      },
-      {
-        "command": "svd-viewer.svd.collapseAll",
-        "title": "Collapse All",
-        "icon": "$(collapse-all)"
       }
     ],
     "menus": {
@@ -134,10 +137,6 @@
         {
           "command": "svd-viewer.svd.refreshAll",
           "when": "false"
-        },
-        {
-          "command": "svd-viewer.svd.collapseAll",
-          "when": "false"
         }
       ],
       "touchBar": [
@@ -171,11 +170,6 @@
           "command": "svd-viewer.svd.refreshAll",
           "when": "view == svd-viewer.svd && debugState == stopped",
           "group": "navigation"
-        },
-        {
-          "command": "svd-viewer.svd.collapseAll",
-          "when": "view == svd-viewer.svd",
-          "group": "navigation"
         }
       ],
       "view/item/context": [
@@ -195,13 +189,13 @@
           "group": "inline"
         },
         {
-          "command": "svd-viewer.svd.updateNode",
-          "when": "view == svd-viewer.svd && viewItem == registerWO",
+          "command": "svd-viewer.svd.copyValue",
+          "when": "view == svd-viewer.svd && viewItem == field",
           "group": "inline"
         },
         {
           "command": "svd-viewer.svd.copyValue",
-          "when": "view == svd-viewer.svd && viewItem == field",
+          "when": "view == svd-viewer.svd && viewItem == fieldRO",
           "group": "inline"
         },
         {
@@ -271,7 +265,7 @@
         },
         "svd-viewer.packAssetUrl": {
           "type": "string",
-          "default": "https://pack-asset-service.keil.arm.com",
+          "default": "https://pack-content.cmsis.io",
           "description": "Base URL for CMSIS pack assets"
         },
         "svd-viewer.svdAddrGapThreshold": {
@@ -284,7 +278,7 @@
         },
         "svd-viewer.saveLayout": {
           "type": "boolean",
-          "default": false,
+          "default": true,
           "description": "Save layout of peripheral view between sessions"
         }
       }

diff --git a/src/addrranges.ts b/src/addrranges.ts
@@ -1,20 +1,9 @@
-/*
- * Copyright 2017-2019 Marcel Ball
- * https://github.com/Marus/cortex-debug
+/********************************************************************************
+ * Copyright (C) 2023 Marcel Ball, Arm Limited and others.
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
- * documentation files (the "Software"), to deal in the Software without restriction, including without
- * limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
- * Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
- * TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the MIT License as outlined in the LICENSE File
+ ********************************************************************************/
 
 export class AddrRange {
     constructor(public base: number, public length: number) {

diff --git a/src/browser/extension.ts b/src/browser/extension.ts
@@ -1,6 +1,9 @@
-/**
- * Copyright (C) 2023 Arm Limited
- */
+/********************************************************************************
+ * Copyright (C) 2023 Marcel Ball, Arm Limited and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the MIT License as outlined in the LICENSE File
+ ********************************************************************************/
 
 import * as vscode from 'vscode';
 import { PeripheralTreeProvider } from '../views/peripheral';
@@ -13,11 +16,11 @@ export const activate = async (context: vscode.ExtensionContext): Promise<SvdReg
     const tracker = new DebugTracker();
     const registry = new SvdRegistry();
     const resolver = new SvdResolver(registry);
-    const peripheralTree = new PeripheralTreeProvider(tracker, resolver);
+    const peripheralTree = new PeripheralTreeProvider(tracker, resolver, context);
     const commands = new Commands(peripheralTree);
 
     await tracker.activate(context);
-    await peripheralTree.activate(context);
+    await peripheralTree.activate();
     await commands.activate(context);
 
     return registry;

diff --git a/src/cmsis-pack/pack-utils.ts b/src/cmsis-pack/pack-utils.ts
@@ -1,6 +1,9 @@
-/**
- * Copyright (C) 2023 Arm Limited
- */
+/********************************************************************************
+ * Copyright (C) 2023 Marcel Ball, Arm Limited and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the MIT License as outlined in the LICENSE File
+ ********************************************************************************/
 
 import * as vscode from 'vscode';
 

diff --git a/src/cmsis-pack/pdsc.ts b/src/cmsis-pack/pdsc.ts
@@ -1,6 +1,9 @@
-/**
- * Copyright (C) 2023 Arm Limited
- */
+/********************************************************************************
+ * Copyright (C) 2023 Marcel Ball, Arm Limited and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the MIT License as outlined in the LICENSE File
+ ********************************************************************************/
 
 /**
  * Interface describing raw PDSC data returned from xml2js

diff --git a/src/commands.ts b/src/commands.ts
@@ -1,20 +1,9 @@
-/*
- * Copyright 2017-2019 Marcel Ball
- * https://github.com/Marus/cortex-debug
+/********************************************************************************
+ * Copyright (C) 2023 Marcel Ball, Arm Limited and others.
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
- * documentation files (the "Software"), to deal in the Software without restriction, including without
- * limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
- * Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
- * TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the MIT License as outlined in the LICENSE File
+ ********************************************************************************/
 
 import * as vscode from 'vscode';
 import * as manifest from './manifest';
@@ -35,7 +24,6 @@ export class Commands {
             vscode.commands.registerCommand(`${manifest.PACKAGE_NAME}.svd.pin`, node => this.peripheralsTogglePin(node)),
             vscode.commands.registerCommand(`${manifest.PACKAGE_NAME}.svd.unpin`, node => this.peripheralsTogglePin(node)),
             vscode.commands.registerCommand(`${manifest.PACKAGE_NAME}.svd.refreshAll`, () => this.peripheralsForceRefresh()),
-            vscode.commands.registerCommand(`${manifest.PACKAGE_NAME}.svd.collapseAll`, () => this.peripheralsCollapseAll())
         );
     }
 
@@ -46,7 +34,7 @@ export class Commands {
                 this.peripheralsForceRefresh();
             }
         } catch (error) {
-            vscode.window.showErrorMessage(`Unable to update value: ${(error as Error).message}`);
+            vscode.debug.activeDebugConsole.appendLine(`Unable to update value: ${(error as Error).message}`);
         }
     }
 
@@ -83,10 +71,6 @@ export class Commands {
         }
     }
 
-    private peripheralsCollapseAll(): void {
-        this.peripheralProvider.collapseAll();
-    }
-
     private peripheralsTogglePin(node: PeripheralBaseNode): void {
         this.peripheralProvider.togglePinPeripheral(node);
         this.peripheralProvider.refresh();

diff --git a/src/common.ts b/src/common.ts
@@ -1,20 +1,9 @@
-/*
- * Copyright 2017-2019 Marcel Ball
- * https://github.com/Marus/cortex-debug
+/********************************************************************************
+ * Copyright (C) 2023 Marcel Ball, Arm Limited and others.
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
- * documentation files (the "Software"), to deal in the Software without restriction, including without
- * limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
- * Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
- * TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the MIT License as outlined in the LICENSE File
+ ********************************************************************************/
 
 export enum NumberFormat {
     Auto = 0,

diff --git a/src/debug-tracker.ts b/src/debug-tracker.ts
@@ -1,6 +1,9 @@
-/**
- * Copyright (C) 2023 Arm Limited
- */
+/********************************************************************************
+ * Copyright (C) 2023 Marcel Ball, Arm Limited and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the MIT License as outlined in the LICENSE File
+ ********************************************************************************/
 
 import * as vscode from 'vscode';
 

diff --git a/src/desktop/extension.ts b/src/desktop/extension.ts
@@ -1,6 +1,9 @@
-/**
- * Copyright (C) 2023 Arm Limited
- */
+/********************************************************************************
+ * Copyright (C) 2023 Marcel Ball, Arm Limited and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the MIT License as outlined in the LICENSE File
+ ********************************************************************************/
 
 import * as vscode from 'vscode';
 import { PeripheralTreeProvider } from '../views/peripheral';
@@ -13,11 +16,11 @@ export const activate = async (context: vscode.ExtensionContext): Promise<SvdReg
     const tracker = new DebugTracker();
     const registry = new SvdRegistry();
     const resolver = new SvdResolver(registry);
-    const peripheralTree = new PeripheralTreeProvider(tracker, resolver);
+    const peripheralTree = new PeripheralTreeProvider(tracker, resolver, context);
     const commands = new Commands(peripheralTree);
 
     await tracker.activate(context);
-    await peripheralTree.activate(context);
+    await peripheralTree.activate();
     await commands.activate(context);
 
     return registry;