Update generated code
This commit is contained in:
@ -212,8 +212,6 @@ impl_gpio_pin!(PK13, 10, 13, EXTI13);
|
||||
impl_gpio_pin!(PK14, 10, 14, EXTI14);
|
||||
impl_gpio_pin!(PK15, 10, 15, EXTI15);
|
||||
pub const RNG: rng::Rng = rng::Rng(0x50060800 as _);
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
impl_rng!(RNG, HASH_RNG);
|
||||
pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
|
||||
impl_spi!(SPI1, APB2);
|
||||
@ -265,18 +263,6 @@ impl_spi!(SPI6, APB2);
|
||||
impl_spi_pin!(SPI6, MisoPin, PG12, 5);
|
||||
impl_spi_pin!(SPI6, SckPin, PG13, 5);
|
||||
impl_spi_pin!(SPI6, MosiPin, PG14, 5);
|
||||
=======
|
||||
impl_rng!(RNG);
|
||||
=======
|
||||
impl_rng!(RNG, HASH_RNG);
|
||||
>>>>>>> cbbaaa9 (Fix RNG interrupt name)
|
||||
pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
|
||||
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 _);
|
||||
pub const SPI5: spi::Spi = spi::Spi(0x40015000 as _);
|
||||
pub const SPI6: spi::Spi = spi::Spi(0x40015400 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);
|
||||
|
Reference in New Issue
Block a user