aboutsummaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorDario Nieuwenhuis <[email protected]>2020-12-29 01:53:17 +0100
committerDario Nieuwenhuis <[email protected]>2020-12-29 01:53:17 +0100
commitaf5454fbfec6232074c79ef571b2135dc7253d45 (patch)
tree2dd99c7e6ca0ae1b0c7634d0bb983c862dcbdad5 /examples
parent4b8d8ba87ee26173b0a7743c606c76df2d171790 (diff)
Update drivers to owned irqs.
Diffstat (limited to 'examples')
-rw-r--r--examples/src/bin/gpiote.rs4
-rw-r--r--examples/src/bin/gpiote_port.rs4
-rw-r--r--examples/src/bin/uart.rs4
3 files changed, 10 insertions, 2 deletions
diff --git a/examples/src/bin/gpiote.rs b/examples/src/bin/gpiote.rs
index edc3f5ef1..afa1b85d5 100644
--- a/examples/src/bin/gpiote.rs
+++ b/examples/src/bin/gpiote.rs
@@ -7,18 +7,20 @@ mod example_common;
7use example_common::*; 7use example_common::*;
8 8
9use cortex_m_rt::entry; 9use cortex_m_rt::entry;
10use defmt::panic;
10use nrf52840_hal::gpio; 11use nrf52840_hal::gpio;
11 12
12use embassy::executor::{task, Executor}; 13use embassy::executor::{task, Executor};
13use embassy::util::Forever; 14use embassy::util::Forever;
14use embassy_nrf::gpiote; 15use embassy_nrf::gpiote;
16use embassy_nrf::interrupt;
15 17
16#[task] 18#[task]
17async fn run() { 19async fn run() {
18 let p = unwrap!(embassy_nrf::pac::Peripherals::take()); 20 let p = unwrap!(embassy_nrf::pac::Peripherals::take());
19 let port0 = gpio::p0::Parts::new(p.P0); 21 let port0 = gpio::p0::Parts::new(p.P0);
20 22
21 let g = gpiote::Gpiote::new(p.GPIOTE); 23 let g = gpiote::Gpiote::new(p.GPIOTE, interrupt::take!(GPIOTE));
22 24
23 info!("Starting!"); 25 info!("Starting!");
24 26
diff --git a/examples/src/bin/gpiote_port.rs b/examples/src/bin/gpiote_port.rs
index 585317642..f5aa81322 100644
--- a/examples/src/bin/gpiote_port.rs
+++ b/examples/src/bin/gpiote_port.rs
@@ -8,11 +8,13 @@ use example_common::*;
8 8
9use core::mem; 9use core::mem;
10use cortex_m_rt::entry; 10use cortex_m_rt::entry;
11use defmt::panic;
11use nrf52840_hal::gpio; 12use nrf52840_hal::gpio;
12 13
13use embassy::executor::{task, Executor}; 14use embassy::executor::{task, Executor};
14use embassy::util::Forever; 15use embassy::util::Forever;
15use embassy_nrf::gpiote::{Gpiote, PortInputPolarity}; 16use embassy_nrf::gpiote::{Gpiote, PortInputPolarity};
17use embassy_nrf::interrupt;
16 18
17async fn button(g: &Gpiote, n: usize, pin: gpio::Pin<gpio::Input<gpio::PullUp>>) { 19async fn button(g: &Gpiote, n: usize, pin: gpio::Pin<gpio::Input<gpio::PullUp>>) {
18 loop { 20 loop {
@@ -28,7 +30,7 @@ async fn run() {
28 let p = unwrap!(embassy_nrf::pac::Peripherals::take()); 30 let p = unwrap!(embassy_nrf::pac::Peripherals::take());
29 let port0 = gpio::p0::Parts::new(p.P0); 31 let port0 = gpio::p0::Parts::new(p.P0);
30 32
31 let g = Gpiote::new(p.GPIOTE); 33 let g = Gpiote::new(p.GPIOTE, interrupt::take!(GPIOTE));
32 info!( 34 info!(
33 "sizeof Signal<()> = {:usize}", 35 "sizeof Signal<()> = {:usize}",
34 mem::size_of::<embassy::util::Signal<()>>() 36 mem::size_of::<embassy::util::Signal<()>>()
diff --git a/examples/src/bin/uart.rs b/examples/src/bin/uart.rs
index e664fcef2..6e15fbcfa 100644
--- a/examples/src/bin/uart.rs
+++ b/examples/src/bin/uart.rs
@@ -7,6 +7,7 @@ mod example_common;
7use example_common::*; 7use example_common::*;
8 8
9use cortex_m_rt::entry; 9use cortex_m_rt::entry;
10use defmt::panic;
10use futures::pin_mut; 11use futures::pin_mut;
11use nrf52840_hal::gpio; 12use nrf52840_hal::gpio;
12 13
@@ -14,6 +15,7 @@ use embassy::executor::{task, Executor};
14use embassy::io::{AsyncBufRead, AsyncBufReadExt, AsyncWrite, AsyncWriteExt}; 15use embassy::io::{AsyncBufRead, AsyncBufReadExt, AsyncWrite, AsyncWriteExt};
15use embassy::util::Forever; 16use embassy::util::Forever;
16use embassy_nrf::buffered_uarte; 17use embassy_nrf::buffered_uarte;
18use embassy_nrf::interrupt;
17 19
18#[task] 20#[task]
19async fn run() { 21async fn run() {
@@ -31,8 +33,10 @@ async fn run() {
31 rts: None, 33 rts: None,
32 }; 34 };
33 35
36 let irq = interrupt::take!(UARTE0_UART0);
34 let u = buffered_uarte::BufferedUarte::new( 37 let u = buffered_uarte::BufferedUarte::new(
35 p.UARTE0, 38 p.UARTE0,
39 irq,
36 pins, 40 pins,
37 buffered_uarte::Parity::EXCLUDED, 41 buffered_uarte::Parity::EXCLUDED,
38 buffered_uarte::Baudrate::BAUD115200, 42 buffered_uarte::Baudrate::BAUD115200,