mirrors/embedded-trainings-2020
1
0
Fork 0
mirror of https://github.com/ferrous-systems/embedded-trainings-2020.git synced 2024-04-29 07:08:56 +00:00
Code Issues Projects Releases Wiki Activity

rustfmt

Browse source
This commit is contained in:
Mirabellensaft 2022-01-12 21:54:59 +01:00
parent f8b38e1d88
commit 02e9012e8e
13 changed files with 188 additions and 166 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
advanced/firmware/src/bin/events.rs
View file

@ -1,7 +1,6 @@
#![no_main]
#![no_std]
// this imports `beginner/apps/lib.rs` to retrieve our global logger + panicking-behavior
use firmware as _;
@ -10,12 +9,10 @@ mod app {
use cortex_m::asm;
#[local]
struct MyLocalResources {
}
struct MyLocalResources {}
#[shared]
struct MySharedResources {
}
struct MySharedResources {}
#[init]
fn init(_cx: init::Context) -> (MySharedResources, MyLocalResources, init::Monotonics) {
@ -50,7 +47,11 @@ mod app {
// ^^^^^^^^^^ bitfield name
defmt::println!("USBREGSTATUS.VBUSDETECT: {}", vbusdetect);
(MySharedResources {}, MyLocalResources {}, init::Monotonics())
(
MySharedResources {},
MyLocalResources {},
init::Monotonics(),
)
}
#[idle]

6
advanced/firmware/src/bin/resource-solution.rs
View file

@ -16,8 +16,7 @@ mod app {
}
#[shared]
struct MySharedResources {
}
struct MySharedResources {}
#[init]
fn init(_cx: init::Context) -> (MySharedResources, MyLocalResources, init::Monotonics) {
@ -35,11 +34,10 @@ mod app {
power,
counter: 0, // <- initialize the new resource
},
init::Monotonics()
init::Monotonics(),
)
}
#[idle]
fn idle(_cx: idle::Context) -> ! {
loop {

10
advanced/firmware/src/bin/resource.rs
View file

@ -15,9 +15,7 @@ mod app {
}
#[shared]
struct MySharedResources {
}
struct MySharedResources {}
#[init]
fn init(_cx: init::Context) -> (MySharedResources, MyLocalResources, init::Monotonics) {
@ -29,7 +27,11 @@ mod app {
defmt::println!("USBDETECTED interrupt enabled");
(MySharedResources {}, MyLocalResources {power}, init::Monotonics())
(
MySharedResources {},
MyLocalResources { power },
init::Monotonics(),
)
}
#[idle]

14
advanced/firmware/src/bin/rtic-hello.rs
View file

@ -1,7 +1,6 @@
#![no_main]
#![no_std]
// this imports `beginner/apps/lib.rs` to retrieve our global logger + panicking-behavior
use firmware as _;
@ -10,20 +9,21 @@ mod app {
use cortex_m::asm;
#[local]
struct MyLocalResources {
}
struct MyLocalResources {}
#[shared]
struct MySharedResources {
}
struct MySharedResources {}
#[init]
fn init(_cx: init::Context) -> (MySharedResources, MyLocalResources, init::Monotonics) {
dk::init().unwrap();
defmt::println!("Hello");
(MySharedResources {}, MyLocalResources {}, init::Monotonics())
(
MySharedResources {},
MyLocalResources {},
init::Monotonics(),
)
}
#[idle]

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

@ -1,7 +1,6 @@
#![no_main]
#![no_std]
// this imports `beginner/apps/lib.rs` to retrieve our global logger + panicking-behavior
use firmware as _;
@ -19,9 +18,7 @@ mod app {
}
#[shared]
struct MySharedResources {
}
struct MySharedResources {}
#[init]
fn init(_cx: init::Context) -> (MySharedResources, MyLocalResources, init::Monotonics) {
@ -33,7 +30,11 @@ mod app {
defmt::println!("USBD initialized");
(MySharedResources {}, MyLocalResources {usbd: board.usbd }, init::Monotonics())
(
MySharedResources {},
MyLocalResources { usbd: board.usbd },
init::Monotonics(),
)
}
#[task(binds = USBD, local = [usbd])]
@ -63,5 +64,3 @@ mod app {
}
}
}

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

@ -18,8 +18,7 @@ mod app {
}
#[shared]
struct MySharedResources {
}
struct MySharedResources {}
#[init]
fn init(_cx: init::Context) -> (MySharedResources, MyLocalResources, init::Monotonics) {
@ -31,7 +30,11 @@ mod app {
defmt::println!("USBD initialized");
(MySharedResources {}, MyLocalResources { usbd: board.usbd }, init::Monotonics())
(
MySharedResources {},
MyLocalResources { usbd: board.usbd },
init::Monotonics(),
)
}
#[task(binds = USBD, local = [usbd])]
@ -58,5 +61,3 @@ mod app {
}
}
}

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

@ -19,8 +19,7 @@ mod app {
}
#[shared]
struct MySharedResources {
}
struct MySharedResources {}
#[init]
fn init(_cx: init::Context) -> (MySharedResources, MyLocalResources, init::Monotonics) {
@ -28,7 +27,11 @@ mod app {
usbd::init(board.power, &board.usbd);
(MySharedResources {}, MyLocalResources { usbd: board.usbd }, init::Monotonics())
(
MySharedResources {},
MyLocalResources { usbd: board.usbd },
init::Monotonics(),
)
}
#[task(binds = USBD, local = [usbd])]
@ -107,4 +110,3 @@ mod app {
}
}
}

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

@ -1,7 +1,6 @@
#![no_main]
#![no_std]
// this imports `beginner/apps/lib.rs` to retrieve our global logger + panicking-behavior
use firmware as _;
@ -20,9 +19,7 @@ mod app {
}
#[shared]
struct MySharedResources {
}
struct MySharedResources {}
#[init]
fn init(_cx: init::Context) -> (MySharedResources, MyLocalResources, init::Monotonics) {
@ -30,7 +27,11 @@ mod app {
usbd::init(board.power, &board.usbd);
(MySharedResources {}, MyLocalResources { usbd: board.usbd }, init::Monotonics())
(
MySharedResources {},
MyLocalResources { usbd: board.usbd },
init::Monotonics(),
)
}
#[task(binds = USBD, local = [usbd])]
@ -104,4 +105,3 @@ mod app {
}
}
}

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

@ -20,9 +20,7 @@ mod app {
}
#[shared]
struct MySharedResources {
}
struct MySharedResources {}
#[init]
fn init(_cx: init::Context) -> (MySharedResources, MyLocalResources, init::Monotonics) {
@ -30,7 +28,14 @@ mod app {
usbd::init(board.power, &board.usbd);
(MySharedResources {}, MyLocalResources { usbd: board.usbd, ep0in: board.ep0in, }, init::Monotonics())
(
MySharedResources {},
MyLocalResources {
usbd: board.usbd,
ep0in: board.ep0in,
},
init::Monotonics(),
)
}
#[task(binds = USBD, local = [usbd, ep0in])]
@ -92,7 +97,8 @@ mod app {
idVendor: consts::VID,
};
let desc_bytes = desc.bytes();
let resp = &desc_bytes[..core::cmp::min(desc_bytes.len(), usize::from(length))];
let resp =
&desc_bytes[..core::cmp::min(desc_bytes.len(), usize::from(length))];
ep0in.start(&resp, usbd);
}
Request::SetAddress { .. } => {
@ -110,6 +116,4 @@ mod app {
}
}
}
}

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

