aboutsummaryrefslogtreecommitdiff
path: root/examples/stm32f1/src/bin
diff options
context:
space:
mode:
authorDario Nieuwenhuis <[email protected]>2022-06-12 22:15:44 +0200
committerDario Nieuwenhuis <[email protected]>2022-06-12 22:22:31 +0200
commita8703b75988e1e700af701116464025679d2feb8 (patch)
treef4ec5de70ec05e793a774049e010935ac45853ed /examples/stm32f1/src/bin
parent6199bdea710cde33e5d5381b6d6abfc8af46df19 (diff)
Run rustfmt.
Diffstat (limited to 'examples/stm32f1/src/bin')
-rw-r--r--examples/stm32f1/src/bin/adc.rs4
-rw-r--r--examples/stm32f1/src/bin/blinky.rs4
-rw-r--r--examples/stm32f1/src/bin/hello.rs7
-rw-r--r--examples/stm32f1/src/bin/usb_serial.rs20
4 files changed, 10 insertions, 25 deletions
diff --git a/examples/stm32f1/src/bin/adc.rs b/examples/stm32f1/src/bin/adc.rs
index af403423d..09904d4cc 100644
--- a/examples/stm32f1/src/bin/adc.rs
+++ b/examples/stm32f1/src/bin/adc.rs
@@ -7,9 +7,7 @@ use embassy::executor::Spawner;
7use embassy::time::{Delay, Duration, Timer}; 7use embassy::time::{Delay, Duration, Timer};
8use embassy_stm32::adc::Adc; 8use embassy_stm32::adc::Adc;
9use embassy_stm32::Peripherals; 9use embassy_stm32::Peripherals;
10 10use {defmt_rtt as _, panic_probe as _};
11use defmt_rtt as _; // global logger
12use panic_probe as _;
13 11
14#[embassy::main] 12#[embassy::main]
15async fn main(_spawner: Spawner, p: Peripherals) { 13async fn main(_spawner: Spawner, p: Peripherals) {
diff --git a/examples/stm32f1/src/bin/blinky.rs b/examples/stm32f1/src/bin/blinky.rs
index 657bcdd1d..c98d0cdad 100644
--- a/examples/stm32f1/src/bin/blinky.rs
+++ b/examples/stm32f1/src/bin/blinky.rs
@@ -7,9 +7,7 @@ use embassy::executor::Spawner;
7use embassy::time::{Duration, Timer}; 7use embassy::time::{Duration, Timer};
8use embassy_stm32::gpio::{Level, Output, Speed}; 8use embassy_stm32::gpio::{Level, Output, Speed};
9use embassy_stm32::Peripherals; 9use embassy_stm32::Peripherals;
10 10use {defmt_rtt as _, panic_probe as _};
11use defmt_rtt as _; // global logger
12use panic_probe as _;
13 11
14#[embassy::main] 12#[embassy::main]
15async fn main(_spawner: Spawner, p: Peripherals) { 13async fn main(_spawner: Spawner, p: Peripherals) {
diff --git a/examples/stm32f1/src/bin/hello.rs b/examples/stm32f1/src/bin/hello.rs
index 8054a8993..82f11bc28 100644
--- a/examples/stm32f1/src/bin/hello.rs
+++ b/examples/stm32f1/src/bin/hello.rs
@@ -6,11 +6,8 @@ use defmt::info;
6use embassy::executor::Spawner; 6use embassy::executor::Spawner;
7use embassy::time::{Duration, Timer}; 7use embassy::time::{Duration, Timer};
8use embassy_stm32::time::Hertz; 8use embassy_stm32::time::Hertz;
9use embassy_stm32::Config; 9use embassy_stm32::{Config, Peripherals};
10use embassy_stm32::Peripherals; 10use {defmt_rtt as _, panic_probe as _};
11
12use defmt_rtt as _; // global logger
13use panic_probe as _;
14 11
15fn config() -> Config { 12fn config() -> Config {
16 let mut config = Config::default(); 13 let mut config = Config::default();
diff --git a/examples/stm32f1/src/bin/usb_serial.rs b/examples/stm32f1/src/bin/usb_serial.rs
index fe4aa4cc9..d06315d76 100644
--- a/examples/stm32f1/src/bin/usb_serial.rs
+++ b/examples/stm32f1/src/bin/usb_serial.rs
@@ -2,24 +2,18 @@
2#![no_main] 2#![no_main]
3#![feature(type_alias_impl_trait)] 3#![feature(type_alias_impl_trait)]
4 4
5use defmt::panic; 5use defmt::{panic, *};
6use defmt::*;
7use defmt_rtt as _; // global logger
8use embassy::executor::Spawner; 6use embassy::executor::Spawner;
9use embassy::time::Duration; 7use embassy::time::{Duration, Timer};
10use embassy::time::Timer; 8use embassy_stm32::gpio::{Level, Output, Speed};
11use embassy_stm32::gpio::Level;
12use embassy_stm32::gpio::Output;
13use embassy_stm32::gpio::Speed;
14use embassy_stm32::interrupt;
15use embassy_stm32::time::Hertz; 9use embassy_stm32::time::Hertz;
16use embassy_stm32::usb::{Driver, Instance}; 10use embassy_stm32::usb::{Driver, Instance};
17use embassy_stm32::{Config, Peripherals}; 11use embassy_stm32::{interrupt, Config, Peripherals};
18use embassy_usb::driver::EndpointError; 12use embassy_usb::driver::EndpointError;
19use embassy_usb::Builder; 13use embassy_usb::Builder;
20use embassy_usb_serial::{CdcAcmClass, State}; 14use embassy_usb_serial::{CdcAcmClass, State};
21use futures::future::join; 15use futures::future::join;
22use panic_probe as _; 16use {defmt_rtt as _, panic_probe as _};
23 17
24fn config() -> Config { 18fn config() -> Config {
25 let mut config = Config::default(); 19 let mut config = Config::default();
@@ -104,9 +98,7 @@ impl From<EndpointError> for Disconnected {
104 } 98 }
105} 99}
106 100
107async fn echo<'d, T: Instance + 'd>( 101async fn echo<'d, T: Instance + 'd>(class: &mut CdcAcmClass<'d, Driver<'d, T>>) -> Result<(), Disconnected> {
108 class: &mut CdcAcmClass<'d, Driver<'d, T>>,
109) -> Result<(), Disconnected> {
110 let mut buf = [0; 64]; 102 let mut buf = [0; 64];
111 loop { 103 loop {
112 let n = class.read_packet(&mut buf).await?; 104 let n = class.read_packet(&mut buf).await?;