mirrors/embedded-trainings-2020
1
0
Fork 0
mirror of https://github.com/ferrous-systems/embedded-trainings-2020.git synced 2024-04-28 14:49:02 +00:00
Code Issues Projects Releases Wiki Activity

rm unused imports and fix logging

Browse source
This commit is contained in:
Mirabellensaft 2022-01-12 17:33:45 +01:00
parent 59f20c1c05
commit 5be260503a
9 changed files with 13 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
advanced/firmware/src/bin/usb-1-solution.rs
View file

@ -46,7 +46,7 @@ mod app {
} }
fn on_event(_usbd: &USBD, event: Event) { fn on_event(_usbd: &USBD, event: Event) {
defmt::println!("USB: {:?}", event); defmt::println!("USB: {}", event);
match event { match event {
Event::UsbReset => { Event::UsbReset => {
@ -58,7 +58,7 @@ mod app {
Event::UsbEp0Setup => { Event::UsbEp0Setup => {
defmt::println!("goal reached; move to the next section"); defmt::println!("goal reached; move to the next section");
asm::bkpt(); dk::exit();
} }
} }
} }

2
advanced/firmware/src/bin/usb-1.rs
View file

@ -53,7 +53,7 @@ mod app {
// leave this at it is for now. // leave this at it is for now.
Event::UsbEp0Setup => { Event::UsbEp0Setup => {
defmt::println!("goal reached; move to the next section"); defmt::println!("goal reached; move to the next section");
asm::bkpt() dk::exit();
} }
} }
} }

1
advanced/firmware/src/bin/usb-2-solution.rs
View file

