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": { 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 0d4b806f..8e7b2d8d 100644 --- a/package.json +++ b/package.json @@ -535,7 +535,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", @@ -1639,7 +1639,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", 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() { diff --git a/src/openocd.ts b/src/openocd.ts index 130932d7..a551395d 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, () => { diff --git a/src/remote/package-lock.json b/src/remote/package-lock.json index 39afb320..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", @@ -1416,9 +1418,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" } }