Update generated code

.vscode/settings.json

@@ -1,16 +1,16 @@
 {
+  "rust-analyzer.assist.importMergeBehavior": "last",
   "editor.formatOnSave": true,
   "rust-analyzer.cargo.allFeatures": false,
   "rust-analyzer.checkOnSave.allFeatures": false,
   "rust-analyzer.checkOnSave.allTargets": false,
-  "rust-analyzer.cargo.target": "thumbv7em-none-eabihf",
+  "rust-analyzer.cargo.target": "thumbv7em-none-eabi",
-  "rust-analyzer.checkOnSave.target": "thumbv7em-none-eabihf",
+  "rust-analyzer.checkOnSave.target": "thumbv7em-none-eabi",
   "rust-analyzer.procMacro.enable": true,
   "rust-analyzer.cargo.loadOutDirsFromCheck": true,
   "files.watcherExclude": {
     "**/.git/objects/**": true,
     "**/.git/subtree-cache/**": true,
-    "**/target/**": true,
+    "**/target/**": true
-    "**/embassy-stm32/src/chip/**": true,
   }
 }

embassy-stm32/Cargo.toml

@@ -182,6 +182,119 @@ stm32f479vg = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_r
 stm32f479vi = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_stm32f4", "_syscfg", "_syscfg_f4", "_usart", "_usart_v1",]
 stm32f479zg = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_stm32f4", "_syscfg", "_syscfg_f4", "_usart", "_usart_v1",]
 stm32f479zi = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_stm32f4", "_syscfg", "_syscfg_f4", "_usart", "_usart_v1",]
