From 54d31c98fe44533c955c494ea58dd16810367c4f Mon Sep 17 00:00:00 2001 From: pennae Date: Fri, 21 Jul 2023 21:33:53 +0200 Subject: [PATCH] rp: remove AdcChannel::channel we're not using it, and actually using it is more trouble than it's worth. remove the false assurance instead. --- embassy-rp/src/adc.rs | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/embassy-rp/src/adc.rs b/embassy-rp/src/adc.rs index e0c2910b8..38b323ec9 100644 --- a/embassy-rp/src/adc.rs +++ b/embassy-rp/src/adc.rs @@ -223,28 +223,21 @@ impl interrupt::typelevel::Handler for Inter } mod sealed { - pub trait AdcChannel { - fn channel(&mut self) -> u8; - } + pub trait AdcChannel {} } pub trait AdcChannel: sealed::AdcChannel {} pub trait AdcPin: AdcChannel + gpio::Pin {} macro_rules! impl_pin { - ($pin:ident, $channel:expr) => { - impl sealed::AdcChannel for peripherals::$pin { - fn channel(&mut self) -> u8 { - $channel - } - } - + ($pin:ident) => { + impl sealed::AdcChannel for peripherals::$pin {} impl AdcChannel for peripherals::$pin {} impl AdcPin for peripherals::$pin {} }; } -impl_pin!(PIN_26, 0); -impl_pin!(PIN_27, 1); -impl_pin!(PIN_28, 2); -impl_pin!(PIN_29, 3); +impl_pin!(PIN_26); +impl_pin!(PIN_27); +impl_pin!(PIN_28); +impl_pin!(PIN_29);