diff --git a/src/adc.rs b/src/adc.rs index 8b15894..7ed9107 100644 --- a/src/adc.rs +++ b/src/adc.rs @@ -1,6 +1,6 @@ use embassy_nrf::{ Peri, - gpio::Output, + gpio::{Level, Output, OutputDrive}, peripherals, pwm::{self, DutyCycle, SimpleConfig, SimplePwm}, saadc::{self, ChannelConfig, Config, Resolution, Saadc}, @@ -89,7 +89,7 @@ pub async fn task( mut saadc: Peri<'static, peripherals::SAADC>, mut light_pin: Peri<'static, peripherals::P0_02>, mut soil_pin: Peri<'static, peripherals::P0_03>, - mut photo_ctrl: Output<'static>, + mut photo_pin: Peri<'static, peripherals::P0_29>, mut pwm: Peri<'static, peripherals::PWM0>, mut pin5: Peri<'static, peripherals::P0_05>, ) { @@ -100,9 +100,8 @@ pub async fn task( loop { measure.changed().await; - + let mut photo_ctrl = Output::new(photo_pin.reborrow(), Level::Low, OutputDrive::Standard); let mut pwm_ctrl = init_pwm(pwm.reborrow(), pin5.reborrow()); - let mut saadc = init_saadc(saadc.reborrow(), light_pin.reborrow(), soil_pin.reborrow()); photo_ctrl.set_high(); diff --git a/src/main.rs b/src/main.rs index d00d318..19428d2 100644 --- a/src/main.rs +++ b/src/main.rs @@ -42,8 +42,6 @@ bind_interrupts!(struct Irqs { fn main() -> ! { let p = embassy_nrf::init(Default::default()); - let photo_ctrl = Output::new(p.P0_29, Level::Low, OutputDrive::Standard); - let mpsl_p = mpsl::Peripherals::new(p.RTC0, p.TIMER0, p.TEMP, p.PPI_CH19, p.PPI_CH30, p.PPI_CH31); let lfclk_cfg = mpsl::raw::mpsl_clock_lfclk_cfg_t { @@ -83,7 +81,7 @@ fn main() -> ! { )))); spawner.spawn(unwrap!(shtc3::task(p.TWISPI0, p.P0_24, p.P0_13))); spawner.spawn(unwrap!(adc::task( - p.SAADC, p.P0_02, p.P0_03, photo_ctrl, p.PWM0, p.P0_05, + p.SAADC, p.P0_02, p.P0_03, p.P0_29, p.PWM0, p.P0_05, ))); spawner.spawn(unwrap!(timer::task())); spawner.spawn(unwrap!(ble::task(spawner, sdc, mpsl)));