diff options
| author | Dario Nieuwenhuis <[email protected]> | 2020-11-27 18:42:59 +0100 |
|---|---|---|
| committer | Dario Nieuwenhuis <[email protected]> | 2020-11-27 18:42:59 +0100 |
| commit | 78135a81d96a8bb74207b3f73c9f261aa4561a18 (patch) | |
| tree | 534fb19b9e9d51b557a76617a53934253431f1f4 /examples | |
| parent | 49d5121094fb7e2f4ddc3aead351769443515d55 (diff) | |
Remove anyfmt
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/Cargo.toml | 11 | ||||
| -rw-r--r-- | examples/src/bin/qspi.rs | 3 | ||||
| -rw-r--r-- | examples/src/example_common.rs | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/examples/Cargo.toml b/examples/Cargo.toml index 719f73269..71d0bbd77 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml | |||
| @@ -17,17 +17,16 @@ defmt-error = [] | |||
| 17 | 17 | ||
| 18 | 18 | ||
| 19 | [dependencies] | 19 | [dependencies] |
| 20 | embassy = { version = "0.1.0", path = "../embassy", features = ["defmt"] } | 20 | embassy = { version = "0.1.0", path = "../embassy", features = ["defmt-trace"] } |
| 21 | embassy-nrf = { version = "0.1.0", path = "../embassy-nrf", features = ["defmt", "defmt-trace", "52840"] } | 21 | embassy-nrf = { version = "0.1.0", path = "../embassy-nrf", features = ["defmt-trace", "52840"] } |
| 22 | anyfmt = { version = "0.1.0", path = "../anyfmt", features = ["defmt"] } | ||
| 23 | 22 | ||
| 24 | defmt = "0.1.0" | 23 | defmt = "0.1.2" |
| 25 | defmt-rtt = "0.1.0" | 24 | defmt-rtt = "0.1.0" |
| 26 | 25 | ||
| 27 | cortex-m = { version = "0.6.3" } | 26 | cortex-m = { version = "0.6.3" } |
| 28 | cortex-m-rt = "0.6.12" | 27 | cortex-m-rt = "0.6.12" |
| 29 | embedded-hal = { version = "0.2.4" } | 28 | embedded-hal = { version = "0.2.4" } |
| 30 | panic-probe = "0.1.0" | 29 | panic-probe = "0.1.0" |
| 31 | nrf52840-hal = { version = "0.11.0" } | 30 | nrf52840-hal = { version = "0.12.0" } |
| 32 | futures = { version = "0.3.7", default-features = false, features = ["async-await"] } | 31 | futures = { version = "0.3.8", default-features = false, features = ["async-await"] } |
| 33 | cortex-m-rtic = { git = "https://github.com/rtic-rs/cortex-m-rtic", branch = "master"} | 32 | cortex-m-rtic = { git = "https://github.com/rtic-rs/cortex-m-rtic", branch = "master"} |
diff --git a/examples/src/bin/qspi.rs b/examples/src/bin/qspi.rs index a7f668ca7..644018e2d 100644 --- a/examples/src/bin/qspi.rs +++ b/examples/src/bin/qspi.rs | |||
| @@ -6,8 +6,8 @@ | |||
| 6 | mod example_common; | 6 | mod example_common; |
| 7 | use example_common::*; | 7 | use example_common::*; |
| 8 | 8 | ||
| 9 | use anyfmt::panic; | ||
| 10 | use cortex_m_rt::entry; | 9 | use cortex_m_rt::entry; |
| 10 | use defmt::{assert_eq, panic, *}; | ||
| 11 | use nrf52840_hal::gpio; | 11 | use nrf52840_hal::gpio; |
| 12 | 12 | ||
| 13 | use embassy::executor::{task, Executor}; | 13 | use embassy::executor::{task, Executor}; |
| @@ -65,6 +65,7 @@ async fn run() { | |||
| 65 | write_opcode: qspi::WriteOpcode::PP4IO, | 65 | write_opcode: qspi::WriteOpcode::PP4IO, |
| 66 | xip_offset: 0, | 66 | xip_offset: 0, |
| 67 | write_page_size: qspi::WritePageSize::_256BYTES, | 67 | write_page_size: qspi::WritePageSize::_256BYTES, |
| 68 | deep_power_down: None, | ||
| 68 | }; | 69 | }; |
| 69 | 70 | ||
| 70 | let mut q = qspi::Qspi::new(p.QSPI, config); | 71 | let mut q = qspi::Qspi::new(p.QSPI, config); |
diff --git a/examples/src/example_common.rs b/examples/src/example_common.rs index 1a12fa69a..60bb02082 100644 --- a/examples/src/example_common.rs +++ b/examples/src/example_common.rs | |||
| @@ -4,7 +4,7 @@ use defmt_rtt as _; // global logger | |||
| 4 | use nrf52840_hal as _; | 4 | use nrf52840_hal as _; |
| 5 | use panic_probe as _; | 5 | use panic_probe as _; |
| 6 | 6 | ||
| 7 | pub use anyfmt::*; | 7 | pub use defmt::*; |
| 8 | 8 | ||
| 9 | use core::sync::atomic::{AtomicUsize, Ordering}; | 9 | use core::sync::atomic::{AtomicUsize, Ordering}; |
| 10 | 10 | ||