@ -9,7 +9,6 @@ mod app {
use dk::{ use dk::{
peripheral::USBD, peripheral::USBD,
usbd::{self, Event}, usbd::{self, Event},
Peripherals,
}; };
use usb::{Descriptor, Request}; use usb::{Descriptor, Request};

3
advanced/firmware/src/bin/usb-2.rs
View file

@ -10,7 +10,6 @@ mod app {
use dk::{ use dk::{
peripheral::USBD, peripheral::USBD,
usbd::{self, Event}, usbd::{self, Event},
Peripherals,
}; };
use usb::{Descriptor, Request}; use usb::{Descriptor, Request};
@ -44,7 +43,7 @@ mod app {
} }
fn on_event(_usbd: &USBD, event: Event) { fn on_event(_usbd: &USBD, event: Event) {
defmt::println!("USB: {:?} @ {:?}", event, dk::uptime()); defmt::println!("USB: {} @ {}", event, dk::uptime());
match event { match event {
Event::UsbReset => { Event::UsbReset => {

4
advanced/firmware/src/bin/usb-3-solution.rs
View file

@ -9,8 +9,8 @@ mod app {
use dk::{ use dk::{
peripheral::USBD, peripheral::USBD,
usbd::{self, Ep0In, Event}, usbd::{self, Ep0In, Event},
Peripherals,
}; };
use usb::{Descriptor, Request}; use usb::{Descriptor, Request};
#[local] #[local]
@ -44,7 +44,7 @@ mod app {
} }
fn on_event(usbd: &USBD, ep0in: &mut Ep0In, event: Event) { fn on_event(usbd: &USBD, ep0in: &mut Ep0In, event: Event) {
defmt::println!("USB: {:?} @ {:?}", event, dk::uptime()); defmt::println!("USB: {} @ {}", event, dk::uptime());
match event { match event {
Event::UsbReset => { Event::UsbReset => {

3
advanced/firmware/src/bin/usb-3.rs
View file

@ -9,7 +9,6 @@ mod app {
use dk::{ use dk::{
peripheral::USBD, peripheral::USBD,
usbd::{self, Ep0In, Event}, usbd::{self, Ep0In, Event},
Peripherals,
}; };
use usb::{Descriptor, Request}; use usb::{Descriptor, Request};
@ -43,7 +42,7 @@ mod app {
} }
fn on_event(usbd: &USBD, ep0in: &mut Ep0In, event: Event) { fn on_event(usbd: &USBD, ep0in: &mut Ep0In, event: Event) {
defmt::println!("USB: {:?} @ {:?}", event, dk::uptime()); defmt::println!("USB: {} @ {}", event, dk::uptime());
match event { match event {
Event::UsbReset => { Event::UsbReset => {

5
advanced/firmware/src/bin/usb-4-solution.rs
View file

@ -12,7 +12,6 @@ mod app {
use dk::{ use dk::{
peripheral::USBD, peripheral::USBD,
usbd::{self, Ep0In, Event}, usbd::{self, Ep0In, Event},
Peripherals,
}; };
use usb2::{GetDescriptor as Descriptor, StandardRequest as Request, State}; use usb2::{GetDescriptor as Descriptor, StandardRequest as Request, State};
@ -90,8 +89,8 @@ mod app {
let request = Request::parse(bmrequesttype, brequest, wvalue, windex, wlength) let request = Request::parse(bmrequesttype, brequest, wvalue, windex, wlength)
.expect("Error parsing request"); .expect("Error parsing request");
defmt::println!("EP0: {:?}", defmt::Debug2Format(&request)); defmt::println!("EP0: {}", defmt::Debug2Format(&request));
// ^^^^^^^^^^^^^^^^^^^ this adapter is currently needed to log // ^^^^^^^^^^^^^^^^^^^ this adapter is currently needed to log
// `StandardRequest` with `defmt` // `StandardRequest` with `defmt`
match request { match request {
// section 9.4.3 // section 9.4.3

5
advanced/firmware/src/bin/usb-4.rs
View file

@ -13,7 +13,6 @@ mod app {
use dk::{ use dk::{
peripheral::USBD, peripheral::USBD,
usbd::{self, Ep0In, Event}, usbd::{self, Ep0In, Event},
Peripherals,
}; };
use usb2::State; use usb2::State;
// HEADS UP to use *your* USB packet parser uncomment line 12 and remove line 13 // HEADS UP to use *your* USB packet parser uncomment line 12 and remove line 13
@ -52,7 +51,7 @@ mod app {
} }
fn on_event(usbd: &USBD, ep0in: &mut Ep0In, state: &mut State, event: Event) { fn on_event(usbd: &USBD, ep0in: &mut Ep0In, state: &mut State, event: Event) {
defmt::println!("USB: {:?} @ {:?}", event, dk::uptime()); defmt::println!("USB: {} @ {}", event, dk::uptime());
match event { match event {
// TODO change `state` as specified in chapter 9.1 USB Device States, of the USB specification // TODO change `state` as specified in chapter 9.1 USB Device States, of the USB specification
@ -94,7 +93,7 @@ mod app {
let request = Request::parse(bmrequesttype, brequest, wvalue, windex, wlength) let request = Request::parse(bmrequesttype, brequest, wvalue, windex, wlength)
.expect("Error parsing request"); .expect("Error parsing request");
defmt::println!("EP0: {:?}", defmt::Debug2Format(&request)); defmt::println!("EP0: {}", defmt::Debug2Format(&request));
// ^^^^^^^^^^^^^^^^^^^ this adapter is currently needed to log // ^^^^^^^^^^^^^^^^^^^ this adapter is currently needed to log
// `StandardRequest` with `defmt` // `StandardRequest` with `defmt`

5
advanced/firmware/src/bin/usb-5-solution.rs
View file

@ -12,7 +12,6 @@ mod app {
use dk::{ use dk::{
peripheral::USBD, peripheral::USBD,
usbd::{self, Ep0In, Event}, usbd::{self, Ep0In, Event},
Peripherals,
}; };
use usb2::{GetDescriptor as Descriptor, StandardRequest as Request, State}; use usb2::{GetDescriptor as Descriptor, StandardRequest as Request, State};
@ -47,7 +46,7 @@ mod app {
} }
} }
fn on_event(usbd: &USBD, ep0in: &mut Ep0In, state: &mut State, event: Event) { fn on_event(usbd: &USBD, ep0in: &mut Ep0In, state: &mut State, event: Event) {
defmt::println!("USB: {:?} @ {:?}", event, dk::uptime()); defmt::println!("USB: {} @ {}", event, dk::uptime());
match event { match event {
Event::UsbReset => { Event::UsbReset => {
@ -90,7 +89,7 @@ mod app {
let request = Request::parse(bmrequesttype, brequest, wvalue, windex, wlength) let request = Request::parse(bmrequesttype, brequest, wvalue, windex, wlength)
.expect("Error parsing request"); .expect("Error parsing request");
defmt::println!("EP0: {:?}", defmt::Debug2Format(&request)); defmt::println!("EP0: {}", defmt::Debug2Format(&request));
// ^^^^^^^^^^^^^^^^^^^ this adapter is currently needed to log // ^^^^^^^^^^^^^^^^^^^ this adapter is currently needed to log
// `StandardRequest` with `defmt` // `StandardRequest` with `defmt`