Merge branch 'master' of https://github.com/Marus/cortex-debug

.gitignore

@@ -1,7 +1,7 @@
 out
 /node_modules
 /webview/node_modules
-/binary_modules/*/node_modules
+/binary_modules/**/node_modules
 *.vsix
 .vscode-test
 .DS_Store

.vscodeignore

@@ -10,6 +10,6 @@ tsconfig.json
 vsc-extension-quickstart.md
 webpack.config.js
 node_modules
-binary_modules/electron*
+binary_modules
 
 !node_modules/@vscode/webview-ui-toolkit

CHANGELOG.md

@@ -10,6 +10,7 @@
     * It is not clear what (should) happens when you use the `Restart` button when multiple debuggers are active at the same time. For instance in a multi-core session. It may work, but we have not tested it.
   * This is the reason why we implemented the `Reset` button a while ago because VSCode `Restart` meant different (undocumented) behaviors at different times.
   * As a result, all the Restart related launch.json properties no longer apply. But, for compatibility reasons, they still exist and used by the `Reset` functionality when a `Reset` specific property does not exist. This is what used to happen in the previous releases.
+* ST-LINK GDB server (*not* st-util) now supports SWO functionality, using standard configuration options.
 
 # V1.12.1
 * Fix for [#923: Local variables with same name between functions not tracking or updating context](https://github.com/Marus/cortex-debug/issues/923)
@@ -27,9 +28,9 @@ This is a major release. It has been in pre-release for quite a while and some o
   * [RTOS Views](https://marketplace.visualstudio.com/items?itemName=mcu-debug.rtos-views)
   * [Memory View](https://marketplace.visualstudio.com/items?itemName=mcu-debug.memory-view)
   * [Peripheral Viewer](https://marketplace.visualstudio.com/items?itemName=mcu-debug.peripheral-viewer)
- 
+
  *Note: Please install this extension using VSCode with a working internet connection. Do not try to install it manually. If you install it manually, then also make sure all the other dependent extensions are installed.*
-  
+
 # V1.11.3
 * Issue #861: Potential fix
 * Issue #867: STLink make it so that user has to enable `-shared` if needed. Before it was automatically added to the command-line and there was no (good) way to remove it

README.md

@@ -5,7 +5,7 @@
 Debugging support for ARM Cortex-M Microcontrollers with the following features:
 
 * Highly configurable. See https://github.com/Marus/cortex-debug/blob/master/debug_attributes.md
-* Support J-Link, OpenOCD GDB Server, STMicroelectronic's ST-LINK GDB server (no SWO support yet), pyOCD
+* Support J-Link, OpenOCD GDB Server, STMicroelectronic's ST-LINK GDB server, pyOCD
 * Initial support for the Black Magic Probe (This has not been as heavily tested; SWO can only be captured via a serial port)
 * Partial support textane/stlink (st-util) GDB Servers (SWO can only be captured via a serial port)
 * Multi-core and multi-session debugging. See https://github.com/Marus/cortex-debug/wiki/Multi-core-debugging
@@ -23,7 +23,7 @@ Debugging support for ARM Cortex-M Microcontrollers with the following features:
 ![](images/gdb-server.png)
 * Support for SEGGER Real Time Trace (RTT) using OpenOCD and J-Link gdb-servers. All the features supported for SWO (text, binary, graphing) are also supported with RTT. See image above for console style output. SWO output also creates another section.
 * Globals and Static scopes in the variables view
-* Initial support for Rust code (most functionality is working; report any issues
+* Initial support for Rust code (most functionality is working; report any issues)
 * RTOS Thread Support in `CALL STACK` window (J-Link, OpenOCD, pyOCD - RTOS supported depend on GDB server)
     * As a general rule do not try to use stepping instructions before the scheduler of your RTOS has started - in many cases this tends to crash the GDB servers or leave it in an inconsistent state.
 * Live Watch with supported GDB servers (tested with OpenOCD, J-Link, STLink so far - since V1.6)

binary_modules/package.json

@@ -11,6 +11,7 @@
     "electron-rebuild": "^3.2.8"
   },
   "dependencies": {
-    "serialport": "^10.4.0"
+    "serialport": "^10.4.0",
+    "usb": "^2.14.0"
   }
 }

debug_attributes.md

@@ -88,8 +88,8 @@ If the type is marked as `{...}` it means that it is a complex item can have mul
 | swoConfig<br>.enabled | boolean | Both | Enable SWO decoding. |
 | swoConfig<br>.source | string | Both | Source for SWO data. Can either be "probe" to get directly from debug probe, or a serial port device to use a serial port external to the debug probe. |
 | swoConfig<br>.swoFrequency | number | Both | SWO frequency in Hz. |
-| swoConfig<br>.swoPath | string | Both | Path name when source is "file" or "serial". 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 |
+| 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 |
 | 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' |