+stm32h723ve = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h723vg = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h723ze = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h723zg = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h725ae = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h725ag = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h725ie = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h725ig = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h725re = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h725rg = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h725ve = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h725vg = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h725ze = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h725zg = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h730ab = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h730ib = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h730vb = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h730zb = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h733vg = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h733zg = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h735ag = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h735ig = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h735rg = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h735vg = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h735zg = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h742ag = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h742ai = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h742bg = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h742bi = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h742ig = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h742ii = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h742vg = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h742vi = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h742xg = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h742xi = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h742zg = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h742zi = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h743ag = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h743ai = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h743bg = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h743bi = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h743ig = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h743ii = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h743vg = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h743vi = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h743xg = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h743xi = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h743zg = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h743zi = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h745bg = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h745bi = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h745ig = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h745ii = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h745xg = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h745xi = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h745zg = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h745zi = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h747ag = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h747ai = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h747bg = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h747bi = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h747ig = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h747ii = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h747xg = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h747xi = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h747zi = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h750ib = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h750vb = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h750xb = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h750zb = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h753ai = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h753bi = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h753ii = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h753vi = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h753xi = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h753zi = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h755bi = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h755ii = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h755xi = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h755zi = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h757ai = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h757bi = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h757ii = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h757xi = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h757zi = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h7a3ag = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h7a3ai = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h7a3ig = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h7a3ii = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h7a3lg = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h7a3li = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h7a3ng = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h7a3ni = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h7a3qi = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h7a3rg = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h7a3ri = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h7a3vg = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h7a3vi = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h7a3zg = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h7a3zi = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h7b0ab = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h7b0ib = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h7b0rb = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h7b0vb = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h7b0zb = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h7b3ai = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h7b3ii = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h7b3li = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h7b3ni = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h7b3qi = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h7b3ri = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h7b3vi = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
+stm32h7b3zi = [ "_dma", "_dma_v2", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_sdmmc", "_sdmmc_v2", "_stm32h7", "_syscfg", "_syscfg_h7",]
 stm32l412c8 = [ "_dma", "_dma_v1", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_stm32l4", "_syscfg", "_syscfg_l4", "_usart", "_usart_v2",]
 stm32l412cb = [ "_dma", "_dma_v1", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_stm32l4", "_syscfg", "_syscfg_l4", "_usart", "_usart_v2",]
 stm32l412k8 = [ "_dma", "_dma_v1", "_exti", "_exti_v1", "_gpio", "_gpio_v2", "_rng", "_rng_v1", "_stm32l4", "_syscfg", "_syscfg_l4", "_usart", "_usart_v2",]
@@ -337,11 +450,16 @@ _spi_v1 = []
 _spi_v2 = []
 _sdmmc = [ "sdio-host",]
 _sdmmc_v2 = []
+_spi = []
+_spi_v1 = []
+_spi_v2 = []
 _stm32f4 = []
+_stm32h7 = []
 _stm32l4 = []
 _stm32l4p = []
 _syscfg = []
 _syscfg_f4 = []
+_syscfg_h7 = []
 _syscfg_l4 = []
 _usart = []
 _usart_v1 = []

embassy-stm32/src/pac/stm32f401cb.rs

@@ -127,6 +127,7 @@ 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);
@@ -152,6 +153,10 @@ 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,6 +127,7 @@ 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);
@@ -152,6 +153,10 @@ 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,6 +127,7 @@ 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);
@@ -152,6 +153,10 @@ 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,6 +127,7 @@ 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);
@@ -152,6 +153,10 @@ 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,6 +127,7 @@ 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);
@@ -152,6 +153,10 @@ 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,6 +127,7 @@ 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);
@@ -152,6 +153,10 @@ 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,6 +127,7 @@ 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);
@@ -152,6 +153,10 @@ 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,6 +127,7 @@ 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);
@@ -152,6 +153,10 @@ 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,6 +127,7 @@ 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);
@@ -160,6 +161,11 @@ 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,6 +127,7 @@ 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);
@@ -160,6 +161,11 @@ 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,6 +127,7 @@ 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);
@@ -160,6 +161,11 @@ 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,6 +127,7 @@ 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);
@@ -160,6 +161,11 @@ 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,6 +178,7 @@ 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
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -206,6 +207,12 @@ 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);
+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,6 +178,7 @@ 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
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -206,6 +207,12 @@ 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);
+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,6 +178,7 @@ 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
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -206,6 +207,12 @@ 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);
+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,6 +178,7 @@ 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
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -206,6 +207,12 @@ 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);
+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,6 +178,7 @@ 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
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -206,6 +207,12 @@ 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);
+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,6 +178,7 @@ 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
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -206,6 +207,12 @@ 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);
+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,6 +178,7 @@ 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
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -206,6 +207,12 @@ 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);
+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,6 +178,7 @@ 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
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -206,6 +207,12 @@ 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);
+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,6 +178,7 @@ 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
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -206,6 +207,12 @@ 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);
+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,6 +178,7 @@ 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
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -206,6 +207,12 @@ 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);
+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,6 +178,7 @@ 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
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -206,6 +207,12 @@ 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);
+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,6 +127,7 @@ 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);
@@ -177,6 +178,12 @@ 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,6 +127,7 @@ 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);
@@ -177,6 +178,12 @@ 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,6 +127,7 @@ 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);
@@ -177,6 +178,12 @@ 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,6 +127,7 @@ 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);
@@ -177,6 +178,12 @@ 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,6 +127,7 @@ 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);
@@ -177,6 +178,12 @@ 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,6 +127,7 @@ 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);
@@ -177,6 +178,12 @@ 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,6 +93,7 @@ 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
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -131,6 +132,14 @@ 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);
+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,6 +93,7 @@ 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
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -131,6 +132,14 @@ 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);
+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,6 +110,7 @@ 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
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -150,6 +151,14 @@ 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);
+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,6 +110,7 @@ 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
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -150,6 +151,14 @@ 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);
+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,6 +161,7 @@ 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
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -213,6 +214,14 @@ 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);
+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,6 +161,7 @@ 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
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -213,6 +214,14 @@ 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);
+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,6 +161,7 @@ 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
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -213,6 +214,14 @@ 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);
+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,6 +161,7 @@ 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
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -213,6 +214,14 @@ 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);
+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,6 +161,7 @@ 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
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -216,6 +217,14 @@ 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);
+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,6 +161,7 @@ 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
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -216,6 +217,14 @@ 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);
+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,6 +161,7 @@ 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
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -216,6 +217,14 @@ 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);
+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,6 +161,7 @@ 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
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -216,6 +217,14 @@ 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);
+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,6 +161,7 @@ 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
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -216,6 +217,14 @@ 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);
+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,6 +161,7 @@ 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
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -216,6 +217,14 @@ 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);
+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,6 +161,7 @@ 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
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -216,6 +217,14 @@ 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);
+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,6 +161,7 @@ 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
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -216,6 +217,14 @@ 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);
+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,6 +161,7 @@ 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
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -216,6 +217,14 @@ 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);
+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,6 +161,7 @@ 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
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -216,6 +217,14 @@ 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);
+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,6 +178,7 @@ 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
 impl_rng!(RNG, HASH_RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -206,6 +207,12 @@ 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);
+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,6 +178,7 @@ 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
 impl_rng!(RNG, HASH_RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -206,6 +207,12 @@ 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);
+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,6 +178,7 @@ 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
 impl_rng!(RNG, HASH_RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -206,6 +207,12 @@ 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);
+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,6 +178,7 @@ 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
 impl_rng!(RNG, HASH_RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -206,6 +207,12 @@ 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);
+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,6 +178,7 @@ 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
 impl_rng!(RNG, HASH_RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -206,6 +207,12 @@ 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);
+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,6 +178,7 @@ 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
 impl_rng!(RNG, HASH_RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -206,6 +207,12 @@ 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);
+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,6 +178,7 @@ 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
 impl_rng!(RNG, HASH_RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -206,6 +207,12 @@ 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);
+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,6 +178,7 @@ 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
 impl_rng!(RNG, HASH_RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -206,6 +207,12 @@ 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);
+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,6 +178,7 @@ 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
 impl_rng!(RNG, HASH_RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -206,6 +207,12 @@ 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);
+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,6 +178,7 @@ 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
 impl_rng!(RNG, HASH_RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -206,6 +207,12 @@ 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);
