Merge branch 'embassy-rs:master' into master

This commit is contained in:
Chuck Davis
2023-04-26 12:26:19 -05:00
committed by GitHub
34 changed files with 62 additions and 62 deletions

View File

@ -14,7 +14,7 @@ async fn main(_spawner: Spawner) {
let p = embassy_nrf::init(Default::default());
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;
let mut f = Nvmc::new(p.NVMC);

View File

@ -16,7 +16,7 @@ async fn main(_spawner: Spawner) {
let mut config = Config::default();
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.
config.run_during_debug_halt = false;