Skip to content

Commit

Permalink
Merge #358
Browse files Browse the repository at this point in the history 
358: Allow pullup inputs and opendrain outputs r=burrbull a=Windfisch

This fixes #321, #199 and extends on #118, and also fixes this issue for other peripherals that don't mind which pull-ups are configured for their inputs and whether their outputs are pushpull or open drain.

This is a superset of #357 and #359. Prefer this PR.

Co-authored-by: Florian Jung <flo@windfis.ch>
  • Loading branch information
@bors @Windfisch
bors[bot] and Windfisch authored Aug 17, 2021
2 parents 82806e1 + a0e4f46 commit afd8087
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 37 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- `From<Bps>` for `serial::Config`
- `From<Into<Hertz>>` for `i2c::Mode`
- `exti_rtic` example
- Support for OpenDrain pin configuration on SPI CLK and MOSI pins
- Support for OpenDrain pin configuration on CAN, SPI, UART, PWM output pins
- LSB/MSB bit format selection for `SPI`
- Support for CAN peripherals with the `bxcan` crate
- Add DAC, UART4, UART5 clock in RCC for the f103 high density line
Expand All @@ -29,6 +29,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- Added DMA receive support for `SPI`
- Added `release` functions to SPI DMA
- Add GPIOF/GPIOG support for high/xl density lines
- Allow using `Input<PullUp>` and `Input<PullDown>` for all alternate
function inputs.

### Fixed

Expand Down
20 changes: 10 additions & 10 deletions src/can.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
//! ## Alternate function remapping
//!
//! TX: Alternate Push-Pull Output
//! RX: Input Floating Input
//! RX: Input
//!
//! ### CAN1
//!
Expand All @@ -25,7 +25,7 @@ use crate::gpio::gpiob::{PB12, PB13, PB5, PB6};
use crate::gpio::{
gpioa::{PA11, PA12},
gpiob::{PB8, PB9},
Alternate, Floating, Input, PushPull,
Alternate, Input,
};
#[cfg(feature = "connectivity")]
use crate::pac::CAN2;
Expand All @@ -38,8 +38,8 @@ pub trait Pins: crate::Sealed {
fn remap(mapr: &mut MAPR);
}

