Merge branch 'main' into samc21

blackmagic-debug · Oct 30, 2023 · af4fd32 · af4fd32
2 parents 123d5f2 + 0425b88
commit af4fd32
Show file tree

Hide file tree

Showing 48 changed files with 796 additions and 2,405 deletions.
diff --git a/.envrc b/.envrc
@@ -0,0 +1 @@
+use nix --arg pkgs 'import <nixpkgs> { }'
diff --git a/.gitignore b/.gitignore
@@ -24,3 +24,5 @@ src/artifacts/
 src/ftd2xx.dll
 
 scripts/swolisten
+
+.direnv/
diff --git a/README.md b/README.md
@@ -84,25 +84,25 @@ to connect.
 Black Magic Debug App can talk to
 
 * Black Magic Probe firmware probes via the USB-serial port
-* ST-LinkV2 and V3 with recent firmware
+* ST-Link v2, v2.1 and v3 with recent firmware
 * CMSIS-DAP compatible probes
-* JLINK probes
-* FTDI MPSSE based probe.
+* J-Link probes
+* FTDI MPSSE based probes
 
-When connected to a single BMP supported probe, starting "blackmagic" w/o any
+When connected to a single BMP supported probe, starting `blackmagic` w/o any
 arguments starts the server. When several BMP supported probes are connected,
 their types, position and serial number is displayed and the program exits.
-Add "-P (position)" to the next invocation to select one.
+Add `-P (position)` to the next invocation to select one.
 For the setup from the sample session above:
 
 In another terminal:
 
 ```console
 > blackmagic
-Black Magic Debug App v1.8.0
- for Black Magic Probe, ST-Link v2 and v3, CMSIS-DAP, JLink and libftdi/MPSSE
+Black Magic Debug App v1.9.2
+ for Black Magic Probe, ST-Link v2 and v3, CMSIS-DAP, J-Link and FTDI (MPSSE)
 Using 1d50:6018 8BB20A03 Black Magic Debug
- Black Magic Probe  v1.8.0
+ Black Magic Probe  v1.9.2
 Listening on TCP: 2000
 ```
 

diff --git a/scripts/README b/scripts/README
diff --git a/scripts/bootprog.py b/scripts/bootprog.py
diff --git a/scripts/dfu-convert.py b/scripts/dfu-convert.py
Original file line number	Diff line number	Diff line change
Expand Up		@@ -24,3 +24,5 @@ src/artifacts/
		src/ftd2xx.dll

		scripts/swolisten

		.direnv/