From 6de02bb23e270141885e24719dc8fbca0bb97feb Mon Sep 17 00:00:00 2001 From: Dario Nieuwenhuis Date: Sat, 12 Feb 2022 01:04:01 +0100 Subject: nrf: remove OptionalPin --- examples/nrf/src/bin/pwm.rs | 2 +- examples/nrf/src/bin/pwm_double_sequence.rs | 5 +---- examples/nrf/src/bin/pwm_sequence.rs | 5 +---- examples/nrf/src/bin/pwm_sequence_ppi.rs | 6 ++---- examples/nrf/src/bin/pwm_sequence_ws2812b.rs | 5 +---- examples/nrf/src/bin/pwm_servo.rs | 3 +-- examples/nrf/src/bin/uart.rs | 3 +-- examples/nrf/src/bin/uart_idle.rs | 3 +-- examples/nrf/src/bin/uart_split.rs | 3 +-- 9 files changed, 10 insertions(+), 25 deletions(-) (limited to 'examples/nrf') diff --git a/examples/nrf/src/bin/pwm.rs b/examples/nrf/src/bin/pwm.rs index 8679eddd8..68402ce22 100644 --- a/examples/nrf/src/bin/pwm.rs +++ b/examples/nrf/src/bin/pwm.rs @@ -85,7 +85,7 @@ static DUTY: [u16; 1024] = [ #[embassy::main] async fn main(_spawner: Spawner, p: Peripherals) { - let mut pwm = SimplePwm::new(p.PWM0, p.P0_13, p.P0_14, p.P0_16, p.P0_15); + let mut pwm = SimplePwm::new_4ch(p.PWM0, p.P0_13, p.P0_14, p.P0_16, p.P0_15); pwm.set_prescaler(Prescaler::Div1); pwm.set_max_duty(32767); info!("pwm initialized!"); diff --git a/examples/nrf/src/bin/pwm_double_sequence.rs b/examples/nrf/src/bin/pwm_double_sequence.rs index 269015f4a..85938f32c 100644 --- a/examples/nrf/src/bin/pwm_double_sequence.rs +++ b/examples/nrf/src/bin/pwm_double_sequence.rs @@ -7,7 +7,6 @@ mod example_common; use defmt::*; use embassy::executor::Spawner; use embassy::time::{Duration, Timer}; -use embassy_nrf::gpio::NoPin; use embassy_nrf::pwm::{ Config, Prescaler, Sequence, SequenceConfig, SequenceMode, SequencePwm, Sequencer, StartSequence, @@ -29,9 +28,7 @@ async fn main(_spawner: Spawner, p: Peripherals) { seq_config.refresh = 624; // thus our sequence takes 5 * 5000ms or 25 seconds - let mut pwm = unwrap!(SequencePwm::new( - p.PWM0, p.P0_13, NoPin, NoPin, NoPin, config, - )); + let mut pwm = unwrap!(SequencePwm::new_1ch(p.PWM0, p.P0_13, config)); let sequence_0 = Sequence::new(&seq_words_0, seq_config.clone()); let sequence_1 = Sequence::new(&seq_words_1, seq_config); diff --git a/examples/nrf/src/bin/pwm_sequence.rs b/examples/nrf/src/bin/pwm_sequence.rs index f06ea0b19..f42958145 100644 --- a/examples/nrf/src/bin/pwm_sequence.rs +++ b/examples/nrf/src/bin/pwm_sequence.rs @@ -7,7 +7,6 @@ mod example_common; use defmt::*; use embassy::executor::Spawner; use embassy::time::{Duration, Timer}; -use embassy_nrf::gpio::NoPin; use embassy_nrf::pwm::{ Config, Prescaler, SequenceConfig, SequencePwm, SingleSequenceMode, SingleSequencer, }; @@ -27,9 +26,7 @@ async fn main(_spawner: Spawner, p: Peripherals) { seq_config.refresh = 624; // thus our sequence takes 5 * 5000ms or 25 seconds - let mut pwm = unwrap!(SequencePwm::new( - p.PWM0, p.P0_13, NoPin, NoPin, NoPin, config, - )); + let mut pwm = unwrap!(SequencePwm::new_1ch(p.PWM0, p.P0_13, config,)); let sequencer = SingleSequencer::new(&mut pwm, &seq_words, seq_config); unwrap!(sequencer.start(SingleSequenceMode::Times(1))); diff --git a/examples/nrf/src/bin/pwm_sequence_ppi.rs b/examples/nrf/src/bin/pwm_sequence_ppi.rs index c25c5e10d..66717c592 100644 --- a/examples/nrf/src/bin/pwm_sequence_ppi.rs +++ b/examples/nrf/src/bin/pwm_sequence_ppi.rs @@ -8,7 +8,7 @@ mod example_common; use core::future::pending; use defmt::*; use embassy::executor::Spawner; -use embassy_nrf::gpio::{Input, NoPin, Pull}; +use embassy_nrf::gpio::{Input, Pull}; use embassy_nrf::gpiote::{InputChannel, InputChannelPolarity}; use embassy_nrf::ppi::Ppi; use embassy_nrf::pwm::{ @@ -29,9 +29,7 @@ async fn main(_spawner: Spawner, p: Peripherals) { let mut seq_config = SequenceConfig::default(); seq_config.refresh = 30; - let mut pwm = unwrap!(SequencePwm::new( - p.PWM0, p.P0_13, NoPin, NoPin, NoPin, config, - )); + let mut pwm = unwrap!(SequencePwm::new_1ch(p.PWM0, p.P0_13, config)); // pwm.stop() deconfigures pins, and then the task_start_seq0 task cant work // so its going to have to start running in order load the configuration diff --git a/examples/nrf/src/bin/pwm_sequence_ws2812b.rs b/examples/nrf/src/bin/pwm_sequence_ws2812b.rs index d1a027a7e..e5af7b462 100644 --- a/examples/nrf/src/bin/pwm_sequence_ws2812b.rs +++ b/examples/nrf/src/bin/pwm_sequence_ws2812b.rs @@ -7,7 +7,6 @@ mod example_common; use defmt::*; use embassy::executor::Spawner; use embassy::time::{Duration, Timer}; -use embassy_nrf::gpio::NoPin; use embassy_nrf::pwm::{ Config, Prescaler, SequenceConfig, SequenceLoad, SequencePwm, SingleSequenceMode, SingleSequencer, @@ -35,9 +34,7 @@ async fn main(_spawner: Spawner, p: Peripherals) { config.sequence_load = SequenceLoad::Common; config.prescaler = Prescaler::Div1; config.max_duty = 20; // 1.25us (1s / 16Mhz * 20) - let mut pwm = unwrap!(SequencePwm::new( - p.PWM0, p.P1_05, NoPin, NoPin, NoPin, config, - )); + let mut pwm = unwrap!(SequencePwm::new_1ch(p.PWM0, p.P1_05, config)); // Declare the bits of 24 bits in a buffer we'll be // mutating later. diff --git a/examples/nrf/src/bin/pwm_servo.rs b/examples/nrf/src/bin/pwm_servo.rs index 7859a858e..c2ab0e7d1 100644 --- a/examples/nrf/src/bin/pwm_servo.rs +++ b/examples/nrf/src/bin/pwm_servo.rs @@ -7,13 +7,12 @@ mod example_common; use defmt::*; use embassy::executor::Spawner; use embassy::time::{Duration, Timer}; -use embassy_nrf::gpio::NoPin; use embassy_nrf::pwm::{Prescaler, SimplePwm}; use embassy_nrf::Peripherals; #[embassy::main] async fn main(_spawner: Spawner, p: Peripherals) { - let mut pwm = SimplePwm::new(p.PWM0, p.P0_05, NoPin, NoPin, NoPin); + let mut pwm = SimplePwm::new_1ch(p.PWM0, p.P0_05); // sg90 microervo requires 50hz or 20ms period // set_period can only set down to 125khz so we cant use it directly // Div128 is 125khz or 0.000008s or 0.008ms, 20/0.008 is 2500 is top diff --git a/examples/nrf/src/bin/uart.rs b/examples/nrf/src/bin/uart.rs index 68ee3978a..5dc89df66 100644 --- a/examples/nrf/src/bin/uart.rs +++ b/examples/nrf/src/bin/uart.rs @@ -7,7 +7,6 @@ mod example_common; use example_common::*; use embassy::executor::Spawner; -use embassy_nrf::gpio::NoPin; use embassy_nrf::{interrupt, uarte, Peripherals}; #[embassy::main] @@ -17,7 +16,7 @@ async fn main(_spawner: Spawner, p: Peripherals) { config.baudrate = uarte::Baudrate::BAUD115200; let irq = interrupt::take!(UARTE0_UART0); - let mut uart = uarte::Uarte::new(p.UARTE0, irq, p.P0_08, p.P0_06, NoPin, NoPin, config); + let mut uart = uarte::Uarte::new(p.UARTE0, irq, p.P0_08, p.P0_06, config); info!("uarte initialized!"); diff --git a/examples/nrf/src/bin/uart_idle.rs b/examples/nrf/src/bin/uart_idle.rs index 76449c0e3..88dc185af 100644 --- a/examples/nrf/src/bin/uart_idle.rs +++ b/examples/nrf/src/bin/uart_idle.rs @@ -7,7 +7,6 @@ mod example_common; use example_common::*; use embassy::executor::Spawner; -use embassy_nrf::gpio::NoPin; use embassy_nrf::{interrupt, uarte, Peripherals}; #[embassy::main] @@ -18,7 +17,7 @@ async fn main(_spawner: Spawner, p: Peripherals) { let irq = interrupt::take!(UARTE0_UART0); let mut uart = uarte::UarteWithIdle::new( - p.UARTE0, p.TIMER0, p.PPI_CH0, p.PPI_CH1, irq, p.P0_08, p.P0_06, NoPin, NoPin, config, + p.UARTE0, p.TIMER0, p.PPI_CH0, p.PPI_CH1, irq, p.P0_08, p.P0_06, config, ); info!("uarte initialized!"); diff --git a/examples/nrf/src/bin/uart_split.rs b/examples/nrf/src/bin/uart_split.rs index a9c02e796..750798378 100644 --- a/examples/nrf/src/bin/uart_split.rs +++ b/examples/nrf/src/bin/uart_split.rs @@ -10,7 +10,6 @@ use embassy::blocking_mutex::kind::Noop; use embassy::channel::mpsc::{self, Channel, Sender}; use embassy::executor::Spawner; use embassy::util::Forever; -use embassy_nrf::gpio::NoPin; use embassy_nrf::peripherals::UARTE0; use embassy_nrf::uarte::UarteRx; use embassy_nrf::{interrupt, uarte, Peripherals}; @@ -24,7 +23,7 @@ async fn main(spawner: Spawner, p: Peripherals) { config.baudrate = uarte::Baudrate::BAUD115200; let irq = interrupt::take!(UARTE0_UART0); - let uart = uarte::Uarte::new(p.UARTE0, irq, p.P0_08, p.P0_06, NoPin, NoPin, config); + let uart = uarte::Uarte::new(p.UARTE0, irq, p.P0_08, p.P0_06, config); let (mut tx, rx) = uart.split(); let c = CHANNEL.put(Channel::new()); -- cgit