aboutsummaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorDario Nieuwenhuis <[email protected]>2022-01-13 22:24:13 +0100
committerDario Nieuwenhuis <[email protected]>2022-01-13 23:56:39 +0100
commit3e503e73356f4805d459d50fa1cded7b65ecd6d8 (patch)
tree3398ee381190c0ad187dc5df30ee05e86540cc1d /examples
parentc432d036c78480303827d832db3611cc7d2680f5 (diff)
nrf/uarte: expose all functionality as inherent methods.
Diffstat (limited to 'examples')
-rw-r--r--examples/nrf/src/bin/uart.rs1
-rw-r--r--examples/nrf/src/bin/uart_idle.rs10
-rw-r--r--examples/nrf/src/bin/uart_split.rs9
3 files changed, 7 insertions, 13 deletions
diff --git a/examples/nrf/src/bin/uart.rs b/examples/nrf/src/bin/uart.rs
index 208961c8b..68ee3978a 100644
--- a/examples/nrf/src/bin/uart.rs
+++ b/examples/nrf/src/bin/uart.rs
@@ -7,7 +7,6 @@ mod example_common;
7use example_common::*; 7use example_common::*;
8 8
9use embassy::executor::Spawner; 9use embassy::executor::Spawner;
10use embassy::traits::uart::{Read, Write};
11use embassy_nrf::gpio::NoPin; 10use embassy_nrf::gpio::NoPin;
12use embassy_nrf::{interrupt, uarte, Peripherals}; 11use embassy_nrf::{interrupt, uarte, Peripherals};
13 12
diff --git a/examples/nrf/src/bin/uart_idle.rs b/examples/nrf/src/bin/uart_idle.rs
index ec9a36026..76449c0e3 100644
--- a/examples/nrf/src/bin/uart_idle.rs
+++ b/examples/nrf/src/bin/uart_idle.rs
@@ -4,11 +4,9 @@
4 4
5#[path = "../example_common.rs"] 5#[path = "../example_common.rs"]
6mod example_common; 6mod example_common;
7use embassy_traits::uart::ReadUntilIdle;
8use example_common::*; 7use example_common::*;
9 8
10use embassy::executor::Spawner; 9use embassy::executor::Spawner;
11use embassy::traits::uart::Write;
12use embassy_nrf::gpio::NoPin; 10use embassy_nrf::gpio::NoPin;
13use embassy_nrf::{interrupt, uarte, Peripherals}; 11use embassy_nrf::{interrupt, uarte, Peripherals};
14 12
@@ -19,11 +17,9 @@ async fn main(_spawner: Spawner, p: Peripherals) {
19 config.baudrate = uarte::Baudrate::BAUD115200; 17 config.baudrate = uarte::Baudrate::BAUD115200;
20 18
21 let irq = interrupt::take!(UARTE0_UART0); 19 let irq = interrupt::take!(UARTE0_UART0);
22 let mut uart = unsafe { 20 let mut uart = uarte::UarteWithIdle::new(
23 uarte::UarteWithIdle::new( 21 p.UARTE0, p.TIMER0, p.PPI_CH0, p.PPI_CH1, irq, p.P0_08, p.P0_06, NoPin, NoPin, config,
24 p.UARTE0, p.TIMER0, p.PPI_CH0, p.PPI_CH1, irq, p.P0_08, p.P0_06, NoPin, NoPin, config, 22 );
25 )
26 };
27 23
28 info!("uarte initialized!"); 24 info!("uarte initialized!");
29 25
diff --git a/examples/nrf/src/bin/uart_split.rs b/examples/nrf/src/bin/uart_split.rs
index 4b5dbb21f..a9c02e796 100644
--- a/examples/nrf/src/bin/uart_split.rs
+++ b/examples/nrf/src/bin/uart_split.rs
@@ -4,16 +4,15 @@
4 4
5#[path = "../example_common.rs"] 5#[path = "../example_common.rs"]
6mod example_common; 6mod example_common;
7use example_common::*;
8
7use embassy::blocking_mutex::kind::Noop; 9use embassy::blocking_mutex::kind::Noop;
8use embassy::channel::mpsc::{self, Channel, Sender}; 10use embassy::channel::mpsc::{self, Channel, Sender};
11use embassy::executor::Spawner;
9use embassy::util::Forever; 12use embassy::util::Forever;
13use embassy_nrf::gpio::NoPin;
10use embassy_nrf::peripherals::UARTE0; 14use embassy_nrf::peripherals::UARTE0;
11use embassy_nrf::uarte::UarteRx; 15use embassy_nrf::uarte::UarteRx;
12use example_common::*;
13
14use embassy::executor::Spawner;
15use embassy::traits::uart::{Read, Write};
16use embassy_nrf::gpio::NoPin;
17use embassy_nrf::{interrupt, uarte, Peripherals}; 16use embassy_nrf::{interrupt, uarte, Peripherals};
18 17
19static CHANNEL: Forever<Channel<Noop, [u8; 8], 1>> = Forever::new(); 18static CHANNEL: Forever<Channel<Noop, [u8; 8], 1>> = Forever::new();