Merge pull request #1398 from embassy-rs/probe-rs
Switch from probe-run to probe-rs-cli.
This commit is contained in:
commit
e2410cbb6a
@ -106,10 +106,10 @@ git submodule init
|
|||||||
git submodule update
|
git submodule update
|
||||||
```
|
```
|
||||||
|
|
||||||
- Install `probe-run` with defmt support.
|
- Install `probe-rs-cli` with defmt support.
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
cargo install probe-run
|
cargo install probe-rs-cli
|
||||||
```
|
```
|
||||||
|
|
||||||
- Change directory to the sample's base directory. For example:
|
- Change directory to the sample's base directory. For example:
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
||||||
# replace nRF82840_xxAA with your chip as listed in `probe-run --list-chips`
|
# replace nRF82840_xxAA with your chip as listed in `probe-rs-cli chip list`
|
||||||
runner = "probe-run --chip nRF52840_xxAA"
|
runner = "probe-rs-cli run --chip nRF52840_xxAA"
|
||||||
|
|
||||||
[build]
|
[build]
|
||||||
target = "thumbv7em-none-eabi"
|
target = "thumbv7em-none-eabi"
|
||||||
|
@ -3,7 +3,7 @@ build-std = ["core"]
|
|||||||
build-std-features = ["panic_immediate_abort"]
|
build-std-features = ["panic_immediate_abort"]
|
||||||
|
|
||||||
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
||||||
runner = "probe-run --chip RP2040"
|
runner = "probe-rs-cli run --chip RP2040"
|
||||||
|
|
||||||
[build]
|
[build]
|
||||||
target = "thumbv6m-none-eabi"
|
target = "thumbv6m-none-eabi"
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
||||||
# replace STM32F429ZITx with your chip as listed in `probe-run --list-chips`
|
# replace STM32F429ZITx with your chip as listed in `probe-rs-cli chip list`
|
||||||
runner = "probe-run --chip STM32F303VCTx"
|
runner = "probe-rs-cli run --chip STM32F303VCTx"
|
||||||
|
|
||||||
[build]
|
[build]
|
||||||
target = "thumbv7em-none-eabihf"
|
target = "thumbv7em-none-eabihf"
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
||||||
# replace STM32F429ZITx with your chip as listed in `probe-run --list-chips`
|
# replace STM32F429ZITx with your chip as listed in `probe-rs-cli chip list`
|
||||||
runner = "probe-run --chip STM32F767ZITx -v"
|
runner = "probe-rs-cli run --chip STM32F767ZITx -v"
|
||||||
|
|
||||||
[build]
|
[build]
|
||||||
target = "thumbv7em-none-eabihf"
|
target = "thumbv7em-none-eabihf"
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
||||||
# replace STM32F429ZITx with your chip as listed in `probe-run --list-chips`
|
# replace STM32F429ZITx with your chip as listed in `probe-rs-cli chip list`
|
||||||
runner = "probe-run --chip STM32H743ZITx"
|
runner = "probe-rs-cli run --chip STM32H743ZITx"
|
||||||
|
|
||||||
[build]
|
[build]
|
||||||
target = "thumbv7em-none-eabihf"
|
target = "thumbv7em-none-eabihf"
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
||||||
# replace your chip as listed in `probe-run --list-chips`
|
# replace your chip as listed in `probe-rs-cli chip list`
|
||||||
runner = "probe-run --chip STM32L072CZTx"
|
runner = "probe-rs-cli run --chip STM32L072CZTx"
|
||||||
|
|
||||||
[build]
|
[build]
|
||||||
target = "thumbv6m-none-eabi"
|
target = "thumbv6m-none-eabi"
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
||||||
# replace your chip as listed in `probe-run --list-chips`
|
# replace your chip as listed in `probe-rs-cli chip list`
|
||||||
runner = "probe-run --chip STM32L151CBxxA"
|
runner = "probe-rs-cli run --chip STM32L151CBxxA"
|
||||||
|
|
||||||
[build]
|
[build]
|
||||||
target = "thumbv7m-none-eabi"
|
target = "thumbv7m-none-eabi"
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
||||||
# replace your chip as listed in `probe-run --list-chips`
|
# replace your chip as listed in `probe-rs-cli chip list`
|
||||||
runner = "probe-run --chip STM32L475VG"
|
runner = "probe-rs-cli run --chip STM32L475VG"
|
||||||
|
|
||||||
[build]
|
[build]
|
||||||
target = "thumbv7em-none-eabihf"
|
target = "thumbv7em-none-eabihf"
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
||||||
# replace your chip as listed in `probe-run --list-chips`
|
# replace your chip as listed in `probe-rs-cli chip list`
|
||||||
runner = "probe-run --chip STM32WLE5JCIx"
|
runner = "probe-rs-cli run --chip STM32WLE5JCIx"
|
||||||
|
|
||||||
[build]
|
[build]
|
||||||
target = "thumbv7em-none-eabihf"
|
target = "thumbv7em-none-eabihf"
|
||||||
|
@ -4,7 +4,7 @@ build-std-features = ["panic_immediate_abort"]
|
|||||||
|
|
||||||
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
||||||
#runner = "./fruitrunner"
|
#runner = "./fruitrunner"
|
||||||
runner = "probe-run --chip nrf52840_xxAA"
|
runner = "probe-rs-cli run --chip nrf52840_xxAA"
|
||||||
|
|
||||||
rustflags = [
|
rustflags = [
|
||||||
# Code-size optimizations.
|
# Code-size optimizations.
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
||||||
runner = "probe-run --chip RP2040"
|
runner = "probe-rs-cli run --chip RP2040"
|
||||||
|
|
||||||
[build]
|
[build]
|
||||||
target = "thumbv6m-none-eabi"
|
target = "thumbv6m-none-eabi"
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
||||||
# replace nRF82840_xxAA with your chip as listed in `probe-run --list-chips`
|
# replace nRF82840_xxAA with your chip as listed in `probe-rs-cli chip list`
|
||||||
runner = "probe-run --chip nRF52840_xxAA"
|
runner = "probe-rs-cli run --chip nRF52840_xxAA"
|
||||||
|
|
||||||
[build]
|
[build]
|
||||||
target = "thumbv7em-none-eabi"
|
target = "thumbv7em-none-eabi"
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
||||||
# replace nRF82840_xxAA with your chip as listed in `probe-run --list-chips`
|
# replace nRF82840_xxAA with your chip as listed in `probe-rs-cli chip list`
|
||||||
runner = "probe-run --chip nRF52840_xxAA"
|
runner = "probe-rs-cli run --chip nRF52840_xxAA"
|
||||||
|
|
||||||
[build]
|
[build]
|
||||||
target = "thumbv7em-none-eabi"
|
target = "thumbv7em-none-eabi"
|
||||||
|
@ -14,7 +14,7 @@ async fn main(_spawner: Spawner) {
|
|||||||
let p = embassy_nrf::init(Default::default());
|
let p = embassy_nrf::init(Default::default());
|
||||||
info!("Hello NVMC!");
|
info!("Hello NVMC!");
|
||||||
|
|
||||||
// probe-run breaks without this, I'm not sure why.
|
// probe-rs-cli run breaks without this, I'm not sure why.
|
||||||
Timer::after(Duration::from_secs(1)).await;
|
Timer::after(Duration::from_secs(1)).await;
|
||||||
|
|
||||||
let mut f = Nvmc::new(p.NVMC);
|
let mut f = Nvmc::new(p.NVMC);
|
||||||
|
@ -16,7 +16,7 @@ async fn main(_spawner: Spawner) {
|
|||||||
let mut config = Config::default();
|
let mut config = Config::default();
|
||||||
config.timeout_ticks = 32768 * 3; // 3 seconds
|
config.timeout_ticks = 32768 * 3; // 3 seconds
|
||||||
|
|
||||||
// This is needed for `probe-run` to be able to catch the panic message
|
// This is needed for `probe-rs-cli run` to be able to catch the panic message
|
||||||
// in the WDT interrupt. The core resets 2 ticks after firing the interrupt.
|
// in the WDT interrupt. The core resets 2 ticks after firing the interrupt.
|
||||||
config.run_during_debug_halt = false;
|
config.run_during_debug_halt = false;
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
||||||
# replace nRF5340_xxAA with your chip as listed in `probe-run --list-chips`
|
# replace nRF5340_xxAA with your chip as listed in `probe-rs-cli chip list`
|
||||||
runner = "probe-run --chip nRF5340_xxAA"
|
runner = "probe-rs-cli run --chip nRF5340_xxAA"
|
||||||
|
|
||||||
[build]
|
[build]
|
||||||
target = "thumbv8m.main-none-eabihf"
|
target = "thumbv8m.main-none-eabihf"
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
||||||
# replace STM32G071C8Rx with your chip as listed in `probe-run --list-chips`
|
# replace STM32G071C8Rx with your chip as listed in `probe-rs-cli chip list`
|
||||||
runner = "probe-rs-cli run --speed 100 --chip STM32c031c6tx"
|
runner = "probe-rs-cli run --speed 100 --chip STM32c031c6tx"
|
||||||
|
|
||||||
[build]
|
[build]
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
[target.thumbv6m-none-eabi]
|
[target.thumbv6m-none-eabi]
|
||||||
runner = 'probe-run --chip STM32F091RCTX'
|
runner = 'probe-rs-cli run --chip STM32F091RCTX'
|
||||||
|
|
||||||
[build]
|
[build]
|
||||||
target = "thumbv6m-none-eabi"
|
target = "thumbv6m-none-eabi"
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
||||||
# replace STM32F103C8 with your chip as listed in `probe-run --list-chips`
|
# replace STM32F103C8 with your chip as listed in `probe-rs-cli chip list`
|
||||||
runner = "probe-run --chip STM32F103C8"
|
runner = "probe-rs-cli run --chip STM32F103C8"
|
||||||
|
|
||||||
[build]
|
[build]
|
||||||
target = "thumbv7m-none-eabi"
|
target = "thumbv7m-none-eabi"
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
||||||
# replace STM32F207ZGTx with your chip as listed in `probe-run --list-chips`
|
# replace STM32F207ZGTx with your chip as listed in `probe-rs-cli chip list`
|
||||||
runner = "probe-run --chip STM32F207ZGTx"
|
runner = "probe-rs-cli run --chip STM32F207ZGTx"
|
||||||
|
|
||||||
[build]
|
[build]
|
||||||
target = "thumbv7m-none-eabi"
|
target = "thumbv7m-none-eabi"
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
||||||
# replace STM32F429ZITx with your chip as listed in `probe-run --list-chips`
|
# replace STM32F429ZITx with your chip as listed in `probe-rs-cli chip list`
|
||||||
runner = "probe-run --chip STM32F303ZETx"
|
runner = "probe-rs-cli run --chip STM32F303ZETx"
|
||||||
|
|
||||||
[build]
|
[build]
|
||||||
target = "thumbv7em-none-eabihf"
|
target = "thumbv7em-none-eabihf"
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
||||||
# replace STM32F429ZITx with your chip as listed in `probe-run --list-chips`
|
# replace STM32F429ZITx with your chip as listed in `probe-rs-cli chip list`
|
||||||
runner = "probe-run --chip STM32F429ZITx"
|
runner = "probe-rs-cli run --chip STM32F429ZITx"
|
||||||
|
|
||||||
[build]
|
[build]
|
||||||
target = "thumbv7em-none-eabi"
|
target = "thumbv7em-none-eabi"
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
||||||
# replace STM32F429ZITx with your chip as listed in `probe-run --list-chips`
|
# replace STM32F429ZITx with your chip as listed in `probe-rs-cli chip list`
|
||||||
runner = "probe-run --chip STM32F767ZITx"
|
runner = "probe-rs-cli run --chip STM32F767ZITx"
|
||||||
|
|
||||||
[build]
|
[build]
|
||||||
target = "thumbv7em-none-eabihf"
|
target = "thumbv7em-none-eabihf"
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
||||||
# replace STM32G071C8Rx with your chip as listed in `probe-run --list-chips`
|
# replace STM32G071C8Rx with your chip as listed in `probe-rs-cli chip list`
|
||||||
runner = "probe-run --chip STM32G071RBTx"
|
runner = "probe-rs-cli run --chip STM32G071RBTx"
|
||||||
|
|
||||||
[build]
|
[build]
|
||||||
target = "thumbv6m-none-eabi"
|
target = "thumbv6m-none-eabi"
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
||||||
# replace STM32G071C8Rx with your chip as listed in `probe-run --list-chips`
|
# replace STM32G071C8Rx with your chip as listed in `probe-rs-cli chip list`
|
||||||
runner = "probe-run --chip STM32G484VETx"
|
runner = "probe-rs-cli run --chip STM32G484VETx"
|
||||||
|
|
||||||
[build]
|
[build]
|
||||||
target = "thumbv7em-none-eabi"
|
target = "thumbv7em-none-eabi"
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
[target.thumbv7em-none-eabihf]
|
[target.thumbv7em-none-eabihf]
|
||||||
runner = 'probe-run --chip STM32H743ZITx'
|
runner = 'probe-rs-cli run --chip STM32H743ZITx'
|
||||||
|
|
||||||
[build]
|
[build]
|
||||||
target = "thumbv7em-none-eabihf" # Cortex-M4F and Cortex-M7F (with FPU)
|
target = "thumbv7em-none-eabihf" # Cortex-M4F and Cortex-M7F (with FPU)
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
||||||
# replace your chip as listed in `probe-run --list-chips`
|
# replace your chip as listed in `probe-rs-cli chip list`
|
||||||
runner = "probe-run --chip STM32L053R8Tx"
|
runner = "probe-rs-cli run --chip STM32L053R8Tx"
|
||||||
|
|
||||||
[build]
|
[build]
|
||||||
target = "thumbv6m-none-eabi"
|
target = "thumbv6m-none-eabi"
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
||||||
# replace your chip as listed in `probe-run --list-chips`
|
# replace your chip as listed in `probe-rs-cli chip list`
|
||||||
runner = "probe-run --chip STM32L151CBxxA"
|
runner = "probe-rs-cli run --chip STM32L151CBxxA"
|
||||||
|
|
||||||
[build]
|
[build]
|
||||||
target = "thumbv7m-none-eabi"
|
target = "thumbv7m-none-eabi"
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
||||||
# replace STM32F429ZITx with your chip as listed in `probe-run --list-chips`
|
# replace STM32F429ZITx with your chip as listed in `probe-rs-cli chip list`
|
||||||
#runner = "probe-run --chip STM32L475VGT6"
|
#runner = "probe-rs-cli run --chip STM32L475VGT6"
|
||||||
#runner = "probe-run --chip STM32L475VG"
|
#runner = "probe-rs-cli run --chip STM32L475VG"
|
||||||
runner = "probe-run --chip STM32L4S5VI"
|
runner = "probe-rs-cli run --chip STM32L4S5VI"
|
||||||
|
|
||||||
[build]
|
[build]
|
||||||
target = "thumbv7em-none-eabi"
|
target = "thumbv7em-none-eabi"
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
||||||
# replace STM32L552ZETxQ with your chip as listed in `probe-run --list-chips`
|
# replace STM32L552ZETxQ with your chip as listed in `probe-rs-cli chip list`
|
||||||
runner = "probe-run --chip STM32L552ZETxQ"
|
runner = "probe-rs-cli run --chip STM32L552ZETxQ"
|
||||||
|
|
||||||
[build]
|
[build]
|
||||||
target = "thumbv8m.main-none-eabihf"
|
target = "thumbv8m.main-none-eabihf"
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
||||||
# replace STM32U585AIIx with your chip as listed in `probe-run --list-chips`
|
# replace STM32U585AIIx with your chip as listed in `probe-rs-cli chip list`
|
||||||
runner = "probe-run --chip STM32U585AIIx"
|
runner = "probe-rs-cli run --chip STM32U585AIIx"
|
||||||
|
|
||||||
[build]
|
[build]
|
||||||
target = "thumbv8m.main-none-eabihf"
|
target = "thumbv8m.main-none-eabihf"
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
||||||
# replace STM32WB55CCUx with your chip as listed in `probe-run --list-chips`
|
# replace STM32WB55CCUx with your chip as listed in `probe-rs-cli chip list`
|
||||||
runner = "probe-run --chip STM32WB55CCUx --speed 1000 --connect-under-reset"
|
runner = "probe-rs-cli run --chip STM32WB55CCUx --speed 1000 --connect-under-reset"
|
||||||
|
|
||||||
[build]
|
[build]
|
||||||
target = "thumbv7em-none-eabihf"
|
target = "thumbv7em-none-eabihf"
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
|
||||||
# replace your chip as listed in `probe-run --list-chips`
|
# replace your chip as listed in `probe-rs-cli chip list`
|
||||||
runner = "probe-run --chip STM32WLE5JCIx"
|
runner = "probe-rs-cli run --chip STM32WLE5JCIx"
|
||||||
|
|
||||||
[build]
|
[build]
|
||||||
target = "thumbv7em-none-eabihf"
|
target = "thumbv7em-none-eabihf"
|
||||||
|
Loading…
Reference in New Issue
Block a user