aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaleb Jamison <[email protected]>2024-10-09 11:44:58 -0400
committerCaleb Jamison <[email protected]>2024-10-09 11:44:58 -0400
commitc7f7728eb164edea2f8041d2511a976f9ebc17ca (patch)
tree3cfd74e9fcb0cdb01d6c95b56c916ae0470f7df0
parentfc978c2ee9dda07b9fe7113e2aa0f2d3fb33fd1b (diff)
cargo +nightly fmt
-rw-r--r--embassy-rp/src/pio_programs/i2s.rs14
-rw-r--r--embassy-rp/src/pio_programs/pwm.rs9
-rw-r--r--embassy-rp/src/pio_programs/rotary_encoder.rs3
-rw-r--r--embassy-rp/src/pio_programs/stepper.rs3
-rw-r--r--embassy-rp/src/pio_programs/uart.rs15
-rw-r--r--embassy-rp/src/pio_programs/ws2812.rs14
6 files changed, 28 insertions, 30 deletions
diff --git a/embassy-rp/src/pio_programs/i2s.rs b/embassy-rp/src/pio_programs/i2s.rs
index 3c8ef8bb6..e3f1f89d4 100644
--- a/embassy-rp/src/pio_programs/i2s.rs
+++ b/embassy-rp/src/pio_programs/i2s.rs
@@ -1,15 +1,13 @@
1//! Pio backed I2s output 1//! Pio backed I2s output
2 2
3use crate::{
4 dma::{AnyChannel, Channel, Transfer},
5 into_ref,
6 pio::{
7 Common, Config, Direction, FifoJoin, Instance, LoadedProgram, PioPin, ShiftConfig, ShiftDirection, StateMachine,
8 },
9 Peripheral, PeripheralRef,
10};
11use fixed::traits::ToFixed; 3use fixed::traits::ToFixed;
12 4
5use crate::dma::{AnyChannel, Channel, Transfer};
6use crate::pio::{
7 Common, Config, Direction, FifoJoin, Instance, LoadedProgram, PioPin, ShiftConfig, ShiftDirection, StateMachine,
8};
9use crate::{into_ref, Peripheral, PeripheralRef};
10
13/// This struct represents an i2s output driver program 11/// This struct represents an i2s output driver program
14pub struct PioI2sOutProgram<'a, PIO: Instance> { 12pub struct PioI2sOutProgram<'a, PIO: Instance> {
15 prg: LoadedProgram<'a, PIO>, 13 prg: LoadedProgram<'a, PIO>,
diff --git a/embassy-rp/src/pio_programs/pwm.rs b/embassy-rp/src/pio_programs/pwm.rs
index 5dfd70cc9..8a0f3d5ee 100644
--- a/embassy-rp/src/pio_programs/pwm.rs
+++ b/embassy-rp/src/pio_programs/pwm.rs
@@ -2,13 +2,12 @@
2 2
3use core::time::Duration; 3use core::time::Duration;
4 4
5use crate::{
6 clocks,
7 gpio::Level,
8 pio::{Common, Config, Direction, Instance, LoadedProgram, PioPin, StateMachine},
9};
10use pio::InstructionOperands; 5use pio::InstructionOperands;
11 6
7use crate::clocks;
8use crate::gpio::Level;
9use crate::pio::{Common, Config, Direction, Instance, LoadedProgram, PioPin, StateMachine};
10
12fn to_pio_cycles(duration: Duration) -> u32 { 11fn to_pio_cycles(duration: Duration) -> u32 {
13 (clocks::clk_sys_freq() / 1_000_000) / 3 * duration.as_micros() as u32 // parentheses are required to prevent overflow 12 (clocks::clk_sys_freq() / 1_000_000) / 3 * duration.as_micros() as u32 // parentheses are required to prevent overflow
14} 13}
diff --git a/embassy-rp/src/pio_programs/rotary_encoder.rs b/embassy-rp/src/pio_programs/rotary_encoder.rs
index 323f839bc..86423fd31 100644
--- a/embassy-rp/src/pio_programs/rotary_encoder.rs
+++ b/embassy-rp/src/pio_programs/rotary_encoder.rs
@@ -1,8 +1,9 @@
1//! PIO backed quadrature encoder 1//! PIO backed quadrature encoder
2 2
3use fixed::traits::ToFixed;
4
3use crate::gpio::Pull; 5use crate::gpio::Pull;
4use crate::pio::{self, Common, Config, FifoJoin, Instance, LoadedProgram, PioPin, ShiftDirection, StateMachine}; 6use crate::pio::{self, Common, Config, FifoJoin, Instance, LoadedProgram, PioPin, ShiftDirection, StateMachine};
5use fixed::traits::ToFixed;
6 7
7/// This struct represents an Encoder program loaded into pio instruction memory. 8/// This struct represents an Encoder program loaded into pio instruction memory.
8pub struct PioEncoderProgram<'a, PIO: Instance> { 9pub struct PioEncoderProgram<'a, PIO: Instance> {
diff --git a/embassy-rp/src/pio_programs/stepper.rs b/embassy-rp/src/pio_programs/stepper.rs
index 0ecc4eff0..0d58c754c 100644
--- a/embassy-rp/src/pio_programs/stepper.rs
+++ b/embassy-rp/src/pio_programs/stepper.rs
@@ -2,11 +2,12 @@
2 2
3use core::mem::{self, MaybeUninit}; 3use core::mem::{self, MaybeUninit};
4 4
5use crate::pio::{Common, Config, Direction, Instance, Irq, LoadedProgram, PioPin, StateMachine};
6use fixed::traits::ToFixed; 5use fixed::traits::ToFixed;
7use fixed::types::extra::U8; 6use fixed::types::extra::U8;
8use fixed::FixedU32; 7use fixed::FixedU32;
9 8
9use crate::pio::{Common, Config, Direction, Instance, Irq, LoadedProgram, PioPin, StateMachine};
10
10/// This struct represents a Stepper driver program loaded into pio instruction memory. 11/// This struct represents a Stepper driver program loaded into pio instruction memory.
11pub struct PioStepperProgram<'a, PIO: Instance> { 12pub struct PioStepperProgram<'a, PIO: Instance> {
12 prg: LoadedProgram<'a, PIO>, 13 prg: LoadedProgram<'a, PIO>,
diff --git a/embassy-rp/src/pio_programs/uart.rs b/embassy-rp/src/pio_programs/uart.rs
index f4b3b204e..c643f1063 100644
--- a/embassy-rp/src/pio_programs/uart.rs
+++ b/embassy-rp/src/pio_programs/uart.rs
@@ -1,17 +1,16 @@
1//! Pio backed uart drivers 1//! Pio backed uart drivers
2 2
3use crate::{
4 clocks::clk_sys_freq,
5 gpio::Level,
6 pio::{
7 Common, Config, Direction as PioDirection, FifoJoin, Instance, LoadedProgram, PioPin, ShiftDirection,
8 StateMachine,
9 },
10};
11use core::convert::Infallible; 3use core::convert::Infallible;
4
12use embedded_io_async::{ErrorType, Read, Write}; 5use embedded_io_async::{ErrorType, Read, Write};
13use fixed::traits::ToFixed; 6use fixed::traits::ToFixed;
14 7
8use crate::clocks::clk_sys_freq;
9use crate::gpio::Level;
10use crate::pio::{
11 Common, Config, Direction as PioDirection, FifoJoin, Instance, LoadedProgram, PioPin, ShiftDirection, StateMachine,
12};
13
15/// This struct represents a uart tx program loaded into pio instruction memory. 14/// This struct represents a uart tx program loaded into pio instruction memory.
16pub struct PioUartTxProgram<'a, PIO: Instance> { 15pub struct PioUartTxProgram<'a, PIO: Instance> {
17 prg: LoadedProgram<'a, PIO>, 16 prg: LoadedProgram<'a, PIO>,
diff --git a/embassy-rp/src/pio_programs/ws2812.rs b/embassy-rp/src/pio_programs/ws2812.rs
index 3fc7e1017..875f0209f 100644
--- a/embassy-rp/src/pio_programs/ws2812.rs
+++ b/embassy-rp/src/pio_programs/ws2812.rs
@@ -1,16 +1,16 @@
1//! [ws2812](https://www.sparkfun.com/datasheets/LCD/HD44780.pdf) 1//! [ws2812](https://www.sparkfun.com/datasheets/LCD/HD44780.pdf)
2 2
3use crate::{
4 clocks::clk_sys_freq,
5 dma::{AnyChannel, Channel},
6 into_ref,
7 pio::{Common, Config, FifoJoin, Instance, LoadedProgram, PioPin, ShiftConfig, ShiftDirection, StateMachine},
8 Peripheral, PeripheralRef,
9};
10use embassy_time::Timer; 3use embassy_time::Timer;
11use fixed::types::U24F8; 4use fixed::types::U24F8;
12use smart_leds::RGB8; 5use smart_leds::RGB8;
13 6
7use crate::clocks::clk_sys_freq;
8use crate::dma::{AnyChannel, Channel};
9use crate::pio::{
10 Common, Config, FifoJoin, Instance, LoadedProgram, PioPin, ShiftConfig, ShiftDirection, StateMachine,
11};
12use crate::{into_ref, Peripheral, PeripheralRef};
13
14const T1: u8 = 2; // start bit 14const T1: u8 = 2; // start bit
15const T2: u8 = 5; // data bit 15const T2: u8 = 5; // data bit
16const T3: u8 = 3; // stop bit 16const T3: u8 = 3; // stop bit