max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Run rustfmt.

Browse Source
This commit is contained in:
Dario Nieuwenhuis
2022-06-12 22:15:44 +02:00
parent 6199bdea71
commit a8703b7598
340 changed files with 1326 additions and 3020 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/stm32f3/src/bin/blinky.rs
View File

@ -7,9 +7,7 @@ use embassy::executor::Spawner;
use embassy::time::{Duration, Timer};
use embassy_stm32::gpio::{Level, Output, Speed};
use embassy_stm32::Peripherals;
use defmt_rtt as _; // global logger
use panic_probe as _;
use {defmt_rtt as _, panic_probe as _};
#[embassy::main]
async fn main(_spawner: Spawner, p: Peripherals) {

3
examples/stm32f3/src/bin/button.rs
View File

@ -4,9 +4,8 @@
use cortex_m_rt::entry;
use defmt::*;
use defmt_rtt as _; // global logger
use embassy_stm32::gpio::{Input, Level, Output, Pull, Speed};
use panic_probe as _;
use {defmt_rtt as _, panic_probe as _};
#[entry]
fn main() -> ! {

25
examples/stm32f3/src/bin/button_events.rs
View File

@ -19,9 +19,7 @@ use embassy_stm32::exti::ExtiInput;
use embassy_stm32::gpio::{AnyPin, Input, Level, Output, Pin, Pull, Speed};
use embassy_stm32::peripherals::PA0;
use embassy_stm32::Peripherals;
use defmt_rtt as _; // global logger
use panic_probe as _;
use {defmt_rtt as _, panic_probe as _};
struct Leds<'a> {
leds: [Output<'a, AnyPin>; 8],
@ -57,8 +55,7 @@ impl<'a> Leds<'a> {
self.process_event(new_message).await;
} else {
self.leds[self.current_led].set_low();
if let Ok(new_message) = with_timeout(Duration::from_millis(200), CHANNEL.recv()).await
{
if let Ok(new_message) = with_timeout(Duration::from_millis(200), CHANNEL.recv()).await {
self.process_event(new_message).await;
}
}
@ -137,22 +134,16 @@ async fn button_waiter(mut button: ExtiInput<'static, PA0>) {
button.wait_for_rising_edge().await;
loop {
if with_timeout(
Duration::from_millis(HOLD_DELAY),
button.wait_for_falling_edge(),
)
.await
.is_err()
if with_timeout(Duration::from_millis(HOLD_DELAY), button.wait_for_falling_edge())
.await
.is_err()
{
info!("Hold");
CHANNEL.send(ButtonEvent::Hold).await;
button.wait_for_falling_edge().await;
} else if with_timeout(
Duration::from_millis(DOUBLE_CLICK_DELAY),
button.wait_for_rising_edge(),
)
.await
.is_err()
} else if with_timeout(Duration::from_millis(DOUBLE_CLICK_DELAY), button.wait_for_rising_edge())
.await
.is_err()
{
info!("Single click");
CHANNEL.send(ButtonEvent::SingleClick).await;

3
examples/stm32f3/src/bin/button_exti.rs
View File

@ -3,12 +3,11 @@
#![feature(type_alias_impl_trait)]
use defmt::*;
use defmt_rtt as _; // global logger
use embassy::executor::Spawner;
use embassy_stm32::exti::ExtiInput;
use embassy_stm32::gpio::{Input, Pull};
use embassy_stm32::Peripherals;
use panic_probe as _;
use {defmt_rtt as _, panic_probe as _};
#[embassy::main]
async fn main(_spawner: Spawner, p: Peripherals) {

4
examples/stm32f3/src/bin/flash.rs
View File

@ -7,9 +7,7 @@ use embassy::executor::Spawner;
use embassy_stm32::flash::Flash;
use embassy_stm32::Peripherals;
use embedded_storage::nor_flash::{NorFlash, ReadNorFlash};
use defmt_rtt as _; // global logger
use panic_probe as _;
use {defmt_rtt as _, panic_probe as _};
#[embassy::main]
async fn main(_spawner: Spawner, p: Peripherals) {

7
examples/stm32f3/src/bin/hello.rs
View File

@ -6,11 +6,8 @@ use defmt::info;
use embassy::executor::Spawner;
use embassy::time::{Duration, Timer};
use embassy_stm32::time::Hertz;
use embassy_stm32::Config;
use embassy_stm32::Peripherals;
use defmt_rtt as _; // global logger
use panic_probe as _;
use embassy_stm32::{Config, Peripherals};
use {defmt_rtt as _, panic_probe as _};
fn config() -> Config {
let mut config = Config::default();

6
examples/stm32f3/src/bin/multiprio.rs
View File

@ -57,16 +57,14 @@
#![no_main]
#![feature(type_alias_impl_trait)]
use defmt::*;
use defmt_rtt as _; // global logger
use panic_probe as _;
use cortex_m_rt::entry;
use defmt::*;
use embassy::time::{Duration, Instant, Timer};
use embassy::util::Forever;
use embassy_stm32::executor::{Executor, InterruptExecutor};
use embassy_stm32::interrupt;
use embassy_stm32::interrupt::InterruptExt;
use {defmt_rtt as _, panic_probe as _};
#[embassy::task]
async fn run_high() {

8
examples/stm32f3/src/bin/spi_dma.rs
View File

@ -4,14 +4,14 @@
use core::fmt::Write;
use core::str::from_utf8;
use defmt::*;
use defmt_rtt as _; // global logger
use embassy::executor::Spawner;
use embassy_stm32::spi::{Config, Spi};
use embassy_stm32::time::Hertz;
use embassy_stm32::Peripherals;
use heapless::String;
use panic_probe as _;
use {defmt_rtt as _, panic_probe as _};
#[embassy::main]
async fn main(_spawner: Spawner, p: Peripherals) {
@ -32,9 +32,7 @@ async fn main(_spawner: Spawner, p: Peripherals) {
let mut write: String<128> = String::new();
let mut read = [0; 128];
core::write!(&mut write, "Hello DMA World {}!\r\n", n).unwrap();
spi.transfer(&mut read[0..write.len()], write.as_bytes())
.await
.ok();
spi.transfer(&mut read[0..write.len()], write.as_bytes()).await.ok();
info!("read via spi+dma: {}", from_utf8(&read).unwrap());
}
}

4
examples/stm32f3/src/bin/usart_dma.rs
View File

@ -3,14 +3,14 @@
#![feature(type_alias_impl_trait)]
use core::fmt::Write;
use defmt::*;
use defmt_rtt as _; // global logger
use embassy::executor::Spawner;
use embassy_stm32::dma::NoDma;
use embassy_stm32::usart::{Config, Uart};
use embassy_stm32::Peripherals;
use heapless::String;
use panic_probe as _;
use {defmt_rtt as _, panic_probe as _};
#[embassy::main]
async fn main(_spawner: Spawner, p: Peripherals) {

20
examples/stm32f3/src/bin/usb_serial.rs
View File

@ -2,24 +2,18 @@
#![no_main]
#![feature(type_alias_impl_trait)]
use defmt::panic;
use defmt::*;
use defmt_rtt as _; // global logger
use defmt::{panic, *};
use embassy::executor::Spawner;
use embassy::time::Duration;
use embassy::time::Timer;
use embassy_stm32::gpio::Level;
use embassy_stm32::gpio::Output;
use embassy_stm32::gpio::Speed;
use embassy_stm32::interrupt;
use embassy::time::{Duration, Timer};
use embassy_stm32::gpio::{Level, Output, Speed};
use embassy_stm32::time::U32Ext;
use embassy_stm32::usb::{Driver, Instance};
use embassy_stm32::{Config, Peripherals};
use embassy_stm32::{interrupt, Config, Peripherals};
use embassy_usb::driver::EndpointError;
use embassy_usb::Builder;
use embassy_usb_serial::{CdcAcmClass, State};
use futures::future::join;
use panic_probe as _;
use {defmt_rtt as _, panic_probe as _};
fn config() -> Config {
let mut config = Config::default();
@ -103,9 +97,7 @@ impl From<EndpointError> for Disconnected {
}
}
async fn echo<'d, T: Instance + 'd>(
class: &mut CdcAcmClass<'d, Driver<'d, T>>,
) -> Result<(), Disconnected> {
async fn echo<'d, T: Instance + 'd>(class: &mut CdcAcmClass<'d, Driver<'d, T>>) -> Result<(), Disconnected> {
let mut buf = [0; 64];
loop {
let n = class.read_packet(&mut buf).await?;