Update generated code

embassy-stm32/Cargo.toml

@@ -444,9 +444,6 @@ _gpio = []
 _gpio_v2 = []
 _rng = [ "rand_core",]
 _rng_v1 = []
-_spi = []
-_spi_v1 = []
-_spi_v2 = []
 _sdmmc = [ "sdio-host",]
 _sdmmc_v2 = []
 _spi = []

embassy-stm32/src/pac/stm32f401cb.rs

@@ -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);
@@ -153,10 +152,6 @@ impl_spi_pin!(SPI3, SckPin, PC10, 6);
 impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
 impl_spi_pin!(SPI3, MosiPin, PD6, 5);
-=======
-pub const SPI2: spi::Spi = spi::Spi(0x40003800 as _);
-pub const SPI3: spi::Spi = spi::Spi(0x40003c00 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);

embassy-stm32/src/pac/stm32f401cc.rs

@@ -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);
@@ -153,10 +152,6 @@ impl_spi_pin!(SPI3, SckPin, PC10, 6);
 impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
 impl_spi_pin!(SPI3, MosiPin, PD6, 5);
-=======
-pub const SPI2: spi::Spi = spi::Spi(0x40003800 as _);
-pub const SPI3: spi::Spi = spi::Spi(0x40003c00 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);

embassy-stm32/src/pac/stm32f401cd.rs

@@ -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);
@@ -153,10 +152,6 @@ impl_spi_pin!(SPI3, SckPin, PC10, 6);
 impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
 impl_spi_pin!(SPI3, MosiPin, PD6, 5);
-=======
-pub const SPI2: spi::Spi = spi::Spi(0x40003800 as _);
-pub const SPI3: spi::Spi = spi::Spi(0x40003c00 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);

embassy-stm32/src/pac/stm32f401ce.rs

@@ -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);
@@ -153,10 +152,6 @@ impl_spi_pin!(SPI3, SckPin, PC10, 6);
 impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
 impl_spi_pin!(SPI3, MosiPin, PD6, 5);
-=======
-pub const SPI2: spi::Spi = spi::Spi(0x40003800 as _);
-pub const SPI3: spi::Spi = spi::Spi(0x40003c00 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);

embassy-stm32/src/pac/stm32f401rb.rs

@@ -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);
@@ -153,10 +152,6 @@ impl_spi_pin!(SPI3, SckPin, PC10, 6);
 impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
 impl_spi_pin!(SPI3, MosiPin, PD6, 5);
-=======
-pub const SPI2: spi::Spi = spi::Spi(0x40003800 as _);
-pub const SPI3: spi::Spi = spi::Spi(0x40003c00 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);

embassy-stm32/src/pac/stm32f401rc.rs

@@ -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);
@@ -153,10 +152,6 @@ impl_spi_pin!(SPI3, SckPin, PC10, 6);
 impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
 impl_spi_pin!(SPI3, MosiPin, PD6, 5);
-=======
-pub const SPI2: spi::Spi = spi::Spi(0x40003800 as _);
-pub const SPI3: spi::Spi = spi::Spi(0x40003c00 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);

embassy-stm32/src/pac/stm32f401rd.rs

@@ -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);
@@ -153,10 +152,6 @@ impl_spi_pin!(SPI3, SckPin, PC10, 6);
 impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
 impl_spi_pin!(SPI3, MosiPin, PD6, 5);
-=======
-pub const SPI2: spi::Spi = spi::Spi(0x40003800 as _);
-pub const SPI3: spi::Spi = spi::Spi(0x40003c00 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);

embassy-stm32/src/pac/stm32f401re.rs

@@ -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);
@@ -153,10 +152,6 @@ impl_spi_pin!(SPI3, SckPin, PC10, 6);
 impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
 impl_spi_pin!(SPI3, MosiPin, PD6, 5);
-=======
-pub const SPI2: spi::Spi = spi::Spi(0x40003800 as _);
-pub const SPI3: spi::Spi = spi::Spi(0x40003c00 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);

embassy-stm32/src/pac/stm32f401vb.rs

@@ -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);

embassy-stm32/src/pac/stm32f401vc.rs

@@ -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);

embassy-stm32/src/pac/stm32f401vd.rs

@@ -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);

embassy-stm32/src/pac/stm32f401ve.rs

@@ -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);

embassy-stm32/src/pac/stm32f405oe.rs

@@ -178,8 +178,6 @@ impl_gpio_pin!(PI13, 8, 13, EXTI13);
 impl_gpio_pin!(PI14, 8, 14, EXTI14);
 impl_gpio_pin!(PI15, 8, 15, EXTI15);
 pub const RNG: rng::Rng = rng::Rng(0x50060800 as _);
-<<<<<<< HEAD
-<<<<<<< HEAD
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -208,15 +206,6 @@ impl_spi_pin!(SPI3, MosiPin, PB5, 6);
 impl_spi_pin!(SPI3, SckPin, PC10, 6);
 impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
