NaxdyOrg/embassy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Changed attach to new

Browse source
This commit is contained in:
Bjorn 2024-04-21 10:00:57 -07:00
parent 7658966486
commit d2ba751c06
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
examples/rp/src/bin/pio_pwm.rs
View file

@ -28,7 +28,7 @@ pub struct PwmPio<'d, T: Instance, const SM: usize> {
} }
impl<'d, T: Instance, const SM: usize> PwmPio<'d, T, SM> { impl<'d, T: Instance, const SM: usize> PwmPio<'d, T, SM> {
pub fn attach(pio: &mut Common<'d, T>, mut sm: StateMachine<'d, T, SM>, pin: impl PioPin) -> Self { pub fn new(pio: &mut Common<'d, T>, mut sm: StateMachine<'d, T, SM>, pin: impl PioPin) -> Self {
let prg = pio_proc::pio_asm!( let prg = pio_proc::pio_asm!(
".side_set 1 opt" ".side_set 1 opt"
"pull noblock side 0" "pull noblock side 0"
@ -105,7 +105,7 @@ async fn main(_spawner: Spawner) {
let Pio { mut common, sm0, .. } = Pio::new(p.PIO0, Irqs); let Pio { mut common, sm0, .. } = Pio::new(p.PIO0, Irqs);
// Note that PIN_25 is the led pin on the Pico // Note that PIN_25 is the led pin on the Pico
let mut pwm_pio = PwmPio::attach(&mut common, sm0, p.PIN_25); let mut pwm_pio = PwmPio::new(&mut common, sm0, p.PIN_25);
pwm_pio.set_period(Duration::from_micros(REFRESH_INTERVAL)); pwm_pio.set_period(Duration::from_micros(REFRESH_INTERVAL));
pwm_pio.start(); pwm_pio.start();

4
examples/rp/src/bin/pio_servo.rs
View file

@ -31,7 +31,7 @@ pub struct PwmPio<'d, T: Instance, const SM: usize> {
} }
impl<'d, T: Instance, const SM: usize> PwmPio<'d, T, SM> { impl<'d, T: Instance, const SM: usize> PwmPio<'d, T, SM> {
pub fn attach(pio: &mut Common<'d, T>, mut sm: StateMachine<'d, T, SM>, pin: impl PioPin) -> Self { pub fn new(pio: &mut Common<'d, T>, mut sm: StateMachine<'d, T, SM>, pin: impl PioPin) -> Self {
let prg = pio_proc::pio_asm!( let prg = pio_proc::pio_asm!(
".side_set 1 opt" ".side_set 1 opt"
"pull noblock side 0" "pull noblock side 0"
@ -190,7 +190,7 @@ async fn main(_spawner: Spawner) {
let p = embassy_rp::init(Default::default()); let p = embassy_rp::init(Default::default());
let Pio { mut common, sm0, .. } = Pio::new(p.PIO0, Irqs); let Pio { mut common, sm0, .. } = Pio::new(p.PIO0, Irqs);
let pwm_pio = PwmPio::attach(&mut common, sm0, p.PIN_1); let pwm_pio = PwmPio::new(&mut common, sm0, p.PIN_1);
let mut servo = ServoBuilder::new(pwm_pio) let mut servo = ServoBuilder::new(pwm_pio)
.set_max_degree_rotation(120) // Example of adjusting values for MG996R servo .set_max_degree_rotation(120) // Example of adjusting values for MG996R servo
.set_min_pulse_width(Duration::from_micros(350)) // This value was detemined by a rough experiment. .set_min_pulse_width(Duration::from_micros(350)) // This value was detemined by a rough experiment.