Merge remote-tracking branch 'upstream/master'

Avlaak · Avlaak · commit 0e79c177a268 · 2026-04-15T18:04:03.000+03:00
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -2,60 +2,72 @@ name: CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
-    branches: [ master ]
+    branches: [master]
 
 jobs:
   setup:
     name: Setup
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - name: Cache NPM Install
-      id: cache-npm
-      uses: actions/cache@v3
-      with:
-        path: ./node_modules
-        key: npm-${{ hashFiles('./package-lock.json') }}
-    - name: Install NPM dependencies
-      if: steps.cache-npm.outputs.cache-hit != 'true'
-      run: |
-        npm install
+      - uses: actions/checkout@v3
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "22"
+      - name: Cache NPM Install
+        id: cache-npm
+        uses: actions/cache@v3
+        with:
+          path: ./node_modules
+          key: npm-${{ hashFiles('./package-lock.json') }}
+      - name: Install NPM dependencies
+        if: steps.cache-npm.outputs.cache-hit != 'true'
+        run: |
+          npm install
 
   build:
     name: Build
     needs: setup
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - name: Load NPM install
-      id: cache-npm
-      uses: actions/cache@v3
-      with:
-        path: ./node_modules
-        key: npm-${{ hashFiles('./package-lock.json') }}
-    - name: Install VSCE for packaging
-      run: npm install vsce
-    - name: Package Binary
-      run: ./node_modules/vsce/vsce package -o cortex-debug.vsix
-    - name: Upload Artifact
-      uses: actions/upload-artifact@v4
-      with:
-        name: cortex-debug.vsix
-        path: ./cortex-debug.vsix
+      - uses: actions/checkout@v3
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "22"
+      - name: Load NPM install
+        id: cache-npm
+        uses: actions/cache@v3
+        with:
+          path: ./node_modules
+          key: npm-${{ hashFiles('./package-lock.json') }}
+      - name: Install VSCE for packaging
+        run: npm install vsce
+      - name: Package Binary
+        run: ./node_modules/vsce/vsce package -o cortex-debug.vsix
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: cortex-debug.vsix
+          path: ./cortex-debug.vsix
 
   lint:
     name: Lint
     needs: setup
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - name: Load NPM install
-      id: cache-npm
-      uses: actions/cache@v3
-      with:
-        path: ./node_modules
-        key: npm-${{ hashFiles('./package-lock.json') }}
-    - name: Lint Project
-      run: npm run lint
+      - uses: actions/checkout@v3
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "22"
+      - name: Load NPM install
+        id: cache-npm
+        uses: actions/cache@v3
+        with:
+          path: ./node_modules
+          key: npm-${{ hashFiles('./package-lock.json') }}
+      - name: Lint Project
+        run: npm run lint
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -231,7 +231,7 @@ This is a major release. It has been in pre-release for quite a while and some o
 * You can also use **Microsoft Embedded Tools** and their RTOS views as we are now compatible with each other
 * Microsoft Embedded Tools also added compatibility for Cortex-Debug for their version of Peripheral Views/Registers. They also helped with integrating Cortex-Debug with MS built-in Hex-Editor. To use MS Peripheral View, use `svdPath` in launch.json. `svdFile` uses the SVD feature from Cortex-Debug. You can use both at the same time if you wish but you should typically use only one.
 * Fixed a long standing issue with OpenOCD RTT where there was no good way to know when to start the RTT. We can now poll until RTT is detected and enabled. See `rttConfig.rtt_start_retry` in your launch.json to control who the polling works.
