From 9609105d98782ae4af72ee8a402a5b98989fb52d Mon Sep 17 00:00:00 2001 From: Aaron Qian Date: Tue, 28 Nov 2023 08:49:48 -0800 Subject: [PATCH 1/6] fix AdvancedDecoder not emitting data to real time graph (#961) --- src/frontend/swo/decoders/advanced.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/frontend/swo/decoders/advanced.ts b/src/frontend/swo/decoders/advanced.ts index fcea40fc..042b099b 100644 --- a/src/frontend/swo/decoders/advanced.ts +++ b/src/frontend/swo/decoders/advanced.ts @@ -65,7 +65,7 @@ export class SWORTTAdvancedProcessor extends EventEmitter implements SWORTTDecod public graphData(data: number, id: string) { const message: GrapherDataMessage = { type: 'data', data: data, id: id }; - this.emit('data', message); + this.emit('message', message); } public dispose() { From cfff611cc3578386c7ea83eebe6627bc2c013cef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 20 Feb 2024 14:42:46 -0500 Subject: [PATCH 2/6] Bump ip from 2.0.0 to 2.0.1 in /binary_modules (#984) Bumps [ip](https://github.com/indutny/node-ip) from 2.0.0 to 2.0.1. - [Commits](https://github.com/indutny/node-ip/compare/v2.0.0...v2.0.1) --- updated-dependencies: - dependency-name: ip dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- binary_modules/package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/binary_modules/package-lock.json b/binary_modules/package-lock.json index 9fdb99f4..33314022 100644 --- a/binary_modules/package-lock.json +++ b/binary_modules/package-lock.json @@ -1178,9 +1178,9 @@ "dev": true }, "node_modules/ip": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz", - "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.1.tgz", + "integrity": "sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==", "dev": true }, "node_modules/is-fullwidth-code-point": { @@ -2996,9 +2996,9 @@ "dev": true }, "ip": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz", - "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.1.tgz", + "integrity": "sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==", "dev": true }, "is-fullwidth-code-point": { From 3982f0416a39fe8e7f12b58ec2b1f84ef6d1bfe1 Mon Sep 17 00:00:00 2001 From: Daekeun Kang Date: Mon, 17 Jun 2024 20:21:32 +0900 Subject: [PATCH 3/6] Fix the openocd tcl socket connection problem (#1018) The openocd tcl socket connection problem is caused by the host name 'localhost' which is resolved to '::1' on some systems. This patch changes the host name to '127.0.0.1' to avoid the problem. --- src/openocd.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openocd.ts b/src/openocd.ts index c4543650..11e02a24 100644 --- a/src/openocd.ts +++ b/src/openocd.ts @@ -421,7 +421,7 @@ export class OpenOCDServerController extends EventEmitter implements GDBServerCo const tclPortName = createPortName(0, 'tclPort'); const tclPortNum = this.ports[tclPortName]; const obj = { - host: 'localhost', + host: '127.0.0.1', port: tclPortNum }; this.tclSocket = net.createConnection(obj, () => { From 1b3ca3442f707572e5b7dc42467f21f591e1aaa9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Jun 2024 07:51:24 -0400 Subject: [PATCH 4/6] Bump ip from 1.1.5 to 1.1.9 in /src/remote (#985) Bumps [ip](https://github.com/indutny/node-ip) from 1.1.5 to 1.1.9. - [Commits](https://github.com/indutny/node-ip/compare/v1.1.5...v1.1.9) --- updated-dependencies: - dependency-name: ip dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/remote/package-lock.json | 6 +++--- src/remote/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/remote/package-lock.json b/src/remote/package-lock.json index 39afb320..15c8d3c5 100644 --- a/src/remote/package-lock.json +++ b/src/remote/package-lock.json @@ -1416,9 +1416,9 @@ "dev": true }, "ip": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", - "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=" + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.9.tgz", + "integrity": "sha512-cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ==" }, "is-binary-path": { "version": "2.1.0", diff --git a/src/remote/package.json b/src/remote/package.json index 2611049f..bb65163d 100644 --- a/src/remote/package.json +++ b/src/remote/package.json @@ -57,7 +57,7 @@ }, "dependencies": { "command-exists": "^1.2.9", - "ip": "^1.1.5", + "ip": "^1.1.9", "vscode-jsonrpc": "^6.0.0" } } From aa236fa2415067b419ec53959429f5abf05ebba2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Jun 2024 07:53:48 -0400 Subject: [PATCH 5/6] Bump braces from 3.0.2 to 3.0.3 in /src/remote (#1028) Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3. - [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md) - [Commits](https://github.com/micromatch/braces/compare/3.0.2...3.0.3) --- updated-dependencies: - dependency-name: braces dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/remote/package-lock.json | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/src/remote/package-lock.json b/src/remote/package-lock.json index 15c8d3c5..ea8acd75 100644 --- a/src/remote/package-lock.json +++ b/src/remote/package-lock.json @@ -630,12 +630,23 @@ } }, "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, "requires": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" + }, + "dependencies": { + "fill-range": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", + "dev": true, + "requires": { + "to-regex-range": "^5.0.1" + } + } } }, "browser-stdout": { @@ -1148,15 +1159,6 @@ "flat-cache": "^3.0.4" } }, - "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "dev": true, - "requires": { - "to-regex-range": "^5.0.1" - } - }, "find-up": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", From 695fe9fd9b7ace3a7d9b929ece2ea235092cfd53 Mon Sep 17 00:00:00 2001 From: Eugenio Date: Mon, 17 Jun 2024 13:55:18 +0200 Subject: [PATCH 6/6] Detailed explanation in debug_arguments.md (#1003) * detailed servertype explanation * updated package.json and condensed explanation --- debug_attributes.md | 2 +- package.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debug_attributes.md b/debug_attributes.md index a87a0532..dfca8b59 100644 --- a/debug_attributes.md +++ b/debug_attributes.md @@ -78,7 +78,7 @@ If the type is marked as `{...}` it means that it is a complex item can have mul | serialNumber | string | Both | J-Link or ST-LINK Serial Number - only needed if multiple J-Links/ST-LINKs are connected to the computer | | serverArgs | string[] | Both | Additional arguments to pass to GDB Server command line | | serverpath | string | Both | This setting can be used to override the GDB Server path user/workspace setting for a particular launch configuration. It is the full pathname to the executable or name of executable if it is in your PATH | -| servertype | string | Both | GDB Server type - supported types are jlink, openocd, pyocd, pe, stlink, stutil, qemu, bmp and external. For "external", [please read our Wiki](https://github.com/Marus/cortex-debug/wiki/External-gdb-server-configuration) | +| servertype | string | Both | GDB Server type - supported types are jlink, openocd, pyocd, pe, stlink, stutil, qemu, bmp and external. For "external", [please read our Wiki](https://github.com/Marus/cortex-debug/wiki/External-gdb-server-configuration). The executable in your PATH is used by default, to override this use serverpath. | | showDevDebugOutput | string | Both | Used to debug this extension. Prints all GDB responses to the console. 'raw' prints gdb responses, 'parsed' prints results after parsing, 'both' prints both. 'vscode' shows raw and VSCode interactions | | showDevDebugTimestamps | boolean | Both | Show timestamps when 'showDevDebugOutput' is enabled | | stlinkPath | string | Both | Path to the ST-LINK_gdbserver executable. If not set then ST-LINK_gdbserver (ST-LINK_gdbserver.exe on Windows) must be on the system path. | diff --git a/package.json b/package.json index c22be7ca..e2647338 100644 --- a/package.json +++ b/package.json @@ -519,7 +519,7 @@ "properties": { "servertype": { "type": "string", - "description": "GDB Server type - supported types are jlink, openocd, pyocd, pe, stlink, stutil, qemu, bmp and external. For \"external\", [please read our Wiki](https://github.com/Marus/cortex-debug/wiki/External-gdb-server-configuration)", + "description": "GDB Server type - supported types are jlink, openocd, pyocd, pe, stlink, stutil, qemu, bmp and external. For \"external\", [please read our Wiki](https://github.com/Marus/cortex-debug/wiki/External-gdb-server-configuration). The executable in your PATH is used by default, to override this use serverpath.", "enum": [ "jlink", "openocd", @@ -1619,7 +1619,7 @@ "properties": { "servertype": { "type": "string", - "description": "GDB Server type - supported types are jlink, openocd, pyocd, pe, stlink, stutil, qemu, bmp and external. For \"external\", [please read our Wiki](https://github.com/Marus/cortex-debug/wiki/External-gdb-server-configuration)", + "description": "GDB Server type - supported types are jlink, openocd, pyocd, pe, stlink, stutil, qemu, bmp and external. For \"external\", [please read our Wiki](https://github.com/Marus/cortex-debug/wiki/External-gdb-server-configuration). The executable in your PATH is used by default, to override this use serverpath.", "enum": [ "jlink", "openocd",