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

Split embassy crate into embassy-executor, embassy-util.

Browse Source
This commit is contained in:
Dario Nieuwenhuis
2022-07-29 21:58:35 +02:00
parent 8745d646f0
commit a0f1b0ee01
319 changed files with 1159 additions and 998 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
examples/stm32h7/src/bin/adc.rs
View File

@ -3,8 +3,8 @@
#![feature(type_alias_impl_trait)]
use defmt::*;
use embassy::executor::Spawner;
use embassy::time::{Delay, Duration, Timer};
use embassy_executor::executor::Spawner;
use embassy_executor::time::{Delay, Duration, Timer};
use embassy_stm32::adc::{Adc, SampleTime};
use embassy_stm32::rcc::AdcClockSource;
use embassy_stm32::time::mhz;
@ -20,7 +20,7 @@ pub fn config() -> Config {
config
}
#[embassy::main(config = "config()")]
#[embassy_executor::main(config = "config()")]
async fn main(_spawner: Spawner, mut p: Peripherals) {
info!("Hello World!");

6
examples/stm32h7/src/bin/blinky.rs
View File

@ -3,13 +3,13 @@
#![feature(type_alias_impl_trait)]
use defmt::*;
use embassy::executor::Spawner;
use embassy::time::{Duration, Timer};
use embassy_executor::executor::Spawner;
use embassy_executor::time::{Duration, Timer};
use embassy_stm32::gpio::{Level, Output, Speed};
use embassy_stm32::Peripherals;
use {defmt_rtt as _, panic_probe as _};
#[embassy::main]
#[embassy_executor::main]
async fn main(_spawner: Spawner, p: Peripherals) {
info!("Hello World!");

4
examples/stm32h7/src/bin/button_exti.rs
View File

@ -3,13 +3,13 @@
#![feature(type_alias_impl_trait)]
use defmt::*;
use embassy::executor::Spawner;
use embassy_executor::executor::Spawner;
use embassy_stm32::exti::ExtiInput;
use embassy_stm32::gpio::{Input, Pull};
use embassy_stm32::Peripherals;
use {defmt_rtt as _, panic_probe as _};
#[embassy::main]
#[embassy_executor::main]
async fn main(_spawner: Spawner, p: Peripherals) {
info!("Hello World!");

8
examples/stm32h7/src/bin/camera.rs
View File

@ -2,8 +2,8 @@
#![no_main]
#![feature(type_alias_impl_trait)]
use embassy::executor::Spawner;
use embassy::time::{Duration, Timer};
use embassy_executor::executor::Spawner;
use embassy_executor::time::{Duration, Timer};
use embassy_stm32::dcmi::{self, *};
use embassy_stm32::gpio::{Level, Output, Speed};
use embassy_stm32::i2c::I2c;
@ -32,7 +32,7 @@ const HEIGHT: usize = 100;
static mut FRAME: [u32; WIDTH * HEIGHT / 2] = [0u32; WIDTH * HEIGHT / 2];
#[embassy::main(config = "config()")]
#[embassy_executor::main(config = "config()")]
async fn main(_spawner: Spawner, p: Peripherals) {
defmt::info!("Hello World!");
let mco = Mco::new(p.MCO1, p.PA8, Mco1Source::Hsi, McoClock::Divided(3));
@ -78,7 +78,7 @@ mod ov7725 {
use core::marker::PhantomData;
use defmt::Format;
use embassy::time::{Duration, Timer};
use embassy_executor::time::{Duration, Timer};
use embassy_stm32::rcc::{Mco, McoInstance};
use embedded_hal_async::i2c::I2c;

10
examples/stm32h7/src/bin/eth.rs
View File

@ -3,9 +3,8 @@
#![feature(type_alias_impl_trait)]
use defmt::*;
use embassy::executor::Spawner;
use embassy::time::{Duration, Timer};
use embassy::util::Forever;
use embassy_executor::executor::Spawner;
use embassy_executor::time::{Duration, Timer};
use embassy_net::tcp::TcpSocket;
use embassy_net::{Ipv4Address, Stack, StackResources};
use embassy_stm32::eth::generic_smi::GenericSMI;
@ -14,6 +13,7 @@ use embassy_stm32::peripherals::ETH;
use embassy_stm32::rng::Rng;
use embassy_stm32::time::mhz;
use embassy_stm32::{interrupt, Config, Peripherals};
use embassy_util::Forever;
use embedded_io::asynch::Write;
use rand_core::RngCore;
use {defmt_rtt as _, panic_probe as _};
@ -28,7 +28,7 @@ macro_rules! forever {
type Device = Ethernet<'static, ETH, GenericSMI, 4, 4>;
#[embassy::task]
#[embassy_executor::task]
async fn net_task(stack: &'static Stack<Device>) -> ! {
stack.run().await
}
@ -41,7 +41,7 @@ pub fn config() -> Config {
config
}
#[embassy::main(config = "config()")]
#[embassy_executor::main(config = "config()")]
async fn main(spawner: Spawner, p: Peripherals) -> ! {
info!("Hello World!");

6
examples/stm32h7/src/bin/flash.rs
View File

@ -3,14 +3,14 @@
#![feature(type_alias_impl_trait)]
use defmt::{info, unwrap};
use embassy::executor::Spawner;
use embassy::time::{Duration, Timer};
use embassy_executor::executor::Spawner;
use embassy_executor::time::{Duration, Timer};
use embassy_stm32::flash::Flash;
use embassy_stm32::Peripherals;
use embedded_storage::nor_flash::{NorFlash, ReadNorFlash};
use {defmt_rtt as _, panic_probe as _};
#[embassy::main]
#[embassy_executor::main]
async fn main(_spawner: Spawner, p: Peripherals) {
info!("Hello Flash!");

6
examples/stm32h7/src/bin/fmc.rs
View File

@ -3,8 +3,8 @@
#![feature(type_alias_impl_trait)]
use defmt::*;
use embassy::executor::Spawner;
use embassy::time::{Delay, Duration, Timer};
use embassy_executor::executor::Spawner;
use embassy_executor::time::{Delay, Duration, Timer};
use embassy_stm32::fmc::Fmc;
use embassy_stm32::time::mhz;
use embassy_stm32::{Config, Peripherals};
@ -18,7 +18,7 @@ pub fn config() -> Config {
config
}
#[embassy::main(config = "config()")]
#[embassy_executor::main(config = "config()")]
async fn main(_spawner: Spawner, p: Peripherals) {
info!("Hello World!");

6
examples/stm32h7/src/bin/low_level_timer_api.rs
View File

@ -3,8 +3,8 @@
#![feature(type_alias_impl_trait)]
use defmt::*;
use embassy::executor::Spawner;
use embassy::time::{Duration, Timer};
use embassy_executor::executor::Spawner;
use embassy_executor::time::{Duration, Timer};
use embassy_stm32::gpio::low_level::AFType;
use embassy_stm32::gpio::Speed;
use embassy_stm32::pwm::*;
@ -24,7 +24,7 @@ pub fn config() -> Config {
config
}
#[embassy::main(config = "config()")]
#[embassy_executor::main(config = "config()")]
async fn main(_spawner: Spawner, p: Peripherals) {
info!("Hello World!");

6
examples/stm32h7/src/bin/mco.rs
View File

@ -3,14 +3,14 @@
#![feature(type_alias_impl_trait)]
use defmt::*;
use embassy::executor::Spawner;
use embassy::time::{Duration, Timer};
use embassy_executor::executor::Spawner;
use embassy_executor::time::{Duration, Timer};
use embassy_stm32::gpio::{Level, Output, Speed};
use embassy_stm32::rcc::{Mco, Mco1Source, McoClock};
use embassy_stm32::Peripherals;
use {defmt_rtt as _, panic_probe as _};
#[embassy::main]
#[embassy_executor::main]
async fn main(_spawner: Spawner, p: Peripherals) {
info!("Hello World!");

6
examples/stm32h7/src/bin/pwm.rs
View File

@ -3,8 +3,8 @@
#![feature(type_alias_impl_trait)]
use defmt::*;
use embassy::executor::Spawner;
use embassy::time::{Duration, Timer};
use embassy_executor::executor::Spawner;
use embassy_executor::time::{Duration, Timer};
use embassy_stm32::pwm::simple_pwm::{PwmPin, SimplePwm};
use embassy_stm32::pwm::Channel;
use embassy_stm32::time::{khz, mhz};
@ -23,7 +23,7 @@ pub fn config() -> Config {
config
}
#[embassy::main(config = "config()")]
#[embassy_executor::main(config = "config()")]
async fn main(_spawner: Spawner, p: Peripherals) {
info!("Hello World!");

4
examples/stm32h7/src/bin/rng.rs
View File

@ -3,12 +3,12 @@
#![feature(type_alias_impl_trait)]
use defmt::*;
use embassy::executor::Spawner;
use embassy_executor::executor::Spawner;
use embassy_stm32::rng::Rng;
use embassy_stm32::Peripherals;
use {defmt_rtt as _, panic_probe as _};
#[embassy::main]
#[embassy_executor::main]
async fn main(_spawner: Spawner, p: Peripherals) {
info!("Hello World!");

4
examples/stm32h7/src/bin/sdmmc.rs
View File

@ -3,7 +3,7 @@
#![feature(type_alias_impl_trait)]
use defmt::*;
use embassy::executor::Spawner;
use embassy_executor::executor::Spawner;
use embassy_stm32::sdmmc::Sdmmc;
use embassy_stm32::time::mhz;
use embassy_stm32::{interrupt, Config, Peripherals};
@ -15,7 +15,7 @@ fn config() -> Config {
config
}
#[embassy::main(config = "config()")]
#[embassy_executor::main(config = "config()")]
async fn main(_spawner: Spawner, p: Peripherals) -> ! {
info!("Hello World!");

10
examples/stm32h7/src/bin/signal.rs
View File

@ -3,15 +3,15 @@
#![feature(type_alias_impl_trait)]
use defmt::{info, unwrap};
use embassy::channel::signal::Signal;
use embassy::executor::Spawner;
use embassy::time::{Duration, Timer};
use embassy_executor::executor::Spawner;
use embassy_executor::time::{Duration, Timer};
use embassy_stm32::Peripherals;
use embassy_util::channel::signal::Signal;
use {defmt_rtt as _, panic_probe as _};
static SIGNAL: Signal<u32> = Signal::new();
#[embassy::task]
#[embassy_executor::task]
async fn my_sending_task() {
let mut counter: u32 = 0;
@ -24,7 +24,7 @@ async fn my_sending_task() {
}
}
#[embassy::main]
#[embassy_executor::main]
async fn main(spawner: Spawner, _p: Peripherals) {
unwrap!(spawner.spawn(my_sending_task()));

6
examples/stm32h7/src/bin/spi.rs
View File

@ -7,12 +7,12 @@ use core::str::from_utf8;
use cortex_m_rt::entry;
use defmt::*;
use embassy::executor::Executor;
use embassy::util::Forever;
use embassy_executor::executor::Executor;
use embassy_stm32::dma::NoDma;
use embassy_stm32::peripherals::SPI3;
use embassy_stm32::time::mhz;
use embassy_stm32::{spi, Config};
use embassy_util::Forever;
use heapless::String;
use {defmt_rtt as _, panic_probe as _};
@ -24,7 +24,7 @@ pub fn config() -> Config {
config
}
#[embassy::task]
#[embassy_executor::task]
async fn main_task(mut spi: spi::Spi<'static, SPI3, NoDma, NoDma>) {
for n in 0u32.. {
let mut write: String<128> = String::new();

6
examples/stm32h7/src/bin/spi_dma.rs
View File

@ -7,11 +7,11 @@ use core::str::from_utf8;
use cortex_m_rt::entry;
use defmt::*;
use embassy::executor::Executor;
use embassy::util::Forever;
use embassy_executor::executor::Executor;
use embassy_stm32::peripherals::{DMA1_CH3, DMA1_CH4, SPI3};
use embassy_stm32::time::mhz;
use embassy_stm32::{spi, Config};
use embassy_util::Forever;
use heapless::String;
use {defmt_rtt as _, panic_probe as _};
@ -23,7 +23,7 @@ pub fn config() -> Config {
config
}
#[embassy::task]
#[embassy_executor::task]
async fn main_task(mut spi: spi::Spi<'static, SPI3, DMA1_CH3, DMA1_CH4>) {
for n in 0u32.. {
let mut write: String<128> = String::new();

6
examples/stm32h7/src/bin/usart.rs
View File

@ -4,13 +4,13 @@
use cortex_m_rt::entry;
use defmt::*;
use embassy::executor::Executor;
use embassy::util::Forever;
use embassy_executor::executor::Executor;
use embassy_stm32::dma::NoDma;
use embassy_stm32::usart::{Config, Uart};
use embassy_util::Forever;
use {defmt_rtt as _, panic_probe as _};
#[embassy::task]
#[embassy_executor::task]
async fn main_task() {
let p = embassy_stm32::init(Default::default());

6
examples/stm32h7/src/bin/usart_dma.rs
View File

@ -6,14 +6,14 @@ use core::fmt::Write;
use cortex_m_rt::entry;
use defmt::*;
use embassy::executor::Executor;
use embassy::util::Forever;
use embassy_executor::executor::Executor;
use embassy_stm32::dma::NoDma;
use embassy_stm32::usart::{Config, Uart};
use embassy_util::Forever;
use heapless::String;
use {defmt_rtt as _, panic_probe as _};
#[embassy::task]
#[embassy_executor::task]
async fn main_task() {
let p = embassy_stm32::init(Default::default());

12
examples/stm32h7/src/bin/usart_split.rs
View File

@ -3,16 +3,16 @@
#![feature(type_alias_impl_trait)]
use defmt::*;
use embassy::blocking_mutex::raw::ThreadModeRawMutex;
use embassy::channel::mpmc::Channel;
use embassy::executor::Spawner;
use embassy_executor::executor::Spawner;
use embassy_stm32::dma::NoDma;
use embassy_stm32::peripherals::{DMA1_CH1, UART7};
use embassy_stm32::usart::{Config, Uart, UartRx};
use embassy_stm32::Peripherals;
use embassy_util::blocking_mutex::raw::ThreadModeRawMutex;
use embassy_util::channel::mpmc::Channel;
use {defmt_rtt as _, panic_probe as _};
#[embassy::task]
#[embassy_executor::task]
async fn writer(mut usart: Uart<'static, UART7, NoDma, NoDma>) {
unwrap!(usart.blocking_write(b"Hello Embassy World!\r\n"));
info!("wrote Hello, starting echo");
@ -26,7 +26,7 @@ async fn writer(mut usart: Uart<'static, UART7, NoDma, NoDma>) {
static CHANNEL: Channel<ThreadModeRawMutex, [u8; 8], 1> = Channel::new();
#[embassy::main]
#[embassy_executor::main]
async fn main(spawner: Spawner, p: Peripherals) -> ! {
info!("Hello World!");
@ -45,7 +45,7 @@ async fn main(spawner: Spawner, p: Peripherals) -> ! {
}
}
#[embassy::task]
#[embassy_executor::task]
async fn reader(mut rx: UartRx<'static, UART7, DMA1_CH1>) {
let mut buf = [0; 8];
loop {