fixup: Uart shared irq misinterpretation

modm-io · May 9, 2021 · 7f4cc65 · 7f4cc65
1 parent a2e5e26
commit 7f4cc65
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/modm/platform/uart/stm32/module.lb b/src/modm/platform/uart/stm32/module.lb
@@ -111,7 +111,8 @@ def prepare(module, options):
     shared_irqs = [v for v in shared_irqs if ("USART" in v or "UART" in v or "LPUART" in v) and "_" in v]
     for shared_irq in shared_irqs:
         uart_type = ""
-        for s in shared_irq.split("_"):
+        import re
+        for s in re.findall(r"L?P?US?ART[\d_]+", shared_irq):
             if "LPUART" in s:
                 uart_type = "Lpuart"
             elif "UART" in s:
@@ -121,8 +122,11 @@ def prepare(module, options):
             else:
                 # use type from previous irq id
                 pass
-            irq_id = s[-1]
-            shared_irqs_new[uart_type + irq_id] = shared_irq
+            irq_ids = re.findall(r"\d+", s)
+            if len(irq_ids) == 2:
+                irq_ids = range(int(irq_ids[0]), int(irq_ids[1])+1)
+            for irq_id in irq_ids:
+                shared_irqs_new[uart_type + str(irq_id)] = shared_irq
     props["shared_irqs"] = shared_irqs_new
 
     props["target"] = device.identifier