From 12b2c5d5f70b836c853c000f036df2bdc255098d Mon Sep 17 00:00:00 2001
From: Jacob Rosenthal <jacobrosenthal@gmail.com>
Date: Mon, 1 Nov 2021 08:54:07 -0700
Subject: better not as a constructor?

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

(limited to 'examples')

diff --git a/examples/nrf/src/bin/pwm_sequence.rs b/examples/nrf/src/bin/pwm_sequence.rs
index 40ba7ab1c..066ab3c03 100644
--- a/examples/nrf/src/bin/pwm_sequence.rs
+++ b/examples/nrf/src/bin/pwm_sequence.rs
@@ -7,7 +7,7 @@ mod example_common;
 use defmt::*;
 use embassy::executor::Spawner;
 use embassy::time::{Duration, Timer};
-use embassy_nrf::pwm::{CounterMode, LoopMode, LoopingConfig, Prescaler, Pwm, SequenceLoad};
+use embassy_nrf::pwm::{CounterMode, Prescaler, Pwm, SequenceConfig, SequenceLoad, SequenceMode};
 use embassy_nrf::Peripherals;
 
 #[embassy::main]
@@ -16,7 +16,7 @@ async fn main(_spawner: Spawner, p: Peripherals) {
         0x8000, 0, 0, 0, 0, 0x8000, 0, 0, 0, 0, 0x8000, 0, 0, 0, 0, 0x8000,
     ];
 
-    let config = LoopingConfig {
+    let config = SequenceConfig {
         counter_mode: CounterMode::Up,
         top: 15625,
         prescaler: Prescaler::Div128,
@@ -24,12 +24,11 @@ async fn main(_spawner: Spawner, p: Peripherals) {
         sequence_load: SequenceLoad::Individual,
         refresh: 0,
         end_delay: 0,
-        times: LoopMode::Times(5),
+        times: SequenceMode::Times(5),
     };
 
-    let _pwm = unwrap!(Pwm::simple_playback(
-        p.PWM0, p.P0_13, p.P0_15, p.P0_16, p.P0_14, config
-    ));
+    let pwm = Pwm::new(p.PWM0, p.P0_13, p.P0_15, p.P0_16, p.P0_14);
+    unwrap!(pwm.play_sequence(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 c1af0db8c..3c1bddbc7 100644
--- a/examples/nrf/src/bin/pwm_simple_sin.rs
+++ b/examples/nrf/src/bin/pwm_simple_sin.rs
@@ -9,7 +9,7 @@ use defmt::*;
 use embassy::executor::Spawner;
 use embassy::time::{Duration, Timer};
 use embassy_nrf::gpio::NoPin;
-use embassy_nrf::pwm::{CounterMode, LoopMode, LoopingConfig, Prescaler, Pwm, SequenceLoad};
+use embassy_nrf::pwm::{CounterMode, Prescaler, Pwm, SequenceConfig, SequenceLoad, SequenceMode};
 use embassy_nrf::Peripherals;
 use micromath::F32Ext;
 
@@ -20,7 +20,7 @@ async fn main(_spawner: Spawner, p: Peripherals) {
     // probably not best use of resources to create the table at runtime, but makes testing fast
     let seq_values: [u16; 220] = core::array::from_fn(|n| ((W1 * n as f32).sin() * 10000.0) as u16);
 
-    let config = LoopingConfig {
+    let config = SequenceConfig {
         counter_mode: CounterMode::UpAndDown,
         top: 12000,
         prescaler: Prescaler::Div16,
@@ -28,12 +28,11 @@ async fn main(_spawner: Spawner, p: Peripherals) {
         sequence_load: SequenceLoad::Common,
         refresh: 0,
         end_delay: 0,
-        times: LoopMode::Infinite,
+        times: SequenceMode::Infinite,
     };
 
-    let pwm = unwrap!(Pwm::simple_playback(
-        p.PWM0, p.P0_13, NoPin, NoPin, NoPin, config
-    ));
+    let pwm = Pwm::new(p.PWM0, p.P0_13, NoPin, NoPin, NoPin);
+    unwrap!(pwm.play_sequence(config));
     info!("pwm started!");
 
     Timer::after(Duration::from_millis(20000)).await;
-- 
cgit