From 49253152cff2a45bd08cd1801bb6d5f0f3ce9b30 Mon Sep 17 00:00:00 2001
From: Jacob Rosenthal <jacobrosenthal@gmail.com>
Date: Mon, 1 Nov 2021 19:11:37 -0700
Subject: seperate sequence from duty cycle pwm struct

---
 examples/nrf/src/bin/pwm_sequence.rs   | 9 ++++++---
 examples/nrf/src/bin/pwm_simple_sin.rs | 9 +++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'examples')

diff --git a/examples/nrf/src/bin/pwm_sequence.rs b/examples/nrf/src/bin/pwm_sequence.rs
index 066ab3c03..0a7bea1c4 100644
--- a/examples/nrf/src/bin/pwm_sequence.rs
+++ b/examples/nrf/src/bin/pwm_sequence.rs
@@ -7,7 +7,9 @@ mod example_common;
 use defmt::*;
 use embassy::executor::Spawner;
 use embassy::time::{Duration, Timer};
-use embassy_nrf::pwm::{CounterMode, Prescaler, Pwm, SequenceConfig, SequenceLoad, SequenceMode};
+use embassy_nrf::pwm::{
+    CounterMode, Prescaler, PwmSeq, SequenceConfig, SequenceLoad, SequenceMode,
+};
 use embassy_nrf::Peripherals;
 
 #[embassy::main]
@@ -27,8 +29,9 @@ async fn main(_spawner: Spawner, p: Peripherals) {
         times: SequenceMode::Times(5),
     };
 
-    let pwm = Pwm::new(p.PWM0, p.P0_13, p.P0_15, p.P0_16, p.P0_14);
-    unwrap!(pwm.play_sequence(config));
+    let _pwm = unwrap!(PwmSeq::new(
+        p.PWM0, p.P0_13, p.P0_15, p.P0_16, p.P0_14, config
+    ));
     info!("pwm started!");
 
     loop {
diff --git a/examples/nrf/src/bin/pwm_simple_sin.rs b/examples/nrf/src/bin/pwm_simple_sin.rs
index 3c1bddbc7..6fd59c6a4 100644
--- a/examples/nrf/src/bin/pwm_simple_sin.rs
+++ b/examples/nrf/src/bin/pwm_simple_sin.rs
@@ -9,7 +9,9 @@ use defmt::*;
 use embassy::executor::Spawner;
 use embassy::time::{Duration, Timer};
 use embassy_nrf::gpio::NoPin;
-use embassy_nrf::pwm::{CounterMode, Prescaler, Pwm, SequenceConfig, SequenceLoad, SequenceMode};
+use embassy_nrf::pwm::{
+    CounterMode, Prescaler, PwmSeq, SequenceConfig, SequenceLoad, SequenceMode,
+};
 use embassy_nrf::Peripherals;
 use micromath::F32Ext;
 
@@ -31,13 +33,12 @@ async fn main(_spawner: Spawner, p: Peripherals) {
         times: SequenceMode::Infinite,
     };
 
-    let pwm = Pwm::new(p.PWM0, p.P0_13, NoPin, NoPin, NoPin);
-    unwrap!(pwm.play_sequence(config));
+    let pwm = unwrap!(PwmSeq::new(p.PWM0, p.P0_13, NoPin, NoPin, NoPin, config));
     info!("pwm started!");
 
     Timer::after(Duration::from_millis(20000)).await;
 
-    pwm.sequence_stop();
+    pwm.stop();
     info!("pwm stopped!");
 
     loop {
-- 
cgit