max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update generated code

Browse Source
This commit is contained in:
Thales Fragoso
2021-05-14 23:53:12 -03:00
parent 1e5f25aa41
commit 86063ac2a2
194 changed files with 6835 additions and 35319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
embassy-stm32/src/pac/stm32f401vd.rs
View File

@ -127,7 +127,6 @@ impl_gpio_pin!(PH13, 7, 13, EXTI13);
impl_gpio_pin!(PH14, 7, 14, EXTI14);
impl_gpio_pin!(PH15, 7, 15, EXTI15);
pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
<<<<<<< HEAD
impl_spi!(SPI1, APB2);
impl_spi_pin!(SPI1, SckPin, PA5, 5);
impl_spi_pin!(SPI1, MisoPin, PA6, 5);
@ -161,11 +160,6 @@ impl_spi_pin!(SPI4, MosiPin, PE14, 5);
impl_spi_pin!(SPI4, SckPin, PE2, 5);
impl_spi_pin!(SPI4, MisoPin, PE5, 5);
impl_spi_pin!(SPI4, MosiPin, PE6, 5);
=======
pub const SPI2: spi::Spi = spi::Spi(0x40003800 as _);
pub const SPI3: spi::Spi = spi::Spi(0x40003c00 as _);
pub const SPI4: spi::Spi = spi::Spi(0x40013400 as _);
>>>>>>> 546082a (Update generated code)
pub const SYSCFG: syscfg::Syscfg = syscfg::Syscfg(0x40013800 as _);
pub const USART1: usart::Usart = usart::Usart(0x40011000 as _);
impl_usart!(USART1);