From 1d951a54beeee4184315260b3f2ba0a021f4f9d0 Mon Sep 17 00:00:00 2001 From: chemicstry Date: Thu, 26 May 2022 14:02:55 +0300 Subject: Reimplement BufRead for BufferedUart --- examples/stm32f4/Cargo.toml | 2 +- examples/stm32f4/src/bin/usart_buffered.rs | 38 ++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 examples/stm32f4/src/bin/usart_buffered.rs (limited to 'examples') diff --git a/examples/stm32f4/Cargo.toml b/examples/stm32f4/Cargo.toml index e2065bed9..4cd8b7a28 100644 --- a/examples/stm32f4/Cargo.toml +++ b/examples/stm32f4/Cargo.toml @@ -9,13 +9,13 @@ resolver = "2" [dependencies] embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-timestamp-uptime", "unstable-traits"] } embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "unstable-traits", "defmt", "stm32f429zi", "unstable-pac", "memory-x", "time-driver-any", "exti"] } - defmt = "0.3" defmt-rtt = "0.3" cortex-m = "0.7.3" cortex-m-rt = "0.7.0" embedded-hal = "0.2.6" +embedded-io = "0.3.0" panic-probe = { version = "0.3", features = ["print-defmt"] } futures = { version = "0.3.17", default-features = false, features = ["async-await"] } heapless = { version = "0.7.5", default-features = false } diff --git a/examples/stm32f4/src/bin/usart_buffered.rs b/examples/stm32f4/src/bin/usart_buffered.rs new file mode 100644 index 000000000..c5fbbbe5d --- /dev/null +++ b/examples/stm32f4/src/bin/usart_buffered.rs @@ -0,0 +1,38 @@ +#![no_std] +#![no_main] +#![feature(type_alias_impl_trait)] + +use defmt::*; +use defmt_rtt as _; // global logger +use embassy::executor::Spawner; +use embassy_stm32::dma::NoDma; +use embassy_stm32::usart::{BufferedUart, Config, State, Uart}; +use embassy_stm32::{interrupt, Peripherals}; +use embedded_io::asynch::BufRead; +use panic_probe as _; + +#[embassy::main] +async fn main(_spawner: Spawner, p: Peripherals) { + info!("Hello World!"); + + let config = Config::default(); + let usart = Uart::new(p.USART3, p.PD9, p.PD8, NoDma, NoDma, config); + + let mut state = State::new(); + let irq = interrupt::take!(USART3); + let mut tx_buf = [0u8; 32]; + let mut rx_buf = [0u8; 32]; + let mut buf_usart = + unsafe { BufferedUart::new(&mut state, usart, irq, &mut tx_buf, &mut rx_buf) }; + + loop { + let n = { + let buf = buf_usart.fill_buf().await.unwrap(); + info!("Received: {}", buf); + buf.len() + }; + + // Read bytes have to be explicitly consumed, otherwise fill_buf() will return them again + buf_usart.consume(n); + } +} -- cgit From 4b6162694a65bf8629da62499046b8f22cf3175e Mon Sep 17 00:00:00 2001 From: chemicstry Date: Thu, 26 May 2022 14:05:56 +0300 Subject: Fix removed space --- examples/stm32f4/Cargo.toml | 1 + 1 file changed, 1 insertion(+) (limited to 'examples') diff --git a/examples/stm32f4/Cargo.toml b/examples/stm32f4/Cargo.toml index 4cd8b7a28..651d01388 100644 --- a/examples/stm32f4/Cargo.toml +++ b/examples/stm32f4/Cargo.toml @@ -9,6 +9,7 @@ resolver = "2" [dependencies] embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-timestamp-uptime", "unstable-traits"] } embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "unstable-traits", "defmt", "stm32f429zi", "unstable-pac", "memory-x", "time-driver-any", "exti"] } + defmt = "0.3" defmt-rtt = "0.3" -- cgit From 667abe6d1d78cc989fb57884643f4d2f5834ea52 Mon Sep 17 00:00:00 2001 From: chemicstry Date: Thu, 26 May 2022 14:11:15 +0300 Subject: Simplify example --- examples/stm32f4/src/bin/usart_buffered.rs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'examples') diff --git a/examples/stm32f4/src/bin/usart_buffered.rs b/examples/stm32f4/src/bin/usart_buffered.rs index c5fbbbe5d..80b65f0d4 100644 --- a/examples/stm32f4/src/bin/usart_buffered.rs +++ b/examples/stm32f4/src/bin/usart_buffered.rs @@ -26,13 +26,11 @@ async fn main(_spawner: Spawner, p: Peripherals) { unsafe { BufferedUart::new(&mut state, usart, irq, &mut tx_buf, &mut rx_buf) }; loop { - let n = { - let buf = buf_usart.fill_buf().await.unwrap(); - info!("Received: {}", buf); - buf.len() - }; + let buf = buf_usart.fill_buf().await.unwrap(); + info!("Received: {}", buf); // Read bytes have to be explicitly consumed, otherwise fill_buf() will return them again + let n = buf.len(); buf_usart.consume(n); } } -- cgit From c3b899c470bd84ef4f0b8bdeca992ca1069a546c Mon Sep 17 00:00:00 2001 From: chemicstry Date: Thu, 26 May 2022 23:15:06 +0300 Subject: Implement BufRead for nrf BufferedUarte --- examples/nrf/src/bin/buffered_uart.rs | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) (limited to 'examples') diff --git a/examples/nrf/src/bin/buffered_uart.rs b/examples/nrf/src/bin/buffered_uart.rs index a64c5821b..782c39499 100644 --- a/examples/nrf/src/bin/buffered_uart.rs +++ b/examples/nrf/src/bin/buffered_uart.rs @@ -6,7 +6,7 @@ use defmt::*; use embassy::executor::Spawner; use embassy_nrf::buffered_uarte::State; use embassy_nrf::{buffered_uarte::BufferedUarte, interrupt, uarte, Peripherals}; -use embedded_io::asynch::{Read, Write}; +use embedded_io::asynch::{BufRead, Write}; use futures::pin_mut; use defmt_rtt as _; // global logger @@ -46,23 +46,13 @@ async fn main(_spawner: Spawner, p: Peripherals) { unwrap!(u.write_all(b"Hello!\r\n").await); info!("wrote hello in uart!"); - // Simple demo, reading 8-char chunks and echoing them back reversed. loop { info!("reading..."); - let mut buf = [0u8; 8]; - unwrap!(u.read_exact(&mut buf).await); + let buf = unwrap!(u.fill_buf().await); info!("read done, got {}", buf); - // Reverse buf - for i in 0..4 { - buf.swap(i, 7 - i); - } - - info!("writing..."); - unwrap!(u.write_all(&buf).await); - info!("write done"); - - // Wait until the bytes are actually finished being transmitted - unwrap!(u.flush().await); + // Read bytes have to be explicitly consumed, otherwise fill_buf() will return them again + let n = buf.len(); + u.consume(n); } } -- cgit