[st] Select correct header for STM32H7 devices

Author: chris-durand

ext/st/module.lb

@@ -36,13 +36,19 @@ def getDefineForDevice(device_id, familyDefines):
     deviceDefines.sort(key=lambda d: (d[:minlen], d[minlen:]))
 
     # now we match for the size-id (and variant-id if applicable).
-    devNameMatch = devName + "x{}".format(device_id.size.upper())
+    if device_id.family == "h7":
+        devNameMatch = devName + "xx"
+    else:
+        devNameMatch = devName + "x{}".format(device_id.size.upper())
     if device_id.family == "l1":
         # Map STM32L1xxQC and STM32L1xxZC -> STM32L162QCxA variants
         if device_id.pin in ["q", "z"] and device_id.size == "c":
             devNameMatch += "A"
         else:
             devNameMatch += device_id.variant.upper()
+    elif device_id.family == "h7":
+        if device_id.variant:
+            devNameMatch += device_id.variant.upper()
     for define in deviceDefines:
         if devNameMatch <= define:
             return define
@@ -120,7 +126,7 @@ def common_header_file(env):
     define = None
 
     content = Path(localpath(folder, family_header)).read_text(encoding="utf-8", errors="replace")
-    match = re.findall(r"if defined\((?P<define>STM32[F|L|G][\w\d]+)\)", content)
+    match = re.findall(r"if defined\((?P<define>STM32[FLGH][\w\d]+)\)", content)
     define = getDefineForDevice(device.identifier, match)
     if define is None or match is None:
         raise ValidateException("No device define found for '{}'!".format(device.partname))