Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bumping USB dependencies, using probe-rs-cli for cargo-runner #853

Merged
merged 2 commits into from
Mar 6, 2024
Merged

Bumping USB dependencies, using probe-rs-cli for cargo-runner #853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dcaa89b
Bumping USB dependencies, using probe-rs-cli for cargo-runner
ryan-summers Mar 6, 2024
4bd7a2c
Reverting unintended changes
ryan-summers Mar 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .cargo/config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
runner = "probe-run --chip STM32H743ZITx --speed 30000"
runner = "probe-rs run --chip STM32H743ZITx --speed 30000"
# runner = "gdb-multiarch -q -x openocd.gdb"
rustflags = [
"-C", "link-arg=-Tlink.x",
Expand Down
5 changes: 3 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 1 addition & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ enum-iterator = "1.4.1"
rand_xorshift = "0.3.0"
rand_core = "0.6.4"
minimq = "0.8.0"
usb-device = "0.3.0"
usb-device = "0.3.2"
usbd-serial = "0.2"
# Keep this synced with the miniconf version in py/setup.py
miniconf = "0.9.0"
Expand All @@ -76,9 +76,6 @@ bbqueue = "0.5"
postcard = "1"
bit_field = "0.10.2"

[patch.crates-io.usb-device]
git = "https://github.com/rust-embedded-community/usb-device"

[build-dependencies]
built = { version = "0.7", features = ["git2"], default-features = false }

Expand Down
4 changes: 2 additions & 2 deletions book/src/setup.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,9 @@ To observe logging messages or to develop and debug applications a SWD/JTAG
probe is required. To use a compatible probe with `probe-run` connect it as
described [above](#st-link-virtual-mass-storage).

1. Install `probe-run`
1. Install `probe-rs`
```bash
cargo install probe-run
cargo install probe-rs --features cli
```
2. Build and run firmware on the device
```bash
Expand Down
Loading