impl crate::Sealed for (PA12<Alternate<PushPull>>, PA11<Input<Floating>>) {}
impl Pins for (PA12<Alternate<PushPull>>, PA11<Input<Floating>>) {
impl<INMODE, OUTMODE> crate::Sealed for (PA12<Alternate<OUTMODE>>, PA11<Input<INMODE>>) {}
impl<INMODE, OUTMODE> Pins for (PA12<Alternate<OUTMODE>>, PA11<Input<INMODE>>) {
type Instance = CAN1;

fn remap(mapr: &mut MAPR) {
Expand All @@ -50,8 +50,8 @@ impl Pins for (PA12<Alternate<PushPull>>, PA11<Input<Floating>>) {
}
}

impl crate::Sealed for (PB9<Alternate<PushPull>>, PB8<Input<Floating>>) {}
impl Pins for (PB9<Alternate<PushPull>>, PB8<Input<Floating>>) {
impl<INMODE, OUTMODE> crate::Sealed for (PB9<Alternate<OUTMODE>>, PB8<Input<INMODE>>) {}
impl<INMODE, OUTMODE> Pins for (PB9<Alternate<OUTMODE>>, PB8<Input<INMODE>>) {
type Instance = CAN1;

fn remap(mapr: &mut MAPR) {
Expand All @@ -63,9 +63,9 @@ impl Pins for (PB9<Alternate<PushPull>>, PB8<Input<Floating>>) {
}

#[cfg(feature = "connectivity")]
impl crate::Sealed for (PB13<Alternate<PushPull>>, PB12<Input<Floating>>) {}
impl<INMODE, OUTMODE> crate::Sealed for (PB13<Alternate<OUTMODE>>, PB12<Input<INMODE>>) {}
#[cfg(feature = "connectivity")]
impl Pins for (PB13<Alternate<PushPull>>, PB12<Input<Floating>>) {
impl<INMODE, OUTMODE> Pins for (PB13<Alternate<OUTMODE>>, PB12<Input<INMODE>>) {
type Instance = CAN2;

fn remap(mapr: &mut MAPR) {
Expand All @@ -74,9 +74,9 @@ impl Pins for (PB13<Alternate<PushPull>>, PB12<Input<Floating>>) {
}

#[cfg(feature = "connectivity")]
impl crate::Sealed for (PB6<Alternate<PushPull>>, PB5<Input<Floating>>) {}
impl<INMODE, OUTMODE> crate::Sealed for (PB6<Alternate<OUTMODE>>, PB5<Input<INMODE>>) {}
#[cfg(feature = "connectivity")]
impl Pins for (PB6<Alternate<PushPull>>, PB5<Input<Floating>>) {
impl<INMODE, OUTMODE> Pins for (PB6<Alternate<OUTMODE>>, PB5<Input<INMODE>>) {
type Instance = CAN2;

fn remap(mapr: &mut MAPR) {
Expand Down
6 changes: 3 additions & 3 deletions src/pwm.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ use cast::{u16, u32};

use crate::afio::MAPR;
use crate::bb;
use crate::gpio::{self, Alternate, PushPull};
use crate::gpio::{self, Alternate};
use crate::time::Hertz;
use crate::time::U32Ext;
use crate::timer::Timer;
Expand Down Expand Up @@ -106,10 +106,10 @@ macro_rules! pins_impl {
( $( ( $($PINX:ident),+ ), ( $($TRAIT:ident),+ ), ( $($ENCHX:ident),+ ); )+ ) => {
$(
#[allow(unused_parens)]
impl<TIM, REMAP, $($PINX,)+> Pins<REMAP, ($($ENCHX),+)> for ($($PINX),+)
impl<TIM, REMAP, OUTMODE, $($PINX,)+> Pins<REMAP, ($($ENCHX),+)> for ($($PINX),+)
where
REMAP: Remap<Periph = TIM>,
$($PINX: $TRAIT<REMAP> + gpio::PinExt<Mode=Alternate<PushPull>>,)+
$($PINX: $TRAIT<REMAP> + gpio::PinExt<Mode=Alternate<OUTMODE>>,)+
{
$(const $ENCHX: bool = true;)+
type Channels = ($(PwmChannel<TIM, $ENCHX>),+);
Expand Down
8 changes: 4 additions & 4 deletions src/pwm_input.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use crate::pac::TIM4;
use crate::pac::{TIM2, TIM3};

use crate::afio::MAPR;
use crate::gpio::{self, Floating, Input};
use crate::gpio::{self, Input};
use crate::rcc::{Clocks, GetBusFreq, RccBus};
use crate::time::Hertz;
use crate::timer::Timer;
Expand All @@ -21,11 +21,11 @@ pub trait Pins<REMAP> {}

use crate::timer::sealed::{Ch1, Ch2, Remap};

impl<TIM, REMAP, P1, P2> Pins<REMAP> for (P1, P2)
impl<TIM, REMAP, P1, P2, MODE1, MODE2> Pins<REMAP> for (P1, P2)
where
REMAP: Remap<Periph = TIM>,
P1: Ch1<REMAP> + gpio::PinExt<Mode = Input<Floating>>,
P2: Ch2<REMAP> + gpio::PinExt<Mode = Input<Floating>>,
P1: Ch1<REMAP> + gpio::PinExt<Mode = Input<MODE1>>,
P2: Ch2<REMAP> + gpio::PinExt<Mode = Input<MODE2>>,
{
}

Expand Down
16 changes: 8 additions & 8 deletions src/serial.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ use crate::gpio::gpioa::{PA10, PA2, PA3, PA9};
use crate::gpio::gpiob::{PB10, PB11, PB6, PB7};
use crate::gpio::gpioc::{PC10, PC11};
use crate::gpio::gpiod::{PD5, PD6, PD8, PD9};
use crate::gpio::{Alternate, Floating, Input, PushPull};
use crate::gpio::{Alternate, Input};
use crate::rcc::{Clocks, Enable, GetBusFreq, Reset};
use crate::time::{Bps, U32Ext};

Expand Down Expand Up @@ -86,31 +86,31 @@ pub trait Pins<USART> {
const REMAP: u8;
}

impl Pins<USART1> for (PA9<Alternate<PushPull>>, PA10<Input<Floating>>) {
impl<INMODE, OUTMODE> Pins<USART1> for (PA9<Alternate<OUTMODE>>, PA10<Input<INMODE>>) {
const REMAP: u8 = 0;
}

impl Pins<USART1> for (PB6<Alternate<PushPull>>, PB7<Input<Floating>>) {
impl<INMODE, OUTMODE> Pins<USART1> for (PB6<Alternate<OUTMODE>>, PB7<Input<INMODE>>) {
const REMAP: u8 = 1;
}

impl Pins<USART2> for (PA2<Alternate<PushPull>>, PA3<Input<Floating>>) {
impl<INMODE, OUTMODE> Pins<USART2> for (PA2<Alternate<OUTMODE>>, PA3<Input<INMODE>>) {
const REMAP: u8 = 0;
}

impl Pins<USART2> for (PD5<Alternate<PushPull>>, PD6<Input<Floating>>) {
impl<INMODE, OUTMODE> Pins<USART2> for (PD5<Alternate<OUTMODE>>, PD6<Input<INMODE>>) {
const REMAP: u8 = 1;
}

impl Pins<USART3> for (PB10<Alternate<PushPull>>, PB11<Input<Floating>>) {
impl<INMODE, OUTMODE> Pins<USART3> for (PB10<Alternate<OUTMODE>>, PB11<Input<INMODE>>) {
const REMAP: u8 = 0;
}

impl Pins<USART3> for (PC10<Alternate<PushPull>>, PC11<Input<Floating>>) {
impl<INMODE, OUTMODE> Pins<USART3> for (PC10<Alternate<OUTMODE>>, PC11<Input<INMODE>>) {
const REMAP: u8 = 1;
}

impl Pins<USART3> for (PD8<Alternate<PushPull>>, PD9<Input<Floating>>) {
impl<INMODE, OUTMODE> Pins<USART3> for (PD8<Alternate<OUTMODE>>, PD9<Input<INMODE>>) {
const REMAP: u8 = 0b11;
}

Expand Down
20 changes: 9 additions & 11 deletions src/spi.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Serial Peripheral Interface
To construct the SPI instances, use the `Spi::spiX` functions.
The pin parameter is a tuple containing `(sck, miso, mosi)` which should be configured as `(Alternate<PushPull>, Input<Floating>, Alternate<PushPull>)`.
The pin parameter is a tuple containing `(sck, miso, mosi)` which should be configured as `(Alternate<...>, Input<...>, Alternate<...>)`.
As some STM32F1xx chips have 5V tolerant SPI pins, it is also possible to configure Sck and Mosi outputs as `Alternate<PushPull>`. Then
a simple Pull-Up to 5V can be used to use SPI on a 5V bus without a level shifter.
Expand Down Expand Up @@ -50,7 +50,7 @@ use crate::gpio::gpioa::{PA5, PA6, PA7};
use crate::gpio::gpiob::{PB13, PB14, PB15, PB3, PB4, PB5};
#[cfg(feature = "connectivity")]
use crate::gpio::gpioc::{PC10, PC11, PC12};
use crate::gpio::{Alternate, Floating, Input, OpenDrain, PushPull};
use crate::gpio::{Alternate, Input};
use crate::rcc::{Clocks, Enable, GetBusFreq, Reset};
use crate::time::Hertz;

Expand Down Expand Up @@ -127,11 +127,9 @@ macro_rules! remap {
type Periph = $SPIX;
const REMAP: bool = $state;
}
impl Sck<$name> for $SCK<Alternate<PushPull>> {}
impl Sck<$name> for $SCK<Alternate<OpenDrain>> {}
impl Miso<$name> for $MISO<Input<Floating>> {}
impl Mosi<$name> for $MOSI<Alternate<PushPull>> {}
impl Mosi<$name> for $MOSI<Alternate<OpenDrain>> {}
impl<MODE> Sck<$name> for $SCK<Alternate<MODE>> {}
impl<MODE> Miso<$name> for $MISO<Input<MODE>> {}
impl<MODE> Mosi<$name> for $MOSI<Alternate<MODE>> {}
};
}

Expand All @@ -157,7 +155,7 @@ impl<REMAP, PINS> Spi<SPI1, REMAP, PINS, u8> {
/**
Constructs an SPI instance using SPI1 in 8bit dataframe mode.
The pin parameter tuple (sck, miso, mosi) should be `(PA5, PA6, PA7)` or `(PB3, PB4, PB5)` configured as `(Alternate<PushPull>, Input<Floating>, Alternate<PushPull>)`.
The pin parameter tuple (sck, miso, mosi) should be `(PA5, PA6, PA7)` or `(PB3, PB4, PB5)` configured as `(Alternate<...>, Input<...>, Alternate<...>)`.
You can also use `NoSck`, `NoMiso` or `NoMosi` if you don't want to use the pins
*/
Expand All @@ -183,7 +181,7 @@ impl<REMAP, PINS> Spi<SPI2, REMAP, PINS, u8> {
/**
Constructs an SPI instance using SPI2 in 8bit dataframe mode.
The pin parameter tuple (sck, miso, mosi) should be `(PB13, PB14, PB15)` configured as `(Alternate<PushPull>, Input<Floating>, Alternate<PushPull>)`.
The pin parameter tuple (sck, miso, mosi) should be `(PB13, PB14, PB15)` configured as `(Alternate<...>, Input<...>, Alternate<...>)`.
You can also use `NoSck`, `NoMiso` or `NoMosi` if you don't want to use the pins
*/
Expand All @@ -202,7 +200,7 @@ impl<REMAP, PINS> Spi<SPI3, REMAP, PINS, u8> {
/**
Constructs an SPI instance using SPI3 in 8bit dataframe mode.
The pin parameter tuple (sck, miso, mosi) should be `(PB3, PB4, PB5)` configured as `(Alternate<PushPull>, Input<Floating>, Alternate<PushPull>)`.
The pin parameter tuple (sck, miso, mosi) should be `(PB3, PB4, PB5)` configured as `(Alternate<...>, Input<...>, Alternate<...>)`.
You can also use `NoSck`, `NoMiso` or `NoMosi` if you don't want to use the pins
*/
Expand All @@ -219,7 +217,7 @@ impl<REMAP, PINS> Spi<SPI3, REMAP, PINS, u8> {
/**
Constructs an SPI instance using SPI3 in 8bit dataframe mode.
The pin parameter tuple (sck, miso, mosi) should be `(PB3, PB4, PB5)` or `(PC10, PC11, PC12)` configured as `(Alternate<PushPull>, Input<Floating>, Alternate<PushPull>)`.
The pin parameter tuple (sck, miso, mosi) should be `(PB3, PB4, PB5)` or `(PC10, PC11, PC12)` configured as `(Alternate<...>, Input<...>, Alternate<...>)`.
You can also use `NoSck`, `NoMiso` or `NoMosi` if you don't want to use the pins
*/
Expand Down

0 comments on commit afd8087

Please sign in to comment.