-* Support for loading alternate symbol files instead of the `"executable"` using a new launch.json property `"symbolFiles"`. See the Wiki [documentation here](https://github.com/Marus/cortex-debug/wiki/Overview#debug-files). This is in addition to the already existing `"loadFiles"` which is used to customizing the programming of the device
+* Support for loading alternate symbol files instead of the `"executable"` using a new launch.json property `"symbolFiles"`. See the Wiki [documentation here](https://github.com/Marus/cortex-debug/wiki/Cortex-Debug-Under-the-hood#debug-files). This is in addition to the already existing `"loadFiles"` which is used to customizing the programming of the device
 * You can now use `breakAfterReset` and `runToEntryPoint` for an `attach` type launch configuration as well but they will only be used on a reset/restart.
 * For chained configuration, the parent can override properties of children and/or allow children to inherit from itself using `overrides` and `inherits`.
 * Of course, many issues fixed: thanks to the community with reporting them helping fixing them
@@ -265,7 +265,7 @@ This is a major release. It has been in pre-release for quite a while and some o
 # V1.5.1
 
 ## New features
-* Support for loading alternate symbol files instead of the `"executable"` using a new launch.json property `"symbolFiles"`. See the Wiki [documentation here](https://github.com/Marus/cortex-debug/wiki/Overview#debug-files). This is in addition to the already existing `"loadFiles"` which is used to customizing the programming of the device
+* Support for loading alternate symbol files instead of the `"executable"` using a new launch.json property `"symbolFiles"`. See the Wiki [documentation here](https://github.com/Marus/cortex-debug/wiki/Cortex-Debug-Under-the-hood#debug-files). This is in addition to the already existing `"loadFiles"` which is used to customizing the programming of the device
 * You can now use `breakAfterReset` and `runToEntryPoint` for an `attach` type launch configuration as well but they will only be used on a reset/restart.
 * For chained configuration, the parent can override properties of children and/or allow children to inherit from itself using `overrides` and `inherits`.
 
diff --git a/debug_attributes.md b/debug_attributes.md
@@ -101,8 +101,8 @@ If the type is marked as `{...}` it means that it is a complex item can have mul
 | swoConfig<br>.swoEncoding | string | Both | BMP only: SWO encoding data used at the line level. Depends on the probe hardware, native (the original one) supports only Manchester (self-clocked, but slower rates) while most other platforms (e.g. ST-LINK with BMP firmware) support only UART (frequency/baud rate has to match to within ~2%). |
 | swoConfig<br>.swoFrequency | number | Both | SWO frequency in Hz. |
 | swoConfig<br>.swoPath | string | Both | Path name when source is "file" or "serial", device name regex match when source is "probe" for BMP. Typically a /path-name or a serial-port-name |
-| swoConfig<br>.swoPort | string | Both | When server is "external" && source is "socket", port to connect to. Format [host:]port. For BMP, specifies the regex match of the USB interface contianing raw SWO data. |
-| symbolFiles | object[] | Both | Array of ELF files to load symbols from instead of the executable file. Each item in the array cab be a string or an object. Program information is ignored (see `loadFiles`). Can be an empty list to specify none. If this property does not exist, then the executable is used for symbols |
+| swoConfig<br>.swoPort | string | Both | When server is "external" && source is "socket", port to connect to. Format [host:]port. For BMP, specifies the regex match of the USB interface containing raw SWO data. |
+| symbolFiles | object[] | Both | Array of ELF files to load symbols from instead of the executable file. Each item in the array can be a string or an object. Program information is ignored (see `loadFiles`). Can be an empty list to specify none. If this property does not exist, then the executable is used for symbols |
 | targetId | string &#124; number | Both | On BMP this is the ID number that should be passed to the attach command (defaults to 1); for PyOCD this is the target identifier (only needed for custom hardware) |
 | targetProcessor | number | Both | The processor you want to debug. Zero based integer index. Must be less than 'numberOfProcessors' |
 | toolchainPrefix | string | Both | This setting can be used to override the toolchainPrefix user setting for a particular launch configuration. Default = "arm-none-eabi" |
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -722,7 +722,7 @@
                                 "type": "string"
                             },
                             "symbolFiles": {
-                                "description": "Array of ELF files to load symbols from instead of the executable file. Each item in the array cab be a string or an object. Program information is ignored (see `loadFiles`). Can be an empty list to specify none. If this property does not exist, then the executable is used for symbols",
+                                "description": "Array of ELF files to load symbols from instead of the executable file. Each item in the array can be a string or an object. Program information is ignored (see `loadFiles`). Can be an empty list to specify none. If this property does not exist, then the executable is used for symbols",
                                 "type": "array",
                                 "items": {
                                     "type": [
@@ -1924,7 +1924,7 @@
                                 "default": null
                             },
                             "symbolFiles": {
-                                "description": "Array of ELF files to load symbols from instead of the executable file. Each item in the array cab be a string or an object. Program information is ignored (see `loadFiles`). Can be an empty list to specify none. If this property does not exist, then the executable is used for symbols",
+                                "description": "Array of ELF files to load symbols from instead of the executable file. Each item in the array can be a string or an object. Program information is ignored (see `loadFiles`). Can be an empty list to specify none. If this property does not exist, then the executable is used for symbols",
                                 "type": "array",
                                 "items": {
                                     "type": [
@@ -2680,7 +2680,7 @@
                                     "swoPort": {
                                         "type": "string",
                                         "default": "",
-                                        "description": "When server is \"external\" && source is \"socket\", port to connect to. Format [host:]port. For BMP, specifies the regex match of the USB interface contianing raw SWO data."
+                                        "description": "When server is \"external\" && source is \"socket\", port to connect to. Format [host:]port. For BMP, specifies the regex match of the USB interface containing raw SWO data."
                                     },
                                     "decoders": {
                                         "description": "SWO Decoder Configuration",
@@ -3232,7 +3232,7 @@
     "devDependencies": {
         "@stylistic/eslint-plugin": "^2.13.0",
         "@types/mocha": "^10.0.10",
-        "@types/node": "16.x",
+        "@types/node": "22.x",
         "@types/vscode": "^1.69.0",
         "@vscode/debugadapter": "^1.68.0",
         "@vscode/debugprotocol": "^1.68.0",
diff --git a/src/backend/mi2/mi2.ts b/src/backend/mi2/mi2.ts
@@ -96,7 +96,7 @@ export class MI2 extends EventEmitter implements IBackend {
                         reject(new Error('Could not start gdb, no response from gdb'));
                     }, 10);
                     timeout = undefined;
-                }, 5000);
+                }, 10 * 1000);
 
                 const swallOutput = this.debugOutput ? false : true;
                 let v;
@@ -756,14 +756,13 @@ export class MI2 extends EventEmitter implements IBackend {
                     breakpoint.number = bkptNum;
 
                     if (breakpoint.condition) {
-                        this.setBreakPointCondition(bkptNum, breakpoint.condition).then((result) => {
+                        Promise.resolve(this.setBreakPointCondition(bkptNum, breakpoint.condition)).then((result) => {
                             if (result.resultRecords.resultClass === 'done') {
                                 resolve(breakpoint);
                             } else {
                                 reject(new MIError(result.result('msg') || 'Internal error', 'Setting breakpoint condition'));
                             }
-                        },
-                        (reason) => {
+                        }).catch((reason) => {
                             // Just delete the breakpoint we just created as the condition creation failed
                             this.sendCommand(`break-delete ${bkptNum}`).then((x) => { }, (e) => { });
                             reject(reason);     // Use this reason as reason for failing to create the breakpoint
diff --git a/src/frontend/swo/sources/fifo.ts b/src/frontend/swo/sources/fifo.ts
@@ -12,7 +12,7 @@ export class FifoSWOSource extends EventEmitter implements SWORTTSource {
         this.stream.on('data', (buffer) => {
             this.emit('data', buffer);
         });
-        this.stream.on('close', (buffer) => {
+        this.stream.on('close', () => {
             this.emit('disconnected');
         });
         this.connected = true;
diff --git a/src/remote/package-lock.json b/src/remote/package-lock.json
diff --git a/src/remote/package.json b/src/remote/package.json
