Skip to content

Commit

Permalink
rename adcpin -> adcchannel
Browse files Browse the repository at this point in the history
  • Loading branch information
@ExplodingWaffle
ExplodingWaffle committed Oct 30, 2024
1 parent 89dbf60 commit f5df03a
Showing 1 changed file with 28 additions and 28 deletions.
56 changes: 28 additions & 28 deletions src/adc.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ impl<'d, T: Instance> Adc<'d, T> {
}

// regular conversion
pub fn configure_channel(&mut self, channel: &mut impl AdcPin<T>, rank: u8, sample_time: SampleTime) {
pub fn configure_channel(&mut self, channel: &mut impl AdcChannel<T>, rank: u8, sample_time: SampleTime) {
channel.set_as_analog();

let channel = channel.channel();
Expand Down Expand Up @@ -123,7 +123,7 @@ impl<'d, T: Instance> Adc<'d, T> {
}

// Get_ADC_Val
pub fn convert(&mut self, channel: &mut impl AdcPin<T>, sample_time: SampleTime) -> u16 {
pub fn convert(&mut self, channel: &mut impl AdcChannel<T>, sample_time: SampleTime) -> u16 {
self.configure_channel(channel, 1, sample_time);

T::regs().ctlr2().modify(|w| w.set_swstart(true));
Expand All @@ -141,7 +141,7 @@ trait SealedInstance {
fn state() -> &'static State;
}

pub(crate) trait SealedAdcPin<T: Instance> {
pub(crate) trait SealedAdcChannel<T: Instance> {
fn set_as_analog(&mut self) {}

#[allow(unused)]
Expand All @@ -155,7 +155,7 @@ pub trait Instance: SealedInstance + crate::Peripheral<P = Self> + crate::periph

/// ADC pin.
#[allow(private_bounds)]
pub trait AdcPin<T: Instance>: SealedAdcPin<T> + Sized {
pub trait AdcChannel<T: Instance>: SealedAdcChannel<T> + Sized {
fn degrade_adc(mut self) -> AnyAdcChannel<T> {
self.set_as_analog();

Expand All @@ -175,8 +175,8 @@ pub struct AnyAdcChannel<T> {
_phantom: PhantomData<T>,
}

impl<T: Instance> AdcPin<T> for AnyAdcChannel<T> {}
impl<T: Instance> SealedAdcPin<T> for AnyAdcChannel<T> {
impl<T: Instance> AdcChannel<T> for AnyAdcChannel<T> {}
impl<T: Instance> SealedAdcChannel<T> for AnyAdcChannel<T> {
fn channel(&self) -> u8 {
self.channel
}
Expand All @@ -203,9 +203,9 @@ foreach_peripheral!(

macro_rules! impl_adc_pin {
($inst:ident, $pin:ident, $ch:expr) => {
impl crate::adc::AdcPin<peripherals::$inst> for crate::peripherals::$pin {}
impl crate::adc::AdcChannel<peripherals::$inst> for crate::peripherals::$pin {}

impl crate::adc::SealedAdcPin<peripherals::$inst> for crate::peripherals::$pin {
impl crate::adc::SealedAdcChannel<peripherals::$inst> for crate::peripherals::$pin {
fn set_as_analog(&mut self) {
<Self as crate::gpio::SealedPin>::set_as_analog(self);
}
Expand All @@ -222,16 +222,16 @@ mod ch_internal {
use super::*;

pub struct VddaDiv2;
impl<T: Instance> AdcPin<T> for VddaDiv2 {}
impl<T: Instance> SealedAdcPin<T> for VddaDiv2 {
impl<T: Instance> AdcChannel<T> for VddaDiv2 {}
impl<T: Instance> SealedAdcChannel<T> for VddaDiv2 {
fn channel(&self) -> u8 {
18
}
}

pub struct VrefInt;
impl<T: Instance> AdcPin<T> for VrefInt {}
impl<T: Instance> SealedAdcPin<T> for VrefInt {
impl<T: Instance> AdcChannel<T> for VrefInt {}
impl<T: Instance> SealedAdcChannel<T> for VrefInt {
fn set_as_analog(&mut self) {
T::regs().ctlr2().modify(|w| w.set_tsvrefe(true));
}
Expand All @@ -241,8 +241,8 @@ mod ch_internal {
}

pub struct Temperature;
impl<T: Instance> AdcPin<T> for Temperature {}
impl<T: Instance> SealedAdcPin<T> for Temperature {
impl<T: Instance> AdcChannel<T> for Temperature {}
impl<T: Instance> SealedAdcChannel<T> for Temperature {
fn set_as_analog(&mut self) {
T::regs().ctlr2().modify(|w| w.set_tsvrefe(true));
}
Expand All @@ -256,8 +256,8 @@ mod ch_internal {
use super::*;

pub struct VrefInt;
impl<T: Instance> AdcPin<T> for VrefInt {}
impl<T: Instance> SealedAdcPin<T> for VrefInt {
impl<T: Instance> AdcChannel<T> for VrefInt {}
impl<T: Instance> SealedAdcChannel<T> for VrefInt {
fn channel(&self) -> u8 {
15
}
Expand All @@ -268,8 +268,8 @@ mod ch_internal {
use super::*;

pub struct VrefInt;
impl<T: Instance> AdcPin<T> for VrefInt {}
impl<T: Instance> SealedAdcPin<T> for VrefInt {
impl<T: Instance> AdcChannel<T> for VrefInt {}
impl<T: Instance> SealedAdcChannel<T> for VrefInt {
fn set_as_analog(&mut self) {
T::regs().ctlr2().modify(|w| w.set_tsvrefe(true));
}
Expand All @@ -279,8 +279,8 @@ mod ch_internal {
}

pub struct Temperature;
impl<T: Instance> AdcPin<T> for Temperature {}
impl<T: Instance> SealedAdcPin<T> for Temperature {
impl<T: Instance> AdcChannel<T> for Temperature {}
impl<T: Instance> SealedAdcChannel<T> for Temperature {
fn set_as_analog(&mut self) {
T::regs().ctlr2().modify(|w| w.set_tsvrefe(true));
}
Expand All @@ -295,16 +295,16 @@ mod ch_internal {
use super::*;

pub struct Vref;
impl<T: Instance> AdcPin<T> for Vref {}
impl<T: Instance> SealedAdcPin<T> for Vref {
impl<T: Instance> AdcChannel<T> for Vref {}
impl<T: Instance> SealedAdcChannel<T> for Vref {
fn channel(&self) -> u8 {
8
}
}

pub struct Vcal;
impl<T: Instance> AdcPin<T> for Vcal {}
impl<T: Instance> SealedAdcPin<T> for Vcal {
impl<T: Instance> AdcChannel<T> for Vcal {}
impl<T: Instance> SealedAdcChannel<T> for Vcal {
fn channel(&self) -> u8 {
9
}
Expand Down Expand Up @@ -379,16 +379,16 @@ mod ch_internal {
}
impl InvertingPin for peripherals::PB7 {}

impl<T: Instance> AdcPin<T> for Isp {}
impl<T: Instance> SealedAdcPin<T> for Isp {
impl<T: Instance> AdcChannel<T> for Isp {}
impl<T: Instance> SealedAdcChannel<T> for Isp {
fn channel(&self) -> u8 {
8
}
}

pub struct VhvDiv5;
impl<T: Instance> AdcPin<T> for VhvDiv5 {}
impl<T: Instance> SealedAdcPin<T> for VhvDiv5 {
impl<T: Instance> AdcChannel<T> for VhvDiv5 {}
impl<T: Instance> SealedAdcChannel<T> for VhvDiv5 {
fn channel(&self) -> u8 {
15
}
Expand Down

0 comments on commit f5df03a

Please sign in to comment.