-=======
-impl_rng!(RNG);
-=======
-impl_rng!(RNG, 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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f405og.rs

@@ -178,8 +178,6 @@ impl_gpio_pin!(PI13, 8, 13, EXTI13);
 impl_gpio_pin!(PI14, 8, 14, EXTI14);
 impl_gpio_pin!(PI15, 8, 15, EXTI15);
 pub const RNG: rng::Rng = rng::Rng(0x50060800 as _);
-<<<<<<< HEAD
-<<<<<<< HEAD
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -208,15 +206,6 @@ impl_spi_pin!(SPI3, MosiPin, PB5, 6);
 impl_spi_pin!(SPI3, SckPin, PC10, 6);
 impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
-=======
-impl_rng!(RNG);
-=======
-impl_rng!(RNG, 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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f405rg.rs

@@ -178,8 +178,6 @@ impl_gpio_pin!(PI13, 8, 13, EXTI13);
 impl_gpio_pin!(PI14, 8, 14, EXTI14);
 impl_gpio_pin!(PI15, 8, 15, EXTI15);
 pub const RNG: rng::Rng = rng::Rng(0x50060800 as _);
-<<<<<<< HEAD
-<<<<<<< HEAD
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -208,15 +206,6 @@ impl_spi_pin!(SPI3, MosiPin, PB5, 6);
 impl_spi_pin!(SPI3, SckPin, PC10, 6);
 impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
-=======
-impl_rng!(RNG);
-=======
-impl_rng!(RNG, 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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f405vg.rs

@@ -178,8 +178,6 @@ impl_gpio_pin!(PI13, 8, 13, EXTI13);
 impl_gpio_pin!(PI14, 8, 14, EXTI14);
 impl_gpio_pin!(PI15, 8, 15, EXTI15);
 pub const RNG: rng::Rng = rng::Rng(0x50060800 as _);
-<<<<<<< HEAD
-<<<<<<< HEAD
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -208,15 +206,6 @@ impl_spi_pin!(SPI3, MosiPin, PB5, 6);
 impl_spi_pin!(SPI3, SckPin, PC10, 6);
 impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
-=======
-impl_rng!(RNG);
-=======
-impl_rng!(RNG, 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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f405zg.rs

@@ -178,8 +178,6 @@ impl_gpio_pin!(PI13, 8, 13, EXTI13);
 impl_gpio_pin!(PI14, 8, 14, EXTI14);
 impl_gpio_pin!(PI15, 8, 15, EXTI15);
 pub const RNG: rng::Rng = rng::Rng(0x50060800 as _);
-<<<<<<< HEAD
-<<<<<<< HEAD
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -208,15 +206,6 @@ impl_spi_pin!(SPI3, MosiPin, PB5, 6);
 impl_spi_pin!(SPI3, SckPin, PC10, 6);
 impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
-=======
-impl_rng!(RNG);
-=======
-impl_rng!(RNG, 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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f407ie.rs

@@ -178,8 +178,6 @@ impl_gpio_pin!(PI13, 8, 13, EXTI13);
 impl_gpio_pin!(PI14, 8, 14, EXTI14);
 impl_gpio_pin!(PI15, 8, 15, EXTI15);
 pub const RNG: rng::Rng = rng::Rng(0x50060800 as _);
-<<<<<<< HEAD
-<<<<<<< HEAD
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -208,15 +206,6 @@ impl_spi_pin!(SPI3, MosiPin, PB5, 6);
 impl_spi_pin!(SPI3, SckPin, PC10, 6);
 impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
-=======
-impl_rng!(RNG);
-=======
-impl_rng!(RNG, 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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f407ig.rs

@@ -178,8 +178,6 @@ impl_gpio_pin!(PI13, 8, 13, EXTI13);
 impl_gpio_pin!(PI14, 8, 14, EXTI14);
 impl_gpio_pin!(PI15, 8, 15, EXTI15);
 pub const RNG: rng::Rng = rng::Rng(0x50060800 as _);
-<<<<<<< HEAD
-<<<<<<< HEAD
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -208,15 +206,6 @@ impl_spi_pin!(SPI3, MosiPin, PB5, 6);
 impl_spi_pin!(SPI3, SckPin, PC10, 6);
 impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
-=======
-impl_rng!(RNG);
-=======
-impl_rng!(RNG, 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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f407ve.rs

@@ -178,8 +178,6 @@ impl_gpio_pin!(PI13, 8, 13, EXTI13);
 impl_gpio_pin!(PI14, 8, 14, EXTI14);
 impl_gpio_pin!(PI15, 8, 15, EXTI15);
 pub const RNG: rng::Rng = rng::Rng(0x50060800 as _);
-<<<<<<< HEAD
-<<<<<<< HEAD
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -208,15 +206,6 @@ impl_spi_pin!(SPI3, MosiPin, PB5, 6);
 impl_spi_pin!(SPI3, SckPin, PC10, 6);
 impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
-=======
-impl_rng!(RNG);
-=======
-impl_rng!(RNG, 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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f407vg.rs

@@ -178,8 +178,6 @@ impl_gpio_pin!(PI13, 8, 13, EXTI13);
 impl_gpio_pin!(PI14, 8, 14, EXTI14);
 impl_gpio_pin!(PI15, 8, 15, EXTI15);
 pub const RNG: rng::Rng = rng::Rng(0x50060800 as _);
-<<<<<<< HEAD
-<<<<<<< HEAD
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -208,15 +206,6 @@ impl_spi_pin!(SPI3, MosiPin, PB5, 6);
 impl_spi_pin!(SPI3, SckPin, PC10, 6);
 impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
-=======
-impl_rng!(RNG);
-=======
-impl_rng!(RNG, 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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f407ze.rs

@@ -178,8 +178,6 @@ impl_gpio_pin!(PI13, 8, 13, EXTI13);
 impl_gpio_pin!(PI14, 8, 14, EXTI14);
 impl_gpio_pin!(PI15, 8, 15, EXTI15);
 pub const RNG: rng::Rng = rng::Rng(0x50060800 as _);
-<<<<<<< HEAD
-<<<<<<< HEAD
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -208,15 +206,6 @@ impl_spi_pin!(SPI3, MosiPin, PB5, 6);
 impl_spi_pin!(SPI3, SckPin, PC10, 6);
 impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
-=======
-impl_rng!(RNG);
-=======
-impl_rng!(RNG, 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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f407zg.rs

@@ -178,8 +178,6 @@ impl_gpio_pin!(PI13, 8, 13, EXTI13);
 impl_gpio_pin!(PI14, 8, 14, EXTI14);
 impl_gpio_pin!(PI15, 8, 15, EXTI15);
 pub const RNG: rng::Rng = rng::Rng(0x50060800 as _);
-<<<<<<< HEAD
-<<<<<<< HEAD
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -208,15 +206,6 @@ impl_spi_pin!(SPI3, MosiPin, PB5, 6);
 impl_spi_pin!(SPI3, SckPin, PC10, 6);
 impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
-=======
-impl_rng!(RNG);
-=======
-impl_rng!(RNG, 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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f411cc.rs

@@ -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);
@@ -178,12 +177,6 @@ impl_spi_pin!(SPI5, MosiPin, PE14, 6);
 impl_spi_pin!(SPI5, SckPin, PE2, 6);
 impl_spi_pin!(SPI5, MisoPin, PE5, 6);
 impl_spi_pin!(SPI5, MosiPin, PE6, 6);
-=======
-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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f411ce.rs

@@ -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);
@@ -178,12 +177,6 @@ impl_spi_pin!(SPI5, MosiPin, PE14, 6);
 impl_spi_pin!(SPI5, SckPin, PE2, 6);
 impl_spi_pin!(SPI5, MisoPin, PE5, 6);
 impl_spi_pin!(SPI5, MosiPin, PE6, 6);
-=======
-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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f411rc.rs

@@ -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);
@@ -178,12 +177,6 @@ impl_spi_pin!(SPI5, MosiPin, PE14, 6);
 impl_spi_pin!(SPI5, SckPin, PE2, 6);
 impl_spi_pin!(SPI5, MisoPin, PE5, 6);
 impl_spi_pin!(SPI5, MosiPin, PE6, 6);
-=======
-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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f411re.rs

@@ -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);
@@ -178,12 +177,6 @@ impl_spi_pin!(SPI5, MosiPin, PE14, 6);
 impl_spi_pin!(SPI5, SckPin, PE2, 6);
 impl_spi_pin!(SPI5, MisoPin, PE5, 6);
 impl_spi_pin!(SPI5, MosiPin, PE6, 6);
-=======
-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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f411vc.rs

@@ -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);
@@ -178,12 +177,6 @@ impl_spi_pin!(SPI5, MosiPin, PE14, 6);
 impl_spi_pin!(SPI5, SckPin, PE2, 6);
 impl_spi_pin!(SPI5, MisoPin, PE5, 6);
 impl_spi_pin!(SPI5, MosiPin, PE6, 6);
-=======
-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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f411ve.rs

@@ -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);
@@ -178,12 +177,6 @@ impl_spi_pin!(SPI5, MosiPin, PE14, 6);
 impl_spi_pin!(SPI5, SckPin, PE2, 6);
 impl_spi_pin!(SPI5, MisoPin, PE5, 6);
 impl_spi_pin!(SPI5, MosiPin, PE6, 6);
-=======
-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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f412ce.rs

@@ -93,8 +93,6 @@ impl_gpio_pin!(PH13, 7, 13, EXTI13);
 impl_gpio_pin!(PH14, 7, 14, EXTI14);
 impl_gpio_pin!(PH15, 7, 15, EXTI15);
 pub const RNG: rng::Rng = rng::Rng(0x50060800 as _);
-<<<<<<< HEAD
-<<<<<<< HEAD
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -133,17 +131,6 @@ impl_spi_pin!(SPI5, MosiPin, PA10, 6);
 impl_spi_pin!(SPI5, MisoPin, PA12, 6);
 impl_spi_pin!(SPI5, SckPin, PB0, 6);
 impl_spi_pin!(SPI5, MosiPin, PB8, 6);
-=======
-impl_rng!(RNG);
-=======
-impl_rng!(RNG, 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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f412cg.rs

@@ -93,8 +93,6 @@ impl_gpio_pin!(PH13, 7, 13, EXTI13);
 impl_gpio_pin!(PH14, 7, 14, EXTI14);
 impl_gpio_pin!(PH15, 7, 15, EXTI15);
 pub const RNG: rng::Rng = rng::Rng(0x50060800 as _);
-<<<<<<< HEAD
-<<<<<<< HEAD
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -133,17 +131,6 @@ impl_spi_pin!(SPI5, MosiPin, PA10, 6);
 impl_spi_pin!(SPI5, MisoPin, PA12, 6);
 impl_spi_pin!(SPI5, SckPin, PB0, 6);
 impl_spi_pin!(SPI5, MosiPin, PB8, 6);
-=======
-impl_rng!(RNG);
-=======
-impl_rng!(RNG, 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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f412re.rs

@@ -110,8 +110,6 @@ impl_gpio_pin!(PH13, 7, 13, EXTI13);
 impl_gpio_pin!(PH14, 7, 14, EXTI14);
 impl_gpio_pin!(PH15, 7, 15, EXTI15);
 pub const RNG: rng::Rng = rng::Rng(0x50060800 as _);
-<<<<<<< HEAD
-<<<<<<< HEAD
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -152,17 +150,6 @@ impl_spi_pin!(SPI5, MosiPin, PA10, 6);
 impl_spi_pin!(SPI5, MisoPin, PA12, 6);
 impl_spi_pin!(SPI5, SckPin, PB0, 6);
 impl_spi_pin!(SPI5, MosiPin, PB8, 6);
-=======
-impl_rng!(RNG);
-=======
-impl_rng!(RNG, 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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f412rg.rs

@@ -110,8 +110,6 @@ impl_gpio_pin!(PH13, 7, 13, EXTI13);
 impl_gpio_pin!(PH14, 7, 14, EXTI14);
 impl_gpio_pin!(PH15, 7, 15, EXTI15);
 pub const RNG: rng::Rng = rng::Rng(0x50060800 as _);
-<<<<<<< HEAD
-<<<<<<< HEAD
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -152,17 +150,6 @@ impl_spi_pin!(SPI5, MosiPin, PA10, 6);
 impl_spi_pin!(SPI5, MisoPin, PA12, 6);
 impl_spi_pin!(SPI5, SckPin, PB0, 6);
 impl_spi_pin!(SPI5, MosiPin, PB8, 6);
-=======
-impl_rng!(RNG);
-=======
-impl_rng!(RNG, 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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f412ve.rs

@@ -161,8 +161,6 @@ impl_gpio_pin!(PH13, 7, 13, EXTI13);
 impl_gpio_pin!(PH14, 7, 14, EXTI14);
 impl_gpio_pin!(PH15, 7, 15, EXTI15);
 pub const RNG: rng::Rng = rng::Rng(0x50060800 as _);
-<<<<<<< HEAD
-<<<<<<< HEAD
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -215,17 +213,6 @@ impl_spi_pin!(SPI5, MosiPin, PE14, 6);
 impl_spi_pin!(SPI5, SckPin, PE2, 6);
 impl_spi_pin!(SPI5, MisoPin, PE5, 6);
 impl_spi_pin!(SPI5, MosiPin, PE6, 6);
-=======
-impl_rng!(RNG);
-=======
-impl_rng!(RNG, 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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f412vg.rs

@@ -161,8 +161,6 @@ impl_gpio_pin!(PH13, 7, 13, EXTI13);
 impl_gpio_pin!(PH14, 7, 14, EXTI14);
 impl_gpio_pin!(PH15, 7, 15, EXTI15);
 pub const RNG: rng::Rng = rng::Rng(0x50060800 as _);
-<<<<<<< HEAD
-<<<<<<< HEAD
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -215,17 +213,6 @@ impl_spi_pin!(SPI5, MosiPin, PE14, 6);
 impl_spi_pin!(SPI5, SckPin, PE2, 6);
 impl_spi_pin!(SPI5, MisoPin, PE5, 6);
 impl_spi_pin!(SPI5, MosiPin, PE6, 6);
-=======
-impl_rng!(RNG);
-=======
-impl_rng!(RNG, 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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f412ze.rs

@@ -161,8 +161,6 @@ impl_gpio_pin!(PH13, 7, 13, EXTI13);
 impl_gpio_pin!(PH14, 7, 14, EXTI14);
 impl_gpio_pin!(PH15, 7, 15, EXTI15);
 pub const RNG: rng::Rng = rng::Rng(0x50060800 as _);
-<<<<<<< HEAD
-<<<<<<< HEAD
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -215,17 +213,6 @@ impl_spi_pin!(SPI5, MosiPin, PE14, 6);
 impl_spi_pin!(SPI5, SckPin, PE2, 6);
 impl_spi_pin!(SPI5, MisoPin, PE5, 6);
 impl_spi_pin!(SPI5, MosiPin, PE6, 6);
-=======
-impl_rng!(RNG);
-=======
-impl_rng!(RNG, 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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f412zg.rs

@@ -161,8 +161,6 @@ impl_gpio_pin!(PH13, 7, 13, EXTI13);
 impl_gpio_pin!(PH14, 7, 14, EXTI14);
 impl_gpio_pin!(PH15, 7, 15, EXTI15);
 pub const RNG: rng::Rng = rng::Rng(0x50060800 as _);
-<<<<<<< HEAD
-<<<<<<< HEAD
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -215,17 +213,6 @@ impl_spi_pin!(SPI5, MosiPin, PE14, 6);
 impl_spi_pin!(SPI5, SckPin, PE2, 6);
 impl_spi_pin!(SPI5, MisoPin, PE5, 6);
 impl_spi_pin!(SPI5, MosiPin, PE6, 6);
-=======
-impl_rng!(RNG);
-=======
-impl_rng!(RNG, 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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f413cg.rs

@@ -161,8 +161,6 @@ impl_gpio_pin!(PH13, 7, 13, EXTI13);
 impl_gpio_pin!(PH14, 7, 14, EXTI14);
 impl_gpio_pin!(PH15, 7, 15, EXTI15);
 pub const RNG: rng::Rng = rng::Rng(0x50060800 as _);
-<<<<<<< HEAD
-<<<<<<< HEAD
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -218,17 +216,6 @@ impl_spi_pin!(SPI5, MosiPin, PE14, 6);
 impl_spi_pin!(SPI5, SckPin, PE2, 6);
 impl_spi_pin!(SPI5, MisoPin, PE5, 6);
 impl_spi_pin!(SPI5, MosiPin, PE6, 6);
-=======
-impl_rng!(RNG);
-=======
-impl_rng!(RNG, 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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f413ch.rs

@@ -161,8 +161,6 @@ impl_gpio_pin!(PH13, 7, 13, EXTI13);
 impl_gpio_pin!(PH14, 7, 14, EXTI14);
 impl_gpio_pin!(PH15, 7, 15, EXTI15);
 pub const RNG: rng::Rng = rng::Rng(0x50060800 as _);
-<<<<<<< HEAD
-<<<<<<< HEAD
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -218,17 +216,6 @@ impl_spi_pin!(SPI5, MosiPin, PE14, 6);
 impl_spi_pin!(SPI5, SckPin, PE2, 6);
 impl_spi_pin!(SPI5, MisoPin, PE5, 6);
 impl_spi_pin!(SPI5, MosiPin, PE6, 6);
-=======
-impl_rng!(RNG);
-=======
-impl_rng!(RNG, 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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f413mg.rs

@@ -161,8 +161,6 @@ impl_gpio_pin!(PH13, 7, 13, EXTI13);
 impl_gpio_pin!(PH14, 7, 14, EXTI14);
 impl_gpio_pin!(PH15, 7, 15, EXTI15);
 pub const RNG: rng::Rng = rng::Rng(0x50060800 as _);
-<<<<<<< HEAD
-<<<<<<< HEAD
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -218,17 +216,6 @@ impl_spi_pin!(SPI5, MosiPin, PE14, 6);
 impl_spi_pin!(SPI5, SckPin, PE2, 6);
 impl_spi_pin!(SPI5, MisoPin, PE5, 6);
 impl_spi_pin!(SPI5, MosiPin, PE6, 6);
-=======
-impl_rng!(RNG);
-=======
-impl_rng!(RNG, 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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f413mh.rs

@@ -161,8 +161,6 @@ impl_gpio_pin!(PH13, 7, 13, EXTI13);
 impl_gpio_pin!(PH14, 7, 14, EXTI14);
 impl_gpio_pin!(PH15, 7, 15, EXTI15);
 pub const RNG: rng::Rng = rng::Rng(0x50060800 as _);
-<<<<<<< HEAD
-<<<<<<< HEAD
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -218,17 +216,6 @@ impl_spi_pin!(SPI5, MosiPin, PE14, 6);
 impl_spi_pin!(SPI5, SckPin, PE2, 6);
 impl_spi_pin!(SPI5, MisoPin, PE5, 6);
 impl_spi_pin!(SPI5, MosiPin, PE6, 6);
-=======
-impl_rng!(RNG);
-=======
-impl_rng!(RNG, 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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f413rg.rs

@@ -161,8 +161,6 @@ impl_gpio_pin!(PH13, 7, 13, EXTI13);
 impl_gpio_pin!(PH14, 7, 14, EXTI14);
 impl_gpio_pin!(PH15, 7, 15, EXTI15);
 pub const RNG: rng::Rng = rng::Rng(0x50060800 as _);
-<<<<<<< HEAD
-<<<<<<< HEAD
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -218,17 +216,6 @@ impl_spi_pin!(SPI5, MosiPin, PE14, 6);
 impl_spi_pin!(SPI5, SckPin, PE2, 6);
 impl_spi_pin!(SPI5, MisoPin, PE5, 6);
 impl_spi_pin!(SPI5, MosiPin, PE6, 6);
-=======
-impl_rng!(RNG);
-=======
-impl_rng!(RNG, 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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f413rh.rs

@@ -161,8 +161,6 @@ impl_gpio_pin!(PH13, 7, 13, EXTI13);
 impl_gpio_pin!(PH14, 7, 14, EXTI14);
 impl_gpio_pin!(PH15, 7, 15, EXTI15);
 pub const RNG: rng::Rng = rng::Rng(0x50060800 as _);
-<<<<<<< HEAD
-<<<<<<< HEAD
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -218,17 +216,6 @@ impl_spi_pin!(SPI5, MosiPin, PE14, 6);
 impl_spi_pin!(SPI5, SckPin, PE2, 6);
 impl_spi_pin!(SPI5, MisoPin, PE5, 6);
 impl_spi_pin!(SPI5, MosiPin, PE6, 6);
-=======
-impl_rng!(RNG);
-=======
-impl_rng!(RNG, 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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f413vg.rs

@@ -161,8 +161,6 @@ impl_gpio_pin!(PH13, 7, 13, EXTI13);
 impl_gpio_pin!(PH14, 7, 14, EXTI14);
 impl_gpio_pin!(PH15, 7, 15, EXTI15);
 pub const RNG: rng::Rng = rng::Rng(0x50060800 as _);
-<<<<<<< HEAD
-<<<<<<< HEAD
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -218,17 +216,6 @@ impl_spi_pin!(SPI5, MosiPin, PE14, 6);
 impl_spi_pin!(SPI5, SckPin, PE2, 6);
 impl_spi_pin!(SPI5, MisoPin, PE5, 6);
 impl_spi_pin!(SPI5, MosiPin, PE6, 6);
-=======
-impl_rng!(RNG);
-=======
-impl_rng!(RNG, 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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f413vh.rs

@@ -161,8 +161,6 @@ impl_gpio_pin!(PH13, 7, 13, EXTI13);
 impl_gpio_pin!(PH14, 7, 14, EXTI14);
 impl_gpio_pin!(PH15, 7, 15, EXTI15);
 pub const RNG: rng::Rng = rng::Rng(0x50060800 as _);
-<<<<<<< HEAD
-<<<<<<< HEAD
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -218,17 +216,6 @@ impl_spi_pin!(SPI5, MosiPin, PE14, 6);
 impl_spi_pin!(SPI5, SckPin, PE2, 6);
 impl_spi_pin!(SPI5, MisoPin, PE5, 6);
 impl_spi_pin!(SPI5, MosiPin, PE6, 6);
-=======
-impl_rng!(RNG);
-=======
-impl_rng!(RNG, 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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f413zg.rs

@@ -161,8 +161,6 @@ impl_gpio_pin!(PH13, 7, 13, EXTI13);
 impl_gpio_pin!(PH14, 7, 14, EXTI14);
 impl_gpio_pin!(PH15, 7, 15, EXTI15);
 pub const RNG: rng::Rng = rng::Rng(0x50060800 as _);
-<<<<<<< HEAD
-<<<<<<< HEAD
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -218,17 +216,6 @@ impl_spi_pin!(SPI5, MosiPin, PE14, 6);
 impl_spi_pin!(SPI5, SckPin, PE2, 6);
 impl_spi_pin!(SPI5, MisoPin, PE5, 6);
 impl_spi_pin!(SPI5, MosiPin, PE6, 6);
-=======
-impl_rng!(RNG);
-=======
-impl_rng!(RNG, 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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f413zh.rs

@@ -161,8 +161,6 @@ impl_gpio_pin!(PH13, 7, 13, EXTI13);
 impl_gpio_pin!(PH14, 7, 14, EXTI14);
 impl_gpio_pin!(PH15, 7, 15, EXTI15);
 pub const RNG: rng::Rng = rng::Rng(0x50060800 as _);
-<<<<<<< HEAD
-<<<<<<< HEAD
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -218,17 +216,6 @@ impl_spi_pin!(SPI5, MosiPin, PE14, 6);
 impl_spi_pin!(SPI5, SckPin, PE2, 6);
 impl_spi_pin!(SPI5, MisoPin, PE5, 6);
 impl_spi_pin!(SPI5, MosiPin, PE6, 6);
-=======
-impl_rng!(RNG);
-=======
-impl_rng!(RNG, 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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f415og.rs

@@ -178,8 +178,6 @@ impl_gpio_pin!(PI13, 8, 13, EXTI13);
 impl_gpio_pin!(PI14, 8, 14, EXTI14);
 impl_gpio_pin!(PI15, 8, 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);
@@ -208,15 +206,6 @@ impl_spi_pin!(SPI3, MosiPin, PB5, 6);
 impl_spi_pin!(SPI3, SckPin, PC10, 6);
 impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
-=======
-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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f415rg.rs

@@ -178,8 +178,6 @@ impl_gpio_pin!(PI13, 8, 13, EXTI13);
 impl_gpio_pin!(PI14, 8, 14, EXTI14);
 impl_gpio_pin!(PI15, 8, 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);
@@ -208,15 +206,6 @@ impl_spi_pin!(SPI3, MosiPin, PB5, 6);
 impl_spi_pin!(SPI3, SckPin, PC10, 6);
 impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
-=======
-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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f415vg.rs

@@ -178,8 +178,6 @@ impl_gpio_pin!(PI13, 8, 13, EXTI13);
 impl_gpio_pin!(PI14, 8, 14, EXTI14);
 impl_gpio_pin!(PI15, 8, 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);
@@ -208,15 +206,6 @@ impl_spi_pin!(SPI3, MosiPin, PB5, 6);
 impl_spi_pin!(SPI3, SckPin, PC10, 6);
 impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
-=======
-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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f415zg.rs

@@ -178,8 +178,6 @@ impl_gpio_pin!(PI13, 8, 13, EXTI13);
 impl_gpio_pin!(PI14, 8, 14, EXTI14);
 impl_gpio_pin!(PI15, 8, 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);
@@ -208,15 +206,6 @@ impl_spi_pin!(SPI3, MosiPin, PB5, 6);
 impl_spi_pin!(SPI3, SckPin, PC10, 6);
 impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
-=======
-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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f417ie.rs

@@ -178,8 +178,6 @@ impl_gpio_pin!(PI13, 8, 13, EXTI13);
 impl_gpio_pin!(PI14, 8, 14, EXTI14);
 impl_gpio_pin!(PI15, 8, 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);
@@ -208,15 +206,6 @@ impl_spi_pin!(SPI3, MosiPin, PB5, 6);
 impl_spi_pin!(SPI3, SckPin, PC10, 6);
 impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
-=======
-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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f417ig.rs

@@ -178,8 +178,6 @@ impl_gpio_pin!(PI13, 8, 13, EXTI13);
 impl_gpio_pin!(PI14, 8, 14, EXTI14);
 impl_gpio_pin!(PI15, 8, 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);
@@ -208,15 +206,6 @@ impl_spi_pin!(SPI3, MosiPin, PB5, 6);
 impl_spi_pin!(SPI3, SckPin, PC10, 6);
 impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
-=======
-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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f417ve.rs

@@ -178,8 +178,6 @@ impl_gpio_pin!(PI13, 8, 13, EXTI13);
 impl_gpio_pin!(PI14, 8, 14, EXTI14);
 impl_gpio_pin!(PI15, 8, 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);
@@ -208,15 +206,6 @@ impl_spi_pin!(SPI3, MosiPin, PB5, 6);
 impl_spi_pin!(SPI3, SckPin, PC10, 6);
 impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
-=======
-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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f417vg.rs

@@ -178,8 +178,6 @@ impl_gpio_pin!(PI13, 8, 13, EXTI13);
 impl_gpio_pin!(PI14, 8, 14, EXTI14);
 impl_gpio_pin!(PI15, 8, 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);
@@ -208,15 +206,6 @@ impl_spi_pin!(SPI3, MosiPin, PB5, 6);
 impl_spi_pin!(SPI3, SckPin, PC10, 6);
 impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
-=======
-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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f417ze.rs

@@ -178,8 +178,6 @@ impl_gpio_pin!(PI13, 8, 13, EXTI13);
 impl_gpio_pin!(PI14, 8, 14, EXTI14);
 impl_gpio_pin!(PI15, 8, 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);
@@ -208,15 +206,6 @@ impl_spi_pin!(SPI3, MosiPin, PB5, 6);
 impl_spi_pin!(SPI3, SckPin, PC10, 6);
 impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
-=======
-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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f417zg.rs

@@ -178,8 +178,6 @@ impl_gpio_pin!(PI13, 8, 13, EXTI13);
 impl_gpio_pin!(PI14, 8, 14, EXTI14);
 impl_gpio_pin!(PI15, 8, 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);
@@ -208,15 +206,6 @@ impl_spi_pin!(SPI3, MosiPin, PB5, 6);
 impl_spi_pin!(SPI3, SckPin, PC10, 6);
 impl_spi_pin!(SPI3, MisoPin, PC11, 6);
 impl_spi_pin!(SPI3, MosiPin, PC12, 6);
-=======
-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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f423ch.rs

@@ -161,8 +161,6 @@ impl_gpio_pin!(PH13, 7, 13, EXTI13);
 impl_gpio_pin!(PH14, 7, 14, EXTI14);
 impl_gpio_pin!(PH15, 7, 15, EXTI15);
 pub const RNG: rng::Rng = rng::Rng(0x50060800 as _);
-<<<<<<< HEAD
-<<<<<<< HEAD
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -218,17 +216,6 @@ impl_spi_pin!(SPI5, MosiPin, PE14, 6);
 impl_spi_pin!(SPI5, SckPin, PE2, 6);
 impl_spi_pin!(SPI5, MisoPin, PE5, 6);
 impl_spi_pin!(SPI5, MosiPin, PE6, 6);
-=======
-impl_rng!(RNG);
-=======
-impl_rng!(RNG, 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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f423mh.rs

@@ -161,8 +161,6 @@ impl_gpio_pin!(PH13, 7, 13, EXTI13);
 impl_gpio_pin!(PH14, 7, 14, EXTI14);
 impl_gpio_pin!(PH15, 7, 15, EXTI15);
 pub const RNG: rng::Rng = rng::Rng(0x50060800 as _);
-<<<<<<< HEAD
-<<<<<<< HEAD
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -218,17 +216,6 @@ impl_spi_pin!(SPI5, MosiPin, PE14, 6);
 impl_spi_pin!(SPI5, SckPin, PE2, 6);
 impl_spi_pin!(SPI5, MisoPin, PE5, 6);
 impl_spi_pin!(SPI5, MosiPin, PE6, 6);
-=======
-impl_rng!(RNG);
-=======
-impl_rng!(RNG, 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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f423rh.rs

@@ -161,8 +161,6 @@ impl_gpio_pin!(PH13, 7, 13, EXTI13);
 impl_gpio_pin!(PH14, 7, 14, EXTI14);
 impl_gpio_pin!(PH15, 7, 15, EXTI15);
 pub const RNG: rng::Rng = rng::Rng(0x50060800 as _);
-<<<<<<< HEAD
-<<<<<<< HEAD
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -218,17 +216,6 @@ impl_spi_pin!(SPI5, MosiPin, PE14, 6);
 impl_spi_pin!(SPI5, SckPin, PE2, 6);
 impl_spi_pin!(SPI5, MisoPin, PE5, 6);
 impl_spi_pin!(SPI5, MosiPin, PE6, 6);
-=======
-impl_rng!(RNG);
-=======
-impl_rng!(RNG, 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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f423vh.rs

@@ -161,8 +161,6 @@ impl_gpio_pin!(PH13, 7, 13, EXTI13);
 impl_gpio_pin!(PH14, 7, 14, EXTI14);
 impl_gpio_pin!(PH15, 7, 15, EXTI15);
 pub const RNG: rng::Rng = rng::Rng(0x50060800 as _);
-<<<<<<< HEAD
-<<<<<<< HEAD
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -218,17 +216,6 @@ impl_spi_pin!(SPI5, MosiPin, PE14, 6);
 impl_spi_pin!(SPI5, SckPin, PE2, 6);
 impl_spi_pin!(SPI5, MisoPin, PE5, 6);
 impl_spi_pin!(SPI5, MosiPin, PE6, 6);
-=======
-impl_rng!(RNG);
-=======
-impl_rng!(RNG, 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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f423zh.rs

@@ -161,8 +161,6 @@ impl_gpio_pin!(PH13, 7, 13, EXTI13);
 impl_gpio_pin!(PH14, 7, 14, EXTI14);
 impl_gpio_pin!(PH15, 7, 15, EXTI15);
 pub const RNG: rng::Rng = rng::Rng(0x50060800 as _);
-<<<<<<< HEAD
-<<<<<<< HEAD
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -218,17 +216,6 @@ impl_spi_pin!(SPI5, MosiPin, PE14, 6);
 impl_spi_pin!(SPI5, SckPin, PE2, 6);
 impl_spi_pin!(SPI5, MisoPin, PE5, 6);
 impl_spi_pin!(SPI5, MosiPin, PE6, 6);
-=======
-impl_rng!(RNG);
-=======
-impl_rng!(RNG, 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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f427ag.rs

@@ -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);
@@ -260,17 +258,6 @@ impl_spi_pin!(SPI5, MisoPin, PF8, 5);
 impl_spi_pin!(SPI5, MosiPin, PF9, 5);
 impl_spi_pin!(SPI5, SckPin, PH6, 5);
 impl_spi_pin!(SPI5, MisoPin, PH7, 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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f427ai.rs

@@ -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);
@@ -260,17 +258,6 @@ impl_spi_pin!(SPI5, MisoPin, PF8, 5);
 impl_spi_pin!(SPI5, MosiPin, PF9, 5);
 impl_spi_pin!(SPI5, SckPin, PH6, 5);
 impl_spi_pin!(SPI5, MisoPin, PH7, 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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f427ig.rs

@@ -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);

embassy-stm32/src/pac/stm32f427ii.rs

@@ -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);

embassy-stm32/src/pac/stm32f427vg.rs

@@ -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);
@@ -252,16 +250,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);
-=======
-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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f427vi.rs

@@ -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);
@@ -252,16 +250,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);
-=======
-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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f427zg.rs

@@ -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);

embassy-stm32/src/pac/stm32f427zi.rs

@@ -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);

embassy-stm32/src/pac/stm32f429ag.rs

@@ -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);
@@ -260,17 +258,6 @@ impl_spi_pin!(SPI5, MisoPin, PF8, 5);
 impl_spi_pin!(SPI5, MosiPin, PF9, 5);
 impl_spi_pin!(SPI5, SckPin, PH6, 5);
 impl_spi_pin!(SPI5, MisoPin, PH7, 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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f429ai.rs

@@ -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);
@@ -260,17 +258,6 @@ impl_spi_pin!(SPI5, MisoPin, PF8, 5);
 impl_spi_pin!(SPI5, MosiPin, PF9, 5);
 impl_spi_pin!(SPI5, SckPin, PH6, 5);
 impl_spi_pin!(SPI5, MisoPin, PH7, 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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f429be.rs

@@ -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);

embassy-stm32/src/pac/stm32f429bg.rs

@@ -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);

embassy-stm32/src/pac/stm32f429bi.rs

@@ -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);

embassy-stm32/src/pac/stm32f429ie.rs

@@ -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);

embassy-stm32/src/pac/stm32f429ig.rs

@@ -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);

embassy-stm32/src/pac/stm32f429ii.rs

@@ -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);

embassy-stm32/src/pac/stm32f429ne.rs

@@ -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);

embassy-stm32/src/pac/stm32f429ng.rs

@@ -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);

embassy-stm32/src/pac/stm32f429ni.rs

@@ -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);

embassy-stm32/src/pac/stm32f429ve.rs

@@ -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);
@@ -252,16 +250,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);
-=======
-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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f429vg.rs

@@ -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);
@@ -252,16 +250,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);
-=======
-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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f429vi.rs

@@ -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);
@@ -252,16 +250,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);
-=======
-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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f429ze.rs

@@ -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);

embassy-stm32/src/pac/stm32f429zg.rs

@@ -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);

embassy-stm32/src/pac/stm32f429zi.rs

@@ -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);

embassy-stm32/src/pac/stm32f437ai.rs

@@ -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);
@@ -260,17 +258,6 @@ impl_spi_pin!(SPI5, MisoPin, PF8, 5);
 impl_spi_pin!(SPI5, MosiPin, PF9, 5);
 impl_spi_pin!(SPI5, SckPin, PH6, 5);
 impl_spi_pin!(SPI5, MisoPin, PH7, 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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f437ig.rs

@@ -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);

embassy-stm32/src/pac/stm32f437ii.rs

@@ -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);

embassy-stm32/src/pac/stm32f437vg.rs

@@ -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);
@@ -252,16 +250,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);
-=======
-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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f437vi.rs

@@ -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);
@@ -252,16 +250,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);
-=======
-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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f437zg.rs

@@ -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);

embassy-stm32/src/pac/stm32f437zi.rs

@@ -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);

embassy-stm32/src/pac/stm32f439ai.rs

@@ -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);
@@ -260,17 +258,6 @@ impl_spi_pin!(SPI5, MisoPin, PF8, 5);
 impl_spi_pin!(SPI5, MosiPin, PF9, 5);
 impl_spi_pin!(SPI5, SckPin, PH6, 5);
 impl_spi_pin!(SPI5, MisoPin, PH7, 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 _);
->>>>>>> 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);

embassy-stm32/src/pac/stm32f439bg.rs

@@ -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);

embassy-stm32/src/pac/stm32f439bi.rs

@@ -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);

embassy-stm32/src/pac/stm32f439ig.rs

@@ -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);