diff options
| author | Bob McWhirter <bmcwhirt@redhat.com> | 2021-11-15 14:37:19 -0500 |
|---|---|---|
| committer | Bob McWhirter <bmcwhirt@redhat.com> | 2021-11-15 15:11:11 -0500 |
| commit | c0cfccffc7c44c88cb9580b1496569d3e9de1848 (patch) | |
| tree | d2583a3adf1df68ed47c333865ad5fae91200787 /examples | |
| parent | fae86722ac818c275920b8b78e0b34ea274e56d8 (diff) | |
| download | nrf-softdevice-c0cfccffc7c44c88cb9580b1496569d3e9de1848.zip | |
Update toolchain and defmt versions.
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/Cargo.toml | 13 | ||||
| -rw-r--r-- | examples/src/bin/ble_l2cap_central.rs | 2 | ||||
| -rw-r--r-- | examples/src/example_common.rs | 2 |
3 files changed, 4 insertions, 13 deletions
diff --git a/examples/Cargo.toml b/examples/Cargo.toml index 5fac497..995b6f4 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -6,17 +6,10 @@ version = "0.1.0" [features] default = [ - "defmt-default", "ble-l2cap", "ble-gatt-server", "ble-gatt-client", ] -defmt-default = [] -defmt-trace = [] -defmt-debug = [] -defmt-info = [] -defmt-warn = [] -defmt-error = [] ble-l2cap = ["nrf-softdevice/ble-l2cap"] ble-gatt-server = ["nrf-softdevice/ble-gatt-server"] @@ -28,10 +21,10 @@ embassy-traits = { version = "0.1.0", features = ["defmt"]} embassy-nrf = { version = "0.1.0", features = [ "defmt", "nrf52840", "gpiote", "time-driver-rtc1" ]} cortex-m = { version = "0.7.2" } cortex-m-rt = "0.7.0" -defmt = { version = "0.2.0", features = ["alloc"] } +defmt = { version = "0.3", features = ["alloc"] } nrf-softdevice-defmt-rtt = { path = "../nrf-softdevice-defmt-rtt", version = "0.1.0" } -panic-probe = { version = "0.2.0", features= ["print-defmt"] } -nrf-softdevice = { version = "0.1.0", path = "../nrf-softdevice", features = ["defmt", "defmt-trace", "nrf52840", "s140", "ble-peripheral", "ble-central", "critical-section-impl"] } +panic-probe = { version = "0.3", features= ["print-defmt"] } +nrf-softdevice = { version = "0.1.0", path = "../nrf-softdevice", features = ["defmt", "nrf52840", "s140", "ble-peripheral", "ble-central", "critical-section-impl"] } nrf-softdevice-s140 = { version = "0.1.1", path = "../nrf-softdevice-s140" } futures = { version = "0.3.5", default-features = false } fixed = "1.2.0" diff --git a/examples/src/bin/ble_l2cap_central.rs b/examples/src/bin/ble_l2cap_central.rs index 1637cf5..4a1817e 100644 --- a/examples/src/bin/ble_l2cap_central.rs +++ b/examples/src/bin/ble_l2cap_central.rs @@ -13,7 +13,7 @@ use core::ptr::NonNull; use core::slice; use cortex_m_rt::entry; use defmt::info; -use defmt::*; +use defmt::{unreachable, *}; use embassy::executor::Executor; use embassy::util::Forever; diff --git a/examples/src/example_common.rs b/examples/src/example_common.rs index ba6eef0..f402f7f 100644 --- a/examples/src/example_common.rs +++ b/examples/src/example_common.rs @@ -20,8 +20,6 @@ fn alloc_error(_layout: Layout) -> ! { panic!("Alloc error"); } -const HEAP_SIZE: usize = 32 * 1024; // in bytes - defmt::timestamp! {"{=u64}", { static COUNT: AtomicUsize = AtomicUsize::new(0); // NOTE(no-CAS) `timestamps` runs with interrupts disabled |