Skip to content

Commit 378bea7

Browse files
authored
Merge pull request #138 from 9names/use-probe-rs
Update tooling to use probe-rs
2 parents 00c54aa + 8837238 commit 378bea7

File tree

4 files changed

+21
-6
lines changed

4 files changed

+21
-6
lines changed

.cargo/config.toml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ xtask = "run --package xtask --"
44
# For micro:bit v1.x
55

66
[target.thumbv6m-none-eabi]
7-
runner = 'probe-run --chip nRF51822_xxAA'
7+
runner = 'probe-rs run --chip nRF51822_xxAA --protocol swd'
88
rustflags = [
99
"-C", "linker=flip-link",
1010
"-C", "link-arg=-Tlink.x",
@@ -14,17 +14,21 @@ rustflags = [
1414
# For micro:bit v2
1515

1616
[target.thumbv7em-none-eabi]
17-
runner = "probe-run --chip nRF52833_xxAA"
17+
runner = "probe-rs run --chip nRF52833_xxAA --protocol swd"
1818
rustflags = [
1919
"-C", "linker=flip-link",
2020
"-C", "link-arg=-Tlink.x",
2121
"-C", "link-arg=-Tdefmt.x",
2222
]
2323

2424
[target.thumbv7em-none-eabihf]
25-
runner = "probe-run --chip nRF52833_xxAA"
25+
runner = "probe-rs run --chip nRF52833_xxAA --protocol swd"
2626
rustflags = [
2727
"-C", "linker=flip-link",
2828
"-C", "link-arg=-Tlink.x",
2929
"-C", "link-arg=-Tdefmt.x",
3030
]
31+
32+
# Enable printing of defmt debug, info and warning messages by default
33+
[env]
34+
DEFMT_LOG="debug"

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
2929
- Updated HAL crates to latest versions.
3030
- Updated to `embedded-hal` 1.0.
3131
- Updated magnetometer example to use `lsm303agr` 0.3.
32+
- Update debug tooling from probe-run to probe-rs
3233

3334
## [0.13.0] - 2022-05-24
3435

Cargo.toml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,13 @@ members = [
77
"examples/*",
88
"xtask",
99
]
10+
11+
# Modify default build profiles to make debugging easier
12+
[profile.release]
13+
debug = 2
14+
lto = "off"
15+
16+
[profile.dev]
17+
debug = 2
18+
opt-level = 1
19+
lto = "off"

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ which crate you need to use.
2424

2525
### Install dependencies
2626

27-
The examples make use of some of the fantastic tooling from the [knurling](https://knurling.ferrous-systems.com/) project.
28-
In order to run the examples you need to install [`probe-run`](https://github.com/knurling-rs/probe-run#installation)
27+
The examples make use of some of the fantastic tooling from the [knurling](https://knurling.ferrous-systems.com/) and [probe-rs](https://probe.rs/) projects.
28+
In order to run the examples you need to install [`probe-rs`](https://probe.rs/docs/getting-started/installation)
2929
and [`flip-link`](https://github.com/knurling-rs/flip-link#installation).
3030

3131
```bash
32-
> cargo install probe-run flip-link
32+
> cargo install probe-rs flip-link
3333
```
3434

3535
### Run an example

0 commit comments

Comments
 (0)