@ -19,16 +19,21 @@ mod app {
}
#[shared]
struct MySharedResources {
}
struct MySharedResources {}
#[init]
fn init(_cx: init::Context) -> (MySharedResources, MyLocalResources, init::Monotonics) {
let board = dk::init().unwrap();
usbd::init(board.power, &board.usbd);
(MySharedResources {}, MyLocalResources { usbd: board.usbd, ep0in: board.ep0in, }, init::Monotonics())
(
MySharedResources {},
MyLocalResources {
usbd: board.usbd,
ep0in: board.ep0in,
},
init::Monotonics(),
)
}
#[task(binds = USBD, local = [usbd, ep0in])]
@ -96,6 +101,4 @@ mod app {
}
}
}
}

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

@ -23,16 +23,22 @@ mod app {
}
#[shared]
struct MySharedResources {
}
struct MySharedResources {}
#[init]
fn init(_cx: init::Context) -> (MySharedResources, MyLocalResources, init::Monotonics) {
let board = dk::init().unwrap();
usbd::init(board.power, &board.usbd);
(MySharedResources {}, MyLocalResources { usbd: board.usbd, ep0in: board.ep0in, state: State::Default, }, init::Monotonics())
(
MySharedResources {},
MyLocalResources {
usbd: board.usbd,
ep0in: board.ep0in,
state: State::Default,
},
init::Monotonics(),
)
}
#[task(binds = USBD, local = [usbd, ep0in, state])]
@ -186,6 +192,4 @@ mod app {
Ok(())
}
}

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

@ -4,7 +4,6 @@
// this imports `beginner/apps/lib.rs` to retrieve our global logger + panicking-behavior
use firmware as _;
#[rtic::app(device = dk, peripherals = false)]
mod app {
@ -27,8 +26,7 @@ mod app {
}
#[shared]
struct MySharedResources {
}
struct MySharedResources {}
#[init]
fn init(_cx: init::Context) -> (MySharedResources, MyLocalResources, init::Monotonics) {
@ -36,7 +34,15 @@ mod app {
usbd::init(board.power, &board.usbd);
(MySharedResources {}, MyLocalResources { usbd: board.usbd, ep0in: board.ep0in, state: State::Default, }, init::Monotonics())
(
MySharedResources {},
MyLocalResources {
usbd: board.usbd,
ep0in: board.ep0in,
state: State::Default,
},
init::Monotonics(),
)
}
#[task(binds = USBD, local = [usbd, ep0in, state])]
@ -137,6 +143,4 @@ mod app {
Ok(())
}
}

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

@ -23,16 +23,22 @@ mod app {
}
#[shared]
struct MySharedResources {
}
struct MySharedResources {}
#[init]
fn init(_cx: init::Context) -> (MySharedResources, MyLocalResources, init::Monotonics) {
let board = dk::init().unwrap();
usbd::init(board.power, &board.usbd);
(MySharedResources {}, MyLocalResources { usbd: board.usbd, ep0in: board.ep0in, state: State::Default, }, init::Monotonics())
(
MySharedResources {},
MyLocalResources {
usbd: board.usbd,
ep0in: board.ep0in,
state: State::Default,
},
init::Monotonics(),
)
}
#[task(binds = USBD, local = [usbd, ep0in, state])]
@ -234,6 +240,4 @@ mod app {
Ok(())
}
}