Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 17 additions & 12 deletions src/gpio.rs
Original file line number Diff line number Diff line change
Expand Up @@ -170,10 +170,12 @@ pub struct PatchSmGPIO {
pub c3: Option<gpio::gpioa::PA2<Analog>>,
pub c4: Option<gpio::gpioa::PA6<Analog>>,
pub c5: Option<gpio::gpioa::PA3<Analog>>,
pub c6: Option<gpio::gpiob::PB1<Analog>>,
pub c7: Option<gpio::gpioc::PC4<Analog>>,
pub c8: Option<gpio::gpioc::PC0<Analog>>,
pub c9: Option<gpio::gpioc::PC1<Analog>>,
// NOTE: C6-C9 are mismatched from the datasheet STM32 pin connections
// This is to match the documented "CVx" numbering that is used everywhere
pub c6: Option<gpio::gpioc::PC1<Analog>>,
pub c7: Option<gpio::gpioc::PC0<Analog>>,
pub c8: Option<gpio::gpiob::PB1<Analog>>,
pub c9: Option<gpio::gpioc::PC4<Analog>>,
pub c10: Option<gpio::gpioa::PA4<Analog>>,
pub d1: Option<gpio::gpiob::PB4<Alternate<0>>>,
pub d2: Option<gpio::gpioc::PC11<Analog>>,
Expand Down Expand Up @@ -208,10 +210,12 @@ impl PatchSmGPIO {
c3: Option<gpio::gpioa::PA2<Analog>>,
c4: Option<gpio::gpioa::PA6<Analog>>,
c5: Option<gpio::gpioa::PA3<Analog>>,
c6: Option<gpio::gpiob::PB1<Analog>>,
c7: Option<gpio::gpioc::PC4<Analog>>,
c8: Option<gpio::gpioc::PC0<Analog>>,
c9: Option<gpio::gpioc::PC1<Analog>>,
// Physical pin arguments stay in "physical" order to make this obvious,
// and easier to confirm w/ datasheet..
c6_phys: Option<gpio::gpiob::PB1<Analog>>,
c7_phys: Option<gpio::gpioc::PC4<Analog>>,
c8_phys: Option<gpio::gpioc::PC0<Analog>>,
c9_phys: Option<gpio::gpioc::PC1<Analog>>,
c10: Option<gpio::gpioa::PA4<Analog>>,
d1: Option<gpio::gpiob::PB4<Alternate<0>>>,
d2: Option<gpio::gpioc::PC11<Analog>>,
Expand Down Expand Up @@ -245,10 +249,11 @@ impl PatchSmGPIO {
c3,
c4,
c5,
c6,
c7,
c8,
c9,
// Remap to match expected CV ordering in datasheet, frontpanels, etc.
c6: c9_phys,
c7: c8_phys,
c8: c6_phys,
c9: c7_phys,
c10,
d1,
d2,
Expand Down
Loading