Simplify gpio.rs macro

Author: Piroro-hs

Cargo.toml

@@ -24,24 +24,22 @@ features = ["stm32f303xc", "rt", "stm32-usbd", "can"]
 targets = ["thumbv7em-none-eabihf"]
 
 [dependencies]
-cfg-if = "1.0"
+cfg-if = "1"
 cortex-m = "0.7"
 cortex-m-rt = "0.6"
 embedded-dma = "0.1"
 embedded-hal = "0.2"
-nb = "1.0"
+embedded-time = "0.10"
+nb = "1"
 paste = "1"
 rtcc = "0.2"
 stm32f3 = "0.13"
-embedded-time = "0.10"
+typenum = "1"
 
 [dependencies.embedded-hal-can]
 version = "0.1.0"
 optional = true
 
-[dependencies.bare-metal]
-version = "1.0"
-
 [dependencies.stm32-usbd]
 version = "0.6"
 optional = true
@@ -95,12 +93,12 @@ stm32f303xb = ["stm32f303", "gpio-f303", "device-selected"]
 stm32f303xc = ["stm32f303", "gpio-f303", "device-selected"]
 stm32f303xd = ["stm32f303", "gpio-f303e", "device-selected"]
 stm32f303xe = ["stm32f303", "gpio-f303e", "device-selected"]
-stm32f373 = ["gpio-f373", "stm32f3/stm32f373", "device-selected"]
-stm32f378 = ["gpio-f373", "stm32f3/stm32f373", "device-selected"]
-stm32f334 = ["gpio-f333", "stm32f3/stm32f3x4", "device-selected"]
 stm32f328 = ["gpio-f333", "stm32f3/stm32f303", "device-selected"]
 stm32f358 = ["gpio-f303", "stm32f3/stm32f303", "device-selected"]
 stm32f398 = ["gpio-f303e", "stm32f3/stm32f303", "device-selected"]
+stm32f373 = ["gpio-f373", "stm32f3/stm32f373", "device-selected"]
+stm32f378 = ["gpio-f373", "stm32f3/stm32f373", "device-selected"]
+stm32f334 = ["gpio-f333", "stm32f3/stm32f3x4", "device-selected"]
 
 defmt-default = ["defmt"]
 defmt-trace = ["defmt"]

codegen/src/codegen/gpio.rs

@@ -60,32 +60,41 @@ fn merge_pins_by_port(pins: &[gpio::Pin]) -> Result<Vec<Port>> {
 }
 
 fn gen_gpio_macro_call(ports: &[Port], feature: &str) -> Result<()> {
-    println!("gpio!([");
+    println!("gpio!({{");
+
+    let mut pac_modules: Vec<_> = ports.iter().map(|port| get_port_pac_module(port, feature)).collect();
+    pac_modules.sort();
+    pac_modules.dedup();
+    println!("    pacs: [{}],", pac_modules.join(", "));
+
+    println!("    ports: [");
     for port in ports {
         gen_port(port, feature)?;
     }
-    println!("]);");
+    println!("    ],");
+
+    println!("}});");
     Ok(())
 }
 
 fn gen_port(port: &Port, feature: &str) -> Result<()> {
     let pac_module = get_port_pac_module(port, feature);
 
-    println!("    {{");
+    println!("        {{");
     println!(
-        "        port: ({}/{}, pac: {}),",
+        "            port: ({}/{}, pac: {}),",
         port.id,
         port.id.to_lowercase(),
         pac_module,
     );
-    println!("        pins: [");
+    println!("            pins: [");
 
     for pin in &port.pins {
         gen_pin(pin)?;
     }
 
-    println!("        ],");
-    println!("    }},");
+    println!("            ],");
+    println!("        }},");
     Ok(())
 }
 
@@ -107,11 +116,10 @@ fn gen_pin(pin: &gpio::Pin) -> Result<()> {
     let af_numbers = get_pin_af_numbers(pin)?;
 
     println!(
-        "            {} => {{ reset: {}, afr: {}/{}, af: {:?} }},",
+        "                {} => {{ reset: {}, afr: {}, af: {:?} }},",
         nr,
         reset_mode,
         afr,
-        afr.to_lowercase(),
         af_numbers,
     );