From 57f433204bc094f3dde68bf9668dcffe4637251d Mon Sep 17 00:00:00 2001 From: Lotte Steenbrink Date: Wed, 14 Apr 2021 12:13:12 +0200 Subject: [PATCH] [untested] switch rest of dk over to defmt as well --- boards/dk/Cargo.toml | 1 - boards/dk/src/lib.rs | 2 +- boards/dk/src/usbd.rs | 6 +++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/boards/dk/Cargo.toml b/boards/dk/Cargo.toml index 4008bce..6918d1b 100644 --- a/boards/dk/Cargo.toml +++ b/boards/dk/Cargo.toml @@ -10,7 +10,6 @@ cortex-m = "0.6.4" cortex-m-rt = "0.6.13" embedded-hal = "0.2.3" hal = { package = "nrf52840-hal", version = "0.12.1" } -log = "0.4.8" defmt = "0.2.1" defmt-rtt = "0.2.0" panic-probe = { version = "0.2.0", features = ["print-defmt" ] } diff --git a/boards/dk/src/lib.rs b/boards/dk/src/lib.rs index 2de1bd7..d010023 100644 --- a/boards/dk/src/lib.rs +++ b/boards/dk/src/lib.rs @@ -96,7 +96,7 @@ impl Led { /// Turns off the LED pub fn off(&mut self) { - log::trace!( + defmt::trace!( "setting P{}.{} high (LED off)", if self.inner.port() == Port::Port1 { '1' diff --git a/boards/dk/src/usbd.rs b/boards/dk/src/usbd.rs index 7ee6d7e..d1ee75c 100644 --- a/boards/dk/src/usbd.rs +++ b/boards/dk/src/usbd.rs @@ -51,7 +51,7 @@ impl Ep0In { self.busy = true; - log::info!("EP0IN: start {}B transfer", n); + defmt::info!("EP0IN: start {}B transfer", n); // start DMA transfer dma_start(); @@ -75,7 +75,7 @@ impl Ep0In { usbd.events_ep0datadone.reset(); self.busy = false; - log::info!("EP0IN: transfer done"); + defmt::info!("EP0IN: transfer done"); } } } @@ -110,7 +110,7 @@ pub fn init(power: POWER, usbd: &USBD) { // wait until the USB cable has been connected while power.events_usbdetected.read().bits() == 0 { if once { - log::info!("waiting for USB connection on port J3"); + defmt::info!("waiting for USB connection on port J3"); once = false; }