Remove Peripheral trait, rename PeripheralRef->Peri.
This commit is contained in:
@@ -25,14 +25,14 @@ async fn main(_spawner: Spawner) {
|
||||
// test teardown + recreate of the buffereduarte works fine.
|
||||
for _ in 0..2 {
|
||||
let u = BufferedUarte::new(
|
||||
&mut peri!(p, UART0),
|
||||
&mut p.TIMER0,
|
||||
&mut p.PPI_CH0,
|
||||
&mut p.PPI_CH1,
|
||||
&mut p.PPI_GROUP0,
|
||||
peri!(p, UART0).reborrow(),
|
||||
p.TIMER0.reborrow(),
|
||||
p.PPI_CH0.reborrow(),
|
||||
p.PPI_CH1.reborrow(),
|
||||
p.PPI_GROUP0.reborrow(),
|
||||
irqs!(UART0_BUFFERED),
|
||||
&mut peri!(p, PIN_A),
|
||||
&mut peri!(p, PIN_B),
|
||||
peri!(p, PIN_A).reborrow(),
|
||||
peri!(p, PIN_B).reborrow(),
|
||||
config.clone(),
|
||||
&mut rx_buffer,
|
||||
&mut tx_buffer,
|
||||
|
||||
@@ -27,21 +27,21 @@ async fn main(_spawner: Spawner) {
|
||||
const COUNT: usize = 40_000;
|
||||
|
||||
let mut tx = BufferedUarteTx::new(
|
||||
&mut peri!(p, UART1),
|
||||
peri!(p, UART1).reborrow(),
|
||||
irqs!(UART1_BUFFERED),
|
||||
&mut peri!(p, PIN_A),
|
||||
peri!(p, PIN_A).reborrow(),
|
||||
config.clone(),
|
||||
&mut tx_buffer,
|
||||
);
|
||||
|
||||
let mut rx = BufferedUarteRx::new(
|
||||
&mut peri!(p, UART0),
|
||||
&mut p.TIMER0,
|
||||
&mut p.PPI_CH0,
|
||||
&mut p.PPI_CH1,
|
||||
&mut p.PPI_GROUP0,
|
||||
peri!(p, UART0).reborrow(),
|
||||
p.TIMER0.reborrow(),
|
||||
p.PPI_CH0.reborrow(),
|
||||
p.PPI_CH1.reborrow(),
|
||||
p.PPI_GROUP0.reborrow(),
|
||||
irqs!(UART0_BUFFERED),
|
||||
&mut peri!(p, PIN_B),
|
||||
peri!(p, PIN_B).reborrow(),
|
||||
config.clone(),
|
||||
&mut rx_buffer,
|
||||
);
|
||||
|
||||
@@ -27,7 +27,11 @@ async fn main(_spawner: Spawner) {
|
||||
|
||||
let mut rx_buffer = [0u8; 1024];
|
||||
|
||||
mem::forget(Output::new(&mut peri!(p, PIN_A), Level::High, OutputDrive::Standard));
|
||||
mem::forget(Output::new(
|
||||
peri!(p, PIN_A).reborrow(),
|
||||
Level::High,
|
||||
OutputDrive::Standard,
|
||||
));
|
||||
|
||||
let mut u = BufferedUarteRx::new(
|
||||
peri!(p, UART0),
|
||||
|
||||
@@ -17,11 +17,11 @@ async fn main(_spawner: Spawner) {
|
||||
let mut config = spim::Config::default();
|
||||
config.frequency = spim::Frequency::M1;
|
||||
let mut spim = Spim::new(
|
||||
&mut peri!(p, SPIM0),
|
||||
peri!(p, SPIM0).reborrow(),
|
||||
irqs!(SPIM0),
|
||||
&mut peri!(p, PIN_X),
|
||||
&mut peri!(p, PIN_A), // MISO
|
||||
&mut peri!(p, PIN_B), // MOSI
|
||||
peri!(p, PIN_X).reborrow(),
|
||||
peri!(p, PIN_A).reborrow(), // MISO
|
||||
peri!(p, PIN_B).reborrow(), // MOSI
|
||||
config.clone(),
|
||||
);
|
||||
let data = [
|
||||
|
||||
@@ -19,8 +19,18 @@ async fn main(_spawner: Spawner) {
|
||||
config.parity = uarte::Parity::EXCLUDED;
|
||||
config.baudrate = uarte::Baudrate::BAUD1M;
|
||||
|
||||
let mut tx = UarteTx::new(&mut peri!(p, UART0), irqs!(UART0), &mut peri!(p, PIN_A), config.clone());
|
||||
let mut rx = UarteRx::new(&mut peri!(p, UART1), irqs!(UART1), &mut peri!(p, PIN_B), config.clone());
|
||||
let mut tx = UarteTx::new(
|
||||
peri!(p, UART0).reborrow(),
|
||||
irqs!(UART0),
|
||||
peri!(p, PIN_A).reborrow(),
|
||||
config.clone(),
|
||||
);
|
||||
let mut rx = UarteRx::new(
|
||||
peri!(p, UART1).reborrow(),
|
||||
irqs!(UART1),
|
||||
peri!(p, PIN_B).reborrow(),
|
||||
config.clone(),
|
||||
);
|
||||
|
||||
let data = [
|
||||
0x42, 0x43, 0x44, 0x45, 0x66, 0x12, 0x23, 0x34, 0x45, 0x19, 0x91, 0xaa, 0xff, 0xa5, 0x5a, 0x77,
|
||||
|
||||
@@ -21,10 +21,10 @@ async fn main(_spawner: Spawner) {
|
||||
config.baudrate = uarte::Baudrate::BAUD9600;
|
||||
|
||||
let uarte = Uarte::new(
|
||||
&mut peri!(p, UART0),
|
||||
peri!(p, UART0).reborrow(),
|
||||
irqs!(UART0),
|
||||
&mut peri!(p, PIN_A),
|
||||
&mut peri!(p, PIN_B),
|
||||
peri!(p, PIN_A).reborrow(),
|
||||
peri!(p, PIN_B).reborrow(),
|
||||
config.clone(),
|
||||
);
|
||||
let (mut tx, mut rx) = uarte.split();
|
||||
|
||||
Reference in New Issue
Block a user