mirrors
/
embedded-trainings-2020
mirror of https://github.com/ferrous-systems/embedded-trainings-2020.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[untested] switch rest of dk over to defmt as well

This commit is contained in:
Lotte Steenbrink 2021-04-14 12:13:12 +02:00 committed by Mirabellensaft
parent 217207f602
commit 57f433204b
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
boards/dk/Cargo.toml
View File

@ -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" ] }

2
boards/dk/src/lib.rs
View File

@ -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'

6
boards/dk/src/usbd.rs
View File

@ -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;
}