+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,6 +161,7 @@ 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
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -216,6 +217,14 @@ 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);
+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,6 +161,7 @@ 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
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -216,6 +217,14 @@ 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);
+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,6 +161,7 @@ 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
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -216,6 +217,14 @@ 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);
+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,6 +161,7 @@ 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
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -216,6 +217,14 @@ 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);
+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,6 +161,7 @@ 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
 impl_rng!(RNG, RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -216,6 +217,14 @@ 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);
+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,6 +212,7 @@ 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
 impl_rng!(RNG, HASH_RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -258,6 +259,14 @@ 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);
+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,6 +212,7 @@ 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
 impl_rng!(RNG, HASH_RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -258,6 +259,14 @@ 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);
+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,6 +212,7 @@ 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
 impl_rng!(RNG, HASH_RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -263,6 +264,15 @@ 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);
+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,6 +212,7 @@ 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
 impl_rng!(RNG, HASH_RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -263,6 +264,15 @@ 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);
+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,6 +212,7 @@ 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
 impl_rng!(RNG, HASH_RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -250,6 +251,13 @@ 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);
+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,6 +212,7 @@ 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
 impl_rng!(RNG, HASH_RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -250,6 +251,13 @@ 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);
+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,6 +212,7 @@ 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
 impl_rng!(RNG, HASH_RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -263,6 +264,15 @@ 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);
+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,6 +212,7 @@ 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
 impl_rng!(RNG, HASH_RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -263,6 +264,15 @@ 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);
+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,6 +212,7 @@ 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
 impl_rng!(RNG, HASH_RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -258,6 +259,14 @@ 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);
+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,6 +212,7 @@ 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
 impl_rng!(RNG, HASH_RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -258,6 +259,14 @@ 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);
+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,6 +212,7 @@ 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
 impl_rng!(RNG, HASH_RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -263,6 +264,15 @@ 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);
+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,6 +212,7 @@ 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
 impl_rng!(RNG, HASH_RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -263,6 +264,15 @@ 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);
+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,6 +212,7 @@ 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
 impl_rng!(RNG, HASH_RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -263,6 +264,15 @@ 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);
+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,6 +212,7 @@ 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
 impl_rng!(RNG, HASH_RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -263,6 +264,15 @@ 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);
+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,6 +212,7 @@ 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
 impl_rng!(RNG, HASH_RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -263,6 +264,15 @@ 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);
+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,6 +212,7 @@ 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
 impl_rng!(RNG, HASH_RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -263,6 +264,15 @@ 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);
+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,6 +212,7 @@ 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
 impl_rng!(RNG, HASH_RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -263,6 +264,15 @@ 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);
+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,6 +212,7 @@ 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
 impl_rng!(RNG, HASH_RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -263,6 +264,15 @@ 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);
+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,6 +212,7 @@ 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
 impl_rng!(RNG, HASH_RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -263,6 +264,15 @@ 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);
+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,6 +212,7 @@ 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
 impl_rng!(RNG, HASH_RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -250,6 +251,13 @@ 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);
+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,6 +212,7 @@ 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
 impl_rng!(RNG, HASH_RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -250,6 +251,13 @@ 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);
+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,6 +212,7 @@ 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
 impl_rng!(RNG, HASH_RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -250,6 +251,13 @@ 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);
+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,6 +212,7 @@ 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
 impl_rng!(RNG, HASH_RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -263,6 +264,15 @@ 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);
+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,6 +212,7 @@ 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
 impl_rng!(RNG, HASH_RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -263,6 +264,15 @@ 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);
+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,6 +212,7 @@ 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
 impl_rng!(RNG, HASH_RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -263,6 +264,15 @@ 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);
+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,6 +212,7 @@ 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
 impl_rng!(RNG, HASH_RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -258,6 +259,14 @@ 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);
+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,6 +212,7 @@ 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
 impl_rng!(RNG, HASH_RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -263,6 +264,15 @@ 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);
+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,6 +212,7 @@ 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
 impl_rng!(RNG, HASH_RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -263,6 +264,15 @@ 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);
+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,6 +212,7 @@ 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
 impl_rng!(RNG, HASH_RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -250,6 +251,13 @@ 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);
+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,6 +212,7 @@ 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
 impl_rng!(RNG, HASH_RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -250,6 +251,13 @@ 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);
+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,6 +212,7 @@ 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
 impl_rng!(RNG, HASH_RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -263,6 +264,15 @@ 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);
+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,6 +212,7 @@ 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
 impl_rng!(RNG, HASH_RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -263,6 +264,15 @@ 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);
+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,6 +212,7 @@ 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
 impl_rng!(RNG, HASH_RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -258,6 +259,14 @@ 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);
+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,6 +212,7 @@ 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
 impl_rng!(RNG, HASH_RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -263,6 +264,15 @@ 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);
+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,6 +212,7 @@ 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
 impl_rng!(RNG, HASH_RNG);
 pub const SPI1: spi::Spi = spi::Spi(0x40013000 as _);
 impl_spi!(SPI1, APB2);
@@ -263,6 +264,15 @@ 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);
+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);