Merge #1122
1122: embassy-rp: Add split() to BufferedUart r=kalkyl a=kalkyl Co-authored-by: kalkyl <henrik.alser@me.com>
This commit is contained in:
commit
67a6e5accf
3 changed files with 65 additions and 1 deletions
|
@ -126,6 +126,13 @@ impl<'d, T: Instance> BufferedUart<'d, T> {
|
||||||
|
|
||||||
Self { phantom: PhantomData }
|
Self { phantom: PhantomData }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn split(&mut self) -> (BufferedUartRx<'d, T>, BufferedUartTx<'d, T>) {
|
||||||
|
(
|
||||||
|
BufferedUartRx { phantom: PhantomData },
|
||||||
|
BufferedUartTx { phantom: PhantomData },
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'d, T: Instance> BufferedUartRx<'d, T> {
|
impl<'d, T: Instance> BufferedUartRx<'d, T> {
|
||||||
|
|
|
@ -5,4 +5,4 @@ runner = "probe-run --chip RP2040"
|
||||||
target = "thumbv6m-none-eabi" # Cortex-M0 and Cortex-M0+
|
target = "thumbv6m-none-eabi" # Cortex-M0 and Cortex-M0+
|
||||||
|
|
||||||
[env]
|
[env]
|
||||||
DEFMT_LOG = "trace"
|
DEFMT_LOG = "debug"
|
||||||
|
|
57
examples/rp/src/bin/uart_buffered_split.rs
Normal file
57
examples/rp/src/bin/uart_buffered_split.rs
Normal file
|
@ -0,0 +1,57 @@
|
||||||
|
#![no_std]
|
||||||
|
#![no_main]
|
||||||
|
#![feature(type_alias_impl_trait)]
|
||||||
|
|
||||||
|
use defmt::*;
|
||||||
|
use embassy_executor::Spawner;
|
||||||
|
use embassy_executor::_export::StaticCell;
|
||||||
|
use embassy_rp::interrupt;
|
||||||
|
use embassy_rp::peripherals::UART0;
|
||||||
|
use embassy_rp::uart::{BufferedUart, BufferedUartRx, Config};
|
||||||
|
use embassy_time::{Duration, Timer};
|
||||||
|
use embedded_io::asynch::{Read, Write};
|
||||||
|
use {defmt_rtt as _, panic_probe as _};
|
||||||
|
|
||||||
|
macro_rules! singleton {
|
||||||
|
($val:expr) => {{
|
||||||
|
type T = impl Sized;
|
||||||
|
static STATIC_CELL: StaticCell<T> = StaticCell::new();
|
||||||
|
let (x,) = STATIC_CELL.init(($val,));
|
||||||
|
x
|
||||||
|
}};
|
||||||
|
}
|
||||||
|
|
||||||
|
#[embassy_executor::main]
|
||||||
|
async fn main(spawner: Spawner) {
|
||||||
|
let p = embassy_rp::init(Default::default());
|
||||||
|
let (tx_pin, rx_pin, uart) = (p.PIN_0, p.PIN_1, p.UART0);
|
||||||
|
|
||||||
|
let irq = interrupt::take!(UART0_IRQ);
|
||||||
|
let tx_buf = &mut singleton!([0u8; 16])[..];
|
||||||
|
let rx_buf = &mut singleton!([0u8; 16])[..];
|
||||||
|
let mut uart = BufferedUart::new(uart, irq, tx_pin, rx_pin, tx_buf, rx_buf, Config::default());
|
||||||
|
let (rx, mut tx) = uart.split();
|
||||||
|
|
||||||
|
unwrap!(spawner.spawn(reader(rx)));
|
||||||
|
|
||||||
|
info!("Writing...");
|
||||||
|
loop {
|
||||||
|
let data = [
|
||||||
|
1u8, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
|
||||||
|
29, 30, 31,
|
||||||
|
];
|
||||||
|
info!("TX {:?}", data);
|
||||||
|
tx.write_all(&data).await.unwrap();
|
||||||
|
Timer::after(Duration::from_secs(1)).await;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[embassy_executor::task]
|
||||||
|
async fn reader(mut rx: BufferedUartRx<'static, UART0>) {
|
||||||
|
info!("Reading...");
|
||||||
|
loop {
|
||||||
|
let mut buf = [0; 31];
|
||||||
|
rx.read_exact(&mut buf).await.unwrap();
|
||||||
|
info!("RX {:?}", buf);
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in a new issue