max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed examples and added defmt format to the new error types

Browse Source
This commit is contained in:
Dion Dokter 2021-10-14 15:13:45 +02:00 committed by Dario Nieuwenhuis
parent 4950682a50
commit e6ec81b999
5 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
embassy-nrf/src/buffered_uarte.rs
View File

@ -25,6 +25,7 @@ pub use pac::uarte0::{baudrate::BAUDRATE_A as Baudrate, config::PARITY_A as Pari
#[non_exhaustive] #[non_exhaustive]
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
#[cfg_attr(feature = "defmt", derive(defmt::Format))]
pub enum Error { pub enum Error {
PpiError(ppi::Error), PpiError(ppi::Error),
} }

1
embassy-nrf/src/ppi.rs
View File

@ -23,6 +23,7 @@ use embassy_hal_common::{unborrow, unsafe_impl_unborrow};
/// Error type of the PPI driver /// Error type of the PPI driver
#[non_exhaustive] #[non_exhaustive]
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
#[cfg_attr(feature = "defmt", derive(defmt::Format))]
pub enum Error { pub enum Error {
/// There is no capacity to enable this task or event (nRF51 & nRF52 only) /// There is no capacity to enable this task or event (nRF51 & nRF52 only)
NoCapacityLeft, NoCapacityLeft,

1
embassy-nrf/src/uarte.rs
View File

@ -27,6 +27,7 @@ pub use pac::uarte0::{baudrate::BAUDRATE_A as Baudrate, config::PARITY_A as Pari
#[non_exhaustive] #[non_exhaustive]
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
#[cfg_attr(feature = "defmt", derive(defmt::Format))]
pub enum Error { pub enum Error {
PpiError(crate::ppi::Error), PpiError(crate::ppi::Error),
} }

4
examples/nrf/src/bin/buffered_uart.rs
View File

@ -26,7 +26,7 @@ async fn main(_spawner: Spawner, p: Peripherals) {
let irq = interrupt::take!(UARTE0_UART0); let irq = interrupt::take!(UARTE0_UART0);
let mut state = State::new(); let mut state = State::new();
let u = unsafe { let u = unsafe {
BufferedUarte::new( unwrap!(BufferedUarte::new(
&mut state, &mut state,
p.UARTE0, p.UARTE0,
p.TIMER0, p.TIMER0,
@ -40,7 +40,7 @@ async fn main(_spawner: Spawner, p: Peripherals) {
config, config,
&mut rx_buffer, &mut rx_buffer,
&mut tx_buffer, &mut tx_buffer,
) ))
}; };
pin_mut!(u); pin_mut!(u);

4
examples/nrf/src/bin/uart_idle.rs
View File

@ -21,9 +21,9 @@ async fn main(_spawner: Spawner, p: Peripherals) {
let irq = interrupt::take!(UARTE0_UART0); let irq = interrupt::take!(UARTE0_UART0);
let mut uart = unsafe { let mut uart = unsafe {
uarte::UarteWithIdle::new( unwrap!(uarte::UarteWithIdle::new(
p.UARTE0, p.TIMER0, p.PPI_CH0, p.PPI_CH1, irq, p.P0_08, p.P0_06, NoPin, NoPin, config, p.UARTE0, p.TIMER0, p.PPI_CH0, p.PPI_CH1, irq, p.P0_08, p.P0_06, NoPin, NoPin, config,
) ))
}; };
info!("uarte initialized!"); info!("uarte initialized!");