aboutsummaryrefslogtreecommitdiff
path: root/examples/std/src
diff options
context:
space:
mode:
authorDario Nieuwenhuis <[email protected]>2022-07-29 21:58:35 +0200
committerDario Nieuwenhuis <[email protected]>2022-07-29 23:40:36 +0200
commita0f1b0ee01d461607660d2d56b5b1bdc57e0d3fb (patch)
treee60fc8f8db8ec07e55d655c1a830b07f4db0b7d2 /examples/std/src
parent8745d646f0976791b7098456aa61adb983fb1c18 (diff)
Split embassy crate into embassy-executor, embassy-util.
Diffstat (limited to 'examples/std/src')
-rw-r--r--examples/std/src/bin/net.rs8
-rw-r--r--examples/std/src/bin/serial.rs6
-rw-r--r--examples/std/src/bin/tick.rs8
3 files changed, 11 insertions, 11 deletions
diff --git a/examples/std/src/bin/net.rs b/examples/std/src/bin/net.rs
index 74073ee81..202585289 100644
--- a/examples/std/src/bin/net.rs
+++ b/examples/std/src/bin/net.rs
@@ -1,10 +1,10 @@
1#![feature(type_alias_impl_trait)] 1#![feature(type_alias_impl_trait)]
2 2
3use clap::Parser; 3use clap::Parser;
4use embassy::executor::{Executor, Spawner}; 4use embassy_executor::executor::{Executor, Spawner};
5use embassy::util::Forever;
6use embassy_net::tcp::TcpSocket; 5use embassy_net::tcp::TcpSocket;
7use embassy_net::{ConfigStrategy, Ipv4Address, Ipv4Cidr, Stack, StackResources}; 6use embassy_net::{ConfigStrategy, Ipv4Address, Ipv4Cidr, Stack, StackResources};
7use embassy_util::Forever;
8use embedded_io::asynch::Write; 8use embedded_io::asynch::Write;
9use heapless::Vec; 9use heapless::Vec;
10use log::*; 10use log::*;
@@ -34,12 +34,12 @@ struct Opts {
34 static_ip: bool, 34 static_ip: bool,
35} 35}
36 36
37#[embassy::task] 37#[embassy_executor::task]
38async fn net_task(stack: &'static Stack<TunTapDevice>) -> ! { 38async fn net_task(stack: &'static Stack<TunTapDevice>) -> ! {
39 stack.run().await 39 stack.run().await
40} 40}
41 41
42#[embassy::task] 42#[embassy_executor::task]
43async fn main_task(spawner: Spawner) { 43async fn main_task(spawner: Spawner) {
44 let opts: Opts = Opts::parse(); 44 let opts: Opts = Opts::parse();
45 45
diff --git a/examples/std/src/bin/serial.rs b/examples/std/src/bin/serial.rs
index b1e5b0142..b803d1ef7 100644
--- a/examples/std/src/bin/serial.rs
+++ b/examples/std/src/bin/serial.rs
@@ -4,15 +4,15 @@
4mod serial_port; 4mod serial_port;
5 5
6use async_io::Async; 6use async_io::Async;
7use embassy::executor::Executor; 7use embassy_executor::executor::Executor;
8use embassy::util::Forever; 8use embassy_util::Forever;
9use embedded_io::asynch::Read; 9use embedded_io::asynch::Read;
10use log::*; 10use log::*;
11use nix::sys::termios; 11use nix::sys::termios;
12 12
13use self::serial_port::SerialPort; 13use self::serial_port::SerialPort;
14 14
15#[embassy::task] 15#[embassy_executor::task]
16async fn run() { 16async fn run() {
17 // Open the serial port. 17 // Open the serial port.
18 let baudrate = termios::BaudRate::B115200; 18 let baudrate = termios::BaudRate::B115200;
diff --git a/examples/std/src/bin/tick.rs b/examples/std/src/bin/tick.rs
index bed9d7dc5..9ca900df8 100644
--- a/examples/std/src/bin/tick.rs
+++ b/examples/std/src/bin/tick.rs
@@ -1,10 +1,10 @@
1#![feature(type_alias_impl_trait)] 1#![feature(type_alias_impl_trait)]
2 2
3use embassy::executor::Spawner; 3use embassy_executor::executor::Spawner;
4use embassy::time::{Duration, Timer}; 4use embassy_executor::time::{Duration, Timer};
5use log::*; 5use log::*;
6 6
7#[embassy::task] 7#[embassy_executor::task]
8async fn run() { 8async fn run() {
9 loop { 9 loop {
10 info!("tick"); 10 info!("tick");
@@ -12,7 +12,7 @@ async fn run() {
12 } 12 }
13} 13}
14 14
15#[embassy::main] 15#[embassy_executor::main]
16async fn main(spawner: Spawner) { 16async fn main(spawner: Spawner) {
17 env_logger::builder() 17 env_logger::builder()
18 .filter_level(log::LevelFilter::Debug) 18 .filter_level(log::LevelFilter::Debug)