Skip to content

Commit 9d93f3a

Browse files
authored
Merge pull request #32 from hn3000/update-readme-probe-run
2 parents ae239b5 + 7158fbd commit 9d93f3a

File tree

1 file changed

+26
-4
lines changed

1 file changed

+26
-4
lines changed

README.md

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,19 @@ The Neotron BIOS uses the [defmt](https://crates.io/crates/defmt) crate to provi
4545
* connect Pin 5 on the *Debugger* Pico to SWDIO on the *Neotron* Pico
4646
* connect USB on the *Debugger* Pico to your PC
4747

48-
2. Flash your *Debugger* Pico with https://github.com/majbthrd/DapperMime firmware (e.g. by copying the UF2 file to the USB Mass Storage device)
48+
2. Flash your *Debugger* Pico with https://github.com/raspberrypi/picoprobe or https://github.com/majbthrd/DapperMime firmware (e.g. by copying the UF2 file to the USB Mass Storage device)
4949

50-
3. On your PC, install [*probe-rs*](https://github.com/knurling-rs/probe-run), the programming tool from [Ferrous System's](https://www.ferrous-systems.com) [Knurling Project](https://github.com/knurling).
50+
3. On your PC, install [*probe-run*](https://github.com/knurling-rs/probe-run), the programming tool from [Ferrous System's](https://www.ferrous-systems.com) [Knurling Project](https://github.com/knurling).
5151

5252
```console
53-
user@host ~ $ cargo install probe-rs
53+
user@host ~ $ cargo install probe-run
5454
```
5555

5656
4. Power on your Neotron Pico.
5757

5858
5. Build the Neotron OS
5959

60-
We use the "neotron-os-pico.ld" linker script to link it at `0x1002_0000`.
60+
We use the "neotron-flash-1002.ld" linker script to link it at `0x1002_0000`.
6161

6262
```console
6363
user@host ~/neotron-os $ cargo build --bin=flash1002 --release --target=thumbv6m-none-eabi
@@ -86,6 +86,28 @@ user@host ~/neotron-pico-bios $ DEFMT_LOG=debug cargo run --release
8686

8787
You should see your Neotron Pico boot, both over RTT in the `probe-run` output, and also on the VGA output.
8888

89+
6a. Multiple probes
90+
91+
If you have multiple probe-rs compatible probes attached to your computer,
92+
you will receive an error message.
93+
94+
You can set the PROBE_RUN_PROBE environment variable to select one of the
95+
available probes, like so:
96+
97+
```console
98+
$ probe-run --list-probes
99+
the following probes were found:
100+
[0]: Picoprobe CMSIS-DAP (VID: 2e8a, PID: 000c, Serial: Exxxxxxxxxxxxxx6, CmsisDap)
101+
[1]: STLink V2 (VID: 0483, PID: 3748, Serial: 0xxxxxxxxxxxxxxxxxxxxxxE, StLink)
102+
user@host ~/neotron-pico-bios $ PROBE_RUN_PROBE='0483:3748' DEFMT_LOG=debug cargo run --release
103+
```
104+
105+
You can also just provide the probe Serial, for example if you have multiple
106+
identical probes.
107+
108+
The documentation for this feature can be found at
109+
<https://github.com/knurling-rs/probe-run#12-multiple-probes>
110+
89111
## Changelog
90112

91113
See [CHANGELOG.md](./CHANGELOG.md)

0 commit comments

Comments
 (0)