diff --git a/CI/build/arduino-cli.py b/CI/build/arduino-cli.py
index def16458ae..e096e15d04 100644
--- a/CI/build/arduino-cli.py
+++ b/CI/build/arduino-cli.py
@@ -90,7 +90,7 @@
 
 # error or fatal error
 fork_pattern = re.compile(r"^Error during build: fork/exec")
-error_pattern = re.compile(r":\d+:\d*:?\s.*error:\s|^Error:")
+error_pattern = re.compile(r":\d+:\d*:?\s.*error:\s|^Error:|fatal error:")
 ld_pattern = re.compile("arm-none-eabi/bin/ld:")
 overflow_pattern = re.compile(
     r"(will not fit in |section .+ is not within )?region( .+ overflowed by [\d]+ bytes)?"
@@ -584,6 +584,7 @@ def check_status(status, build_conf, boardKo, nb_build_conf):
         # Check if failed due to a region overflowed
         logFile = build_conf[idx_log] / f"{sketch_name}.log"
         error_found = False
+        overflow_found = False
         for i, line in enumerate(open(logFile)):
             if error_pattern.search(line):
                 error_found = True
@@ -593,17 +594,20 @@ def check_status(status, build_conf, boardKo, nb_build_conf):
                 # If one ld line is not for region overflowed --> failed
                 if overflow_pattern.search(line) is None:
                     error_found = True
+                else:
+                    overflow_found = True
             if error_found:
-                result = ffail
-                boardKo.append(build_conf[idx_b_name])
-                if args.ci:
-                    cat(logFile)
-                nb_build_failed += 1
                 break
-        else:
-            # else consider it succeeded
+        # Succeeded if overflow is found and no other error found
+        if overflow_found and not error_found:
             result = "\033[32msucceeded*\033[0m"
             nb_build_passed += 1
+        else:
+            result = ffail
+            boardKo.append(build_conf[idx_b_name])
+            if args.ci:
+                cat(logFile)
+            nb_build_failed += 1
     else:
         result = "\033[31merror\033[0m"
         boardKo.append(build_conf[idx_b_name])
diff --git a/CI/update/stm32variant.py b/CI/update/stm32variant.py
index b2cdd5d9d4..39426eaacc 100644
--- a/CI/update/stm32variant.py
+++ b/CI/update/stm32variant.py
@@ -1037,7 +1037,6 @@ def print_peripheral():
 
     periph_c_file.write(
         periph_c_template.render(
-            year=datetime.datetime.now().year,
             mcu_file=mcu_file.name,
             db_release=db_release,
             peripherals_list=(
@@ -1360,7 +1359,6 @@ def print_variant(generic_list, alt_syswkup_list):
 
     variant_h_file.write(
         variant_h_template.render(
-            year=datetime.datetime.now().year,
             pins_number_list=pins_number_list,
             alt_pins_list=alt_pins_list,
             alt_syswkup_list=alt_syswkup_list,
@@ -1379,7 +1377,6 @@ def print_variant(generic_list, alt_syswkup_list):
 
     variant_cpp_file.write(
         variant_cpp_template.render(
-            year=datetime.datetime.now().year,
             generic_list=generic_list,
             pinnames_list=pinnames_list,
             analog_pins_list=analog_pins_list,
@@ -1515,7 +1512,6 @@ def print_general_clock(generic_list):
     generic_clock_template = j2_env.get_template(generic_clock_filename)
     generic_clock_file.write(
         generic_clock_template.render(
-            year=datetime.datetime.now().year,
             generic_list=generic_list,
         )
     )
@@ -1845,7 +1841,7 @@ def group_by_flash(group_base_list, glist, index_mcu_base):
             # Assert
             if sub.group(2) != "x":
                 print(
-                    "Package of {base_name} info contains {sub.group(2)} instead of 'x'"
+                    f"Package of {base_name}, ppe {ppe} info contains {sub.group(2)} instead of 'x'"
                 )
                 exit(1)
             if sub.group(3):
@@ -2427,7 +2423,7 @@ def manage_repo():
 update_regex = re.compile(r"defined\(ARDUINO_GENERIC_.+\)")
 board_entry_regex = re.compile(r"(Gen.+\..+variant=STM32.+xx/)\S+")
 #                              P     T      E
-mcu_PE_regex = re.compile(r"([\w])([\w])([ANPQX])?$")
+mcu_PE_regex = re.compile(r"([\w])([\w])([ANPQSX])?$")
 aggregate_dir()
 
 # Clean temporary dir
diff --git a/CI/update/templates/PeripheralPins.c b/CI/update/templates/PeripheralPins.c
index 6299ad8142..3257686749 100644
--- a/CI/update/templates/PeripheralPins.c
+++ b/CI/update/templates/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-{{year}}, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/CI/update/templates/generic_clock.c b/CI/update/templates/generic_clock.c
index 10f37de526..736c0e0b67 100644
--- a/CI/update/templates/generic_clock.c
+++ b/CI/update/templates/generic_clock.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-{{year}}, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/CI/update/templates/variant_generic.cpp b/CI/update/templates/variant_generic.cpp
index aec9d187f4..5b671b2463 100644
--- a/CI/update/templates/variant_generic.cpp
+++ b/CI/update/templates/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-{{year}}, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/CI/update/templates/variant_generic.h b/CI/update/templates/variant_generic.h
index 804d98c436..c2d8750726 100644
--- a/CI/update/templates/variant_generic.h
+++ b/CI/update/templates/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-{{year}}, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/README.md b/README.md
index c70a186b4c..12f875252f 100644
--- a/README.md
+++ b/README.md
@@ -438,7 +438,7 @@ User can add a STM32 based board following this [wiki](https://github.com/stm32d
 | Status | Device(s) | Name | Release | Notes |
 | :----: | :-------: | ---- | :-----: | :---- |
 | :green_heart:  | STM32U575AGIxQ<br>STM32U575AIIxQ<br>STM32U585AIIxQ | Generic Board | *2.1.0* |  |
-| :green_heart:  | STM32U575ZGTxQ<br>STM32U575ZITxQ<br>STM32U585ZETxQ | Generic Board | *2.1.0* |  |
+| :green_heart:  | STM32U575ZGTxQ<br>STM32U575ZITxQ<br>STM32U585ZITxQ | Generic Board | *2.1.0* |  |
 
 ### Generic STM32WB boards
 
diff --git a/boards.txt b/boards.txt
index 0ea99f1da3..55f3dae41f 100644
--- a/boards.txt
+++ b/boards.txt
@@ -190,7 +190,7 @@ Nucleo_144.menu.pnum.NUCLEO_U575ZI_Q.build.flags.fp=-mfpu=fpv4-sp-d16 -mfloat-ab
 Nucleo_144.menu.pnum.NUCLEO_U575ZI_Q.build.board=NUCLEO_U575ZI_Q
 Nucleo_144.menu.pnum.NUCLEO_U575ZI_Q.build.series=STM32U5xx
 Nucleo_144.menu.pnum.NUCLEO_U575ZI_Q.build.product_line=STM32U575xx
-Nucleo_144.menu.pnum.NUCLEO_U575ZI_Q.build.variant=STM32U5xx/U575Z(G-I)TxQ_U585ZETxQ
+Nucleo_144.menu.pnum.NUCLEO_U575ZI_Q.build.variant=STM32U5xx/U575Z(G-I)TxQ_U585ZITxQ
 Nucleo_144.menu.pnum.NUCLEO_U575ZI_Q.build.cmsis_lib_gcc=arm_ARMv8MMLlfsp_math
 Nucleo_144.menu.pnum.NUCLEO_U575ZI_Q.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
 
@@ -371,7 +371,7 @@ Nucleo_64.menu.pnum.NUCLEO_G0B1RE.build.mcu=cortex-m0plus
 Nucleo_64.menu.pnum.NUCLEO_G0B1RE.build.board=NUCLEO_G0B1RE
 Nucleo_64.menu.pnum.NUCLEO_G0B1RE.build.series=STM32G0xx
 Nucleo_64.menu.pnum.NUCLEO_G0B1RE.build.product_line=STM32G0B1xx
-Nucleo_64.menu.pnum.NUCLEO_G0B1RE.build.variant=STM32G0xx/G0B1RBT_G0B1R(C-E)(I-T)_G0C1R(C-E)(I-T)
+Nucleo_64.menu.pnum.NUCLEO_G0B1RE.build.variant=STM32G0xx/G0B1R(B-C-E)T_G0C1R(C-E)T
 Nucleo_64.menu.pnum.NUCLEO_G0B1RE.build.cmsis_lib_gcc=arm_cortexM0l_math
 Nucleo_64.menu.pnum.NUCLEO_G0B1RE.build.extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -D__CORTEX_SC=0
 
@@ -475,7 +475,7 @@ Nucleo_64.menu.pnum.NUCLEO_L452RE.build.flags.fp=-mfpu=fpv4-sp-d16 -mfloat-abi=h
 Nucleo_64.menu.pnum.NUCLEO_L452RE.build.board=NUCLEO_L452RE
 Nucleo_64.menu.pnum.NUCLEO_L452RE.build.series=STM32L4xx
 Nucleo_64.menu.pnum.NUCLEO_L452RE.build.product_line=STM32L452xx
-Nucleo_64.menu.pnum.NUCLEO_L452RE.build.variant=STM32L4xx/L452R(C-E)(I-T-Y)_L462RE(I-T-Y)
+Nucleo_64.menu.pnum.NUCLEO_L452RE.build.variant=STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)
 Nucleo_64.menu.pnum.NUCLEO_L452RE.build.cmsis_lib_gcc=arm_cortexM4lf_math
 
 # NUCLEO_L452RE-P board
@@ -3468,7 +3468,7 @@ GenG0.menu.pnum.GENERIC_G0B1RBTX.upload.maximum_size=131072
 GenG0.menu.pnum.GENERIC_G0B1RBTX.upload.maximum_data_size=147456
 GenG0.menu.pnum.GENERIC_G0B1RBTX.build.board=GENERIC_G0B1RBTX
 GenG0.menu.pnum.GENERIC_G0B1RBTX.build.product_line=STM32G0B1xx
-GenG0.menu.pnum.GENERIC_G0B1RBTX.build.variant=STM32G0xx/G0B1RBT_G0B1R(C-E)(I-T)_G0C1R(C-E)(I-T)
+GenG0.menu.pnum.GENERIC_G0B1RBTX.build.variant=STM32G0xx/G0B1R(B-C-E)T_G0C1R(C-E)T
 
 # Generic G0B1RCTx
 GenG0.menu.pnum.GENERIC_G0B1RCTX=Generic G0B1RCTx
@@ -3476,15 +3476,7 @@ GenG0.menu.pnum.GENERIC_G0B1RCTX.upload.maximum_size=262144
 GenG0.menu.pnum.GENERIC_G0B1RCTX.upload.maximum_data_size=147456
 GenG0.menu.pnum.GENERIC_G0B1RCTX.build.board=GENERIC_G0B1RCTX
 GenG0.menu.pnum.GENERIC_G0B1RCTX.build.product_line=STM32G0B1xx
-GenG0.menu.pnum.GENERIC_G0B1RCTX.build.variant=STM32G0xx/G0B1RBT_G0B1R(C-E)(I-T)_G0C1R(C-E)(I-T)
-
-# Generic G0B1RCIx
-GenG0.menu.pnum.GENERIC_G0B1RCIX=Generic G0B1RCIx
-GenG0.menu.pnum.GENERIC_G0B1RCIX.upload.maximum_size=262144
-GenG0.menu.pnum.GENERIC_G0B1RCIX.upload.maximum_data_size=147456
-GenG0.menu.pnum.GENERIC_G0B1RCIX.build.board=GENERIC_G0B1RCIX
-GenG0.menu.pnum.GENERIC_G0B1RCIX.build.product_line=STM32G0B1xx
-GenG0.menu.pnum.GENERIC_G0B1RCIX.build.variant=STM32G0xx/G0B1RBT_G0B1R(C-E)(I-T)_G0C1R(C-E)(I-T)
+GenG0.menu.pnum.GENERIC_G0B1RCTX.build.variant=STM32G0xx/G0B1R(B-C-E)T_G0C1R(C-E)T
 
 # Generic G0B1RETx
 GenG0.menu.pnum.GENERIC_G0B1RETX=Generic G0B1RETx
@@ -3492,15 +3484,7 @@ GenG0.menu.pnum.GENERIC_G0B1RETX.upload.maximum_size=524288
 GenG0.menu.pnum.GENERIC_G0B1RETX.upload.maximum_data_size=147456
 GenG0.menu.pnum.GENERIC_G0B1RETX.build.board=GENERIC_G0B1RETX
 GenG0.menu.pnum.GENERIC_G0B1RETX.build.product_line=STM32G0B1xx
-GenG0.menu.pnum.GENERIC_G0B1RETX.build.variant=STM32G0xx/G0B1RBT_G0B1R(C-E)(I-T)_G0C1R(C-E)(I-T)
-
-# Generic G0B1REIx
-GenG0.menu.pnum.GENERIC_G0B1REIX=Generic G0B1REIx
-GenG0.menu.pnum.GENERIC_G0B1REIX.upload.maximum_size=524288
-GenG0.menu.pnum.GENERIC_G0B1REIX.upload.maximum_data_size=147456
-GenG0.menu.pnum.GENERIC_G0B1REIX.build.board=GENERIC_G0B1REIX
-GenG0.menu.pnum.GENERIC_G0B1REIX.build.product_line=STM32G0B1xx
-GenG0.menu.pnum.GENERIC_G0B1REIX.build.variant=STM32G0xx/G0B1RBT_G0B1R(C-E)(I-T)_G0C1R(C-E)(I-T)
+GenG0.menu.pnum.GENERIC_G0B1RETX.build.variant=STM32G0xx/G0B1R(B-C-E)T_G0C1R(C-E)T
 
 # Generic G0C1RCTx
 GenG0.menu.pnum.GENERIC_G0C1RCTX=Generic G0C1RCTx
@@ -3508,15 +3492,7 @@ GenG0.menu.pnum.GENERIC_G0C1RCTX.upload.maximum_size=262144
 GenG0.menu.pnum.GENERIC_G0C1RCTX.upload.maximum_data_size=147456
 GenG0.menu.pnum.GENERIC_G0C1RCTX.build.board=GENERIC_G0C1RCTX
 GenG0.menu.pnum.GENERIC_G0C1RCTX.build.product_line=STM32G0C1xx
-GenG0.menu.pnum.GENERIC_G0C1RCTX.build.variant=STM32G0xx/G0B1RBT_G0B1R(C-E)(I-T)_G0C1R(C-E)(I-T)
-
-# Generic G0C1RCIx
-GenG0.menu.pnum.GENERIC_G0C1RCIX=Generic G0C1RCIx
-GenG0.menu.pnum.GENERIC_G0C1RCIX.upload.maximum_size=262144
-GenG0.menu.pnum.GENERIC_G0C1RCIX.upload.maximum_data_size=147456
-GenG0.menu.pnum.GENERIC_G0C1RCIX.build.board=GENERIC_G0C1RCIX
-GenG0.menu.pnum.GENERIC_G0C1RCIX.build.product_line=STM32G0C1xx
-GenG0.menu.pnum.GENERIC_G0C1RCIX.build.variant=STM32G0xx/G0B1RBT_G0B1R(C-E)(I-T)_G0C1R(C-E)(I-T)
+GenG0.menu.pnum.GENERIC_G0C1RCTX.build.variant=STM32G0xx/G0B1R(B-C-E)T_G0C1R(C-E)T
 
 # Generic G0C1RETx
 GenG0.menu.pnum.GENERIC_G0C1RETX=Generic G0C1RETx
@@ -3524,15 +3500,7 @@ GenG0.menu.pnum.GENERIC_G0C1RETX.upload.maximum_size=524288
 GenG0.menu.pnum.GENERIC_G0C1RETX.upload.maximum_data_size=147456
 GenG0.menu.pnum.GENERIC_G0C1RETX.build.board=GENERIC_G0C1RETX
 GenG0.menu.pnum.GENERIC_G0C1RETX.build.product_line=STM32G0C1xx
-GenG0.menu.pnum.GENERIC_G0C1RETX.build.variant=STM32G0xx/G0B1RBT_G0B1R(C-E)(I-T)_G0C1R(C-E)(I-T)
-
-# Generic G0C1REIx
-GenG0.menu.pnum.GENERIC_G0C1REIX=Generic G0C1REIx
-GenG0.menu.pnum.GENERIC_G0C1REIX.upload.maximum_size=524288
-GenG0.menu.pnum.GENERIC_G0C1REIX.upload.maximum_data_size=147456
-GenG0.menu.pnum.GENERIC_G0C1REIX.build.board=GENERIC_G0C1REIX
-GenG0.menu.pnum.GENERIC_G0C1REIX.build.product_line=STM32G0C1xx
-GenG0.menu.pnum.GENERIC_G0C1REIX.build.variant=STM32G0xx/G0B1RBT_G0B1R(C-E)(I-T)_G0C1R(C-E)(I-T)
+GenG0.menu.pnum.GENERIC_G0C1RETX.build.variant=STM32G0xx/G0B1R(B-C-E)T_G0C1R(C-E)T
 
 # Upload menu
 GenG0.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
@@ -4863,7 +4831,7 @@ GenL4.menu.pnum.GENERIC_L452RCIX.upload.maximum_size=262144
 GenL4.menu.pnum.GENERIC_L452RCIX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L452RCIX.build.board=GENERIC_L452RCIX
 GenL4.menu.pnum.GENERIC_L452RCIX.build.product_line=STM32L452xx
-GenL4.menu.pnum.GENERIC_L452RCIX.build.variant=STM32L4xx/L452R(C-E)(I-T-Y)_L462RE(I-T-Y)
+GenL4.menu.pnum.GENERIC_L452RCIX.build.variant=STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)
 
 # Generic L452REIx
 GenL4.menu.pnum.GENERIC_L452REIX=Generic L452REIx
@@ -4871,7 +4839,7 @@ GenL4.menu.pnum.GENERIC_L452REIX.upload.maximum_size=524288
 GenL4.menu.pnum.GENERIC_L452REIX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L452REIX.build.board=GENERIC_L452REIX
 GenL4.menu.pnum.GENERIC_L452REIX.build.product_line=STM32L452xx
-GenL4.menu.pnum.GENERIC_L452REIX.build.variant=STM32L4xx/L452R(C-E)(I-T-Y)_L462RE(I-T-Y)
+GenL4.menu.pnum.GENERIC_L452REIX.build.variant=STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)
 
 # Generic L452RCTx
 GenL4.menu.pnum.GENERIC_L452RCTX=Generic L452RCTx
@@ -4879,7 +4847,7 @@ GenL4.menu.pnum.GENERIC_L452RCTX.upload.maximum_size=262144
 GenL4.menu.pnum.GENERIC_L452RCTX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L452RCTX.build.board=GENERIC_L452RCTX
 GenL4.menu.pnum.GENERIC_L452RCTX.build.product_line=STM32L452xx
-GenL4.menu.pnum.GENERIC_L452RCTX.build.variant=STM32L4xx/L452R(C-E)(I-T-Y)_L462RE(I-T-Y)
+GenL4.menu.pnum.GENERIC_L452RCTX.build.variant=STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)
 
 # Generic L452RETx
 GenL4.menu.pnum.GENERIC_L452RETX=Generic L452RETx
@@ -4887,7 +4855,7 @@ GenL4.menu.pnum.GENERIC_L452RETX.upload.maximum_size=524288
 GenL4.menu.pnum.GENERIC_L452RETX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L452RETX.build.board=GENERIC_L452RETX
 GenL4.menu.pnum.GENERIC_L452RETX.build.product_line=STM32L452xx
-GenL4.menu.pnum.GENERIC_L452RETX.build.variant=STM32L4xx/L452R(C-E)(I-T-Y)_L462RE(I-T-Y)
+GenL4.menu.pnum.GENERIC_L452RETX.build.variant=STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)
 
 # Generic L452RCYx
 GenL4.menu.pnum.GENERIC_L452RCYX=Generic L452RCYx
@@ -4895,7 +4863,7 @@ GenL4.menu.pnum.GENERIC_L452RCYX.upload.maximum_size=262144
 GenL4.menu.pnum.GENERIC_L452RCYX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L452RCYX.build.board=GENERIC_L452RCYX
 GenL4.menu.pnum.GENERIC_L452RCYX.build.product_line=STM32L452xx
-GenL4.menu.pnum.GENERIC_L452RCYX.build.variant=STM32L4xx/L452R(C-E)(I-T-Y)_L462RE(I-T-Y)
+GenL4.menu.pnum.GENERIC_L452RCYX.build.variant=STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)
 
 # Generic L452REYx
 GenL4.menu.pnum.GENERIC_L452REYX=Generic L452REYx
@@ -4903,7 +4871,7 @@ GenL4.menu.pnum.GENERIC_L452REYX.upload.maximum_size=524288
 GenL4.menu.pnum.GENERIC_L452REYX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L452REYX.build.board=GENERIC_L452REYX
 GenL4.menu.pnum.GENERIC_L452REYX.build.product_line=STM32L452xx
-GenL4.menu.pnum.GENERIC_L452REYX.build.variant=STM32L4xx/L452R(C-E)(I-T-Y)_L462RE(I-T-Y)
+GenL4.menu.pnum.GENERIC_L452REYX.build.variant=STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)
 
 # Generic L452RETxP
 GenL4.menu.pnum.GENERIC_L452RETXP=Generic L452RETxP
@@ -4919,7 +4887,7 @@ GenL4.menu.pnum.GENERIC_L462REIX.upload.maximum_size=524288
 GenL4.menu.pnum.GENERIC_L462REIX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L462REIX.build.board=GENERIC_L462REIX
 GenL4.menu.pnum.GENERIC_L462REIX.build.product_line=STM32L462xx
-GenL4.menu.pnum.GENERIC_L462REIX.build.variant=STM32L4xx/L452R(C-E)(I-T-Y)_L462RE(I-T-Y)
+GenL4.menu.pnum.GENERIC_L462REIX.build.variant=STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)
 
 # Generic L462RETx
 GenL4.menu.pnum.GENERIC_L462RETX=Generic L462RETx
@@ -4927,7 +4895,7 @@ GenL4.menu.pnum.GENERIC_L462RETX.upload.maximum_size=524288
 GenL4.menu.pnum.GENERIC_L462RETX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L462RETX.build.board=GENERIC_L462RETX
 GenL4.menu.pnum.GENERIC_L462RETX.build.product_line=STM32L462xx
-GenL4.menu.pnum.GENERIC_L462RETX.build.variant=STM32L4xx/L452R(C-E)(I-T-Y)_L462RE(I-T-Y)
+GenL4.menu.pnum.GENERIC_L462RETX.build.variant=STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)
 
 # Generic L462REYx
 GenL4.menu.pnum.GENERIC_L462REYX=Generic L462REYx
@@ -4935,7 +4903,7 @@ GenL4.menu.pnum.GENERIC_L462REYX.upload.maximum_size=524288
 GenL4.menu.pnum.GENERIC_L462REYX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L462REYX.build.board=GENERIC_L462REYX
 GenL4.menu.pnum.GENERIC_L462REYX.build.product_line=STM32L462xx
-GenL4.menu.pnum.GENERIC_L462REYX.build.variant=STM32L4xx/L452R(C-E)(I-T-Y)_L462RE(I-T-Y)
+GenL4.menu.pnum.GENERIC_L462REYX.build.variant=STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)
 
 # Generic L475RCTx
 GenL4.menu.pnum.GENERIC_L475RCTX=Generic L475RCTx
@@ -5351,7 +5319,7 @@ GenU5.menu.pnum.GENERIC_U575ZGTXQ.upload.maximum_size=1048576
 GenU5.menu.pnum.GENERIC_U575ZGTXQ.upload.maximum_data_size=262144
 GenU5.menu.pnum.GENERIC_U575ZGTXQ.build.board=GENERIC_U575ZGTXQ
 GenU5.menu.pnum.GENERIC_U575ZGTXQ.build.product_line=STM32U575xx
-GenU5.menu.pnum.GENERIC_U575ZGTXQ.build.variant=STM32U5xx/U575Z(G-I)TxQ_U585ZETxQ
+GenU5.menu.pnum.GENERIC_U575ZGTXQ.build.variant=STM32U5xx/U575Z(G-I)TxQ_U585ZITxQ
 
 # Generic U575ZITxQ
 GenU5.menu.pnum.GENERIC_U575ZITXQ=Generic U575ZITxQ
@@ -5359,7 +5327,15 @@ GenU5.menu.pnum.GENERIC_U575ZITXQ.upload.maximum_size=2097152
 GenU5.menu.pnum.GENERIC_U575ZITXQ.upload.maximum_data_size=262144
 GenU5.menu.pnum.GENERIC_U575ZITXQ.build.board=GENERIC_U575ZITXQ
 GenU5.menu.pnum.GENERIC_U575ZITXQ.build.product_line=STM32U575xx
-GenU5.menu.pnum.GENERIC_U575ZITXQ.build.variant=STM32U5xx/U575Z(G-I)TxQ_U585ZETxQ
+GenU5.menu.pnum.GENERIC_U575ZITXQ.build.variant=STM32U5xx/U575Z(G-I)TxQ_U585ZITxQ
+
+# Generic U585ZITxQ
+GenU5.menu.pnum.GENERIC_U585ZITXQ=Generic U585ZITxQ
+GenU5.menu.pnum.GENERIC_U585ZITXQ.upload.maximum_size=2097152
+GenU5.menu.pnum.GENERIC_U585ZITXQ.upload.maximum_data_size=262144
+GenU5.menu.pnum.GENERIC_U585ZITXQ.build.board=GENERIC_U585ZITXQ
+GenU5.menu.pnum.GENERIC_U585ZITXQ.build.product_line=STM32U585xx
+GenU5.menu.pnum.GENERIC_U585ZITXQ.build.variant=STM32U5xx/U575Z(G-I)TxQ_U585ZITxQ
 
 # Generic U585AIIxQ
 GenU5.menu.pnum.GENERIC_U585AIIXQ=Generic U585AIIxQ
@@ -5369,14 +5345,6 @@ GenU5.menu.pnum.GENERIC_U585AIIXQ.build.board=GENERIC_U585AIIXQ
 GenU5.menu.pnum.GENERIC_U585AIIXQ.build.product_line=STM32U585xx
 GenU5.menu.pnum.GENERIC_U585AIIXQ.build.variant=STM32U5xx/U575A(G-I)IxQ_U585AIIxQ
 
-# Generic U585ZETxQ
-GenU5.menu.pnum.GENERIC_U585ZETXQ=Generic U585ZETxQ
-GenU5.menu.pnum.GENERIC_U585ZETXQ.upload.maximum_size=524288
-GenU5.menu.pnum.GENERIC_U585ZETXQ.upload.maximum_data_size=262144
-GenU5.menu.pnum.GENERIC_U585ZETXQ.build.board=GENERIC_U585ZETXQ
-GenU5.menu.pnum.GENERIC_U585ZETXQ.build.product_line=STM32U585xx
-GenU5.menu.pnum.GENERIC_U585ZETXQ.build.variant=STM32U5xx/U575Z(G-I)TxQ_U585ZETxQ
-
 # Upload menu
 GenU5.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
 GenU5.menu.upload_method.swdMethod.upload.protocol=0
@@ -5411,7 +5379,7 @@ GenWB.menu.pnum.GENERIC_WB55CCUX.upload.maximum_size=131072
 GenWB.menu.pnum.GENERIC_WB55CCUX.upload.maximum_data_size=65536
 GenWB.menu.pnum.GENERIC_WB55CCUX.build.board=GENERIC_WB55CCUX
 GenWB.menu.pnum.GENERIC_WB55CCUX.build.product_line=STM32WB55xx
-GenWB.menu.pnum.GENERIC_WB55CCUX.build.variant=STM32WBxx/WB55C(C-E-G)U
+GenWB.menu.pnum.GENERIC_WB55CCUX.build.variant=STM32WBxx/WB35C(C-E)UxA_WB55C(C-E-G)U
 
 # Generic WB55CEUx
 GenWB.menu.pnum.GENERIC_WB55CEUX=Generic WB55CEUx
@@ -5419,7 +5387,7 @@ GenWB.menu.pnum.GENERIC_WB55CEUX.upload.maximum_size=262144
 GenWB.menu.pnum.GENERIC_WB55CEUX.upload.maximum_data_size=196608
 GenWB.menu.pnum.GENERIC_WB55CEUX.build.board=GENERIC_WB55CEUX
 GenWB.menu.pnum.GENERIC_WB55CEUX.build.product_line=STM32WB55xx
-GenWB.menu.pnum.GENERIC_WB55CEUX.build.variant=STM32WBxx/WB55C(C-E-G)U
+GenWB.menu.pnum.GENERIC_WB55CEUX.build.variant=STM32WBxx/WB35C(C-E)UxA_WB55C(C-E-G)U
 
 # Generic WB55CGUx
 GenWB.menu.pnum.GENERIC_WB55CGUX=Generic WB55CGUx
@@ -5427,7 +5395,7 @@ GenWB.menu.pnum.GENERIC_WB55CGUX.upload.maximum_size=524288
 GenWB.menu.pnum.GENERIC_WB55CGUX.upload.maximum_data_size=196608
 GenWB.menu.pnum.GENERIC_WB55CGUX.build.board=GENERIC_WB55CGUX
 GenWB.menu.pnum.GENERIC_WB55CGUX.build.product_line=STM32WB55xx
-GenWB.menu.pnum.GENERIC_WB55CGUX.build.variant=STM32WBxx/WB55C(C-E-G)U
+GenWB.menu.pnum.GENERIC_WB55CGUX.build.variant=STM32WBxx/WB35C(C-E)UxA_WB55C(C-E-G)U
 
 # Generic WB5MMGHx
 GenWB.menu.pnum.GENERIC_WB5MMGHX=Generic WB5MMGHx
@@ -6223,7 +6191,7 @@ Midatronics.menu.pnum.MKR_SHARKY.build.flags.fp=-mfpu=fpv4-sp-d16 -mfloat-abi=ha
 Midatronics.menu.pnum.MKR_SHARKY.build.board=MKR_SHARKY
 Midatronics.menu.pnum.MKR_SHARKY.build.series=STM32WBxx
 Midatronics.menu.pnum.MKR_SHARKY.build.product_line=STM32WB55xx
-Midatronics.menu.pnum.MKR_SHARKY.build.variant=STM32WBxx/WB55C(C-E-G)U
+Midatronics.menu.pnum.MKR_SHARKY.build.variant=STM32WBxx/WB35C(C-E)UxA_WB55C(C-E-G)U
 Midatronics.menu.pnum.MKR_SHARKY.build.cmsis_lib_gcc=arm_cortexM4lf_math
 
 # Upload menu
diff --git a/variants/STM32F0xx/F030C6T/PeripheralPins.c b/variants/STM32F0xx/F030C6T/PeripheralPins.c
index 8516d646cc..55128962d2 100644
--- a/variants/STM32F0xx/F030C6T/PeripheralPins.c
+++ b/variants/STM32F0xx/F030C6T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F030C6Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F030C6T/variant_generic.cpp b/variants/STM32F0xx/F030C6T/variant_generic.cpp
index 8c6570ec94..c847bbc852 100644
--- a/variants/STM32F0xx/F030C6T/variant_generic.cpp
+++ b/variants/STM32F0xx/F030C6T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F030C6T/variant_generic.h b/variants/STM32F0xx/F030C6T/variant_generic.h
index 9235874ff6..82e0fcfcae 100644
--- a/variants/STM32F0xx/F030C6T/variant_generic.h
+++ b/variants/STM32F0xx/F030C6T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F030C8T/PeripheralPins.c b/variants/STM32F0xx/F030C8T/PeripheralPins.c
index 630b804be3..114dda4fcd 100644
--- a/variants/STM32F0xx/F030C8T/PeripheralPins.c
+++ b/variants/STM32F0xx/F030C8T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F030C8Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F030C8T/variant_generic.cpp b/variants/STM32F0xx/F030C8T/variant_generic.cpp
index d3fbca37ce..cb6dff715e 100644
--- a/variants/STM32F0xx/F030C8T/variant_generic.cpp
+++ b/variants/STM32F0xx/F030C8T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F030C8T/variant_generic.h b/variants/STM32F0xx/F030C8T/variant_generic.h
index 87f8191e44..a8135096c3 100644
--- a/variants/STM32F0xx/F030C8T/variant_generic.h
+++ b/variants/STM32F0xx/F030C8T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F030CCT/PeripheralPins.c b/variants/STM32F0xx/F030CCT/PeripheralPins.c
index 2f3ffb3cdf..ad2dc06fd4 100644
--- a/variants/STM32F0xx/F030CCT/PeripheralPins.c
+++ b/variants/STM32F0xx/F030CCT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F030CCTx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F030CCT/variant_generic.cpp b/variants/STM32F0xx/F030CCT/variant_generic.cpp
index 864accfc17..1be5467664 100644
--- a/variants/STM32F0xx/F030CCT/variant_generic.cpp
+++ b/variants/STM32F0xx/F030CCT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F030CCT/variant_generic.h b/variants/STM32F0xx/F030CCT/variant_generic.h
index 40cdfd0843..8dbb403f3d 100644
--- a/variants/STM32F0xx/F030CCT/variant_generic.h
+++ b/variants/STM32F0xx/F030CCT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F030F4P/PeripheralPins.c b/variants/STM32F0xx/F030F4P/PeripheralPins.c
index f6a1f40b9a..e5f7350739 100644
--- a/variants/STM32F0xx/F030F4P/PeripheralPins.c
+++ b/variants/STM32F0xx/F030F4P/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F030F4Px.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F030F4P/variant_generic.cpp b/variants/STM32F0xx/F030F4P/variant_generic.cpp
index 8466de42ce..17c33b54e0 100644
--- a/variants/STM32F0xx/F030F4P/variant_generic.cpp
+++ b/variants/STM32F0xx/F030F4P/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F030F4P/variant_generic.h b/variants/STM32F0xx/F030F4P/variant_generic.h
index 5918fda77b..c5ab025de6 100644
--- a/variants/STM32F0xx/F030F4P/variant_generic.h
+++ b/variants/STM32F0xx/F030F4P/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F030K6T/PeripheralPins.c b/variants/STM32F0xx/F030K6T/PeripheralPins.c
index c07ada1089..14c31625e1 100644
--- a/variants/STM32F0xx/F030K6T/PeripheralPins.c
+++ b/variants/STM32F0xx/F030K6T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F030K6Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F030K6T/variant_generic.cpp b/variants/STM32F0xx/F030K6T/variant_generic.cpp
index 65c51bdcc4..4988b4d152 100644
--- a/variants/STM32F0xx/F030K6T/variant_generic.cpp
+++ b/variants/STM32F0xx/F030K6T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F030K6T/variant_generic.h b/variants/STM32F0xx/F030K6T/variant_generic.h
index 87173dcb5b..611c8866e6 100644
--- a/variants/STM32F0xx/F030K6T/variant_generic.h
+++ b/variants/STM32F0xx/F030K6T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F030R8T/PeripheralPins.c b/variants/STM32F0xx/F030R8T/PeripheralPins.c
index 45d6387415..59558aa071 100644
--- a/variants/STM32F0xx/F030R8T/PeripheralPins.c
+++ b/variants/STM32F0xx/F030R8T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F030R8Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F030R8T/variant_generic.cpp b/variants/STM32F0xx/F030R8T/variant_generic.cpp
index 5581781f0e..cd0d7563b9 100644
--- a/variants/STM32F0xx/F030R8T/variant_generic.cpp
+++ b/variants/STM32F0xx/F030R8T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F030R8T/variant_generic.h b/variants/STM32F0xx/F030R8T/variant_generic.h
index ca2e6139d5..9242628edf 100644
--- a/variants/STM32F0xx/F030R8T/variant_generic.h
+++ b/variants/STM32F0xx/F030R8T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F030RCT/PeripheralPins.c b/variants/STM32F0xx/F030RCT/PeripheralPins.c
index 4fb8e14dd4..7733cfab9e 100644
--- a/variants/STM32F0xx/F030RCT/PeripheralPins.c
+++ b/variants/STM32F0xx/F030RCT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F030RCTx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F030RCT/variant_generic.cpp b/variants/STM32F0xx/F030RCT/variant_generic.cpp
index 51e07424ac..1b807b23dd 100644
--- a/variants/STM32F0xx/F030RCT/variant_generic.cpp
+++ b/variants/STM32F0xx/F030RCT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F030RCT/variant_generic.h b/variants/STM32F0xx/F030RCT/variant_generic.h
index e1fcb9dfa1..23a988828b 100644
--- a/variants/STM32F0xx/F030RCT/variant_generic.h
+++ b/variants/STM32F0xx/F030RCT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F031C(4-6)T/PeripheralPins.c b/variants/STM32F0xx/F031C(4-6)T/PeripheralPins.c
index 1eb3cc064e..189e170aa2 100644
--- a/variants/STM32F0xx/F031C(4-6)T/PeripheralPins.c
+++ b/variants/STM32F0xx/F031C(4-6)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F031C(4-6)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F031C(4-6)T/variant_generic.cpp b/variants/STM32F0xx/F031C(4-6)T/variant_generic.cpp
index 9b7d21fc9e..59331cd9bb 100644
--- a/variants/STM32F0xx/F031C(4-6)T/variant_generic.cpp
+++ b/variants/STM32F0xx/F031C(4-6)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F031C(4-6)T/variant_generic.h b/variants/STM32F0xx/F031C(4-6)T/variant_generic.h
index 9235874ff6..82e0fcfcae 100644
--- a/variants/STM32F0xx/F031C(4-6)T/variant_generic.h
+++ b/variants/STM32F0xx/F031C(4-6)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F031E6Y_F038E6Y/PeripheralPins.c b/variants/STM32F0xx/F031E6Y_F038E6Y/PeripheralPins.c
index a1bae4073d..0d049856ca 100644
--- a/variants/STM32F0xx/F031E6Y_F038E6Y/PeripheralPins.c
+++ b/variants/STM32F0xx/F031E6Y_F038E6Y/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F031E6Yx.xml, STM32F038E6Yx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F031E6Y_F038E6Y/variant_generic.cpp b/variants/STM32F0xx/F031E6Y_F038E6Y/variant_generic.cpp
index 3514b7c1ca..6b1406f59c 100644
--- a/variants/STM32F0xx/F031E6Y_F038E6Y/variant_generic.cpp
+++ b/variants/STM32F0xx/F031E6Y_F038E6Y/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F031E6Y_F038E6Y/variant_generic.h b/variants/STM32F0xx/F031E6Y_F038E6Y/variant_generic.h
index 9b5e5b2b03..85c4354690 100644
--- a/variants/STM32F0xx/F031E6Y_F038E6Y/variant_generic.h
+++ b/variants/STM32F0xx/F031E6Y_F038E6Y/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F031F(4-6)P/PeripheralPins.c b/variants/STM32F0xx/F031F(4-6)P/PeripheralPins.c
index 06ae5b65fe..d5cff27ffb 100644
--- a/variants/STM32F0xx/F031F(4-6)P/PeripheralPins.c
+++ b/variants/STM32F0xx/F031F(4-6)P/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F031F(4-6)Px.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F031F(4-6)P/variant_generic.cpp b/variants/STM32F0xx/F031F(4-6)P/variant_generic.cpp
index 1ce3507bd8..cf567af90c 100644
--- a/variants/STM32F0xx/F031F(4-6)P/variant_generic.cpp
+++ b/variants/STM32F0xx/F031F(4-6)P/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F031F(4-6)P/variant_generic.h b/variants/STM32F0xx/F031F(4-6)P/variant_generic.h
index 5918fda77b..c5ab025de6 100644
--- a/variants/STM32F0xx/F031F(4-6)P/variant_generic.h
+++ b/variants/STM32F0xx/F031F(4-6)P/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F031G(4-6)U/PeripheralPins.c b/variants/STM32F0xx/F031G(4-6)U/PeripheralPins.c
index 3cd99753b6..3c3cc6d68d 100644
--- a/variants/STM32F0xx/F031G(4-6)U/PeripheralPins.c
+++ b/variants/STM32F0xx/F031G(4-6)U/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F031G(4-6)Ux.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F031G(4-6)U/variant_generic.cpp b/variants/STM32F0xx/F031G(4-6)U/variant_generic.cpp
index e39222bad2..bddaa2f66d 100644
--- a/variants/STM32F0xx/F031G(4-6)U/variant_generic.cpp
+++ b/variants/STM32F0xx/F031G(4-6)U/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F031G(4-6)U/variant_generic.h b/variants/STM32F0xx/F031G(4-6)U/variant_generic.h
index dedc3a89c7..6670e7a36e 100644
--- a/variants/STM32F0xx/F031G(4-6)U/variant_generic.h
+++ b/variants/STM32F0xx/F031G(4-6)U/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F031K(4-6)U/PeripheralPins.c b/variants/STM32F0xx/F031K(4-6)U/PeripheralPins.c
index e488f18e88..a783a60ced 100644
--- a/variants/STM32F0xx/F031K(4-6)U/PeripheralPins.c
+++ b/variants/STM32F0xx/F031K(4-6)U/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F031K(4-6)Ux.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F031K(4-6)U/variant_generic.cpp b/variants/STM32F0xx/F031K(4-6)U/variant_generic.cpp
index 881da2b723..2f17d5a4af 100644
--- a/variants/STM32F0xx/F031K(4-6)U/variant_generic.cpp
+++ b/variants/STM32F0xx/F031K(4-6)U/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F031K(4-6)U/variant_generic.h b/variants/STM32F0xx/F031K(4-6)U/variant_generic.h
index afddf6807d..18cf303a28 100644
--- a/variants/STM32F0xx/F031K(4-6)U/variant_generic.h
+++ b/variants/STM32F0xx/F031K(4-6)U/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F031K6T/PeripheralPins.c b/variants/STM32F0xx/F031K6T/PeripheralPins.c
index 6f9384c5db..ea7774b25b 100644
--- a/variants/STM32F0xx/F031K6T/PeripheralPins.c
+++ b/variants/STM32F0xx/F031K6T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F031K6Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F031K6T/variant_generic.cpp b/variants/STM32F0xx/F031K6T/variant_generic.cpp
index ac81770c85..d391da9840 100644
--- a/variants/STM32F0xx/F031K6T/variant_generic.cpp
+++ b/variants/STM32F0xx/F031K6T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F031K6T/variant_generic.h b/variants/STM32F0xx/F031K6T/variant_generic.h
index 87173dcb5b..611c8866e6 100644
--- a/variants/STM32F0xx/F031K6T/variant_generic.h
+++ b/variants/STM32F0xx/F031K6T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F038C6T/PeripheralPins.c b/variants/STM32F0xx/F038C6T/PeripheralPins.c
index 689e0d61f9..541972e373 100644
--- a/variants/STM32F0xx/F038C6T/PeripheralPins.c
+++ b/variants/STM32F0xx/F038C6T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F038C6Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F038C6T/variant_generic.cpp b/variants/STM32F0xx/F038C6T/variant_generic.cpp
index 77a2d03cf4..d2f4df776d 100644
--- a/variants/STM32F0xx/F038C6T/variant_generic.cpp
+++ b/variants/STM32F0xx/F038C6T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F038C6T/variant_generic.h b/variants/STM32F0xx/F038C6T/variant_generic.h
index e30829b09a..51d6266199 100644
--- a/variants/STM32F0xx/F038C6T/variant_generic.h
+++ b/variants/STM32F0xx/F038C6T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F038F6P/PeripheralPins.c b/variants/STM32F0xx/F038F6P/PeripheralPins.c
index d0c8fba023..925b152fb9 100644
--- a/variants/STM32F0xx/F038F6P/PeripheralPins.c
+++ b/variants/STM32F0xx/F038F6P/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F038F6Px.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F038F6P/variant_generic.cpp b/variants/STM32F0xx/F038F6P/variant_generic.cpp
index 382ff8f8b2..2c9d7fd87e 100644
--- a/variants/STM32F0xx/F038F6P/variant_generic.cpp
+++ b/variants/STM32F0xx/F038F6P/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F038F6P/variant_generic.h b/variants/STM32F0xx/F038F6P/variant_generic.h
index f528d76c04..54427ba9e5 100644
--- a/variants/STM32F0xx/F038F6P/variant_generic.h
+++ b/variants/STM32F0xx/F038F6P/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F038G6U/PeripheralPins.c b/variants/STM32F0xx/F038G6U/PeripheralPins.c
index dcb41fc0ca..14fc591466 100644
--- a/variants/STM32F0xx/F038G6U/PeripheralPins.c
+++ b/variants/STM32F0xx/F038G6U/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F038G6Ux.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F038G6U/variant_generic.cpp b/variants/STM32F0xx/F038G6U/variant_generic.cpp
index bce53ed4ac..410c427c75 100644
--- a/variants/STM32F0xx/F038G6U/variant_generic.cpp
+++ b/variants/STM32F0xx/F038G6U/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F038G6U/variant_generic.h b/variants/STM32F0xx/F038G6U/variant_generic.h
index 091fa3d7c4..fa1dc15415 100644
--- a/variants/STM32F0xx/F038G6U/variant_generic.h
+++ b/variants/STM32F0xx/F038G6U/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F038K6U/PeripheralPins.c b/variants/STM32F0xx/F038K6U/PeripheralPins.c
index ecdd2ad56e..dc50522c58 100644
--- a/variants/STM32F0xx/F038K6U/PeripheralPins.c
+++ b/variants/STM32F0xx/F038K6U/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F038K6Ux.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F038K6U/variant_generic.cpp b/variants/STM32F0xx/F038K6U/variant_generic.cpp
index 2f1ad2b132..be77bc39c1 100644
--- a/variants/STM32F0xx/F038K6U/variant_generic.cpp
+++ b/variants/STM32F0xx/F038K6U/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F038K6U/variant_generic.h b/variants/STM32F0xx/F038K6U/variant_generic.h
index 6c0cc3702c..1f812dd3ec 100644
--- a/variants/STM32F0xx/F038K6U/variant_generic.h
+++ b/variants/STM32F0xx/F038K6U/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F042C(4-6)(T-U)/PeripheralPins.c b/variants/STM32F0xx/F042C(4-6)(T-U)/PeripheralPins.c
index f3195fb3f3..b97856b8b5 100644
--- a/variants/STM32F0xx/F042C(4-6)(T-U)/PeripheralPins.c
+++ b/variants/STM32F0xx/F042C(4-6)(T-U)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F042C(4-6)Tx.xml, STM32F042C(4-6)Ux.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F042C(4-6)(T-U)/variant_generic.cpp b/variants/STM32F0xx/F042C(4-6)(T-U)/variant_generic.cpp
index 70678f1942..64e0d1c4d6 100644
--- a/variants/STM32F0xx/F042C(4-6)(T-U)/variant_generic.cpp
+++ b/variants/STM32F0xx/F042C(4-6)(T-U)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F042C(4-6)(T-U)/variant_generic.h b/variants/STM32F0xx/F042C(4-6)(T-U)/variant_generic.h
index 0936e8c5eb..853d2722bb 100644
--- a/variants/STM32F0xx/F042C(4-6)(T-U)/variant_generic.h
+++ b/variants/STM32F0xx/F042C(4-6)(T-U)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F042F(4-6)P/PeripheralPins.c b/variants/STM32F0xx/F042F(4-6)P/PeripheralPins.c
index 3308c67274..52fe6e3f46 100644
--- a/variants/STM32F0xx/F042F(4-6)P/PeripheralPins.c
+++ b/variants/STM32F0xx/F042F(4-6)P/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F042F4Px.xml, STM32F042F6Px.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F042F(4-6)P/variant_generic.cpp b/variants/STM32F0xx/F042F(4-6)P/variant_generic.cpp
index ab140ddc01..56d5e6882b 100644
--- a/variants/STM32F0xx/F042F(4-6)P/variant_generic.cpp
+++ b/variants/STM32F0xx/F042F(4-6)P/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F042F(4-6)P/variant_generic.h b/variants/STM32F0xx/F042F(4-6)P/variant_generic.h
index 2f24aeca19..9d812ba90f 100644
--- a/variants/STM32F0xx/F042F(4-6)P/variant_generic.h
+++ b/variants/STM32F0xx/F042F(4-6)P/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F042G(4-6)U/PeripheralPins.c b/variants/STM32F0xx/F042G(4-6)U/PeripheralPins.c
index e412a16df8..3df3198ab7 100644
--- a/variants/STM32F0xx/F042G(4-6)U/PeripheralPins.c
+++ b/variants/STM32F0xx/F042G(4-6)U/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F042G(4-6)Ux.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F042G(4-6)U/variant_generic.cpp b/variants/STM32F0xx/F042G(4-6)U/variant_generic.cpp
index 17b81e957f..8357ef995a 100644
--- a/variants/STM32F0xx/F042G(4-6)U/variant_generic.cpp
+++ b/variants/STM32F0xx/F042G(4-6)U/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F042G(4-6)U/variant_generic.h b/variants/STM32F0xx/F042G(4-6)U/variant_generic.h
index 381736a516..870d7f9f88 100644
--- a/variants/STM32F0xx/F042G(4-6)U/variant_generic.h
+++ b/variants/STM32F0xx/F042G(4-6)U/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F042K(4-6)T/PeripheralPins.c b/variants/STM32F0xx/F042K(4-6)T/PeripheralPins.c
index 7739c6efcb..5160a37e52 100644
--- a/variants/STM32F0xx/F042K(4-6)T/PeripheralPins.c
+++ b/variants/STM32F0xx/F042K(4-6)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F042K(4-6)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F042K(4-6)T/variant_generic.cpp b/variants/STM32F0xx/F042K(4-6)T/variant_generic.cpp
index d12159a5cb..ddc6a31129 100644
--- a/variants/STM32F0xx/F042K(4-6)T/variant_generic.cpp
+++ b/variants/STM32F0xx/F042K(4-6)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F042K(4-6)T/variant_generic.h b/variants/STM32F0xx/F042K(4-6)T/variant_generic.h
index 27093f6d00..423f1d81f8 100644
--- a/variants/STM32F0xx/F042K(4-6)T/variant_generic.h
+++ b/variants/STM32F0xx/F042K(4-6)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F042K(4-6)U/PeripheralPins.c b/variants/STM32F0xx/F042K(4-6)U/PeripheralPins.c
index 39280f5645..a4e8689cc8 100644
--- a/variants/STM32F0xx/F042K(4-6)U/PeripheralPins.c
+++ b/variants/STM32F0xx/F042K(4-6)U/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F042K(4-6)Ux.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F042K(4-6)U/variant_generic.cpp b/variants/STM32F0xx/F042K(4-6)U/variant_generic.cpp
index 9dba385f45..73ed76adf1 100644
--- a/variants/STM32F0xx/F042K(4-6)U/variant_generic.cpp
+++ b/variants/STM32F0xx/F042K(4-6)U/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F042K(4-6)U/variant_generic.h b/variants/STM32F0xx/F042K(4-6)U/variant_generic.h
index 4ab75a46d3..5fdf957d71 100644
--- a/variants/STM32F0xx/F042K(4-6)U/variant_generic.h
+++ b/variants/STM32F0xx/F042K(4-6)U/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F042T6Y/PeripheralPins.c b/variants/STM32F0xx/F042T6Y/PeripheralPins.c
index 943a282f8b..924fd805a3 100644
--- a/variants/STM32F0xx/F042T6Y/PeripheralPins.c
+++ b/variants/STM32F0xx/F042T6Y/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F042T6Yx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F042T6Y/variant_generic.cpp b/variants/STM32F0xx/F042T6Y/variant_generic.cpp
index fd98930d83..408b3e9716 100644
--- a/variants/STM32F0xx/F042T6Y/variant_generic.cpp
+++ b/variants/STM32F0xx/F042T6Y/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F042T6Y/variant_generic.h b/variants/STM32F0xx/F042T6Y/variant_generic.h
index 4c882c3fc3..5966d7565c 100644
--- a/variants/STM32F0xx/F042T6Y/variant_generic.h
+++ b/variants/STM32F0xx/F042T6Y/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F048C6U/PeripheralPins.c b/variants/STM32F0xx/F048C6U/PeripheralPins.c
index 949155c974..537a56156a 100644
--- a/variants/STM32F0xx/F048C6U/PeripheralPins.c
+++ b/variants/STM32F0xx/F048C6U/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F048C6Ux.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F048C6U/variant_generic.cpp b/variants/STM32F0xx/F048C6U/variant_generic.cpp
index 9139cb14a9..567573e1de 100644
--- a/variants/STM32F0xx/F048C6U/variant_generic.cpp
+++ b/variants/STM32F0xx/F048C6U/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F048C6U/variant_generic.h b/variants/STM32F0xx/F048C6U/variant_generic.h
index 02768c6745..4b52b38fd1 100644
--- a/variants/STM32F0xx/F048C6U/variant_generic.h
+++ b/variants/STM32F0xx/F048C6U/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F048G6U/PeripheralPins.c b/variants/STM32F0xx/F048G6U/PeripheralPins.c
index 8c4bcc3827..113ef44220 100644
--- a/variants/STM32F0xx/F048G6U/PeripheralPins.c
+++ b/variants/STM32F0xx/F048G6U/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F048G6Ux.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F048G6U/variant_generic.cpp b/variants/STM32F0xx/F048G6U/variant_generic.cpp
index 1035476e3e..fec9c1412e 100644
--- a/variants/STM32F0xx/F048G6U/variant_generic.cpp
+++ b/variants/STM32F0xx/F048G6U/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F048G6U/variant_generic.h b/variants/STM32F0xx/F048G6U/variant_generic.h
index 2cb83af309..186dc2d5ef 100644
--- a/variants/STM32F0xx/F048G6U/variant_generic.h
+++ b/variants/STM32F0xx/F048G6U/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F048T6Y/PeripheralPins.c b/variants/STM32F0xx/F048T6Y/PeripheralPins.c
index 176ae106dd..1f0c2c85fd 100644
--- a/variants/STM32F0xx/F048T6Y/PeripheralPins.c
+++ b/variants/STM32F0xx/F048T6Y/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F048T6Yx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F048T6Y/variant_generic.cpp b/variants/STM32F0xx/F048T6Y/variant_generic.cpp
index d6b6118985..b096b556b6 100644
--- a/variants/STM32F0xx/F048T6Y/variant_generic.cpp
+++ b/variants/STM32F0xx/F048T6Y/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F048T6Y/variant_generic.h b/variants/STM32F0xx/F048T6Y/variant_generic.h
index 54c3746699..03e568f354 100644
--- a/variants/STM32F0xx/F048T6Y/variant_generic.h
+++ b/variants/STM32F0xx/F048T6Y/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F051C4(T-U)/PeripheralPins.c b/variants/STM32F0xx/F051C4(T-U)/PeripheralPins.c
index 917b27bec0..5504807982 100644
--- a/variants/STM32F0xx/F051C4(T-U)/PeripheralPins.c
+++ b/variants/STM32F0xx/F051C4(T-U)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F051C4Tx.xml, STM32F051C4Ux.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F051C4(T-U)/variant_generic.cpp b/variants/STM32F0xx/F051C4(T-U)/variant_generic.cpp
index a62cdd8eaa..1cfdb0c6d0 100644
--- a/variants/STM32F0xx/F051C4(T-U)/variant_generic.cpp
+++ b/variants/STM32F0xx/F051C4(T-U)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F051C4(T-U)/variant_generic.h b/variants/STM32F0xx/F051C4(T-U)/variant_generic.h
index ba26db9127..3720309f3e 100644
--- a/variants/STM32F0xx/F051C4(T-U)/variant_generic.h
+++ b/variants/STM32F0xx/F051C4(T-U)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F051C6(T-U)/PeripheralPins.c b/variants/STM32F0xx/F051C6(T-U)/PeripheralPins.c
index a55a0bdbc9..f163f7073a 100644
--- a/variants/STM32F0xx/F051C6(T-U)/PeripheralPins.c
+++ b/variants/STM32F0xx/F051C6(T-U)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F051C6Tx.xml, STM32F051C6Ux.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F051C6(T-U)/variant_generic.cpp b/variants/STM32F0xx/F051C6(T-U)/variant_generic.cpp
index fadec6997f..e1dfa63362 100644
--- a/variants/STM32F0xx/F051C6(T-U)/variant_generic.cpp
+++ b/variants/STM32F0xx/F051C6(T-U)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F051C6(T-U)/variant_generic.h b/variants/STM32F0xx/F051C6(T-U)/variant_generic.h
index 236885a4f9..519e8476c8 100644
--- a/variants/STM32F0xx/F051C6(T-U)/variant_generic.h
+++ b/variants/STM32F0xx/F051C6(T-U)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F051C8(T-U)/PeripheralPins.c b/variants/STM32F0xx/F051C8(T-U)/PeripheralPins.c
index 239a9e112d..5cab93071e 100644
--- a/variants/STM32F0xx/F051C8(T-U)/PeripheralPins.c
+++ b/variants/STM32F0xx/F051C8(T-U)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32F051C8Tx.xml, STM32F051C8Ux.xml
  * STM32F058C8Ux.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F051C8(T-U)/variant_generic.cpp b/variants/STM32F0xx/F051C8(T-U)/variant_generic.cpp
index fc2bdd8417..0ed2ca29db 100644
--- a/variants/STM32F0xx/F051C8(T-U)/variant_generic.cpp
+++ b/variants/STM32F0xx/F051C8(T-U)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F051C8(T-U)/variant_generic.h b/variants/STM32F0xx/F051C8(T-U)/variant_generic.h
index 236885a4f9..519e8476c8 100644
--- a/variants/STM32F0xx/F051C8(T-U)/variant_generic.h
+++ b/variants/STM32F0xx/F051C8(T-U)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F051K(6-8)T/PeripheralPins.c b/variants/STM32F0xx/F051K(6-8)T/PeripheralPins.c
index 1bdd47b9dc..fd2e99c10f 100644
--- a/variants/STM32F0xx/F051K(6-8)T/PeripheralPins.c
+++ b/variants/STM32F0xx/F051K(6-8)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32F051K6Tx.xml, STM32F051K8Tx.xml
  * STM32F051T8Yx.xml, STM32F058T8Yx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F051K(6-8)T/variant_generic.cpp b/variants/STM32F0xx/F051K(6-8)T/variant_generic.cpp
index 5f1a346d09..f04329b291 100644
--- a/variants/STM32F0xx/F051K(6-8)T/variant_generic.cpp
+++ b/variants/STM32F0xx/F051K(6-8)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F051K(6-8)T/variant_generic.h b/variants/STM32F0xx/F051K(6-8)T/variant_generic.h
index 47019a05da..0a8809988e 100644
--- a/variants/STM32F0xx/F051K(6-8)T/variant_generic.h
+++ b/variants/STM32F0xx/F051K(6-8)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F051K(6-8)U/PeripheralPins.c b/variants/STM32F0xx/F051K(6-8)U/PeripheralPins.c
index 0212c9d681..e3e326ef1d 100644
--- a/variants/STM32F0xx/F051K(6-8)U/PeripheralPins.c
+++ b/variants/STM32F0xx/F051K(6-8)U/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F051K6Ux.xml, STM32F051K8Ux.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F051K(6-8)U/variant_generic.cpp b/variants/STM32F0xx/F051K(6-8)U/variant_generic.cpp
index 5601e43a5d..aba2d4a1c9 100644
--- a/variants/STM32F0xx/F051K(6-8)U/variant_generic.cpp
+++ b/variants/STM32F0xx/F051K(6-8)U/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F051K(6-8)U/variant_generic.h b/variants/STM32F0xx/F051K(6-8)U/variant_generic.h
index 4455e4b0df..967ea103cb 100644
--- a/variants/STM32F0xx/F051K(6-8)U/variant_generic.h
+++ b/variants/STM32F0xx/F051K(6-8)U/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F051K4T/PeripheralPins.c b/variants/STM32F0xx/F051K4T/PeripheralPins.c
index 4407035dff..4193f7a106 100644
--- a/variants/STM32F0xx/F051K4T/PeripheralPins.c
+++ b/variants/STM32F0xx/F051K4T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F051K4Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F051K4T/variant_generic.cpp b/variants/STM32F0xx/F051K4T/variant_generic.cpp
index e729d1bf27..4843c12283 100644
--- a/variants/STM32F0xx/F051K4T/variant_generic.cpp
+++ b/variants/STM32F0xx/F051K4T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F051K4T/variant_generic.h b/variants/STM32F0xx/F051K4T/variant_generic.h
index c3d36bfbfa..7149f73627 100644
--- a/variants/STM32F0xx/F051K4T/variant_generic.h
+++ b/variants/STM32F0xx/F051K4T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F051K4U/PeripheralPins.c b/variants/STM32F0xx/F051K4U/PeripheralPins.c
index 0433543108..49b263da1b 100644
--- a/variants/STM32F0xx/F051K4U/PeripheralPins.c
+++ b/variants/STM32F0xx/F051K4U/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F051K4Ux.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F051K4U/variant_generic.cpp b/variants/STM32F0xx/F051K4U/variant_generic.cpp
index 69bacdf1a0..b0a38fb15c 100644
--- a/variants/STM32F0xx/F051K4U/variant_generic.cpp
+++ b/variants/STM32F0xx/F051K4U/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F051K4U/variant_generic.h b/variants/STM32F0xx/F051K4U/variant_generic.h
index 1199c253a4..d86b8023d5 100644
--- a/variants/STM32F0xx/F051K4U/variant_generic.h
+++ b/variants/STM32F0xx/F051K4U/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F051R4T/PeripheralPins.c b/variants/STM32F0xx/F051R4T/PeripheralPins.c
index df39e3a6ad..3b0ee17687 100644
--- a/variants/STM32F0xx/F051R4T/PeripheralPins.c
+++ b/variants/STM32F0xx/F051R4T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F051R4Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F051R4T/variant_generic.cpp b/variants/STM32F0xx/F051R4T/variant_generic.cpp
index eaecbb02ee..061c9434e9 100644
--- a/variants/STM32F0xx/F051R4T/variant_generic.cpp
+++ b/variants/STM32F0xx/F051R4T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F051R4T/variant_generic.h b/variants/STM32F0xx/F051R4T/variant_generic.h
index f3e2fe7bbb..58ae8e7e88 100644
--- a/variants/STM32F0xx/F051R4T/variant_generic.h
+++ b/variants/STM32F0xx/F051R4T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F051R6T/PeripheralPins.c b/variants/STM32F0xx/F051R6T/PeripheralPins.c
index 2d0009c91b..a640bc28aa 100644
--- a/variants/STM32F0xx/F051R6T/PeripheralPins.c
+++ b/variants/STM32F0xx/F051R6T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F051R6Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F051R6T/variant_generic.cpp b/variants/STM32F0xx/F051R6T/variant_generic.cpp
index b73703d6d3..8933b762a5 100644
--- a/variants/STM32F0xx/F051R6T/variant_generic.cpp
+++ b/variants/STM32F0xx/F051R6T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F051R6T/variant_generic.h b/variants/STM32F0xx/F051R6T/variant_generic.h
index 76448f4816..f6042f6424 100644
--- a/variants/STM32F0xx/F051R6T/variant_generic.h
+++ b/variants/STM32F0xx/F051R6T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F051R8(H-T)/PeripheralPins.c b/variants/STM32F0xx/F051R8(H-T)/PeripheralPins.c
index a13ccbeec9..c1a27d3a07 100644
--- a/variants/STM32F0xx/F051R8(H-T)/PeripheralPins.c
+++ b/variants/STM32F0xx/F051R8(H-T)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32F051R8Hx.xml, STM32F051R8Tx.xml
  * STM32F058R8Hx.xml, STM32F058R8Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F051R8(H-T)/variant_generic.cpp b/variants/STM32F0xx/F051R8(H-T)/variant_generic.cpp
index 69fb10d141..852faf75a7 100644
--- a/variants/STM32F0xx/F051R8(H-T)/variant_generic.cpp
+++ b/variants/STM32F0xx/F051R8(H-T)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F051R8(H-T)/variant_generic.h b/variants/STM32F0xx/F051R8(H-T)/variant_generic.h
index 76448f4816..f6042f6424 100644
--- a/variants/STM32F0xx/F051R8(H-T)/variant_generic.h
+++ b/variants/STM32F0xx/F051R8(H-T)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F051T8Y/PeripheralPins.c b/variants/STM32F0xx/F051T8Y/PeripheralPins.c
index a05b122998..45194190de 100644
--- a/variants/STM32F0xx/F051T8Y/PeripheralPins.c
+++ b/variants/STM32F0xx/F051T8Y/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F051T8Yx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F051T8Y/variant_generic.cpp b/variants/STM32F0xx/F051T8Y/variant_generic.cpp
index a4bf744f35..74172d39b1 100644
--- a/variants/STM32F0xx/F051T8Y/variant_generic.cpp
+++ b/variants/STM32F0xx/F051T8Y/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F051T8Y/variant_generic.h b/variants/STM32F0xx/F051T8Y/variant_generic.h
index c144e2ea34..5c6e1793ce 100644
--- a/variants/STM32F0xx/F051T8Y/variant_generic.h
+++ b/variants/STM32F0xx/F051T8Y/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F058C8U/PeripheralPins.c b/variants/STM32F0xx/F058C8U/PeripheralPins.c
index 52cd15c75c..97577c51d2 100644
--- a/variants/STM32F0xx/F058C8U/PeripheralPins.c
+++ b/variants/STM32F0xx/F058C8U/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F058C8Ux.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F058C8U/variant_generic.cpp b/variants/STM32F0xx/F058C8U/variant_generic.cpp
index ed1ad7ee51..c223cf24c4 100644
--- a/variants/STM32F0xx/F058C8U/variant_generic.cpp
+++ b/variants/STM32F0xx/F058C8U/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F058C8U/variant_generic.h b/variants/STM32F0xx/F058C8U/variant_generic.h
index e537df4132..b25874a49b 100644
--- a/variants/STM32F0xx/F058C8U/variant_generic.h
+++ b/variants/STM32F0xx/F058C8U/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F058R8(H-T)/PeripheralPins.c b/variants/STM32F0xx/F058R8(H-T)/PeripheralPins.c
index 064c377392..68d99fc0a5 100644
--- a/variants/STM32F0xx/F058R8(H-T)/PeripheralPins.c
+++ b/variants/STM32F0xx/F058R8(H-T)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F058R8Hx.xml, STM32F058R8Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F058R8(H-T)/variant_generic.cpp b/variants/STM32F0xx/F058R8(H-T)/variant_generic.cpp
index da86a0fd30..2e180fe9cd 100644
--- a/variants/STM32F0xx/F058R8(H-T)/variant_generic.cpp
+++ b/variants/STM32F0xx/F058R8(H-T)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F058R8(H-T)/variant_generic.h b/variants/STM32F0xx/F058R8(H-T)/variant_generic.h
index fbc69c8870..0c8c1d7986 100644
--- a/variants/STM32F0xx/F058R8(H-T)/variant_generic.h
+++ b/variants/STM32F0xx/F058R8(H-T)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F058T8Y/PeripheralPins.c b/variants/STM32F0xx/F058T8Y/PeripheralPins.c
index 83f9078dd0..d5c0a91994 100644
--- a/variants/STM32F0xx/F058T8Y/PeripheralPins.c
+++ b/variants/STM32F0xx/F058T8Y/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F058T8Yx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F058T8Y/variant_generic.cpp b/variants/STM32F0xx/F058T8Y/variant_generic.cpp
index 93e854ed5d..4351199233 100644
--- a/variants/STM32F0xx/F058T8Y/variant_generic.cpp
+++ b/variants/STM32F0xx/F058T8Y/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F058T8Y/variant_generic.h b/variants/STM32F0xx/F058T8Y/variant_generic.h
index 050c717edd..55ab9817fe 100644
--- a/variants/STM32F0xx/F058T8Y/variant_generic.h
+++ b/variants/STM32F0xx/F058T8Y/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F070C6T/PeripheralPins.c b/variants/STM32F0xx/F070C6T/PeripheralPins.c
index 83920fde95..f92b195678 100644
--- a/variants/STM32F0xx/F070C6T/PeripheralPins.c
+++ b/variants/STM32F0xx/F070C6T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F070C6Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F070C6T/variant_generic.cpp b/variants/STM32F0xx/F070C6T/variant_generic.cpp
index 043b22467c..9f7b814051 100644
--- a/variants/STM32F0xx/F070C6T/variant_generic.cpp
+++ b/variants/STM32F0xx/F070C6T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F070C6T/variant_generic.h b/variants/STM32F0xx/F070C6T/variant_generic.h
index 1d61133e3a..9aef93426a 100644
--- a/variants/STM32F0xx/F070C6T/variant_generic.h
+++ b/variants/STM32F0xx/F070C6T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F070CBT/PeripheralPins.c b/variants/STM32F0xx/F070CBT/PeripheralPins.c
index 30e83d7b75..4cd05aeb1e 100644
--- a/variants/STM32F0xx/F070CBT/PeripheralPins.c
+++ b/variants/STM32F0xx/F070CBT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F070CBTx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F070CBT/variant_generic.cpp b/variants/STM32F0xx/F070CBT/variant_generic.cpp
index 9e4ddd6b6f..c4e0633aa3 100644
--- a/variants/STM32F0xx/F070CBT/variant_generic.cpp
+++ b/variants/STM32F0xx/F070CBT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F070CBT/variant_generic.h b/variants/STM32F0xx/F070CBT/variant_generic.h
index 6d0ed7f080..f08a28a48d 100644
--- a/variants/STM32F0xx/F070CBT/variant_generic.h
+++ b/variants/STM32F0xx/F070CBT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F070F6P/PeripheralPins.c b/variants/STM32F0xx/F070F6P/PeripheralPins.c
index da33563da3..1b7792b2ff 100644
--- a/variants/STM32F0xx/F070F6P/PeripheralPins.c
+++ b/variants/STM32F0xx/F070F6P/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F070F6Px.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F070F6P/variant_generic.cpp b/variants/STM32F0xx/F070F6P/variant_generic.cpp
index 8b04879e2e..6b46653118 100644
--- a/variants/STM32F0xx/F070F6P/variant_generic.cpp
+++ b/variants/STM32F0xx/F070F6P/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F070F6P/variant_generic.h b/variants/STM32F0xx/F070F6P/variant_generic.h
index a48f420b1f..c51b7ecb11 100644
--- a/variants/STM32F0xx/F070F6P/variant_generic.h
+++ b/variants/STM32F0xx/F070F6P/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F070RBT/PeripheralPins.c b/variants/STM32F0xx/F070RBT/PeripheralPins.c
index 49655df5ab..476c82715a 100644
--- a/variants/STM32F0xx/F070RBT/PeripheralPins.c
+++ b/variants/STM32F0xx/F070RBT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F070RBTx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F070RBT/variant_generic.cpp b/variants/STM32F0xx/F070RBT/variant_generic.cpp
index 6b144d4064..04d15af276 100644
--- a/variants/STM32F0xx/F070RBT/variant_generic.cpp
+++ b/variants/STM32F0xx/F070RBT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F070RBT/variant_generic.h b/variants/STM32F0xx/F070RBT/variant_generic.h
index 1df340d5e7..c9b3da9363 100644
--- a/variants/STM32F0xx/F070RBT/variant_generic.h
+++ b/variants/STM32F0xx/F070RBT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F071C8(T-U)_F071CB(T-U-Y)/PeripheralPins.c b/variants/STM32F0xx/F071C8(T-U)_F071CB(T-U-Y)/PeripheralPins.c
index bf22620882..8b4470e40a 100644
--- a/variants/STM32F0xx/F071C8(T-U)_F071CB(T-U-Y)/PeripheralPins.c
+++ b/variants/STM32F0xx/F071C8(T-U)_F071CB(T-U-Y)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32F071C(8-B)Tx.xml, STM32F071C(8-B)Ux.xml
  * STM32F071CBYx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F071C8(T-U)_F071CB(T-U-Y)/variant_generic.cpp b/variants/STM32F0xx/F071C8(T-U)_F071CB(T-U-Y)/variant_generic.cpp
index a9fc89303d..f81afcd4f3 100644
--- a/variants/STM32F0xx/F071C8(T-U)_F071CB(T-U-Y)/variant_generic.cpp
+++ b/variants/STM32F0xx/F071C8(T-U)_F071CB(T-U-Y)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F071C8(T-U)_F071CB(T-U-Y)/variant_generic.h b/variants/STM32F0xx/F071C8(T-U)_F071CB(T-U-Y)/variant_generic.h
index 982893c2d4..33f891da31 100644
--- a/variants/STM32F0xx/F071C8(T-U)_F071CB(T-U-Y)/variant_generic.h
+++ b/variants/STM32F0xx/F071C8(T-U)_F071CB(T-U-Y)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F071RBT/PeripheralPins.c b/variants/STM32F0xx/F071RBT/PeripheralPins.c
index 549d5e581c..e0f8b58bb6 100644
--- a/variants/STM32F0xx/F071RBT/PeripheralPins.c
+++ b/variants/STM32F0xx/F071RBT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F071RBTx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F071RBT/variant_generic.cpp b/variants/STM32F0xx/F071RBT/variant_generic.cpp
index dfcc4f467a..639ecd89e9 100644
--- a/variants/STM32F0xx/F071RBT/variant_generic.cpp
+++ b/variants/STM32F0xx/F071RBT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F071RBT/variant_generic.h b/variants/STM32F0xx/F071RBT/variant_generic.h
index f8125b2430..ae3623d25c 100644
--- a/variants/STM32F0xx/F071RBT/variant_generic.h
+++ b/variants/STM32F0xx/F071RBT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F071V(8-B)(H-T)/PeripheralPins.c b/variants/STM32F0xx/F071V(8-B)(H-T)/PeripheralPins.c
index 71db674a28..cf6b1eb2c0 100644
--- a/variants/STM32F0xx/F071V(8-B)(H-T)/PeripheralPins.c
+++ b/variants/STM32F0xx/F071V(8-B)(H-T)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F071V(8-B)Hx.xml, STM32F071V(8-B)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F071V(8-B)(H-T)/variant_generic.cpp b/variants/STM32F0xx/F071V(8-B)(H-T)/variant_generic.cpp
index dc77ff36c6..d4b66502dc 100644
--- a/variants/STM32F0xx/F071V(8-B)(H-T)/variant_generic.cpp
+++ b/variants/STM32F0xx/F071V(8-B)(H-T)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F071V(8-B)(H-T)/variant_generic.h b/variants/STM32F0xx/F071V(8-B)(H-T)/variant_generic.h
index 4690b938e7..3988171ce7 100644
--- a/variants/STM32F0xx/F071V(8-B)(H-T)/variant_generic.h
+++ b/variants/STM32F0xx/F071V(8-B)(H-T)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F072C8(T-U)_F072CB(T-U-Y)/PeripheralPins.c b/variants/STM32F0xx/F072C8(T-U)_F072CB(T-U-Y)/PeripheralPins.c
index 70c61f0cc3..6dc0ca6091 100644
--- a/variants/STM32F0xx/F072C8(T-U)_F072CB(T-U-Y)/PeripheralPins.c
+++ b/variants/STM32F0xx/F072C8(T-U)_F072CB(T-U-Y)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32F072C(8-B)Tx.xml, STM32F072C(8-B)Ux.xml
  * STM32F072CBYx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F072C8(T-U)_F072CB(T-U-Y)/variant_generic.cpp b/variants/STM32F0xx/F072C8(T-U)_F072CB(T-U-Y)/variant_generic.cpp
index 3200715386..5185bd9ddb 100644
--- a/variants/STM32F0xx/F072C8(T-U)_F072CB(T-U-Y)/variant_generic.cpp
+++ b/variants/STM32F0xx/F072C8(T-U)_F072CB(T-U-Y)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F072C8(T-U)_F072CB(T-U-Y)/variant_generic.h b/variants/STM32F0xx/F072C8(T-U)_F072CB(T-U-Y)/variant_generic.h
index 982893c2d4..33f891da31 100644
--- a/variants/STM32F0xx/F072C8(T-U)_F072CB(T-U-Y)/variant_generic.h
+++ b/variants/STM32F0xx/F072C8(T-U)_F072CB(T-U-Y)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F072R8T_F072RB(H-I-T)/PeripheralPins.c b/variants/STM32F0xx/F072R8T_F072RB(H-I-T)/PeripheralPins.c
index a2a6217514..84ba6dcb58 100644
--- a/variants/STM32F0xx/F072R8T_F072RB(H-I-T)/PeripheralPins.c
+++ b/variants/STM32F0xx/F072R8T_F072RB(H-I-T)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32F072R(8-B)Tx.xml, STM32F072RBHx.xml
  * STM32F072RBIx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F072R8T_F072RB(H-I-T)/variant_generic.cpp b/variants/STM32F0xx/F072R8T_F072RB(H-I-T)/variant_generic.cpp
index bf5fdaf8e0..1290ba4009 100644
--- a/variants/STM32F0xx/F072R8T_F072RB(H-I-T)/variant_generic.cpp
+++ b/variants/STM32F0xx/F072R8T_F072RB(H-I-T)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F072R8T_F072RB(H-I-T)/variant_generic.h b/variants/STM32F0xx/F072R8T_F072RB(H-I-T)/variant_generic.h
index f8125b2430..ae3623d25c 100644
--- a/variants/STM32F0xx/F072R8T_F072RB(H-I-T)/variant_generic.h
+++ b/variants/STM32F0xx/F072R8T_F072RB(H-I-T)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F072V(8-B)(H-T)/PeripheralPins.c b/variants/STM32F0xx/F072V(8-B)(H-T)/PeripheralPins.c
index 72b3a1ee9e..1e5454d6a6 100644
--- a/variants/STM32F0xx/F072V(8-B)(H-T)/PeripheralPins.c
+++ b/variants/STM32F0xx/F072V(8-B)(H-T)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F072V(8-B)Hx.xml, STM32F072V(8-B)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F072V(8-B)(H-T)/variant_generic.cpp b/variants/STM32F0xx/F072V(8-B)(H-T)/variant_generic.cpp
index 08a2a777d6..e4435e5e09 100644
--- a/variants/STM32F0xx/F072V(8-B)(H-T)/variant_generic.cpp
+++ b/variants/STM32F0xx/F072V(8-B)(H-T)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F072V(8-B)(H-T)/variant_generic.h b/variants/STM32F0xx/F072V(8-B)(H-T)/variant_generic.h
index 4690b938e7..3988171ce7 100644
--- a/variants/STM32F0xx/F072V(8-B)(H-T)/variant_generic.h
+++ b/variants/STM32F0xx/F072V(8-B)(H-T)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F078CB(T-U-Y)/PeripheralPins.c b/variants/STM32F0xx/F078CB(T-U-Y)/PeripheralPins.c
index 64e830c644..ee9f52f430 100644
--- a/variants/STM32F0xx/F078CB(T-U-Y)/PeripheralPins.c
+++ b/variants/STM32F0xx/F078CB(T-U-Y)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32F078CBTx.xml, STM32F078CBUx.xml
  * STM32F078CBYx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F078CB(T-U-Y)/variant_generic.cpp b/variants/STM32F0xx/F078CB(T-U-Y)/variant_generic.cpp
index 6b193428b6..ce675af64f 100644
--- a/variants/STM32F0xx/F078CB(T-U-Y)/variant_generic.cpp
+++ b/variants/STM32F0xx/F078CB(T-U-Y)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F078CB(T-U-Y)/variant_generic.h b/variants/STM32F0xx/F078CB(T-U-Y)/variant_generic.h
index 093479631f..a39a27bb51 100644
--- a/variants/STM32F0xx/F078CB(T-U-Y)/variant_generic.h
+++ b/variants/STM32F0xx/F078CB(T-U-Y)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F078RB(H-T)/PeripheralPins.c b/variants/STM32F0xx/F078RB(H-T)/PeripheralPins.c
index 955aef6f6b..198ed61f26 100644
--- a/variants/STM32F0xx/F078RB(H-T)/PeripheralPins.c
+++ b/variants/STM32F0xx/F078RB(H-T)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F078RBHx.xml, STM32F078RBTx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F078RB(H-T)/variant_generic.cpp b/variants/STM32F0xx/F078RB(H-T)/variant_generic.cpp
index 6aa427d5e3..03bebaa88b 100644
--- a/variants/STM32F0xx/F078RB(H-T)/variant_generic.cpp
+++ b/variants/STM32F0xx/F078RB(H-T)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F078RB(H-T)/variant_generic.h b/variants/STM32F0xx/F078RB(H-T)/variant_generic.h
index f106940013..a2d544542c 100644
--- a/variants/STM32F0xx/F078RB(H-T)/variant_generic.h
+++ b/variants/STM32F0xx/F078RB(H-T)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F078VB(H-T)/PeripheralPins.c b/variants/STM32F0xx/F078VB(H-T)/PeripheralPins.c
index 9168d272b8..0a9829b5d8 100644
--- a/variants/STM32F0xx/F078VB(H-T)/PeripheralPins.c
+++ b/variants/STM32F0xx/F078VB(H-T)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F078VBHx.xml, STM32F078VBTx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F078VB(H-T)/variant_generic.cpp b/variants/STM32F0xx/F078VB(H-T)/variant_generic.cpp
index a3ef54d5e4..bd91fc9ebd 100644
--- a/variants/STM32F0xx/F078VB(H-T)/variant_generic.cpp
+++ b/variants/STM32F0xx/F078VB(H-T)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F078VB(H-T)/variant_generic.h b/variants/STM32F0xx/F078VB(H-T)/variant_generic.h
index eb8347ced0..2178c93d81 100644
--- a/variants/STM32F0xx/F078VB(H-T)/variant_generic.h
+++ b/variants/STM32F0xx/F078VB(H-T)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F091C(B-C)(T-U)/PeripheralPins.c b/variants/STM32F0xx/F091C(B-C)(T-U)/PeripheralPins.c
index 26aec60c41..83185a9947 100644
--- a/variants/STM32F0xx/F091C(B-C)(T-U)/PeripheralPins.c
+++ b/variants/STM32F0xx/F091C(B-C)(T-U)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32F091C(B-C)Tx.xml, STM32F091C(B-C)Ux.xml
  * STM32F098CCTx.xml, STM32F098CCUx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F091C(B-C)(T-U)/variant_generic.cpp b/variants/STM32F0xx/F091C(B-C)(T-U)/variant_generic.cpp
index 545f50c2d8..62e6415e90 100644
--- a/variants/STM32F0xx/F091C(B-C)(T-U)/variant_generic.cpp
+++ b/variants/STM32F0xx/F091C(B-C)(T-U)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F091C(B-C)(T-U)/variant_generic.h b/variants/STM32F0xx/F091C(B-C)(T-U)/variant_generic.h
index e09bb9ae99..3367f1180b 100644
--- a/variants/STM32F0xx/F091C(B-C)(T-U)/variant_generic.h
+++ b/variants/STM32F0xx/F091C(B-C)(T-U)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F091RBT_F091RC(H-T-Y)/PeripheralPins.c b/variants/STM32F0xx/F091RBT_F091RC(H-T-Y)/PeripheralPins.c
index 7618e3ea89..05b238b739 100644
--- a/variants/STM32F0xx/F091RBT_F091RC(H-T-Y)/PeripheralPins.c
+++ b/variants/STM32F0xx/F091RBT_F091RC(H-T-Y)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -14,7 +14,7 @@
  * Automatically generated from STM32F091R(B-C)Tx.xml, STM32F091RCHx.xml
  * STM32F091RCYx.xml, STM32F098RCHx.xml
  * STM32F098RCTx.xml, STM32F098RCYx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F091RBT_F091RC(H-T-Y)/variant_generic.cpp b/variants/STM32F0xx/F091RBT_F091RC(H-T-Y)/variant_generic.cpp
index fb10ea1ab6..791801ac5f 100644
--- a/variants/STM32F0xx/F091RBT_F091RC(H-T-Y)/variant_generic.cpp
+++ b/variants/STM32F0xx/F091RBT_F091RC(H-T-Y)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F091RBT_F091RC(H-T-Y)/variant_generic.h b/variants/STM32F0xx/F091RBT_F091RC(H-T-Y)/variant_generic.h
index 6616ffc7e9..ed13d6de91 100644
--- a/variants/STM32F0xx/F091RBT_F091RC(H-T-Y)/variant_generic.h
+++ b/variants/STM32F0xx/F091RBT_F091RC(H-T-Y)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F091VBT_F091VC(H-T)/PeripheralPins.c b/variants/STM32F0xx/F091VBT_F091VC(H-T)/PeripheralPins.c
index 130f6bb9b4..6ed3c70d83 100644
--- a/variants/STM32F0xx/F091VBT_F091VC(H-T)/PeripheralPins.c
+++ b/variants/STM32F0xx/F091VBT_F091VC(H-T)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32F091V(B-C)Tx.xml, STM32F091VCHx.xml
  * STM32F098VCHx.xml, STM32F098VCTx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F091VBT_F091VC(H-T)/variant_generic.cpp b/variants/STM32F0xx/F091VBT_F091VC(H-T)/variant_generic.cpp
index 4792b10c8d..e156e03f82 100644
--- a/variants/STM32F0xx/F091VBT_F091VC(H-T)/variant_generic.cpp
+++ b/variants/STM32F0xx/F091VBT_F091VC(H-T)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F091VBT_F091VC(H-T)/variant_generic.h b/variants/STM32F0xx/F091VBT_F091VC(H-T)/variant_generic.h
index b4de2076a4..44d12f9ca8 100644
--- a/variants/STM32F0xx/F091VBT_F091VC(H-T)/variant_generic.h
+++ b/variants/STM32F0xx/F091VBT_F091VC(H-T)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F098CC(T-U)/PeripheralPins.c b/variants/STM32F0xx/F098CC(T-U)/PeripheralPins.c
index bf8d2469a7..b5282efa00 100644
--- a/variants/STM32F0xx/F098CC(T-U)/PeripheralPins.c
+++ b/variants/STM32F0xx/F098CC(T-U)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F098CCTx.xml, STM32F098CCUx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F098CC(T-U)/variant_generic.cpp b/variants/STM32F0xx/F098CC(T-U)/variant_generic.cpp
index 81126f2885..ad5b39ad5f 100644
--- a/variants/STM32F0xx/F098CC(T-U)/variant_generic.cpp
+++ b/variants/STM32F0xx/F098CC(T-U)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F098CC(T-U)/variant_generic.h b/variants/STM32F0xx/F098CC(T-U)/variant_generic.h
index 67d5faa5c1..b20abacf2c 100644
--- a/variants/STM32F0xx/F098CC(T-U)/variant_generic.h
+++ b/variants/STM32F0xx/F098CC(T-U)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F098RC(H-T-Y)/PeripheralPins.c b/variants/STM32F0xx/F098RC(H-T-Y)/PeripheralPins.c
index 367f90e719..1188aa3bac 100644
--- a/variants/STM32F0xx/F098RC(H-T-Y)/PeripheralPins.c
+++ b/variants/STM32F0xx/F098RC(H-T-Y)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32F098RCHx.xml, STM32F098RCTx.xml
  * STM32F098RCYx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F098RC(H-T-Y)/variant_generic.cpp b/variants/STM32F0xx/F098RC(H-T-Y)/variant_generic.cpp
index 809643b599..6e1815f0b9 100644
--- a/variants/STM32F0xx/F098RC(H-T-Y)/variant_generic.cpp
+++ b/variants/STM32F0xx/F098RC(H-T-Y)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F098RC(H-T-Y)/variant_generic.h b/variants/STM32F0xx/F098RC(H-T-Y)/variant_generic.h
index 837263c4e3..eb56f67727 100644
--- a/variants/STM32F0xx/F098RC(H-T-Y)/variant_generic.h
+++ b/variants/STM32F0xx/F098RC(H-T-Y)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F098VC(H-T)/PeripheralPins.c b/variants/STM32F0xx/F098VC(H-T)/PeripheralPins.c
index 2661fa141f..3a93d342d5 100644
--- a/variants/STM32F0xx/F098VC(H-T)/PeripheralPins.c
+++ b/variants/STM32F0xx/F098VC(H-T)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F098VCHx.xml, STM32F098VCTx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F0xx/F098VC(H-T)/variant_generic.cpp b/variants/STM32F0xx/F098VC(H-T)/variant_generic.cpp
index 9f140367fe..44faaeb551 100644
--- a/variants/STM32F0xx/F098VC(H-T)/variant_generic.cpp
+++ b/variants/STM32F0xx/F098VC(H-T)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F0xx/F098VC(H-T)/variant_generic.h b/variants/STM32F0xx/F098VC(H-T)/variant_generic.h
index 5ec63fd7ad..702596ee08 100644
--- a/variants/STM32F0xx/F098VC(H-T)/variant_generic.h
+++ b/variants/STM32F0xx/F098VC(H-T)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F100C(4-6)T/PeripheralPins.c b/variants/STM32F1xx/F100C(4-6)T/PeripheralPins.c
index 2a005cf003..3714bb6553 100644
--- a/variants/STM32F1xx/F100C(4-6)T/PeripheralPins.c
+++ b/variants/STM32F1xx/F100C(4-6)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F100C(4-6)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F1xx/F100C(4-6)T/variant_generic.cpp b/variants/STM32F1xx/F100C(4-6)T/variant_generic.cpp
index 66adbbdd5f..abe36229a6 100644
--- a/variants/STM32F1xx/F100C(4-6)T/variant_generic.cpp
+++ b/variants/STM32F1xx/F100C(4-6)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F100C(4-6)T/variant_generic.h b/variants/STM32F1xx/F100C(4-6)T/variant_generic.h
index 1f679c1f95..dd43903527 100644
--- a/variants/STM32F1xx/F100C(4-6)T/variant_generic.h
+++ b/variants/STM32F1xx/F100C(4-6)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F100C(8-B)T/PeripheralPins.c b/variants/STM32F1xx/F100C(8-B)T/PeripheralPins.c
index b488898bf3..8eb90f75a3 100644
--- a/variants/STM32F1xx/F100C(8-B)T/PeripheralPins.c
+++ b/variants/STM32F1xx/F100C(8-B)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F100C(8-B)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F1xx/F100C(8-B)T/variant_generic.cpp b/variants/STM32F1xx/F100C(8-B)T/variant_generic.cpp
index aee21af7cc..8080d2522d 100644
--- a/variants/STM32F1xx/F100C(8-B)T/variant_generic.cpp
+++ b/variants/STM32F1xx/F100C(8-B)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F100C(8-B)T/variant_generic.h b/variants/STM32F1xx/F100C(8-B)T/variant_generic.h
index dfef344038..fb453f6b1a 100644
--- a/variants/STM32F1xx/F100C(8-B)T/variant_generic.h
+++ b/variants/STM32F1xx/F100C(8-B)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F100R(4-6)H/PeripheralPins.c b/variants/STM32F1xx/F100R(4-6)H/PeripheralPins.c
index c75eb247e9..5e3fb4e0a0 100644
--- a/variants/STM32F1xx/F100R(4-6)H/PeripheralPins.c
+++ b/variants/STM32F1xx/F100R(4-6)H/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F100R(4-6)Hx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F1xx/F100R(4-6)H/variant_generic.cpp b/variants/STM32F1xx/F100R(4-6)H/variant_generic.cpp
index 7c818cc1fb..adf67736ab 100644
--- a/variants/STM32F1xx/F100R(4-6)H/variant_generic.cpp
+++ b/variants/STM32F1xx/F100R(4-6)H/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F100R(4-6)H/variant_generic.h b/variants/STM32F1xx/F100R(4-6)H/variant_generic.h
index c550175291..d41e836610 100644
--- a/variants/STM32F1xx/F100R(4-6)H/variant_generic.h
+++ b/variants/STM32F1xx/F100R(4-6)H/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F100R(4-6)T/PeripheralPins.c b/variants/STM32F1xx/F100R(4-6)T/PeripheralPins.c
index 120a5406d5..82d4d67370 100644
--- a/variants/STM32F1xx/F100R(4-6)T/PeripheralPins.c
+++ b/variants/STM32F1xx/F100R(4-6)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F100R(4-6)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F1xx/F100R(4-6)T/variant_generic.cpp b/variants/STM32F1xx/F100R(4-6)T/variant_generic.cpp
index ca532a740e..81e23050cb 100644
--- a/variants/STM32F1xx/F100R(4-6)T/variant_generic.cpp
+++ b/variants/STM32F1xx/F100R(4-6)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F100R(4-6)T/variant_generic.h b/variants/STM32F1xx/F100R(4-6)T/variant_generic.h
index 16e7c329ad..5e9467e91e 100644
--- a/variants/STM32F1xx/F100R(4-6)T/variant_generic.h
+++ b/variants/STM32F1xx/F100R(4-6)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F100R(8-B)H/PeripheralPins.c b/variants/STM32F1xx/F100R(8-B)H/PeripheralPins.c
index 105f679e58..80ad264b8c 100644
--- a/variants/STM32F1xx/F100R(8-B)H/PeripheralPins.c
+++ b/variants/STM32F1xx/F100R(8-B)H/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F100R(8-B)Hx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F1xx/F100R(8-B)H/variant_generic.cpp b/variants/STM32F1xx/F100R(8-B)H/variant_generic.cpp
index cf319047cf..e4158901f9 100644
--- a/variants/STM32F1xx/F100R(8-B)H/variant_generic.cpp
+++ b/variants/STM32F1xx/F100R(8-B)H/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F100R(8-B)H/variant_generic.h b/variants/STM32F1xx/F100R(8-B)H/variant_generic.h
index a9988f67f4..528578981f 100644
--- a/variants/STM32F1xx/F100R(8-B)H/variant_generic.h
+++ b/variants/STM32F1xx/F100R(8-B)H/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F100R(8-B)T/PeripheralPins.c b/variants/STM32F1xx/F100R(8-B)T/PeripheralPins.c
index f509c45a95..fad158fb2a 100644
--- a/variants/STM32F1xx/F100R(8-B)T/PeripheralPins.c
+++ b/variants/STM32F1xx/F100R(8-B)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F100R(8-B)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F1xx/F100R(8-B)T/variant_generic.cpp b/variants/STM32F1xx/F100R(8-B)T/variant_generic.cpp
index f25be2868b..cbbf4c477a 100644
--- a/variants/STM32F1xx/F100R(8-B)T/variant_generic.cpp
+++ b/variants/STM32F1xx/F100R(8-B)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F100R(8-B)T/variant_generic.h b/variants/STM32F1xx/F100R(8-B)T/variant_generic.h
index b2d2a71509..c1668c83d1 100644
--- a/variants/STM32F1xx/F100R(8-B)T/variant_generic.h
+++ b/variants/STM32F1xx/F100R(8-B)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F100R(C-D-E)T/PeripheralPins.c b/variants/STM32F1xx/F100R(C-D-E)T/PeripheralPins.c
index c734d9a6c9..23a1e2cc79 100644
--- a/variants/STM32F1xx/F100R(C-D-E)T/PeripheralPins.c
+++ b/variants/STM32F1xx/F100R(C-D-E)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F100R(C-D-E)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F1xx/F100R(C-D-E)T/variant_generic.cpp b/variants/STM32F1xx/F100R(C-D-E)T/variant_generic.cpp
index e64ea8fd23..c800b1e540 100644
--- a/variants/STM32F1xx/F100R(C-D-E)T/variant_generic.cpp
+++ b/variants/STM32F1xx/F100R(C-D-E)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F100R(C-D-E)T/variant_generic.h b/variants/STM32F1xx/F100R(C-D-E)T/variant_generic.h
index 5ca20b692f..9641bbcd77 100644
--- a/variants/STM32F1xx/F100R(C-D-E)T/variant_generic.h
+++ b/variants/STM32F1xx/F100R(C-D-E)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F100V(8-B)T/PeripheralPins.c b/variants/STM32F1xx/F100V(8-B)T/PeripheralPins.c
index aa8be0f944..bea4dbf6b5 100644
--- a/variants/STM32F1xx/F100V(8-B)T/PeripheralPins.c
+++ b/variants/STM32F1xx/F100V(8-B)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F100V(8-B)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F1xx/F100V(8-B)T/variant_generic.cpp b/variants/STM32F1xx/F100V(8-B)T/variant_generic.cpp
index d4349a66e5..1c1315b19d 100644
--- a/variants/STM32F1xx/F100V(8-B)T/variant_generic.cpp
+++ b/variants/STM32F1xx/F100V(8-B)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F100V(8-B)T/variant_generic.h b/variants/STM32F1xx/F100V(8-B)T/variant_generic.h
index c7500a5559..b43103bde7 100644
--- a/variants/STM32F1xx/F100V(8-B)T/variant_generic.h
+++ b/variants/STM32F1xx/F100V(8-B)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F100V(C-D-E)T/PeripheralPins.c b/variants/STM32F1xx/F100V(C-D-E)T/PeripheralPins.c
index e682486087..4ca654059d 100644
--- a/variants/STM32F1xx/F100V(C-D-E)T/PeripheralPins.c
+++ b/variants/STM32F1xx/F100V(C-D-E)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F100V(C-D-E)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F1xx/F100V(C-D-E)T/variant_generic.cpp b/variants/STM32F1xx/F100V(C-D-E)T/variant_generic.cpp
index 0fd782b02a..91d0ccbdd4 100644
--- a/variants/STM32F1xx/F100V(C-D-E)T/variant_generic.cpp
+++ b/variants/STM32F1xx/F100V(C-D-E)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F100V(C-D-E)T/variant_generic.h b/variants/STM32F1xx/F100V(C-D-E)T/variant_generic.h
index 8aafc91818..aa09898ffc 100644
--- a/variants/STM32F1xx/F100V(C-D-E)T/variant_generic.h
+++ b/variants/STM32F1xx/F100V(C-D-E)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F100Z(C-D-E)T/PeripheralPins.c b/variants/STM32F1xx/F100Z(C-D-E)T/PeripheralPins.c
index 3fb0c415cf..015264667f 100644
--- a/variants/STM32F1xx/F100Z(C-D-E)T/PeripheralPins.c
+++ b/variants/STM32F1xx/F100Z(C-D-E)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F100Z(C-D-E)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F1xx/F100Z(C-D-E)T/variant_generic.cpp b/variants/STM32F1xx/F100Z(C-D-E)T/variant_generic.cpp
index 86145df5e6..e41dd18e5a 100644
--- a/variants/STM32F1xx/F100Z(C-D-E)T/variant_generic.cpp
+++ b/variants/STM32F1xx/F100Z(C-D-E)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F100Z(C-D-E)T/variant_generic.h b/variants/STM32F1xx/F100Z(C-D-E)T/variant_generic.h
index 068cc366f4..ab6e5f463b 100644
--- a/variants/STM32F1xx/F100Z(C-D-E)T/variant_generic.h
+++ b/variants/STM32F1xx/F100Z(C-D-E)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F101C(4-6)T/PeripheralPins.c b/variants/STM32F1xx/F101C(4-6)T/PeripheralPins.c
index 7209223998..5f2ea62b21 100644
--- a/variants/STM32F1xx/F101C(4-6)T/PeripheralPins.c
+++ b/variants/STM32F1xx/F101C(4-6)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F101C(4-6)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F1xx/F101C(4-6)T/variant_generic.cpp b/variants/STM32F1xx/F101C(4-6)T/variant_generic.cpp
index ea5119ed20..f0df739836 100644
--- a/variants/STM32F1xx/F101C(4-6)T/variant_generic.cpp
+++ b/variants/STM32F1xx/F101C(4-6)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F101C(4-6)T/variant_generic.h b/variants/STM32F1xx/F101C(4-6)T/variant_generic.h
index 9fa46b8941..bc40b3e683 100644
--- a/variants/STM32F1xx/F101C(4-6)T/variant_generic.h
+++ b/variants/STM32F1xx/F101C(4-6)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F101C(8-B)(T-U)/PeripheralPins.c b/variants/STM32F1xx/F101C(8-B)(T-U)/PeripheralPins.c
index 2e46323f50..7e1d43db59 100644
--- a/variants/STM32F1xx/F101C(8-B)(T-U)/PeripheralPins.c
+++ b/variants/STM32F1xx/F101C(8-B)(T-U)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F101C(8-B)Tx.xml, STM32F101C(8-B)Ux.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F1xx/F101C(8-B)(T-U)/variant_generic.cpp b/variants/STM32F1xx/F101C(8-B)(T-U)/variant_generic.cpp
index 7acad9a88f..e31edc2d8e 100644
--- a/variants/STM32F1xx/F101C(8-B)(T-U)/variant_generic.cpp
+++ b/variants/STM32F1xx/F101C(8-B)(T-U)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F101C(8-B)(T-U)/variant_generic.h b/variants/STM32F1xx/F101C(8-B)(T-U)/variant_generic.h
index 75b8fdc1da..3b7d97c4c8 100644
--- a/variants/STM32F1xx/F101C(8-B)(T-U)/variant_generic.h
+++ b/variants/STM32F1xx/F101C(8-B)(T-U)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F101R(4-6)T/PeripheralPins.c b/variants/STM32F1xx/F101R(4-6)T/PeripheralPins.c
index 3ff230ffc4..6d1dc2f80e 100644
--- a/variants/STM32F1xx/F101R(4-6)T/PeripheralPins.c
+++ b/variants/STM32F1xx/F101R(4-6)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F101R(4-6)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F1xx/F101R(4-6)T/variant_generic.cpp b/variants/STM32F1xx/F101R(4-6)T/variant_generic.cpp
index 0ad75904ad..cc272fda94 100644
--- a/variants/STM32F1xx/F101R(4-6)T/variant_generic.cpp
+++ b/variants/STM32F1xx/F101R(4-6)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F101R(4-6)T/variant_generic.h b/variants/STM32F1xx/F101R(4-6)T/variant_generic.h
index 29f1478939..f767a07d09 100644
--- a/variants/STM32F1xx/F101R(4-6)T/variant_generic.h
+++ b/variants/STM32F1xx/F101R(4-6)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F101R(8-B)T/PeripheralPins.c b/variants/STM32F1xx/F101R(8-B)T/PeripheralPins.c
index 6c1f7e8162..fc8f87491c 100644
--- a/variants/STM32F1xx/F101R(8-B)T/PeripheralPins.c
+++ b/variants/STM32F1xx/F101R(8-B)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F101R(8-B)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F1xx/F101R(8-B)T/variant_generic.cpp b/variants/STM32F1xx/F101R(8-B)T/variant_generic.cpp
index da4c1d7ebf..68531173b8 100644
--- a/variants/STM32F1xx/F101R(8-B)T/variant_generic.cpp
+++ b/variants/STM32F1xx/F101R(8-B)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F101R(8-B)T/variant_generic.h b/variants/STM32F1xx/F101R(8-B)T/variant_generic.h
index ca76ecc3ea..ad46cd7ecc 100644
--- a/variants/STM32F1xx/F101R(8-B)T/variant_generic.h
+++ b/variants/STM32F1xx/F101R(8-B)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F101R(C-D-E)T/PeripheralPins.c b/variants/STM32F1xx/F101R(C-D-E)T/PeripheralPins.c
index ed5833b0ad..239d6e2d7a 100644
--- a/variants/STM32F1xx/F101R(C-D-E)T/PeripheralPins.c
+++ b/variants/STM32F1xx/F101R(C-D-E)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F101R(C-D-E)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F1xx/F101R(C-D-E)T/variant_generic.cpp b/variants/STM32F1xx/F101R(C-D-E)T/variant_generic.cpp
index f13f4f81c3..c67226f698 100644
--- a/variants/STM32F1xx/F101R(C-D-E)T/variant_generic.cpp
+++ b/variants/STM32F1xx/F101R(C-D-E)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F101R(C-D-E)T/variant_generic.h b/variants/STM32F1xx/F101R(C-D-E)T/variant_generic.h
index 1858c21ec3..51109172a6 100644
--- a/variants/STM32F1xx/F101R(C-D-E)T/variant_generic.h
+++ b/variants/STM32F1xx/F101R(C-D-E)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F101R(F-G)T/PeripheralPins.c b/variants/STM32F1xx/F101R(F-G)T/PeripheralPins.c
index 4911b5f0b2..4ccc30732b 100644
--- a/variants/STM32F1xx/F101R(F-G)T/PeripheralPins.c
+++ b/variants/STM32F1xx/F101R(F-G)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F101R(F-G)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F1xx/F101R(F-G)T/variant_generic.cpp b/variants/STM32F1xx/F101R(F-G)T/variant_generic.cpp
index e5e6e94fb8..bead8e2c8b 100644
--- a/variants/STM32F1xx/F101R(F-G)T/variant_generic.cpp
+++ b/variants/STM32F1xx/F101R(F-G)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F101R(F-G)T/variant_generic.h b/variants/STM32F1xx/F101R(F-G)T/variant_generic.h
index 8347517d40..32142e9f98 100644
--- a/variants/STM32F1xx/F101R(F-G)T/variant_generic.h
+++ b/variants/STM32F1xx/F101R(F-G)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F101RBH/PeripheralPins.c b/variants/STM32F1xx/F101RBH/PeripheralPins.c
index 3d96774037..b3202c28dd 100644
--- a/variants/STM32F1xx/F101RBH/PeripheralPins.c
+++ b/variants/STM32F1xx/F101RBH/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F101RBHx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F1xx/F101RBH/variant_generic.cpp b/variants/STM32F1xx/F101RBH/variant_generic.cpp
index 146160522a..8262840e49 100644
--- a/variants/STM32F1xx/F101RBH/variant_generic.cpp
+++ b/variants/STM32F1xx/F101RBH/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F101RBH/variant_generic.h b/variants/STM32F1xx/F101RBH/variant_generic.h
index a45b3bd906..8d0b866d51 100644
--- a/variants/STM32F1xx/F101RBH/variant_generic.h
+++ b/variants/STM32F1xx/F101RBH/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F101T(4-6)U/PeripheralPins.c b/variants/STM32F1xx/F101T(4-6)U/PeripheralPins.c
index 53e60438d2..ac577622c6 100644
--- a/variants/STM32F1xx/F101T(4-6)U/PeripheralPins.c
+++ b/variants/STM32F1xx/F101T(4-6)U/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F101T(4-6)Ux.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F1xx/F101T(4-6)U/variant_generic.cpp b/variants/STM32F1xx/F101T(4-6)U/variant_generic.cpp
index 2c746dec4e..51dba0d055 100644
--- a/variants/STM32F1xx/F101T(4-6)U/variant_generic.cpp
+++ b/variants/STM32F1xx/F101T(4-6)U/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F101T(4-6)U/variant_generic.h b/variants/STM32F1xx/F101T(4-6)U/variant_generic.h
index 1b0e8fb3b7..ea993f81fb 100644
--- a/variants/STM32F1xx/F101T(4-6)U/variant_generic.h
+++ b/variants/STM32F1xx/F101T(4-6)U/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F101T(8-B)U/PeripheralPins.c b/variants/STM32F1xx/F101T(8-B)U/PeripheralPins.c
index b9d5166781..499644886a 100644
--- a/variants/STM32F1xx/F101T(8-B)U/PeripheralPins.c
+++ b/variants/STM32F1xx/F101T(8-B)U/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F101T(8-B)Ux.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F1xx/F101T(8-B)U/variant_generic.cpp b/variants/STM32F1xx/F101T(8-B)U/variant_generic.cpp
index a47fc08b47..ada4e14d52 100644
--- a/variants/STM32F1xx/F101T(8-B)U/variant_generic.cpp
+++ b/variants/STM32F1xx/F101T(8-B)U/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F101T(8-B)U/variant_generic.h b/variants/STM32F1xx/F101T(8-B)U/variant_generic.h
index 2a45e29c6a..8a9b3ee361 100644
--- a/variants/STM32F1xx/F101T(8-B)U/variant_generic.h
+++ b/variants/STM32F1xx/F101T(8-B)U/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F101V(8-B)T/PeripheralPins.c b/variants/STM32F1xx/F101V(8-B)T/PeripheralPins.c
index f89d8c1161..442ec4d053 100644
--- a/variants/STM32F1xx/F101V(8-B)T/PeripheralPins.c
+++ b/variants/STM32F1xx/F101V(8-B)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F101V(8-B)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F1xx/F101V(8-B)T/variant_generic.cpp b/variants/STM32F1xx/F101V(8-B)T/variant_generic.cpp
index ec21544574..b690069be3 100644
--- a/variants/STM32F1xx/F101V(8-B)T/variant_generic.cpp
+++ b/variants/STM32F1xx/F101V(8-B)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F101V(8-B)T/variant_generic.h b/variants/STM32F1xx/F101V(8-B)T/variant_generic.h
index 9dea2809b8..10cccbef99 100644
--- a/variants/STM32F1xx/F101V(8-B)T/variant_generic.h
+++ b/variants/STM32F1xx/F101V(8-B)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F101V(C-D-E)T/PeripheralPins.c b/variants/STM32F1xx/F101V(C-D-E)T/PeripheralPins.c
index 37caf8d6ab..d67b0b8922 100644
--- a/variants/STM32F1xx/F101V(C-D-E)T/PeripheralPins.c
+++ b/variants/STM32F1xx/F101V(C-D-E)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F101V(C-D-E)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F1xx/F101V(C-D-E)T/variant_generic.cpp b/variants/STM32F1xx/F101V(C-D-E)T/variant_generic.cpp
index 4bb1e22d6e..c88f5eaa85 100644
--- a/variants/STM32F1xx/F101V(C-D-E)T/variant_generic.cpp
+++ b/variants/STM32F1xx/F101V(C-D-E)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F101V(C-D-E)T/variant_generic.h b/variants/STM32F1xx/F101V(C-D-E)T/variant_generic.h
index 4af13691c6..a1b4c2d19a 100644
--- a/variants/STM32F1xx/F101V(C-D-E)T/variant_generic.h
+++ b/variants/STM32F1xx/F101V(C-D-E)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F101V(F-G)T/PeripheralPins.c b/variants/STM32F1xx/F101V(F-G)T/PeripheralPins.c
index be954668d9..65a8d824f5 100644
--- a/variants/STM32F1xx/F101V(F-G)T/PeripheralPins.c
+++ b/variants/STM32F1xx/F101V(F-G)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F101V(F-G)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F1xx/F101V(F-G)T/variant_generic.cpp b/variants/STM32F1xx/F101V(F-G)T/variant_generic.cpp
index b9b82e4431..847a43d1c2 100644
--- a/variants/STM32F1xx/F101V(F-G)T/variant_generic.cpp
+++ b/variants/STM32F1xx/F101V(F-G)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F101V(F-G)T/variant_generic.h b/variants/STM32F1xx/F101V(F-G)T/variant_generic.h
index 849cc2b129..92368fa8e1 100644
--- a/variants/STM32F1xx/F101V(F-G)T/variant_generic.h
+++ b/variants/STM32F1xx/F101V(F-G)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F101Z(C-D-E)T/PeripheralPins.c b/variants/STM32F1xx/F101Z(C-D-E)T/PeripheralPins.c
index 57003114d1..63ccfde34e 100644
--- a/variants/STM32F1xx/F101Z(C-D-E)T/PeripheralPins.c
+++ b/variants/STM32F1xx/F101Z(C-D-E)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F101Z(C-D-E)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F1xx/F101Z(C-D-E)T/variant_generic.cpp b/variants/STM32F1xx/F101Z(C-D-E)T/variant_generic.cpp
index 3c8943106a..3d51fd5151 100644
--- a/variants/STM32F1xx/F101Z(C-D-E)T/variant_generic.cpp
+++ b/variants/STM32F1xx/F101Z(C-D-E)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F101Z(C-D-E)T/variant_generic.h b/variants/STM32F1xx/F101Z(C-D-E)T/variant_generic.h
index 548d92d156..43417816fa 100644
--- a/variants/STM32F1xx/F101Z(C-D-E)T/variant_generic.h
+++ b/variants/STM32F1xx/F101Z(C-D-E)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F101Z(F-G)T/PeripheralPins.c b/variants/STM32F1xx/F101Z(F-G)T/PeripheralPins.c
index def7e3cb24..293f36a35e 100644
--- a/variants/STM32F1xx/F101Z(F-G)T/PeripheralPins.c
+++ b/variants/STM32F1xx/F101Z(F-G)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F101Z(F-G)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F1xx/F101Z(F-G)T/variant_generic.cpp b/variants/STM32F1xx/F101Z(F-G)T/variant_generic.cpp
index f65998dc33..c6b4684b44 100644
--- a/variants/STM32F1xx/F101Z(F-G)T/variant_generic.cpp
+++ b/variants/STM32F1xx/F101Z(F-G)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F101Z(F-G)T/variant_generic.h b/variants/STM32F1xx/F101Z(F-G)T/variant_generic.h
index 54d4417262..376813602f 100644
--- a/variants/STM32F1xx/F101Z(F-G)T/variant_generic.h
+++ b/variants/STM32F1xx/F101Z(F-G)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F102C(4-6)T/PeripheralPins.c b/variants/STM32F1xx/F102C(4-6)T/PeripheralPins.c
index 39c4af9277..3393aaaf77 100644
--- a/variants/STM32F1xx/F102C(4-6)T/PeripheralPins.c
+++ b/variants/STM32F1xx/F102C(4-6)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F102C(4-6)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F1xx/F102C(4-6)T/variant_generic.cpp b/variants/STM32F1xx/F102C(4-6)T/variant_generic.cpp
index 679e841e93..18cd8e0cdf 100644
--- a/variants/STM32F1xx/F102C(4-6)T/variant_generic.cpp
+++ b/variants/STM32F1xx/F102C(4-6)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F102C(4-6)T/variant_generic.h b/variants/STM32F1xx/F102C(4-6)T/variant_generic.h
index 9fa46b8941..bc40b3e683 100644
--- a/variants/STM32F1xx/F102C(4-6)T/variant_generic.h
+++ b/variants/STM32F1xx/F102C(4-6)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F102C(8-B)T/PeripheralPins.c b/variants/STM32F1xx/F102C(8-B)T/PeripheralPins.c
index 1487390f8b..766f35a33a 100644
--- a/variants/STM32F1xx/F102C(8-B)T/PeripheralPins.c
+++ b/variants/STM32F1xx/F102C(8-B)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F102C(8-B)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F1xx/F102C(8-B)T/variant_generic.cpp b/variants/STM32F1xx/F102C(8-B)T/variant_generic.cpp
index 3999735820..a1a5d70238 100644
--- a/variants/STM32F1xx/F102C(8-B)T/variant_generic.cpp
+++ b/variants/STM32F1xx/F102C(8-B)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F102C(8-B)T/variant_generic.h b/variants/STM32F1xx/F102C(8-B)T/variant_generic.h
index 75b8fdc1da..3b7d97c4c8 100644
--- a/variants/STM32F1xx/F102C(8-B)T/variant_generic.h
+++ b/variants/STM32F1xx/F102C(8-B)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F102R(4-6)T/PeripheralPins.c b/variants/STM32F1xx/F102R(4-6)T/PeripheralPins.c
index d7e6b250b9..a29c71c13a 100644
--- a/variants/STM32F1xx/F102R(4-6)T/PeripheralPins.c
+++ b/variants/STM32F1xx/F102R(4-6)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F102R(4-6)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F1xx/F102R(4-6)T/variant_generic.cpp b/variants/STM32F1xx/F102R(4-6)T/variant_generic.cpp
index 52b9115e29..4337a26790 100644
--- a/variants/STM32F1xx/F102R(4-6)T/variant_generic.cpp
+++ b/variants/STM32F1xx/F102R(4-6)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F102R(4-6)T/variant_generic.h b/variants/STM32F1xx/F102R(4-6)T/variant_generic.h
index 29f1478939..f767a07d09 100644
--- a/variants/STM32F1xx/F102R(4-6)T/variant_generic.h
+++ b/variants/STM32F1xx/F102R(4-6)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F102R(8-B)T/PeripheralPins.c b/variants/STM32F1xx/F102R(8-B)T/PeripheralPins.c
index 4cd03e2bf1..79016ded3f 100644
--- a/variants/STM32F1xx/F102R(8-B)T/PeripheralPins.c
+++ b/variants/STM32F1xx/F102R(8-B)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F102R(8-B)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F1xx/F102R(8-B)T/variant_generic.cpp b/variants/STM32F1xx/F102R(8-B)T/variant_generic.cpp
index a76ead94ec..0392c3e659 100644
--- a/variants/STM32F1xx/F102R(8-B)T/variant_generic.cpp
+++ b/variants/STM32F1xx/F102R(8-B)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F102R(8-B)T/variant_generic.h b/variants/STM32F1xx/F102R(8-B)T/variant_generic.h
index ca76ecc3ea..ad46cd7ecc 100644
--- a/variants/STM32F1xx/F102R(8-B)T/variant_generic.h
+++ b/variants/STM32F1xx/F102R(8-B)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F103C4T_F103C6(T-U)/PeripheralPins.c b/variants/STM32F1xx/F103C4T_F103C6(T-U)/PeripheralPins.c
index 745e5364b6..d910d36833 100644
--- a/variants/STM32F1xx/F103C4T_F103C6(T-U)/PeripheralPins.c
+++ b/variants/STM32F1xx/F103C4T_F103C6(T-U)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F103C(4-6)Tx.xml, STM32F103C6Ux.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F1xx/F103C4T_F103C6(T-U)/variant_generic.cpp b/variants/STM32F1xx/F103C4T_F103C6(T-U)/variant_generic.cpp
index b196e3ecc9..24b66a2e80 100644
--- a/variants/STM32F1xx/F103C4T_F103C6(T-U)/variant_generic.cpp
+++ b/variants/STM32F1xx/F103C4T_F103C6(T-U)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F103C4T_F103C6(T-U)/variant_generic.h b/variants/STM32F1xx/F103C4T_F103C6(T-U)/variant_generic.h
index 5b1691a96c..841bf7fba3 100644
--- a/variants/STM32F1xx/F103C4T_F103C6(T-U)/variant_generic.h
+++ b/variants/STM32F1xx/F103C4T_F103C6(T-U)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F103C8T_F103CB(T-U)/PeripheralPins.c b/variants/STM32F1xx/F103C8T_F103CB(T-U)/PeripheralPins.c
index c57f08b4f3..51dc22ce5d 100644
--- a/variants/STM32F1xx/F103C8T_F103CB(T-U)/PeripheralPins.c
+++ b/variants/STM32F1xx/F103C8T_F103CB(T-U)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F103C(8-B)Tx.xml, STM32F103CBUx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F1xx/F103C8T_F103CB(T-U)/variant_generic.cpp b/variants/STM32F1xx/F103C8T_F103CB(T-U)/variant_generic.cpp
index cd3a71de91..b61cea159c 100644
--- a/variants/STM32F1xx/F103C8T_F103CB(T-U)/variant_generic.cpp
+++ b/variants/STM32F1xx/F103C8T_F103CB(T-U)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F103C8T_F103CB(T-U)/variant_generic.h b/variants/STM32F1xx/F103C8T_F103CB(T-U)/variant_generic.h
index 0979bdd626..790bc46291 100644
--- a/variants/STM32F1xx/F103C8T_F103CB(T-U)/variant_generic.h
+++ b/variants/STM32F1xx/F103C8T_F103CB(T-U)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F103R(4-6)H/PeripheralPins.c b/variants/STM32F1xx/F103R(4-6)H/PeripheralPins.c
index 4ebff01719..0c084828b9 100644
--- a/variants/STM32F1xx/F103R(4-6)H/PeripheralPins.c
+++ b/variants/STM32F1xx/F103R(4-6)H/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F103R(4-6)Hx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F1xx/F103R(4-6)H/variant_generic.cpp b/variants/STM32F1xx/F103R(4-6)H/variant_generic.cpp
index 89e5d4771c..d5020b6928 100644
--- a/variants/STM32F1xx/F103R(4-6)H/variant_generic.cpp
+++ b/variants/STM32F1xx/F103R(4-6)H/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F103R(4-6)H/variant_generic.h b/variants/STM32F1xx/F103R(4-6)H/variant_generic.h
index 3b9ebc3bee..a92583e351 100644
--- a/variants/STM32F1xx/F103R(4-6)H/variant_generic.h
+++ b/variants/STM32F1xx/F103R(4-6)H/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F103R(4-6)T/PeripheralPins.c b/variants/STM32F1xx/F103R(4-6)T/PeripheralPins.c
index 8a4a23c977..9294501060 100644
--- a/variants/STM32F1xx/F103R(4-6)T/PeripheralPins.c
+++ b/variants/STM32F1xx/F103R(4-6)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F103R(4-6)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F1xx/F103R(4-6)T/variant_generic.cpp b/variants/STM32F1xx/F103R(4-6)T/variant_generic.cpp
index 364ace80b1..843b833ce2 100644
--- a/variants/STM32F1xx/F103R(4-6)T/variant_generic.cpp
+++ b/variants/STM32F1xx/F103R(4-6)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F103R(4-6)T/variant_generic.h b/variants/STM32F1xx/F103R(4-6)T/variant_generic.h
index 1594c3906f..f8c97b10c6 100644
--- a/variants/STM32F1xx/F103R(4-6)T/variant_generic.h
+++ b/variants/STM32F1xx/F103R(4-6)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F103R(8-B)H/PeripheralPins.c b/variants/STM32F1xx/F103R(8-B)H/PeripheralPins.c
index 4129d6dc93..bbb8335e23 100644
--- a/variants/STM32F1xx/F103R(8-B)H/PeripheralPins.c
+++ b/variants/STM32F1xx/F103R(8-B)H/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F103R(8-B)Hx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F1xx/F103R(8-B)H/variant_generic.cpp b/variants/STM32F1xx/F103R(8-B)H/variant_generic.cpp
index d690146fdf..d4d1565f15 100644
--- a/variants/STM32F1xx/F103R(8-B)H/variant_generic.cpp
+++ b/variants/STM32F1xx/F103R(8-B)H/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F103R(8-B)H/variant_generic.h b/variants/STM32F1xx/F103R(8-B)H/variant_generic.h
index 600ac04cc5..f0f60937d8 100644
--- a/variants/STM32F1xx/F103R(8-B)H/variant_generic.h
+++ b/variants/STM32F1xx/F103R(8-B)H/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F103R(8-B)T/PeripheralPins.c b/variants/STM32F1xx/F103R(8-B)T/PeripheralPins.c
index f1052f474f..ae1b68de92 100644
--- a/variants/STM32F1xx/F103R(8-B)T/PeripheralPins.c
+++ b/variants/STM32F1xx/F103R(8-B)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F103R(8-B)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F1xx/F103R(8-B)T/variant_generic.cpp b/variants/STM32F1xx/F103R(8-B)T/variant_generic.cpp
index 35c7d405cd..1a80ec3564 100644
--- a/variants/STM32F1xx/F103R(8-B)T/variant_generic.cpp
+++ b/variants/STM32F1xx/F103R(8-B)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F103R(8-B)T/variant_generic.h b/variants/STM32F1xx/F103R(8-B)T/variant_generic.h
index dd1f5579af..5254079650 100644
--- a/variants/STM32F1xx/F103R(8-B)T/variant_generic.h
+++ b/variants/STM32F1xx/F103R(8-B)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F103R(C-D-E)T/PeripheralPins.c b/variants/STM32F1xx/F103R(C-D-E)T/PeripheralPins.c
index 5cfca287cd..edd0fb59a1 100644
--- a/variants/STM32F1xx/F103R(C-D-E)T/PeripheralPins.c
+++ b/variants/STM32F1xx/F103R(C-D-E)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F103R(C-D-E)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F1xx/F103R(C-D-E)T/variant_generic.cpp b/variants/STM32F1xx/F103R(C-D-E)T/variant_generic.cpp
index ea0dbc3876..0ae741ccb3 100644
--- a/variants/STM32F1xx/F103R(C-D-E)T/variant_generic.cpp
+++ b/variants/STM32F1xx/F103R(C-D-E)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F103R(C-D-E)T/variant_generic.h b/variants/STM32F1xx/F103R(C-D-E)T/variant_generic.h
index 481f132779..82acc2ea16 100644
--- a/variants/STM32F1xx/F103R(C-D-E)T/variant_generic.h
+++ b/variants/STM32F1xx/F103R(C-D-E)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F103R(C-D-E)Y/PeripheralPins.c b/variants/STM32F1xx/F103R(C-D-E)Y/PeripheralPins.c
index 0d96fe39a0..bbb749bb59 100644
--- a/variants/STM32F1xx/F103R(C-D-E)Y/PeripheralPins.c
+++ b/variants/STM32F1xx/F103R(C-D-E)Y/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F103R(C-D-E)Yx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F1xx/F103R(C-D-E)Y/variant_generic.cpp b/variants/STM32F1xx/F103R(C-D-E)Y/variant_generic.cpp
index 70b729ea14..93c3c5666a 100644
--- a/variants/STM32F1xx/F103R(C-D-E)Y/variant_generic.cpp
+++ b/variants/STM32F1xx/F103R(C-D-E)Y/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F103R(C-D-E)Y/variant_generic.h b/variants/STM32F1xx/F103R(C-D-E)Y/variant_generic.h
index cf1bbbb5af..cef0d6cf7d 100644
--- a/variants/STM32F1xx/F103R(C-D-E)Y/variant_generic.h
+++ b/variants/STM32F1xx/F103R(C-D-E)Y/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F103R(F-G)T/PeripheralPins.c b/variants/STM32F1xx/F103R(F-G)T/PeripheralPins.c
index 78208756cc..2eb4c67842 100644
--- a/variants/STM32F1xx/F103R(F-G)T/PeripheralPins.c
+++ b/variants/STM32F1xx/F103R(F-G)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F103R(F-G)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F1xx/F103R(F-G)T/variant_generic.cpp b/variants/STM32F1xx/F103R(F-G)T/variant_generic.cpp
index 15a6535d11..77c8c7f751 100644
--- a/variants/STM32F1xx/F103R(F-G)T/variant_generic.cpp
+++ b/variants/STM32F1xx/F103R(F-G)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F103R(F-G)T/variant_generic.h b/variants/STM32F1xx/F103R(F-G)T/variant_generic.h
index 62f7fcc6c5..402d5dfc6b 100644
--- a/variants/STM32F1xx/F103R(F-G)T/variant_generic.h
+++ b/variants/STM32F1xx/F103R(F-G)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F103T(4-6)U/PeripheralPins.c b/variants/STM32F1xx/F103T(4-6)U/PeripheralPins.c
index 7e20c58021..38146d9e69 100644
--- a/variants/STM32F1xx/F103T(4-6)U/PeripheralPins.c
+++ b/variants/STM32F1xx/F103T(4-6)U/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F103T(4-6)Ux.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F1xx/F103T(4-6)U/variant_generic.cpp b/variants/STM32F1xx/F103T(4-6)U/variant_generic.cpp
index 66971ceca9..0947eacd97 100644
--- a/variants/STM32F1xx/F103T(4-6)U/variant_generic.cpp
+++ b/variants/STM32F1xx/F103T(4-6)U/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F103T(4-6)U/variant_generic.h b/variants/STM32F1xx/F103T(4-6)U/variant_generic.h
index cefb32ed33..4640b889f1 100644
--- a/variants/STM32F1xx/F103T(4-6)U/variant_generic.h
+++ b/variants/STM32F1xx/F103T(4-6)U/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F103T(8-B)U/PeripheralPins.c b/variants/STM32F1xx/F103T(8-B)U/PeripheralPins.c
index ab61ab3372..55a44d05f3 100644
--- a/variants/STM32F1xx/F103T(8-B)U/PeripheralPins.c
+++ b/variants/STM32F1xx/F103T(8-B)U/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F103T(8-B)Ux.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F1xx/F103T(8-B)U/variant_generic.cpp b/variants/STM32F1xx/F103T(8-B)U/variant_generic.cpp
index 3acb6a58cf..75d1f5382f 100644
--- a/variants/STM32F1xx/F103T(8-B)U/variant_generic.cpp
+++ b/variants/STM32F1xx/F103T(8-B)U/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F103T(8-B)U/variant_generic.h b/variants/STM32F1xx/F103T(8-B)U/variant_generic.h
index 0d3502e05b..ce3fe3f682 100644
--- a/variants/STM32F1xx/F103T(8-B)U/variant_generic.h
+++ b/variants/STM32F1xx/F103T(8-B)U/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F103V(C-D-E)(H-T)/PeripheralPins.c b/variants/STM32F1xx/F103V(C-D-E)(H-T)/PeripheralPins.c
index c4d17c2ae3..907898a2b9 100644
--- a/variants/STM32F1xx/F103V(C-D-E)(H-T)/PeripheralPins.c
+++ b/variants/STM32F1xx/F103V(C-D-E)(H-T)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F103V(C-D-E)Hx.xml, STM32F103V(C-D-E)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F1xx/F103V(C-D-E)(H-T)/variant_generic.cpp b/variants/STM32F1xx/F103V(C-D-E)(H-T)/variant_generic.cpp
index 4c815e5023..67921900d5 100644
--- a/variants/STM32F1xx/F103V(C-D-E)(H-T)/variant_generic.cpp
+++ b/variants/STM32F1xx/F103V(C-D-E)(H-T)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F103V(C-D-E)(H-T)/variant_generic.h b/variants/STM32F1xx/F103V(C-D-E)(H-T)/variant_generic.h
index e985af3942..a6da8611ce 100644
--- a/variants/STM32F1xx/F103V(C-D-E)(H-T)/variant_generic.h
+++ b/variants/STM32F1xx/F103V(C-D-E)(H-T)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F103V(F-G)T/PeripheralPins.c b/variants/STM32F1xx/F103V(F-G)T/PeripheralPins.c
index 319a21d474..24a35b6833 100644
--- a/variants/STM32F1xx/F103V(F-G)T/PeripheralPins.c
+++ b/variants/STM32F1xx/F103V(F-G)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F103V(F-G)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F1xx/F103V(F-G)T/variant_generic.cpp b/variants/STM32F1xx/F103V(F-G)T/variant_generic.cpp
index a4fd1788bb..7e1bd8a51c 100644
--- a/variants/STM32F1xx/F103V(F-G)T/variant_generic.cpp
+++ b/variants/STM32F1xx/F103V(F-G)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F103V(F-G)T/variant_generic.h b/variants/STM32F1xx/F103V(F-G)T/variant_generic.h
index 3e4e22529f..7be7007e80 100644
--- a/variants/STM32F1xx/F103V(F-G)T/variant_generic.h
+++ b/variants/STM32F1xx/F103V(F-G)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F103V8(H-T)_F103VB(H-I-T)/PeripheralPins.c b/variants/STM32F1xx/F103V8(H-T)_F103VB(H-I-T)/PeripheralPins.c
index e2330603f2..4655fe41ee 100644
--- a/variants/STM32F1xx/F103V8(H-T)_F103VB(H-I-T)/PeripheralPins.c
+++ b/variants/STM32F1xx/F103V8(H-T)_F103VB(H-I-T)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32F103V(8-B)Hx.xml, STM32F103V(8-B)Tx.xml
  * STM32F103VBIx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F1xx/F103V8(H-T)_F103VB(H-I-T)/variant_generic.cpp b/variants/STM32F1xx/F103V8(H-T)_F103VB(H-I-T)/variant_generic.cpp
index 8724e477ce..c91091e613 100644
--- a/variants/STM32F1xx/F103V8(H-T)_F103VB(H-I-T)/variant_generic.cpp
+++ b/variants/STM32F1xx/F103V8(H-T)_F103VB(H-I-T)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F103V8(H-T)_F103VB(H-I-T)/variant_generic.h b/variants/STM32F1xx/F103V8(H-T)_F103VB(H-I-T)/variant_generic.h
index 5ff576ee1c..0f7ef706b0 100644
--- a/variants/STM32F1xx/F103V8(H-T)_F103VB(H-I-T)/variant_generic.h
+++ b/variants/STM32F1xx/F103V8(H-T)_F103VB(H-I-T)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F103Z(C-D-E)(H-T)/PeripheralPins.c b/variants/STM32F1xx/F103Z(C-D-E)(H-T)/PeripheralPins.c
index d61d2ff26b..ab8b36960d 100644
--- a/variants/STM32F1xx/F103Z(C-D-E)(H-T)/PeripheralPins.c
+++ b/variants/STM32F1xx/F103Z(C-D-E)(H-T)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F103Z(C-D-E)Hx.xml, STM32F103Z(C-D-E)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F1xx/F103Z(C-D-E)(H-T)/variant_generic.cpp b/variants/STM32F1xx/F103Z(C-D-E)(H-T)/variant_generic.cpp
index d02bec2a7c..87159338ed 100644
--- a/variants/STM32F1xx/F103Z(C-D-E)(H-T)/variant_generic.cpp
+++ b/variants/STM32F1xx/F103Z(C-D-E)(H-T)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F103Z(C-D-E)(H-T)/variant_generic.h b/variants/STM32F1xx/F103Z(C-D-E)(H-T)/variant_generic.h
index 2611d13044..6ed8cf40fe 100644
--- a/variants/STM32F1xx/F103Z(C-D-E)(H-T)/variant_generic.h
+++ b/variants/STM32F1xx/F103Z(C-D-E)(H-T)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F103Z(F-G)(H-T)/PeripheralPins.c b/variants/STM32F1xx/F103Z(F-G)(H-T)/PeripheralPins.c
index 688acc544c..04027dd506 100644
--- a/variants/STM32F1xx/F103Z(F-G)(H-T)/PeripheralPins.c
+++ b/variants/STM32F1xx/F103Z(F-G)(H-T)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F103Z(F-G)Hx.xml, STM32F103Z(F-G)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F1xx/F103Z(F-G)(H-T)/variant_generic.cpp b/variants/STM32F1xx/F103Z(F-G)(H-T)/variant_generic.cpp
index 53b5208b87..93c0f8ce91 100644
--- a/variants/STM32F1xx/F103Z(F-G)(H-T)/variant_generic.cpp
+++ b/variants/STM32F1xx/F103Z(F-G)(H-T)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F103Z(F-G)(H-T)/variant_generic.h b/variants/STM32F1xx/F103Z(F-G)(H-T)/variant_generic.h
index 0d448803dd..12ed0b01c1 100644
--- a/variants/STM32F1xx/F103Z(F-G)(H-T)/variant_generic.h
+++ b/variants/STM32F1xx/F103Z(F-G)(H-T)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F105R(8-B-C)T/PeripheralPins.c b/variants/STM32F1xx/F105R(8-B-C)T/PeripheralPins.c
index f3fa174369..a00078f729 100644
--- a/variants/STM32F1xx/F105R(8-B-C)T/PeripheralPins.c
+++ b/variants/STM32F1xx/F105R(8-B-C)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F105R(8-B-C)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F1xx/F105R(8-B-C)T/variant_generic.cpp b/variants/STM32F1xx/F105R(8-B-C)T/variant_generic.cpp
index 14f60e3a97..d0d2f9c866 100644
--- a/variants/STM32F1xx/F105R(8-B-C)T/variant_generic.cpp
+++ b/variants/STM32F1xx/F105R(8-B-C)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F105R(8-B-C)T/variant_generic.h b/variants/STM32F1xx/F105R(8-B-C)T/variant_generic.h
index 6aa14fc18a..b261509bea 100644
--- a/variants/STM32F1xx/F105R(8-B-C)T/variant_generic.h
+++ b/variants/STM32F1xx/F105R(8-B-C)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F105V(8-B)(H-T)_F105VCT/PeripheralPins.c b/variants/STM32F1xx/F105V(8-B)(H-T)_F105VCT/PeripheralPins.c
index 2b5bcdff61..d07c335bca 100644
--- a/variants/STM32F1xx/F105V(8-B)(H-T)_F105VCT/PeripheralPins.c
+++ b/variants/STM32F1xx/F105V(8-B)(H-T)_F105VCT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F105V(8-B)Hx.xml, STM32F105V(8-B-C)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F1xx/F105V(8-B)(H-T)_F105VCT/variant_generic.cpp b/variants/STM32F1xx/F105V(8-B)(H-T)_F105VCT/variant_generic.cpp
index 2d00cf905e..4c6fd813f1 100644
--- a/variants/STM32F1xx/F105V(8-B)(H-T)_F105VCT/variant_generic.cpp
+++ b/variants/STM32F1xx/F105V(8-B)(H-T)_F105VCT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F105V(8-B)(H-T)_F105VCT/variant_generic.h b/variants/STM32F1xx/F105V(8-B)(H-T)_F105VCT/variant_generic.h
index 0a76dd05a3..20b6ed1cf8 100644
--- a/variants/STM32F1xx/F105V(8-B)(H-T)_F105VCT/variant_generic.h
+++ b/variants/STM32F1xx/F105V(8-B)(H-T)_F105VCT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F107R(B-C)T/PeripheralPins.c b/variants/STM32F1xx/F107R(B-C)T/PeripheralPins.c
index 7e9ec1093a..6e3d5f00c1 100644
--- a/variants/STM32F1xx/F107R(B-C)T/PeripheralPins.c
+++ b/variants/STM32F1xx/F107R(B-C)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F107R(B-C)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F1xx/F107R(B-C)T/variant_generic.cpp b/variants/STM32F1xx/F107R(B-C)T/variant_generic.cpp
index 8aeabc8eaa..69df2f87ee 100644
--- a/variants/STM32F1xx/F107R(B-C)T/variant_generic.cpp
+++ b/variants/STM32F1xx/F107R(B-C)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F107R(B-C)T/variant_generic.h b/variants/STM32F1xx/F107R(B-C)T/variant_generic.h
index 8bd2e3f062..97c1880e0c 100644
--- a/variants/STM32F1xx/F107R(B-C)T/variant_generic.h
+++ b/variants/STM32F1xx/F107R(B-C)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F107VBT_F107VC(H-T)/PeripheralPins.c b/variants/STM32F1xx/F107VBT_F107VC(H-T)/PeripheralPins.c
index f3a022c331..aefae9307f 100644
--- a/variants/STM32F1xx/F107VBT_F107VC(H-T)/PeripheralPins.c
+++ b/variants/STM32F1xx/F107VBT_F107VC(H-T)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F107V(B-C)Tx.xml, STM32F107VCHx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F1xx/F107VBT_F107VC(H-T)/variant_generic.cpp b/variants/STM32F1xx/F107VBT_F107VC(H-T)/variant_generic.cpp
index 1c1db45ba5..7bca7eea4d 100644
--- a/variants/STM32F1xx/F107VBT_F107VC(H-T)/variant_generic.cpp
+++ b/variants/STM32F1xx/F107VBT_F107VC(H-T)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F1xx/F107VBT_F107VC(H-T)/variant_generic.h b/variants/STM32F1xx/F107VBT_F107VC(H-T)/variant_generic.h
index aa4329fa8a..190b3718be 100644
--- a/variants/STM32F1xx/F107VBT_F107VC(H-T)/variant_generic.h
+++ b/variants/STM32F1xx/F107VBT_F107VC(H-T)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F2xx/F205RE(T-Y)_F205R(B-C-F)T_F205RG(E-T-Y)_F215R(E-G)T/PeripheralPins.c b/variants/STM32F2xx/F205RE(T-Y)_F205R(B-C-F)T_F205RG(E-T-Y)_F215R(E-G)T/PeripheralPins.c
index 72fb634c22..1f56b50577 100644
--- a/variants/STM32F2xx/F205RE(T-Y)_F205R(B-C-F)T_F205RG(E-T-Y)_F215R(E-G)T/PeripheralPins.c
+++ b/variants/STM32F2xx/F205RE(T-Y)_F205R(B-C-F)T_F205RG(E-T-Y)_F215R(E-G)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32F205R(B-C-E-F-G)Tx.xml, STM32F205R(E-G)Yx.xml
  * STM32F205RGEx.xml, STM32F215R(E-G)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F2xx/F205RE(T-Y)_F205R(B-C-F)T_F205RG(E-T-Y)_F215R(E-G)T/variant_generic.cpp b/variants/STM32F2xx/F205RE(T-Y)_F205R(B-C-F)T_F205RG(E-T-Y)_F215R(E-G)T/variant_generic.cpp
index f356adf37a..eb90b370d4 100644
--- a/variants/STM32F2xx/F205RE(T-Y)_F205R(B-C-F)T_F205RG(E-T-Y)_F215R(E-G)T/variant_generic.cpp
+++ b/variants/STM32F2xx/F205RE(T-Y)_F205R(B-C-F)T_F205RG(E-T-Y)_F215R(E-G)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F2xx/F205RE(T-Y)_F205R(B-C-F)T_F205RG(E-T-Y)_F215R(E-G)T/variant_generic.h b/variants/STM32F2xx/F205RE(T-Y)_F205R(B-C-F)T_F205RG(E-T-Y)_F215R(E-G)T/variant_generic.h
index ab06dd4e64..0d286fd21d 100644
--- a/variants/STM32F2xx/F205RE(T-Y)_F205R(B-C-F)T_F205RG(E-T-Y)_F215R(E-G)T/variant_generic.h
+++ b/variants/STM32F2xx/F205RE(T-Y)_F205R(B-C-F)T_F205RG(E-T-Y)_F215R(E-G)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F2xx/F205V(B-C-E-F-G)T_F215V(E-G)T/PeripheralPins.c b/variants/STM32F2xx/F205V(B-C-E-F-G)T_F215V(E-G)T/PeripheralPins.c
index 9b25113a27..bbdbf42536 100644
--- a/variants/STM32F2xx/F205V(B-C-E-F-G)T_F215V(E-G)T/PeripheralPins.c
+++ b/variants/STM32F2xx/F205V(B-C-E-F-G)T_F215V(E-G)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F205V(B-C-E-F-G)Tx.xml, STM32F215V(E-G)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F2xx/F205V(B-C-E-F-G)T_F215V(E-G)T/variant_generic.cpp b/variants/STM32F2xx/F205V(B-C-E-F-G)T_F215V(E-G)T/variant_generic.cpp
index 687d8d91c6..2226e66ce3 100644
--- a/variants/STM32F2xx/F205V(B-C-E-F-G)T_F215V(E-G)T/variant_generic.cpp
+++ b/variants/STM32F2xx/F205V(B-C-E-F-G)T_F215V(E-G)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F2xx/F205V(B-C-E-F-G)T_F215V(E-G)T/variant_generic.h b/variants/STM32F2xx/F205V(B-C-E-F-G)T_F215V(E-G)T/variant_generic.h
index 923c89614a..10d49ffa88 100644
--- a/variants/STM32F2xx/F205V(B-C-E-F-G)T_F215V(E-G)T/variant_generic.h
+++ b/variants/STM32F2xx/F205V(B-C-E-F-G)T_F215V(E-G)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F2xx/F205Z(C-E-F-G)T_F215Z(E-G)T/PeripheralPins.c b/variants/STM32F2xx/F205Z(C-E-F-G)T_F215Z(E-G)T/PeripheralPins.c
index 295d7559f1..5f9bf2d83b 100644
--- a/variants/STM32F2xx/F205Z(C-E-F-G)T_F215Z(E-G)T/PeripheralPins.c
+++ b/variants/STM32F2xx/F205Z(C-E-F-G)T_F215Z(E-G)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F205Z(C-E-F-G)Tx.xml, STM32F215Z(E-G)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F2xx/F205Z(C-E-F-G)T_F215Z(E-G)T/variant_generic.cpp b/variants/STM32F2xx/F205Z(C-E-F-G)T_F215Z(E-G)T/variant_generic.cpp
index 555551f2e9..83aabfd0c0 100644
--- a/variants/STM32F2xx/F205Z(C-E-F-G)T_F215Z(E-G)T/variant_generic.cpp
+++ b/variants/STM32F2xx/F205Z(C-E-F-G)T_F215Z(E-G)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F2xx/F205Z(C-E-F-G)T_F215Z(E-G)T/variant_generic.h b/variants/STM32F2xx/F205Z(C-E-F-G)T_F215Z(E-G)T/variant_generic.h
index 418b770c2e..cb9781e11c 100644
--- a/variants/STM32F2xx/F205Z(C-E-F-G)T_F215Z(E-G)T/variant_generic.h
+++ b/variants/STM32F2xx/F205Z(C-E-F-G)T_F215Z(E-G)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F2xx/F207I(C-E-F-G)(H-T)_F217I(E-G)(H-T)/PeripheralPins.c b/variants/STM32F2xx/F207I(C-E-F-G)(H-T)_F217I(E-G)(H-T)/PeripheralPins.c
index 40f804319e..d2508ed919 100644
--- a/variants/STM32F2xx/F207I(C-E-F-G)(H-T)_F217I(E-G)(H-T)/PeripheralPins.c
+++ b/variants/STM32F2xx/F207I(C-E-F-G)(H-T)_F217I(E-G)(H-T)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32F207I(C-E-F-G)Hx.xml, STM32F207I(C-E-F-G)Tx.xml
  * STM32F217I(E-G)Hx.xml, STM32F217I(E-G)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F2xx/F207I(C-E-F-G)(H-T)_F217I(E-G)(H-T)/variant_generic.cpp b/variants/STM32F2xx/F207I(C-E-F-G)(H-T)_F217I(E-G)(H-T)/variant_generic.cpp
index 0516409ebd..22ad65f56b 100644
--- a/variants/STM32F2xx/F207I(C-E-F-G)(H-T)_F217I(E-G)(H-T)/variant_generic.cpp
+++ b/variants/STM32F2xx/F207I(C-E-F-G)(H-T)_F217I(E-G)(H-T)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F2xx/F207I(C-E-F-G)(H-T)_F217I(E-G)(H-T)/variant_generic.h b/variants/STM32F2xx/F207I(C-E-F-G)(H-T)_F217I(E-G)(H-T)/variant_generic.h
index 55a6b42511..15fcbcc4a5 100644
--- a/variants/STM32F2xx/F207I(C-E-F-G)(H-T)_F217I(E-G)(H-T)/variant_generic.h
+++ b/variants/STM32F2xx/F207I(C-E-F-G)(H-T)_F217I(E-G)(H-T)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F2xx/F207V(C-E-F-G)T_F217V(E-G)T/PeripheralPins.c b/variants/STM32F2xx/F207V(C-E-F-G)T_F217V(E-G)T/PeripheralPins.c
index 5bdefac0b0..a541c63a15 100644
--- a/variants/STM32F2xx/F207V(C-E-F-G)T_F217V(E-G)T/PeripheralPins.c
+++ b/variants/STM32F2xx/F207V(C-E-F-G)T_F217V(E-G)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F207V(C-E-F-G)Tx.xml, STM32F217V(E-G)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F2xx/F207V(C-E-F-G)T_F217V(E-G)T/variant_generic.cpp b/variants/STM32F2xx/F207V(C-E-F-G)T_F217V(E-G)T/variant_generic.cpp
index 1696e32530..cf2e74fe02 100644
--- a/variants/STM32F2xx/F207V(C-E-F-G)T_F217V(E-G)T/variant_generic.cpp
+++ b/variants/STM32F2xx/F207V(C-E-F-G)T_F217V(E-G)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F2xx/F207V(C-E-F-G)T_F217V(E-G)T/variant_generic.h b/variants/STM32F2xx/F207V(C-E-F-G)T_F217V(E-G)T/variant_generic.h
index cfb557d3ec..40cc656e36 100644
--- a/variants/STM32F2xx/F207V(C-E-F-G)T_F217V(E-G)T/variant_generic.h
+++ b/variants/STM32F2xx/F207V(C-E-F-G)T_F217V(E-G)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F2xx/F207Z(C-E-F-G)T_F217Z(E-G)T/PeripheralPins.c b/variants/STM32F2xx/F207Z(C-E-F-G)T_F217Z(E-G)T/PeripheralPins.c
index 970e42ab53..729d8b947f 100644
--- a/variants/STM32F2xx/F207Z(C-E-F-G)T_F217Z(E-G)T/PeripheralPins.c
+++ b/variants/STM32F2xx/F207Z(C-E-F-G)T_F217Z(E-G)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F207Z(C-E-F-G)Tx.xml, STM32F217Z(E-G)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F2xx/F207Z(C-E-F-G)T_F217Z(E-G)T/variant_generic.cpp b/variants/STM32F2xx/F207Z(C-E-F-G)T_F217Z(E-G)T/variant_generic.cpp
index 52b7d1e834..c42cb88197 100644
--- a/variants/STM32F2xx/F207Z(C-E-F-G)T_F217Z(E-G)T/variant_generic.cpp
+++ b/variants/STM32F2xx/F207Z(C-E-F-G)T_F217Z(E-G)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F2xx/F207Z(C-E-F-G)T_F217Z(E-G)T/variant_generic.h b/variants/STM32F2xx/F207Z(C-E-F-G)T_F217Z(E-G)T/variant_generic.h
index 1febcf383d..c0d30ba5d7 100644
--- a/variants/STM32F2xx/F207Z(C-E-F-G)T_F217Z(E-G)T/variant_generic.h
+++ b/variants/STM32F2xx/F207Z(C-E-F-G)T_F217Z(E-G)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F301C6T_F301C8(T-Y)/PeripheralPins.c b/variants/STM32F3xx/F301C6T_F301C8(T-Y)/PeripheralPins.c
index 1ca07b1a2a..6398762ce2 100644
--- a/variants/STM32F3xx/F301C6T_F301C8(T-Y)/PeripheralPins.c
+++ b/variants/STM32F3xx/F301C6T_F301C8(T-Y)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32F301C(6-8)Tx.xml, STM32F301C8Yx.xml
  * STM32F318C8Tx.xml, STM32F318C8Yx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F3xx/F301C6T_F301C8(T-Y)/variant_generic.cpp b/variants/STM32F3xx/F301C6T_F301C8(T-Y)/variant_generic.cpp
index 6e6cae83de..1433f63d31 100644
--- a/variants/STM32F3xx/F301C6T_F301C8(T-Y)/variant_generic.cpp
+++ b/variants/STM32F3xx/F301C6T_F301C8(T-Y)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F301C6T_F301C8(T-Y)/variant_generic.h b/variants/STM32F3xx/F301C6T_F301C8(T-Y)/variant_generic.h
index 24b3148549..51a9c043bc 100644
--- a/variants/STM32F3xx/F301C6T_F301C8(T-Y)/variant_generic.h
+++ b/variants/STM32F3xx/F301C6T_F301C8(T-Y)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F301K(6-8)T/PeripheralPins.c b/variants/STM32F3xx/F301K(6-8)T/PeripheralPins.c
index d31b40a72e..d5cecdb508 100644
--- a/variants/STM32F3xx/F301K(6-8)T/PeripheralPins.c
+++ b/variants/STM32F3xx/F301K(6-8)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F301K(6-8)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F3xx/F301K(6-8)T/variant_generic.cpp b/variants/STM32F3xx/F301K(6-8)T/variant_generic.cpp
index d531dc7c4b..c5750a6b9a 100644
--- a/variants/STM32F3xx/F301K(6-8)T/variant_generic.cpp
+++ b/variants/STM32F3xx/F301K(6-8)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F301K(6-8)T/variant_generic.h b/variants/STM32F3xx/F301K(6-8)T/variant_generic.h
index 4367c4b00c..c278b4b370 100644
--- a/variants/STM32F3xx/F301K(6-8)T/variant_generic.h
+++ b/variants/STM32F3xx/F301K(6-8)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F301K(6-8)U/PeripheralPins.c b/variants/STM32F3xx/F301K(6-8)U/PeripheralPins.c
index 68b85655d6..9c4a13a010 100644
--- a/variants/STM32F3xx/F301K(6-8)U/PeripheralPins.c
+++ b/variants/STM32F3xx/F301K(6-8)U/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F301K(6-8)Ux.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F3xx/F301K(6-8)U/variant_generic.cpp b/variants/STM32F3xx/F301K(6-8)U/variant_generic.cpp
index 70e3958f39..e53ca1d6ad 100644
--- a/variants/STM32F3xx/F301K(6-8)U/variant_generic.cpp
+++ b/variants/STM32F3xx/F301K(6-8)U/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F301K(6-8)U/variant_generic.h b/variants/STM32F3xx/F301K(6-8)U/variant_generic.h
index adba5e4d4e..ac4de55402 100644
--- a/variants/STM32F3xx/F301K(6-8)U/variant_generic.h
+++ b/variants/STM32F3xx/F301K(6-8)U/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F301R(6-8)T/PeripheralPins.c b/variants/STM32F3xx/F301R(6-8)T/PeripheralPins.c
index 0afe7356b8..7740d23b0b 100644
--- a/variants/STM32F3xx/F301R(6-8)T/PeripheralPins.c
+++ b/variants/STM32F3xx/F301R(6-8)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F301R(6-8)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F3xx/F301R(6-8)T/variant_generic.cpp b/variants/STM32F3xx/F301R(6-8)T/variant_generic.cpp
index 7ec7a2dd51..bf825d9f1a 100644
--- a/variants/STM32F3xx/F301R(6-8)T/variant_generic.cpp
+++ b/variants/STM32F3xx/F301R(6-8)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F301R(6-8)T/variant_generic.h b/variants/STM32F3xx/F301R(6-8)T/variant_generic.h
index 69ed9c7fd0..1458fe961d 100644
--- a/variants/STM32F3xx/F301R(6-8)T/variant_generic.h
+++ b/variants/STM32F3xx/F301R(6-8)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F302C(B-C)T/PeripheralPins.c b/variants/STM32F3xx/F302C(B-C)T/PeripheralPins.c
index 05187d9893..fea2b17045 100644
--- a/variants/STM32F3xx/F302C(B-C)T/PeripheralPins.c
+++ b/variants/STM32F3xx/F302C(B-C)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F302C(B-C)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F3xx/F302C(B-C)T/variant_generic.cpp b/variants/STM32F3xx/F302C(B-C)T/variant_generic.cpp
index b8faf6459a..ed553ba2c6 100644
--- a/variants/STM32F3xx/F302C(B-C)T/variant_generic.cpp
+++ b/variants/STM32F3xx/F302C(B-C)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F302C(B-C)T/variant_generic.h b/variants/STM32F3xx/F302C(B-C)T/variant_generic.h
index fbb5424209..c0b5c9c460 100644
--- a/variants/STM32F3xx/F302C(B-C)T/variant_generic.h
+++ b/variants/STM32F3xx/F302C(B-C)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F302C6T_F302C8(T-Y)/PeripheralPins.c b/variants/STM32F3xx/F302C6T_F302C8(T-Y)/PeripheralPins.c
index f109d385d5..eb83fe9abb 100644
--- a/variants/STM32F3xx/F302C6T_F302C8(T-Y)/PeripheralPins.c
+++ b/variants/STM32F3xx/F302C6T_F302C8(T-Y)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F302C(6-8)Tx.xml, STM32F302C8Yx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F3xx/F302C6T_F302C8(T-Y)/variant_generic.cpp b/variants/STM32F3xx/F302C6T_F302C8(T-Y)/variant_generic.cpp
index 45c5654584..1a6ad35445 100644
--- a/variants/STM32F3xx/F302C6T_F302C8(T-Y)/variant_generic.cpp
+++ b/variants/STM32F3xx/F302C6T_F302C8(T-Y)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F302C6T_F302C8(T-Y)/variant_generic.h b/variants/STM32F3xx/F302C6T_F302C8(T-Y)/variant_generic.h
index 24b3148549..51a9c043bc 100644
--- a/variants/STM32F3xx/F302C6T_F302C8(T-Y)/variant_generic.h
+++ b/variants/STM32F3xx/F302C6T_F302C8(T-Y)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F302K(6-8)U/PeripheralPins.c b/variants/STM32F3xx/F302K(6-8)U/PeripheralPins.c
index d2e3a89cd4..974d3328fb 100644
--- a/variants/STM32F3xx/F302K(6-8)U/PeripheralPins.c
+++ b/variants/STM32F3xx/F302K(6-8)U/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F302K(6-8)Ux.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F3xx/F302K(6-8)U/variant_generic.cpp b/variants/STM32F3xx/F302K(6-8)U/variant_generic.cpp
index dec66d3430..5f4381448b 100644
--- a/variants/STM32F3xx/F302K(6-8)U/variant_generic.cpp
+++ b/variants/STM32F3xx/F302K(6-8)U/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F302K(6-8)U/variant_generic.h b/variants/STM32F3xx/F302K(6-8)U/variant_generic.h
index adba5e4d4e..ac4de55402 100644
--- a/variants/STM32F3xx/F302K(6-8)U/variant_generic.h
+++ b/variants/STM32F3xx/F302K(6-8)U/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F302R(6-8)T/PeripheralPins.c b/variants/STM32F3xx/F302R(6-8)T/PeripheralPins.c
index 76992de3b3..ad048c177b 100644
--- a/variants/STM32F3xx/F302R(6-8)T/PeripheralPins.c
+++ b/variants/STM32F3xx/F302R(6-8)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F302R(6-8)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F3xx/F302R(6-8)T/variant_generic.cpp b/variants/STM32F3xx/F302R(6-8)T/variant_generic.cpp
index 2e4a6757dc..c933e0f2cb 100644
--- a/variants/STM32F3xx/F302R(6-8)T/variant_generic.cpp
+++ b/variants/STM32F3xx/F302R(6-8)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F302R(6-8)T/variant_generic.h b/variants/STM32F3xx/F302R(6-8)T/variant_generic.h
index 69ed9c7fd0..1458fe961d 100644
--- a/variants/STM32F3xx/F302R(6-8)T/variant_generic.h
+++ b/variants/STM32F3xx/F302R(6-8)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F302R(B-C)T/PeripheralPins.c b/variants/STM32F3xx/F302R(B-C)T/PeripheralPins.c
index ff69ec5fa1..24c736a8e5 100644
--- a/variants/STM32F3xx/F302R(B-C)T/PeripheralPins.c
+++ b/variants/STM32F3xx/F302R(B-C)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F302R(B-C)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F3xx/F302R(B-C)T/variant_generic.cpp b/variants/STM32F3xx/F302R(B-C)T/variant_generic.cpp
index fb51a46225..8fdc9520ab 100644
--- a/variants/STM32F3xx/F302R(B-C)T/variant_generic.cpp
+++ b/variants/STM32F3xx/F302R(B-C)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F302R(B-C)T/variant_generic.h b/variants/STM32F3xx/F302R(B-C)T/variant_generic.h
index e30e0881bd..47ad4bf107 100644
--- a/variants/STM32F3xx/F302R(B-C)T/variant_generic.h
+++ b/variants/STM32F3xx/F302R(B-C)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F302R(D-E)T/PeripheralPins.c b/variants/STM32F3xx/F302R(D-E)T/PeripheralPins.c
index 390a26a71c..96dc8352ff 100644
--- a/variants/STM32F3xx/F302R(D-E)T/PeripheralPins.c
+++ b/variants/STM32F3xx/F302R(D-E)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F302R(D-E)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F3xx/F302R(D-E)T/variant_generic.cpp b/variants/STM32F3xx/F302R(D-E)T/variant_generic.cpp
index 0d8931b1ed..353cff99a1 100644
--- a/variants/STM32F3xx/F302R(D-E)T/variant_generic.cpp
+++ b/variants/STM32F3xx/F302R(D-E)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F302R(D-E)T/variant_generic.h b/variants/STM32F3xx/F302R(D-E)T/variant_generic.h
index fe2aa9cb5a..2547a6c154 100644
--- a/variants/STM32F3xx/F302R(D-E)T/variant_generic.h
+++ b/variants/STM32F3xx/F302R(D-E)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F302V(B-C)T/PeripheralPins.c b/variants/STM32F3xx/F302V(B-C)T/PeripheralPins.c
index 95f025dd79..8dfb5ec65c 100644
--- a/variants/STM32F3xx/F302V(B-C)T/PeripheralPins.c
+++ b/variants/STM32F3xx/F302V(B-C)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F302V(B-C)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F3xx/F302V(B-C)T/variant_generic.cpp b/variants/STM32F3xx/F302V(B-C)T/variant_generic.cpp
index 840cdadf51..ea63cd5285 100644
--- a/variants/STM32F3xx/F302V(B-C)T/variant_generic.cpp
+++ b/variants/STM32F3xx/F302V(B-C)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F302V(B-C)T/variant_generic.h b/variants/STM32F3xx/F302V(B-C)T/variant_generic.h
index 33a438a0cc..c108aa1055 100644
--- a/variants/STM32F3xx/F302V(B-C)T/variant_generic.h
+++ b/variants/STM32F3xx/F302V(B-C)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F302V(D-E)(H-T)/PeripheralPins.c b/variants/STM32F3xx/F302V(D-E)(H-T)/PeripheralPins.c
index 34c98e08fe..2f12b72ea3 100644
--- a/variants/STM32F3xx/F302V(D-E)(H-T)/PeripheralPins.c
+++ b/variants/STM32F3xx/F302V(D-E)(H-T)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F302V(D-E)Hx.xml, STM32F302V(D-E)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F3xx/F302V(D-E)(H-T)/variant_generic.cpp b/variants/STM32F3xx/F302V(D-E)(H-T)/variant_generic.cpp
index ba43d69442..7981f2c687 100644
--- a/variants/STM32F3xx/F302V(D-E)(H-T)/variant_generic.cpp
+++ b/variants/STM32F3xx/F302V(D-E)(H-T)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F302V(D-E)(H-T)/variant_generic.h b/variants/STM32F3xx/F302V(D-E)(H-T)/variant_generic.h
index b50a86912c..003c55c46f 100644
--- a/variants/STM32F3xx/F302V(D-E)(H-T)/variant_generic.h
+++ b/variants/STM32F3xx/F302V(D-E)(H-T)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F302VCY/PeripheralPins.c b/variants/STM32F3xx/F302VCY/PeripheralPins.c
index f5a5d9914e..a7237fc4c2 100644
--- a/variants/STM32F3xx/F302VCY/PeripheralPins.c
+++ b/variants/STM32F3xx/F302VCY/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F302VCYx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F3xx/F302VCY/variant_generic.cpp b/variants/STM32F3xx/F302VCY/variant_generic.cpp
index a28c71b0ae..badf82a257 100644
--- a/variants/STM32F3xx/F302VCY/variant_generic.cpp
+++ b/variants/STM32F3xx/F302VCY/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F302VCY/variant_generic.h b/variants/STM32F3xx/F302VCY/variant_generic.h
index 676c7e07bd..ea6383d857 100644
--- a/variants/STM32F3xx/F302VCY/variant_generic.h
+++ b/variants/STM32F3xx/F302VCY/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F302Z(D-E)T/PeripheralPins.c b/variants/STM32F3xx/F302Z(D-E)T/PeripheralPins.c
index ccf1af9f96..0839f02ad6 100644
--- a/variants/STM32F3xx/F302Z(D-E)T/PeripheralPins.c
+++ b/variants/STM32F3xx/F302Z(D-E)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F302Z(D-E)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F3xx/F302Z(D-E)T/variant_generic.cpp b/variants/STM32F3xx/F302Z(D-E)T/variant_generic.cpp
index 1b9db1a37a..40b181b14a 100644
--- a/variants/STM32F3xx/F302Z(D-E)T/variant_generic.cpp
+++ b/variants/STM32F3xx/F302Z(D-E)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F302Z(D-E)T/variant_generic.h b/variants/STM32F3xx/F302Z(D-E)T/variant_generic.h
index c4c77438c3..57d5e74422 100644
--- a/variants/STM32F3xx/F302Z(D-E)T/variant_generic.h
+++ b/variants/STM32F3xx/F302Z(D-E)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F303C(6-8)T_F334C(4-6-8)T/PeripheralPins.c b/variants/STM32F3xx/F303C(6-8)T_F334C(4-6-8)T/PeripheralPins.c
index 377f571815..d97eb31b7e 100644
--- a/variants/STM32F3xx/F303C(6-8)T_F334C(4-6-8)T/PeripheralPins.c
+++ b/variants/STM32F3xx/F303C(6-8)T_F334C(4-6-8)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F303C(6-8)Tx.xml, STM32F334C(4-6-8)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F3xx/F303C(6-8)T_F334C(4-6-8)T/variant_generic.cpp b/variants/STM32F3xx/F303C(6-8)T_F334C(4-6-8)T/variant_generic.cpp
index 2b31bd8a1f..3346235588 100644
--- a/variants/STM32F3xx/F303C(6-8)T_F334C(4-6-8)T/variant_generic.cpp
+++ b/variants/STM32F3xx/F303C(6-8)T_F334C(4-6-8)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F303C(6-8)T_F334C(4-6-8)T/variant_generic.h b/variants/STM32F3xx/F303C(6-8)T_F334C(4-6-8)T/variant_generic.h
index 05d308c480..16be90ff2d 100644
--- a/variants/STM32F3xx/F303C(6-8)T_F334C(4-6-8)T/variant_generic.h
+++ b/variants/STM32F3xx/F303C(6-8)T_F334C(4-6-8)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F303C(B-C)T/PeripheralPins.c b/variants/STM32F3xx/F303C(B-C)T/PeripheralPins.c
index 8b84d1fafa..5fb6c37baa 100644
--- a/variants/STM32F3xx/F303C(B-C)T/PeripheralPins.c
+++ b/variants/STM32F3xx/F303C(B-C)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F303C(B-C)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F3xx/F303C(B-C)T/variant_generic.cpp b/variants/STM32F3xx/F303C(B-C)T/variant_generic.cpp
index a0c3be08c4..a0351a70ba 100644
--- a/variants/STM32F3xx/F303C(B-C)T/variant_generic.cpp
+++ b/variants/STM32F3xx/F303C(B-C)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F303C(B-C)T/variant_generic.h b/variants/STM32F3xx/F303C(B-C)T/variant_generic.h
index c944573eab..4bc4b9d795 100644
--- a/variants/STM32F3xx/F303C(B-C)T/variant_generic.h
+++ b/variants/STM32F3xx/F303C(B-C)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F303C8Y_F334C8Y/PeripheralPins.c b/variants/STM32F3xx/F303C8Y_F334C8Y/PeripheralPins.c
index 948e22a2c7..5e2578209c 100644
--- a/variants/STM32F3xx/F303C8Y_F334C8Y/PeripheralPins.c
+++ b/variants/STM32F3xx/F303C8Y_F334C8Y/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F303C8Yx.xml, STM32F334C8Yx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F3xx/F303C8Y_F334C8Y/variant_generic.cpp b/variants/STM32F3xx/F303C8Y_F334C8Y/variant_generic.cpp
index 98ff9ea1a2..1074bbfeed 100644
--- a/variants/STM32F3xx/F303C8Y_F334C8Y/variant_generic.cpp
+++ b/variants/STM32F3xx/F303C8Y_F334C8Y/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F303C8Y_F334C8Y/variant_generic.h b/variants/STM32F3xx/F303C8Y_F334C8Y/variant_generic.h
index 961a645b8b..f1f5b613e9 100644
--- a/variants/STM32F3xx/F303C8Y_F334C8Y/variant_generic.h
+++ b/variants/STM32F3xx/F303C8Y_F334C8Y/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F303K(6-8)T_F334K(4-6-8)T/PeripheralPins.c b/variants/STM32F3xx/F303K(6-8)T_F334K(4-6-8)T/PeripheralPins.c
index bb7893ea56..6ddd9ced0f 100644
--- a/variants/STM32F3xx/F303K(6-8)T_F334K(4-6-8)T/PeripheralPins.c
+++ b/variants/STM32F3xx/F303K(6-8)T_F334K(4-6-8)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F303K(6-8)Tx.xml, STM32F334K(4-6-8)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F3xx/F303K(6-8)T_F334K(4-6-8)T/variant_generic.cpp b/variants/STM32F3xx/F303K(6-8)T_F334K(4-6-8)T/variant_generic.cpp
index e089848592..3bf3d7bf3d 100644
--- a/variants/STM32F3xx/F303K(6-8)T_F334K(4-6-8)T/variant_generic.cpp
+++ b/variants/STM32F3xx/F303K(6-8)T_F334K(4-6-8)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F303K(6-8)T_F334K(4-6-8)T/variant_generic.h b/variants/STM32F3xx/F303K(6-8)T_F334K(4-6-8)T/variant_generic.h
index 8b92fdffb1..4ecb397ec3 100644
--- a/variants/STM32F3xx/F303K(6-8)T_F334K(4-6-8)T/variant_generic.h
+++ b/variants/STM32F3xx/F303K(6-8)T_F334K(4-6-8)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F303K(6-8)U_F334K(4-6-8)U/PeripheralPins.c b/variants/STM32F3xx/F303K(6-8)U_F334K(4-6-8)U/PeripheralPins.c
index b749dc08ff..5946f69e06 100644
--- a/variants/STM32F3xx/F303K(6-8)U_F334K(4-6-8)U/PeripheralPins.c
+++ b/variants/STM32F3xx/F303K(6-8)U_F334K(4-6-8)U/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F303K(6-8)Ux.xml, STM32F334K(4-6-8)Ux.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F3xx/F303K(6-8)U_F334K(4-6-8)U/variant_generic.cpp b/variants/STM32F3xx/F303K(6-8)U_F334K(4-6-8)U/variant_generic.cpp
index 8c436e0960..f8c4035394 100644
--- a/variants/STM32F3xx/F303K(6-8)U_F334K(4-6-8)U/variant_generic.cpp
+++ b/variants/STM32F3xx/F303K(6-8)U_F334K(4-6-8)U/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F303K(6-8)U_F334K(4-6-8)U/variant_generic.h b/variants/STM32F3xx/F303K(6-8)U_F334K(4-6-8)U/variant_generic.h
index 0dbc028e8e..b781235585 100644
--- a/variants/STM32F3xx/F303K(6-8)U_F334K(4-6-8)U/variant_generic.h
+++ b/variants/STM32F3xx/F303K(6-8)U_F334K(4-6-8)U/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F303R(6-8)T_F334R(6-8)T/PeripheralPins.c b/variants/STM32F3xx/F303R(6-8)T_F334R(6-8)T/PeripheralPins.c
index e6931e01e4..62b65bb1a6 100644
--- a/variants/STM32F3xx/F303R(6-8)T_F334R(6-8)T/PeripheralPins.c
+++ b/variants/STM32F3xx/F303R(6-8)T_F334R(6-8)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F303R(6-8)Tx.xml, STM32F334R(6-8)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F3xx/F303R(6-8)T_F334R(6-8)T/variant_generic.cpp b/variants/STM32F3xx/F303R(6-8)T_F334R(6-8)T/variant_generic.cpp
index 0b7ff53305..35c70f6c06 100644
--- a/variants/STM32F3xx/F303R(6-8)T_F334R(6-8)T/variant_generic.cpp
+++ b/variants/STM32F3xx/F303R(6-8)T_F334R(6-8)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F303R(6-8)T_F334R(6-8)T/variant_generic.h b/variants/STM32F3xx/F303R(6-8)T_F334R(6-8)T/variant_generic.h
index 862a6a7e0f..53bb5ec490 100644
--- a/variants/STM32F3xx/F303R(6-8)T_F334R(6-8)T/variant_generic.h
+++ b/variants/STM32F3xx/F303R(6-8)T_F334R(6-8)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F303R(B-C)T/PeripheralPins.c b/variants/STM32F3xx/F303R(B-C)T/PeripheralPins.c
index df12277a42..be502988f1 100644
--- a/variants/STM32F3xx/F303R(B-C)T/PeripheralPins.c
+++ b/variants/STM32F3xx/F303R(B-C)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F303R(B-C)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F3xx/F303R(B-C)T/variant_generic.cpp b/variants/STM32F3xx/F303R(B-C)T/variant_generic.cpp
index cb1450edda..a56da79a44 100644
--- a/variants/STM32F3xx/F303R(B-C)T/variant_generic.cpp
+++ b/variants/STM32F3xx/F303R(B-C)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F303R(B-C)T/variant_generic.h b/variants/STM32F3xx/F303R(B-C)T/variant_generic.h
index 2dbbd671e0..9704cfbce6 100644
--- a/variants/STM32F3xx/F303R(B-C)T/variant_generic.h
+++ b/variants/STM32F3xx/F303R(B-C)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F303R(D-E)T/PeripheralPins.c b/variants/STM32F3xx/F303R(D-E)T/PeripheralPins.c
index a4bf02fe69..eb2b39ffe2 100644
--- a/variants/STM32F3xx/F303R(D-E)T/PeripheralPins.c
+++ b/variants/STM32F3xx/F303R(D-E)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F303R(D-E)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F3xx/F303R(D-E)T/variant_generic.cpp b/variants/STM32F3xx/F303R(D-E)T/variant_generic.cpp
index d09cf34c09..ed21fc4ab6 100644
--- a/variants/STM32F3xx/F303R(D-E)T/variant_generic.cpp
+++ b/variants/STM32F3xx/F303R(D-E)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F303R(D-E)T/variant_generic.h b/variants/STM32F3xx/F303R(D-E)T/variant_generic.h
index d0d5eda9c6..60ea86681f 100644
--- a/variants/STM32F3xx/F303R(D-E)T/variant_generic.h
+++ b/variants/STM32F3xx/F303R(D-E)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F303V(B-C)T/PeripheralPins.c b/variants/STM32F3xx/F303V(B-C)T/PeripheralPins.c
index 8b8eb540d0..9a07f7ec89 100644
--- a/variants/STM32F3xx/F303V(B-C)T/PeripheralPins.c
+++ b/variants/STM32F3xx/F303V(B-C)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F303V(B-C)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F3xx/F303V(B-C)T/variant_generic.cpp b/variants/STM32F3xx/F303V(B-C)T/variant_generic.cpp
index 4f6b31aaa0..c1a6912d7d 100644
--- a/variants/STM32F3xx/F303V(B-C)T/variant_generic.cpp
+++ b/variants/STM32F3xx/F303V(B-C)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F303V(B-C)T/variant_generic.h b/variants/STM32F3xx/F303V(B-C)T/variant_generic.h
index bdfb38efe9..132e180472 100644
--- a/variants/STM32F3xx/F303V(B-C)T/variant_generic.h
+++ b/variants/STM32F3xx/F303V(B-C)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F303V(D-E)(H-T)/PeripheralPins.c b/variants/STM32F3xx/F303V(D-E)(H-T)/PeripheralPins.c
index 5962188441..ad369750a8 100644
--- a/variants/STM32F3xx/F303V(D-E)(H-T)/PeripheralPins.c
+++ b/variants/STM32F3xx/F303V(D-E)(H-T)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F303V(D-E)Hx.xml, STM32F303V(D-E)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F3xx/F303V(D-E)(H-T)/variant_generic.cpp b/variants/STM32F3xx/F303V(D-E)(H-T)/variant_generic.cpp
index 3f286658f2..137342a6ee 100644
--- a/variants/STM32F3xx/F303V(D-E)(H-T)/variant_generic.cpp
+++ b/variants/STM32F3xx/F303V(D-E)(H-T)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F303V(D-E)(H-T)/variant_generic.h b/variants/STM32F3xx/F303V(D-E)(H-T)/variant_generic.h
index 9727bf325e..c02e9bfaae 100644
--- a/variants/STM32F3xx/F303V(D-E)(H-T)/variant_generic.h
+++ b/variants/STM32F3xx/F303V(D-E)(H-T)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F303VCY/PeripheralPins.c b/variants/STM32F3xx/F303VCY/PeripheralPins.c
index f2c4984cea..6ceb2d9d51 100644
--- a/variants/STM32F3xx/F303VCY/PeripheralPins.c
+++ b/variants/STM32F3xx/F303VCY/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F303VCYx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F3xx/F303VCY/variant_generic.cpp b/variants/STM32F3xx/F303VCY/variant_generic.cpp
index 03c7483a82..6fd3d53806 100644
--- a/variants/STM32F3xx/F303VCY/variant_generic.cpp
+++ b/variants/STM32F3xx/F303VCY/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F303VCY/variant_generic.h b/variants/STM32F3xx/F303VCY/variant_generic.h
index b3c29f2db7..5376851bd1 100644
--- a/variants/STM32F3xx/F303VCY/variant_generic.h
+++ b/variants/STM32F3xx/F303VCY/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F303VEY/PeripheralPins.c b/variants/STM32F3xx/F303VEY/PeripheralPins.c
index 6af9595ad7..f30ba9bdd7 100644
--- a/variants/STM32F3xx/F303VEY/PeripheralPins.c
+++ b/variants/STM32F3xx/F303VEY/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F303VEYx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F3xx/F303VEY/variant_generic.cpp b/variants/STM32F3xx/F303VEY/variant_generic.cpp
index 48a940b4a2..a1022ceead 100644
--- a/variants/STM32F3xx/F303VEY/variant_generic.cpp
+++ b/variants/STM32F3xx/F303VEY/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F303VEY/variant_generic.h b/variants/STM32F3xx/F303VEY/variant_generic.h
index 0b6e877262..695f8ff2a7 100644
--- a/variants/STM32F3xx/F303VEY/variant_generic.h
+++ b/variants/STM32F3xx/F303VEY/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F303Z(D-E)T/PeripheralPins.c b/variants/STM32F3xx/F303Z(D-E)T/PeripheralPins.c
index 000a13c4f6..a586bec29a 100644
--- a/variants/STM32F3xx/F303Z(D-E)T/PeripheralPins.c
+++ b/variants/STM32F3xx/F303Z(D-E)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F303Z(D-E)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F3xx/F303Z(D-E)T/variant_generic.cpp b/variants/STM32F3xx/F303Z(D-E)T/variant_generic.cpp
index c614498075..d103e9ce9e 100644
--- a/variants/STM32F3xx/F303Z(D-E)T/variant_generic.cpp
+++ b/variants/STM32F3xx/F303Z(D-E)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F303Z(D-E)T/variant_generic.h b/variants/STM32F3xx/F303Z(D-E)T/variant_generic.h
index f4b5722979..9cb1e8634f 100644
--- a/variants/STM32F3xx/F303Z(D-E)T/variant_generic.h
+++ b/variants/STM32F3xx/F303Z(D-E)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F318C8(T-Y)/PeripheralPins.c b/variants/STM32F3xx/F318C8(T-Y)/PeripheralPins.c
index 1a67d001ce..32c951626f 100644
--- a/variants/STM32F3xx/F318C8(T-Y)/PeripheralPins.c
+++ b/variants/STM32F3xx/F318C8(T-Y)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F318C8Tx.xml, STM32F318C8Yx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F3xx/F318C8(T-Y)/variant_generic.cpp b/variants/STM32F3xx/F318C8(T-Y)/variant_generic.cpp
index 456ee96627..e5ae02f89f 100644
--- a/variants/STM32F3xx/F318C8(T-Y)/variant_generic.cpp
+++ b/variants/STM32F3xx/F318C8(T-Y)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F318C8(T-Y)/variant_generic.h b/variants/STM32F3xx/F318C8(T-Y)/variant_generic.h
index 76630e022c..c8b7f33f7d 100644
--- a/variants/STM32F3xx/F318C8(T-Y)/variant_generic.h
+++ b/variants/STM32F3xx/F318C8(T-Y)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F318K8U/PeripheralPins.c b/variants/STM32F3xx/F318K8U/PeripheralPins.c
index e8c5e93ce7..4e4b74f65c 100644
--- a/variants/STM32F3xx/F318K8U/PeripheralPins.c
+++ b/variants/STM32F3xx/F318K8U/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F318K8Ux.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F3xx/F318K8U/variant_generic.cpp b/variants/STM32F3xx/F318K8U/variant_generic.cpp
index c536327297..6fba7dfc69 100644
--- a/variants/STM32F3xx/F318K8U/variant_generic.cpp
+++ b/variants/STM32F3xx/F318K8U/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F318K8U/variant_generic.h b/variants/STM32F3xx/F318K8U/variant_generic.h
index 6ea8e19e34..48237fd7a3 100644
--- a/variants/STM32F3xx/F318K8U/variant_generic.h
+++ b/variants/STM32F3xx/F318K8U/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F328C8T/PeripheralPins.c b/variants/STM32F3xx/F328C8T/PeripheralPins.c
index d8ba92e632..ba4e065132 100644
--- a/variants/STM32F3xx/F328C8T/PeripheralPins.c
+++ b/variants/STM32F3xx/F328C8T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F328C8Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F3xx/F328C8T/variant_generic.cpp b/variants/STM32F3xx/F328C8T/variant_generic.cpp
index fe46e4364d..e5552ac200 100644
--- a/variants/STM32F3xx/F328C8T/variant_generic.cpp
+++ b/variants/STM32F3xx/F328C8T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F328C8T/variant_generic.h b/variants/STM32F3xx/F328C8T/variant_generic.h
index a162d53089..30374bc8a9 100644
--- a/variants/STM32F3xx/F328C8T/variant_generic.h
+++ b/variants/STM32F3xx/F328C8T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F358CCT/PeripheralPins.c b/variants/STM32F3xx/F358CCT/PeripheralPins.c
index b0365969cd..2ae46a1a83 100644
--- a/variants/STM32F3xx/F358CCT/PeripheralPins.c
+++ b/variants/STM32F3xx/F358CCT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F358CCTx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F3xx/F358CCT/variant_generic.cpp b/variants/STM32F3xx/F358CCT/variant_generic.cpp
index cb3d8efed4..ad9c7ecca5 100644
--- a/variants/STM32F3xx/F358CCT/variant_generic.cpp
+++ b/variants/STM32F3xx/F358CCT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F358CCT/variant_generic.h b/variants/STM32F3xx/F358CCT/variant_generic.h
index 01f99225e9..c3beef8d5d 100644
--- a/variants/STM32F3xx/F358CCT/variant_generic.h
+++ b/variants/STM32F3xx/F358CCT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F358RCT/PeripheralPins.c b/variants/STM32F3xx/F358RCT/PeripheralPins.c
index 6c4e789c20..25888e09b3 100644
--- a/variants/STM32F3xx/F358RCT/PeripheralPins.c
+++ b/variants/STM32F3xx/F358RCT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F358RCTx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F3xx/F358RCT/variant_generic.cpp b/variants/STM32F3xx/F358RCT/variant_generic.cpp
index 574e56f764..08e93c06d7 100644
--- a/variants/STM32F3xx/F358RCT/variant_generic.cpp
+++ b/variants/STM32F3xx/F358RCT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F358RCT/variant_generic.h b/variants/STM32F3xx/F358RCT/variant_generic.h
index 8cac0782ab..3698d4fc90 100644
--- a/variants/STM32F3xx/F358RCT/variant_generic.h
+++ b/variants/STM32F3xx/F358RCT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F358VCT/PeripheralPins.c b/variants/STM32F3xx/F358VCT/PeripheralPins.c
index 6432547063..5780c07798 100644
--- a/variants/STM32F3xx/F358VCT/PeripheralPins.c
+++ b/variants/STM32F3xx/F358VCT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F358VCTx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F3xx/F358VCT/variant_generic.cpp b/variants/STM32F3xx/F358VCT/variant_generic.cpp
index 7f06ee6d7a..e5c6679f25 100644
--- a/variants/STM32F3xx/F358VCT/variant_generic.cpp
+++ b/variants/STM32F3xx/F358VCT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F358VCT/variant_generic.h b/variants/STM32F3xx/F358VCT/variant_generic.h
index 73c07d495e..d2570287dd 100644
--- a/variants/STM32F3xx/F358VCT/variant_generic.h
+++ b/variants/STM32F3xx/F358VCT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F373C(8-B-C)T/PeripheralPins.c b/variants/STM32F3xx/F373C(8-B-C)T/PeripheralPins.c
index 50c79df9db..ec01ebb5bd 100644
--- a/variants/STM32F3xx/F373C(8-B-C)T/PeripheralPins.c
+++ b/variants/STM32F3xx/F373C(8-B-C)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F373C(8-B-C)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F3xx/F373C(8-B-C)T/variant_generic.cpp b/variants/STM32F3xx/F373C(8-B-C)T/variant_generic.cpp
index 09be29ca8a..c4e533b0d6 100644
--- a/variants/STM32F3xx/F373C(8-B-C)T/variant_generic.cpp
+++ b/variants/STM32F3xx/F373C(8-B-C)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F373C(8-B-C)T/variant_generic.h b/variants/STM32F3xx/F373C(8-B-C)T/variant_generic.h
index 7fabc726ad..7771040125 100644
--- a/variants/STM32F3xx/F373C(8-B-C)T/variant_generic.h
+++ b/variants/STM32F3xx/F373C(8-B-C)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F373R(8-B-C)T/PeripheralPins.c b/variants/STM32F3xx/F373R(8-B-C)T/PeripheralPins.c
index 4e7478aeed..c09cd20d6e 100644
--- a/variants/STM32F3xx/F373R(8-B-C)T/PeripheralPins.c
+++ b/variants/STM32F3xx/F373R(8-B-C)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F373R(8-B-C)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F3xx/F373R(8-B-C)T/variant_generic.cpp b/variants/STM32F3xx/F373R(8-B-C)T/variant_generic.cpp
index 3b6e88374c..da6e1d8dd8 100644
--- a/variants/STM32F3xx/F373R(8-B-C)T/variant_generic.cpp
+++ b/variants/STM32F3xx/F373R(8-B-C)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F373R(8-B-C)T/variant_generic.h b/variants/STM32F3xx/F373R(8-B-C)T/variant_generic.h
index d612dfb7ab..9a06f60abe 100644
--- a/variants/STM32F3xx/F373R(8-B-C)T/variant_generic.h
+++ b/variants/STM32F3xx/F373R(8-B-C)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F373V(8-B-C)(H-T)/PeripheralPins.c b/variants/STM32F3xx/F373V(8-B-C)(H-T)/PeripheralPins.c
index c998ba1720..166ba0f3af 100644
--- a/variants/STM32F3xx/F373V(8-B-C)(H-T)/PeripheralPins.c
+++ b/variants/STM32F3xx/F373V(8-B-C)(H-T)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F373V(8-B-C)Hx.xml, STM32F373V(8-B-C)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F3xx/F373V(8-B-C)(H-T)/variant_generic.cpp b/variants/STM32F3xx/F373V(8-B-C)(H-T)/variant_generic.cpp
index d5b1a7315a..1f49bd5bec 100644
--- a/variants/STM32F3xx/F373V(8-B-C)(H-T)/variant_generic.cpp
+++ b/variants/STM32F3xx/F373V(8-B-C)(H-T)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F373V(8-B-C)(H-T)/variant_generic.h b/variants/STM32F3xx/F373V(8-B-C)(H-T)/variant_generic.h
index 421f89dca2..4d85ebf630 100644
--- a/variants/STM32F3xx/F373V(8-B-C)(H-T)/variant_generic.h
+++ b/variants/STM32F3xx/F373V(8-B-C)(H-T)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F378CCT/PeripheralPins.c b/variants/STM32F3xx/F378CCT/PeripheralPins.c
index 1bf5deecd8..18c6b1124b 100644
--- a/variants/STM32F3xx/F378CCT/PeripheralPins.c
+++ b/variants/STM32F3xx/F378CCT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F378CCTx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F3xx/F378CCT/variant_generic.cpp b/variants/STM32F3xx/F378CCT/variant_generic.cpp
index 7887b7efc3..5817b9d308 100644
--- a/variants/STM32F3xx/F378CCT/variant_generic.cpp
+++ b/variants/STM32F3xx/F378CCT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F378CCT/variant_generic.h b/variants/STM32F3xx/F378CCT/variant_generic.h
index ddee65241d..627c2e55ae 100644
--- a/variants/STM32F3xx/F378CCT/variant_generic.h
+++ b/variants/STM32F3xx/F378CCT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F378RC(T-Y)/PeripheralPins.c b/variants/STM32F3xx/F378RC(T-Y)/PeripheralPins.c
index 92c3f474bc..93a7602b5c 100644
--- a/variants/STM32F3xx/F378RC(T-Y)/PeripheralPins.c
+++ b/variants/STM32F3xx/F378RC(T-Y)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F378RCTx.xml, STM32F378RCYx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F3xx/F378RC(T-Y)/variant_generic.cpp b/variants/STM32F3xx/F378RC(T-Y)/variant_generic.cpp
index bb685d699e..0296a0b345 100644
--- a/variants/STM32F3xx/F378RC(T-Y)/variant_generic.cpp
+++ b/variants/STM32F3xx/F378RC(T-Y)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F378RC(T-Y)/variant_generic.h b/variants/STM32F3xx/F378RC(T-Y)/variant_generic.h
index 37e9cad904..2f1693662c 100644
--- a/variants/STM32F3xx/F378RC(T-Y)/variant_generic.h
+++ b/variants/STM32F3xx/F378RC(T-Y)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F378VC(H-T)/PeripheralPins.c b/variants/STM32F3xx/F378VC(H-T)/PeripheralPins.c
index ce2a0c63b4..5ad380c69c 100644
--- a/variants/STM32F3xx/F378VC(H-T)/PeripheralPins.c
+++ b/variants/STM32F3xx/F378VC(H-T)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F378VCHx.xml, STM32F378VCTx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F3xx/F378VC(H-T)/variant_generic.cpp b/variants/STM32F3xx/F378VC(H-T)/variant_generic.cpp
index bc078544f2..693a65fbb9 100644
--- a/variants/STM32F3xx/F378VC(H-T)/variant_generic.cpp
+++ b/variants/STM32F3xx/F378VC(H-T)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F378VC(H-T)/variant_generic.h b/variants/STM32F3xx/F378VC(H-T)/variant_generic.h
index 2dff9f94e1..f245b8fc68 100644
--- a/variants/STM32F3xx/F378VC(H-T)/variant_generic.h
+++ b/variants/STM32F3xx/F378VC(H-T)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F398VET/PeripheralPins.c b/variants/STM32F3xx/F398VET/PeripheralPins.c
index 0acd87e15f..ef1fec092b 100644
--- a/variants/STM32F3xx/F398VET/PeripheralPins.c
+++ b/variants/STM32F3xx/F398VET/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F398VETx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F3xx/F398VET/variant_generic.cpp b/variants/STM32F3xx/F398VET/variant_generic.cpp
index 6e53a6b2be..afd8efbdc6 100644
--- a/variants/STM32F3xx/F398VET/variant_generic.cpp
+++ b/variants/STM32F3xx/F398VET/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F3xx/F398VET/variant_generic.h b/variants/STM32F3xx/F398VET/variant_generic.h
index c4c29fd8d1..a8881494a8 100644
--- a/variants/STM32F3xx/F398VET/variant_generic.h
+++ b/variants/STM32F3xx/F398VET/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F401CC(F-U-Y)_F401C(B-D-E)(U-Y)/PeripheralPins.c b/variants/STM32F4xx/F401CC(F-U-Y)_F401C(B-D-E)(U-Y)/PeripheralPins.c
index 888b767ba9..947bc24d79 100644
--- a/variants/STM32F4xx/F401CC(F-U-Y)_F401C(B-D-E)(U-Y)/PeripheralPins.c
+++ b/variants/STM32F4xx/F401CC(F-U-Y)_F401C(B-D-E)(U-Y)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -14,7 +14,7 @@
  * Automatically generated from STM32F401C(B-C)Ux.xml, STM32F401C(B-C)Yx.xml
  * STM32F401C(D-E)Ux.xml, STM32F401C(D-E)Yx.xml
  * STM32F401CCFx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F4xx/F401CC(F-U-Y)_F401C(B-D-E)(U-Y)/variant_generic.cpp b/variants/STM32F4xx/F401CC(F-U-Y)_F401C(B-D-E)(U-Y)/variant_generic.cpp
index e7f107ae55..e3831dedb6 100644
--- a/variants/STM32F4xx/F401CC(F-U-Y)_F401C(B-D-E)(U-Y)/variant_generic.cpp
+++ b/variants/STM32F4xx/F401CC(F-U-Y)_F401C(B-D-E)(U-Y)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F401CC(F-U-Y)_F401C(B-D-E)(U-Y)/variant_generic.h b/variants/STM32F4xx/F401CC(F-U-Y)_F401C(B-D-E)(U-Y)/variant_generic.h
index 731bb948d9..0711b8746c 100644
--- a/variants/STM32F4xx/F401CC(F-U-Y)_F401C(B-D-E)(U-Y)/variant_generic.h
+++ b/variants/STM32F4xx/F401CC(F-U-Y)_F401C(B-D-E)(U-Y)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F401R(B-C-D-E)T/PeripheralPins.c b/variants/STM32F4xx/F401R(B-C-D-E)T/PeripheralPins.c
index b30ccf606b..ab03b1bb2c 100644
--- a/variants/STM32F4xx/F401R(B-C-D-E)T/PeripheralPins.c
+++ b/variants/STM32F4xx/F401R(B-C-D-E)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F401R(B-C)Tx.xml, STM32F401R(D-E)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F4xx/F401R(B-C-D-E)T/variant_generic.cpp b/variants/STM32F4xx/F401R(B-C-D-E)T/variant_generic.cpp
index f306339fba..44334bdba9 100644
--- a/variants/STM32F4xx/F401R(B-C-D-E)T/variant_generic.cpp
+++ b/variants/STM32F4xx/F401R(B-C-D-E)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F401R(B-C-D-E)T/variant_generic.h b/variants/STM32F4xx/F401R(B-C-D-E)T/variant_generic.h
index e554073abd..72e8aa25ad 100644
--- a/variants/STM32F4xx/F401R(B-C-D-E)T/variant_generic.h
+++ b/variants/STM32F4xx/F401R(B-C-D-E)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F401V(B-C-D-E)H/PeripheralPins.c b/variants/STM32F4xx/F401V(B-C-D-E)H/PeripheralPins.c
index ce1effbb27..4b3a670e98 100644
--- a/variants/STM32F4xx/F401V(B-C-D-E)H/PeripheralPins.c
+++ b/variants/STM32F4xx/F401V(B-C-D-E)H/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F401V(B-C)Hx.xml, STM32F401V(D-E)Hx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F4xx/F401V(B-C-D-E)H/variant_generic.cpp b/variants/STM32F4xx/F401V(B-C-D-E)H/variant_generic.cpp
index b5fe9aecba..3be69f2461 100644
--- a/variants/STM32F4xx/F401V(B-C-D-E)H/variant_generic.cpp
+++ b/variants/STM32F4xx/F401V(B-C-D-E)H/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F401V(B-C-D-E)H/variant_generic.h b/variants/STM32F4xx/F401V(B-C-D-E)H/variant_generic.h
index 9c6b940586..3c43cd1df8 100644
--- a/variants/STM32F4xx/F401V(B-C-D-E)H/variant_generic.h
+++ b/variants/STM32F4xx/F401V(B-C-D-E)H/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F401V(B-C-D-E)T/PeripheralPins.c b/variants/STM32F4xx/F401V(B-C-D-E)T/PeripheralPins.c
index 588a103fd0..d406bbf87a 100644
--- a/variants/STM32F4xx/F401V(B-C-D-E)T/PeripheralPins.c
+++ b/variants/STM32F4xx/F401V(B-C-D-E)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F401V(B-C)Tx.xml, STM32F401V(D-E)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F4xx/F401V(B-C-D-E)T/variant_generic.cpp b/variants/STM32F4xx/F401V(B-C-D-E)T/variant_generic.cpp
index 2a4a97a7ce..9f048ccb15 100644
--- a/variants/STM32F4xx/F401V(B-C-D-E)T/variant_generic.cpp
+++ b/variants/STM32F4xx/F401V(B-C-D-E)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F401V(B-C-D-E)T/variant_generic.h b/variants/STM32F4xx/F401V(B-C-D-E)T/variant_generic.h
index 95d7fdb5f4..83731ccde5 100644
--- a/variants/STM32F4xx/F401V(B-C-D-E)T/variant_generic.h
+++ b/variants/STM32F4xx/F401V(B-C-D-E)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F405O(E-G)Y_F415OGY/PeripheralPins.c b/variants/STM32F4xx/F405O(E-G)Y_F415OGY/PeripheralPins.c
index cf98feca41..4d9e855411 100644
--- a/variants/STM32F4xx/F405O(E-G)Y_F415OGY/PeripheralPins.c
+++ b/variants/STM32F4xx/F405O(E-G)Y_F415OGY/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F405O(E-G)Yx.xml, STM32F415OGYx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F4xx/F405O(E-G)Y_F415OGY/variant_generic.cpp b/variants/STM32F4xx/F405O(E-G)Y_F415OGY/variant_generic.cpp
index 920485fb16..4d7b39547d 100644
--- a/variants/STM32F4xx/F405O(E-G)Y_F415OGY/variant_generic.cpp
+++ b/variants/STM32F4xx/F405O(E-G)Y_F415OGY/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F405O(E-G)Y_F415OGY/variant_generic.h b/variants/STM32F4xx/F405O(E-G)Y_F415OGY/variant_generic.h
index a59f71456e..71de68a41e 100644
--- a/variants/STM32F4xx/F405O(E-G)Y_F415OGY/variant_generic.h
+++ b/variants/STM32F4xx/F405O(E-G)Y_F415OGY/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F405RGT_F415RGT/PeripheralPins.c b/variants/STM32F4xx/F405RGT_F415RGT/PeripheralPins.c
index 18d090045e..e0c22e0d85 100644
--- a/variants/STM32F4xx/F405RGT_F415RGT/PeripheralPins.c
+++ b/variants/STM32F4xx/F405RGT_F415RGT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F405RGTx.xml, STM32F415RGTx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F4xx/F405RGT_F415RGT/variant_generic.cpp b/variants/STM32F4xx/F405RGT_F415RGT/variant_generic.cpp
index a8fe3c9404..fec05d9019 100644
--- a/variants/STM32F4xx/F405RGT_F415RGT/variant_generic.cpp
+++ b/variants/STM32F4xx/F405RGT_F415RGT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F405RGT_F415RGT/variant_generic.h b/variants/STM32F4xx/F405RGT_F415RGT/variant_generic.h
index ab06dd4e64..0d286fd21d 100644
--- a/variants/STM32F4xx/F405RGT_F415RGT/variant_generic.h
+++ b/variants/STM32F4xx/F405RGT_F415RGT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F405VGT_F415VGT/PeripheralPins.c b/variants/STM32F4xx/F405VGT_F415VGT/PeripheralPins.c
index 19fbb3e67a..38cbbf7df2 100644
--- a/variants/STM32F4xx/F405VGT_F415VGT/PeripheralPins.c
+++ b/variants/STM32F4xx/F405VGT_F415VGT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F405VGTx.xml, STM32F415VGTx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F4xx/F405VGT_F415VGT/variant_generic.cpp b/variants/STM32F4xx/F405VGT_F415VGT/variant_generic.cpp
index 65d8db248f..7bb5e52dcd 100644
--- a/variants/STM32F4xx/F405VGT_F415VGT/variant_generic.cpp
+++ b/variants/STM32F4xx/F405VGT_F415VGT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F405VGT_F415VGT/variant_generic.h b/variants/STM32F4xx/F405VGT_F415VGT/variant_generic.h
index 923c89614a..10d49ffa88 100644
--- a/variants/STM32F4xx/F405VGT_F415VGT/variant_generic.h
+++ b/variants/STM32F4xx/F405VGT_F415VGT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F405ZGT_F415ZGT/PeripheralPins.c b/variants/STM32F4xx/F405ZGT_F415ZGT/PeripheralPins.c
index a817f22755..719a364379 100644
--- a/variants/STM32F4xx/F405ZGT_F415ZGT/PeripheralPins.c
+++ b/variants/STM32F4xx/F405ZGT_F415ZGT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F405ZGTx.xml, STM32F415ZGTx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F4xx/F405ZGT_F415ZGT/variant_generic.cpp b/variants/STM32F4xx/F405ZGT_F415ZGT/variant_generic.cpp
index 9a01944033..ccfc8cc087 100644
--- a/variants/STM32F4xx/F405ZGT_F415ZGT/variant_generic.cpp
+++ b/variants/STM32F4xx/F405ZGT_F415ZGT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F405ZGT_F415ZGT/variant_generic.h b/variants/STM32F4xx/F405ZGT_F415ZGT/variant_generic.h
index 418b770c2e..cb9781e11c 100644
--- a/variants/STM32F4xx/F405ZGT_F415ZGT/variant_generic.h
+++ b/variants/STM32F4xx/F405ZGT_F415ZGT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F407I(E-G)(H-T)_F417I(E-G)(H-T)/PeripheralPins.c b/variants/STM32F4xx/F407I(E-G)(H-T)_F417I(E-G)(H-T)/PeripheralPins.c
index 1fa24655f0..d32965c9f4 100644
--- a/variants/STM32F4xx/F407I(E-G)(H-T)_F417I(E-G)(H-T)/PeripheralPins.c
+++ b/variants/STM32F4xx/F407I(E-G)(H-T)_F417I(E-G)(H-T)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32F407I(E-G)Hx.xml, STM32F407I(E-G)Tx.xml
  * STM32F417I(E-G)Hx.xml, STM32F417I(E-G)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F4xx/F407I(E-G)(H-T)_F417I(E-G)(H-T)/variant_generic.cpp b/variants/STM32F4xx/F407I(E-G)(H-T)_F417I(E-G)(H-T)/variant_generic.cpp
index 5a1aed3115..eea681eab0 100644
--- a/variants/STM32F4xx/F407I(E-G)(H-T)_F417I(E-G)(H-T)/variant_generic.cpp
+++ b/variants/STM32F4xx/F407I(E-G)(H-T)_F417I(E-G)(H-T)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F407I(E-G)(H-T)_F417I(E-G)(H-T)/variant_generic.h b/variants/STM32F4xx/F407I(E-G)(H-T)_F417I(E-G)(H-T)/variant_generic.h
index 55a6b42511..15fcbcc4a5 100644
--- a/variants/STM32F4xx/F407I(E-G)(H-T)_F417I(E-G)(H-T)/variant_generic.h
+++ b/variants/STM32F4xx/F407I(E-G)(H-T)_F417I(E-G)(H-T)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F407V(E-G)T_F417V(E-G)T/PeripheralPins.c b/variants/STM32F4xx/F407V(E-G)T_F417V(E-G)T/PeripheralPins.c
index 0a57effed7..86acd2fb08 100644
--- a/variants/STM32F4xx/F407V(E-G)T_F417V(E-G)T/PeripheralPins.c
+++ b/variants/STM32F4xx/F407V(E-G)T_F417V(E-G)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F407V(E-G)Tx.xml, STM32F417V(E-G)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F4xx/F407V(E-G)T_F417V(E-G)T/variant_generic.cpp b/variants/STM32F4xx/F407V(E-G)T_F417V(E-G)T/variant_generic.cpp
index bd6b27ae97..8fd92d0caf 100644
--- a/variants/STM32F4xx/F407V(E-G)T_F417V(E-G)T/variant_generic.cpp
+++ b/variants/STM32F4xx/F407V(E-G)T_F417V(E-G)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F407V(E-G)T_F417V(E-G)T/variant_generic.h b/variants/STM32F4xx/F407V(E-G)T_F417V(E-G)T/variant_generic.h
index cfb557d3ec..40cc656e36 100644
--- a/variants/STM32F4xx/F407V(E-G)T_F417V(E-G)T/variant_generic.h
+++ b/variants/STM32F4xx/F407V(E-G)T_F417V(E-G)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F407Z(E-G)T_F417Z(E-G)T/PeripheralPins.c b/variants/STM32F4xx/F407Z(E-G)T_F417Z(E-G)T/PeripheralPins.c
index 229a6c7921..18c785f239 100644
--- a/variants/STM32F4xx/F407Z(E-G)T_F417Z(E-G)T/PeripheralPins.c
+++ b/variants/STM32F4xx/F407Z(E-G)T_F417Z(E-G)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F407Z(E-G)Tx.xml, STM32F417Z(E-G)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F4xx/F407Z(E-G)T_F417Z(E-G)T/variant_generic.cpp b/variants/STM32F4xx/F407Z(E-G)T_F417Z(E-G)T/variant_generic.cpp
index 4ec7c4ff0f..dd1344729d 100644
--- a/variants/STM32F4xx/F407Z(E-G)T_F417Z(E-G)T/variant_generic.cpp
+++ b/variants/STM32F4xx/F407Z(E-G)T_F417Z(E-G)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F407Z(E-G)T_F417Z(E-G)T/variant_generic.h b/variants/STM32F4xx/F407Z(E-G)T_F417Z(E-G)T/variant_generic.h
index 1febcf383d..c0d30ba5d7 100644
--- a/variants/STM32F4xx/F407Z(E-G)T_F417Z(E-G)T/variant_generic.h
+++ b/variants/STM32F4xx/F407Z(E-G)T_F417Z(E-G)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F410C(8-B)T/PeripheralPins.c b/variants/STM32F4xx/F410C(8-B)T/PeripheralPins.c
index 59b6623883..5b7cbc55ac 100644
--- a/variants/STM32F4xx/F410C(8-B)T/PeripheralPins.c
+++ b/variants/STM32F4xx/F410C(8-B)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F410C(8-B)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F4xx/F410C(8-B)T/variant_generic.cpp b/variants/STM32F4xx/F410C(8-B)T/variant_generic.cpp
index f3cb1cf15d..2ff248d1b0 100644
--- a/variants/STM32F4xx/F410C(8-B)T/variant_generic.cpp
+++ b/variants/STM32F4xx/F410C(8-B)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F410C(8-B)T/variant_generic.h b/variants/STM32F4xx/F410C(8-B)T/variant_generic.h
index f129a7c375..1602ab5497 100644
--- a/variants/STM32F4xx/F410C(8-B)T/variant_generic.h
+++ b/variants/STM32F4xx/F410C(8-B)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F410C(8-B)U/PeripheralPins.c b/variants/STM32F4xx/F410C(8-B)U/PeripheralPins.c
index 7b25420ee6..3cf45e600d 100644
--- a/variants/STM32F4xx/F410C(8-B)U/PeripheralPins.c
+++ b/variants/STM32F4xx/F410C(8-B)U/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F410C(8-B)Ux.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F4xx/F410C(8-B)U/variant_generic.cpp b/variants/STM32F4xx/F410C(8-B)U/variant_generic.cpp
index 71d7748dbc..29ce71ebdf 100644
--- a/variants/STM32F4xx/F410C(8-B)U/variant_generic.cpp
+++ b/variants/STM32F4xx/F410C(8-B)U/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F410C(8-B)U/variant_generic.h b/variants/STM32F4xx/F410C(8-B)U/variant_generic.h
index 03d395c10e..ca8359fd43 100644
--- a/variants/STM32F4xx/F410C(8-B)U/variant_generic.h
+++ b/variants/STM32F4xx/F410C(8-B)U/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F410R(8-B)(I-T)/PeripheralPins.c b/variants/STM32F4xx/F410R(8-B)(I-T)/PeripheralPins.c
index 55cca3bb20..6bd218c609 100644
--- a/variants/STM32F4xx/F410R(8-B)(I-T)/PeripheralPins.c
+++ b/variants/STM32F4xx/F410R(8-B)(I-T)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F410R(8-B)Ix.xml, STM32F410R(8-B)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F4xx/F410R(8-B)(I-T)/variant_generic.cpp b/variants/STM32F4xx/F410R(8-B)(I-T)/variant_generic.cpp
index d5c3c9859b..97f6096355 100644
--- a/variants/STM32F4xx/F410R(8-B)(I-T)/variant_generic.cpp
+++ b/variants/STM32F4xx/F410R(8-B)(I-T)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F410R(8-B)(I-T)/variant_generic.h b/variants/STM32F4xx/F410R(8-B)(I-T)/variant_generic.h
index e88a412e86..e32202f0ba 100644
--- a/variants/STM32F4xx/F410R(8-B)(I-T)/variant_generic.h
+++ b/variants/STM32F4xx/F410R(8-B)(I-T)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F410T(8-B)Y/PeripheralPins.c b/variants/STM32F4xx/F410T(8-B)Y/PeripheralPins.c
index f6d80ccd73..6f6c695da2 100644
--- a/variants/STM32F4xx/F410T(8-B)Y/PeripheralPins.c
+++ b/variants/STM32F4xx/F410T(8-B)Y/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F410T(8-B)Yx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F4xx/F410T(8-B)Y/variant_generic.cpp b/variants/STM32F4xx/F410T(8-B)Y/variant_generic.cpp
index 5e7d3281fb..3ee83ce5d0 100644
--- a/variants/STM32F4xx/F410T(8-B)Y/variant_generic.cpp
+++ b/variants/STM32F4xx/F410T(8-B)Y/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F410T(8-B)Y/variant_generic.h b/variants/STM32F4xx/F410T(8-B)Y/variant_generic.h
index 7db848c682..3ab41bd850 100644
--- a/variants/STM32F4xx/F410T(8-B)Y/variant_generic.h
+++ b/variants/STM32F4xx/F410T(8-B)Y/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F411C(C-E)(U-Y)/PeripheralPins.c b/variants/STM32F4xx/F411C(C-E)(U-Y)/PeripheralPins.c
index 83c1f8059f..3500af405b 100644
--- a/variants/STM32F4xx/F411C(C-E)(U-Y)/PeripheralPins.c
+++ b/variants/STM32F4xx/F411C(C-E)(U-Y)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F411C(C-E)Ux.xml, STM32F411C(C-E)Yx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F4xx/F411C(C-E)(U-Y)/variant_generic.cpp b/variants/STM32F4xx/F411C(C-E)(U-Y)/variant_generic.cpp
index 15578c8421..78e969278e 100644
--- a/variants/STM32F4xx/F411C(C-E)(U-Y)/variant_generic.cpp
+++ b/variants/STM32F4xx/F411C(C-E)(U-Y)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F411C(C-E)(U-Y)/variant_generic.h b/variants/STM32F4xx/F411C(C-E)(U-Y)/variant_generic.h
index 97518418b1..d521493d28 100644
--- a/variants/STM32F4xx/F411C(C-E)(U-Y)/variant_generic.h
+++ b/variants/STM32F4xx/F411C(C-E)(U-Y)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F411R(C-E)T/PeripheralPins.c b/variants/STM32F4xx/F411R(C-E)T/PeripheralPins.c
index d6774514ed..1466663e6b 100644
--- a/variants/STM32F4xx/F411R(C-E)T/PeripheralPins.c
+++ b/variants/STM32F4xx/F411R(C-E)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F411R(C-E)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F4xx/F411R(C-E)T/variant_generic.cpp b/variants/STM32F4xx/F411R(C-E)T/variant_generic.cpp
index 3da13a99d6..e52982ac20 100644
--- a/variants/STM32F4xx/F411R(C-E)T/variant_generic.cpp
+++ b/variants/STM32F4xx/F411R(C-E)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F411R(C-E)T/variant_generic.h b/variants/STM32F4xx/F411R(C-E)T/variant_generic.h
index 19de4fe8bd..f1a1cd4cf3 100644
--- a/variants/STM32F4xx/F411R(C-E)T/variant_generic.h
+++ b/variants/STM32F4xx/F411R(C-E)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F411V(C-E)H/PeripheralPins.c b/variants/STM32F4xx/F411V(C-E)H/PeripheralPins.c
index 0f60862008..a3dc8e07dd 100644
--- a/variants/STM32F4xx/F411V(C-E)H/PeripheralPins.c
+++ b/variants/STM32F4xx/F411V(C-E)H/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F411V(C-E)Hx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F4xx/F411V(C-E)H/variant_generic.cpp b/variants/STM32F4xx/F411V(C-E)H/variant_generic.cpp
index f03e839768..ae33d49e6d 100644
--- a/variants/STM32F4xx/F411V(C-E)H/variant_generic.cpp
+++ b/variants/STM32F4xx/F411V(C-E)H/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F411V(C-E)H/variant_generic.h b/variants/STM32F4xx/F411V(C-E)H/variant_generic.h
index dd7ce209b5..2802451248 100644
--- a/variants/STM32F4xx/F411V(C-E)H/variant_generic.h
+++ b/variants/STM32F4xx/F411V(C-E)H/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F411V(C-E)T/PeripheralPins.c b/variants/STM32F4xx/F411V(C-E)T/PeripheralPins.c
index 0dd8eb0e02..073f6fee88 100644
--- a/variants/STM32F4xx/F411V(C-E)T/PeripheralPins.c
+++ b/variants/STM32F4xx/F411V(C-E)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F411V(C-E)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F4xx/F411V(C-E)T/variant_generic.cpp b/variants/STM32F4xx/F411V(C-E)T/variant_generic.cpp
index 7cf615b0e0..0e22a34166 100644
--- a/variants/STM32F4xx/F411V(C-E)T/variant_generic.cpp
+++ b/variants/STM32F4xx/F411V(C-E)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F411V(C-E)T/variant_generic.h b/variants/STM32F4xx/F411V(C-E)T/variant_generic.h
index cdfbf6ce70..b295c42e1c 100644
--- a/variants/STM32F4xx/F411V(C-E)T/variant_generic.h
+++ b/variants/STM32F4xx/F411V(C-E)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F412C(E-G)U/PeripheralPins.c b/variants/STM32F4xx/F412C(E-G)U/PeripheralPins.c
index 1149512bfa..6d8add1adc 100644
--- a/variants/STM32F4xx/F412C(E-G)U/PeripheralPins.c
+++ b/variants/STM32F4xx/F412C(E-G)U/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F412C(E-G)Ux.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F4xx/F412C(E-G)U/variant_generic.cpp b/variants/STM32F4xx/F412C(E-G)U/variant_generic.cpp
index 395cfc13ef..1977ddc34b 100644
--- a/variants/STM32F4xx/F412C(E-G)U/variant_generic.cpp
+++ b/variants/STM32F4xx/F412C(E-G)U/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F412C(E-G)U/variant_generic.h b/variants/STM32F4xx/F412C(E-G)U/variant_generic.h
index 740d052bef..0e3786c5e8 100644
--- a/variants/STM32F4xx/F412C(E-G)U/variant_generic.h
+++ b/variants/STM32F4xx/F412C(E-G)U/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F412R(E-G)(T-Y)x(P)/PeripheralPins.c b/variants/STM32F4xx/F412R(E-G)(T-Y)x(P)/PeripheralPins.c
index a86dd34631..09c5eff60a 100644
--- a/variants/STM32F4xx/F412R(E-G)(T-Y)x(P)/PeripheralPins.c
+++ b/variants/STM32F4xx/F412R(E-G)(T-Y)x(P)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32F412R(E-G)Tx.xml, STM32F412R(E-G)Yx.xml
  * STM32F412R(E-G)YxP.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F4xx/F412R(E-G)(T-Y)x(P)/variant_generic.cpp b/variants/STM32F4xx/F412R(E-G)(T-Y)x(P)/variant_generic.cpp
index ca9f91d235..66604d2e99 100644
--- a/variants/STM32F4xx/F412R(E-G)(T-Y)x(P)/variant_generic.cpp
+++ b/variants/STM32F4xx/F412R(E-G)(T-Y)x(P)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F412R(E-G)(T-Y)x(P)/variant_generic.h b/variants/STM32F4xx/F412R(E-G)(T-Y)x(P)/variant_generic.h
index 5e8dabb3fe..012b9487b7 100644
--- a/variants/STM32F4xx/F412R(E-G)(T-Y)x(P)/variant_generic.h
+++ b/variants/STM32F4xx/F412R(E-G)(T-Y)x(P)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F412V(E-G)H/PeripheralPins.c b/variants/STM32F4xx/F412V(E-G)H/PeripheralPins.c
index 96388ee26b..bed1a75a86 100644
--- a/variants/STM32F4xx/F412V(E-G)H/PeripheralPins.c
+++ b/variants/STM32F4xx/F412V(E-G)H/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F412V(E-G)Hx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F4xx/F412V(E-G)H/variant_generic.cpp b/variants/STM32F4xx/F412V(E-G)H/variant_generic.cpp
index 806500a36b..6c0c0bea56 100644
--- a/variants/STM32F4xx/F412V(E-G)H/variant_generic.cpp
+++ b/variants/STM32F4xx/F412V(E-G)H/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F412V(E-G)H/variant_generic.h b/variants/STM32F4xx/F412V(E-G)H/variant_generic.h
index 5e14d13379..dac0f3215b 100644
--- a/variants/STM32F4xx/F412V(E-G)H/variant_generic.h
+++ b/variants/STM32F4xx/F412V(E-G)H/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F412V(E-G)T/PeripheralPins.c b/variants/STM32F4xx/F412V(E-G)T/PeripheralPins.c
index 8d4ad19434..4c600d2992 100644
--- a/variants/STM32F4xx/F412V(E-G)T/PeripheralPins.c
+++ b/variants/STM32F4xx/F412V(E-G)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F412V(E-G)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F4xx/F412V(E-G)T/variant_generic.cpp b/variants/STM32F4xx/F412V(E-G)T/variant_generic.cpp
index 9f124a5d29..40f24d2793 100644
--- a/variants/STM32F4xx/F412V(E-G)T/variant_generic.cpp
+++ b/variants/STM32F4xx/F412V(E-G)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F412V(E-G)T/variant_generic.h b/variants/STM32F4xx/F412V(E-G)T/variant_generic.h
index f27cb735e3..ce20f92447 100644
--- a/variants/STM32F4xx/F412V(E-G)T/variant_generic.h
+++ b/variants/STM32F4xx/F412V(E-G)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F412Z(E-G)(J-T)/PeripheralPins.c b/variants/STM32F4xx/F412Z(E-G)(J-T)/PeripheralPins.c
index f50f5311f1..3d36c8c5c6 100644
--- a/variants/STM32F4xx/F412Z(E-G)(J-T)/PeripheralPins.c
+++ b/variants/STM32F4xx/F412Z(E-G)(J-T)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F412Z(E-G)Jx.xml, STM32F412Z(E-G)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F4xx/F412Z(E-G)(J-T)/variant_generic.cpp b/variants/STM32F4xx/F412Z(E-G)(J-T)/variant_generic.cpp
index 0a86930450..a327bd3105 100644
--- a/variants/STM32F4xx/F412Z(E-G)(J-T)/variant_generic.cpp
+++ b/variants/STM32F4xx/F412Z(E-G)(J-T)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F412Z(E-G)(J-T)/variant_generic.h b/variants/STM32F4xx/F412Z(E-G)(J-T)/variant_generic.h
index 54f333aadd..56a49e0a72 100644
--- a/variants/STM32F4xx/F412Z(E-G)(J-T)/variant_generic.h
+++ b/variants/STM32F4xx/F412Z(E-G)(J-T)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F413C(G-H)U_F423CHU/PeripheralPins.c b/variants/STM32F4xx/F413C(G-H)U_F423CHU/PeripheralPins.c
index 596a893653..e06d56c948 100644
--- a/variants/STM32F4xx/F413C(G-H)U_F423CHU/PeripheralPins.c
+++ b/variants/STM32F4xx/F413C(G-H)U_F423CHU/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F413C(G-H)Ux.xml, STM32F423CHUx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F4xx/F413C(G-H)U_F423CHU/variant_generic.cpp b/variants/STM32F4xx/F413C(G-H)U_F423CHU/variant_generic.cpp
index f2cd50645c..dbabb8718d 100644
--- a/variants/STM32F4xx/F413C(G-H)U_F423CHU/variant_generic.cpp
+++ b/variants/STM32F4xx/F413C(G-H)U_F423CHU/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F413C(G-H)U_F423CHU/variant_generic.h b/variants/STM32F4xx/F413C(G-H)U_F423CHU/variant_generic.h
index a6d3ea2cea..a2fc290a8f 100644
--- a/variants/STM32F4xx/F413C(G-H)U_F423CHU/variant_generic.h
+++ b/variants/STM32F4xx/F413C(G-H)U_F423CHU/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F413M(G-H)Y_F423MHY/PeripheralPins.c b/variants/STM32F4xx/F413M(G-H)Y_F423MHY/PeripheralPins.c
index 183c80b4b4..982f88191a 100644
--- a/variants/STM32F4xx/F413M(G-H)Y_F423MHY/PeripheralPins.c
+++ b/variants/STM32F4xx/F413M(G-H)Y_F423MHY/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F413M(G-H)Yx.xml, STM32F423MHYx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
@@ -330,7 +330,7 @@ WEAK const PinMap PinMap_CAN_TD[] = {
 
 #ifdef HAL_QSPI_MODULE_ENABLED
 WEAK const PinMap PinMap_QUADSPI_DATA0[] = {
-  {PA_6, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // QUADSPI_BK2_IO0
+  {PA_6, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK2_IO0
   {PC_9, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO0
   {NC,   NP,      0}
 };
@@ -338,7 +338,7 @@ WEAK const PinMap PinMap_QUADSPI_DATA0[] = {
 
 #ifdef HAL_QSPI_MODULE_ENABLED
 WEAK const PinMap PinMap_QUADSPI_DATA1[] = {
-  {PA_7,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // QUADSPI_BK2_IO1
+  {PA_7,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK2_IO1
   {PC_10, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO1
   {NC,    NP,      0}
 };
@@ -346,9 +346,9 @@ WEAK const PinMap PinMap_QUADSPI_DATA1[] = {
 
 #ifdef HAL_QSPI_MODULE_ENABLED
 WEAK const PinMap PinMap_QUADSPI_DATA2[] = {
-  {PC_4, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // QUADSPI_BK2_IO2
+  {PC_4, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK2_IO2
   {PC_8, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO2
-  {PE_9, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // QUADSPI_BK2_IO2
+  {PE_9, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK2_IO2
   {NC,   NP,      0}
 };
 #endif
@@ -356,8 +356,8 @@ WEAK const PinMap PinMap_QUADSPI_DATA2[] = {
 #ifdef HAL_QSPI_MODULE_ENABLED
 WEAK const PinMap PinMap_QUADSPI_DATA3[] = {
   {PA_1,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO3
-  {PC_5,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // QUADSPI_BK2_IO3
-  {PE_10, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // QUADSPI_BK2_IO3
+  {PC_5,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK2_IO3
+  {PE_10, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK2_IO3
   {NC,    NP,      0}
 };
 #endif
@@ -372,7 +372,7 @@ WEAK const PinMap PinMap_QUADSPI_SCLK[] = {
 
 #ifdef HAL_QSPI_MODULE_ENABLED
 WEAK const PinMap PinMap_QUADSPI_SSEL[] = {
-  {PB_6,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // QUADSPI_BK1_NCS
+  {PB_6,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK1_NCS
   {PC_11, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK2_NCS
   {NC,    NP,      0}
 };
diff --git a/variants/STM32F4xx/F413M(G-H)Y_F423MHY/variant_generic.cpp b/variants/STM32F4xx/F413M(G-H)Y_F423MHY/variant_generic.cpp
index 4bb006c42d..a9e6264b79 100644
--- a/variants/STM32F4xx/F413M(G-H)Y_F423MHY/variant_generic.cpp
+++ b/variants/STM32F4xx/F413M(G-H)Y_F423MHY/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F413M(G-H)Y_F423MHY/variant_generic.h b/variants/STM32F4xx/F413M(G-H)Y_F423MHY/variant_generic.h
index cb74cad3bc..9af368680a 100644
--- a/variants/STM32F4xx/F413M(G-H)Y_F423MHY/variant_generic.h
+++ b/variants/STM32F4xx/F413M(G-H)Y_F423MHY/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F413R(G-H)T_F423RHT/PeripheralPins.c b/variants/STM32F4xx/F413R(G-H)T_F423RHT/PeripheralPins.c
index 85fa88b8f8..408d962b9d 100644
--- a/variants/STM32F4xx/F413R(G-H)T_F423RHT/PeripheralPins.c
+++ b/variants/STM32F4xx/F413R(G-H)T_F423RHT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F413R(G-H)Tx.xml, STM32F423RHTx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
@@ -312,7 +312,7 @@ WEAK const PinMap PinMap_CAN_TD[] = {
 
 #ifdef HAL_QSPI_MODULE_ENABLED
 WEAK const PinMap PinMap_QUADSPI_DATA0[] = {
-  {PA_6, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // QUADSPI_BK2_IO0
+  {PA_6, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK2_IO0
   {PC_9, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO0
   {NC,   NP,      0}
 };
@@ -320,7 +320,7 @@ WEAK const PinMap PinMap_QUADSPI_DATA0[] = {
 
 #ifdef HAL_QSPI_MODULE_ENABLED
 WEAK const PinMap PinMap_QUADSPI_DATA1[] = {
-  {PA_7,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // QUADSPI_BK2_IO1
+  {PA_7,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK2_IO1
   {PC_10, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO1
   {NC,    NP,      0}
 };
@@ -328,7 +328,7 @@ WEAK const PinMap PinMap_QUADSPI_DATA1[] = {
 
 #ifdef HAL_QSPI_MODULE_ENABLED
 WEAK const PinMap PinMap_QUADSPI_DATA2[] = {
-  {PC_4, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // QUADSPI_BK2_IO2
+  {PC_4, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK2_IO2
   {PC_8, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO2
   {NC,   NP,      0}
 };
@@ -337,7 +337,7 @@ WEAK const PinMap PinMap_QUADSPI_DATA2[] = {
 #ifdef HAL_QSPI_MODULE_ENABLED
 WEAK const PinMap PinMap_QUADSPI_DATA3[] = {
   {PA_1, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO3
-  {PC_5, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // QUADSPI_BK2_IO3
+  {PC_5, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK2_IO3
   {NC,   NP,      0}
 };
 #endif
@@ -352,7 +352,7 @@ WEAK const PinMap PinMap_QUADSPI_SCLK[] = {
 
 #ifdef HAL_QSPI_MODULE_ENABLED
 WEAK const PinMap PinMap_QUADSPI_SSEL[] = {
-  {PB_6,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // QUADSPI_BK1_NCS
+  {PB_6,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK1_NCS
   {PC_11, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK2_NCS
   {NC,    NP,      0}
 };
diff --git a/variants/STM32F4xx/F413R(G-H)T_F423RHT/variant_generic.cpp b/variants/STM32F4xx/F413R(G-H)T_F423RHT/variant_generic.cpp
index 874067bff4..535f77617c 100644
--- a/variants/STM32F4xx/F413R(G-H)T_F423RHT/variant_generic.cpp
+++ b/variants/STM32F4xx/F413R(G-H)T_F423RHT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F413R(G-H)T_F423RHT/variant_generic.h b/variants/STM32F4xx/F413R(G-H)T_F423RHT/variant_generic.h
index c7baca687e..58ae88f093 100644
--- a/variants/STM32F4xx/F413R(G-H)T_F423RHT/variant_generic.h
+++ b/variants/STM32F4xx/F413R(G-H)T_F423RHT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F413V(G-H)H_F423VHH/PeripheralPins.c b/variants/STM32F4xx/F413V(G-H)H_F423VHH/PeripheralPins.c
index dd2b595dd9..d4d0f14e9c 100644
--- a/variants/STM32F4xx/F413V(G-H)H_F423VHH/PeripheralPins.c
+++ b/variants/STM32F4xx/F413V(G-H)H_F423VHH/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F413V(G-H)Hx.xml, STM32F423VHHx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
@@ -366,30 +366,30 @@ WEAK const PinMap PinMap_CAN_TD[] = {
 
 #ifdef HAL_QSPI_MODULE_ENABLED
 WEAK const PinMap PinMap_QUADSPI_DATA0[] = {
-  {PA_6,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // QUADSPI_BK2_IO0
+  {PA_6,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK2_IO0
   {PC_9,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO0
   {PD_11, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO0
-  {PE_7,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // QUADSPI_BK2_IO0
+  {PE_7,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK2_IO0
   {NC,    NP,      0}
 };
 #endif
 
 #ifdef HAL_QSPI_MODULE_ENABLED
 WEAK const PinMap PinMap_QUADSPI_DATA1[] = {
-  {PA_7,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // QUADSPI_BK2_IO1
+  {PA_7,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK2_IO1
   {PC_10, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO1
   {PD_12, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO1
-  {PE_8,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // QUADSPI_BK2_IO1
+  {PE_8,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK2_IO1
   {NC,    NP,      0}
 };
 #endif
 
 #ifdef HAL_QSPI_MODULE_ENABLED
 WEAK const PinMap PinMap_QUADSPI_DATA2[] = {
-  {PC_4, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // QUADSPI_BK2_IO2
+  {PC_4, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK2_IO2
   {PC_8, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO2
   {PE_2, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO2
-  {PE_9, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // QUADSPI_BK2_IO2
+  {PE_9, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK2_IO2
   {NC,   NP,      0}
 };
 #endif
@@ -397,9 +397,9 @@ WEAK const PinMap PinMap_QUADSPI_DATA2[] = {
 #ifdef HAL_QSPI_MODULE_ENABLED
 WEAK const PinMap PinMap_QUADSPI_DATA3[] = {
   {PA_1,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO3
-  {PC_5,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // QUADSPI_BK2_IO3
+  {PC_5,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK2_IO3
   {PD_13, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO3
-  {PE_10, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // QUADSPI_BK2_IO3
+  {PE_10, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK2_IO3
   {NC,    NP,      0}
 };
 #endif
@@ -415,7 +415,7 @@ WEAK const PinMap PinMap_QUADSPI_SCLK[] = {
 
 #ifdef HAL_QSPI_MODULE_ENABLED
 WEAK const PinMap PinMap_QUADSPI_SSEL[] = {
-  {PB_6,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // QUADSPI_BK1_NCS
+  {PB_6,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK1_NCS
   {PC_11, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK2_NCS
   {NC,    NP,      0}
 };
diff --git a/variants/STM32F4xx/F413V(G-H)H_F423VHH/variant_generic.cpp b/variants/STM32F4xx/F413V(G-H)H_F423VHH/variant_generic.cpp
index 4fc229d3ae..20aa7ea972 100644
--- a/variants/STM32F4xx/F413V(G-H)H_F423VHH/variant_generic.cpp
+++ b/variants/STM32F4xx/F413V(G-H)H_F423VHH/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F413V(G-H)H_F423VHH/variant_generic.h b/variants/STM32F4xx/F413V(G-H)H_F423VHH/variant_generic.h
index 57e9b304ff..428a034b54 100644
--- a/variants/STM32F4xx/F413V(G-H)H_F423VHH/variant_generic.h
+++ b/variants/STM32F4xx/F413V(G-H)H_F423VHH/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F413V(G-H)T_F423VHT/PeripheralPins.c b/variants/STM32F4xx/F413V(G-H)T_F423VHT/PeripheralPins.c
index 1e5a2af2bd..0012843809 100644
--- a/variants/STM32F4xx/F413V(G-H)T_F423VHT/PeripheralPins.c
+++ b/variants/STM32F4xx/F413V(G-H)T_F423VHT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F413V(G-H)Tx.xml, STM32F423VHTx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
@@ -364,30 +364,30 @@ WEAK const PinMap PinMap_CAN_TD[] = {
 
 #ifdef HAL_QSPI_MODULE_ENABLED
 WEAK const PinMap PinMap_QUADSPI_DATA0[] = {
-  {PA_6,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // QUADSPI_BK2_IO0
+  {PA_6,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK2_IO0
   {PC_9,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO0
   {PD_11, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO0
-  {PE_7,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // QUADSPI_BK2_IO0
+  {PE_7,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK2_IO0
   {NC,    NP,      0}
 };
 #endif
 
 #ifdef HAL_QSPI_MODULE_ENABLED
 WEAK const PinMap PinMap_QUADSPI_DATA1[] = {
-  {PA_7,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // QUADSPI_BK2_IO1
+  {PA_7,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK2_IO1
   {PC_10, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO1
   {PD_12, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO1
-  {PE_8,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // QUADSPI_BK2_IO1
+  {PE_8,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK2_IO1
   {NC,    NP,      0}
 };
 #endif
 
 #ifdef HAL_QSPI_MODULE_ENABLED
 WEAK const PinMap PinMap_QUADSPI_DATA2[] = {
-  {PC_4, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // QUADSPI_BK2_IO2
+  {PC_4, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK2_IO2
   {PC_8, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO2
   {PE_2, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO2
-  {PE_9, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // QUADSPI_BK2_IO2
+  {PE_9, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK2_IO2
   {NC,   NP,      0}
 };
 #endif
@@ -395,9 +395,9 @@ WEAK const PinMap PinMap_QUADSPI_DATA2[] = {
 #ifdef HAL_QSPI_MODULE_ENABLED
 WEAK const PinMap PinMap_QUADSPI_DATA3[] = {
   {PA_1,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO3
-  {PC_5,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // QUADSPI_BK2_IO3
+  {PC_5,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK2_IO3
   {PD_13, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO3
-  {PE_10, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // QUADSPI_BK2_IO3
+  {PE_10, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK2_IO3
   {NC,    NP,      0}
 };
 #endif
@@ -413,7 +413,7 @@ WEAK const PinMap PinMap_QUADSPI_SCLK[] = {
 
 #ifdef HAL_QSPI_MODULE_ENABLED
 WEAK const PinMap PinMap_QUADSPI_SSEL[] = {
-  {PB_6,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // QUADSPI_BK1_NCS
+  {PB_6,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK1_NCS
   {PC_11, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK2_NCS
   {NC,    NP,      0}
 };
diff --git a/variants/STM32F4xx/F413V(G-H)T_F423VHT/variant_generic.cpp b/variants/STM32F4xx/F413V(G-H)T_F423VHT/variant_generic.cpp
index 393be409a2..24f7538e77 100644
--- a/variants/STM32F4xx/F413V(G-H)T_F423VHT/variant_generic.cpp
+++ b/variants/STM32F4xx/F413V(G-H)T_F423VHT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F413V(G-H)T_F423VHT/variant_generic.h b/variants/STM32F4xx/F413V(G-H)T_F423VHT/variant_generic.h
index 2b03d27511..c5fae319e9 100644
--- a/variants/STM32F4xx/F413V(G-H)T_F423VHT/variant_generic.h
+++ b/variants/STM32F4xx/F413V(G-H)T_F423VHT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F413Z(G-H)(J-T)_F423ZH(J-T)/PeripheralPins.c b/variants/STM32F4xx/F413Z(G-H)(J-T)_F423ZH(J-T)/PeripheralPins.c
index 826d5a3ae7..db8b1664a6 100644
--- a/variants/STM32F4xx/F413Z(G-H)(J-T)_F423ZH(J-T)/PeripheralPins.c
+++ b/variants/STM32F4xx/F413Z(G-H)(J-T)_F423ZH(J-T)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32F413Z(G-H)Jx.xml, STM32F413Z(G-H)Tx.xml
  * STM32F423ZHJx.xml, STM32F423ZHTx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
@@ -396,32 +396,32 @@ WEAK const PinMap PinMap_CAN_TD[] = {
 
 #ifdef HAL_QSPI_MODULE_ENABLED
 WEAK const PinMap PinMap_QUADSPI_DATA0[] = {
-  {PA_6,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // QUADSPI_BK2_IO0
+  {PA_6,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK2_IO0
   {PC_9,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO0
   {PD_11, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO0
-  {PE_7,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // QUADSPI_BK2_IO0
-  {PF_8,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // QUADSPI_BK1_IO0
+  {PE_7,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK2_IO0
+  {PF_8,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK1_IO0
   {NC,    NP,      0}
 };
 #endif
 
 #ifdef HAL_QSPI_MODULE_ENABLED
 WEAK const PinMap PinMap_QUADSPI_DATA1[] = {
-  {PA_7,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // QUADSPI_BK2_IO1
+  {PA_7,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK2_IO1
   {PC_10, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO1
   {PD_12, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO1
-  {PE_8,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // QUADSPI_BK2_IO1
-  {PF_9,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // QUADSPI_BK1_IO1
+  {PE_8,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK2_IO1
+  {PF_9,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK1_IO1
   {NC,    NP,      0}
 };
 #endif
 
 #ifdef HAL_QSPI_MODULE_ENABLED
 WEAK const PinMap PinMap_QUADSPI_DATA2[] = {
-  {PC_4, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // QUADSPI_BK2_IO2
+  {PC_4, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK2_IO2
   {PC_8, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO2
   {PE_2, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO2
-  {PE_9, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // QUADSPI_BK2_IO2
+  {PE_9, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK2_IO2
   {PF_7, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO2
   {PG_9, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK2_IO2
   {NC,   NP,      0}
@@ -431,9 +431,9 @@ WEAK const PinMap PinMap_QUADSPI_DATA2[] = {
 #ifdef HAL_QSPI_MODULE_ENABLED
 WEAK const PinMap PinMap_QUADSPI_DATA3[] = {
   {PA_1,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO3
-  {PC_5,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // QUADSPI_BK2_IO3
+  {PC_5,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK2_IO3
   {PD_13, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO3
-  {PE_10, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // QUADSPI_BK2_IO3
+  {PE_10, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK2_IO3
   {PF_6,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO3
   {PG_14, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK2_IO3
   {NC,    NP,      0}
@@ -451,9 +451,9 @@ WEAK const PinMap PinMap_QUADSPI_SCLK[] = {
 
 #ifdef HAL_QSPI_MODULE_ENABLED
 WEAK const PinMap PinMap_QUADSPI_SSEL[] = {
-  {PB_6,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // QUADSPI_BK1_NCS
+  {PB_6,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK1_NCS
   {PC_11, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK2_NCS
-  {PG_6,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // QUADSPI_BK1_NCS
+  {PG_6,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK1_NCS
   {NC,    NP,      0}
 };
 #endif
diff --git a/variants/STM32F4xx/F413Z(G-H)(J-T)_F423ZH(J-T)/variant_generic.cpp b/variants/STM32F4xx/F413Z(G-H)(J-T)_F423ZH(J-T)/variant_generic.cpp
index 481319921e..78420068ba 100644
--- a/variants/STM32F4xx/F413Z(G-H)(J-T)_F423ZH(J-T)/variant_generic.cpp
+++ b/variants/STM32F4xx/F413Z(G-H)(J-T)_F423ZH(J-T)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F413Z(G-H)(J-T)_F423ZH(J-T)/variant_generic.h b/variants/STM32F4xx/F413Z(G-H)(J-T)_F423ZH(J-T)/variant_generic.h
index e3fa988aba..7080232015 100644
--- a/variants/STM32F4xx/F413Z(G-H)(J-T)_F423ZH(J-T)/variant_generic.h
+++ b/variants/STM32F4xx/F413Z(G-H)(J-T)_F423ZH(J-T)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F427A(G-I)H_F429A(G-I)H_F437AIH_F439AIH/PeripheralPins.c b/variants/STM32F4xx/F427A(G-I)H_F429A(G-I)H_F437AIH_F439AIH/PeripheralPins.c
index efc01d219b..9261c6c955 100644
--- a/variants/STM32F4xx/F427A(G-I)H_F429A(G-I)H_F437AIH_F439AIH/PeripheralPins.c
+++ b/variants/STM32F4xx/F427A(G-I)H_F429A(G-I)H_F437AIH_F439AIH/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32F427A(G-I)Hx.xml, STM32F429A(G-I)Hx.xml
  * STM32F437AIHx.xml, STM32F439AIHx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F4xx/F427A(G-I)H_F429A(G-I)H_F437AIH_F439AIH/variant_generic.cpp b/variants/STM32F4xx/F427A(G-I)H_F429A(G-I)H_F437AIH_F439AIH/variant_generic.cpp
index e780654d39..0c1b93d849 100644
--- a/variants/STM32F4xx/F427A(G-I)H_F429A(G-I)H_F437AIH_F439AIH/variant_generic.cpp
+++ b/variants/STM32F4xx/F427A(G-I)H_F429A(G-I)H_F437AIH_F439AIH/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F427A(G-I)H_F429A(G-I)H_F437AIH_F439AIH/variant_generic.h b/variants/STM32F4xx/F427A(G-I)H_F429A(G-I)H_F437AIH_F439AIH/variant_generic.h
index 642adcf399..0252bfb49a 100644
--- a/variants/STM32F4xx/F427A(G-I)H_F429A(G-I)H_F437AIH_F439AIH/variant_generic.h
+++ b/variants/STM32F4xx/F427A(G-I)H_F429A(G-I)H_F437AIH_F439AIH/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F427I(G-I)(H-T)_F429I(E-G-I)(H-T)_F437I(G-I)(H-T)_F439I(G-I)(H-T)/PeripheralPins.c b/variants/STM32F4xx/F427I(G-I)(H-T)_F429I(E-G-I)(H-T)_F437I(G-I)(H-T)_F439I(G-I)(H-T)/PeripheralPins.c
index 554f19edc8..661ded1d89 100644
--- a/variants/STM32F4xx/F427I(G-I)(H-T)_F429I(E-G-I)(H-T)_F437I(G-I)(H-T)_F439I(G-I)(H-T)/PeripheralPins.c
+++ b/variants/STM32F4xx/F427I(G-I)(H-T)_F429I(E-G-I)(H-T)_F437I(G-I)(H-T)_F439I(G-I)(H-T)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -18,7 +18,7 @@
  * STM32F437I(G-I)Hx.xml, STM32F437I(G-I)Tx.xml
  * STM32F439B(G-I)Tx.xml, STM32F439I(G-I)Hx.xml
  * STM32F439I(G-I)Tx.xml, STM32F439N(G-I)Hx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F4xx/F427I(G-I)(H-T)_F429I(E-G-I)(H-T)_F437I(G-I)(H-T)_F439I(G-I)(H-T)/variant_generic.cpp b/variants/STM32F4xx/F427I(G-I)(H-T)_F429I(E-G-I)(H-T)_F437I(G-I)(H-T)_F439I(G-I)(H-T)/variant_generic.cpp
index 0836709090..69dacf4cb4 100644
--- a/variants/STM32F4xx/F427I(G-I)(H-T)_F429I(E-G-I)(H-T)_F437I(G-I)(H-T)_F439I(G-I)(H-T)/variant_generic.cpp
+++ b/variants/STM32F4xx/F427I(G-I)(H-T)_F429I(E-G-I)(H-T)_F437I(G-I)(H-T)_F439I(G-I)(H-T)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F427I(G-I)(H-T)_F429I(E-G-I)(H-T)_F437I(G-I)(H-T)_F439I(G-I)(H-T)/variant_generic.h b/variants/STM32F4xx/F427I(G-I)(H-T)_F429I(E-G-I)(H-T)_F437I(G-I)(H-T)_F439I(G-I)(H-T)/variant_generic.h
index 55a6b42511..15fcbcc4a5 100644
--- a/variants/STM32F4xx/F427I(G-I)(H-T)_F429I(E-G-I)(H-T)_F437I(G-I)(H-T)_F439I(G-I)(H-T)/variant_generic.h
+++ b/variants/STM32F4xx/F427I(G-I)(H-T)_F429I(E-G-I)(H-T)_F437I(G-I)(H-T)_F439I(G-I)(H-T)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F427V(G-I)T_F429V(E-G-I)T_F437V(G-I)T_F439V(G-I)T/PeripheralPins.c b/variants/STM32F4xx/F427V(G-I)T_F429V(E-G-I)T_F437V(G-I)T_F439V(G-I)T/PeripheralPins.c
index 942df0f83b..527fc2f80f 100644
--- a/variants/STM32F4xx/F427V(G-I)T_F429V(E-G-I)T_F437V(G-I)T_F439V(G-I)T/PeripheralPins.c
+++ b/variants/STM32F4xx/F427V(G-I)T_F429V(E-G-I)T_F437V(G-I)T_F439V(G-I)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -14,7 +14,7 @@
  * Automatically generated from STM32F427V(G-I)Tx.xml, STM32F429V(E-G)Tx.xml
  * STM32F429VITx.xml, STM32F437V(G-I)Tx.xml
  * STM32F439V(G-I)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F4xx/F427V(G-I)T_F429V(E-G-I)T_F437V(G-I)T_F439V(G-I)T/variant_generic.cpp b/variants/STM32F4xx/F427V(G-I)T_F429V(E-G-I)T_F437V(G-I)T_F439V(G-I)T/variant_generic.cpp
index ed6c838b44..a62d940867 100644
--- a/variants/STM32F4xx/F427V(G-I)T_F429V(E-G-I)T_F437V(G-I)T_F439V(G-I)T/variant_generic.cpp
+++ b/variants/STM32F4xx/F427V(G-I)T_F429V(E-G-I)T_F437V(G-I)T_F439V(G-I)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F427V(G-I)T_F429V(E-G-I)T_F437V(G-I)T_F439V(G-I)T/variant_generic.h b/variants/STM32F4xx/F427V(G-I)T_F429V(E-G-I)T_F437V(G-I)T_F439V(G-I)T/variant_generic.h
index cfb557d3ec..40cc656e36 100644
--- a/variants/STM32F4xx/F427V(G-I)T_F429V(E-G-I)T_F437V(G-I)T_F439V(G-I)T/variant_generic.h
+++ b/variants/STM32F4xx/F427V(G-I)T_F429V(E-G-I)T_F437V(G-I)T_F439V(G-I)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F427Z(G-I)T_F429ZET_F429Z(G-I)(T-Y)_F437Z(G-I)T_F439Z(G-I)(T-Y)/PeripheralPins.c b/variants/STM32F4xx/F427Z(G-I)T_F429ZET_F429Z(G-I)(T-Y)_F437Z(G-I)T_F439Z(G-I)(T-Y)/PeripheralPins.c
index aed0625add..3d718c2828 100644
--- a/variants/STM32F4xx/F427Z(G-I)T_F429ZET_F429Z(G-I)(T-Y)_F437Z(G-I)T_F439Z(G-I)(T-Y)/PeripheralPins.c
+++ b/variants/STM32F4xx/F427Z(G-I)T_F429ZET_F429Z(G-I)(T-Y)_F437Z(G-I)T_F439Z(G-I)(T-Y)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -15,7 +15,7 @@
  * STM32F429ZGYx.xml, STM32F429ZITx.xml
  * STM32F429ZIYx.xml, STM32F437Z(G-I)Tx.xml
  * STM32F439Z(G-I)Tx.xml, STM32F439Z(G-I)Yx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F4xx/F427Z(G-I)T_F429ZET_F429Z(G-I)(T-Y)_F437Z(G-I)T_F439Z(G-I)(T-Y)/variant_generic.cpp b/variants/STM32F4xx/F427Z(G-I)T_F429ZET_F429Z(G-I)(T-Y)_F437Z(G-I)T_F439Z(G-I)(T-Y)/variant_generic.cpp
index 23e63873a7..ad0ac0a0eb 100644
--- a/variants/STM32F4xx/F427Z(G-I)T_F429ZET_F429Z(G-I)(T-Y)_F437Z(G-I)T_F439Z(G-I)(T-Y)/variant_generic.cpp
+++ b/variants/STM32F4xx/F427Z(G-I)T_F429ZET_F429Z(G-I)(T-Y)_F437Z(G-I)T_F439Z(G-I)(T-Y)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F427Z(G-I)T_F429ZET_F429Z(G-I)(T-Y)_F437Z(G-I)T_F439Z(G-I)(T-Y)/variant_generic.h b/variants/STM32F4xx/F427Z(G-I)T_F429ZET_F429Z(G-I)(T-Y)_F437Z(G-I)T_F439Z(G-I)(T-Y)/variant_generic.h
index 1febcf383d..c0d30ba5d7 100644
--- a/variants/STM32F4xx/F427Z(G-I)T_F429ZET_F429Z(G-I)(T-Y)_F437Z(G-I)T_F439Z(G-I)(T-Y)/variant_generic.h
+++ b/variants/STM32F4xx/F427Z(G-I)T_F429ZET_F429Z(G-I)(T-Y)_F437Z(G-I)T_F439Z(G-I)(T-Y)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F429B(E-G-I)T_F429N(E-G-I)H_F439B(G-I)T_F439N(G-I)H/PeripheralPins.c b/variants/STM32F4xx/F429B(E-G-I)T_F429N(E-G-I)H_F439B(G-I)T_F439N(G-I)H/PeripheralPins.c
index a2129bbd64..c346423260 100644
--- a/variants/STM32F4xx/F429B(E-G-I)T_F429N(E-G-I)H_F439B(G-I)T_F439N(G-I)H/PeripheralPins.c
+++ b/variants/STM32F4xx/F429B(E-G-I)T_F429N(E-G-I)H_F439B(G-I)T_F439N(G-I)H/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -14,7 +14,7 @@
  * Automatically generated from STM32F429B(E-G-I)Tx.xml, STM32F429N(E-G)Hx.xml
  * STM32F429NIHx.xml, STM32F439B(G-I)Tx.xml
  * STM32F439N(G-I)Hx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F4xx/F429B(E-G-I)T_F429N(E-G-I)H_F439B(G-I)T_F439N(G-I)H/variant_generic.cpp b/variants/STM32F4xx/F429B(E-G-I)T_F429N(E-G-I)H_F439B(G-I)T_F439N(G-I)H/variant_generic.cpp
index eb68514a44..760c6155df 100644
--- a/variants/STM32F4xx/F429B(E-G-I)T_F429N(E-G-I)H_F439B(G-I)T_F439N(G-I)H/variant_generic.cpp
+++ b/variants/STM32F4xx/F429B(E-G-I)T_F429N(E-G-I)H_F439B(G-I)T_F439N(G-I)H/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F429B(E-G-I)T_F429N(E-G-I)H_F439B(G-I)T_F439N(G-I)H/variant_generic.h b/variants/STM32F4xx/F429B(E-G-I)T_F429N(E-G-I)H_F439B(G-I)T_F439N(G-I)H/variant_generic.h
index dcb995d1cd..11e8b9a8bc 100644
--- a/variants/STM32F4xx/F429B(E-G-I)T_F429N(E-G-I)H_F439B(G-I)T_F439N(G-I)H/variant_generic.h
+++ b/variants/STM32F4xx/F429B(E-G-I)T_F429N(E-G-I)H_F439B(G-I)T_F439N(G-I)H/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F446M(C-E)Y/PeripheralPins.c b/variants/STM32F4xx/F446M(C-E)Y/PeripheralPins.c
index 3585f1b7e4..b7cbcd6f39 100644
--- a/variants/STM32F4xx/F446M(C-E)Y/PeripheralPins.c
+++ b/variants/STM32F4xx/F446M(C-E)Y/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F446M(C-E)Yx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F4xx/F446M(C-E)Y/variant_generic.cpp b/variants/STM32F4xx/F446M(C-E)Y/variant_generic.cpp
index d6efaf6ec0..42d66d26dd 100644
--- a/variants/STM32F4xx/F446M(C-E)Y/variant_generic.cpp
+++ b/variants/STM32F4xx/F446M(C-E)Y/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F446M(C-E)Y/variant_generic.h b/variants/STM32F4xx/F446M(C-E)Y/variant_generic.h
index 308deb44f1..6abd5db4d9 100644
--- a/variants/STM32F4xx/F446M(C-E)Y/variant_generic.h
+++ b/variants/STM32F4xx/F446M(C-E)Y/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F446R(C-E)T/PeripheralPins.c b/variants/STM32F4xx/F446R(C-E)T/PeripheralPins.c
index 3eec7a6b3a..c4f9ac935a 100644
--- a/variants/STM32F4xx/F446R(C-E)T/PeripheralPins.c
+++ b/variants/STM32F4xx/F446R(C-E)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F446R(C-E)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F4xx/F446R(C-E)T/variant_generic.cpp b/variants/STM32F4xx/F446R(C-E)T/variant_generic.cpp
index b5650c9d16..abbe6d472e 100644
--- a/variants/STM32F4xx/F446R(C-E)T/variant_generic.cpp
+++ b/variants/STM32F4xx/F446R(C-E)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F446R(C-E)T/variant_generic.h b/variants/STM32F4xx/F446R(C-E)T/variant_generic.h
index 45fc7a4420..d50a5a6610 100644
--- a/variants/STM32F4xx/F446R(C-E)T/variant_generic.h
+++ b/variants/STM32F4xx/F446R(C-E)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F446V(C-E)T/PeripheralPins.c b/variants/STM32F4xx/F446V(C-E)T/PeripheralPins.c
index 2dc285b204..669b6a2f4d 100644
--- a/variants/STM32F4xx/F446V(C-E)T/PeripheralPins.c
+++ b/variants/STM32F4xx/F446V(C-E)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F446V(C-E)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F4xx/F446V(C-E)T/variant_generic.cpp b/variants/STM32F4xx/F446V(C-E)T/variant_generic.cpp
index 5743961749..66b0e00e6d 100644
--- a/variants/STM32F4xx/F446V(C-E)T/variant_generic.cpp
+++ b/variants/STM32F4xx/F446V(C-E)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F446V(C-E)T/variant_generic.h b/variants/STM32F4xx/F446V(C-E)T/variant_generic.h
index b2b3d96153..6ea451290f 100644
--- a/variants/STM32F4xx/F446V(C-E)T/variant_generic.h
+++ b/variants/STM32F4xx/F446V(C-E)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F446Z(C-E)(H-J-T)/PeripheralPins.c b/variants/STM32F4xx/F446Z(C-E)(H-J-T)/PeripheralPins.c
index 1e4bbba578..ae04bfd24a 100644
--- a/variants/STM32F4xx/F446Z(C-E)(H-J-T)/PeripheralPins.c
+++ b/variants/STM32F4xx/F446Z(C-E)(H-J-T)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32F446Z(C-E)Hx.xml, STM32F446Z(C-E)Jx.xml
  * STM32F446Z(C-E)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F4xx/F446Z(C-E)(H-J-T)/variant_generic.cpp b/variants/STM32F4xx/F446Z(C-E)(H-J-T)/variant_generic.cpp
index f4ef6207b8..d81eb8c841 100644
--- a/variants/STM32F4xx/F446Z(C-E)(H-J-T)/variant_generic.cpp
+++ b/variants/STM32F4xx/F446Z(C-E)(H-J-T)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F446Z(C-E)(H-J-T)/variant_generic.h b/variants/STM32F4xx/F446Z(C-E)(H-J-T)/variant_generic.h
index 1eb0e2df42..cbd22a3e27 100644
--- a/variants/STM32F4xx/F446Z(C-E)(H-J-T)/variant_generic.h
+++ b/variants/STM32F4xx/F446Z(C-E)(H-J-T)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F469A(E-G-I)(H-Y)_F479A(G-I)(H-Y)/PeripheralPins.c b/variants/STM32F4xx/F469A(E-G-I)(H-Y)_F479A(G-I)(H-Y)/PeripheralPins.c
index 8fd6825487..b46b4e85bd 100644
--- a/variants/STM32F4xx/F469A(E-G-I)(H-Y)_F479A(G-I)(H-Y)/PeripheralPins.c
+++ b/variants/STM32F4xx/F469A(E-G-I)(H-Y)_F479A(G-I)(H-Y)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32F469A(E-G-I)Hx.xml, STM32F469A(E-G-I)Yx.xml
  * STM32F479A(G-I)Hx.xml, STM32F479A(G-I)Yx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F4xx/F469A(E-G-I)(H-Y)_F479A(G-I)(H-Y)/variant_generic.cpp b/variants/STM32F4xx/F469A(E-G-I)(H-Y)_F479A(G-I)(H-Y)/variant_generic.cpp
index 391ed7f8c2..3415561e75 100644
--- a/variants/STM32F4xx/F469A(E-G-I)(H-Y)_F479A(G-I)(H-Y)/variant_generic.cpp
+++ b/variants/STM32F4xx/F469A(E-G-I)(H-Y)_F479A(G-I)(H-Y)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F469A(E-G-I)(H-Y)_F479A(G-I)(H-Y)/variant_generic.h b/variants/STM32F4xx/F469A(E-G-I)(H-Y)_F479A(G-I)(H-Y)/variant_generic.h
index 4118794c85..6ccc894c0e 100644
--- a/variants/STM32F4xx/F469A(E-G-I)(H-Y)_F479A(G-I)(H-Y)/variant_generic.h
+++ b/variants/STM32F4xx/F469A(E-G-I)(H-Y)_F479A(G-I)(H-Y)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F469B(E-G-I)T_F469N(E-G-I)H_F479B(G-I)T_F479N(G-I)H/PeripheralPins.c b/variants/STM32F4xx/F469B(E-G-I)T_F469N(E-G-I)H_F479B(G-I)T_F479N(G-I)H/PeripheralPins.c
index 7d260d1a81..37f103303f 100644
--- a/variants/STM32F4xx/F469B(E-G-I)T_F469N(E-G-I)H_F479B(G-I)T_F479N(G-I)H/PeripheralPins.c
+++ b/variants/STM32F4xx/F469B(E-G-I)T_F469N(E-G-I)H_F479B(G-I)T_F479N(G-I)H/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -14,7 +14,7 @@
  * Automatically generated from STM32F469B(E-G-I)Tx.xml, STM32F469N(E-G)Hx.xml
  * STM32F469NIHx.xml, STM32F479B(G-I)Tx.xml
  * STM32F479N(G-I)Hx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F4xx/F469B(E-G-I)T_F469N(E-G-I)H_F479B(G-I)T_F479N(G-I)H/variant_generic.cpp b/variants/STM32F4xx/F469B(E-G-I)T_F469N(E-G-I)H_F479B(G-I)T_F479N(G-I)H/variant_generic.cpp
index 431ac893c8..323c6685d2 100644
--- a/variants/STM32F4xx/F469B(E-G-I)T_F469N(E-G-I)H_F479B(G-I)T_F479N(G-I)H/variant_generic.cpp
+++ b/variants/STM32F4xx/F469B(E-G-I)T_F469N(E-G-I)H_F479B(G-I)T_F479N(G-I)H/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F469B(E-G-I)T_F469N(E-G-I)H_F479B(G-I)T_F479N(G-I)H/variant_generic.h b/variants/STM32F4xx/F469B(E-G-I)T_F469N(E-G-I)H_F479B(G-I)T_F479N(G-I)H/variant_generic.h
index 21fe046c7b..44268ac2ed 100644
--- a/variants/STM32F4xx/F469B(E-G-I)T_F469N(E-G-I)H_F479B(G-I)T_F479N(G-I)H/variant_generic.h
+++ b/variants/STM32F4xx/F469B(E-G-I)T_F469N(E-G-I)H_F479B(G-I)T_F479N(G-I)H/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F469I(E-G-I)(H-T)_F479I(G-I)(H-T)/PeripheralPins.c b/variants/STM32F4xx/F469I(E-G-I)(H-T)_F479I(G-I)(H-T)/PeripheralPins.c
index 03b61bd384..d3c617c6df 100644
--- a/variants/STM32F4xx/F469I(E-G-I)(H-T)_F479I(G-I)(H-T)/PeripheralPins.c
+++ b/variants/STM32F4xx/F469I(E-G-I)(H-T)_F479I(G-I)(H-T)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -14,7 +14,7 @@
  * Automatically generated from STM32F469I(E-G)Tx.xml, STM32F469I(E-G-I)Hx.xml
  * STM32F469IITx.xml, STM32F479I(G-I)Hx.xml
  * STM32F479I(G-I)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F4xx/F469I(E-G-I)(H-T)_F479I(G-I)(H-T)/variant_generic.cpp b/variants/STM32F4xx/F469I(E-G-I)(H-T)_F479I(G-I)(H-T)/variant_generic.cpp
index b75a5984f3..67e1209412 100644
--- a/variants/STM32F4xx/F469I(E-G-I)(H-T)_F479I(G-I)(H-T)/variant_generic.cpp
+++ b/variants/STM32F4xx/F469I(E-G-I)(H-T)_F479I(G-I)(H-T)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F469I(E-G-I)(H-T)_F479I(G-I)(H-T)/variant_generic.h b/variants/STM32F4xx/F469I(E-G-I)(H-T)_F479I(G-I)(H-T)/variant_generic.h
index a5905f4ccb..9aeee99f2b 100644
--- a/variants/STM32F4xx/F469I(E-G-I)(H-T)_F479I(G-I)(H-T)/variant_generic.h
+++ b/variants/STM32F4xx/F469I(E-G-I)(H-T)_F479I(G-I)(H-T)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F469V(E-G-I)T_F479V(G-I)T/PeripheralPins.c b/variants/STM32F4xx/F469V(E-G-I)T_F479V(G-I)T/PeripheralPins.c
index a291611662..653264d67f 100644
--- a/variants/STM32F4xx/F469V(E-G-I)T_F479V(G-I)T/PeripheralPins.c
+++ b/variants/STM32F4xx/F469V(E-G-I)T_F479V(G-I)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32F469V(E-G)Tx.xml, STM32F469VITx.xml
  * STM32F479V(G-I)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F4xx/F469V(E-G-I)T_F479V(G-I)T/variant_generic.cpp b/variants/STM32F4xx/F469V(E-G-I)T_F479V(G-I)T/variant_generic.cpp
index 08475162f0..dbedca2ac6 100644
--- a/variants/STM32F4xx/F469V(E-G-I)T_F479V(G-I)T/variant_generic.cpp
+++ b/variants/STM32F4xx/F469V(E-G-I)T_F479V(G-I)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F469V(E-G-I)T_F479V(G-I)T/variant_generic.h b/variants/STM32F4xx/F469V(E-G-I)T_F479V(G-I)T/variant_generic.h
index 86b08fde12..0c488646d9 100644
--- a/variants/STM32F4xx/F469V(E-G-I)T_F479V(G-I)T/variant_generic.h
+++ b/variants/STM32F4xx/F469V(E-G-I)T_F479V(G-I)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F469Z(E-G-I)T_F479Z(G-I)T/PeripheralPins.c b/variants/STM32F4xx/F469Z(E-G-I)T_F479Z(G-I)T/PeripheralPins.c
index 363ee08011..b118015c10 100644
--- a/variants/STM32F4xx/F469Z(E-G-I)T_F479Z(G-I)T/PeripheralPins.c
+++ b/variants/STM32F4xx/F469Z(E-G-I)T_F479Z(G-I)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32F469Z(E-G)Tx.xml, STM32F469ZITx.xml
  * STM32F479Z(G-I)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F4xx/F469Z(E-G-I)T_F479Z(G-I)T/variant_generic.cpp b/variants/STM32F4xx/F469Z(E-G-I)T_F479Z(G-I)T/variant_generic.cpp
index efcb598a60..5751d5705d 100644
--- a/variants/STM32F4xx/F469Z(E-G-I)T_F479Z(G-I)T/variant_generic.cpp
+++ b/variants/STM32F4xx/F469Z(E-G-I)T_F479Z(G-I)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F4xx/F469Z(E-G-I)T_F479Z(G-I)T/variant_generic.h b/variants/STM32F4xx/F469Z(E-G-I)T_F479Z(G-I)T/variant_generic.h
index b60ce28d74..65a47101f5 100644
--- a/variants/STM32F4xx/F469Z(E-G-I)T_F479Z(G-I)T/variant_generic.h
+++ b/variants/STM32F4xx/F469Z(E-G-I)T_F479Z(G-I)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F7xx/F722I(C-E)(K-T)_F732IE(K-T)/PeripheralPins.c b/variants/STM32F7xx/F722I(C-E)(K-T)_F732IE(K-T)/PeripheralPins.c
index 5608f8ffb7..575bc760b3 100644
--- a/variants/STM32F7xx/F722I(C-E)(K-T)_F732IE(K-T)/PeripheralPins.c
+++ b/variants/STM32F7xx/F722I(C-E)(K-T)_F732IE(K-T)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32F722I(C-E)Kx.xml, STM32F722I(C-E)Tx.xml
  * STM32F732IEKx.xml, STM32F732IETx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F7xx/F722I(C-E)(K-T)_F732IE(K-T)/variant_generic.cpp b/variants/STM32F7xx/F722I(C-E)(K-T)_F732IE(K-T)/variant_generic.cpp
index 3991b3e3eb..f22da369a6 100644
--- a/variants/STM32F7xx/F722I(C-E)(K-T)_F732IE(K-T)/variant_generic.cpp
+++ b/variants/STM32F7xx/F722I(C-E)(K-T)_F732IE(K-T)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F7xx/F722I(C-E)(K-T)_F732IE(K-T)/variant_generic.h b/variants/STM32F7xx/F722I(C-E)(K-T)_F732IE(K-T)/variant_generic.h
index bf292a76d0..50a650b3ea 100644
--- a/variants/STM32F7xx/F722I(C-E)(K-T)_F732IE(K-T)/variant_generic.h
+++ b/variants/STM32F7xx/F722I(C-E)(K-T)_F732IE(K-T)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F7xx/F722R(C-E)T_F730R8T_F732RET/PeripheralPins.c b/variants/STM32F7xx/F722R(C-E)T_F730R8T_F732RET/PeripheralPins.c
index cc17968272..d7b14d5088 100644
--- a/variants/STM32F7xx/F722R(C-E)T_F730R8T_F732RET/PeripheralPins.c
+++ b/variants/STM32F7xx/F722R(C-E)T_F730R8T_F732RET/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32F722R(C-E)Tx.xml, STM32F730R8Tx.xml
  * STM32F732RETx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F7xx/F722R(C-E)T_F730R8T_F732RET/variant_generic.cpp b/variants/STM32F7xx/F722R(C-E)T_F730R8T_F732RET/variant_generic.cpp
index a04dbda254..4c9b28db56 100644
--- a/variants/STM32F7xx/F722R(C-E)T_F730R8T_F732RET/variant_generic.cpp
+++ b/variants/STM32F7xx/F722R(C-E)T_F730R8T_F732RET/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F7xx/F722R(C-E)T_F730R8T_F732RET/variant_generic.h b/variants/STM32F7xx/F722R(C-E)T_F730R8T_F732RET/variant_generic.h
index 40f9cb45ca..284918debf 100644
--- a/variants/STM32F7xx/F722R(C-E)T_F730R8T_F732RET/variant_generic.h
+++ b/variants/STM32F7xx/F722R(C-E)T_F730R8T_F732RET/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F7xx/F722V(C-E)T_F730V8T_F732VET/PeripheralPins.c b/variants/STM32F7xx/F722V(C-E)T_F730V8T_F732VET/PeripheralPins.c
index 44c8fb5877..1ab8ab8b1d 100644
--- a/variants/STM32F7xx/F722V(C-E)T_F730V8T_F732VET/PeripheralPins.c
+++ b/variants/STM32F7xx/F722V(C-E)T_F730V8T_F732VET/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32F722V(C-E)Tx.xml, STM32F730V8Tx.xml
  * STM32F732VETx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F7xx/F722V(C-E)T_F730V8T_F732VET/variant_generic.cpp b/variants/STM32F7xx/F722V(C-E)T_F730V8T_F732VET/variant_generic.cpp
index a19e2df1f9..d868fcead6 100644
--- a/variants/STM32F7xx/F722V(C-E)T_F730V8T_F732VET/variant_generic.cpp
+++ b/variants/STM32F7xx/F722V(C-E)T_F730V8T_F732VET/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F7xx/F722V(C-E)T_F730V8T_F732VET/variant_generic.h b/variants/STM32F7xx/F722V(C-E)T_F730V8T_F732VET/variant_generic.h
index a8f23f5a8c..3862781205 100644
--- a/variants/STM32F7xx/F722V(C-E)T_F730V8T_F732VET/variant_generic.h
+++ b/variants/STM32F7xx/F722V(C-E)T_F730V8T_F732VET/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F7xx/F722Z(C-E)T_F732ZET/PeripheralPins.c b/variants/STM32F7xx/F722Z(C-E)T_F732ZET/PeripheralPins.c
index 65f9ac13b5..9900c16968 100644
--- a/variants/STM32F7xx/F722Z(C-E)T_F732ZET/PeripheralPins.c
+++ b/variants/STM32F7xx/F722Z(C-E)T_F732ZET/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32F722Z(C-E)Tx.xml, STM32F732ZETx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F7xx/F722Z(C-E)T_F732ZET/variant_generic.cpp b/variants/STM32F7xx/F722Z(C-E)T_F732ZET/variant_generic.cpp
index 2fdba432b7..0cd79b9d9c 100644
--- a/variants/STM32F7xx/F722Z(C-E)T_F732ZET/variant_generic.cpp
+++ b/variants/STM32F7xx/F722Z(C-E)T_F732ZET/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F7xx/F722Z(C-E)T_F732ZET/variant_generic.h b/variants/STM32F7xx/F722Z(C-E)T_F732ZET/variant_generic.h
index fbd465aba6..71e6de01f5 100644
--- a/variants/STM32F7xx/F722Z(C-E)T_F732ZET/variant_generic.h
+++ b/variants/STM32F7xx/F722Z(C-E)T_F732ZET/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F7xx/F723I(C-E)(K-T)_F730I8K_F733IE(K-T)/PeripheralPins.c b/variants/STM32F7xx/F723I(C-E)(K-T)_F730I8K_F733IE(K-T)/PeripheralPins.c
index 17931f9efa..2f7cdebdb6 100644
--- a/variants/STM32F7xx/F723I(C-E)(K-T)_F730I8K_F733IE(K-T)/PeripheralPins.c
+++ b/variants/STM32F7xx/F723I(C-E)(K-T)_F730I8K_F733IE(K-T)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -14,7 +14,7 @@
  * Automatically generated from STM32F723I(C-E)Kx.xml, STM32F723I(C-E)Tx.xml
  * STM32F730I8Kx.xml, STM32F733IEKx.xml
  * STM32F733IETx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F7xx/F723I(C-E)(K-T)_F730I8K_F733IE(K-T)/variant_generic.cpp b/variants/STM32F7xx/F723I(C-E)(K-T)_F730I8K_F733IE(K-T)/variant_generic.cpp
index 410f5c9c81..a0a7160b59 100644
--- a/variants/STM32F7xx/F723I(C-E)(K-T)_F730I8K_F733IE(K-T)/variant_generic.cpp
+++ b/variants/STM32F7xx/F723I(C-E)(K-T)_F730I8K_F733IE(K-T)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F7xx/F723I(C-E)(K-T)_F730I8K_F733IE(K-T)/variant_generic.h b/variants/STM32F7xx/F723I(C-E)(K-T)_F730I8K_F733IE(K-T)/variant_generic.h
index da31fc48f3..ce03c2ae9d 100644
--- a/variants/STM32F7xx/F723I(C-E)(K-T)_F730I8K_F733IE(K-T)/variant_generic.h
+++ b/variants/STM32F7xx/F723I(C-E)(K-T)_F730I8K_F733IE(K-T)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F7xx/F723V(C-E)(T-Y)_F733VE(T-Y)/PeripheralPins.c b/variants/STM32F7xx/F723V(C-E)(T-Y)_F733VE(T-Y)/PeripheralPins.c
index f1da54ca95..fc21c07b5a 100644
--- a/variants/STM32F7xx/F723V(C-E)(T-Y)_F733VE(T-Y)/PeripheralPins.c
+++ b/variants/STM32F7xx/F723V(C-E)(T-Y)_F733VE(T-Y)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32F723V(C-E)Tx.xml, STM32F723V(C-E)Yx.xml
  * STM32F733VETx.xml, STM32F733VEYx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F7xx/F723V(C-E)(T-Y)_F733VE(T-Y)/variant_generic.cpp b/variants/STM32F7xx/F723V(C-E)(T-Y)_F733VE(T-Y)/variant_generic.cpp
index 51a92cfed3..59e463e911 100644
--- a/variants/STM32F7xx/F723V(C-E)(T-Y)_F733VE(T-Y)/variant_generic.cpp
+++ b/variants/STM32F7xx/F723V(C-E)(T-Y)_F733VE(T-Y)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F7xx/F723V(C-E)(T-Y)_F733VE(T-Y)/variant_generic.h b/variants/STM32F7xx/F723V(C-E)(T-Y)_F733VE(T-Y)/variant_generic.h
index 2c06a36f62..946e5fbfb2 100644
--- a/variants/STM32F7xx/F723V(C-E)(T-Y)_F733VE(T-Y)/variant_generic.h
+++ b/variants/STM32F7xx/F723V(C-E)(T-Y)_F733VE(T-Y)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F7xx/F723Z(C-E)(I-T)_F730Z8T_F733ZE(I-T)/PeripheralPins.c b/variants/STM32F7xx/F723Z(C-E)(I-T)_F730Z8T_F733ZE(I-T)/PeripheralPins.c
index 240d37bf62..8a60712ed3 100644
--- a/variants/STM32F7xx/F723Z(C-E)(I-T)_F730Z8T_F733ZE(I-T)/PeripheralPins.c
+++ b/variants/STM32F7xx/F723Z(C-E)(I-T)_F730Z8T_F733ZE(I-T)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -14,7 +14,7 @@
  * Automatically generated from STM32F723Z(C-E)Ix.xml, STM32F723Z(C-E)Tx.xml
  * STM32F730Z8Tx.xml, STM32F733ZEIx.xml
  * STM32F733ZETx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F7xx/F723Z(C-E)(I-T)_F730Z8T_F733ZE(I-T)/variant_generic.cpp b/variants/STM32F7xx/F723Z(C-E)(I-T)_F730Z8T_F733ZE(I-T)/variant_generic.cpp
index a3adbed79c..9512494d3c 100644
--- a/variants/STM32F7xx/F723Z(C-E)(I-T)_F730Z8T_F733ZE(I-T)/variant_generic.cpp
+++ b/variants/STM32F7xx/F723Z(C-E)(I-T)_F730Z8T_F733ZE(I-T)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F7xx/F723Z(C-E)(I-T)_F730Z8T_F733ZE(I-T)/variant_generic.h b/variants/STM32F7xx/F723Z(C-E)(I-T)_F730Z8T_F733ZE(I-T)/variant_generic.h
index dc6261946d..8d0a33158f 100644
--- a/variants/STM32F7xx/F723Z(C-E)(I-T)_F730Z8T_F733ZE(I-T)/variant_generic.h
+++ b/variants/STM32F7xx/F723Z(C-E)(I-T)_F730Z8T_F733ZE(I-T)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F7xx/F745I(E-G)(K-T)_F746I(E-G)(K-T)_F756IG(K-T)/PeripheralPins.c b/variants/STM32F7xx/F745I(E-G)(K-T)_F746I(E-G)(K-T)_F756IG(K-T)/PeripheralPins.c
index 85f51c0d39..1749fb4440 100644
--- a/variants/STM32F7xx/F745I(E-G)(K-T)_F746I(E-G)(K-T)_F756IG(K-T)/PeripheralPins.c
+++ b/variants/STM32F7xx/F745I(E-G)(K-T)_F746I(E-G)(K-T)_F756IG(K-T)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -18,7 +18,7 @@
  * STM32F750N8Hx.xml, STM32F756BGTx.xml
  * STM32F756IGKx.xml, STM32F756IGTx.xml
  * STM32F756NGHx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F7xx/F745I(E-G)(K-T)_F746I(E-G)(K-T)_F756IG(K-T)/variant_generic.cpp b/variants/STM32F7xx/F745I(E-G)(K-T)_F746I(E-G)(K-T)_F756IG(K-T)/variant_generic.cpp
index 59682e938c..076eb89a43 100644
--- a/variants/STM32F7xx/F745I(E-G)(K-T)_F746I(E-G)(K-T)_F756IG(K-T)/variant_generic.cpp
+++ b/variants/STM32F7xx/F745I(E-G)(K-T)_F746I(E-G)(K-T)_F756IG(K-T)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F7xx/F745I(E-G)(K-T)_F746I(E-G)(K-T)_F756IG(K-T)/variant_generic.h b/variants/STM32F7xx/F745I(E-G)(K-T)_F746I(E-G)(K-T)_F756IG(K-T)/variant_generic.h
index dd3e283a45..bae701d881 100644
--- a/variants/STM32F7xx/F745I(E-G)(K-T)_F746I(E-G)(K-T)_F756IG(K-T)/variant_generic.h
+++ b/variants/STM32F7xx/F745I(E-G)(K-T)_F746I(E-G)(K-T)_F756IG(K-T)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F7xx/F745V(E-G)(H-T)_F746V(E-G)(H-T)_F750V8T_F756VG(H-T)/PeripheralPins.c b/variants/STM32F7xx/F745V(E-G)(H-T)_F746V(E-G)(H-T)_F750V8T_F756VG(H-T)/PeripheralPins.c
index 24af1bbab5..d873aae77f 100644
--- a/variants/STM32F7xx/F745V(E-G)(H-T)_F746V(E-G)(H-T)_F750V8T_F756VG(H-T)/PeripheralPins.c
+++ b/variants/STM32F7xx/F745V(E-G)(H-T)_F746V(E-G)(H-T)_F750V8T_F756VG(H-T)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -15,7 +15,7 @@
  * STM32F746V(E-G)Hx.xml, STM32F746VETx.xml
  * STM32F746VGTx.xml, STM32F750V8Tx.xml
  * STM32F756VGHx.xml, STM32F756VGTx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F7xx/F745V(E-G)(H-T)_F746V(E-G)(H-T)_F750V8T_F756VG(H-T)/variant_generic.cpp b/variants/STM32F7xx/F745V(E-G)(H-T)_F746V(E-G)(H-T)_F750V8T_F756VG(H-T)/variant_generic.cpp
index e54369fe3d..28c8caa5e6 100644
--- a/variants/STM32F7xx/F745V(E-G)(H-T)_F746V(E-G)(H-T)_F750V8T_F756VG(H-T)/variant_generic.cpp
+++ b/variants/STM32F7xx/F745V(E-G)(H-T)_F746V(E-G)(H-T)_F750V8T_F756VG(H-T)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F7xx/F745V(E-G)(H-T)_F746V(E-G)(H-T)_F750V8T_F756VG(H-T)/variant_generic.h b/variants/STM32F7xx/F745V(E-G)(H-T)_F746V(E-G)(H-T)_F750V8T_F756VG(H-T)/variant_generic.h
index 3f10aaec0f..ddf502521d 100644
--- a/variants/STM32F7xx/F745V(E-G)(H-T)_F746V(E-G)(H-T)_F750V8T_F756VG(H-T)/variant_generic.h
+++ b/variants/STM32F7xx/F745V(E-G)(H-T)_F746V(E-G)(H-T)_F750V8T_F756VG(H-T)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F7xx/F745Z(E-G)T_F746Z(E-G)(T-Y)_F750Z8T_F756ZG(T-Y)/PeripheralPins.c b/variants/STM32F7xx/F745Z(E-G)T_F746Z(E-G)(T-Y)_F750Z8T_F756ZG(T-Y)/PeripheralPins.c
index 9166088731..b24ebf14ee 100644
--- a/variants/STM32F7xx/F745Z(E-G)T_F746Z(E-G)(T-Y)_F750Z8T_F756ZG(T-Y)/PeripheralPins.c
+++ b/variants/STM32F7xx/F745Z(E-G)T_F746Z(E-G)(T-Y)_F750Z8T_F756ZG(T-Y)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -15,7 +15,7 @@
  * STM32F746ZETx.xml, STM32F746ZGTx.xml
  * STM32F750Z8Tx.xml, STM32F756ZGTx.xml
  * STM32F756ZGYx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F7xx/F745Z(E-G)T_F746Z(E-G)(T-Y)_F750Z8T_F756ZG(T-Y)/variant_generic.cpp b/variants/STM32F7xx/F745Z(E-G)T_F746Z(E-G)(T-Y)_F750Z8T_F756ZG(T-Y)/variant_generic.cpp
index b083164408..435b85c7db 100644
--- a/variants/STM32F7xx/F745Z(E-G)T_F746Z(E-G)(T-Y)_F750Z8T_F756ZG(T-Y)/variant_generic.cpp
+++ b/variants/STM32F7xx/F745Z(E-G)T_F746Z(E-G)(T-Y)_F750Z8T_F756ZG(T-Y)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F7xx/F745Z(E-G)T_F746Z(E-G)(T-Y)_F750Z8T_F756ZG(T-Y)/variant_generic.h b/variants/STM32F7xx/F745Z(E-G)T_F746Z(E-G)(T-Y)_F750Z8T_F756ZG(T-Y)/variant_generic.h
index 02f8a60aae..711cec5079 100644
--- a/variants/STM32F7xx/F745Z(E-G)T_F746Z(E-G)(T-Y)_F750Z8T_F756ZG(T-Y)/variant_generic.h
+++ b/variants/STM32F7xx/F745Z(E-G)T_F746Z(E-G)(T-Y)_F750Z8T_F756ZG(T-Y)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F7xx/F746B(E-G)T_F746N(E-G)H_F750N8H_F756BGT_F756NGH/PeripheralPins.c b/variants/STM32F7xx/F746B(E-G)T_F746N(E-G)H_F750N8H_F756BGT_F756NGH/PeripheralPins.c
index 10dd8e8cea..04190aeec8 100644
--- a/variants/STM32F7xx/F746B(E-G)T_F746N(E-G)H_F750N8H_F756BGT_F756NGH/PeripheralPins.c
+++ b/variants/STM32F7xx/F746B(E-G)T_F746N(E-G)H_F750N8H_F756BGT_F756NGH/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -14,7 +14,7 @@
  * Automatically generated from STM32F746B(E-G)Tx.xml, STM32F746NEHx.xml
  * STM32F746NGHx.xml, STM32F750N8Hx.xml
  * STM32F756BGTx.xml, STM32F756NGHx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F7xx/F746B(E-G)T_F746N(E-G)H_F750N8H_F756BGT_F756NGH/variant_generic.cpp b/variants/STM32F7xx/F746B(E-G)T_F746N(E-G)H_F750N8H_F756BGT_F756NGH/variant_generic.cpp
index fc77ed0c60..cc010176a0 100644
--- a/variants/STM32F7xx/F746B(E-G)T_F746N(E-G)H_F750N8H_F756BGT_F756NGH/variant_generic.cpp
+++ b/variants/STM32F7xx/F746B(E-G)T_F746N(E-G)H_F750N8H_F756BGT_F756NGH/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F7xx/F746B(E-G)T_F746N(E-G)H_F750N8H_F756BGT_F756NGH/variant_generic.h b/variants/STM32F7xx/F746B(E-G)T_F746N(E-G)H_F750N8H_F756BGT_F756NGH/variant_generic.h
index 7f283b4eba..296b10976c 100644
--- a/variants/STM32F7xx/F746B(E-G)T_F746N(E-G)H_F750N8H_F756BGT_F756NGH/variant_generic.h
+++ b/variants/STM32F7xx/F746B(E-G)T_F746N(E-G)H_F750N8H_F756BGT_F756NGH/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F7xx/F765B(G-I)T_F765N(G-I)H_F767B(G-I)T_F767N(G-I)H_F777BIT_F777NIH/PeripheralPins.c b/variants/STM32F7xx/F765B(G-I)T_F765N(G-I)H_F767B(G-I)T_F767N(G-I)H_F777BIT_F777NIH/PeripheralPins.c
index 08fbaeae44..663aa861a4 100644
--- a/variants/STM32F7xx/F765B(G-I)T_F765N(G-I)H_F767B(G-I)T_F767N(G-I)H_F777BIT_F777NIH/PeripheralPins.c
+++ b/variants/STM32F7xx/F765B(G-I)T_F765N(G-I)H_F767B(G-I)T_F767N(G-I)H_F777BIT_F777NIH/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -20,7 +20,7 @@
  * STM32F777IIKx.xml, STM32F777IITx.xml
  * STM32F777NIHx.xml, STM32F779BITx.xml
  * STM32F779NIHx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F7xx/F765B(G-I)T_F765N(G-I)H_F767B(G-I)T_F767N(G-I)H_F777BIT_F777NIH/variant_generic.cpp b/variants/STM32F7xx/F765B(G-I)T_F765N(G-I)H_F767B(G-I)T_F767N(G-I)H_F777BIT_F777NIH/variant_generic.cpp
index b583869e9a..b6590d6028 100644
--- a/variants/STM32F7xx/F765B(G-I)T_F765N(G-I)H_F767B(G-I)T_F767N(G-I)H_F777BIT_F777NIH/variant_generic.cpp
+++ b/variants/STM32F7xx/F765B(G-I)T_F765N(G-I)H_F767B(G-I)T_F767N(G-I)H_F777BIT_F777NIH/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F7xx/F765B(G-I)T_F765N(G-I)H_F767B(G-I)T_F767N(G-I)H_F777BIT_F777NIH/variant_generic.h b/variants/STM32F7xx/F765B(G-I)T_F765N(G-I)H_F767B(G-I)T_F767N(G-I)H_F777BIT_F777NIH/variant_generic.h
index 049265125c..95cef539c1 100644
--- a/variants/STM32F7xx/F765B(G-I)T_F765N(G-I)H_F767B(G-I)T_F767N(G-I)H_F777BIT_F777NIH/variant_generic.h
+++ b/variants/STM32F7xx/F765B(G-I)T_F765N(G-I)H_F767B(G-I)T_F767N(G-I)H_F777BIT_F777NIH/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F7xx/F765I(G-I)(K-T)_F767I(G-I)(K-T)_F777II(K-T)/PeripheralPins.c b/variants/STM32F7xx/F765I(G-I)(K-T)_F767I(G-I)(K-T)_F777II(K-T)/PeripheralPins.c
index eb7d387ce2..ce9d40fcad 100644
--- a/variants/STM32F7xx/F765I(G-I)(K-T)_F767I(G-I)(K-T)_F777II(K-T)/PeripheralPins.c
+++ b/variants/STM32F7xx/F765I(G-I)(K-T)_F767I(G-I)(K-T)_F777II(K-T)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -17,7 +17,7 @@
  * STM32F769NIHx.xml, STM32F777IIKx.xml
  * STM32F777IITx.xml, STM32F779BITx.xml
  * STM32F779NIHx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F7xx/F765I(G-I)(K-T)_F767I(G-I)(K-T)_F777II(K-T)/variant_generic.cpp b/variants/STM32F7xx/F765I(G-I)(K-T)_F767I(G-I)(K-T)_F777II(K-T)/variant_generic.cpp
index 0a29e3d734..30707e13e0 100644
--- a/variants/STM32F7xx/F765I(G-I)(K-T)_F767I(G-I)(K-T)_F777II(K-T)/variant_generic.cpp
+++ b/variants/STM32F7xx/F765I(G-I)(K-T)_F767I(G-I)(K-T)_F777II(K-T)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F7xx/F765I(G-I)(K-T)_F767I(G-I)(K-T)_F777II(K-T)/variant_generic.h b/variants/STM32F7xx/F765I(G-I)(K-T)_F767I(G-I)(K-T)_F777II(K-T)/variant_generic.h
index 318c420d70..b5049bc8b1 100644
--- a/variants/STM32F7xx/F765I(G-I)(K-T)_F767I(G-I)(K-T)_F777II(K-T)/variant_generic.h
+++ b/variants/STM32F7xx/F765I(G-I)(K-T)_F767I(G-I)(K-T)_F777II(K-T)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F7xx/F765V(G-I)(H-T)_F767V(G-I)(H-T)_F777VI(H-T)/PeripheralPins.c b/variants/STM32F7xx/F765V(G-I)(H-T)_F767V(G-I)(H-T)_F777VI(H-T)/PeripheralPins.c
index 7a2ae659e7..4a0a9df6bf 100644
--- a/variants/STM32F7xx/F765V(G-I)(H-T)_F767V(G-I)(H-T)_F777VI(H-T)/PeripheralPins.c
+++ b/variants/STM32F7xx/F765V(G-I)(H-T)_F767V(G-I)(H-T)_F777VI(H-T)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -15,7 +15,7 @@
  * STM32F767VGHx.xml, STM32F767VGTx.xml
  * STM32F767VIHx.xml, STM32F767VITx.xml
  * STM32F777VIHx.xml, STM32F777VITx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F7xx/F765V(G-I)(H-T)_F767V(G-I)(H-T)_F777VI(H-T)/variant_generic.cpp b/variants/STM32F7xx/F765V(G-I)(H-T)_F767V(G-I)(H-T)_F777VI(H-T)/variant_generic.cpp
index f110218c28..402bd9a1e0 100644
--- a/variants/STM32F7xx/F765V(G-I)(H-T)_F767V(G-I)(H-T)_F777VI(H-T)/variant_generic.cpp
+++ b/variants/STM32F7xx/F765V(G-I)(H-T)_F767V(G-I)(H-T)_F777VI(H-T)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F7xx/F765V(G-I)(H-T)_F767V(G-I)(H-T)_F777VI(H-T)/variant_generic.h b/variants/STM32F7xx/F765V(G-I)(H-T)_F767V(G-I)(H-T)_F777VI(H-T)/variant_generic.h
index e9c2977751..6d50d4ffec 100644
--- a/variants/STM32F7xx/F765V(G-I)(H-T)_F767V(G-I)(H-T)_F777VI(H-T)/variant_generic.h
+++ b/variants/STM32F7xx/F765V(G-I)(H-T)_F767V(G-I)(H-T)_F777VI(H-T)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F7xx/F765Z(G-I)T_F767Z(G-I)T_F777ZIT/PeripheralPins.c b/variants/STM32F7xx/F765Z(G-I)T_F767Z(G-I)T_F777ZIT/PeripheralPins.c
index 1d6edeadf3..92a6f1d755 100644
--- a/variants/STM32F7xx/F765Z(G-I)T_F767Z(G-I)T_F777ZIT/PeripheralPins.c
+++ b/variants/STM32F7xx/F765Z(G-I)T_F767Z(G-I)T_F777ZIT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32F765Z(G-I)Tx.xml, STM32F767ZGTx.xml
  * STM32F767ZITx.xml, STM32F777ZITx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F7xx/F765Z(G-I)T_F767Z(G-I)T_F777ZIT/variant_generic.cpp b/variants/STM32F7xx/F765Z(G-I)T_F767Z(G-I)T_F777ZIT/variant_generic.cpp
index 3315fbb662..4ed5766442 100644
--- a/variants/STM32F7xx/F765Z(G-I)T_F767Z(G-I)T_F777ZIT/variant_generic.cpp
+++ b/variants/STM32F7xx/F765Z(G-I)T_F767Z(G-I)T_F777ZIT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F7xx/F765Z(G-I)T_F767Z(G-I)T_F777ZIT/variant_generic.h b/variants/STM32F7xx/F765Z(G-I)T_F767Z(G-I)T_F777ZIT/variant_generic.h
index 6505a4de06..100886b2f6 100644
--- a/variants/STM32F7xx/F765Z(G-I)T_F767Z(G-I)T_F777ZIT/variant_generic.h
+++ b/variants/STM32F7xx/F765Z(G-I)T_F767Z(G-I)T_F777ZIT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F7xx/F768AIY_F769A(G-I)Y_F778AIY_F779AIY/PeripheralPins.c b/variants/STM32F7xx/F768AIY_F769A(G-I)Y_F778AIY_F779AIY/PeripheralPins.c
index ef65bc57a0..5cd5a18a28 100644
--- a/variants/STM32F7xx/F768AIY_F769A(G-I)Y_F778AIY_F779AIY/PeripheralPins.c
+++ b/variants/STM32F7xx/F768AIY_F769A(G-I)Y_F778AIY_F779AIY/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32F768AIYx.xml, STM32F769A(G-I)Yx.xml
  * STM32F778AIYx.xml, STM32F779AIYx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F7xx/F768AIY_F769A(G-I)Y_F778AIY_F779AIY/variant_generic.cpp b/variants/STM32F7xx/F768AIY_F769A(G-I)Y_F778AIY_F779AIY/variant_generic.cpp
index 843e96f58b..f14633ceae 100644
--- a/variants/STM32F7xx/F768AIY_F769A(G-I)Y_F778AIY_F779AIY/variant_generic.cpp
+++ b/variants/STM32F7xx/F768AIY_F769A(G-I)Y_F778AIY_F779AIY/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F7xx/F768AIY_F769A(G-I)Y_F778AIY_F779AIY/variant_generic.h b/variants/STM32F7xx/F768AIY_F769A(G-I)Y_F778AIY_F779AIY/variant_generic.h
index b5f35c3a89..3d9c77ec68 100644
--- a/variants/STM32F7xx/F768AIY_F769A(G-I)Y_F778AIY_F779AIY/variant_generic.h
+++ b/variants/STM32F7xx/F768AIY_F769A(G-I)Y_F778AIY_F779AIY/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F7xx/F769B(G-I)T_F769N(G-I)H_F779BIT_F779NIH/PeripheralPins.c b/variants/STM32F7xx/F769B(G-I)T_F769N(G-I)H_F779BIT_F779NIH/PeripheralPins.c
index e24af66a6b..24dbc7a6c5 100644
--- a/variants/STM32F7xx/F769B(G-I)T_F769N(G-I)H_F779BIT_F779NIH/PeripheralPins.c
+++ b/variants/STM32F7xx/F769B(G-I)T_F769N(G-I)H_F779BIT_F779NIH/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -14,7 +14,7 @@
  * Automatically generated from STM32F769B(G-I)Tx.xml, STM32F769NGHx.xml
  * STM32F769NIHx.xml, STM32F779BITx.xml
  * STM32F779NIHx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F7xx/F769B(G-I)T_F769N(G-I)H_F779BIT_F779NIH/variant_generic.cpp b/variants/STM32F7xx/F769B(G-I)T_F769N(G-I)H_F779BIT_F779NIH/variant_generic.cpp
index dae4ab95ec..4b6113c241 100644
--- a/variants/STM32F7xx/F769B(G-I)T_F769N(G-I)H_F779BIT_F779NIH/variant_generic.cpp
+++ b/variants/STM32F7xx/F769B(G-I)T_F769N(G-I)H_F779BIT_F779NIH/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F7xx/F769B(G-I)T_F769N(G-I)H_F779BIT_F779NIH/variant_generic.h b/variants/STM32F7xx/F769B(G-I)T_F769N(G-I)H_F779BIT_F779NIH/variant_generic.h
index e3b7a72f3b..438a0ac7da 100644
--- a/variants/STM32F7xx/F769B(G-I)T_F769N(G-I)H_F779BIT_F779NIH/variant_generic.h
+++ b/variants/STM32F7xx/F769B(G-I)T_F769N(G-I)H_F779BIT_F779NIH/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F7xx/F769I(G-I)T_F779IIT/PeripheralPins.c b/variants/STM32F7xx/F769I(G-I)T_F779IIT/PeripheralPins.c
index 83d02c1983..727cdb9031 100644
--- a/variants/STM32F7xx/F769I(G-I)T_F779IIT/PeripheralPins.c
+++ b/variants/STM32F7xx/F769I(G-I)T_F779IIT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32F769IGTx.xml, STM32F769IITx.xml
  * STM32F779IITx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32F7xx/F769I(G-I)T_F779IIT/variant_generic.cpp b/variants/STM32F7xx/F769I(G-I)T_F779IIT/variant_generic.cpp
index e6c9d526c8..0a47b9240b 100644
--- a/variants/STM32F7xx/F769I(G-I)T_F779IIT/variant_generic.cpp
+++ b/variants/STM32F7xx/F769I(G-I)T_F779IIT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32F7xx/F769I(G-I)T_F779IIT/variant_generic.h b/variants/STM32F7xx/F769I(G-I)T_F779IIT/variant_generic.h
index 2ca685e78f..81c16c0a54 100644
--- a/variants/STM32F7xx/F769I(G-I)T_F779IIT/variant_generic.h
+++ b/variants/STM32F7xx/F769I(G-I)T_F779IIT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G030C(6-8)T/PeripheralPins.c b/variants/STM32G0xx/G030C(6-8)T/PeripheralPins.c
index 1a9f676795..584416b2c4 100644
--- a/variants/STM32G0xx/G030C(6-8)T/PeripheralPins.c
+++ b/variants/STM32G0xx/G030C(6-8)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32G030C(6-8)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G0xx/G030C(6-8)T/variant_generic.cpp b/variants/STM32G0xx/G030C(6-8)T/variant_generic.cpp
index 9a8e63642a..c1ea988d06 100644
--- a/variants/STM32G0xx/G030C(6-8)T/variant_generic.cpp
+++ b/variants/STM32G0xx/G030C(6-8)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G030C(6-8)T/variant_generic.h b/variants/STM32G0xx/G030C(6-8)T/variant_generic.h
index 5bd656c5db..6486c4a21e 100644
--- a/variants/STM32G0xx/G030C(6-8)T/variant_generic.h
+++ b/variants/STM32G0xx/G030C(6-8)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G030F6P/PeripheralPins.c b/variants/STM32G0xx/G030F6P/PeripheralPins.c
index e15a3dc779..52055b1f68 100644
--- a/variants/STM32G0xx/G030F6P/PeripheralPins.c
+++ b/variants/STM32G0xx/G030F6P/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32G030F6Px.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G0xx/G030F6P/variant_generic.cpp b/variants/STM32G0xx/G030F6P/variant_generic.cpp
index 5ea91eabc8..b41bf9fc5f 100644
--- a/variants/STM32G0xx/G030F6P/variant_generic.cpp
+++ b/variants/STM32G0xx/G030F6P/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G030F6P/variant_generic.h b/variants/STM32G0xx/G030F6P/variant_generic.h
index a763c006a0..3b378cbe81 100644
--- a/variants/STM32G0xx/G030F6P/variant_generic.h
+++ b/variants/STM32G0xx/G030F6P/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G030J6M/PeripheralPins.c b/variants/STM32G0xx/G030J6M/PeripheralPins.c
index da8acab86b..c5cbba6980 100644
--- a/variants/STM32G0xx/G030J6M/PeripheralPins.c
+++ b/variants/STM32G0xx/G030J6M/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32G030J6Mx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G0xx/G030J6M/variant_generic.cpp b/variants/STM32G0xx/G030J6M/variant_generic.cpp
index 237ac84707..6cc9b7328f 100644
--- a/variants/STM32G0xx/G030J6M/variant_generic.cpp
+++ b/variants/STM32G0xx/G030J6M/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G030J6M/variant_generic.h b/variants/STM32G0xx/G030J6M/variant_generic.h
index 3cc8afe129..1b1db239a3 100644
--- a/variants/STM32G0xx/G030J6M/variant_generic.h
+++ b/variants/STM32G0xx/G030J6M/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G030K(6-8)T/PeripheralPins.c b/variants/STM32G0xx/G030K(6-8)T/PeripheralPins.c
index e1a5e08051..3b3cb579a0 100644
--- a/variants/STM32G0xx/G030K(6-8)T/PeripheralPins.c
+++ b/variants/STM32G0xx/G030K(6-8)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32G030K(6-8)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G0xx/G030K(6-8)T/variant_generic.cpp b/variants/STM32G0xx/G030K(6-8)T/variant_generic.cpp
index ad45320c21..51108f5e2d 100644
--- a/variants/STM32G0xx/G030K(6-8)T/variant_generic.cpp
+++ b/variants/STM32G0xx/G030K(6-8)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G030K(6-8)T/variant_generic.h b/variants/STM32G0xx/G030K(6-8)T/variant_generic.h
index 6af9c84e33..253b222287 100644
--- a/variants/STM32G0xx/G030K(6-8)T/variant_generic.h
+++ b/variants/STM32G0xx/G030K(6-8)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G031C(4-6-8)(T-U)_G041C(6-8)(T-U)/PeripheralPins.c b/variants/STM32G0xx/G031C(4-6-8)(T-U)_G041C(6-8)(T-U)/PeripheralPins.c
index bbf1623134..0a44bf14b3 100644
--- a/variants/STM32G0xx/G031C(4-6-8)(T-U)_G041C(6-8)(T-U)/PeripheralPins.c
+++ b/variants/STM32G0xx/G031C(4-6-8)(T-U)_G041C(6-8)(T-U)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32G031C(4-6-8)Tx.xml, STM32G031C(4-6-8)Ux.xml
  * STM32G041C(6-8)Tx.xml, STM32G041C(6-8)Ux.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G0xx/G031C(4-6-8)(T-U)_G041C(6-8)(T-U)/variant_generic.cpp b/variants/STM32G0xx/G031C(4-6-8)(T-U)_G041C(6-8)(T-U)/variant_generic.cpp
index a6b81837b5..7edea9a921 100644
--- a/variants/STM32G0xx/G031C(4-6-8)(T-U)_G041C(6-8)(T-U)/variant_generic.cpp
+++ b/variants/STM32G0xx/G031C(4-6-8)(T-U)_G041C(6-8)(T-U)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G031C(4-6-8)(T-U)_G041C(6-8)(T-U)/variant_generic.h b/variants/STM32G0xx/G031C(4-6-8)(T-U)_G041C(6-8)(T-U)/variant_generic.h
index 141d4deaf6..fde640b6fa 100644
--- a/variants/STM32G0xx/G031C(4-6-8)(T-U)_G041C(6-8)(T-U)/variant_generic.h
+++ b/variants/STM32G0xx/G031C(4-6-8)(T-U)_G041C(6-8)(T-U)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G031F(4-6-8)P_G031Y8Y_G041F(6-8)P_G041Y8Y/PeripheralPins.c b/variants/STM32G0xx/G031F(4-6-8)P_G031Y8Y_G041F(6-8)P_G041Y8Y/PeripheralPins.c
index 57452c7f3a..5671339383 100644
--- a/variants/STM32G0xx/G031F(4-6-8)P_G031Y8Y_G041F(6-8)P_G041Y8Y/PeripheralPins.c
+++ b/variants/STM32G0xx/G031F(4-6-8)P_G031Y8Y_G041F(6-8)P_G041Y8Y/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32G031F(4-6-8)Px.xml, STM32G031Y8Yx.xml
  * STM32G041F(6-8)Px.xml, STM32G041Y8Yx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G0xx/G031F(4-6-8)P_G031Y8Y_G041F(6-8)P_G041Y8Y/variant_generic.cpp b/variants/STM32G0xx/G031F(4-6-8)P_G031Y8Y_G041F(6-8)P_G041Y8Y/variant_generic.cpp
index eb02919f0a..02265e1f7a 100644
--- a/variants/STM32G0xx/G031F(4-6-8)P_G031Y8Y_G041F(6-8)P_G041Y8Y/variant_generic.cpp
+++ b/variants/STM32G0xx/G031F(4-6-8)P_G031Y8Y_G041F(6-8)P_G041Y8Y/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G031F(4-6-8)P_G031Y8Y_G041F(6-8)P_G041Y8Y/variant_generic.h b/variants/STM32G0xx/G031F(4-6-8)P_G031Y8Y_G041F(6-8)P_G041Y8Y/variant_generic.h
index b274458375..2abcf8478b 100644
--- a/variants/STM32G0xx/G031F(4-6-8)P_G031Y8Y_G041F(6-8)P_G041Y8Y/variant_generic.h
+++ b/variants/STM32G0xx/G031F(4-6-8)P_G031Y8Y_G041F(6-8)P_G041Y8Y/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G031G(4-6-8)U_G041G(6-8)U/PeripheralPins.c b/variants/STM32G0xx/G031G(4-6-8)U_G041G(6-8)U/PeripheralPins.c
index 870f74e4ce..8c904d5632 100644
--- a/variants/STM32G0xx/G031G(4-6-8)U_G041G(6-8)U/PeripheralPins.c
+++ b/variants/STM32G0xx/G031G(4-6-8)U_G041G(6-8)U/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32G031G(4-6-8)Ux.xml, STM32G041G(6-8)Ux.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G0xx/G031G(4-6-8)U_G041G(6-8)U/variant_generic.cpp b/variants/STM32G0xx/G031G(4-6-8)U_G041G(6-8)U/variant_generic.cpp
index e47e36ba7d..63ab5f8c6e 100644
--- a/variants/STM32G0xx/G031G(4-6-8)U_G041G(6-8)U/variant_generic.cpp
+++ b/variants/STM32G0xx/G031G(4-6-8)U_G041G(6-8)U/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G031G(4-6-8)U_G041G(6-8)U/variant_generic.h b/variants/STM32G0xx/G031G(4-6-8)U_G041G(6-8)U/variant_generic.h
index 5b61a14766..f2599f33f4 100644
--- a/variants/STM32G0xx/G031G(4-6-8)U_G041G(6-8)U/variant_generic.h
+++ b/variants/STM32G0xx/G031G(4-6-8)U_G041G(6-8)U/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G031J(4-6)M_G041J6M/PeripheralPins.c b/variants/STM32G0xx/G031J(4-6)M_G041J6M/PeripheralPins.c
index 07cdc03975..2f656d0ff5 100644
--- a/variants/STM32G0xx/G031J(4-6)M_G041J6M/PeripheralPins.c
+++ b/variants/STM32G0xx/G031J(4-6)M_G041J6M/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32G031J(4-6)Mx.xml, STM32G041J6Mx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G0xx/G031J(4-6)M_G041J6M/variant_generic.cpp b/variants/STM32G0xx/G031J(4-6)M_G041J6M/variant_generic.cpp
index 69aa210768..922c4e432b 100644
--- a/variants/STM32G0xx/G031J(4-6)M_G041J6M/variant_generic.cpp
+++ b/variants/STM32G0xx/G031J(4-6)M_G041J6M/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G031J(4-6)M_G041J6M/variant_generic.h b/variants/STM32G0xx/G031J(4-6)M_G041J6M/variant_generic.h
index 22ef1db66b..b6a38842d3 100644
--- a/variants/STM32G0xx/G031J(4-6)M_G041J6M/variant_generic.h
+++ b/variants/STM32G0xx/G031J(4-6)M_G041J6M/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G031K(4-6-8)(T-U)_G041K(6-8)(T-U)/PeripheralPins.c b/variants/STM32G0xx/G031K(4-6-8)(T-U)_G041K(6-8)(T-U)/PeripheralPins.c
index 1fd6797348..82fd7ec780 100644
--- a/variants/STM32G0xx/G031K(4-6-8)(T-U)_G041K(6-8)(T-U)/PeripheralPins.c
+++ b/variants/STM32G0xx/G031K(4-6-8)(T-U)_G041K(6-8)(T-U)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32G031K(4-6-8)Tx.xml, STM32G031K(4-6-8)Ux.xml
  * STM32G041K(6-8)Tx.xml, STM32G041K(6-8)Ux.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G0xx/G031K(4-6-8)(T-U)_G041K(6-8)(T-U)/variant_generic.cpp b/variants/STM32G0xx/G031K(4-6-8)(T-U)_G041K(6-8)(T-U)/variant_generic.cpp
index 565e4370b0..c07565238b 100644
--- a/variants/STM32G0xx/G031K(4-6-8)(T-U)_G041K(6-8)(T-U)/variant_generic.cpp
+++ b/variants/STM32G0xx/G031K(4-6-8)(T-U)_G041K(6-8)(T-U)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G031K(4-6-8)(T-U)_G041K(6-8)(T-U)/variant_generic.h b/variants/STM32G0xx/G031K(4-6-8)(T-U)_G041K(6-8)(T-U)/variant_generic.h
index 5d7df1903e..db97c61970 100644
--- a/variants/STM32G0xx/G031K(4-6-8)(T-U)_G041K(6-8)(T-U)/variant_generic.h
+++ b/variants/STM32G0xx/G031K(4-6-8)(T-U)_G041K(6-8)(T-U)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G050C(6-8)T/PeripheralPins.c b/variants/STM32G0xx/G050C(6-8)T/PeripheralPins.c
index d9174c483b..444db10998 100644
--- a/variants/STM32G0xx/G050C(6-8)T/PeripheralPins.c
+++ b/variants/STM32G0xx/G050C(6-8)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32G050C6Tx.xml, STM32G050C8Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G0xx/G050C(6-8)T/variant_generic.cpp b/variants/STM32G0xx/G050C(6-8)T/variant_generic.cpp
index 67cda03a1d..9f63036a88 100644
--- a/variants/STM32G0xx/G050C(6-8)T/variant_generic.cpp
+++ b/variants/STM32G0xx/G050C(6-8)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G050C(6-8)T/variant_generic.h b/variants/STM32G0xx/G050C(6-8)T/variant_generic.h
index 930f661a7f..be3694db3a 100644
--- a/variants/STM32G0xx/G050C(6-8)T/variant_generic.h
+++ b/variants/STM32G0xx/G050C(6-8)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G050F6P/PeripheralPins.c b/variants/STM32G0xx/G050F6P/PeripheralPins.c
index b44261073d..7e759345fb 100644
--- a/variants/STM32G0xx/G050F6P/PeripheralPins.c
+++ b/variants/STM32G0xx/G050F6P/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32G050F6Px.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G0xx/G050F6P/variant_generic.cpp b/variants/STM32G0xx/G050F6P/variant_generic.cpp
index 52bf20dfbb..1e7744a389 100644
--- a/variants/STM32G0xx/G050F6P/variant_generic.cpp
+++ b/variants/STM32G0xx/G050F6P/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G050F6P/variant_generic.h b/variants/STM32G0xx/G050F6P/variant_generic.h
index 7a9d6e1803..dfe64941dc 100644
--- a/variants/STM32G0xx/G050F6P/variant_generic.h
+++ b/variants/STM32G0xx/G050F6P/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G050K(6-8)T/PeripheralPins.c b/variants/STM32G0xx/G050K(6-8)T/PeripheralPins.c
index 53ef978252..3ca67f6aed 100644
--- a/variants/STM32G0xx/G050K(6-8)T/PeripheralPins.c
+++ b/variants/STM32G0xx/G050K(6-8)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32G050K6Tx.xml, STM32G050K8Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G0xx/G050K(6-8)T/variant_generic.cpp b/variants/STM32G0xx/G050K(6-8)T/variant_generic.cpp
index 896800269d..b11f2dbbaa 100644
--- a/variants/STM32G0xx/G050K(6-8)T/variant_generic.cpp
+++ b/variants/STM32G0xx/G050K(6-8)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G050K(6-8)T/variant_generic.h b/variants/STM32G0xx/G050K(6-8)T/variant_generic.h
index fa025dc8af..d64e570b8d 100644
--- a/variants/STM32G0xx/G050K(6-8)T/variant_generic.h
+++ b/variants/STM32G0xx/G050K(6-8)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G051C(6-8)(T-U)_G061C(6-8)(T-U)/PeripheralPins.c b/variants/STM32G0xx/G051C(6-8)(T-U)_G061C(6-8)(T-U)/PeripheralPins.c
index 6d2262f477..82a9581eba 100644
--- a/variants/STM32G0xx/G051C(6-8)(T-U)_G061C(6-8)(T-U)/PeripheralPins.c
+++ b/variants/STM32G0xx/G051C(6-8)(T-U)_G061C(6-8)(T-U)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32G051C(6-8)Tx.xml, STM32G051C(6-8)Ux.xml
  * STM32G061C(6-8)Tx.xml, STM32G061C(6-8)Ux.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G0xx/G051C(6-8)(T-U)_G061C(6-8)(T-U)/variant_generic.cpp b/variants/STM32G0xx/G051C(6-8)(T-U)_G061C(6-8)(T-U)/variant_generic.cpp
index 297d50508b..af371356cb 100644
--- a/variants/STM32G0xx/G051C(6-8)(T-U)_G061C(6-8)(T-U)/variant_generic.cpp
+++ b/variants/STM32G0xx/G051C(6-8)(T-U)_G061C(6-8)(T-U)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G051C(6-8)(T-U)_G061C(6-8)(T-U)/variant_generic.h b/variants/STM32G0xx/G051C(6-8)(T-U)_G061C(6-8)(T-U)/variant_generic.h
index 126e35e237..ad762f8dc9 100644
--- a/variants/STM32G0xx/G051C(6-8)(T-U)_G061C(6-8)(T-U)/variant_generic.h
+++ b/variants/STM32G0xx/G051C(6-8)(T-U)_G061C(6-8)(T-U)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G051F6P_G051F8(P-Y)_G061F6P_G061F8(P-Y)/PeripheralPins.c b/variants/STM32G0xx/G051F6P_G051F8(P-Y)_G061F6P_G061F8(P-Y)/PeripheralPins.c
index 6504af81f9..8b0563ec87 100644
--- a/variants/STM32G0xx/G051F6P_G051F8(P-Y)_G061F6P_G061F8(P-Y)/PeripheralPins.c
+++ b/variants/STM32G0xx/G051F6P_G051F8(P-Y)_G061F6P_G061F8(P-Y)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32G051F(6-8)Px.xml, STM32G051F8Yx.xml
  * STM32G061F(6-8)Px.xml, STM32G061F8Yx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G0xx/G051F6P_G051F8(P-Y)_G061F6P_G061F8(P-Y)/variant_generic.cpp b/variants/STM32G0xx/G051F6P_G051F8(P-Y)_G061F6P_G061F8(P-Y)/variant_generic.cpp
index 428ee7aa07..537898f81f 100644
--- a/variants/STM32G0xx/G051F6P_G051F8(P-Y)_G061F6P_G061F8(P-Y)/variant_generic.cpp
+++ b/variants/STM32G0xx/G051F6P_G051F8(P-Y)_G061F6P_G061F8(P-Y)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G051F6P_G051F8(P-Y)_G061F6P_G061F8(P-Y)/variant_generic.h b/variants/STM32G0xx/G051F6P_G051F8(P-Y)_G061F6P_G061F8(P-Y)/variant_generic.h
index 5e828ac15e..9256851656 100644
--- a/variants/STM32G0xx/G051F6P_G051F8(P-Y)_G061F6P_G061F8(P-Y)/variant_generic.h
+++ b/variants/STM32G0xx/G051F6P_G051F8(P-Y)_G061F6P_G061F8(P-Y)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G051G(6-8)U_G061G(6-8)U/PeripheralPins.c b/variants/STM32G0xx/G051G(6-8)U_G061G(6-8)U/PeripheralPins.c
index f30d223ab9..c1339f1920 100644
--- a/variants/STM32G0xx/G051G(6-8)U_G061G(6-8)U/PeripheralPins.c
+++ b/variants/STM32G0xx/G051G(6-8)U_G061G(6-8)U/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32G051G(6-8)Ux.xml, STM32G061G(6-8)Ux.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G0xx/G051G(6-8)U_G061G(6-8)U/variant_generic.cpp b/variants/STM32G0xx/G051G(6-8)U_G061G(6-8)U/variant_generic.cpp
index 677a0ced37..d47dc18462 100644
--- a/variants/STM32G0xx/G051G(6-8)U_G061G(6-8)U/variant_generic.cpp
+++ b/variants/STM32G0xx/G051G(6-8)U_G061G(6-8)U/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G051G(6-8)U_G061G(6-8)U/variant_generic.h b/variants/STM32G0xx/G051G(6-8)U_G061G(6-8)U/variant_generic.h
index 9afc6bddad..83c831a4f0 100644
--- a/variants/STM32G0xx/G051G(6-8)U_G061G(6-8)U/variant_generic.h
+++ b/variants/STM32G0xx/G051G(6-8)U_G061G(6-8)U/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G051K(6-8)(T-U)_G061K(6-8)(T-U)/PeripheralPins.c b/variants/STM32G0xx/G051K(6-8)(T-U)_G061K(6-8)(T-U)/PeripheralPins.c
index 3962b4ed5c..a8182cfd50 100644
--- a/variants/STM32G0xx/G051K(6-8)(T-U)_G061K(6-8)(T-U)/PeripheralPins.c
+++ b/variants/STM32G0xx/G051K(6-8)(T-U)_G061K(6-8)(T-U)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32G051K(6-8)Tx.xml, STM32G051K(6-8)Ux.xml
  * STM32G061K(6-8)Tx.xml, STM32G061K(6-8)Ux.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G0xx/G051K(6-8)(T-U)_G061K(6-8)(T-U)/variant_generic.cpp b/variants/STM32G0xx/G051K(6-8)(T-U)_G061K(6-8)(T-U)/variant_generic.cpp
index f77ecd450a..8a419cfb2a 100644
--- a/variants/STM32G0xx/G051K(6-8)(T-U)_G061K(6-8)(T-U)/variant_generic.cpp
+++ b/variants/STM32G0xx/G051K(6-8)(T-U)_G061K(6-8)(T-U)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G051K(6-8)(T-U)_G061K(6-8)(T-U)/variant_generic.h b/variants/STM32G0xx/G051K(6-8)(T-U)_G061K(6-8)(T-U)/variant_generic.h
index f9787a4617..b342d7c169 100644
--- a/variants/STM32G0xx/G051K(6-8)(T-U)_G061K(6-8)(T-U)/variant_generic.h
+++ b/variants/STM32G0xx/G051K(6-8)(T-U)_G061K(6-8)(T-U)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G070CBT/PeripheralPins.c b/variants/STM32G0xx/G070CBT/PeripheralPins.c
index 4838c3f67c..a245787eb6 100644
--- a/variants/STM32G0xx/G070CBT/PeripheralPins.c
+++ b/variants/STM32G0xx/G070CBT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32G070CBTx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G0xx/G070CBT/variant_generic.cpp b/variants/STM32G0xx/G070CBT/variant_generic.cpp
index 7b5f858597..e4844b5cba 100644
--- a/variants/STM32G0xx/G070CBT/variant_generic.cpp
+++ b/variants/STM32G0xx/G070CBT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G070CBT/variant_generic.h b/variants/STM32G0xx/G070CBT/variant_generic.h
index bfbe26f9ae..c99cd5a496 100644
--- a/variants/STM32G0xx/G070CBT/variant_generic.h
+++ b/variants/STM32G0xx/G070CBT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G070KBT/PeripheralPins.c b/variants/STM32G0xx/G070KBT/PeripheralPins.c
index b40d18c8b3..dc16d3d05b 100644
--- a/variants/STM32G0xx/G070KBT/PeripheralPins.c
+++ b/variants/STM32G0xx/G070KBT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32G070KBTx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G0xx/G070KBT/variant_generic.cpp b/variants/STM32G0xx/G070KBT/variant_generic.cpp
index a23e062aa6..fad2e7377d 100644
--- a/variants/STM32G0xx/G070KBT/variant_generic.cpp
+++ b/variants/STM32G0xx/G070KBT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G070KBT/variant_generic.h b/variants/STM32G0xx/G070KBT/variant_generic.h
index 259a88f5db..aa3db5ab99 100644
--- a/variants/STM32G0xx/G070KBT/variant_generic.h
+++ b/variants/STM32G0xx/G070KBT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G070RBT/PeripheralPins.c b/variants/STM32G0xx/G070RBT/PeripheralPins.c
index 4a9c4cdf81..eeb110a3fe 100644
--- a/variants/STM32G0xx/G070RBT/PeripheralPins.c
+++ b/variants/STM32G0xx/G070RBT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32G070RBTx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G0xx/G070RBT/variant_generic.cpp b/variants/STM32G0xx/G070RBT/variant_generic.cpp
index 2b012830f8..251fb400cd 100644
--- a/variants/STM32G0xx/G070RBT/variant_generic.cpp
+++ b/variants/STM32G0xx/G070RBT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G070RBT/variant_generic.h b/variants/STM32G0xx/G070RBT/variant_generic.h
index 003cbefade..d371924adb 100644
--- a/variants/STM32G0xx/G070RBT/variant_generic.h
+++ b/variants/STM32G0xx/G070RBT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G071C(6-8-B)(T-U)_G081CB(T-U)/PeripheralPins.c b/variants/STM32G0xx/G071C(6-8-B)(T-U)_G081CB(T-U)/PeripheralPins.c
index 75e287612a..767dd2b57d 100644
--- a/variants/STM32G0xx/G071C(6-8-B)(T-U)_G081CB(T-U)/PeripheralPins.c
+++ b/variants/STM32G0xx/G071C(6-8-B)(T-U)_G081CB(T-U)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32G071C(6-8-B)Tx.xml, STM32G071C(6-8-B)Ux.xml
  * STM32G081CBTx.xml, STM32G081CBUx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G0xx/G071C(6-8-B)(T-U)_G081CB(T-U)/variant_generic.cpp b/variants/STM32G0xx/G071C(6-8-B)(T-U)_G081CB(T-U)/variant_generic.cpp
index d65d3eae89..8489f19a66 100644
--- a/variants/STM32G0xx/G071C(6-8-B)(T-U)_G081CB(T-U)/variant_generic.cpp
+++ b/variants/STM32G0xx/G071C(6-8-B)(T-U)_G081CB(T-U)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G071C(6-8-B)(T-U)_G081CB(T-U)/variant_generic.h b/variants/STM32G0xx/G071C(6-8-B)(T-U)_G081CB(T-U)/variant_generic.h
index 25b36b34d0..24713bcdbc 100644
--- a/variants/STM32G0xx/G071C(6-8-B)(T-U)_G081CB(T-U)/variant_generic.h
+++ b/variants/STM32G0xx/G071C(6-8-B)(T-U)_G081CB(T-U)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G071EBY_G081EBY/PeripheralPins.c b/variants/STM32G0xx/G071EBY_G081EBY/PeripheralPins.c
index d66fe03b8d..fd54136a0f 100644
--- a/variants/STM32G0xx/G071EBY_G081EBY/PeripheralPins.c
+++ b/variants/STM32G0xx/G071EBY_G081EBY/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32G071EBYx.xml, STM32G081EBYx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G0xx/G071EBY_G081EBY/variant_generic.cpp b/variants/STM32G0xx/G071EBY_G081EBY/variant_generic.cpp
index b34d949801..ecb1d3a0af 100644
--- a/variants/STM32G0xx/G071EBY_G081EBY/variant_generic.cpp
+++ b/variants/STM32G0xx/G071EBY_G081EBY/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G071EBY_G081EBY/variant_generic.h b/variants/STM32G0xx/G071EBY_G081EBY/variant_generic.h
index 827934eb77..cba161da12 100644
--- a/variants/STM32G0xx/G071EBY_G081EBY/variant_generic.h
+++ b/variants/STM32G0xx/G071EBY_G081EBY/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G071G(6-8-B)U_G081GBU/PeripheralPins.c b/variants/STM32G0xx/G071G(6-8-B)U_G081GBU/PeripheralPins.c
index 3253038325..97ed4761e4 100644
--- a/variants/STM32G0xx/G071G(6-8-B)U_G081GBU/PeripheralPins.c
+++ b/variants/STM32G0xx/G071G(6-8-B)U_G081GBU/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32G071G(6-8-B)Ux.xml, STM32G081GBUx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G0xx/G071G(6-8-B)U_G081GBU/variant_generic.cpp b/variants/STM32G0xx/G071G(6-8-B)U_G081GBU/variant_generic.cpp
index 9fe5e0ee65..577907809f 100644
--- a/variants/STM32G0xx/G071G(6-8-B)U_G081GBU/variant_generic.cpp
+++ b/variants/STM32G0xx/G071G(6-8-B)U_G081GBU/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G071G(6-8-B)U_G081GBU/variant_generic.h b/variants/STM32G0xx/G071G(6-8-B)U_G081GBU/variant_generic.h
index b6e6503214..582b9eaf58 100644
--- a/variants/STM32G0xx/G071G(6-8-B)U_G081GBU/variant_generic.h
+++ b/variants/STM32G0xx/G071G(6-8-B)U_G081GBU/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G071G(8-B)UxN_G081GBUxN/PeripheralPins.c b/variants/STM32G0xx/G071G(8-B)UxN_G081GBUxN/PeripheralPins.c
index 082e76af24..06d0ed237b 100644
--- a/variants/STM32G0xx/G071G(8-B)UxN_G081GBUxN/PeripheralPins.c
+++ b/variants/STM32G0xx/G071G(8-B)UxN_G081GBUxN/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32G071G(8-B)UxN.xml, STM32G081GBUxN.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G0xx/G071G(8-B)UxN_G081GBUxN/variant_generic.cpp b/variants/STM32G0xx/G071G(8-B)UxN_G081GBUxN/variant_generic.cpp
index 54a01c8aec..8a0bce3cc6 100644
--- a/variants/STM32G0xx/G071G(8-B)UxN_G081GBUxN/variant_generic.cpp
+++ b/variants/STM32G0xx/G071G(8-B)UxN_G081GBUxN/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G071G(8-B)UxN_G081GBUxN/variant_generic.h b/variants/STM32G0xx/G071G(8-B)UxN_G081GBUxN/variant_generic.h
index b674a7dcf7..436654611a 100644
--- a/variants/STM32G0xx/G071G(8-B)UxN_G081GBUxN/variant_generic.h
+++ b/variants/STM32G0xx/G071G(8-B)UxN_G081GBUxN/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G071K(6-8-B)(T-U)_G081KB(T-U)/PeripheralPins.c b/variants/STM32G0xx/G071K(6-8-B)(T-U)_G081KB(T-U)/PeripheralPins.c
index 71f3e105ec..13c957df9d 100644
--- a/variants/STM32G0xx/G071K(6-8-B)(T-U)_G081KB(T-U)/PeripheralPins.c
+++ b/variants/STM32G0xx/G071K(6-8-B)(T-U)_G081KB(T-U)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32G071K(6-8-B)Tx.xml, STM32G071K(6-8-B)Ux.xml
  * STM32G081KBTx.xml, STM32G081KBUx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G0xx/G071K(6-8-B)(T-U)_G081KB(T-U)/variant_generic.cpp b/variants/STM32G0xx/G071K(6-8-B)(T-U)_G081KB(T-U)/variant_generic.cpp
index 5201b0615a..a32ea3d423 100644
--- a/variants/STM32G0xx/G071K(6-8-B)(T-U)_G081KB(T-U)/variant_generic.cpp
+++ b/variants/STM32G0xx/G071K(6-8-B)(T-U)_G081KB(T-U)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G071K(6-8-B)(T-U)_G081KB(T-U)/variant_generic.h b/variants/STM32G0xx/G071K(6-8-B)(T-U)_G081KB(T-U)/variant_generic.h
index 28a6d1c307..201e239950 100644
--- a/variants/STM32G0xx/G071K(6-8-B)(T-U)_G081KB(T-U)/variant_generic.h
+++ b/variants/STM32G0xx/G071K(6-8-B)(T-U)_G081KB(T-U)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G071K(8-B)(T-U)xN_G081KB(T-U)xN/PeripheralPins.c b/variants/STM32G0xx/G071K(8-B)(T-U)xN_G081KB(T-U)xN/PeripheralPins.c
index d03564077c..21cd1c2fe7 100644
--- a/variants/STM32G0xx/G071K(8-B)(T-U)xN_G081KB(T-U)xN/PeripheralPins.c
+++ b/variants/STM32G0xx/G071K(8-B)(T-U)xN_G081KB(T-U)xN/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32G071K(8-B)TxN.xml, STM32G071K(8-B)UxN.xml
  * STM32G081KBTxN.xml, STM32G081KBUxN.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G0xx/G071K(8-B)(T-U)xN_G081KB(T-U)xN/variant_generic.cpp b/variants/STM32G0xx/G071K(8-B)(T-U)xN_G081KB(T-U)xN/variant_generic.cpp
index ef959a3dfe..7470575e68 100644
--- a/variants/STM32G0xx/G071K(8-B)(T-U)xN_G081KB(T-U)xN/variant_generic.cpp
+++ b/variants/STM32G0xx/G071K(8-B)(T-U)xN_G081KB(T-U)xN/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G071K(8-B)(T-U)xN_G081KB(T-U)xN/variant_generic.h b/variants/STM32G0xx/G071K(8-B)(T-U)xN_G081KB(T-U)xN/variant_generic.h
index 445813ea95..9d8ceaa797 100644
--- a/variants/STM32G0xx/G071K(8-B)(T-U)xN_G081KB(T-U)xN/variant_generic.h
+++ b/variants/STM32G0xx/G071K(8-B)(T-U)xN_G081KB(T-U)xN/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G071R(6-8)T_G071RB(I-T)_G081RB(I-T)/PeripheralPins.c b/variants/STM32G0xx/G071R(6-8)T_G071RB(I-T)_G081RB(I-T)/PeripheralPins.c
index 3cba14367a..a6ca2b3452 100644
--- a/variants/STM32G0xx/G071R(6-8)T_G071RB(I-T)_G081RB(I-T)/PeripheralPins.c
+++ b/variants/STM32G0xx/G071R(6-8)T_G071RB(I-T)_G081RB(I-T)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32G071R(6-8-B)Tx.xml, STM32G071RBIx.xml
  * STM32G081RBIx.xml, STM32G081RBTx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G0xx/G071R(6-8)T_G071RB(I-T)_G081RB(I-T)/variant_generic.cpp b/variants/STM32G0xx/G071R(6-8)T_G071RB(I-T)_G081RB(I-T)/variant_generic.cpp
index 6b0985ddab..30724b50c6 100644
--- a/variants/STM32G0xx/G071R(6-8)T_G071RB(I-T)_G081RB(I-T)/variant_generic.cpp
+++ b/variants/STM32G0xx/G071R(6-8)T_G071RB(I-T)_G081RB(I-T)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G071R(6-8)T_G071RB(I-T)_G081RB(I-T)/variant_generic.h b/variants/STM32G0xx/G071R(6-8)T_G071RB(I-T)_G081RB(I-T)/variant_generic.h
index 6941e1c507..96f8715b98 100644
--- a/variants/STM32G0xx/G071R(6-8)T_G071RB(I-T)_G081RB(I-T)/variant_generic.h
+++ b/variants/STM32G0xx/G071R(6-8)T_G071RB(I-T)_G081RB(I-T)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G0B0CET/PeripheralPins.c b/variants/STM32G0xx/G0B0CET/PeripheralPins.c
index f96562cd63..213fe987fe 100644
--- a/variants/STM32G0xx/G0B0CET/PeripheralPins.c
+++ b/variants/STM32G0xx/G0B0CET/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32G0B0CETx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G0xx/G0B0CET/variant_generic.cpp b/variants/STM32G0xx/G0B0CET/variant_generic.cpp
index 2c124e63c1..465c197d3b 100644
--- a/variants/STM32G0xx/G0B0CET/variant_generic.cpp
+++ b/variants/STM32G0xx/G0B0CET/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G0B0CET/variant_generic.h b/variants/STM32G0xx/G0B0CET/variant_generic.h
index aeb37cb225..907fae21a3 100644
--- a/variants/STM32G0xx/G0B0CET/variant_generic.h
+++ b/variants/STM32G0xx/G0B0CET/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G0B0KET/PeripheralPins.c b/variants/STM32G0xx/G0B0KET/PeripheralPins.c
index 8ba83a7b9d..b1c403a908 100644
--- a/variants/STM32G0xx/G0B0KET/PeripheralPins.c
+++ b/variants/STM32G0xx/G0B0KET/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32G0B0KETx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G0xx/G0B0KET/variant_generic.cpp b/variants/STM32G0xx/G0B0KET/variant_generic.cpp
index af0950891d..fa272869c1 100644
--- a/variants/STM32G0xx/G0B0KET/variant_generic.cpp
+++ b/variants/STM32G0xx/G0B0KET/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G0B0KET/variant_generic.h b/variants/STM32G0xx/G0B0KET/variant_generic.h
index fe22cfc902..ae975c7153 100644
--- a/variants/STM32G0xx/G0B0KET/variant_generic.h
+++ b/variants/STM32G0xx/G0B0KET/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G0B0RET/PeripheralPins.c b/variants/STM32G0xx/G0B0RET/PeripheralPins.c
index 83bc4968f3..27119b1857 100644
--- a/variants/STM32G0xx/G0B0RET/PeripheralPins.c
+++ b/variants/STM32G0xx/G0B0RET/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32G0B0RETx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G0xx/G0B0RET/variant_generic.cpp b/variants/STM32G0xx/G0B0RET/variant_generic.cpp
index 8c700873cc..b083a6cb3a 100644
--- a/variants/STM32G0xx/G0B0RET/variant_generic.cpp
+++ b/variants/STM32G0xx/G0B0RET/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G0B0RET/variant_generic.h b/variants/STM32G0xx/G0B0RET/variant_generic.h
index 4f5cee530a..283b53e46a 100644
--- a/variants/STM32G0xx/G0B0RET/variant_generic.h
+++ b/variants/STM32G0xx/G0B0RET/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G0B0VET/PeripheralPins.c b/variants/STM32G0xx/G0B0VET/PeripheralPins.c
index 71e2a8e6cf..adc77db46d 100644
--- a/variants/STM32G0xx/G0B0VET/PeripheralPins.c
+++ b/variants/STM32G0xx/G0B0VET/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32G0B0VETx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G0xx/G0B0VET/variant_generic.cpp b/variants/STM32G0xx/G0B0VET/variant_generic.cpp
index 11ca30fbbe..947fe045dd 100644
--- a/variants/STM32G0xx/G0B0VET/variant_generic.cpp
+++ b/variants/STM32G0xx/G0B0VET/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G0B0VET/variant_generic.h b/variants/STM32G0xx/G0B0VET/variant_generic.h
index 7dc4dbe894..0fe565c137 100644
--- a/variants/STM32G0xx/G0B0VET/variant_generic.h
+++ b/variants/STM32G0xx/G0B0VET/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G0B1C(B-C-E)(T-U)_G0C1C(C-E)(T-U)/PeripheralPins.c b/variants/STM32G0xx/G0B1C(B-C-E)(T-U)_G0C1C(C-E)(T-U)/PeripheralPins.c
index ff0659629f..e573c8e81f 100644
--- a/variants/STM32G0xx/G0B1C(B-C-E)(T-U)_G0C1C(C-E)(T-U)/PeripheralPins.c
+++ b/variants/STM32G0xx/G0B1C(B-C-E)(T-U)_G0C1C(C-E)(T-U)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,9 +12,8 @@
  */
 /*
  * Automatically generated from STM32G0B1C(B-C-E)Tx.xml, STM32G0B1C(B-C-E)Ux.xml
- * STM32G0B1C(C-E)Tx.xml, STM32G0B1C(C-E)Ux.xml
  * STM32G0C1C(C-E)Tx.xml, STM32G0C1C(C-E)Ux.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G0xx/G0B1C(B-C-E)(T-U)_G0C1C(C-E)(T-U)/variant_generic.cpp b/variants/STM32G0xx/G0B1C(B-C-E)(T-U)_G0C1C(C-E)(T-U)/variant_generic.cpp
index e74ef3feb5..654d44f41d 100644
--- a/variants/STM32G0xx/G0B1C(B-C-E)(T-U)_G0C1C(C-E)(T-U)/variant_generic.cpp
+++ b/variants/STM32G0xx/G0B1C(B-C-E)(T-U)_G0C1C(C-E)(T-U)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G0B1C(B-C-E)(T-U)_G0C1C(C-E)(T-U)/variant_generic.h b/variants/STM32G0xx/G0B1C(B-C-E)(T-U)_G0C1C(C-E)(T-U)/variant_generic.h
index 0cc4166fb9..ff75bc1e48 100644
--- a/variants/STM32G0xx/G0B1C(B-C-E)(T-U)_G0C1C(C-E)(T-U)/variant_generic.h
+++ b/variants/STM32G0xx/G0B1C(B-C-E)(T-U)_G0C1C(C-E)(T-U)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G0B1C(B-C-E)(T-U)xN_G0C1C(C-E)(T-U)xN/PeripheralPins.c b/variants/STM32G0xx/G0B1C(B-C-E)(T-U)xN_G0C1C(C-E)(T-U)xN/PeripheralPins.c
index 2e975a6e86..a335aedc3f 100644
--- a/variants/STM32G0xx/G0B1C(B-C-E)(T-U)xN_G0C1C(C-E)(T-U)xN/PeripheralPins.c
+++ b/variants/STM32G0xx/G0B1C(B-C-E)(T-U)xN_G0C1C(C-E)(T-U)xN/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32G0B1C(B-C-E)TxN.xml, STM32G0B1C(B-C-E)UxN.xml
  * STM32G0C1C(C-E)TxN.xml, STM32G0C1C(C-E)UxN.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G0xx/G0B1C(B-C-E)(T-U)xN_G0C1C(C-E)(T-U)xN/variant_generic.cpp b/variants/STM32G0xx/G0B1C(B-C-E)(T-U)xN_G0C1C(C-E)(T-U)xN/variant_generic.cpp
index 2e3f103aba..44f8c82a56 100644
--- a/variants/STM32G0xx/G0B1C(B-C-E)(T-U)xN_G0C1C(C-E)(T-U)xN/variant_generic.cpp
+++ b/variants/STM32G0xx/G0B1C(B-C-E)(T-U)xN_G0C1C(C-E)(T-U)xN/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G0B1C(B-C-E)(T-U)xN_G0C1C(C-E)(T-U)xN/variant_generic.h b/variants/STM32G0xx/G0B1C(B-C-E)(T-U)xN_G0C1C(C-E)(T-U)xN/variant_generic.h
index f4bd0b562b..4b43590a30 100644
--- a/variants/STM32G0xx/G0B1C(B-C-E)(T-U)xN_G0C1C(C-E)(T-U)xN/variant_generic.h
+++ b/variants/STM32G0xx/G0B1C(B-C-E)(T-U)xN_G0C1C(C-E)(T-U)xN/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G0B1K(B-C-E)(T-U)_G0C1K(C-E)(T-U)/PeripheralPins.c b/variants/STM32G0xx/G0B1K(B-C-E)(T-U)_G0C1K(C-E)(T-U)/PeripheralPins.c
index 9c16b43e3d..4559ae6cff 100644
--- a/variants/STM32G0xx/G0B1K(B-C-E)(T-U)_G0C1K(C-E)(T-U)/PeripheralPins.c
+++ b/variants/STM32G0xx/G0B1K(B-C-E)(T-U)_G0C1K(C-E)(T-U)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,9 +12,8 @@
  */
 /*
  * Automatically generated from STM32G0B1K(B-C-E)Tx.xml, STM32G0B1K(B-C-E)Ux.xml
- * STM32G0B1K(C-E)Tx.xml, STM32G0B1K(C-E)Ux.xml
  * STM32G0C1K(C-E)Tx.xml, STM32G0C1K(C-E)Ux.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G0xx/G0B1K(B-C-E)(T-U)_G0C1K(C-E)(T-U)/variant_generic.cpp b/variants/STM32G0xx/G0B1K(B-C-E)(T-U)_G0C1K(C-E)(T-U)/variant_generic.cpp
index c0886919ef..48fdc8b2cc 100644
--- a/variants/STM32G0xx/G0B1K(B-C-E)(T-U)_G0C1K(C-E)(T-U)/variant_generic.cpp
+++ b/variants/STM32G0xx/G0B1K(B-C-E)(T-U)_G0C1K(C-E)(T-U)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G0B1K(B-C-E)(T-U)_G0C1K(C-E)(T-U)/variant_generic.h b/variants/STM32G0xx/G0B1K(B-C-E)(T-U)_G0C1K(C-E)(T-U)/variant_generic.h
index 68d4a60e2d..f29c650d00 100644
--- a/variants/STM32G0xx/G0B1K(B-C-E)(T-U)_G0C1K(C-E)(T-U)/variant_generic.h
+++ b/variants/STM32G0xx/G0B1K(B-C-E)(T-U)_G0C1K(C-E)(T-U)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G0B1K(B-C-E)(T-U)xN_G0C1K(C-E)(T-U)xN/PeripheralPins.c b/variants/STM32G0xx/G0B1K(B-C-E)(T-U)xN_G0C1K(C-E)(T-U)xN/PeripheralPins.c
index 1d721caeff..4397388b1d 100644
--- a/variants/STM32G0xx/G0B1K(B-C-E)(T-U)xN_G0C1K(C-E)(T-U)xN/PeripheralPins.c
+++ b/variants/STM32G0xx/G0B1K(B-C-E)(T-U)xN_G0C1K(C-E)(T-U)xN/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,9 +12,8 @@
  */
 /*
  * Automatically generated from STM32G0B1K(B-C-E)TxN.xml, STM32G0B1K(B-C-E)UxN.xml
- * STM32G0B1K(C-E)TxN.xml, STM32G0B1K(C-E)UxN.xml
  * STM32G0C1K(C-E)TxN.xml, STM32G0C1K(C-E)UxN.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G0xx/G0B1K(B-C-E)(T-U)xN_G0C1K(C-E)(T-U)xN/variant_generic.cpp b/variants/STM32G0xx/G0B1K(B-C-E)(T-U)xN_G0C1K(C-E)(T-U)xN/variant_generic.cpp
index fd6187bb80..17cee34eff 100644
--- a/variants/STM32G0xx/G0B1K(B-C-E)(T-U)xN_G0C1K(C-E)(T-U)xN/variant_generic.cpp
+++ b/variants/STM32G0xx/G0B1K(B-C-E)(T-U)xN_G0C1K(C-E)(T-U)xN/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G0B1K(B-C-E)(T-U)xN_G0C1K(C-E)(T-U)xN/variant_generic.h b/variants/STM32G0xx/G0B1K(B-C-E)(T-U)xN_G0C1K(C-E)(T-U)xN/variant_generic.h
index 774c43faf0..2f62979a2c 100644
--- a/variants/STM32G0xx/G0B1K(B-C-E)(T-U)xN_G0C1K(C-E)(T-U)xN/variant_generic.h
+++ b/variants/STM32G0xx/G0B1K(B-C-E)(T-U)xN_G0C1K(C-E)(T-U)xN/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G0B1M(B-C-E)T_G0C1M(C-E)T/PeripheralPins.c b/variants/STM32G0xx/G0B1M(B-C-E)T_G0C1M(C-E)T/PeripheralPins.c
index 8f89085670..e0f45e51ab 100644
--- a/variants/STM32G0xx/G0B1M(B-C-E)T_G0C1M(C-E)T/PeripheralPins.c
+++ b/variants/STM32G0xx/G0B1M(B-C-E)T_G0C1M(C-E)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -11,9 +11,8 @@
  *******************************************************************************
  */
 /*
- * Automatically generated from STM32G0B1M(B-C-E)Tx.xml, STM32G0B1M(C-E)Tx.xml
- * STM32G0C1M(C-E)Tx.xml
- * CubeMX DB release 6.0.30
+ * Automatically generated from STM32G0B1M(B-C-E)Tx.xml, STM32G0C1M(C-E)Tx.xml
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G0xx/G0B1M(B-C-E)T_G0C1M(C-E)T/variant_generic.cpp b/variants/STM32G0xx/G0B1M(B-C-E)T_G0C1M(C-E)T/variant_generic.cpp
index ed988fa9fe..3ea1239f7f 100644
--- a/variants/STM32G0xx/G0B1M(B-C-E)T_G0C1M(C-E)T/variant_generic.cpp
+++ b/variants/STM32G0xx/G0B1M(B-C-E)T_G0C1M(C-E)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G0B1M(B-C-E)T_G0C1M(C-E)T/variant_generic.h b/variants/STM32G0xx/G0B1M(B-C-E)T_G0C1M(C-E)T/variant_generic.h
index 1c20f45c71..91355539f9 100644
--- a/variants/STM32G0xx/G0B1M(B-C-E)T_G0C1M(C-E)T/variant_generic.h
+++ b/variants/STM32G0xx/G0B1M(B-C-E)T_G0C1M(C-E)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G0B1NEY_G0C1NEY/PeripheralPins.c b/variants/STM32G0xx/G0B1NEY_G0C1NEY/PeripheralPins.c
index b0512481ac..a6d53ee9ec 100644
--- a/variants/STM32G0xx/G0B1NEY_G0C1NEY/PeripheralPins.c
+++ b/variants/STM32G0xx/G0B1NEY_G0C1NEY/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32G0B1NEYx.xml, STM32G0C1NEYx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G0xx/G0B1NEY_G0C1NEY/variant_generic.cpp b/variants/STM32G0xx/G0B1NEY_G0C1NEY/variant_generic.cpp
index ef10953060..97933d8c5d 100644
--- a/variants/STM32G0xx/G0B1NEY_G0C1NEY/variant_generic.cpp
+++ b/variants/STM32G0xx/G0B1NEY_G0C1NEY/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G0B1NEY_G0C1NEY/variant_generic.h b/variants/STM32G0xx/G0B1NEY_G0C1NEY/variant_generic.h
index d47e9027b9..d70a0af095 100644
--- a/variants/STM32G0xx/G0B1NEY_G0C1NEY/variant_generic.h
+++ b/variants/STM32G0xx/G0B1NEY_G0C1NEY/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G0B1R(B-C-E)(I-T)xN_G0C1R(C-E)(I-T)xN/PeripheralPins.c b/variants/STM32G0xx/G0B1R(B-C-E)(I-T)xN_G0C1R(C-E)(I-T)xN/PeripheralPins.c
index 805e999a62..f168319575 100644
--- a/variants/STM32G0xx/G0B1R(B-C-E)(I-T)xN_G0C1R(C-E)(I-T)xN/PeripheralPins.c
+++ b/variants/STM32G0xx/G0B1R(B-C-E)(I-T)xN_G0C1R(C-E)(I-T)xN/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32G0B1R(B-C-E)IxN.xml, STM32G0B1R(B-C-E)TxN.xml
  * STM32G0C1R(C-E)IxN.xml, STM32G0C1R(C-E)TxN.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G0xx/G0B1R(B-C-E)(I-T)xN_G0C1R(C-E)(I-T)xN/variant_generic.cpp b/variants/STM32G0xx/G0B1R(B-C-E)(I-T)xN_G0C1R(C-E)(I-T)xN/variant_generic.cpp
index fe6ac9e181..6fec7efe45 100644
--- a/variants/STM32G0xx/G0B1R(B-C-E)(I-T)xN_G0C1R(C-E)(I-T)xN/variant_generic.cpp
+++ b/variants/STM32G0xx/G0B1R(B-C-E)(I-T)xN_G0C1R(C-E)(I-T)xN/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G0B1R(B-C-E)(I-T)xN_G0C1R(C-E)(I-T)xN/variant_generic.h b/variants/STM32G0xx/G0B1R(B-C-E)(I-T)xN_G0C1R(C-E)(I-T)xN/variant_generic.h
index dfb5e344ff..3adf9fd1ac 100644
--- a/variants/STM32G0xx/G0B1R(B-C-E)(I-T)xN_G0C1R(C-E)(I-T)xN/variant_generic.h
+++ b/variants/STM32G0xx/G0B1R(B-C-E)(I-T)xN_G0C1R(C-E)(I-T)xN/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G0B1RBT_G0B1R(C-E)(I-T)_G0C1R(C-E)(I-T)/PeripheralPins.c b/variants/STM32G0xx/G0B1R(B-C-E)T_G0C1R(C-E)T/PeripheralPins.c
similarity index 99%
rename from variants/STM32G0xx/G0B1RBT_G0B1R(C-E)(I-T)_G0C1R(C-E)(I-T)/PeripheralPins.c
rename to variants/STM32G0xx/G0B1R(B-C-E)T_G0C1R(C-E)T/PeripheralPins.c
index 202797965d..d52276ab1d 100644
--- a/variants/STM32G0xx/G0B1RBT_G0B1R(C-E)(I-T)_G0C1R(C-E)(I-T)/PeripheralPins.c
+++ b/variants/STM32G0xx/G0B1R(B-C-E)T_G0C1R(C-E)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -11,10 +11,8 @@
  *******************************************************************************
  */
 /*
- * Automatically generated from STM32G0B1R(B-C-E)Tx.xml, STM32G0B1R(C-E)Ix.xml
- * STM32G0B1R(C-E)Tx.xml, STM32G0C1R(C-E)Ix.xml
- * STM32G0C1R(C-E)Tx.xml
- * CubeMX DB release 6.0.30
+ * Automatically generated from STM32G0B1R(B-C-E)Tx.xml, STM32G0C1R(C-E)Tx.xml
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G0xx/G0B1RBT_G0B1R(C-E)(I-T)_G0C1R(C-E)(I-T)/PinNamesVar.h b/variants/STM32G0xx/G0B1R(B-C-E)T_G0C1R(C-E)T/PinNamesVar.h
similarity index 100%
rename from variants/STM32G0xx/G0B1RBT_G0B1R(C-E)(I-T)_G0C1R(C-E)(I-T)/PinNamesVar.h
rename to variants/STM32G0xx/G0B1R(B-C-E)T_G0C1R(C-E)T/PinNamesVar.h
diff --git a/variants/STM32G0xx/G0B1R(B-C-E)T_G0C1R(C-E)T/boards_entry.txt b/variants/STM32G0xx/G0B1R(B-C-E)T_G0C1R(C-E)T/boards_entry.txt
new file mode 100644
index 0000000000..434c81f497
--- /dev/null
+++ b/variants/STM32G0xx/G0B1R(B-C-E)T_G0C1R(C-E)T/boards_entry.txt
@@ -0,0 +1,45 @@
+# This file help to add generic board entry.
+# upload.maximum_size and product_line have to be verified
+# and changed if needed.
+# See: https://github.com/stm32duino/wiki/wiki/Add-a-new-variant-%28board%29
+
+# Generic G0B1RBTx
+GenG0.menu.pnum.GENERIC_G0B1RBTX=Generic G0B1RBTx
+GenG0.menu.pnum.GENERIC_G0B1RBTX.upload.maximum_size=131072
+GenG0.menu.pnum.GENERIC_G0B1RBTX.upload.maximum_data_size=147456
+GenG0.menu.pnum.GENERIC_G0B1RBTX.build.board=GENERIC_G0B1RBTX
+GenG0.menu.pnum.GENERIC_G0B1RBTX.build.product_line=STM32G0B1xx
+GenG0.menu.pnum.GENERIC_G0B1RBTX.build.variant=STM32G0xx/G0B1R(B-C-E)T_G0C1R(C-E)T
+
+# Generic G0B1RCTx
+GenG0.menu.pnum.GENERIC_G0B1RCTX=Generic G0B1RCTx
+GenG0.menu.pnum.GENERIC_G0B1RCTX.upload.maximum_size=262144
+GenG0.menu.pnum.GENERIC_G0B1RCTX.upload.maximum_data_size=147456
+GenG0.menu.pnum.GENERIC_G0B1RCTX.build.board=GENERIC_G0B1RCTX
+GenG0.menu.pnum.GENERIC_G0B1RCTX.build.product_line=STM32G0B1xx
+GenG0.menu.pnum.GENERIC_G0B1RCTX.build.variant=STM32G0xx/G0B1R(B-C-E)T_G0C1R(C-E)T
+
+# Generic G0B1RETx
+GenG0.menu.pnum.GENERIC_G0B1RETX=Generic G0B1RETx
+GenG0.menu.pnum.GENERIC_G0B1RETX.upload.maximum_size=524288
+GenG0.menu.pnum.GENERIC_G0B1RETX.upload.maximum_data_size=147456
+GenG0.menu.pnum.GENERIC_G0B1RETX.build.board=GENERIC_G0B1RETX
+GenG0.menu.pnum.GENERIC_G0B1RETX.build.product_line=STM32G0B1xx
+GenG0.menu.pnum.GENERIC_G0B1RETX.build.variant=STM32G0xx/G0B1R(B-C-E)T_G0C1R(C-E)T
+
+# Generic G0C1RCTx
+GenG0.menu.pnum.GENERIC_G0C1RCTX=Generic G0C1RCTx
+GenG0.menu.pnum.GENERIC_G0C1RCTX.upload.maximum_size=262144
+GenG0.menu.pnum.GENERIC_G0C1RCTX.upload.maximum_data_size=147456
+GenG0.menu.pnum.GENERIC_G0C1RCTX.build.board=GENERIC_G0C1RCTX
+GenG0.menu.pnum.GENERIC_G0C1RCTX.build.product_line=STM32G0C1xx
+GenG0.menu.pnum.GENERIC_G0C1RCTX.build.variant=STM32G0xx/G0B1R(B-C-E)T_G0C1R(C-E)T
+
+# Generic G0C1RETx
+GenG0.menu.pnum.GENERIC_G0C1RETX=Generic G0C1RETx
+GenG0.menu.pnum.GENERIC_G0C1RETX.upload.maximum_size=524288
+GenG0.menu.pnum.GENERIC_G0C1RETX.upload.maximum_data_size=147456
+GenG0.menu.pnum.GENERIC_G0C1RETX.build.board=GENERIC_G0C1RETX
+GenG0.menu.pnum.GENERIC_G0C1RETX.build.product_line=STM32G0C1xx
+GenG0.menu.pnum.GENERIC_G0C1RETX.build.variant=STM32G0xx/G0B1R(B-C-E)T_G0C1R(C-E)T
+
diff --git a/variants/STM32G0xx/G0B1RBT_G0B1R(C-E)(I-T)_G0C1R(C-E)(I-T)/generic_clock.c b/variants/STM32G0xx/G0B1R(B-C-E)T_G0C1R(C-E)T/generic_clock.c
similarity index 91%
rename from variants/STM32G0xx/G0B1RBT_G0B1R(C-E)(I-T)_G0C1R(C-E)(I-T)/generic_clock.c
rename to variants/STM32G0xx/G0B1R(B-C-E)T_G0C1R(C-E)T/generic_clock.c
index 00421917c5..6c36ae21a2 100644
--- a/variants/STM32G0xx/G0B1RBT_G0B1R(C-E)(I-T)_G0C1R(C-E)(I-T)/generic_clock.c
+++ b/variants/STM32G0xx/G0B1R(B-C-E)T_G0C1R(C-E)T/generic_clock.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -10,10 +10,8 @@
  *
  *******************************************************************************
  */
-#if defined(ARDUINO_GENERIC_G0B1RBTX) || defined(ARDUINO_GENERIC_G0B1RCIX) ||\
-    defined(ARDUINO_GENERIC_G0B1RCTX) || defined(ARDUINO_GENERIC_G0B1REIX) ||\
-    defined(ARDUINO_GENERIC_G0B1RETX) || defined(ARDUINO_GENERIC_G0C1RCIX) ||\
-    defined(ARDUINO_GENERIC_G0C1RCTX) || defined(ARDUINO_GENERIC_G0C1REIX) ||\
+#if defined(ARDUINO_GENERIC_G0B1RBTX) || defined(ARDUINO_GENERIC_G0B1RCTX) ||\
+    defined(ARDUINO_GENERIC_G0B1RETX) || defined(ARDUINO_GENERIC_G0C1RCTX) ||\
     defined(ARDUINO_GENERIC_G0C1RETX)
 #include "pins_arduino.h"
 
diff --git a/variants/STM32G0xx/G0B1RBT_G0B1R(C-E)(I-T)_G0C1R(C-E)(I-T)/ldscript.ld b/variants/STM32G0xx/G0B1R(B-C-E)T_G0C1R(C-E)T/ldscript.ld
similarity index 100%
rename from variants/STM32G0xx/G0B1RBT_G0B1R(C-E)(I-T)_G0C1R(C-E)(I-T)/ldscript.ld
rename to variants/STM32G0xx/G0B1R(B-C-E)T_G0C1R(C-E)T/ldscript.ld
diff --git a/variants/STM32G0xx/G0B1RBT_G0B1R(C-E)(I-T)_G0C1R(C-E)(I-T)/variant_NUCLEO_G0B1RE.cpp b/variants/STM32G0xx/G0B1R(B-C-E)T_G0C1R(C-E)T/variant_NUCLEO_G0B1RE.cpp
similarity index 100%
rename from variants/STM32G0xx/G0B1RBT_G0B1R(C-E)(I-T)_G0C1R(C-E)(I-T)/variant_NUCLEO_G0B1RE.cpp
rename to variants/STM32G0xx/G0B1R(B-C-E)T_G0C1R(C-E)T/variant_NUCLEO_G0B1RE.cpp
diff --git a/variants/STM32G0xx/G0B1RBT_G0B1R(C-E)(I-T)_G0C1R(C-E)(I-T)/variant_NUCLEO_G0B1RE.h b/variants/STM32G0xx/G0B1R(B-C-E)T_G0C1R(C-E)T/variant_NUCLEO_G0B1RE.h
similarity index 100%
rename from variants/STM32G0xx/G0B1RBT_G0B1R(C-E)(I-T)_G0C1R(C-E)(I-T)/variant_NUCLEO_G0B1RE.h
rename to variants/STM32G0xx/G0B1R(B-C-E)T_G0C1R(C-E)T/variant_NUCLEO_G0B1RE.h
diff --git a/variants/STM32G0xx/G0B1RBT_G0B1R(C-E)(I-T)_G0C1R(C-E)(I-T)/variant_generic.cpp b/variants/STM32G0xx/G0B1R(B-C-E)T_G0C1R(C-E)T/variant_generic.cpp
similarity index 90%
rename from variants/STM32G0xx/G0B1RBT_G0B1R(C-E)(I-T)_G0C1R(C-E)(I-T)/variant_generic.cpp
rename to variants/STM32G0xx/G0B1R(B-C-E)T_G0C1R(C-E)T/variant_generic.cpp
index 78b78f6f79..b5620814fe 100644
--- a/variants/STM32G0xx/G0B1RBT_G0B1R(C-E)(I-T)_G0C1R(C-E)(I-T)/variant_generic.cpp
+++ b/variants/STM32G0xx/G0B1R(B-C-E)T_G0C1R(C-E)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -10,10 +10,8 @@
  *
  *******************************************************************************
  */
-#if defined(ARDUINO_GENERIC_G0B1RBTX) || defined(ARDUINO_GENERIC_G0B1RCIX) ||\
-    defined(ARDUINO_GENERIC_G0B1RCTX) || defined(ARDUINO_GENERIC_G0B1REIX) ||\
-    defined(ARDUINO_GENERIC_G0B1RETX) || defined(ARDUINO_GENERIC_G0C1RCIX) ||\
-    defined(ARDUINO_GENERIC_G0C1RCTX) || defined(ARDUINO_GENERIC_G0C1REIX) ||\
+#if defined(ARDUINO_GENERIC_G0B1RBTX) || defined(ARDUINO_GENERIC_G0B1RCTX) ||\
+    defined(ARDUINO_GENERIC_G0B1RETX) || defined(ARDUINO_GENERIC_G0C1RCTX) ||\
     defined(ARDUINO_GENERIC_G0C1RETX)
 #include "pins_arduino.h"
 
diff --git a/variants/STM32G0xx/G0B1RBT_G0B1R(C-E)(I-T)_G0C1R(C-E)(I-T)/variant_generic.h b/variants/STM32G0xx/G0B1R(B-C-E)T_G0C1R(C-E)T/variant_generic.h
similarity index 99%
rename from variants/STM32G0xx/G0B1RBT_G0B1R(C-E)(I-T)_G0C1R(C-E)(I-T)/variant_generic.h
rename to variants/STM32G0xx/G0B1R(B-C-E)T_G0C1R(C-E)T/variant_generic.h
index b9656ec0de..08952c5271 100644
--- a/variants/STM32G0xx/G0B1RBT_G0B1R(C-E)(I-T)_G0C1R(C-E)(I-T)/variant_generic.h
+++ b/variants/STM32G0xx/G0B1R(B-C-E)T_G0C1R(C-E)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G0B1RBT_G0B1R(C-E)(I-T)_G0C1R(C-E)(I-T)/boards_entry.txt b/variants/STM32G0xx/G0B1RBT_G0B1R(C-E)(I-T)_G0C1R(C-E)(I-T)/boards_entry.txt
deleted file mode 100644
index 4dc3f7c0f7..0000000000
--- a/variants/STM32G0xx/G0B1RBT_G0B1R(C-E)(I-T)_G0C1R(C-E)(I-T)/boards_entry.txt
+++ /dev/null
@@ -1,77 +0,0 @@
-# This file help to add generic board entry.
-# upload.maximum_size and product_line have to be verified
-# and changed if needed.
-# See: https://github.com/stm32duino/wiki/wiki/Add-a-new-variant-%28board%29
-
-# Generic G0B1RBTx
-GenG0.menu.pnum.GENERIC_G0B1RBTX=Generic G0B1RBTx
-GenG0.menu.pnum.GENERIC_G0B1RBTX.upload.maximum_size=131072
-GenG0.menu.pnum.GENERIC_G0B1RBTX.upload.maximum_data_size=147456
-GenG0.menu.pnum.GENERIC_G0B1RBTX.build.board=GENERIC_G0B1RBTX
-GenG0.menu.pnum.GENERIC_G0B1RBTX.build.product_line=STM32G0B1xx
-GenG0.menu.pnum.GENERIC_G0B1RBTX.build.variant=STM32G0xx/G0B1RBT_G0B1R(C-E)(I-T)_G0C1R(C-E)(I-T)
-
-# Generic G0B1RCTx
-GenG0.menu.pnum.GENERIC_G0B1RCTX=Generic G0B1RCTx
-GenG0.menu.pnum.GENERIC_G0B1RCTX.upload.maximum_size=262144
-GenG0.menu.pnum.GENERIC_G0B1RCTX.upload.maximum_data_size=147456
-GenG0.menu.pnum.GENERIC_G0B1RCTX.build.board=GENERIC_G0B1RCTX
-GenG0.menu.pnum.GENERIC_G0B1RCTX.build.product_line=STM32G0B1xx
-GenG0.menu.pnum.GENERIC_G0B1RCTX.build.variant=STM32G0xx/G0B1RBT_G0B1R(C-E)(I-T)_G0C1R(C-E)(I-T)
-
-# Generic G0B1RETx
-GenG0.menu.pnum.GENERIC_G0B1RETX=Generic G0B1RETx
-GenG0.menu.pnum.GENERIC_G0B1RETX.upload.maximum_size=524288
-GenG0.menu.pnum.GENERIC_G0B1RETX.upload.maximum_data_size=147456
-GenG0.menu.pnum.GENERIC_G0B1RETX.build.board=GENERIC_G0B1RETX
-GenG0.menu.pnum.GENERIC_G0B1RETX.build.product_line=STM32G0B1xx
-GenG0.menu.pnum.GENERIC_G0B1RETX.build.variant=STM32G0xx/G0B1RBT_G0B1R(C-E)(I-T)_G0C1R(C-E)(I-T)
-
-# Generic G0B1RCIx
-GenG0.menu.pnum.GENERIC_G0B1RCIX=Generic G0B1RCIx
-GenG0.menu.pnum.GENERIC_G0B1RCIX.upload.maximum_size=262144
-GenG0.menu.pnum.GENERIC_G0B1RCIX.upload.maximum_data_size=147456
-GenG0.menu.pnum.GENERIC_G0B1RCIX.build.board=GENERIC_G0B1RCIX
-GenG0.menu.pnum.GENERIC_G0B1RCIX.build.product_line=STM32G0B1xx
-GenG0.menu.pnum.GENERIC_G0B1RCIX.build.variant=STM32G0xx/G0B1RBT_G0B1R(C-E)(I-T)_G0C1R(C-E)(I-T)
-
-# Generic G0B1REIx
-GenG0.menu.pnum.GENERIC_G0B1REIX=Generic G0B1REIx
-GenG0.menu.pnum.GENERIC_G0B1REIX.upload.maximum_size=524288
-GenG0.menu.pnum.GENERIC_G0B1REIX.upload.maximum_data_size=147456
-GenG0.menu.pnum.GENERIC_G0B1REIX.build.board=GENERIC_G0B1REIX
-GenG0.menu.pnum.GENERIC_G0B1REIX.build.product_line=STM32G0B1xx
-GenG0.menu.pnum.GENERIC_G0B1REIX.build.variant=STM32G0xx/G0B1RBT_G0B1R(C-E)(I-T)_G0C1R(C-E)(I-T)
-
-# Generic G0C1RCIx
-GenG0.menu.pnum.GENERIC_G0C1RCIX=Generic G0C1RCIx
-GenG0.menu.pnum.GENERIC_G0C1RCIX.upload.maximum_size=262144
-GenG0.menu.pnum.GENERIC_G0C1RCIX.upload.maximum_data_size=147456
-GenG0.menu.pnum.GENERIC_G0C1RCIX.build.board=GENERIC_G0C1RCIX
-GenG0.menu.pnum.GENERIC_G0C1RCIX.build.product_line=STM32G0C1xx
-GenG0.menu.pnum.GENERIC_G0C1RCIX.build.variant=STM32G0xx/G0B1RBT_G0B1R(C-E)(I-T)_G0C1R(C-E)(I-T)
-
-# Generic G0C1REIx
-GenG0.menu.pnum.GENERIC_G0C1REIX=Generic G0C1REIx
-GenG0.menu.pnum.GENERIC_G0C1REIX.upload.maximum_size=524288
-GenG0.menu.pnum.GENERIC_G0C1REIX.upload.maximum_data_size=147456
-GenG0.menu.pnum.GENERIC_G0C1REIX.build.board=GENERIC_G0C1REIX
-GenG0.menu.pnum.GENERIC_G0C1REIX.build.product_line=STM32G0C1xx
-GenG0.menu.pnum.GENERIC_G0C1REIX.build.variant=STM32G0xx/G0B1RBT_G0B1R(C-E)(I-T)_G0C1R(C-E)(I-T)
-
-# Generic G0C1RCTx
-GenG0.menu.pnum.GENERIC_G0C1RCTX=Generic G0C1RCTx
-GenG0.menu.pnum.GENERIC_G0C1RCTX.upload.maximum_size=262144
-GenG0.menu.pnum.GENERIC_G0C1RCTX.upload.maximum_data_size=147456
-GenG0.menu.pnum.GENERIC_G0C1RCTX.build.board=GENERIC_G0C1RCTX
-GenG0.menu.pnum.GENERIC_G0C1RCTX.build.product_line=STM32G0C1xx
-GenG0.menu.pnum.GENERIC_G0C1RCTX.build.variant=STM32G0xx/G0B1RBT_G0B1R(C-E)(I-T)_G0C1R(C-E)(I-T)
-
-# Generic G0C1RETx
-GenG0.menu.pnum.GENERIC_G0C1RETX=Generic G0C1RETx
-GenG0.menu.pnum.GENERIC_G0C1RETX.upload.maximum_size=524288
-GenG0.menu.pnum.GENERIC_G0C1RETX.upload.maximum_data_size=147456
-GenG0.menu.pnum.GENERIC_G0C1RETX.build.board=GENERIC_G0C1RETX
-GenG0.menu.pnum.GENERIC_G0C1RETX.build.product_line=STM32G0C1xx
-GenG0.menu.pnum.GENERIC_G0C1RETX.build.variant=STM32G0xx/G0B1RBT_G0B1R(C-E)(I-T)_G0C1R(C-E)(I-T)
-
diff --git a/variants/STM32G0xx/G0B1V(B-C-E)(I-T)_G0C1V(C-E)(I-T)/PeripheralPins.c b/variants/STM32G0xx/G0B1V(B-C-E)(I-T)_G0C1V(C-E)(I-T)/PeripheralPins.c
index a6b1e44237..e9ab857d8f 100644
--- a/variants/STM32G0xx/G0B1V(B-C-E)(I-T)_G0C1V(C-E)(I-T)/PeripheralPins.c
+++ b/variants/STM32G0xx/G0B1V(B-C-E)(I-T)_G0C1V(C-E)(I-T)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,9 +12,8 @@
  */
 /*
  * Automatically generated from STM32G0B1V(B-C-E)Ix.xml, STM32G0B1V(B-C-E)Tx.xml
- * STM32G0B1V(C-E)Ix.xml, STM32G0B1V(C-E)Tx.xml
  * STM32G0C1V(C-E)Ix.xml, STM32G0C1V(C-E)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G0xx/G0B1V(B-C-E)(I-T)_G0C1V(C-E)(I-T)/variant_generic.cpp b/variants/STM32G0xx/G0B1V(B-C-E)(I-T)_G0C1V(C-E)(I-T)/variant_generic.cpp
index 6355a78fbe..882c84ef6c 100644
--- a/variants/STM32G0xx/G0B1V(B-C-E)(I-T)_G0C1V(C-E)(I-T)/variant_generic.cpp
+++ b/variants/STM32G0xx/G0B1V(B-C-E)(I-T)_G0C1V(C-E)(I-T)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G0xx/G0B1V(B-C-E)(I-T)_G0C1V(C-E)(I-T)/variant_generic.h b/variants/STM32G0xx/G0B1V(B-C-E)(I-T)_G0C1V(C-E)(I-T)/variant_generic.h
index e6f2251db0..69706be328 100644
--- a/variants/STM32G0xx/G0B1V(B-C-E)(I-T)_G0C1V(C-E)(I-T)/variant_generic.h
+++ b/variants/STM32G0xx/G0B1V(B-C-E)(I-T)_G0C1V(C-E)(I-T)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G4xx/G431C(6-8-B)T_G441CBT/PeripheralPins.c b/variants/STM32G4xx/G431C(6-8-B)T_G441CBT/PeripheralPins.c
index 30daee0373..0ccf13bd4f 100644
--- a/variants/STM32G4xx/G431C(6-8-B)T_G441CBT/PeripheralPins.c
+++ b/variants/STM32G4xx/G431C(6-8-B)T_G441CBT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32G431C(6-8-B)Tx.xml, STM32G441CBTx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G4xx/G431C(6-8-B)T_G441CBT/variant_generic.cpp b/variants/STM32G4xx/G431C(6-8-B)T_G441CBT/variant_generic.cpp
index fd85fbed93..243daaf0a8 100644
--- a/variants/STM32G4xx/G431C(6-8-B)T_G441CBT/variant_generic.cpp
+++ b/variants/STM32G4xx/G431C(6-8-B)T_G441CBT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G4xx/G431C(6-8-B)T_G441CBT/variant_generic.h b/variants/STM32G4xx/G431C(6-8-B)T_G441CBT/variant_generic.h
index 38a4a18f04..f68d83ea7a 100644
--- a/variants/STM32G4xx/G431C(6-8-B)T_G441CBT/variant_generic.h
+++ b/variants/STM32G4xx/G431C(6-8-B)T_G441CBT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G4xx/G431C(6-8-B)U_G441CBU/PeripheralPins.c b/variants/STM32G4xx/G431C(6-8-B)U_G441CBU/PeripheralPins.c
index 51583d7981..746f69e804 100644
--- a/variants/STM32G4xx/G431C(6-8-B)U_G441CBU/PeripheralPins.c
+++ b/variants/STM32G4xx/G431C(6-8-B)U_G441CBU/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32G431C(6-8-B)Ux.xml, STM32G441CBUx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G4xx/G431C(6-8-B)U_G441CBU/variant_generic.cpp b/variants/STM32G4xx/G431C(6-8-B)U_G441CBU/variant_generic.cpp
index 817a6d7c77..7550506ea5 100644
--- a/variants/STM32G4xx/G431C(6-8-B)U_G441CBU/variant_generic.cpp
+++ b/variants/STM32G4xx/G431C(6-8-B)U_G441CBU/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G4xx/G431C(6-8-B)U_G441CBU/variant_generic.h b/variants/STM32G4xx/G431C(6-8-B)U_G441CBU/variant_generic.h
index 39eb29282c..752ddd23af 100644
--- a/variants/STM32G4xx/G431C(6-8-B)U_G441CBU/variant_generic.h
+++ b/variants/STM32G4xx/G431C(6-8-B)U_G441CBU/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G4xx/G431CBY_G441CBY/PeripheralPins.c b/variants/STM32G4xx/G431CBY_G441CBY/PeripheralPins.c
index 8345c4360a..cd128aab41 100644
--- a/variants/STM32G4xx/G431CBY_G441CBY/PeripheralPins.c
+++ b/variants/STM32G4xx/G431CBY_G441CBY/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32G431CBYx.xml, STM32G441CBYx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G4xx/G431CBY_G441CBY/variant_generic.cpp b/variants/STM32G4xx/G431CBY_G441CBY/variant_generic.cpp
index 8bc1945c30..e002aad73f 100644
--- a/variants/STM32G4xx/G431CBY_G441CBY/variant_generic.cpp
+++ b/variants/STM32G4xx/G431CBY_G441CBY/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G4xx/G431CBY_G441CBY/variant_generic.h b/variants/STM32G4xx/G431CBY_G441CBY/variant_generic.h
index 2aafeb36ef..0022642a38 100644
--- a/variants/STM32G4xx/G431CBY_G441CBY/variant_generic.h
+++ b/variants/STM32G4xx/G431CBY_G441CBY/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G4xx/G431K(6-8-B)(T-U)_G441KB(T-U)/PeripheralPins.c b/variants/STM32G4xx/G431K(6-8-B)(T-U)_G441KB(T-U)/PeripheralPins.c
index 44b4c0331f..311f612fd3 100644
--- a/variants/STM32G4xx/G431K(6-8-B)(T-U)_G441KB(T-U)/PeripheralPins.c
+++ b/variants/STM32G4xx/G431K(6-8-B)(T-U)_G441KB(T-U)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32G431K(6-8-B)Tx.xml, STM32G431K(6-8-B)Ux.xml
  * STM32G441KBTx.xml, STM32G441KBUx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G4xx/G431K(6-8-B)(T-U)_G441KB(T-U)/variant_generic.cpp b/variants/STM32G4xx/G431K(6-8-B)(T-U)_G441KB(T-U)/variant_generic.cpp
index 13824fc97c..6cd2c64cc8 100644
--- a/variants/STM32G4xx/G431K(6-8-B)(T-U)_G441KB(T-U)/variant_generic.cpp
+++ b/variants/STM32G4xx/G431K(6-8-B)(T-U)_G441KB(T-U)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G4xx/G431K(6-8-B)(T-U)_G441KB(T-U)/variant_generic.h b/variants/STM32G4xx/G431K(6-8-B)(T-U)_G441KB(T-U)/variant_generic.h
index 668ddbfb05..613e0d6b70 100644
--- a/variants/STM32G4xx/G431K(6-8-B)(T-U)_G441KB(T-U)/variant_generic.h
+++ b/variants/STM32G4xx/G431K(6-8-B)(T-U)_G441KB(T-U)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G4xx/G431M(6-8-B)T_G441MBT/PeripheralPins.c b/variants/STM32G4xx/G431M(6-8-B)T_G441MBT/PeripheralPins.c
index ac9f87f0d4..25e4c41d5c 100644
--- a/variants/STM32G4xx/G431M(6-8-B)T_G441MBT/PeripheralPins.c
+++ b/variants/STM32G4xx/G431M(6-8-B)T_G441MBT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32G431M(6-8-B)Tx.xml, STM32G441MBTx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G4xx/G431M(6-8-B)T_G441MBT/variant_generic.cpp b/variants/STM32G4xx/G431M(6-8-B)T_G441MBT/variant_generic.cpp
index 630ba2c899..70e4a77920 100644
--- a/variants/STM32G4xx/G431M(6-8-B)T_G441MBT/variant_generic.cpp
+++ b/variants/STM32G4xx/G431M(6-8-B)T_G441MBT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G4xx/G431M(6-8-B)T_G441MBT/variant_generic.h b/variants/STM32G4xx/G431M(6-8-B)T_G441MBT/variant_generic.h
index ed59f2d22c..57fd61682a 100644
--- a/variants/STM32G4xx/G431M(6-8-B)T_G441MBT/variant_generic.h
+++ b/variants/STM32G4xx/G431M(6-8-B)T_G441MBT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G4xx/G431R(6-8-B)(I-T)_G441RB(I-T)/PeripheralPins.c b/variants/STM32G4xx/G431R(6-8-B)(I-T)_G441RB(I-T)/PeripheralPins.c
index 54dbd69a3a..edec7a52f6 100644
--- a/variants/STM32G4xx/G431R(6-8-B)(I-T)_G441RB(I-T)/PeripheralPins.c
+++ b/variants/STM32G4xx/G431R(6-8-B)(I-T)_G441RB(I-T)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32G431R(6-8-B)Ix.xml, STM32G431R(6-8-B)Tx.xml
  * STM32G441RBIx.xml, STM32G441RBTx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G4xx/G431R(6-8-B)(I-T)_G441RB(I-T)/variant_generic.cpp b/variants/STM32G4xx/G431R(6-8-B)(I-T)_G441RB(I-T)/variant_generic.cpp
index d79da94416..e8cb9af1fe 100644
--- a/variants/STM32G4xx/G431R(6-8-B)(I-T)_G441RB(I-T)/variant_generic.cpp
+++ b/variants/STM32G4xx/G431R(6-8-B)(I-T)_G441RB(I-T)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G4xx/G431R(6-8-B)(I-T)_G441RB(I-T)/variant_generic.h b/variants/STM32G4xx/G431R(6-8-B)(I-T)_G441RB(I-T)/variant_generic.h
index a1ea5efc8a..d2bcb9aa6f 100644
--- a/variants/STM32G4xx/G431R(6-8-B)(I-T)_G441RB(I-T)/variant_generic.h
+++ b/variants/STM32G4xx/G431R(6-8-B)(I-T)_G441RB(I-T)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G4xx/G431V(6-8-B)T_G441VBT/PeripheralPins.c b/variants/STM32G4xx/G431V(6-8-B)T_G441VBT/PeripheralPins.c
index d480195396..7e68f6e76e 100644
--- a/variants/STM32G4xx/G431V(6-8-B)T_G441VBT/PeripheralPins.c
+++ b/variants/STM32G4xx/G431V(6-8-B)T_G441VBT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32G431V(6-8-B)Tx.xml, STM32G441VBTx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G4xx/G431V(6-8-B)T_G441VBT/variant_generic.cpp b/variants/STM32G4xx/G431V(6-8-B)T_G441VBT/variant_generic.cpp
index 0e4fed586a..7b30b072ec 100644
--- a/variants/STM32G4xx/G431V(6-8-B)T_G441VBT/variant_generic.cpp
+++ b/variants/STM32G4xx/G431V(6-8-B)T_G441VBT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G4xx/G431V(6-8-B)T_G441VBT/variant_generic.h b/variants/STM32G4xx/G431V(6-8-B)T_G441VBT/variant_generic.h
index 240c8bd4fd..77daacbd52 100644
--- a/variants/STM32G4xx/G431V(6-8-B)T_G441VBT/variant_generic.h
+++ b/variants/STM32G4xx/G431V(6-8-B)T_G441VBT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G4xx/G471C(C-E)T/PeripheralPins.c b/variants/STM32G4xx/G471C(C-E)T/PeripheralPins.c
index 6f02b75544..86f79bdce6 100644
--- a/variants/STM32G4xx/G471C(C-E)T/PeripheralPins.c
+++ b/variants/STM32G4xx/G471C(C-E)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32G471C(C-E)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
@@ -102,16 +102,12 @@ WEAK const PinMap PinMap_I2C_SCL[] = {
 #ifdef HAL_TIM_MODULE_ENABLED
 WEAK const PinMap PinMap_TIM[] = {
   {PA_0,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
-  {PA_0_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)}, // TIM5_CH1
   {PA_1,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
-  {PA_1_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 2, 0)}, // TIM5_CH2
-  {PA_1_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM15, 1, 1)}, // TIM15_CH1N
+  {PA_1_ALT1,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM15, 1, 1)}, // TIM15_CH1N
   {PA_2,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
-  {PA_2_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 3, 0)}, // TIM5_CH3
-  {PA_2_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM15, 1, 0)}, // TIM15_CH1
+  {PA_2_ALT1,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM15, 1, 0)}, // TIM15_CH1
   {PA_3,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4
-  {PA_3_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 4, 0)}, // TIM5_CH4
-  {PA_3_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM15, 2, 0)}, // TIM15_CH2
+  {PA_3_ALT1,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM15, 2, 0)}, // TIM15_CH2
   {PA_4,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
   {PA_5,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
   {PA_6,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
@@ -142,7 +138,7 @@ WEAK const PinMap PinMap_TIM[] = {
   {PB_1,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM1, 3, 1)}, // TIM1_CH3N
   {PB_1_ALT1,  TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
   {PB_1_ALT2,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 3, 1)}, // TIM8_CH3N
-  {PB_2,       TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)}, // TIM5_CH1
+  {PB_2,       TIM20, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM20, 1, 0)}, // TIM20_CH1
   {PB_3,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
   {PB_3_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 1, 1)}, // TIM8_CH1N
   {PB_4,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
diff --git a/variants/STM32G4xx/G471C(C-E)T/PinNamesVar.h b/variants/STM32G4xx/G471C(C-E)T/PinNamesVar.h
index e6de7bf904..a9622aee45 100644
--- a/variants/STM32G4xx/G471C(C-E)T/PinNamesVar.h
+++ b/variants/STM32G4xx/G471C(C-E)T/PinNamesVar.h
@@ -1,11 +1,8 @@
 /* Alternate pin name */
 PA_0_ALT1  = PA_0  | ALT1,
 PA_1_ALT1  = PA_1  | ALT1,
-PA_1_ALT2  = PA_1  | ALT2,
 PA_2_ALT1  = PA_2  | ALT1,
-PA_2_ALT2  = PA_2  | ALT2,
 PA_3_ALT1  = PA_3  | ALT1,
-PA_3_ALT2  = PA_3  | ALT2,
 PA_4_ALT1  = PA_4  | ALT1,
 PA_6_ALT1  = PA_6  | ALT1,
 PA_7_ALT1  = PA_7  | ALT1,
diff --git a/variants/STM32G4xx/G471C(C-E)T/variant_generic.cpp b/variants/STM32G4xx/G471C(C-E)T/variant_generic.cpp
index d7afa31a46..803c3d2a5a 100644
--- a/variants/STM32G4xx/G471C(C-E)T/variant_generic.cpp
+++ b/variants/STM32G4xx/G471C(C-E)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G4xx/G471C(C-E)T/variant_generic.h b/variants/STM32G4xx/G471C(C-E)T/variant_generic.h
index 39a028b906..00bef01959 100644
--- a/variants/STM32G4xx/G471C(C-E)T/variant_generic.h
+++ b/variants/STM32G4xx/G471C(C-E)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -57,11 +57,8 @@
 // Alternate pins number
 #define PA0_ALT1                (PA0  | ALT1)
 #define PA1_ALT1                (PA1  | ALT1)
-#define PA1_ALT2                (PA1  | ALT2)
 #define PA2_ALT1                (PA2  | ALT1)
-#define PA2_ALT2                (PA2  | ALT2)
 #define PA3_ALT1                (PA3  | ALT1)
-#define PA3_ALT2                (PA3  | ALT2)
 #define PA4_ALT1                (PA4  | ALT1)
 #define PA6_ALT1                (PA6  | ALT1)
 #define PA7_ALT1                (PA7  | ALT1)
diff --git a/variants/STM32G4xx/G471C(C-E)U/PeripheralPins.c b/variants/STM32G4xx/G471C(C-E)U/PeripheralPins.c
index 351f6b953c..9338bd24d2 100644
--- a/variants/STM32G4xx/G471C(C-E)U/PeripheralPins.c
+++ b/variants/STM32G4xx/G471C(C-E)U/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32G471C(C-E)Ux.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
@@ -106,16 +106,12 @@ WEAK const PinMap PinMap_I2C_SCL[] = {
 #ifdef HAL_TIM_MODULE_ENABLED
 WEAK const PinMap PinMap_TIM[] = {
   {PA_0,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
-  {PA_0_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)}, // TIM5_CH1
   {PA_1,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
-  {PA_1_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 2, 0)}, // TIM5_CH2
-  {PA_1_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM15, 1, 1)}, // TIM15_CH1N
+  {PA_1_ALT1,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM15, 1, 1)}, // TIM15_CH1N
   {PA_2,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
-  {PA_2_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 3, 0)}, // TIM5_CH3
-  {PA_2_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM15, 1, 0)}, // TIM15_CH1
+  {PA_2_ALT1,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM15, 1, 0)}, // TIM15_CH1
   {PA_3,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4
-  {PA_3_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 4, 0)}, // TIM5_CH4
-  {PA_3_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM15, 2, 0)}, // TIM15_CH2
+  {PA_3_ALT1,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM15, 2, 0)}, // TIM15_CH2
   {PA_4,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
   {PA_5,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
   {PA_6,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
@@ -146,7 +142,7 @@ WEAK const PinMap PinMap_TIM[] = {
   {PB_1,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM1, 3, 1)}, // TIM1_CH3N
   {PB_1_ALT1,  TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
   {PB_1_ALT2,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 3, 1)}, // TIM8_CH3N
-  {PB_2,       TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)}, // TIM5_CH1
+  {PB_2,       TIM20, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM20, 1, 0)}, // TIM20_CH1
   {PB_3,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
   {PB_3_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 1, 1)}, // TIM8_CH1N
   {PB_4,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
diff --git a/variants/STM32G4xx/G471C(C-E)U/PinNamesVar.h b/variants/STM32G4xx/G471C(C-E)U/PinNamesVar.h
index ada22bb507..1b1ee448fe 100644
--- a/variants/STM32G4xx/G471C(C-E)U/PinNamesVar.h
+++ b/variants/STM32G4xx/G471C(C-E)U/PinNamesVar.h
@@ -1,11 +1,8 @@
 /* Alternate pin name */
 PA_0_ALT1  = PA_0  | ALT1,
 PA_1_ALT1  = PA_1  | ALT1,
-PA_1_ALT2  = PA_1  | ALT2,
 PA_2_ALT1  = PA_2  | ALT1,
-PA_2_ALT2  = PA_2  | ALT2,
 PA_3_ALT1  = PA_3  | ALT1,
-PA_3_ALT2  = PA_3  | ALT2,
 PA_4_ALT1  = PA_4  | ALT1,
 PA_6_ALT1  = PA_6  | ALT1,
 PA_7_ALT1  = PA_7  | ALT1,
diff --git a/variants/STM32G4xx/G471C(C-E)U/variant_generic.cpp b/variants/STM32G4xx/G471C(C-E)U/variant_generic.cpp
index 7300d0a077..9922cd5c14 100644
--- a/variants/STM32G4xx/G471C(C-E)U/variant_generic.cpp
+++ b/variants/STM32G4xx/G471C(C-E)U/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G4xx/G471C(C-E)U/variant_generic.h b/variants/STM32G4xx/G471C(C-E)U/variant_generic.h
index 40266b132f..f8efdab0ab 100644
--- a/variants/STM32G4xx/G471C(C-E)U/variant_generic.h
+++ b/variants/STM32G4xx/G471C(C-E)U/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -61,11 +61,8 @@
 // Alternate pins number
 #define PA0_ALT1                (PA0  | ALT1)
 #define PA1_ALT1                (PA1  | ALT1)
-#define PA1_ALT2                (PA1  | ALT2)
 #define PA2_ALT1                (PA2  | ALT1)
-#define PA2_ALT2                (PA2  | ALT2)
 #define PA3_ALT1                (PA3  | ALT1)
-#define PA3_ALT2                (PA3  | ALT2)
 #define PA4_ALT1                (PA4  | ALT1)
 #define PA6_ALT1                (PA6  | ALT1)
 #define PA7_ALT1                (PA7  | ALT1)
diff --git a/variants/STM32G4xx/G471M(C-E)T/PeripheralPins.c b/variants/STM32G4xx/G471M(C-E)T/PeripheralPins.c
index ff41179961..e48c92aae3 100644
--- a/variants/STM32G4xx/G471M(C-E)T/PeripheralPins.c
+++ b/variants/STM32G4xx/G471M(C-E)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32G471M(C-E)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
@@ -126,16 +126,12 @@ WEAK const PinMap PinMap_I2C_SCL[] = {
 #ifdef HAL_TIM_MODULE_ENABLED
 WEAK const PinMap PinMap_TIM[] = {
   {PA_0,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
-  {PA_0_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)}, // TIM5_CH1
   {PA_1,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
-  {PA_1_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 2, 0)}, // TIM5_CH2
-  {PA_1_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM15, 1, 1)}, // TIM15_CH1N
+  {PA_1_ALT1,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM15, 1, 1)}, // TIM15_CH1N
   {PA_2,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
-  {PA_2_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 3, 0)}, // TIM5_CH3
-  {PA_2_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM15, 1, 0)}, // TIM15_CH1
+  {PA_2_ALT1,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM15, 1, 0)}, // TIM15_CH1
   {PA_3,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4
-  {PA_3_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 4, 0)}, // TIM5_CH4
-  {PA_3_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM15, 2, 0)}, // TIM15_CH2
+  {PA_3_ALT1,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM15, 2, 0)}, // TIM15_CH2
   {PA_4,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
   {PA_5,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
   {PA_6,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
@@ -166,7 +162,7 @@ WEAK const PinMap PinMap_TIM[] = {
   {PB_1,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM1, 3, 1)}, // TIM1_CH3N
   {PB_1_ALT1,  TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
   {PB_1_ALT2,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 3, 1)}, // TIM8_CH3N
-  {PB_2,       TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)}, // TIM5_CH1
+  {PB_2,       TIM20, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM20, 1, 0)}, // TIM20_CH1
   {PB_3,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
   {PB_3_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 1, 1)}, // TIM8_CH1N
   {PB_4,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
@@ -199,6 +195,7 @@ WEAK const PinMap PinMap_TIM[] = {
   {PC_0,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 1, 0)}, // TIM1_CH1
   {PC_1,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 2, 0)}, // TIM1_CH2
   {PC_2,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 3, 0)}, // TIM1_CH3
+  {PC_2_ALT1,  TIM20, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM20, 2, 0)}, // TIM20_CH2
   {PC_3,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 4, 0)}, // TIM1_CH4
   {PC_5,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM1, 4, 1)}, // TIM1_CH4N
   {PC_6,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
@@ -207,20 +204,18 @@ WEAK const PinMap PinMap_TIM[] = {
   {PC_7_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 2, 0)}, // TIM8_CH2
   {PC_8,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)}, // TIM3_CH3
   {PC_8_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 3, 0)}, // TIM8_CH3
+  {PC_8_ALT2,  TIM20, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM20, 3, 0)}, // TIM20_CH3
   {PC_9,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
   {PC_9_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 4, 0)}, // TIM8_CH4
   {PC_10,      TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 1, 1)}, // TIM8_CH1N
   {PC_11,      TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 2, 1)}, // TIM8_CH2N
-  {PC_12,      TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM5, 2, 0)}, // TIM5_CH2
-  {PC_12_ALT1, TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 3, 1)}, // TIM8_CH3N
+  {PC_12,      TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 3, 1)}, // TIM8_CH3N
   {PC_13,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM1, 1, 1)}, // TIM1_CH1N
   {PC_13_ALT1, TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM8, 4, 1)}, // TIM8_CH4N
   {PD_0,       TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM8, 4, 1)}, // TIM8_CH4N
   {PD_1,       TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 4, 0)}, // TIM8_CH4
   {PE_8,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 1, 1)}, // TIM1_CH1N
-  {PE_8_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM5, 3, 0)}, // TIM5_CH3
   {PE_9,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 1, 0)}, // TIM1_CH1
-  {PE_9_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM5, 4, 0)}, // TIM5_CH4
   {PE_10,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 2, 1)}, // TIM1_CH2N
   {PE_11,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 2, 0)}, // TIM1_CH2
   {PE_12,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 3, 1)}, // TIM1_CH3N
diff --git a/variants/STM32G4xx/G471M(C-E)T/PinNamesVar.h b/variants/STM32G4xx/G471M(C-E)T/PinNamesVar.h
index ae7fe47b38..a9fe00c69a 100644
--- a/variants/STM32G4xx/G471M(C-E)T/PinNamesVar.h
+++ b/variants/STM32G4xx/G471M(C-E)T/PinNamesVar.h
@@ -1,11 +1,8 @@
 /* Alternate pin name */
 PA_0_ALT1  = PA_0  | ALT1,
 PA_1_ALT1  = PA_1  | ALT1,
-PA_1_ALT2  = PA_1  | ALT2,
 PA_2_ALT1  = PA_2  | ALT1,
-PA_2_ALT2  = PA_2  | ALT2,
 PA_3_ALT1  = PA_3  | ALT1,
-PA_3_ALT2  = PA_3  | ALT2,
 PA_4_ALT1  = PA_4  | ALT1,
 PA_6_ALT1  = PA_6  | ALT1,
 PA_7_ALT1  = PA_7  | ALT1,
@@ -49,13 +46,11 @@ PC_3_ALT1  = PC_3  | ALT1,
 PC_6_ALT1  = PC_6  | ALT1,
 PC_7_ALT1  = PC_7  | ALT1,
 PC_8_ALT1  = PC_8  | ALT1,
+PC_8_ALT2  = PC_8  | ALT2,
 PC_9_ALT1  = PC_9  | ALT1,
 PC_10_ALT1 = PC_10 | ALT1,
 PC_11_ALT1 = PC_11 | ALT1,
-PC_12_ALT1 = PC_12 | ALT1,
 PC_13_ALT1 = PC_13 | ALT1,
-PE_8_ALT1  = PE_8  | ALT1,
-PE_9_ALT1  = PE_9  | ALT1,
 
 /* SYS_WKUP */
 #ifdef PWR_WAKEUP_PIN1
diff --git a/variants/STM32G4xx/G471M(C-E)T/variant_generic.cpp b/variants/STM32G4xx/G471M(C-E)T/variant_generic.cpp
index 687b5d0147..7ec55f0184 100644
--- a/variants/STM32G4xx/G471M(C-E)T/variant_generic.cpp
+++ b/variants/STM32G4xx/G471M(C-E)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G4xx/G471M(C-E)T/variant_generic.h b/variants/STM32G4xx/G471M(C-E)T/variant_generic.h
index 85b4f3ce19..db3e9a529b 100644
--- a/variants/STM32G4xx/G471M(C-E)T/variant_generic.h
+++ b/variants/STM32G4xx/G471M(C-E)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -85,11 +85,8 @@
 // Alternate pins number
 #define PA0_ALT1                (PA0  | ALT1)
 #define PA1_ALT1                (PA1  | ALT1)
-#define PA1_ALT2                (PA1  | ALT2)
 #define PA2_ALT1                (PA2  | ALT1)
-#define PA2_ALT2                (PA2  | ALT2)
 #define PA3_ALT1                (PA3  | ALT1)
-#define PA3_ALT2                (PA3  | ALT2)
 #define PA4_ALT1                (PA4  | ALT1)
 #define PA6_ALT1                (PA6  | ALT1)
 #define PA7_ALT1                (PA7  | ALT1)
@@ -133,13 +130,11 @@
 #define PC6_ALT1                (PC6  | ALT1)
 #define PC7_ALT1                (PC7  | ALT1)
 #define PC8_ALT1                (PC8  | ALT1)
+#define PC8_ALT2                (PC8  | ALT2)
 #define PC9_ALT1                (PC9  | ALT1)
 #define PC10_ALT1               (PC10 | ALT1)
 #define PC11_ALT1               (PC11 | ALT1)
-#define PC12_ALT1               (PC12 | ALT1)
 #define PC13_ALT1               (PC13 | ALT1)
-#define PE8_ALT1                (PE8  | ALT1)
-#define PE9_ALT1                (PE9  | ALT1)
 
 #define NUM_DIGITAL_PINS        66
 #define NUM_ANALOG_INPUTS       32
diff --git a/variants/STM32G4xx/G471MEY/PeripheralPins.c b/variants/STM32G4xx/G471MEY/PeripheralPins.c
index 825b13b7f0..99803a5c49 100644
--- a/variants/STM32G4xx/G471MEY/PeripheralPins.c
+++ b/variants/STM32G4xx/G471MEY/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32G471MEYx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
@@ -127,16 +127,12 @@ WEAK const PinMap PinMap_I2C_SCL[] = {
 #ifdef HAL_TIM_MODULE_ENABLED
 WEAK const PinMap PinMap_TIM[] = {
   {PA_0,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
-  {PA_0_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)}, // TIM5_CH1
   {PA_1,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
-  {PA_1_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 2, 0)}, // TIM5_CH2
-  {PA_1_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM15, 1, 1)}, // TIM15_CH1N
+  {PA_1_ALT1,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM15, 1, 1)}, // TIM15_CH1N
   {PA_2,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
-  {PA_2_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 3, 0)}, // TIM5_CH3
-  {PA_2_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM15, 1, 0)}, // TIM15_CH1
+  {PA_2_ALT1,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM15, 1, 0)}, // TIM15_CH1
   {PA_3,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4
-  {PA_3_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 4, 0)}, // TIM5_CH4
-  {PA_3_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM15, 2, 0)}, // TIM15_CH2
+  {PA_3_ALT1,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM15, 2, 0)}, // TIM15_CH2
   {PA_4,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
   {PA_5,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
   {PA_6,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
@@ -167,7 +163,7 @@ WEAK const PinMap PinMap_TIM[] = {
   {PB_1,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM1, 3, 1)}, // TIM1_CH3N
   {PB_1_ALT1,  TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
   {PB_1_ALT2,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 3, 1)}, // TIM8_CH3N
-  {PB_2,       TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)}, // TIM5_CH1
+  {PB_2,       TIM20, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM20, 1, 0)}, // TIM20_CH1
   {PB_3,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
   {PB_3_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 1, 1)}, // TIM8_CH1N
   {PB_4,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
@@ -200,6 +196,7 @@ WEAK const PinMap PinMap_TIM[] = {
   {PC_0,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 1, 0)}, // TIM1_CH1
   {PC_1,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 2, 0)}, // TIM1_CH2
   {PC_2,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 3, 0)}, // TIM1_CH3
+  {PC_2_ALT1,  TIM20, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM20, 2, 0)}, // TIM20_CH2
   {PC_3,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 4, 0)}, // TIM1_CH4
   {PC_5,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM1, 4, 1)}, // TIM1_CH4N
   {PC_6,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
@@ -208,20 +205,18 @@ WEAK const PinMap PinMap_TIM[] = {
   {PC_7_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 2, 0)}, // TIM8_CH2
   {PC_8,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)}, // TIM3_CH3
   {PC_8_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 3, 0)}, // TIM8_CH3
+  {PC_8_ALT2,  TIM20, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM20, 3, 0)}, // TIM20_CH3
   {PC_9,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
   {PC_9_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 4, 0)}, // TIM8_CH4
   {PC_10,      TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 1, 1)}, // TIM8_CH1N
   {PC_11,      TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 2, 1)}, // TIM8_CH2N
-  {PC_12,      TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM5, 2, 0)}, // TIM5_CH2
-  {PC_12_ALT1, TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 3, 1)}, // TIM8_CH3N
+  {PC_12,      TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 3, 1)}, // TIM8_CH3N
   {PC_13,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM1, 1, 1)}, // TIM1_CH1N
   {PC_13_ALT1, TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM8, 4, 1)}, // TIM8_CH4N
   {PD_0,       TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM8, 4, 1)}, // TIM8_CH4N
   {PD_1,       TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 4, 0)}, // TIM8_CH4
   {PE_8,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 1, 1)}, // TIM1_CH1N
-  {PE_8_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM5, 3, 0)}, // TIM5_CH3
   {PE_9,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 1, 0)}, // TIM1_CH1
-  {PE_9_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM5, 4, 0)}, // TIM5_CH4
   {PE_10,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 2, 1)}, // TIM1_CH2N
   {PE_11,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 2, 0)}, // TIM1_CH2
   {PE_12,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 3, 1)}, // TIM1_CH3N
diff --git a/variants/STM32G4xx/G471MEY/PinNamesVar.h b/variants/STM32G4xx/G471MEY/PinNamesVar.h
index ae7fe47b38..a9fe00c69a 100644
--- a/variants/STM32G4xx/G471MEY/PinNamesVar.h
+++ b/variants/STM32G4xx/G471MEY/PinNamesVar.h
@@ -1,11 +1,8 @@
 /* Alternate pin name */
 PA_0_ALT1  = PA_0  | ALT1,
 PA_1_ALT1  = PA_1  | ALT1,
-PA_1_ALT2  = PA_1  | ALT2,
 PA_2_ALT1  = PA_2  | ALT1,
-PA_2_ALT2  = PA_2  | ALT2,
 PA_3_ALT1  = PA_3  | ALT1,
-PA_3_ALT2  = PA_3  | ALT2,
 PA_4_ALT1  = PA_4  | ALT1,
 PA_6_ALT1  = PA_6  | ALT1,
 PA_7_ALT1  = PA_7  | ALT1,
@@ -49,13 +46,11 @@ PC_3_ALT1  = PC_3  | ALT1,
 PC_6_ALT1  = PC_6  | ALT1,
 PC_7_ALT1  = PC_7  | ALT1,
 PC_8_ALT1  = PC_8  | ALT1,
+PC_8_ALT2  = PC_8  | ALT2,
 PC_9_ALT1  = PC_9  | ALT1,
 PC_10_ALT1 = PC_10 | ALT1,
 PC_11_ALT1 = PC_11 | ALT1,
-PC_12_ALT1 = PC_12 | ALT1,
 PC_13_ALT1 = PC_13 | ALT1,
-PE_8_ALT1  = PE_8  | ALT1,
-PE_9_ALT1  = PE_9  | ALT1,
 
 /* SYS_WKUP */
 #ifdef PWR_WAKEUP_PIN1
diff --git a/variants/STM32G4xx/G471MEY/variant_generic.cpp b/variants/STM32G4xx/G471MEY/variant_generic.cpp
index 6231584f89..d8653f32e3 100644
--- a/variants/STM32G4xx/G471MEY/variant_generic.cpp
+++ b/variants/STM32G4xx/G471MEY/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G4xx/G471MEY/variant_generic.h b/variants/STM32G4xx/G471MEY/variant_generic.h
index 41cd33cc89..a711e560c9 100644
--- a/variants/STM32G4xx/G471MEY/variant_generic.h
+++ b/variants/STM32G4xx/G471MEY/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -86,11 +86,8 @@
 // Alternate pins number
 #define PA0_ALT1                (PA0  | ALT1)
 #define PA1_ALT1                (PA1  | ALT1)
-#define PA1_ALT2                (PA1  | ALT2)
 #define PA2_ALT1                (PA2  | ALT1)
-#define PA2_ALT2                (PA2  | ALT2)
 #define PA3_ALT1                (PA3  | ALT1)
-#define PA3_ALT2                (PA3  | ALT2)
 #define PA4_ALT1                (PA4  | ALT1)
 #define PA6_ALT1                (PA6  | ALT1)
 #define PA7_ALT1                (PA7  | ALT1)
@@ -134,13 +131,11 @@
 #define PC6_ALT1                (PC6  | ALT1)
 #define PC7_ALT1                (PC7  | ALT1)
 #define PC8_ALT1                (PC8  | ALT1)
+#define PC8_ALT2                (PC8  | ALT2)
 #define PC9_ALT1                (PC9  | ALT1)
 #define PC10_ALT1               (PC10 | ALT1)
 #define PC11_ALT1               (PC11 | ALT1)
-#define PC12_ALT1               (PC12 | ALT1)
 #define PC13_ALT1               (PC13 | ALT1)
-#define PE8_ALT1                (PE8  | ALT1)
-#define PE9_ALT1                (PE9  | ALT1)
 
 #define NUM_DIGITAL_PINS        67
 #define NUM_ANALOG_INPUTS       33
diff --git a/variants/STM32G4xx/G471Q(C-E)T/PeripheralPins.c b/variants/STM32G4xx/G471Q(C-E)T/PeripheralPins.c
index cd8a1afaf0..a68a73518b 100644
--- a/variants/STM32G4xx/G471Q(C-E)T/PeripheralPins.c
+++ b/variants/STM32G4xx/G471Q(C-E)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32G471Q(C-E)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
@@ -139,16 +139,12 @@ WEAK const PinMap PinMap_I2C_SCL[] = {
 #ifdef HAL_TIM_MODULE_ENABLED
 WEAK const PinMap PinMap_TIM[] = {
   {PA_0,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
-  {PA_0_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)}, // TIM5_CH1
   {PA_1,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
-  {PA_1_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 2, 0)}, // TIM5_CH2
-  {PA_1_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM15, 1, 1)}, // TIM15_CH1N
+  {PA_1_ALT1,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM15, 1, 1)}, // TIM15_CH1N
   {PA_2,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
-  {PA_2_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 3, 0)}, // TIM5_CH3
-  {PA_2_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM15, 1, 0)}, // TIM15_CH1
+  {PA_2_ALT1,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM15, 1, 0)}, // TIM15_CH1
   {PA_3,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4
-  {PA_3_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 4, 0)}, // TIM5_CH4
-  {PA_3_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM15, 2, 0)}, // TIM15_CH2
+  {PA_3_ALT1,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM15, 2, 0)}, // TIM15_CH2
   {PA_4,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
   {PA_5,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
   {PA_6,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
@@ -179,7 +175,7 @@ WEAK const PinMap PinMap_TIM[] = {
   {PB_1,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM1, 3, 1)}, // TIM1_CH3N
   {PB_1_ALT1,  TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
   {PB_1_ALT2,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 3, 1)}, // TIM8_CH3N
-  {PB_2,       TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)}, // TIM5_CH1
+  {PB_2,       TIM20, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM20, 1, 0)}, // TIM20_CH1
   {PB_3,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
   {PB_3_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 1, 1)}, // TIM8_CH1N
   {PB_4,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
@@ -212,6 +208,7 @@ WEAK const PinMap PinMap_TIM[] = {
   {PC_0,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 1, 0)}, // TIM1_CH1
   {PC_1,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 2, 0)}, // TIM1_CH2
   {PC_2,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 3, 0)}, // TIM1_CH3
+  {PC_2_ALT1,  TIM20, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM20, 2, 0)}, // TIM20_CH2
   {PC_3,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 4, 0)}, // TIM1_CH4
   {PC_5,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM1, 4, 1)}, // TIM1_CH4N
   {PC_6,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
@@ -220,12 +217,12 @@ WEAK const PinMap PinMap_TIM[] = {
   {PC_7_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 2, 0)}, // TIM8_CH2
   {PC_8,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)}, // TIM3_CH3
   {PC_8_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 3, 0)}, // TIM8_CH3
+  {PC_8_ALT2,  TIM20, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM20, 3, 0)}, // TIM20_CH3
   {PC_9,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
   {PC_9_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 4, 0)}, // TIM8_CH4
   {PC_10,      TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 1, 1)}, // TIM8_CH1N
   {PC_11,      TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 2, 1)}, // TIM8_CH2N
-  {PC_12,      TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM5, 2, 0)}, // TIM5_CH2
-  {PC_12_ALT1, TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 3, 1)}, // TIM8_CH3N
+  {PC_12,      TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 3, 1)}, // TIM8_CH3N
   {PC_13,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM1, 1, 1)}, // TIM1_CH1N
   {PC_13_ALT1, TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM8, 4, 1)}, // TIM8_CH4N
   {PD_0,       TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM8, 4, 1)}, // TIM8_CH4N
@@ -239,15 +236,20 @@ WEAK const PinMap PinMap_TIM[] = {
   {PD_14,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 3, 0)}, // TIM4_CH3
   {PD_15,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)}, // TIM4_CH4
   {PE_0,       TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM16, 1, 0)}, // TIM16_CH1
+  {PE_0_ALT1,  TIM20, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM20, 4, 1)}, // TIM20_CH4N
   {PE_1,       TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM17, 1, 0)}, // TIM17_CH1
+  {PE_1_ALT1,  TIM20, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM20, 4, 0)}, // TIM20_CH4
   {PE_2,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
+  {PE_2_ALT1,  TIM20, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM20, 1, 0)}, // TIM20_CH1
   {PE_3,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
+  {PE_3_ALT1,  TIM20, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM20, 2, 0)}, // TIM20_CH2
   {PE_4,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)}, // TIM3_CH3
+  {PE_4_ALT1,  TIM20, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM20, 1, 1)}, // TIM20_CH1N
   {PE_5,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
+  {PE_5_ALT1,  TIM20, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM20, 2, 1)}, // TIM20_CH2N
+  {PE_6,       TIM20, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM20, 3, 1)}, // TIM20_CH3N
   {PE_8,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 1, 1)}, // TIM1_CH1N
-  {PE_8_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM5, 3, 0)}, // TIM5_CH3
   {PE_9,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 1, 0)}, // TIM1_CH1
-  {PE_9_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM5, 4, 0)}, // TIM5_CH4
   {PE_10,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 2, 1)}, // TIM1_CH2N
   {PE_11,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 2, 0)}, // TIM1_CH2
   {PE_12,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 3, 1)}, // TIM1_CH3N
@@ -255,13 +257,21 @@ WEAK const PinMap PinMap_TIM[] = {
   {PE_14,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 4, 0)}, // TIM1_CH4
   {PE_15,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM1, 4, 1)}, // TIM1_CH4N
   {PF_0,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM1, 3, 1)}, // TIM1_CH3N
+  {PF_2,       TIM20, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM20, 3, 0)}, // TIM20_CH3
+  {PF_3,       TIM20, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM20, 4, 0)}, // TIM20_CH4
+  {PF_4,       TIM20, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM20, 1, 1)}, // TIM20_CH1N
+  {PF_5,       TIM20, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM20, 2, 1)}, // TIM20_CH2N
   {PF_6,       TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)}, // TIM4_CH4
-  {PF_6_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM5, 1, 0)}, // TIM5_CH1
-  {PF_7,       TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM5, 2, 0)}, // TIM5_CH2
-  {PF_8,       TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM5, 3, 0)}, // TIM5_CH3
-  {PF_9,       TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM5, 4, 0)}, // TIM5_CH4
-  {PF_9_ALT1,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM15, 1, 0)}, // TIM15_CH1
+  {PF_9,       TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM15, 1, 0)}, // TIM15_CH1
   {PF_10,      TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM15, 2, 0)}, // TIM15_CH2
+  {PF_12,      TIM20, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM20, 1, 0)}, // TIM20_CH1
+  {PF_13,      TIM20, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM20, 2, 0)}, // TIM20_CH2
+  {PF_14,      TIM20, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM20, 3, 0)}, // TIM20_CH3
+  {PF_15,      TIM20, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM20, 4, 0)}, // TIM20_CH4
+  {PG_0,       TIM20, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM20, 1, 1)}, // TIM20_CH1N
+  {PG_1,       TIM20, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM20, 2, 1)}, // TIM20_CH2N
+  {PG_2,       TIM20, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM20, 3, 1)}, // TIM20_CH3N
+  {PG_3,       TIM20, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM20, 4, 1)}, // TIM20_CH4N
   {PG_9,       TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM15, 1, 1)}, // TIM15_CH1N
   {NC,         NP,    0}
 };
diff --git a/variants/STM32G4xx/G471Q(C-E)T/PinNamesVar.h b/variants/STM32G4xx/G471Q(C-E)T/PinNamesVar.h
index bf8c59676d..d8628c9d08 100644
--- a/variants/STM32G4xx/G471Q(C-E)T/PinNamesVar.h
+++ b/variants/STM32G4xx/G471Q(C-E)T/PinNamesVar.h
@@ -1,11 +1,8 @@
 /* Alternate pin name */
 PA_0_ALT1  = PA_0  | ALT1,
 PA_1_ALT1  = PA_1  | ALT1,
-PA_1_ALT2  = PA_1  | ALT2,
 PA_2_ALT1  = PA_2  | ALT1,
-PA_2_ALT2  = PA_2  | ALT2,
 PA_3_ALT1  = PA_3  | ALT1,
-PA_3_ALT2  = PA_3  | ALT2,
 PA_4_ALT1  = PA_4  | ALT1,
 PA_6_ALT1  = PA_6  | ALT1,
 PA_7_ALT1  = PA_7  | ALT1,
@@ -49,15 +46,17 @@ PC_3_ALT1  = PC_3  | ALT1,
 PC_6_ALT1  = PC_6  | ALT1,
 PC_7_ALT1  = PC_7  | ALT1,
 PC_8_ALT1  = PC_8  | ALT1,
+PC_8_ALT2  = PC_8  | ALT2,
 PC_9_ALT1  = PC_9  | ALT1,
 PC_10_ALT1 = PC_10 | ALT1,
 PC_11_ALT1 = PC_11 | ALT1,
-PC_12_ALT1 = PC_12 | ALT1,
 PC_13_ALT1 = PC_13 | ALT1,
-PE_8_ALT1  = PE_8  | ALT1,
-PE_9_ALT1  = PE_9  | ALT1,
-PF_6_ALT1  = PF_6  | ALT1,
-PF_9_ALT1  = PF_9  | ALT1,
+PE_0_ALT1  = PE_0  | ALT1,
+PE_1_ALT1  = PE_1  | ALT1,
+PE_2_ALT1  = PE_2  | ALT1,
+PE_3_ALT1  = PE_3  | ALT1,
+PE_4_ALT1  = PE_4  | ALT1,
+PE_5_ALT1  = PE_5  | ALT1,
 
 /* SYS_WKUP */
 #ifdef PWR_WAKEUP_PIN1
diff --git a/variants/STM32G4xx/G471Q(C-E)T/variant_generic.cpp b/variants/STM32G4xx/G471Q(C-E)T/variant_generic.cpp
index 105d836fee..0f745e89e8 100644
--- a/variants/STM32G4xx/G471Q(C-E)T/variant_generic.cpp
+++ b/variants/STM32G4xx/G471Q(C-E)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G4xx/G471Q(C-E)T/variant_generic.h b/variants/STM32G4xx/G471Q(C-E)T/variant_generic.h
index c987da7e69..ef69a4cecf 100644
--- a/variants/STM32G4xx/G471Q(C-E)T/variant_generic.h
+++ b/variants/STM32G4xx/G471Q(C-E)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -126,11 +126,8 @@
 // Alternate pins number
 #define PA0_ALT1                (PA0  | ALT1)
 #define PA1_ALT1                (PA1  | ALT1)
-#define PA1_ALT2                (PA1  | ALT2)
 #define PA2_ALT1                (PA2  | ALT1)
-#define PA2_ALT2                (PA2  | ALT2)
 #define PA3_ALT1                (PA3  | ALT1)
-#define PA3_ALT2                (PA3  | ALT2)
 #define PA4_ALT1                (PA4  | ALT1)
 #define PA6_ALT1                (PA6  | ALT1)
 #define PA7_ALT1                (PA7  | ALT1)
@@ -174,15 +171,17 @@
 #define PC6_ALT1                (PC6  | ALT1)
 #define PC7_ALT1                (PC7  | ALT1)
 #define PC8_ALT1                (PC8  | ALT1)
+#define PC8_ALT2                (PC8  | ALT2)
 #define PC9_ALT1                (PC9  | ALT1)
 #define PC10_ALT1               (PC10 | ALT1)
 #define PC11_ALT1               (PC11 | ALT1)
-#define PC12_ALT1               (PC12 | ALT1)
 #define PC13_ALT1               (PC13 | ALT1)
-#define PE8_ALT1                (PE8  | ALT1)
-#define PE9_ALT1                (PE9  | ALT1)
-#define PF6_ALT1                (PF6  | ALT1)
-#define PF9_ALT1                (PF9  | ALT1)
+#define PE0_ALT1                (PE0  | ALT1)
+#define PE1_ALT1                (PE1  | ALT1)
+#define PE2_ALT1                (PE2  | ALT1)
+#define PE3_ALT1                (PE3  | ALT1)
+#define PE4_ALT1                (PE4  | ALT1)
+#define PE5_ALT1                (PE5  | ALT1)
 
 #define NUM_DIGITAL_PINS        107
 #define NUM_ANALOG_INPUTS       36
diff --git a/variants/STM32G4xx/G471R(C-E)T/PeripheralPins.c b/variants/STM32G4xx/G471R(C-E)T/PeripheralPins.c
index 8652045abd..017a4f440c 100644
--- a/variants/STM32G4xx/G471R(C-E)T/PeripheralPins.c
+++ b/variants/STM32G4xx/G471R(C-E)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32G471R(C-E)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
@@ -118,16 +118,12 @@ WEAK const PinMap PinMap_I2C_SCL[] = {
 #ifdef HAL_TIM_MODULE_ENABLED
 WEAK const PinMap PinMap_TIM[] = {
   {PA_0,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
-  {PA_0_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)}, // TIM5_CH1
   {PA_1,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
-  {PA_1_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 2, 0)}, // TIM5_CH2
-  {PA_1_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM15, 1, 1)}, // TIM15_CH1N
+  {PA_1_ALT1,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM15, 1, 1)}, // TIM15_CH1N
   {PA_2,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
-  {PA_2_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 3, 0)}, // TIM5_CH3
-  {PA_2_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM15, 1, 0)}, // TIM15_CH1
+  {PA_2_ALT1,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM15, 1, 0)}, // TIM15_CH1
   {PA_3,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4
-  {PA_3_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 4, 0)}, // TIM5_CH4
-  {PA_3_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM15, 2, 0)}, // TIM15_CH2
+  {PA_3_ALT1,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM15, 2, 0)}, // TIM15_CH2
   {PA_4,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
   {PA_5,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
   {PA_6,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
@@ -158,7 +154,7 @@ WEAK const PinMap PinMap_TIM[] = {
   {PB_1,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM1, 3, 1)}, // TIM1_CH3N
   {PB_1_ALT1,  TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
   {PB_1_ALT2,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 3, 1)}, // TIM8_CH3N
-  {PB_2,       TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)}, // TIM5_CH1
+  {PB_2,       TIM20, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM20, 1, 0)}, // TIM20_CH1
   {PB_3,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
   {PB_3_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 1, 1)}, // TIM8_CH1N
   {PB_4,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
@@ -191,6 +187,7 @@ WEAK const PinMap PinMap_TIM[] = {
   {PC_0,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 1, 0)}, // TIM1_CH1
   {PC_1,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 2, 0)}, // TIM1_CH2
   {PC_2,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 3, 0)}, // TIM1_CH3
+  {PC_2_ALT1,  TIM20, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM20, 2, 0)}, // TIM20_CH2
   {PC_3,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 4, 0)}, // TIM1_CH4
   {PC_5,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM1, 4, 1)}, // TIM1_CH4N
   {PC_6,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
@@ -199,12 +196,12 @@ WEAK const PinMap PinMap_TIM[] = {
   {PC_7_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 2, 0)}, // TIM8_CH2
   {PC_8,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)}, // TIM3_CH3
   {PC_8_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 3, 0)}, // TIM8_CH3
+  {PC_8_ALT2,  TIM20, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM20, 3, 0)}, // TIM20_CH3
   {PC_9,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
   {PC_9_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 4, 0)}, // TIM8_CH4
   {PC_10,      TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 1, 1)}, // TIM8_CH1N
   {PC_11,      TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 2, 1)}, // TIM8_CH2N
-  {PC_12,      TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM5, 2, 0)}, // TIM5_CH2
-  {PC_12_ALT1, TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 3, 1)}, // TIM8_CH3N
+  {PC_12,      TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 3, 1)}, // TIM8_CH3N
   {PC_13,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM1, 1, 1)}, // TIM1_CH1N
   {PC_13_ALT1, TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM8, 4, 1)}, // TIM8_CH4N
   {PF_0,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM1, 3, 1)}, // TIM1_CH3N
diff --git a/variants/STM32G4xx/G471R(C-E)T/PinNamesVar.h b/variants/STM32G4xx/G471R(C-E)T/PinNamesVar.h
index 89e726afe7..a9fe00c69a 100644
--- a/variants/STM32G4xx/G471R(C-E)T/PinNamesVar.h
+++ b/variants/STM32G4xx/G471R(C-E)T/PinNamesVar.h
@@ -1,11 +1,8 @@
 /* Alternate pin name */
 PA_0_ALT1  = PA_0  | ALT1,
 PA_1_ALT1  = PA_1  | ALT1,
-PA_1_ALT2  = PA_1  | ALT2,
 PA_2_ALT1  = PA_2  | ALT1,
-PA_2_ALT2  = PA_2  | ALT2,
 PA_3_ALT1  = PA_3  | ALT1,
-PA_3_ALT2  = PA_3  | ALT2,
 PA_4_ALT1  = PA_4  | ALT1,
 PA_6_ALT1  = PA_6  | ALT1,
 PA_7_ALT1  = PA_7  | ALT1,
@@ -49,10 +46,10 @@ PC_3_ALT1  = PC_3  | ALT1,
 PC_6_ALT1  = PC_6  | ALT1,
 PC_7_ALT1  = PC_7  | ALT1,
 PC_8_ALT1  = PC_8  | ALT1,
+PC_8_ALT2  = PC_8  | ALT2,
 PC_9_ALT1  = PC_9  | ALT1,
 PC_10_ALT1 = PC_10 | ALT1,
 PC_11_ALT1 = PC_11 | ALT1,
-PC_12_ALT1 = PC_12 | ALT1,
 PC_13_ALT1 = PC_13 | ALT1,
 
 /* SYS_WKUP */
diff --git a/variants/STM32G4xx/G471R(C-E)T/variant_generic.cpp b/variants/STM32G4xx/G471R(C-E)T/variant_generic.cpp
index 77e88921fd..906af70836 100644
--- a/variants/STM32G4xx/G471R(C-E)T/variant_generic.cpp
+++ b/variants/STM32G4xx/G471R(C-E)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G4xx/G471R(C-E)T/variant_generic.h b/variants/STM32G4xx/G471R(C-E)T/variant_generic.h
index b775d6ba96..4e1ef450f4 100644
--- a/variants/STM32G4xx/G471R(C-E)T/variant_generic.h
+++ b/variants/STM32G4xx/G471R(C-E)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -71,11 +71,8 @@
 // Alternate pins number
 #define PA0_ALT1                (PA0  | ALT1)
 #define PA1_ALT1                (PA1  | ALT1)
-#define PA1_ALT2                (PA1  | ALT2)
 #define PA2_ALT1                (PA2  | ALT1)
-#define PA2_ALT2                (PA2  | ALT2)
 #define PA3_ALT1                (PA3  | ALT1)
-#define PA3_ALT2                (PA3  | ALT2)
 #define PA4_ALT1                (PA4  | ALT1)
 #define PA6_ALT1                (PA6  | ALT1)
 #define PA7_ALT1                (PA7  | ALT1)
@@ -119,10 +116,10 @@
 #define PC6_ALT1                (PC6  | ALT1)
 #define PC7_ALT1                (PC7  | ALT1)
 #define PC8_ALT1                (PC8  | ALT1)
+#define PC8_ALT2                (PC8  | ALT2)
 #define PC9_ALT1                (PC9  | ALT1)
 #define PC10_ALT1               (PC10 | ALT1)
 #define PC11_ALT1               (PC11 | ALT1)
-#define PC12_ALT1               (PC12 | ALT1)
 #define PC13_ALT1               (PC13 | ALT1)
 
 #define NUM_DIGITAL_PINS        52
diff --git a/variants/STM32G4xx/G471V(C-E)(H-I-T)/PeripheralPins.c b/variants/STM32G4xx/G471V(C-E)(H-I-T)/PeripheralPins.c
index 273c11d589..66e660b89e 100644
--- a/variants/STM32G4xx/G471V(C-E)(H-I-T)/PeripheralPins.c
+++ b/variants/STM32G4xx/G471V(C-E)(H-I-T)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32G471V(C-E)Hx.xml, STM32G471V(C-E)Ix.xml
  * STM32G471V(C-E)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
@@ -131,16 +131,12 @@ WEAK const PinMap PinMap_I2C_SCL[] = {
 #ifdef HAL_TIM_MODULE_ENABLED
 WEAK const PinMap PinMap_TIM[] = {
   {PA_0,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
-  {PA_0_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)}, // TIM5_CH1
   {PA_1,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
-  {PA_1_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 2, 0)}, // TIM5_CH2
-  {PA_1_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM15, 1, 1)}, // TIM15_CH1N
+  {PA_1_ALT1,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM15, 1, 1)}, // TIM15_CH1N
   {PA_2,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
-  {PA_2_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 3, 0)}, // TIM5_CH3
-  {PA_2_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM15, 1, 0)}, // TIM15_CH1
+  {PA_2_ALT1,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM15, 1, 0)}, // TIM15_CH1
   {PA_3,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4
-  {PA_3_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 4, 0)}, // TIM5_CH4
-  {PA_3_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM15, 2, 0)}, // TIM15_CH2
+  {PA_3_ALT1,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM15, 2, 0)}, // TIM15_CH2
   {PA_4,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
   {PA_5,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
   {PA_6,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
@@ -171,7 +167,7 @@ WEAK const PinMap PinMap_TIM[] = {
   {PB_1,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM1, 3, 1)}, // TIM1_CH3N
   {PB_1_ALT1,  TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
   {PB_1_ALT2,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 3, 1)}, // TIM8_CH3N
-  {PB_2,       TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)}, // TIM5_CH1
+  {PB_2,       TIM20, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM20, 1, 0)}, // TIM20_CH1
   {PB_3,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
   {PB_3_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 1, 1)}, // TIM8_CH1N
   {PB_4,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
@@ -204,6 +200,7 @@ WEAK const PinMap PinMap_TIM[] = {
   {PC_0,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 1, 0)}, // TIM1_CH1
   {PC_1,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 2, 0)}, // TIM1_CH2
   {PC_2,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 3, 0)}, // TIM1_CH3
+  {PC_2_ALT1,  TIM20, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM20, 2, 0)}, // TIM20_CH2
   {PC_3,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 4, 0)}, // TIM1_CH4
   {PC_5,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM1, 4, 1)}, // TIM1_CH4N
   {PC_6,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
@@ -212,12 +209,12 @@ WEAK const PinMap PinMap_TIM[] = {
   {PC_7_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 2, 0)}, // TIM8_CH2
   {PC_8,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)}, // TIM3_CH3
   {PC_8_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 3, 0)}, // TIM8_CH3
+  {PC_8_ALT2,  TIM20, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM20, 3, 0)}, // TIM20_CH3
   {PC_9,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
   {PC_9_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 4, 0)}, // TIM8_CH4
   {PC_10,      TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 1, 1)}, // TIM8_CH1N
   {PC_11,      TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 2, 1)}, // TIM8_CH2N
-  {PC_12,      TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM5, 2, 0)}, // TIM5_CH2
-  {PC_12_ALT1, TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 3, 1)}, // TIM8_CH3N
+  {PC_12,      TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 3, 1)}, // TIM8_CH3N
   {PC_13,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM1, 1, 1)}, // TIM1_CH1N
   {PC_13_ALT1, TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM8, 4, 1)}, // TIM8_CH4N
   {PD_0,       TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM8, 4, 1)}, // TIM8_CH4N
@@ -231,15 +228,20 @@ WEAK const PinMap PinMap_TIM[] = {
   {PD_14,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 3, 0)}, // TIM4_CH3
   {PD_15,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)}, // TIM4_CH4
   {PE_0,       TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM16, 1, 0)}, // TIM16_CH1
+  {PE_0_ALT1,  TIM20, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM20, 4, 1)}, // TIM20_CH4N
   {PE_1,       TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM17, 1, 0)}, // TIM17_CH1
+  {PE_1_ALT1,  TIM20, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM20, 4, 0)}, // TIM20_CH4
   {PE_2,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
+  {PE_2_ALT1,  TIM20, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM20, 1, 0)}, // TIM20_CH1
   {PE_3,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
+  {PE_3_ALT1,  TIM20, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM20, 2, 0)}, // TIM20_CH2
   {PE_4,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)}, // TIM3_CH3
+  {PE_4_ALT1,  TIM20, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM20, 1, 1)}, // TIM20_CH1N
   {PE_5,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
+  {PE_5_ALT1,  TIM20, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM20, 2, 1)}, // TIM20_CH2N
+  {PE_6,       TIM20, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM20, 3, 1)}, // TIM20_CH3N
   {PE_8,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 1, 1)}, // TIM1_CH1N
-  {PE_8_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM5, 3, 0)}, // TIM5_CH3
   {PE_9,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 1, 0)}, // TIM1_CH1
-  {PE_9_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM5, 4, 0)}, // TIM5_CH4
   {PE_10,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 2, 1)}, // TIM1_CH2N
   {PE_11,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 2, 0)}, // TIM1_CH2
   {PE_12,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 3, 1)}, // TIM1_CH3N
@@ -247,8 +249,8 @@ WEAK const PinMap PinMap_TIM[] = {
   {PE_14,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 4, 0)}, // TIM1_CH4
   {PE_15,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM1, 4, 1)}, // TIM1_CH4N
   {PF_0,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM1, 3, 1)}, // TIM1_CH3N
-  {PF_9,       TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM5, 4, 0)}, // TIM5_CH4
-  {PF_9_ALT1,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM15, 1, 0)}, // TIM15_CH1
+  {PF_2,       TIM20, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM20, 3, 0)}, // TIM20_CH3
+  {PF_9,       TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM15, 1, 0)}, // TIM15_CH1
   {PF_10,      TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM15, 2, 0)}, // TIM15_CH2
   {NC,         NP,    0}
 };
diff --git a/variants/STM32G4xx/G471V(C-E)(H-I-T)/PinNamesVar.h b/variants/STM32G4xx/G471V(C-E)(H-I-T)/PinNamesVar.h
index d689199d6e..d8628c9d08 100644
--- a/variants/STM32G4xx/G471V(C-E)(H-I-T)/PinNamesVar.h
+++ b/variants/STM32G4xx/G471V(C-E)(H-I-T)/PinNamesVar.h
@@ -1,11 +1,8 @@
 /* Alternate pin name */
 PA_0_ALT1  = PA_0  | ALT1,
 PA_1_ALT1  = PA_1  | ALT1,
-PA_1_ALT2  = PA_1  | ALT2,
 PA_2_ALT1  = PA_2  | ALT1,
-PA_2_ALT2  = PA_2  | ALT2,
 PA_3_ALT1  = PA_3  | ALT1,
-PA_3_ALT2  = PA_3  | ALT2,
 PA_4_ALT1  = PA_4  | ALT1,
 PA_6_ALT1  = PA_6  | ALT1,
 PA_7_ALT1  = PA_7  | ALT1,
@@ -49,14 +46,17 @@ PC_3_ALT1  = PC_3  | ALT1,
 PC_6_ALT1  = PC_6  | ALT1,
 PC_7_ALT1  = PC_7  | ALT1,
 PC_8_ALT1  = PC_8  | ALT1,
+PC_8_ALT2  = PC_8  | ALT2,
 PC_9_ALT1  = PC_9  | ALT1,
 PC_10_ALT1 = PC_10 | ALT1,
 PC_11_ALT1 = PC_11 | ALT1,
-PC_12_ALT1 = PC_12 | ALT1,
 PC_13_ALT1 = PC_13 | ALT1,
-PE_8_ALT1  = PE_8  | ALT1,
-PE_9_ALT1  = PE_9  | ALT1,
-PF_9_ALT1  = PF_9  | ALT1,
+PE_0_ALT1  = PE_0  | ALT1,
+PE_1_ALT1  = PE_1  | ALT1,
+PE_2_ALT1  = PE_2  | ALT1,
+PE_3_ALT1  = PE_3  | ALT1,
+PE_4_ALT1  = PE_4  | ALT1,
+PE_5_ALT1  = PE_5  | ALT1,
 
 /* SYS_WKUP */
 #ifdef PWR_WAKEUP_PIN1
diff --git a/variants/STM32G4xx/G471V(C-E)(H-I-T)/variant_generic.cpp b/variants/STM32G4xx/G471V(C-E)(H-I-T)/variant_generic.cpp
index 8fc9643ede..780f991f92 100644
--- a/variants/STM32G4xx/G471V(C-E)(H-I-T)/variant_generic.cpp
+++ b/variants/STM32G4xx/G471V(C-E)(H-I-T)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G4xx/G471V(C-E)(H-I-T)/variant_generic.h b/variants/STM32G4xx/G471V(C-E)(H-I-T)/variant_generic.h
index f4ae51065b..0f37f27df1 100644
--- a/variants/STM32G4xx/G471V(C-E)(H-I-T)/variant_generic.h
+++ b/variants/STM32G4xx/G471V(C-E)(H-I-T)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -105,11 +105,8 @@
 // Alternate pins number
 #define PA0_ALT1                (PA0  | ALT1)
 #define PA1_ALT1                (PA1  | ALT1)
-#define PA1_ALT2                (PA1  | ALT2)
 #define PA2_ALT1                (PA2  | ALT1)
-#define PA2_ALT2                (PA2  | ALT2)
 #define PA3_ALT1                (PA3  | ALT1)
-#define PA3_ALT2                (PA3  | ALT2)
 #define PA4_ALT1                (PA4  | ALT1)
 #define PA6_ALT1                (PA6  | ALT1)
 #define PA7_ALT1                (PA7  | ALT1)
@@ -153,14 +150,17 @@
 #define PC6_ALT1                (PC6  | ALT1)
 #define PC7_ALT1                (PC7  | ALT1)
 #define PC8_ALT1                (PC8  | ALT1)
+#define PC8_ALT2                (PC8  | ALT2)
 #define PC9_ALT1                (PC9  | ALT1)
 #define PC10_ALT1               (PC10 | ALT1)
 #define PC11_ALT1               (PC11 | ALT1)
-#define PC12_ALT1               (PC12 | ALT1)
 #define PC13_ALT1               (PC13 | ALT1)
-#define PE8_ALT1                (PE8  | ALT1)
-#define PE9_ALT1                (PE9  | ALT1)
-#define PF9_ALT1                (PF9  | ALT1)
+#define PE0_ALT1                (PE0  | ALT1)
+#define PE1_ALT1                (PE1  | ALT1)
+#define PE2_ALT1                (PE2  | ALT1)
+#define PE3_ALT1                (PE3  | ALT1)
+#define PE4_ALT1                (PE4  | ALT1)
+#define PE5_ALT1                (PE5  | ALT1)
 
 #define NUM_DIGITAL_PINS        86
 #define NUM_ANALOG_INPUTS       36
diff --git a/variants/STM32G4xx/G473C(B-C-E)T_G474C(B-C-E)T_G483CET_G484CET/PeripheralPins.c b/variants/STM32G4xx/G473C(B-C-E)T_G474C(B-C-E)T_G483CET_G484CET/PeripheralPins.c
index 8568c5f779..f96bcebe36 100644
--- a/variants/STM32G4xx/G473C(B-C-E)T_G474C(B-C-E)T_G483CET_G484CET/PeripheralPins.c
+++ b/variants/STM32G4xx/G473C(B-C-E)T_G474C(B-C-E)T_G483CET_G484CET/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32G473C(B-C-E)Tx.xml, STM32G474C(B-C-E)Tx.xml
  * STM32G483CETx.xml, STM32G484CETx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G4xx/G473C(B-C-E)T_G474C(B-C-E)T_G483CET_G484CET/variant_generic.cpp b/variants/STM32G4xx/G473C(B-C-E)T_G474C(B-C-E)T_G483CET_G484CET/variant_generic.cpp
index c4b9223e55..9d58c40070 100644
--- a/variants/STM32G4xx/G473C(B-C-E)T_G474C(B-C-E)T_G483CET_G484CET/variant_generic.cpp
+++ b/variants/STM32G4xx/G473C(B-C-E)T_G474C(B-C-E)T_G483CET_G484CET/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G4xx/G473C(B-C-E)T_G474C(B-C-E)T_G483CET_G484CET/variant_generic.h b/variants/STM32G4xx/G473C(B-C-E)T_G474C(B-C-E)T_G483CET_G484CET/variant_generic.h
index 80b2e20853..d370aead07 100644
--- a/variants/STM32G4xx/G473C(B-C-E)T_G474C(B-C-E)T_G483CET_G484CET/variant_generic.h
+++ b/variants/STM32G4xx/G473C(B-C-E)T_G474C(B-C-E)T_G483CET_G484CET/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G4xx/G473C(B-C-E)U_G474C(B-C-E)U_G483CEU_G484CEU/PeripheralPins.c b/variants/STM32G4xx/G473C(B-C-E)U_G474C(B-C-E)U_G483CEU_G484CEU/PeripheralPins.c
index bb745be7eb..f0e5cd8a60 100644
--- a/variants/STM32G4xx/G473C(B-C-E)U_G474C(B-C-E)U_G483CEU_G484CEU/PeripheralPins.c
+++ b/variants/STM32G4xx/G473C(B-C-E)U_G474C(B-C-E)U_G483CEU_G484CEU/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32G473C(B-C-E)Ux.xml, STM32G474C(B-C-E)Ux.xml
  * STM32G483CEUx.xml, STM32G484CEUx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G4xx/G473C(B-C-E)U_G474C(B-C-E)U_G483CEU_G484CEU/variant_generic.cpp b/variants/STM32G4xx/G473C(B-C-E)U_G474C(B-C-E)U_G483CEU_G484CEU/variant_generic.cpp
index 31e87d8a73..e8e8c24a9e 100644
--- a/variants/STM32G4xx/G473C(B-C-E)U_G474C(B-C-E)U_G483CEU_G484CEU/variant_generic.cpp
+++ b/variants/STM32G4xx/G473C(B-C-E)U_G474C(B-C-E)U_G483CEU_G484CEU/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G4xx/G473C(B-C-E)U_G474C(B-C-E)U_G483CEU_G484CEU/variant_generic.h b/variants/STM32G4xx/G473C(B-C-E)U_G474C(B-C-E)U_G483CEU_G484CEU/variant_generic.h
index 15fbed8018..f25138e330 100644
--- a/variants/STM32G4xx/G473C(B-C-E)U_G474C(B-C-E)U_G483CEU_G484CEU/variant_generic.h
+++ b/variants/STM32G4xx/G473C(B-C-E)U_G474C(B-C-E)U_G483CEU_G484CEU/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G4xx/G473M(B-C-E)T_G474M(B-C-E)T_G483MET_G484MET/PeripheralPins.c b/variants/STM32G4xx/G473M(B-C-E)T_G474M(B-C-E)T_G483MET_G484MET/PeripheralPins.c
index 992aa6bc4d..7cb292e5e1 100644
--- a/variants/STM32G4xx/G473M(B-C-E)T_G474M(B-C-E)T_G483MET_G484MET/PeripheralPins.c
+++ b/variants/STM32G4xx/G473M(B-C-E)T_G474M(B-C-E)T_G483MET_G484MET/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32G473M(B-C-E)Tx.xml, STM32G474M(B-C-E)Tx.xml
  * STM32G483METx.xml, STM32G484METx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G4xx/G473M(B-C-E)T_G474M(B-C-E)T_G483MET_G484MET/variant_generic.cpp b/variants/STM32G4xx/G473M(B-C-E)T_G474M(B-C-E)T_G483MET_G484MET/variant_generic.cpp
index 4b109df4b8..5192e2dc73 100644
--- a/variants/STM32G4xx/G473M(B-C-E)T_G474M(B-C-E)T_G483MET_G484MET/variant_generic.cpp
+++ b/variants/STM32G4xx/G473M(B-C-E)T_G474M(B-C-E)T_G483MET_G484MET/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G4xx/G473M(B-C-E)T_G474M(B-C-E)T_G483MET_G484MET/variant_generic.h b/variants/STM32G4xx/G473M(B-C-E)T_G474M(B-C-E)T_G483MET_G484MET/variant_generic.h
index dad588dfa4..541b650445 100644
--- a/variants/STM32G4xx/G473M(B-C-E)T_G474M(B-C-E)T_G483MET_G484MET/variant_generic.h
+++ b/variants/STM32G4xx/G473M(B-C-E)T_G474M(B-C-E)T_G483MET_G484MET/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G4xx/G473MEY_G474MEY_G483MEY_G484MEY/PeripheralPins.c b/variants/STM32G4xx/G473MEY_G474MEY_G483MEY_G484MEY/PeripheralPins.c
index 1264ea4c8b..318c412813 100644
--- a/variants/STM32G4xx/G473MEY_G474MEY_G483MEY_G484MEY/PeripheralPins.c
+++ b/variants/STM32G4xx/G473MEY_G474MEY_G483MEY_G484MEY/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32G473MEYx.xml, STM32G474MEYx.xml
  * STM32G483MEYx.xml, STM32G484MEYx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G4xx/G473MEY_G474MEY_G483MEY_G484MEY/variant_generic.cpp b/variants/STM32G4xx/G473MEY_G474MEY_G483MEY_G484MEY/variant_generic.cpp
index ccbaac09c9..7262e85eb8 100644
--- a/variants/STM32G4xx/G473MEY_G474MEY_G483MEY_G484MEY/variant_generic.cpp
+++ b/variants/STM32G4xx/G473MEY_G474MEY_G483MEY_G484MEY/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G4xx/G473MEY_G474MEY_G483MEY_G484MEY/variant_generic.h b/variants/STM32G4xx/G473MEY_G474MEY_G483MEY_G484MEY/variant_generic.h
index dc6656654f..5a90100b8f 100644
--- a/variants/STM32G4xx/G473MEY_G474MEY_G483MEY_G484MEY/variant_generic.h
+++ b/variants/STM32G4xx/G473MEY_G474MEY_G483MEY_G484MEY/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G4xx/G473P(B-C-E)I_G474P(B-C-E)I_G483PEI_G484PEI/PeripheralPins.c b/variants/STM32G4xx/G473P(B-C-E)I_G474P(B-C-E)I_G483PEI_G484PEI/PeripheralPins.c
index b1307e8c96..79e33105ba 100644
--- a/variants/STM32G4xx/G473P(B-C-E)I_G474P(B-C-E)I_G483PEI_G484PEI/PeripheralPins.c
+++ b/variants/STM32G4xx/G473P(B-C-E)I_G474P(B-C-E)I_G483PEI_G484PEI/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32G473P(B-C-E)Ix.xml, STM32G474P(B-C-E)Ix.xml
  * STM32G483PEIx.xml, STM32G484PEIx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G4xx/G473P(B-C-E)I_G474P(B-C-E)I_G483PEI_G484PEI/variant_generic.cpp b/variants/STM32G4xx/G473P(B-C-E)I_G474P(B-C-E)I_G483PEI_G484PEI/variant_generic.cpp
index 4680395f8f..cb053f4d01 100644
--- a/variants/STM32G4xx/G473P(B-C-E)I_G474P(B-C-E)I_G483PEI_G484PEI/variant_generic.cpp
+++ b/variants/STM32G4xx/G473P(B-C-E)I_G474P(B-C-E)I_G483PEI_G484PEI/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G4xx/G473P(B-C-E)I_G474P(B-C-E)I_G483PEI_G484PEI/variant_generic.h b/variants/STM32G4xx/G473P(B-C-E)I_G474P(B-C-E)I_G483PEI_G484PEI/variant_generic.h
index 54f7b019df..4c680bf65e 100644
--- a/variants/STM32G4xx/G473P(B-C-E)I_G474P(B-C-E)I_G483PEI_G484PEI/variant_generic.h
+++ b/variants/STM32G4xx/G473P(B-C-E)I_G474P(B-C-E)I_G483PEI_G484PEI/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G4xx/G473Q(B-C-E)T_G474Q(B-C-E)T_G483QET_G484QET/PeripheralPins.c b/variants/STM32G4xx/G473Q(B-C-E)T_G474Q(B-C-E)T_G483QET_G484QET/PeripheralPins.c
index a6cd935656..f2425cab93 100644
--- a/variants/STM32G4xx/G473Q(B-C-E)T_G474Q(B-C-E)T_G483QET_G484QET/PeripheralPins.c
+++ b/variants/STM32G4xx/G473Q(B-C-E)T_G474Q(B-C-E)T_G483QET_G484QET/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32G473Q(B-C-E)Tx.xml, STM32G474Q(B-C-E)Tx.xml
  * STM32G483QETx.xml, STM32G484QETx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G4xx/G473Q(B-C-E)T_G474Q(B-C-E)T_G483QET_G484QET/variant_generic.cpp b/variants/STM32G4xx/G473Q(B-C-E)T_G474Q(B-C-E)T_G483QET_G484QET/variant_generic.cpp
index 9a0e4152ea..8eff5822e3 100644
--- a/variants/STM32G4xx/G473Q(B-C-E)T_G474Q(B-C-E)T_G483QET_G484QET/variant_generic.cpp
+++ b/variants/STM32G4xx/G473Q(B-C-E)T_G474Q(B-C-E)T_G483QET_G484QET/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G4xx/G473Q(B-C-E)T_G474Q(B-C-E)T_G483QET_G484QET/variant_generic.h b/variants/STM32G4xx/G473Q(B-C-E)T_G474Q(B-C-E)T_G483QET_G484QET/variant_generic.h
index 45b0545a1a..fcfe990358 100644
--- a/variants/STM32G4xx/G473Q(B-C-E)T_G474Q(B-C-E)T_G483QET_G484QET/variant_generic.h
+++ b/variants/STM32G4xx/G473Q(B-C-E)T_G474Q(B-C-E)T_G483QET_G484QET/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G4xx/G473R(B-C-E)T_G474R(B-C-E)T_G483RET_G484RET/PeripheralPins.c b/variants/STM32G4xx/G473R(B-C-E)T_G474R(B-C-E)T_G483RET_G484RET/PeripheralPins.c
index 523251e489..6a99894f69 100644
--- a/variants/STM32G4xx/G473R(B-C-E)T_G474R(B-C-E)T_G483RET_G484RET/PeripheralPins.c
+++ b/variants/STM32G4xx/G473R(B-C-E)T_G474R(B-C-E)T_G483RET_G484RET/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32G473R(B-C-E)Tx.xml, STM32G474R(B-C-E)Tx.xml
  * STM32G483RETx.xml, STM32G484RETx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G4xx/G473R(B-C-E)T_G474R(B-C-E)T_G483RET_G484RET/variant_generic.cpp b/variants/STM32G4xx/G473R(B-C-E)T_G474R(B-C-E)T_G483RET_G484RET/variant_generic.cpp
index 747b701fd3..0f512f76ab 100644
--- a/variants/STM32G4xx/G473R(B-C-E)T_G474R(B-C-E)T_G483RET_G484RET/variant_generic.cpp
+++ b/variants/STM32G4xx/G473R(B-C-E)T_G474R(B-C-E)T_G483RET_G484RET/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G4xx/G473R(B-C-E)T_G474R(B-C-E)T_G483RET_G484RET/variant_generic.h b/variants/STM32G4xx/G473R(B-C-E)T_G474R(B-C-E)T_G483RET_G484RET/variant_generic.h
index 4f2c636d67..72cd946bd3 100644
--- a/variants/STM32G4xx/G473R(B-C-E)T_G474R(B-C-E)T_G483RET_G484RET/variant_generic.h
+++ b/variants/STM32G4xx/G473R(B-C-E)T_G474R(B-C-E)T_G483RET_G484RET/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G4xx/G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T)/PeripheralPins.c b/variants/STM32G4xx/G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T)/PeripheralPins.c
index 0535d5e74b..3a86cfb1e7 100644
--- a/variants/STM32G4xx/G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T)/PeripheralPins.c
+++ b/variants/STM32G4xx/G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -17,7 +17,7 @@
  * STM32G483VEHx.xml, STM32G483VEIx.xml
  * STM32G483VETx.xml, STM32G484VEHx.xml
  * STM32G484VEIx.xml, STM32G484VETx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G4xx/G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T)/variant_generic.cpp b/variants/STM32G4xx/G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T)/variant_generic.cpp
index ee13138307..a7d2e00c56 100644
--- a/variants/STM32G4xx/G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T)/variant_generic.cpp
+++ b/variants/STM32G4xx/G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G4xx/G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T)/variant_generic.h b/variants/STM32G4xx/G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T)/variant_generic.h
index 27d79f7e44..f2120a37f9 100644
--- a/variants/STM32G4xx/G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T)/variant_generic.h
+++ b/variants/STM32G4xx/G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G4xx/G491C(C-E)T_G4A1CET/PeripheralPins.c b/variants/STM32G4xx/G491C(C-E)T_G4A1CET/PeripheralPins.c
index eed7012383..99f9a9b46d 100644
--- a/variants/STM32G4xx/G491C(C-E)T_G4A1CET/PeripheralPins.c
+++ b/variants/STM32G4xx/G491C(C-E)T_G4A1CET/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32G491C(C-E)Tx.xml, STM32G4A1CETx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G4xx/G491C(C-E)T_G4A1CET/variant_generic.cpp b/variants/STM32G4xx/G491C(C-E)T_G4A1CET/variant_generic.cpp
index 0a44b77392..f14dbd93ec 100644
--- a/variants/STM32G4xx/G491C(C-E)T_G4A1CET/variant_generic.cpp
+++ b/variants/STM32G4xx/G491C(C-E)T_G4A1CET/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G4xx/G491C(C-E)T_G4A1CET/variant_generic.h b/variants/STM32G4xx/G491C(C-E)T_G4A1CET/variant_generic.h
index b94bfa23d8..00bef01959 100644
--- a/variants/STM32G4xx/G491C(C-E)T_G4A1CET/variant_generic.h
+++ b/variants/STM32G4xx/G491C(C-E)T_G4A1CET/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G4xx/G491C(C-E)U_G4A1CEU/PeripheralPins.c b/variants/STM32G4xx/G491C(C-E)U_G4A1CEU/PeripheralPins.c
index 943a34685e..465e7c530b 100644
--- a/variants/STM32G4xx/G491C(C-E)U_G4A1CEU/PeripheralPins.c
+++ b/variants/STM32G4xx/G491C(C-E)U_G4A1CEU/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32G491C(C-E)Ux.xml, STM32G4A1CEUx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G4xx/G491C(C-E)U_G4A1CEU/variant_generic.cpp b/variants/STM32G4xx/G491C(C-E)U_G4A1CEU/variant_generic.cpp
index d9c7ae7800..3a70218ef3 100644
--- a/variants/STM32G4xx/G491C(C-E)U_G4A1CEU/variant_generic.cpp
+++ b/variants/STM32G4xx/G491C(C-E)U_G4A1CEU/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G4xx/G491C(C-E)U_G4A1CEU/variant_generic.h b/variants/STM32G4xx/G491C(C-E)U_G4A1CEU/variant_generic.h
index 99f5504700..68a7d6c75a 100644
--- a/variants/STM32G4xx/G491C(C-E)U_G4A1CEU/variant_generic.h
+++ b/variants/STM32G4xx/G491C(C-E)U_G4A1CEU/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G4xx/G491K(C-E)U_G4A1KEU/PeripheralPins.c b/variants/STM32G4xx/G491K(C-E)U_G4A1KEU/PeripheralPins.c
index 1b30987a01..13c669c911 100644
--- a/variants/STM32G4xx/G491K(C-E)U_G4A1KEU/PeripheralPins.c
+++ b/variants/STM32G4xx/G491K(C-E)U_G4A1KEU/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32G491K(C-E)Ux.xml, STM32G4A1KEUx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G4xx/G491K(C-E)U_G4A1KEU/variant_generic.cpp b/variants/STM32G4xx/G491K(C-E)U_G4A1KEU/variant_generic.cpp
index 2ba45be8d6..73e7c3d4a3 100644
--- a/variants/STM32G4xx/G491K(C-E)U_G4A1KEU/variant_generic.cpp
+++ b/variants/STM32G4xx/G491K(C-E)U_G4A1KEU/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G4xx/G491K(C-E)U_G4A1KEU/variant_generic.h b/variants/STM32G4xx/G491K(C-E)U_G4A1KEU/variant_generic.h
index 668ddbfb05..613e0d6b70 100644
--- a/variants/STM32G4xx/G491K(C-E)U_G4A1KEU/variant_generic.h
+++ b/variants/STM32G4xx/G491K(C-E)U_G4A1KEU/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G4xx/G491M(C-E)(S-T)_G4A1ME(S-T)/PeripheralPins.c b/variants/STM32G4xx/G491M(C-E)(S-T)_G4A1ME(S-T)/PeripheralPins.c
index bc46f7478c..d546b37052 100644
--- a/variants/STM32G4xx/G491M(C-E)(S-T)_G4A1ME(S-T)/PeripheralPins.c
+++ b/variants/STM32G4xx/G491M(C-E)(S-T)_G4A1ME(S-T)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32G491M(C-E)Sx.xml, STM32G491M(C-E)Tx.xml
  * STM32G4A1MESx.xml, STM32G4A1METx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G4xx/G491M(C-E)(S-T)_G4A1ME(S-T)/variant_generic.cpp b/variants/STM32G4xx/G491M(C-E)(S-T)_G4A1ME(S-T)/variant_generic.cpp
index 5a13152813..2591f3a26d 100644
--- a/variants/STM32G4xx/G491M(C-E)(S-T)_G4A1ME(S-T)/variant_generic.cpp
+++ b/variants/STM32G4xx/G491M(C-E)(S-T)_G4A1ME(S-T)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G4xx/G491M(C-E)(S-T)_G4A1ME(S-T)/variant_generic.h b/variants/STM32G4xx/G491M(C-E)(S-T)_G4A1ME(S-T)/variant_generic.h
index 97cc683a70..db3e9a529b 100644
--- a/variants/STM32G4xx/G491M(C-E)(S-T)_G4A1ME(S-T)/variant_generic.h
+++ b/variants/STM32G4xx/G491M(C-E)(S-T)_G4A1ME(S-T)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)_G4A1RE(I-T-Y)/PeripheralPins.c b/variants/STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)_G4A1RE(I-T-Y)/PeripheralPins.c
index fea12224a5..fe3253afbe 100644
--- a/variants/STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)_G4A1RE(I-T-Y)/PeripheralPins.c
+++ b/variants/STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)_G4A1RE(I-T-Y)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -14,7 +14,7 @@
  * Automatically generated from STM32G491R(C-E)Ix.xml, STM32G491R(C-E)Tx.xml
  * STM32G491REYx.xml, STM32G4A1REIx.xml
  * STM32G4A1RETx.xml, STM32G4A1REYx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)_G4A1RE(I-T-Y)/variant_generic.cpp b/variants/STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)_G4A1RE(I-T-Y)/variant_generic.cpp
index 699fc10952..aaf5c6e653 100644
--- a/variants/STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)_G4A1RE(I-T-Y)/variant_generic.cpp
+++ b/variants/STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)_G4A1RE(I-T-Y)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)_G4A1RE(I-T-Y)/variant_generic.h b/variants/STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)_G4A1RE(I-T-Y)/variant_generic.h
index f3ab8bab3e..4e1ef450f4 100644
--- a/variants/STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)_G4A1RE(I-T-Y)/variant_generic.h
+++ b/variants/STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)_G4A1RE(I-T-Y)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G4xx/G491V(C-E)T_G4A1VET/PeripheralPins.c b/variants/STM32G4xx/G491V(C-E)T_G4A1VET/PeripheralPins.c
index a1645d5843..9a82f0ab4e 100644
--- a/variants/STM32G4xx/G491V(C-E)T_G4A1VET/PeripheralPins.c
+++ b/variants/STM32G4xx/G491V(C-E)T_G4A1VET/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32G491V(C-E)Tx.xml, STM32G4A1VETx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32G4xx/G491V(C-E)T_G4A1VET/variant_generic.cpp b/variants/STM32G4xx/G491V(C-E)T_G4A1VET/variant_generic.cpp
index 962d681bf8..85a6a9bdbe 100644
--- a/variants/STM32G4xx/G491V(C-E)T_G4A1VET/variant_generic.cpp
+++ b/variants/STM32G4xx/G491V(C-E)T_G4A1VET/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G4xx/G491V(C-E)T_G4A1VET/variant_generic.h b/variants/STM32G4xx/G491V(C-E)T_G4A1VET/variant_generic.h
index 4ddfea5340..0f37f27df1 100644
--- a/variants/STM32G4xx/G491V(C-E)T_G4A1VET/variant_generic.h
+++ b/variants/STM32G4xx/G491V(C-E)T_G4A1VET/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32G4xx/GBK1CBT/PeripheralPins.c b/variants/STM32G4xx/GBK1CBT/PeripheralPins.c
deleted file mode 100644
index 372b124981..0000000000
--- a/variants/STM32G4xx/GBK1CBT/PeripheralPins.c
+++ /dev/null
@@ -1,327 +0,0 @@
-/*
- *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
- * All rights reserved.
- *
- * This software component is licensed by ST under BSD 3-Clause license,
- * the "License"; You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *                        opensource.org/licenses/BSD-3-Clause
- *
- *******************************************************************************
- */
-/*
- * Automatically generated from STM32GBK1CBTx.xml
- * CubeMX DB release 6.0.30
- */
-#if !defined(CUSTOM_PERIPHERAL_PINS)
-#include "Arduino.h"
-#include "PeripheralPins.h"
-
-/* =====
- * Notes:
- * - The pins mentioned Px_y_ALTz are alternative possibilities which use other
- *   HW peripheral instances. You can use them the same way as any other "normal"
- *   pin (i.e. analogWrite(PA7_ALT1, 128);).
- *
- * - Commented lines are alternative possibilities which are not used per default.
- *   If you change them, you will have to know what you do
- * =====
- */
-
-//*** ADC ***
-
-#ifdef HAL_ADC_MODULE_ENABLED
-WEAK const PinMap PinMap_ADC[] = {
-  {PA_0,       ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC1_IN1
-  {PA_0_ALT1,  ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC2_IN1
-  {PA_1,       ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC1_IN2
-  {PA_1_ALT1,  ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC2_IN2
-  {PA_2,       ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC1_IN3
-  {PA_3,       ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC1_IN4
-  {PA_4,       ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 17, 0)}, // ADC2_IN17
-  {PA_5,       ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 13, 0)}, // ADC2_IN13
-  {PA_6,       ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC2_IN3
-  {PA_7,       ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC2_IN4
-  {PB_0,       ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC1_IN15
-  {PB_1,       ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 12, 0)}, // ADC1_IN12
-  {PB_2,       ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 12, 0)}, // ADC2_IN12
-  {PB_11,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC1_IN14
-  {PB_11_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC2_IN14
-  {PB_12,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC1_IN11
-  {PB_14,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC1_IN5
-  {PB_15,      ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC2_IN15
-  {PC_0,       ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC1_IN6
-  {PC_0_ALT1,  ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC2_IN6
-  {PC_1,       ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC1_IN7
-  {PC_1_ALT1,  ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC2_IN7
-  {PC_2,       ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC1_IN8
-  {PC_2_ALT1,  ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC2_IN8
-  {PC_3,       ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC1_IN9
-  {PC_3_ALT1,  ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC2_IN9
-  {PC_5,       ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC2_IN11
-  {PF_0,       ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC1_IN10
-  {PF_1,       ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC2_IN10
-  {NC,         NP,   0}
-};
-#endif
-
-//*** DAC ***
-
-#ifdef HAL_DAC_MODULE_ENABLED
-WEAK const PinMap PinMap_DAC[] = {
-  {PA_4, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // DAC1_OUT1
-  {PA_5, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // DAC1_OUT2
-  {NC,   NP,   0}
-};
-#endif
-
-//*** I2C ***
-
-#ifdef HAL_I2C_MODULE_ENABLED
-WEAK const PinMap PinMap_I2C_SDA[] = {
-  {PA_8,  I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
-  {PA_14, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
-  {PB_5,  I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF8_I2C3)},
-  {PB_7,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
-  {PB_9,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
-  {PF_0,  I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
-  {NC,    NP,   0}
-};
-#endif
-
-#ifdef HAL_I2C_MODULE_ENABLED
-WEAK const PinMap PinMap_I2C_SCL[] = {
-  {PA_8,  I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF2_I2C3)},
-  {PA_9,  I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
-  {PA_13, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
-  {PA_15, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
-  {PB_8,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
-  {NC,    NP,   0}
-};
-#endif
-
-//*** TIM ***
-
-#ifdef HAL_TIM_MODULE_ENABLED
-WEAK const PinMap PinMap_TIM[] = {
-  {PA_0,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
-  {PA_1,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
-  {PA_1_ALT1,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM15, 1, 1)}, // TIM15_CH1N
-  {PA_2,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
-  {PA_2_ALT1,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM15, 1, 0)}, // TIM15_CH1
-  {PA_3,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4
-  {PA_3_ALT1,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM15, 2, 0)}, // TIM15_CH2
-  {PA_4,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
-  {PA_5,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
-  {PA_6,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
-  {PA_6_ALT1,  TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM16, 1, 0)}, // TIM16_CH1
-  {PA_7,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM1, 1, 1)}, // TIM1_CH1N
-  {PA_7_ALT1,  TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
-  {PA_7_ALT2,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 1, 1)}, // TIM8_CH1N
-  {PA_7_ALT3,  TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM17, 1, 0)}, // TIM17_CH1
-  {PA_8,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM1, 1, 0)}, // TIM1_CH1
-  {PA_9,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM1, 2, 0)}, // TIM1_CH2
-  {PA_9_ALT1,  TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_TIM2, 3, 0)}, // TIM2_CH3
-  {PA_10,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM1, 3, 0)}, // TIM1_CH3
-  {PA_10_ALT1, TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_TIM2, 4, 0)}, // TIM2_CH4
-  {PA_11,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM1, 1, 1)}, // TIM1_CH1N
-  {PA_11_ALT1, TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_TIM1, 4, 0)}, // TIM1_CH4
-  {PA_11_ALT2, TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_TIM4, 1, 0)}, // TIM4_CH1
-  {PA_12,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM1, 2, 1)}, // TIM1_CH2N
-  {PA_12_ALT1, TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_TIM4, 2, 0)}, // TIM4_CH2
-  {PA_12_ALT2, TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM16, 1, 0)}, // TIM16_CH1
-  {PA_13,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_TIM4, 3, 0)}, // TIM4_CH3
-  {PA_13_ALT1, TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM16, 1, 1)}, // TIM16_CH1N
-  {PA_14,      TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_TIM8, 2, 0)}, // TIM8_CH2
-  {PA_15,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
-  {PA_15_ALT1, TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM8, 1, 0)}, // TIM8_CH1
-  {PB_0,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM1, 2, 1)}, // TIM1_CH2N
-  {PB_0_ALT1,  TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)}, // TIM3_CH3
-  {PB_0_ALT2,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 2, 1)}, // TIM8_CH2N
-  {PB_1,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM1, 3, 1)}, // TIM1_CH3N
-  {PB_1_ALT1,  TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
-  {PB_1_ALT2,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 3, 1)}, // TIM8_CH3N
-  {PB_3,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
-  {PB_3_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 1, 1)}, // TIM8_CH1N
-  {PB_4,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
-  {PB_4_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 2, 1)}, // TIM8_CH2N
-  {PB_4_ALT2,  TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM16, 1, 0)}, // TIM16_CH1
-  {PB_5,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
-  {PB_5_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 1)}, // TIM8_CH3N
-  {PB_5_ALT2,  TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_TIM17, 1, 0)}, // TIM17_CH1
-  {PB_6,       TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 1, 0)}, // TIM4_CH1
-  {PB_6_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_TIM8, 1, 0)}, // TIM8_CH1
-  {PB_6_ALT2,  TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM16, 1, 1)}, // TIM16_CH1N
-  {PB_7,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_TIM3, 4, 0)}, // TIM3_CH4
-  {PB_7_ALT1,  TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 2, 0)}, // TIM4_CH2
-  {PB_7_ALT2,  TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM17, 1, 1)}, // TIM17_CH1N
-  {PB_8,       TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 3, 0)}, // TIM4_CH3
-  {PB_8_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_TIM8, 2, 0)}, // TIM8_CH2
-  {PB_8_ALT2,  TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM16, 1, 0)}, // TIM16_CH1
-  {PB_9,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_TIM1_COMP1, 3, 1)}, // TIM1_CH3N
-  {PB_9_ALT1,  TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)}, // TIM4_CH4
-  {PB_9_ALT2,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_TIM8, 3, 0)}, // TIM8_CH3
-  {PB_9_ALT3,  TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM17, 1, 0)}, // TIM17_CH1
-  {PB_10,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
-  {PB_11,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4
-  {PB_13,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM1, 1, 1)}, // TIM1_CH1N
-  {PB_14,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM1, 2, 1)}, // TIM1_CH2N
-  {PB_14_ALT1, TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM15, 1, 0)}, // TIM15_CH1
-  {PB_15,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM1, 3, 1)}, // TIM1_CH3N
-  {PB_15_ALT1, TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM15, 1, 1)}, // TIM15_CH1N
-  {PB_15_ALT2, TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM15, 2, 0)}, // TIM15_CH2
-  {PC_0,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 1, 0)}, // TIM1_CH1
-  {PC_1,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 2, 0)}, // TIM1_CH2
-  {PC_2,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 3, 0)}, // TIM1_CH3
-  {PC_3,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 4, 0)}, // TIM1_CH4
-  {PC_5,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM1, 4, 1)}, // TIM1_CH4N
-  {PC_6,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
-  {PC_6_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 1, 0)}, // TIM8_CH1
-  {PC_7,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
-  {PC_7_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 2, 0)}, // TIM8_CH2
-  {PF_0,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM1, 3, 1)}, // TIM1_CH3N
-  {NC,         NP,    0}
-};
-#endif
-
-//*** UART ***
-
-#ifdef HAL_UART_MODULE_ENABLED
-WEAK const PinMap PinMap_UART_TX[] = {
-  {PA_2,      LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_LPUART1)},
-  {PA_2_ALT1, USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PA_9,      USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PA_14,     USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PB_3,      USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PB_6,      USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PB_9,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PB_10,     USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PB_11,     LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
-  {PC_1,      LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
-  {NC,        NP,      0}
-};
-#endif
-
-#ifdef HAL_UART_MODULE_ENABLED
-WEAK const PinMap PinMap_UART_RX[] = {
-  {PA_3,      LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_LPUART1)},
-  {PA_3_ALT1, USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PA_10,     USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PA_15,     USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PB_4,      USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PB_7,      USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PB_8,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PB_10,     LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
-  {PB_11,     USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PC_0,      LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
-  {PC_5,      USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {NC,        NP,      0}
-};
-#endif
-
-#ifdef HAL_UART_MODULE_ENABLED
-WEAK const PinMap PinMap_UART_RTS[] = {
-  {PA_1,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PA_12, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PB_1,  LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_LPUART1)},
-  {PB_12, LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
-  {PB_14, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {NC,    NP,      0}
-};
-#endif
-
-#ifdef HAL_UART_MODULE_ENABLED
-WEAK const PinMap PinMap_UART_CTS[] = {
-  {PA_0,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PA_6,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_LPUART1)},
-  {PA_11,      USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PA_13,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PB_13,      LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
-  {PB_13_ALT1, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {NC,         NP,      0}
-};
-#endif
-
-//*** SPI ***
-
-#ifdef HAL_SPI_MODULE_ENABLED
-WEAK const PinMap PinMap_SPI_MOSI[] = {
-  {PA_7,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PA_11,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PB_5,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PB_5_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PB_15,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {NC,        NP,   0}
-};
-#endif
-
-#ifdef HAL_SPI_MODULE_ENABLED
-WEAK const PinMap PinMap_SPI_MISO[] = {
-  {PA_6,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PA_10,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PB_4,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PB_4_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PB_14,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {NC,        NP,   0}
-};
-#endif
-
-#ifdef HAL_SPI_MODULE_ENABLED
-WEAK const PinMap PinMap_SPI_SCLK[] = {
-  {PA_5,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PB_3,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PB_3_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PB_13,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PF_1,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {NC,        NP,   0}
-};
-#endif
-
-#ifdef HAL_SPI_MODULE_ENABLED
-WEAK const PinMap PinMap_SPI_SSEL[] = {
-  {PA_4,       SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PA_4_ALT1,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PA_15,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PA_15_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PB_12,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PF_0,       SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {NC,         NP,   0}
-};
-#endif
-
-//*** FDCAN ***
-
-#ifdef HAL_FDCAN_MODULE_ENABLED
-WEAK const PinMap PinMap_CAN_RD[] = {
-  {PA_11, FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
-  {PB_8,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
-  {NC,    NP,     0}
-};
-#endif
-
-#ifdef HAL_FDCAN_MODULE_ENABLED
-WEAK const PinMap PinMap_CAN_TD[] = {
-  {PA_12, FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
-  {PB_9,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
-  {NC,    NP,     0}
-};
-#endif
-
-//*** No ETHERNET ***
-
-//*** No QUADSPI ***
-
-//*** USB ***
-
-#if defined(HAL_PCD_MODULE_ENABLED) || defined(HAL_HCD_MODULE_ENABLED)
-WEAK const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_DP
-  {NC,    NP,  0}
-};
-#endif
-
-//*** No SD ***
-
-#endif /* !CUSTOM_PERIPHERAL_PINS */
diff --git a/variants/STM32G4xx/GBK1CBT/PinNamesVar.h b/variants/STM32G4xx/GBK1CBT/PinNamesVar.h
deleted file mode 100644
index 05f29bbe92..0000000000
--- a/variants/STM32G4xx/GBK1CBT/PinNamesVar.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* Alternate pin name */
-PA_0_ALT1  = PA_0  | ALT1,
-PA_1_ALT1  = PA_1  | ALT1,
-PA_2_ALT1  = PA_2  | ALT1,
-PA_3_ALT1  = PA_3  | ALT1,
-PA_4_ALT1  = PA_4  | ALT1,
-PA_6_ALT1  = PA_6  | ALT1,
-PA_7_ALT1  = PA_7  | ALT1,
-PA_7_ALT2  = PA_7  | ALT2,
-PA_7_ALT3  = PA_7  | ALT3,
-PA_9_ALT1  = PA_9  | ALT1,
-PA_10_ALT1 = PA_10 | ALT1,
-PA_11_ALT1 = PA_11 | ALT1,
-PA_11_ALT2 = PA_11 | ALT2,
-PA_12_ALT1 = PA_12 | ALT1,
-PA_12_ALT2 = PA_12 | ALT2,
-PA_13_ALT1 = PA_13 | ALT1,
-PA_15_ALT1 = PA_15 | ALT1,
-PB_0_ALT1  = PB_0  | ALT1,
-PB_0_ALT2  = PB_0  | ALT2,
-PB_1_ALT1  = PB_1  | ALT1,
-PB_1_ALT2  = PB_1  | ALT2,
-PB_3_ALT1  = PB_3  | ALT1,
-PB_4_ALT1  = PB_4  | ALT1,
-PB_4_ALT2  = PB_4  | ALT2,
-PB_5_ALT1  = PB_5  | ALT1,
-PB_5_ALT2  = PB_5  | ALT2,
-PB_6_ALT1  = PB_6  | ALT1,
-PB_6_ALT2  = PB_6  | ALT2,
-PB_7_ALT1  = PB_7  | ALT1,
-PB_7_ALT2  = PB_7  | ALT2,
-PB_8_ALT1  = PB_8  | ALT1,
-PB_8_ALT2  = PB_8  | ALT2,
-PB_9_ALT1  = PB_9  | ALT1,
-PB_9_ALT2  = PB_9  | ALT2,
-PB_9_ALT3  = PB_9  | ALT3,
-PB_11_ALT1 = PB_11 | ALT1,
-PB_13_ALT1 = PB_13 | ALT1,
-PB_14_ALT1 = PB_14 | ALT1,
-PB_15_ALT1 = PB_15 | ALT1,
-PB_15_ALT2 = PB_15 | ALT2,
-PC_0_ALT1  = PC_0  | ALT1,
-PC_1_ALT1  = PC_1  | ALT1,
-PC_2_ALT1  = PC_2  | ALT1,
-PC_3_ALT1  = PC_3  | ALT1,
-PC_6_ALT1  = PC_6  | ALT1,
-PC_7_ALT1  = PC_7  | ALT1,
-
-/* SYS_WKUP */
-#ifdef PWR_WAKEUP_PIN1
-  SYS_WKUP1 = PA_0,
-#endif
-#ifdef PWR_WAKEUP_PIN2
-  SYS_WKUP2 = NC,
-#endif
-#ifdef PWR_WAKEUP_PIN3
-  SYS_WKUP3 = NC,
-#endif
-#ifdef PWR_WAKEUP_PIN4
-  SYS_WKUP4 = PA_2,
-#endif
-#ifdef PWR_WAKEUP_PIN5
-  SYS_WKUP5 = PC_5,
-#endif
-#ifdef PWR_WAKEUP_PIN6
-  SYS_WKUP6 = NC,
-#endif
-#ifdef PWR_WAKEUP_PIN7
-  SYS_WKUP7 = NC,
-#endif
-#ifdef PWR_WAKEUP_PIN8
-  SYS_WKUP8 = NC,
-#endif
-
-/* USB */
-#ifdef USBCON
-  USB_DM = PA_11,
-  USB_DP = PA_12,
-#endif
diff --git a/variants/STM32G4xx/GBK1CBT/boards_entry.txt b/variants/STM32G4xx/GBK1CBT/boards_entry.txt
deleted file mode 100644
index 11e252331e..0000000000
--- a/variants/STM32G4xx/GBK1CBT/boards_entry.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-# This file help to add generic board entry.
-# upload.maximum_size and product_line have to be verified
-# and changed if needed.
-# See: https://github.com/stm32duino/wiki/wiki/Add-a-new-variant-%28board%29
-
-# Generic GBK1CBTx
-GenG4.menu.pnum.GENERIC_GBK1CBTX=Generic GBK1CBTx
-GenG4.menu.pnum.GENERIC_GBK1CBTX.upload.maximum_size=131072
-GenG4.menu.pnum.GENERIC_GBK1CBTX.upload.maximum_data_size=32768
-GenG4.menu.pnum.GENERIC_GBK1CBTX.build.board=GENERIC_GBK1CBTX
-GenG4.menu.pnum.GENERIC_GBK1CBTX.build.product_line=STM32GBK1CB
-GenG4.menu.pnum.GENERIC_GBK1CBTX.build.variant=STM32G4xx/GBK1CBT
-
diff --git a/variants/STM32G4xx/GBK1CBT/variant_generic.cpp b/variants/STM32G4xx/GBK1CBT/variant_generic.cpp
deleted file mode 100644
index 51556b8b08..0000000000
--- a/variants/STM32G4xx/GBK1CBT/variant_generic.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
- * All rights reserved.
- *
- * This software component is licensed by ST under BSD 3-Clause license,
- * the "License"; You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *                        opensource.org/licenses/BSD-3-Clause
- *
- *******************************************************************************
- */
-#if defined(ARDUINO_GENERIC_GBK1CBTX)
-#include "pins_arduino.h"
-
-// Digital PinName array
-const PinName digitalPin[] = {
-  PA_0,   // D0/A0
-  PA_1,   // D1/A1
-  PA_2,   // D2/A2
-  PA_3,   // D3/A3
-  PA_4,   // D4/A4
-  PA_5,   // D5/A5
-  PA_6,   // D6/A6
-  PA_7,   // D7/A7
-  PA_8,   // D8
-  PA_9,   // D9
-  PA_10,  // D10
-  PA_11,  // D11
-  PA_12,  // D12
-  PA_13,  // D13
-  PA_14,  // D14
-  PA_15,  // D15
-  PB_0,   // D16/A8
-  PB_1,   // D17/A9
-  PB_2,   // D18/A10
-  PB_3,   // D19
-  PB_4,   // D20
-  PB_5,   // D21
-  PB_6,   // D22
-  PB_7,   // D23
-  PB_8,   // D24
-  PB_9,   // D25
-  PB_10,  // D26
-  PB_11,  // D27/A11
-  PB_12,  // D28/A12
-  PB_13,  // D29
-  PB_14,  // D30/A13
-  PB_15,  // D31/A14
-  PC_0,   // D32/A15
-  PC_1,   // D33/A16
-  PC_2,   // D34/A17
-  PC_3,   // D35/A18
-  PC_5,   // D36/A19
-  PC_6,   // D37
-  PC_7,   // D38
-  PF_0,   // D39/A20
-  PF_1,   // D40/A21
-  PG_10   // D41
-};
-
-// Analog (Ax) pin number array
-const uint32_t analogInputPin[] = {
-  0,  // A0,  PA0
-  1,  // A1,  PA1
-  2,  // A2,  PA2
-  3,  // A3,  PA3
-  4,  // A4,  PA4
-  5,  // A5,  PA5
-  6,  // A6,  PA6
-  7,  // A7,  PA7
-  16, // A8,  PB0
-  17, // A9,  PB1
-  18, // A10, PB2
-  27, // A11, PB11
-  28, // A12, PB12
-  30, // A13, PB14
-  31, // A14, PB15
-  32, // A15, PC0
-  33, // A16, PC1
-  34, // A17, PC2
-  35, // A18, PC3
-  36, // A19, PC5
-  39, // A20, PF0
-  40  // A21, PF1
-};
-
-#endif /* ARDUINO_GENERIC_* */
diff --git a/variants/STM32G4xx/GBK1CBT/variant_generic.h b/variants/STM32G4xx/GBK1CBT/variant_generic.h
deleted file mode 100644
index 80280a0a5e..0000000000
--- a/variants/STM32G4xx/GBK1CBT/variant_generic.h
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
- * All rights reserved.
- *
- * This software component is licensed by ST under BSD 3-Clause license,
- * the "License"; You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *                        opensource.org/licenses/BSD-3-Clause
- *
- *******************************************************************************
- */
-#pragma once
-
-/*----------------------------------------------------------------------------
- *        STM32 pins number
- *----------------------------------------------------------------------------*/
-#define PA0                     PIN_A0
-#define PA1                     PIN_A1
-#define PA2                     PIN_A2
-#define PA3                     PIN_A3
-#define PA4                     PIN_A4
-#define PA5                     PIN_A5
-#define PA6                     PIN_A6
-#define PA7                     PIN_A7
-#define PA8                     8
-#define PA9                     9
-#define PA10                    10
-#define PA11                    11
-#define PA12                    12
-#define PA13                    13
-#define PA14                    14
-#define PA15                    15
-#define PB0                     PIN_A8
-#define PB1                     PIN_A9
-#define PB2                     PIN_A10
-#define PB3                     19
-#define PB4                     20
-#define PB5                     21
-#define PB6                     22
-#define PB7                     23
-#define PB8                     24
-#define PB9                     25
-#define PB10                    26
-#define PB11                    PIN_A11
-#define PB12                    PIN_A12
-#define PB13                    29
-#define PB14                    PIN_A13
-#define PB15                    PIN_A14
-#define PC0                     PIN_A15
-#define PC1                     PIN_A16
-#define PC2                     PIN_A17
-#define PC3                     PIN_A18
-#define PC5                     PIN_A19
-#define PC6                     37
-#define PC7                     38
-#define PF0                     PIN_A20
-#define PF1                     PIN_A21
-#define PG10                    41
-
-// Alternate pins number
-#define PA0_ALT1                (PA0  | ALT1)
-#define PA1_ALT1                (PA1  | ALT1)
-#define PA2_ALT1                (PA2  | ALT1)
-#define PA3_ALT1                (PA3  | ALT1)
-#define PA4_ALT1                (PA4  | ALT1)
-#define PA6_ALT1                (PA6  | ALT1)
-#define PA7_ALT1                (PA7  | ALT1)
-#define PA7_ALT2                (PA7  | ALT2)
-#define PA7_ALT3                (PA7  | ALT3)
-#define PA9_ALT1                (PA9  | ALT1)
-#define PA10_ALT1               (PA10 | ALT1)
-#define PA11_ALT1               (PA11 | ALT1)
-#define PA11_ALT2               (PA11 | ALT2)
-#define PA12_ALT1               (PA12 | ALT1)
-#define PA12_ALT2               (PA12 | ALT2)
-#define PA13_ALT1               (PA13 | ALT1)
-#define PA15_ALT1               (PA15 | ALT1)
-#define PB0_ALT1                (PB0  | ALT1)
-#define PB0_ALT2                (PB0  | ALT2)
-#define PB1_ALT1                (PB1  | ALT1)
-#define PB1_ALT2                (PB1  | ALT2)
-#define PB3_ALT1                (PB3  | ALT1)
-#define PB4_ALT1                (PB4  | ALT1)
-#define PB4_ALT2                (PB4  | ALT2)
-#define PB5_ALT1                (PB5  | ALT1)
-#define PB5_ALT2                (PB5  | ALT2)
-#define PB6_ALT1                (PB6  | ALT1)
-#define PB6_ALT2                (PB6  | ALT2)
-#define PB7_ALT1                (PB7  | ALT1)
-#define PB7_ALT2                (PB7  | ALT2)
-#define PB8_ALT1                (PB8  | ALT1)
-#define PB8_ALT2                (PB8  | ALT2)
-#define PB9_ALT1                (PB9  | ALT1)
-#define PB9_ALT2                (PB9  | ALT2)
-#define PB9_ALT3                (PB9  | ALT3)
-#define PB11_ALT1               (PB11 | ALT1)
-#define PB13_ALT1               (PB13 | ALT1)
-#define PB14_ALT1               (PB14 | ALT1)
-#define PB15_ALT1               (PB15 | ALT1)
-#define PB15_ALT2               (PB15 | ALT2)
-#define PC0_ALT1                (PC0  | ALT1)
-#define PC1_ALT1                (PC1  | ALT1)
-#define PC2_ALT1                (PC2  | ALT1)
-#define PC3_ALT1                (PC3  | ALT1)
-#define PC6_ALT1                (PC6  | ALT1)
-#define PC7_ALT1                (PC7  | ALT1)
-
-#define NUM_DIGITAL_PINS        42
-#define NUM_ANALOG_INPUTS       22
-
-// On-board LED pin number
-#ifndef LED_BUILTIN
-  #define LED_BUILTIN           PNUM_NOT_DEFINED
-#endif
-
-// On-board user button
-#ifndef USER_BTN
-  #define USER_BTN              PNUM_NOT_DEFINED
-#endif
-
-// SPI definitions
-#ifndef PIN_SPI_SS
-  #define PIN_SPI_SS            PA4
-#endif
-#ifndef PIN_SPI_SS1
-  #define PIN_SPI_SS1           PA15
-#endif
-#ifndef PIN_SPI_SS2
-  #define PIN_SPI_SS2           PNUM_NOT_DEFINED
-#endif
-#ifndef PIN_SPI_SS3
-  #define PIN_SPI_SS3           PNUM_NOT_DEFINED
-#endif
-#ifndef PIN_SPI_MOSI
-  #define PIN_SPI_MOSI          PA7
-#endif
-#ifndef PIN_SPI_MISO
-  #define PIN_SPI_MISO          PA6
-#endif
-#ifndef PIN_SPI_SCK
-  #define PIN_SPI_SCK           PA5
-#endif
-
-// I2C definitions
-#ifndef PIN_WIRE_SDA
-  #define PIN_WIRE_SDA          PA8
-#endif
-#ifndef PIN_WIRE_SCL
-  #define PIN_WIRE_SCL          PA9
-#endif
-
-// Timer Definitions
-// Use TIM6/TIM7 when possible as servo and tone don't need GPIO output pin
-#ifndef TIMER_TONE
-  #define TIMER_TONE            TIM6
-#endif
-#ifndef TIMER_SERVO
-  #define TIMER_SERVO           TIM7
-#endif
-
-// UART Definitions
-#ifndef SERIAL_UART_INSTANCE
-  #define SERIAL_UART_INSTANCE  101
-#endif
-
-// Default pin used for generic 'Serial' instance
-// Mandatory for Firmata
-#ifndef PIN_SERIAL_RX
-  #define PIN_SERIAL_RX         PA3
-#endif
-#ifndef PIN_SERIAL_TX
-  #define PIN_SERIAL_TX         PA2
-#endif
-
-// Extra HAL modules
-#if !defined(HAL_DAC_MODULE_DISABLED)
-  #define HAL_DAC_MODULE_ENABLED
-#endif
-
-/*----------------------------------------------------------------------------
- *        Arduino objects - C++ only
- *----------------------------------------------------------------------------*/
-
-#ifdef __cplusplus
-  // These serial port names are intended to allow libraries and architecture-neutral
-  // sketches to automatically default to the correct port name for a particular type
-  // of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
-  // the first hardware serial port whose RX/TX pins are not dedicated to another use.
-  //
-  // SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
-  //
-  // SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
-  //
-  // SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
-  //
-  // SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
-  //
-  // SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
-  //                            pins are NOT connected to anything by default.
-  #ifndef SERIAL_PORT_MONITOR
-    #define SERIAL_PORT_MONITOR   Serial
-  #endif
-  #ifndef SERIAL_PORT_HARDWARE
-    #define SERIAL_PORT_HARDWARE  Serial
-  #endif
-#endif
diff --git a/variants/STM32H7xx/H723V(E-G)(H-T)_H733VG(H-T)/PeripheralPins.c b/variants/STM32H7xx/H723V(E-G)(H-T)_H730VB(H-T)_H733VG(H-T)/PeripheralPins.c
similarity index 99%
rename from variants/STM32H7xx/H723V(E-G)(H-T)_H733VG(H-T)/PeripheralPins.c
rename to variants/STM32H7xx/H723V(E-G)(H-T)_H730VB(H-T)_H733VG(H-T)/PeripheralPins.c
index d5c739c07a..5753da2707 100644
--- a/variants/STM32H7xx/H723V(E-G)(H-T)_H733VG(H-T)/PeripheralPins.c
+++ b/variants/STM32H7xx/H723V(E-G)(H-T)_H730VB(H-T)_H733VG(H-T)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,8 +13,9 @@
 /*
  * Automatically generated from STM32H723VEHx.xml, STM32H723VETx.xml
  * STM32H723VGHx.xml, STM32H723VGTx.xml
+ * STM32H730VBHx.xml, STM32H730VBTx.xml
  * STM32H733VGHx.xml, STM32H733VGTx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32H7xx/H723V(E-G)(H-T)_H733VG(H-T)/PinNamesVar.h b/variants/STM32H7xx/H723V(E-G)(H-T)_H730VB(H-T)_H733VG(H-T)/PinNamesVar.h
similarity index 100%
rename from variants/STM32H7xx/H723V(E-G)(H-T)_H733VG(H-T)/PinNamesVar.h
rename to variants/STM32H7xx/H723V(E-G)(H-T)_H730VB(H-T)_H733VG(H-T)/PinNamesVar.h
diff --git a/variants/STM32H7xx/H723V(E-G)(H-T)_H733VG(H-T)/boards_entry.txt b/variants/STM32H7xx/H723V(E-G)(H-T)_H730VB(H-T)_H733VG(H-T)/boards_entry.txt
similarity index 70%
rename from variants/STM32H7xx/H723V(E-G)(H-T)_H733VG(H-T)/boards_entry.txt
rename to variants/STM32H7xx/H723V(E-G)(H-T)_H730VB(H-T)_H733VG(H-T)/boards_entry.txt
index 464f3c4ff1..41c332a76e 100644
--- a/variants/STM32H7xx/H723V(E-G)(H-T)_H733VG(H-T)/boards_entry.txt
+++ b/variants/STM32H7xx/H723V(E-G)(H-T)_H730VB(H-T)_H733VG(H-T)/boards_entry.txt
@@ -9,7 +9,7 @@ GenH7.menu.pnum.GENERIC_H723VEHX.upload.maximum_size=524288
 GenH7.menu.pnum.GENERIC_H723VEHX.upload.maximum_data_size=1048576
 GenH7.menu.pnum.GENERIC_H723VEHX.build.board=GENERIC_H723VEHX
 GenH7.menu.pnum.GENERIC_H723VEHX.build.product_line=STM32H723xx
-GenH7.menu.pnum.GENERIC_H723VEHX.build.variant=STM32H7xx/H723V(E-G)(H-T)_H733VG(H-T)
+GenH7.menu.pnum.GENERIC_H723VEHX.build.variant=STM32H7xx/H723V(E-G)(H-T)_H730VB(H-T)_H733VG(H-T)
 
 # Generic H723VETx
 GenH7.menu.pnum.GENERIC_H723VETX=Generic H723VETx
@@ -17,7 +17,7 @@ GenH7.menu.pnum.GENERIC_H723VETX.upload.maximum_size=524288
 GenH7.menu.pnum.GENERIC_H723VETX.upload.maximum_data_size=1048576
 GenH7.menu.pnum.GENERIC_H723VETX.build.board=GENERIC_H723VETX
 GenH7.menu.pnum.GENERIC_H723VETX.build.product_line=STM32H723xx
-GenH7.menu.pnum.GENERIC_H723VETX.build.variant=STM32H7xx/H723V(E-G)(H-T)_H733VG(H-T)
+GenH7.menu.pnum.GENERIC_H723VETX.build.variant=STM32H7xx/H723V(E-G)(H-T)_H730VB(H-T)_H733VG(H-T)
 
 # Generic H723VGHx
 GenH7.menu.pnum.GENERIC_H723VGHX=Generic H723VGHx
@@ -25,7 +25,7 @@ GenH7.menu.pnum.GENERIC_H723VGHX.upload.maximum_size=1048576
 GenH7.menu.pnum.GENERIC_H723VGHX.upload.maximum_data_size=1048576
 GenH7.menu.pnum.GENERIC_H723VGHX.build.board=GENERIC_H723VGHX
 GenH7.menu.pnum.GENERIC_H723VGHX.build.product_line=STM32H723xx
-GenH7.menu.pnum.GENERIC_H723VGHX.build.variant=STM32H7xx/H723V(E-G)(H-T)_H733VG(H-T)
+GenH7.menu.pnum.GENERIC_H723VGHX.build.variant=STM32H7xx/H723V(E-G)(H-T)_H730VB(H-T)_H733VG(H-T)
 
 # Generic H723VGTx
 GenH7.menu.pnum.GENERIC_H723VGTX=Generic H723VGTx
@@ -33,7 +33,23 @@ GenH7.menu.pnum.GENERIC_H723VGTX.upload.maximum_size=1048576
 GenH7.menu.pnum.GENERIC_H723VGTX.upload.maximum_data_size=1048576
 GenH7.menu.pnum.GENERIC_H723VGTX.build.board=GENERIC_H723VGTX
 GenH7.menu.pnum.GENERIC_H723VGTX.build.product_line=STM32H723xx
-GenH7.menu.pnum.GENERIC_H723VGTX.build.variant=STM32H7xx/H723V(E-G)(H-T)_H733VG(H-T)
+GenH7.menu.pnum.GENERIC_H723VGTX.build.variant=STM32H7xx/H723V(E-G)(H-T)_H730VB(H-T)_H733VG(H-T)
+
+# Generic H730VBHx
+GenH7.menu.pnum.GENERIC_H730VBHX=Generic H730VBHx
+GenH7.menu.pnum.GENERIC_H730VBHX.upload.maximum_size=131072
+GenH7.menu.pnum.GENERIC_H730VBHX.upload.maximum_data_size=1048576
+GenH7.menu.pnum.GENERIC_H730VBHX.build.board=GENERIC_H730VBHX
+GenH7.menu.pnum.GENERIC_H730VBHX.build.product_line=STM32H730xx
+GenH7.menu.pnum.GENERIC_H730VBHX.build.variant=STM32H7xx/H723V(E-G)(H-T)_H730VB(H-T)_H733VG(H-T)
+
+# Generic H730VBTx
+GenH7.menu.pnum.GENERIC_H730VBTX=Generic H730VBTx
+GenH7.menu.pnum.GENERIC_H730VBTX.upload.maximum_size=131072
+GenH7.menu.pnum.GENERIC_H730VBTX.upload.maximum_data_size=1048576
+GenH7.menu.pnum.GENERIC_H730VBTX.build.board=GENERIC_H730VBTX
+GenH7.menu.pnum.GENERIC_H730VBTX.build.product_line=STM32H730xx
+GenH7.menu.pnum.GENERIC_H730VBTX.build.variant=STM32H7xx/H723V(E-G)(H-T)_H730VB(H-T)_H733VG(H-T)
 
 # Generic H733VGHx
 GenH7.menu.pnum.GENERIC_H733VGHX=Generic H733VGHx
@@ -41,7 +57,7 @@ GenH7.menu.pnum.GENERIC_H733VGHX.upload.maximum_size=1048576
 GenH7.menu.pnum.GENERIC_H733VGHX.upload.maximum_data_size=1048576
 GenH7.menu.pnum.GENERIC_H733VGHX.build.board=GENERIC_H733VGHX
 GenH7.menu.pnum.GENERIC_H733VGHX.build.product_line=STM32H733xx
-GenH7.menu.pnum.GENERIC_H733VGHX.build.variant=STM32H7xx/H723V(E-G)(H-T)_H733VG(H-T)
+GenH7.menu.pnum.GENERIC_H733VGHX.build.variant=STM32H7xx/H723V(E-G)(H-T)_H730VB(H-T)_H733VG(H-T)
 
 # Generic H733VGTx
 GenH7.menu.pnum.GENERIC_H733VGTX=Generic H733VGTx
@@ -49,5 +65,5 @@ GenH7.menu.pnum.GENERIC_H733VGTX.upload.maximum_size=1048576
 GenH7.menu.pnum.GENERIC_H733VGTX.upload.maximum_data_size=1048576
 GenH7.menu.pnum.GENERIC_H733VGTX.build.board=GENERIC_H733VGTX
 GenH7.menu.pnum.GENERIC_H733VGTX.build.product_line=STM32H733xx
-GenH7.menu.pnum.GENERIC_H733VGTX.build.variant=STM32H7xx/H723V(E-G)(H-T)_H733VG(H-T)
+GenH7.menu.pnum.GENERIC_H733VGTX.build.variant=STM32H7xx/H723V(E-G)(H-T)_H730VB(H-T)_H733VG(H-T)
 
diff --git a/variants/STM32H7xx/H723V(E-G)(H-T)_H733VG(H-T)/generic_clock.c b/variants/STM32H7xx/H723V(E-G)(H-T)_H730VB(H-T)_H733VG(H-T)/generic_clock.c
similarity index 89%
rename from variants/STM32H7xx/H723V(E-G)(H-T)_H733VG(H-T)/generic_clock.c
rename to variants/STM32H7xx/H723V(E-G)(H-T)_H730VB(H-T)_H733VG(H-T)/generic_clock.c
index 1a21c75163..2230f31690 100644
--- a/variants/STM32H7xx/H723V(E-G)(H-T)_H733VG(H-T)/generic_clock.c
+++ b/variants/STM32H7xx/H723V(E-G)(H-T)_H730VB(H-T)_H733VG(H-T)/generic_clock.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,6 +12,7 @@
  */
 #if defined(ARDUINO_GENERIC_H723VEHX) || defined(ARDUINO_GENERIC_H723VETX) ||\
     defined(ARDUINO_GENERIC_H723VGHX) || defined(ARDUINO_GENERIC_H723VGTX) ||\
+    defined(ARDUINO_GENERIC_H730VBHX) || defined(ARDUINO_GENERIC_H730VBTX) ||\
     defined(ARDUINO_GENERIC_H733VGHX) || defined(ARDUINO_GENERIC_H733VGTX)
 #include "pins_arduino.h"
 
diff --git a/variants/STM32H7xx/H723V(E-G)(H-T)_H733VG(H-T)/variant_generic.cpp b/variants/STM32H7xx/H723V(E-G)(H-T)_H730VB(H-T)_H733VG(H-T)/variant_generic.cpp
similarity index 95%
rename from variants/STM32H7xx/H723V(E-G)(H-T)_H733VG(H-T)/variant_generic.cpp
rename to variants/STM32H7xx/H723V(E-G)(H-T)_H730VB(H-T)_H733VG(H-T)/variant_generic.cpp
index ea357f0835..95c5d47011 100644
--- a/variants/STM32H7xx/H723V(E-G)(H-T)_H733VG(H-T)/variant_generic.cpp
+++ b/variants/STM32H7xx/H723V(E-G)(H-T)_H730VB(H-T)_H733VG(H-T)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,6 +12,7 @@
  */
 #if defined(ARDUINO_GENERIC_H723VEHX) || defined(ARDUINO_GENERIC_H723VETX) ||\
     defined(ARDUINO_GENERIC_H723VGHX) || defined(ARDUINO_GENERIC_H723VGTX) ||\
+    defined(ARDUINO_GENERIC_H730VBHX) || defined(ARDUINO_GENERIC_H730VBTX) ||\
     defined(ARDUINO_GENERIC_H733VGHX) || defined(ARDUINO_GENERIC_H733VGTX)
 #include "pins_arduino.h"
 
diff --git a/variants/STM32H7xx/H723V(E-G)(H-T)_H733VG(H-T)/variant_generic.h b/variants/STM32H7xx/H723V(E-G)(H-T)_H730VB(H-T)_H733VG(H-T)/variant_generic.h
similarity index 99%
rename from variants/STM32H7xx/H723V(E-G)(H-T)_H733VG(H-T)/variant_generic.h
rename to variants/STM32H7xx/H723V(E-G)(H-T)_H730VB(H-T)_H733VG(H-T)/variant_generic.h
index 04b68247d7..e3dafff867 100644
--- a/variants/STM32H7xx/H723V(E-G)(H-T)_H733VG(H-T)/variant_generic.h
+++ b/variants/STM32H7xx/H723V(E-G)(H-T)_H730VB(H-T)_H733VG(H-T)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H723Z(E-G)I_H730ZBI_H733ZGI/PeripheralPins.c b/variants/STM32H7xx/H723Z(E-G)I_H730ZBI_H733ZGI/PeripheralPins.c
index 50490937fe..3ff7d8b988 100644
--- a/variants/STM32H7xx/H723Z(E-G)I_H730ZBI_H733ZGI/PeripheralPins.c
+++ b/variants/STM32H7xx/H723Z(E-G)I_H730ZBI_H733ZGI/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32H723ZEIx.xml, STM32H723ZGIx.xml
  * STM32H730ZBIx.xml, STM32H733ZGIx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32H7xx/H723Z(E-G)I_H730ZBI_H733ZGI/variant_generic.cpp b/variants/STM32H7xx/H723Z(E-G)I_H730ZBI_H733ZGI/variant_generic.cpp
index 78a6470113..a83cf70e2e 100644
--- a/variants/STM32H7xx/H723Z(E-G)I_H730ZBI_H733ZGI/variant_generic.cpp
+++ b/variants/STM32H7xx/H723Z(E-G)I_H730ZBI_H733ZGI/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H723Z(E-G)I_H730ZBI_H733ZGI/variant_generic.h b/variants/STM32H7xx/H723Z(E-G)I_H730ZBI_H733ZGI/variant_generic.h
index a3edda7594..8afaa67730 100644
--- a/variants/STM32H7xx/H723Z(E-G)I_H730ZBI_H733ZGI/variant_generic.h
+++ b/variants/STM32H7xx/H723Z(E-G)I_H730ZBI_H733ZGI/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H723Z(E-G)T_H733ZGT/PeripheralPins.c b/variants/STM32H7xx/H723Z(E-G)T_H730ZBT_H733ZGT/PeripheralPins.c
similarity index 99%
rename from variants/STM32H7xx/H723Z(E-G)T_H733ZGT/PeripheralPins.c
rename to variants/STM32H7xx/H723Z(E-G)T_H730ZBT_H733ZGT/PeripheralPins.c
index 70048173e7..54ef155dfc 100644
--- a/variants/STM32H7xx/H723Z(E-G)T_H733ZGT/PeripheralPins.c
+++ b/variants/STM32H7xx/H723Z(E-G)T_H730ZBT_H733ZGT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,8 +12,8 @@
  */
 /*
  * Automatically generated from STM32H723ZETx.xml, STM32H723ZGTx.xml
- * STM32H733ZGTx.xml
- * CubeMX DB release 6.0.30
+ * STM32H730ZBTx.xml, STM32H733ZGTx.xml
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32H7xx/H723Z(E-G)T_H733ZGT/PinNamesVar.h b/variants/STM32H7xx/H723Z(E-G)T_H730ZBT_H733ZGT/PinNamesVar.h
similarity index 100%
rename from variants/STM32H7xx/H723Z(E-G)T_H733ZGT/PinNamesVar.h
rename to variants/STM32H7xx/H723Z(E-G)T_H730ZBT_H733ZGT/PinNamesVar.h
diff --git a/variants/STM32H7xx/H723Z(E-G)T_H733ZGT/boards_entry.txt b/variants/STM32H7xx/H723Z(E-G)T_H730ZBT_H733ZGT/boards_entry.txt
similarity index 74%
rename from variants/STM32H7xx/H723Z(E-G)T_H733ZGT/boards_entry.txt
rename to variants/STM32H7xx/H723Z(E-G)T_H730ZBT_H733ZGT/boards_entry.txt
index 774807a1b5..dc49f8eb9b 100644
--- a/variants/STM32H7xx/H723Z(E-G)T_H733ZGT/boards_entry.txt
+++ b/variants/STM32H7xx/H723Z(E-G)T_H730ZBT_H733ZGT/boards_entry.txt
@@ -9,7 +9,7 @@ GenH7.menu.pnum.GENERIC_H723ZETX.upload.maximum_size=524288
 GenH7.menu.pnum.GENERIC_H723ZETX.upload.maximum_data_size=1048576
 GenH7.menu.pnum.GENERIC_H723ZETX.build.board=GENERIC_H723ZETX
 GenH7.menu.pnum.GENERIC_H723ZETX.build.product_line=STM32H723xx
-GenH7.menu.pnum.GENERIC_H723ZETX.build.variant=STM32H7xx/H723Z(E-G)T_H733ZGT
+GenH7.menu.pnum.GENERIC_H723ZETX.build.variant=STM32H7xx/H723Z(E-G)T_H730ZBT_H733ZGT
 
 # Generic H723ZGTx
 GenH7.menu.pnum.GENERIC_H723ZGTX=Generic H723ZGTx
@@ -17,7 +17,15 @@ GenH7.menu.pnum.GENERIC_H723ZGTX.upload.maximum_size=1048576
 GenH7.menu.pnum.GENERIC_H723ZGTX.upload.maximum_data_size=1048576
 GenH7.menu.pnum.GENERIC_H723ZGTX.build.board=GENERIC_H723ZGTX
 GenH7.menu.pnum.GENERIC_H723ZGTX.build.product_line=STM32H723xx
-GenH7.menu.pnum.GENERIC_H723ZGTX.build.variant=STM32H7xx/H723Z(E-G)T_H733ZGT
+GenH7.menu.pnum.GENERIC_H723ZGTX.build.variant=STM32H7xx/H723Z(E-G)T_H730ZBT_H733ZGT
+
+# Generic H730ZBTx
+GenH7.menu.pnum.GENERIC_H730ZBTX=Generic H730ZBTx
+GenH7.menu.pnum.GENERIC_H730ZBTX.upload.maximum_size=131072
+GenH7.menu.pnum.GENERIC_H730ZBTX.upload.maximum_data_size=1048576
+GenH7.menu.pnum.GENERIC_H730ZBTX.build.board=GENERIC_H730ZBTX
+GenH7.menu.pnum.GENERIC_H730ZBTX.build.product_line=STM32H730xx
+GenH7.menu.pnum.GENERIC_H730ZBTX.build.variant=STM32H7xx/H723Z(E-G)T_H730ZBT_H733ZGT
 
 # Generic H733ZGTx
 GenH7.menu.pnum.GENERIC_H733ZGTX=Generic H733ZGTx
@@ -25,5 +33,5 @@ GenH7.menu.pnum.GENERIC_H733ZGTX.upload.maximum_size=1048576
 GenH7.menu.pnum.GENERIC_H733ZGTX.upload.maximum_data_size=1048576
 GenH7.menu.pnum.GENERIC_H733ZGTX.build.board=GENERIC_H733ZGTX
 GenH7.menu.pnum.GENERIC_H733ZGTX.build.product_line=STM32H733xx
-GenH7.menu.pnum.GENERIC_H733ZGTX.build.variant=STM32H7xx/H723Z(E-G)T_H733ZGT
+GenH7.menu.pnum.GENERIC_H733ZGTX.build.variant=STM32H7xx/H723Z(E-G)T_H730ZBT_H733ZGT
 
diff --git a/variants/STM32H7xx/H723Z(E-G)T_H733ZGT/generic_clock.c b/variants/STM32H7xx/H723Z(E-G)T_H730ZBT_H733ZGT/generic_clock.c
similarity index 87%
rename from variants/STM32H7xx/H723Z(E-G)T_H733ZGT/generic_clock.c
rename to variants/STM32H7xx/H723Z(E-G)T_H730ZBT_H733ZGT/generic_clock.c
index 39d6558be4..42baa9c31a 100644
--- a/variants/STM32H7xx/H723Z(E-G)T_H733ZGT/generic_clock.c
+++ b/variants/STM32H7xx/H723Z(E-G)T_H730ZBT_H733ZGT/generic_clock.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -11,7 +11,7 @@
  *******************************************************************************
  */
 #if defined(ARDUINO_GENERIC_H723ZETX) || defined(ARDUINO_GENERIC_H723ZGTX) ||\
-    defined(ARDUINO_GENERIC_H733ZGTX)
+    defined(ARDUINO_GENERIC_H730ZBTX) || defined(ARDUINO_GENERIC_H733ZGTX)
 #include "pins_arduino.h"
 
 /**
diff --git a/variants/STM32H7xx/H723Z(E-G)T_H733ZGT/variant_generic.cpp b/variants/STM32H7xx/H723Z(E-G)T_H730ZBT_H733ZGT/variant_generic.cpp
similarity index 96%
rename from variants/STM32H7xx/H723Z(E-G)T_H733ZGT/variant_generic.cpp
rename to variants/STM32H7xx/H723Z(E-G)T_H730ZBT_H733ZGT/variant_generic.cpp
index 7c27ce0665..e0bb447c29 100644
--- a/variants/STM32H7xx/H723Z(E-G)T_H733ZGT/variant_generic.cpp
+++ b/variants/STM32H7xx/H723Z(E-G)T_H730ZBT_H733ZGT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -11,7 +11,7 @@
  *******************************************************************************
  */
 #if defined(ARDUINO_GENERIC_H723ZETX) || defined(ARDUINO_GENERIC_H723ZGTX) ||\
-    defined(ARDUINO_GENERIC_H733ZGTX)
+    defined(ARDUINO_GENERIC_H730ZBTX) || defined(ARDUINO_GENERIC_H733ZGTX)
 #include "pins_arduino.h"
 
 // Digital PinName array
diff --git a/variants/STM32H7xx/H723Z(E-G)T_H733ZGT/variant_generic.h b/variants/STM32H7xx/H723Z(E-G)T_H730ZBT_H733ZGT/variant_generic.h
similarity index 99%
rename from variants/STM32H7xx/H723Z(E-G)T_H733ZGT/variant_generic.h
rename to variants/STM32H7xx/H723Z(E-G)T_H730ZBT_H733ZGT/variant_generic.h
index d443f5c1fd..ff6d37f09f 100644
--- a/variants/STM32H7xx/H723Z(E-G)T_H733ZGT/variant_generic.h
+++ b/variants/STM32H7xx/H723Z(E-G)T_H730ZBT_H733ZGT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H725A(E-G)I_H735AGI/PeripheralPins.c b/variants/STM32H7xx/H725A(E-G)I_H730ABIxQ_H735AGI/PeripheralPins.c
similarity index 98%
rename from variants/STM32H7xx/H725A(E-G)I_H735AGI/PeripheralPins.c
rename to variants/STM32H7xx/H725A(E-G)I_H730ABIxQ_H735AGI/PeripheralPins.c
index 0b5fa77e12..c087c09ef1 100644
--- a/variants/STM32H7xx/H725A(E-G)I_H735AGI/PeripheralPins.c
+++ b/variants/STM32H7xx/H725A(E-G)I_H730ABIxQ_H735AGI/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,8 +12,8 @@
  */
 /*
  * Automatically generated from STM32H725AEIx.xml, STM32H725AGIx.xml
- * STM32H735AGIx.xml
- * CubeMX DB release 6.0.30
+ * STM32H730ABIxQ.xml, STM32H735AGIx.xml
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
@@ -281,9 +281,11 @@ WEAK const PinMap PinMap_UART_TX[] = {
   {PD_8,       USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
   {PD_15,      UART9,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART9)},
   {PE_1,       UART8,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART8)},
+  {PE_3,       USART10, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_USART10)},
   {PE_8,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
   {PF_7,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
   {PG_1,       UART9,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART9)},
+  {PG_12,      USART10, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART10)},
   {PG_14,      USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
   {PH_13,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
   {NC,         NP,      0}
@@ -316,10 +318,12 @@ WEAK const PinMap PinMap_UART_RX[] = {
   {PD_9,       USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
   {PD_14,      UART9,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART9)},
   {PE_0,       UART8,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART8)},
+  {PE_2,       USART10, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART10)},
   {PE_7,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
   {PF_6,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
   {PG_0,       UART9,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART9)},
   {PG_9,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {PG_11,      USART10, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART10)},
   {PH_14,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
   {NC,         NP,      0}
 };
@@ -343,6 +347,7 @@ WEAK const PinMap PinMap_UART_RTS[] = {
   {PF_8,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
   {PG_8,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
   {PG_12,      USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {PG_14,      USART10, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART10)},
   {NC,         NP,      0}
 };
 #endif
@@ -363,7 +368,8 @@ WEAK const PinMap PinMap_UART_CTS[] = {
   {PD_14,      UART8,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART8)},
   {PE_10,      UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
   {PF_9,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
-  {PG_13,      USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {PG_13,      USART10, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART10)},
+  {PG_13_ALT1, USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
   {PG_15,      USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
   {NC,         NP,      0}
 };
diff --git a/variants/STM32H7xx/H725A(E-G)I_H735AGI/PinNamesVar.h b/variants/STM32H7xx/H725A(E-G)I_H730ABIxQ_H735AGI/PinNamesVar.h
similarity index 99%
rename from variants/STM32H7xx/H725A(E-G)I_H735AGI/PinNamesVar.h
rename to variants/STM32H7xx/H725A(E-G)I_H730ABIxQ_H735AGI/PinNamesVar.h
index 3781658ed7..5d964991c1 100644
--- a/variants/STM32H7xx/H725A(E-G)I_H735AGI/PinNamesVar.h
+++ b/variants/STM32H7xx/H725A(E-G)I_H730ABIxQ_H735AGI/PinNamesVar.h
@@ -75,6 +75,7 @@ PF_8_ALT1   = PF_8   | ALT1,
 PF_8_ALT2   = PF_8   | ALT2,
 PF_9_ALT1   = PF_9   | ALT1,
 PF_9_ALT2   = PF_9   | ALT2,
+PG_13_ALT1  = PG_13  | ALT1,
 
 /* SYS_WKUP */
 #ifdef PWR_WAKEUP_PIN1
diff --git a/variants/STM32H7xx/H725A(E-G)I_H735AGI/boards_entry.txt b/variants/STM32H7xx/H725A(E-G)I_H730ABIxQ_H735AGI/boards_entry.txt
similarity index 73%
rename from variants/STM32H7xx/H725A(E-G)I_H735AGI/boards_entry.txt
rename to variants/STM32H7xx/H725A(E-G)I_H730ABIxQ_H735AGI/boards_entry.txt
index 45223321ea..81bbc439af 100644
--- a/variants/STM32H7xx/H725A(E-G)I_H735AGI/boards_entry.txt
+++ b/variants/STM32H7xx/H725A(E-G)I_H730ABIxQ_H735AGI/boards_entry.txt
@@ -9,7 +9,7 @@ GenH7.menu.pnum.GENERIC_H725AEIX.upload.maximum_size=524288
 GenH7.menu.pnum.GENERIC_H725AEIX.upload.maximum_data_size=1048576
 GenH7.menu.pnum.GENERIC_H725AEIX.build.board=GENERIC_H725AEIX
 GenH7.menu.pnum.GENERIC_H725AEIX.build.product_line=STM32H725xx
-GenH7.menu.pnum.GENERIC_H725AEIX.build.variant=STM32H7xx/H725A(E-G)I_H735AGI
+GenH7.menu.pnum.GENERIC_H725AEIX.build.variant=STM32H7xx/H725A(E-G)I_H730ABIxQ_H735AGI
 
 # Generic H725AGIx
 GenH7.menu.pnum.GENERIC_H725AGIX=Generic H725AGIx
@@ -17,7 +17,15 @@ GenH7.menu.pnum.GENERIC_H725AGIX.upload.maximum_size=1048576
 GenH7.menu.pnum.GENERIC_H725AGIX.upload.maximum_data_size=1048576
 GenH7.menu.pnum.GENERIC_H725AGIX.build.board=GENERIC_H725AGIX
 GenH7.menu.pnum.GENERIC_H725AGIX.build.product_line=STM32H725xx
-GenH7.menu.pnum.GENERIC_H725AGIX.build.variant=STM32H7xx/H725A(E-G)I_H735AGI
+GenH7.menu.pnum.GENERIC_H725AGIX.build.variant=STM32H7xx/H725A(E-G)I_H730ABIxQ_H735AGI
+
+# Generic H730ABIxQ
+GenH7.menu.pnum.GENERIC_H730ABIXQ=Generic H730ABIxQ
+GenH7.menu.pnum.GENERIC_H730ABIXQ.upload.maximum_size=131072
+GenH7.menu.pnum.GENERIC_H730ABIXQ.upload.maximum_data_size=1048576
+GenH7.menu.pnum.GENERIC_H730ABIXQ.build.board=GENERIC_H730ABIXQ
+GenH7.menu.pnum.GENERIC_H730ABIXQ.build.product_line=STM32H730xx
+GenH7.menu.pnum.GENERIC_H730ABIXQ.build.variant=STM32H7xx/H725A(E-G)I_H730ABIxQ_H735AGI
 
 # Generic H735AGIx
 GenH7.menu.pnum.GENERIC_H735AGIX=Generic H735AGIx
@@ -25,5 +33,5 @@ GenH7.menu.pnum.GENERIC_H735AGIX.upload.maximum_size=1048576
 GenH7.menu.pnum.GENERIC_H735AGIX.upload.maximum_data_size=1048576
 GenH7.menu.pnum.GENERIC_H735AGIX.build.board=GENERIC_H735AGIX
 GenH7.menu.pnum.GENERIC_H735AGIX.build.product_line=STM32H735xx
-GenH7.menu.pnum.GENERIC_H735AGIX.build.variant=STM32H7xx/H725A(E-G)I_H735AGI
+GenH7.menu.pnum.GENERIC_H735AGIX.build.variant=STM32H7xx/H725A(E-G)I_H730ABIxQ_H735AGI
 
diff --git a/variants/STM32H7xx/H725A(E-G)I_H735AGI/generic_clock.c b/variants/STM32H7xx/H725A(E-G)I_H730ABIxQ_H735AGI/generic_clock.c
similarity index 87%
rename from variants/STM32H7xx/H725A(E-G)I_H735AGI/generic_clock.c
rename to variants/STM32H7xx/H725A(E-G)I_H730ABIxQ_H735AGI/generic_clock.c
index cf687b6f36..c7631f1793 100644
--- a/variants/STM32H7xx/H725A(E-G)I_H735AGI/generic_clock.c
+++ b/variants/STM32H7xx/H725A(E-G)I_H730ABIxQ_H735AGI/generic_clock.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -11,7 +11,7 @@
  *******************************************************************************
  */
 #if defined(ARDUINO_GENERIC_H725AEIX) || defined(ARDUINO_GENERIC_H725AGIX) ||\
-    defined(ARDUINO_GENERIC_H735AGIX)
+    defined(ARDUINO_GENERIC_H730ABIXQ) || defined(ARDUINO_GENERIC_H735AGIX)
 #include "pins_arduino.h"
 
 /**
diff --git a/variants/STM32H7xx/H725A(E-G)I_H735AGI/variant_generic.cpp b/variants/STM32H7xx/H725A(E-G)I_H730ABIxQ_H735AGI/variant_generic.cpp
similarity index 96%
rename from variants/STM32H7xx/H725A(E-G)I_H735AGI/variant_generic.cpp
rename to variants/STM32H7xx/H725A(E-G)I_H730ABIxQ_H735AGI/variant_generic.cpp
index 7a159388b4..9adc155410 100644
--- a/variants/STM32H7xx/H725A(E-G)I_H735AGI/variant_generic.cpp
+++ b/variants/STM32H7xx/H725A(E-G)I_H730ABIxQ_H735AGI/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -11,7 +11,7 @@
  *******************************************************************************
  */
 #if defined(ARDUINO_GENERIC_H725AEIX) || defined(ARDUINO_GENERIC_H725AGIX) ||\
-    defined(ARDUINO_GENERIC_H735AGIX)
+    defined(ARDUINO_GENERIC_H730ABIXQ) || defined(ARDUINO_GENERIC_H735AGIX)
 #include "pins_arduino.h"
 
 // Digital PinName array
diff --git a/variants/STM32H7xx/H725A(E-G)I_H735AGI/variant_generic.h b/variants/STM32H7xx/H725A(E-G)I_H730ABIxQ_H735AGI/variant_generic.h
similarity index 99%
rename from variants/STM32H7xx/H725A(E-G)I_H735AGI/variant_generic.h
rename to variants/STM32H7xx/H725A(E-G)I_H730ABIxQ_H735AGI/variant_generic.h
index 1b56266ce1..870150159e 100644
--- a/variants/STM32H7xx/H725A(E-G)I_H735AGI/variant_generic.h
+++ b/variants/STM32H7xx/H725A(E-G)I_H730ABIxQ_H735AGI/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -212,6 +212,7 @@
 #define PF8_ALT2                (PF8   | ALT2)
 #define PF9_ALT1                (PF9   | ALT1)
 #define PF9_ALT2                (PF9   | ALT2)
+#define PG13_ALT1               (PG13  | ALT1)
 
 #define NUM_DIGITAL_PINS        125
 #define NUM_DUALPAD_PINS        4
diff --git a/variants/STM32H7xx/H725I(E-G)K_H735IGK/PeripheralPins.c b/variants/STM32H7xx/H725I(E-G)K_H730IBKxQ_H735IGK/PeripheralPins.c
similarity index 99%
rename from variants/STM32H7xx/H725I(E-G)K_H735IGK/PeripheralPins.c
rename to variants/STM32H7xx/H725I(E-G)K_H730IBKxQ_H735IGK/PeripheralPins.c
index eaf4fe110b..1b6f163c2f 100644
--- a/variants/STM32H7xx/H725I(E-G)K_H735IGK/PeripheralPins.c
+++ b/variants/STM32H7xx/H725I(E-G)K_H730IBKxQ_H735IGK/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,8 +12,8 @@
  */
 /*
  * Automatically generated from STM32H725IEKx.xml, STM32H725IGKx.xml
- * STM32H735IGKx.xml
- * CubeMX DB release 6.0.30
+ * STM32H730IBKxQ.xml, STM32H735IGKx.xml
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32H7xx/H725I(E-G)K_H735IGK/PinNamesVar.h b/variants/STM32H7xx/H725I(E-G)K_H730IBKxQ_H735IGK/PinNamesVar.h
similarity index 100%
rename from variants/STM32H7xx/H725I(E-G)K_H735IGK/PinNamesVar.h
rename to variants/STM32H7xx/H725I(E-G)K_H730IBKxQ_H735IGK/PinNamesVar.h
diff --git a/variants/STM32H7xx/H725I(E-G)K_H735IGK/boards_entry.txt b/variants/STM32H7xx/H725I(E-G)K_H730IBKxQ_H735IGK/boards_entry.txt
similarity index 73%
rename from variants/STM32H7xx/H725I(E-G)K_H735IGK/boards_entry.txt
rename to variants/STM32H7xx/H725I(E-G)K_H730IBKxQ_H735IGK/boards_entry.txt
index a7b53640ef..8b97129051 100644
--- a/variants/STM32H7xx/H725I(E-G)K_H735IGK/boards_entry.txt
+++ b/variants/STM32H7xx/H725I(E-G)K_H730IBKxQ_H735IGK/boards_entry.txt
@@ -9,7 +9,7 @@ GenH7.menu.pnum.GENERIC_H725IEKX.upload.maximum_size=524288
 GenH7.menu.pnum.GENERIC_H725IEKX.upload.maximum_data_size=1048576
 GenH7.menu.pnum.GENERIC_H725IEKX.build.board=GENERIC_H725IEKX
 GenH7.menu.pnum.GENERIC_H725IEKX.build.product_line=STM32H725xx
-GenH7.menu.pnum.GENERIC_H725IEKX.build.variant=STM32H7xx/H725I(E-G)K_H735IGK
+GenH7.menu.pnum.GENERIC_H725IEKX.build.variant=STM32H7xx/H725I(E-G)K_H730IBKxQ_H735IGK
 
 # Generic H725IGKx
 GenH7.menu.pnum.GENERIC_H725IGKX=Generic H725IGKx
@@ -17,7 +17,15 @@ GenH7.menu.pnum.GENERIC_H725IGKX.upload.maximum_size=1048576
 GenH7.menu.pnum.GENERIC_H725IGKX.upload.maximum_data_size=1048576
 GenH7.menu.pnum.GENERIC_H725IGKX.build.board=GENERIC_H725IGKX
 GenH7.menu.pnum.GENERIC_H725IGKX.build.product_line=STM32H725xx
-GenH7.menu.pnum.GENERIC_H725IGKX.build.variant=STM32H7xx/H725I(E-G)K_H735IGK
+GenH7.menu.pnum.GENERIC_H725IGKX.build.variant=STM32H7xx/H725I(E-G)K_H730IBKxQ_H735IGK
+
+# Generic H730IBKxQ
+GenH7.menu.pnum.GENERIC_H730IBKXQ=Generic H730IBKxQ
+GenH7.menu.pnum.GENERIC_H730IBKXQ.upload.maximum_size=131072
+GenH7.menu.pnum.GENERIC_H730IBKXQ.upload.maximum_data_size=1048576
+GenH7.menu.pnum.GENERIC_H730IBKXQ.build.board=GENERIC_H730IBKXQ
+GenH7.menu.pnum.GENERIC_H730IBKXQ.build.product_line=STM32H730xx
+GenH7.menu.pnum.GENERIC_H730IBKXQ.build.variant=STM32H7xx/H725I(E-G)K_H730IBKxQ_H735IGK
 
 # Generic H735IGKx
 GenH7.menu.pnum.GENERIC_H735IGKX=Generic H735IGKx
@@ -25,5 +33,5 @@ GenH7.menu.pnum.GENERIC_H735IGKX.upload.maximum_size=1048576
 GenH7.menu.pnum.GENERIC_H735IGKX.upload.maximum_data_size=1048576
 GenH7.menu.pnum.GENERIC_H735IGKX.build.board=GENERIC_H735IGKX
 GenH7.menu.pnum.GENERIC_H735IGKX.build.product_line=STM32H735xx
-GenH7.menu.pnum.GENERIC_H735IGKX.build.variant=STM32H7xx/H725I(E-G)K_H735IGK
+GenH7.menu.pnum.GENERIC_H735IGKX.build.variant=STM32H7xx/H725I(E-G)K_H730IBKxQ_H735IGK
 
diff --git a/variants/STM32H7xx/H725I(E-G)K_H735IGK/generic_clock.c b/variants/STM32H7xx/H725I(E-G)K_H730IBKxQ_H735IGK/generic_clock.c
similarity index 87%
rename from variants/STM32H7xx/H725I(E-G)K_H735IGK/generic_clock.c
rename to variants/STM32H7xx/H725I(E-G)K_H730IBKxQ_H735IGK/generic_clock.c
index b741f83248..dc4d89bb68 100644
--- a/variants/STM32H7xx/H725I(E-G)K_H735IGK/generic_clock.c
+++ b/variants/STM32H7xx/H725I(E-G)K_H730IBKxQ_H735IGK/generic_clock.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -11,7 +11,7 @@
  *******************************************************************************
  */
 #if defined(ARDUINO_GENERIC_H725IEKX) || defined(ARDUINO_GENERIC_H725IGKX) ||\
-    defined(ARDUINO_GENERIC_H735IGKX)
+    defined(ARDUINO_GENERIC_H730IBKXQ) || defined(ARDUINO_GENERIC_H735IGKX)
 #include "pins_arduino.h"
 
 /**
diff --git a/variants/STM32H7xx/H725I(E-G)K_H735IGK/variant_generic.cpp b/variants/STM32H7xx/H725I(E-G)K_H730IBKxQ_H735IGK/variant_generic.cpp
similarity index 96%
rename from variants/STM32H7xx/H725I(E-G)K_H735IGK/variant_generic.cpp
rename to variants/STM32H7xx/H725I(E-G)K_H730IBKxQ_H735IGK/variant_generic.cpp
index 01aa7bb29e..c42a7745c9 100644
--- a/variants/STM32H7xx/H725I(E-G)K_H735IGK/variant_generic.cpp
+++ b/variants/STM32H7xx/H725I(E-G)K_H730IBKxQ_H735IGK/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -11,7 +11,7 @@
  *******************************************************************************
  */
 #if defined(ARDUINO_GENERIC_H725IEKX) || defined(ARDUINO_GENERIC_H725IGKX) ||\
-    defined(ARDUINO_GENERIC_H735IGKX)
+    defined(ARDUINO_GENERIC_H730IBKXQ) || defined(ARDUINO_GENERIC_H735IGKX)
 #include "pins_arduino.h"
 
 // Digital PinName array
diff --git a/variants/STM32H7xx/H725I(E-G)K_H735IGK/variant_generic.h b/variants/STM32H7xx/H725I(E-G)K_H730IBKxQ_H735IGK/variant_generic.h
similarity index 99%
rename from variants/STM32H7xx/H725I(E-G)K_H735IGK/variant_generic.h
rename to variants/STM32H7xx/H725I(E-G)K_H730IBKxQ_H735IGK/variant_generic.h
index c9f350d579..0329121734 100644
--- a/variants/STM32H7xx/H725I(E-G)K_H735IGK/variant_generic.h
+++ b/variants/STM32H7xx/H725I(E-G)K_H730IBKxQ_H735IGK/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H725I(E-G)T_H735IGT/PeripheralPins.c b/variants/STM32H7xx/H725I(E-G)T_H730IBTxQ_H735IGT/PeripheralPins.c
similarity index 99%
rename from variants/STM32H7xx/H725I(E-G)T_H735IGT/PeripheralPins.c
rename to variants/STM32H7xx/H725I(E-G)T_H730IBTxQ_H735IGT/PeripheralPins.c
index 2d7fc07386..9e5aae5673 100644
--- a/variants/STM32H7xx/H725I(E-G)T_H735IGT/PeripheralPins.c
+++ b/variants/STM32H7xx/H725I(E-G)T_H730IBTxQ_H735IGT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,8 +12,8 @@
  */
 /*
  * Automatically generated from STM32H725IETx.xml, STM32H725IGTx.xml
- * STM32H735IGTx.xml
- * CubeMX DB release 6.0.30
+ * STM32H730IBTxQ.xml, STM32H735IGTx.xml
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32H7xx/H725I(E-G)T_H735IGT/PinNamesVar.h b/variants/STM32H7xx/H725I(E-G)T_H730IBTxQ_H735IGT/PinNamesVar.h
similarity index 100%
rename from variants/STM32H7xx/H725I(E-G)T_H735IGT/PinNamesVar.h
rename to variants/STM32H7xx/H725I(E-G)T_H730IBTxQ_H735IGT/PinNamesVar.h
diff --git a/variants/STM32H7xx/H725I(E-G)T_H735IGT/boards_entry.txt b/variants/STM32H7xx/H725I(E-G)T_H730IBTxQ_H735IGT/boards_entry.txt
similarity index 73%
rename from variants/STM32H7xx/H725I(E-G)T_H735IGT/boards_entry.txt
rename to variants/STM32H7xx/H725I(E-G)T_H730IBTxQ_H735IGT/boards_entry.txt
index 69bf8161e6..a4aef57190 100644
--- a/variants/STM32H7xx/H725I(E-G)T_H735IGT/boards_entry.txt
+++ b/variants/STM32H7xx/H725I(E-G)T_H730IBTxQ_H735IGT/boards_entry.txt
@@ -9,7 +9,7 @@ GenH7.menu.pnum.GENERIC_H725IETX.upload.maximum_size=524288
 GenH7.menu.pnum.GENERIC_H725IETX.upload.maximum_data_size=1048576
 GenH7.menu.pnum.GENERIC_H725IETX.build.board=GENERIC_H725IETX
 GenH7.menu.pnum.GENERIC_H725IETX.build.product_line=STM32H725xx
-GenH7.menu.pnum.GENERIC_H725IETX.build.variant=STM32H7xx/H725I(E-G)T_H735IGT
+GenH7.menu.pnum.GENERIC_H725IETX.build.variant=STM32H7xx/H725I(E-G)T_H730IBTxQ_H735IGT
 
 # Generic H725IGTx
 GenH7.menu.pnum.GENERIC_H725IGTX=Generic H725IGTx
@@ -17,7 +17,15 @@ GenH7.menu.pnum.GENERIC_H725IGTX.upload.maximum_size=1048576
 GenH7.menu.pnum.GENERIC_H725IGTX.upload.maximum_data_size=1048576
 GenH7.menu.pnum.GENERIC_H725IGTX.build.board=GENERIC_H725IGTX
 GenH7.menu.pnum.GENERIC_H725IGTX.build.product_line=STM32H725xx
-GenH7.menu.pnum.GENERIC_H725IGTX.build.variant=STM32H7xx/H725I(E-G)T_H735IGT
+GenH7.menu.pnum.GENERIC_H725IGTX.build.variant=STM32H7xx/H725I(E-G)T_H730IBTxQ_H735IGT
+
+# Generic H730IBTxQ
+GenH7.menu.pnum.GENERIC_H730IBTXQ=Generic H730IBTxQ
+GenH7.menu.pnum.GENERIC_H730IBTXQ.upload.maximum_size=131072
+GenH7.menu.pnum.GENERIC_H730IBTXQ.upload.maximum_data_size=1048576
+GenH7.menu.pnum.GENERIC_H730IBTXQ.build.board=GENERIC_H730IBTXQ
+GenH7.menu.pnum.GENERIC_H730IBTXQ.build.product_line=STM32H730xx
+GenH7.menu.pnum.GENERIC_H730IBTXQ.build.variant=STM32H7xx/H725I(E-G)T_H730IBTxQ_H735IGT
 
 # Generic H735IGTx
 GenH7.menu.pnum.GENERIC_H735IGTX=Generic H735IGTx
@@ -25,5 +33,5 @@ GenH7.menu.pnum.GENERIC_H735IGTX.upload.maximum_size=1048576
 GenH7.menu.pnum.GENERIC_H735IGTX.upload.maximum_data_size=1048576
 GenH7.menu.pnum.GENERIC_H735IGTX.build.board=GENERIC_H735IGTX
 GenH7.menu.pnum.GENERIC_H735IGTX.build.product_line=STM32H735xx
-GenH7.menu.pnum.GENERIC_H735IGTX.build.variant=STM32H7xx/H725I(E-G)T_H735IGT
+GenH7.menu.pnum.GENERIC_H735IGTX.build.variant=STM32H7xx/H725I(E-G)T_H730IBTxQ_H735IGT
 
diff --git a/variants/STM32H7xx/H725I(E-G)T_H735IGT/generic_clock.c b/variants/STM32H7xx/H725I(E-G)T_H730IBTxQ_H735IGT/generic_clock.c
similarity index 87%
rename from variants/STM32H7xx/H725I(E-G)T_H735IGT/generic_clock.c
rename to variants/STM32H7xx/H725I(E-G)T_H730IBTxQ_H735IGT/generic_clock.c
index 399b785eb7..014225b7a2 100644
--- a/variants/STM32H7xx/H725I(E-G)T_H735IGT/generic_clock.c
+++ b/variants/STM32H7xx/H725I(E-G)T_H730IBTxQ_H735IGT/generic_clock.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -11,7 +11,7 @@
  *******************************************************************************
  */
 #if defined(ARDUINO_GENERIC_H725IETX) || defined(ARDUINO_GENERIC_H725IGTX) ||\
-    defined(ARDUINO_GENERIC_H735IGTX)
+    defined(ARDUINO_GENERIC_H730IBTXQ) || defined(ARDUINO_GENERIC_H735IGTX)
 #include "pins_arduino.h"
 
 /**
diff --git a/variants/STM32H7xx/H725I(E-G)T_H735IGT/variant_generic.cpp b/variants/STM32H7xx/H725I(E-G)T_H730IBTxQ_H735IGT/variant_generic.cpp
similarity index 96%
rename from variants/STM32H7xx/H725I(E-G)T_H735IGT/variant_generic.cpp
rename to variants/STM32H7xx/H725I(E-G)T_H730IBTxQ_H735IGT/variant_generic.cpp
index 8da537d7b6..4d08fc3636 100644
--- a/variants/STM32H7xx/H725I(E-G)T_H735IGT/variant_generic.cpp
+++ b/variants/STM32H7xx/H725I(E-G)T_H730IBTxQ_H735IGT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -11,7 +11,7 @@
  *******************************************************************************
  */
 #if defined(ARDUINO_GENERIC_H725IETX) || defined(ARDUINO_GENERIC_H725IGTX) ||\
-    defined(ARDUINO_GENERIC_H735IGTX)
+    defined(ARDUINO_GENERIC_H730IBTXQ) || defined(ARDUINO_GENERIC_H735IGTX)
 #include "pins_arduino.h"
 
 // Digital PinName array
diff --git a/variants/STM32H7xx/H725I(E-G)T_H735IGT/variant_generic.h b/variants/STM32H7xx/H725I(E-G)T_H730IBTxQ_H735IGT/variant_generic.h
similarity index 99%
rename from variants/STM32H7xx/H725I(E-G)T_H735IGT/variant_generic.h
rename to variants/STM32H7xx/H725I(E-G)T_H730IBTxQ_H735IGT/variant_generic.h
index 411d13311b..aeb930c6cc 100644
--- a/variants/STM32H7xx/H725I(E-G)T_H735IGT/variant_generic.h
+++ b/variants/STM32H7xx/H725I(E-G)T_H730IBTxQ_H735IGT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H725R(E-G)V_H735RGV/PeripheralPins.c b/variants/STM32H7xx/H725R(E-G)V_H735RGV/PeripheralPins.c
index 78ed2e96b6..1b4d1cf2c7 100644
--- a/variants/STM32H7xx/H725R(E-G)V_H735RGV/PeripheralPins.c
+++ b/variants/STM32H7xx/H725R(E-G)V_H735RGV/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32H725REVx.xml, STM32H725RGVx.xml
  * STM32H735RGVx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32H7xx/H725R(E-G)V_H735RGV/variant_generic.cpp b/variants/STM32H7xx/H725R(E-G)V_H735RGV/variant_generic.cpp
index cbf6a25179..6e4079cb53 100644
--- a/variants/STM32H7xx/H725R(E-G)V_H735RGV/variant_generic.cpp
+++ b/variants/STM32H7xx/H725R(E-G)V_H735RGV/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H725R(E-G)V_H735RGV/variant_generic.h b/variants/STM32H7xx/H725R(E-G)V_H735RGV/variant_generic.h
index 305a1d5990..8c96f0cafd 100644
--- a/variants/STM32H7xx/H725R(E-G)V_H735RGV/variant_generic.h
+++ b/variants/STM32H7xx/H725R(E-G)V_H735RGV/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H725V(E-G)H/PeripheralPins.c b/variants/STM32H7xx/H725V(E-G)H/PeripheralPins.c
deleted file mode 100644
index 18d7a16cf5..0000000000
--- a/variants/STM32H7xx/H725V(E-G)H/PeripheralPins.c
+++ /dev/null
@@ -1,572 +0,0 @@
-/*
- *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
- * All rights reserved.
- *
- * This software component is licensed by ST under BSD 3-Clause license,
- * the "License"; You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *                        opensource.org/licenses/BSD-3-Clause
- *
- *******************************************************************************
- */
-/*
- * Automatically generated from STM32H725VEHx.xml, STM32H725VGHx.xml
- * CubeMX DB release 6.0.30
- */
-#if !defined(CUSTOM_PERIPHERAL_PINS)
-#include "Arduino.h"
-#include "PeripheralPins.h"
-
-/* =====
- * Notes:
- * - The pins mentioned Px_y_ALTz are alternative possibilities which use other
- *   HW peripheral instances. You can use them the same way as any other "normal"
- *   pin (i.e. analogWrite(PA7_ALT1, 128);).
- *
- * - Commented lines are alternative possibilities which are not used per default.
- *   If you change them, you will have to know what you do
- * =====
- */
-
-//*** ADC ***
-
-#ifdef HAL_ADC_MODULE_ENABLED
-WEAK const PinMap PinMap_ADC[] = {
-  {PA_0,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 16, 0)}, // ADC1_INP16
-  {PA_1,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 17, 0)}, // ADC1_INP17
-  {PA_2,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC1_INP14
-  {PA_2_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC2_INP14
-  {PA_3,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC1_INP15
-  {PA_3_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC2_INP15
-  {PA_4,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 18, 0)}, // ADC1_INP18
-  {PA_4_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 18, 0)}, // ADC2_INP18
-  {PA_5,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 19, 0)}, // ADC1_INP19
-  {PA_5_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 19, 0)}, // ADC2_INP19
-  {PA_6,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC1_INP3
-  {PA_6_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC2_INP3
-  {PA_7,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC1_INP7
-  {PA_7_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC2_INP7
-  {PB_0,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC1_INP9
-  {PB_0_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC2_INP9
-  {PB_1,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC1_INP5
-  {PB_1_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC2_INP5
-  {PC_0,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC1_INP10
-  {PC_0_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC2_INP10
-  {PC_0_ALT2, ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC3_INP10
-  {PC_1,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC1_INP11
-  {PC_1_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC2_INP11
-  {PC_1_ALT2, ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC3_INP11
-  {PC_2_C,    ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC3_INP0
-  {PC_3_C,    ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC3_INP1
-  {PC_4,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC1_INP4
-  {PC_4_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC2_INP4
-  {PC_5,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC1_INP8
-  {PC_5_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC2_INP8
-  {NC,        NP,   0}
-};
-#endif
-
-//*** DAC ***
-
-#ifdef HAL_DAC_MODULE_ENABLED
-WEAK const PinMap PinMap_DAC[] = {
-  {PA_4, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // DAC1_OUT1
-  {PA_5, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // DAC1_OUT2
-  {NC,   NP,   0}
-};
-#endif
-
-//*** I2C ***
-
-#ifdef HAL_I2C_MODULE_ENABLED
-WEAK const PinMap PinMap_I2C_SDA[] = {
-  {PB_7,      I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
-  {PB_7_ALT1, I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C4)},
-  {PB_9,      I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
-  {PB_9_ALT1, I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C4)},
-  {PB_11,     I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
-  {PC_9,      I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
-  {PC_9_ALT1, I2C5, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C5)},
-  {PC_10,     I2C5, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C5)},
-  {PD_13,     I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C4)},
-  {NC,        NP,   0}
-};
-#endif
-
-#ifdef HAL_I2C_MODULE_ENABLED
-WEAK const PinMap PinMap_I2C_SCL[] = {
-  {PA_8,      I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
-  {PA_8_ALT1, I2C5, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C5)},
-  {PB_6,      I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
-  {PB_6_ALT1, I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C4)},
-  {PB_8,      I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
-  {PB_8_ALT1, I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C4)},
-  {PB_10,     I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
-  {PC_11,     I2C5, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C5)},
-  {PD_12,     I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C4)},
-  {NC,        NP,   0}
-};
-#endif
-
-//*** TIM ***
-
-#ifdef HAL_TIM_MODULE_ENABLED
-WEAK const PinMap PinMap_TIM[] = {
-  {PA_0,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
-  {PA_0_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)}, // TIM5_CH1
-  {PA_1,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
-  {PA_1_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 2, 0)}, // TIM5_CH2
-  {PA_1_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM15, 1, 1)}, // TIM15_CH1N
-  {PA_2,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
-  {PA_2_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 3, 0)}, // TIM5_CH3
-  {PA_2_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM15, 1, 0)}, // TIM15_CH1
-  {PA_3,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4
-  {PA_3_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 4, 0)}, // TIM5_CH4
-  {PA_3_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM15, 2, 0)}, // TIM15_CH2
-  {PA_5,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
-  {PA_5_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 1)}, // TIM8_CH1N
-  {PA_6,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
-  {PA_6_ALT1,  TIM13, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM13, 1, 0)}, // TIM13_CH1
-  {PA_7,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
-  {PA_7_ALT1,  TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
-  {PA_7_ALT2,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 1)}, // TIM8_CH1N
-  {PA_7_ALT3,  TIM14, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM14, 1, 0)}, // TIM14_CH1
-  {PA_8,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)}, // TIM1_CH1
-  {PA_9,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 0)}, // TIM1_CH2
-  {PA_10,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 0)}, // TIM1_CH3
-  {PA_11,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 4, 0)}, // TIM1_CH4
-  {PA_15,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
-  {PB_0,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
-  {PB_0_ALT1,  TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)}, // TIM3_CH3
-  {PB_0_ALT2,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 1)}, // TIM8_CH2N
-  {PB_1,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
-  {PB_1_ALT1,  TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
-  {PB_1_ALT2,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 1)}, // TIM8_CH3N
-  {PB_3,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
-  {PB_4,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
-  {PB_5,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
-  {PB_6,       TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 1, 0)}, // TIM4_CH1
-  {PB_6_ALT1,  TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM16, 1, 1)}, // TIM16_CH1N
-  {PB_7,       TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 2, 0)}, // TIM4_CH2
-  {PB_7_ALT1,  TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM17, 1, 1)}, // TIM17_CH1N
-  {PB_8,       TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 3, 0)}, // TIM4_CH3
-  {PB_8_ALT1,  TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM16, 1, 0)}, // TIM16_CH1
-  {PB_9,       TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)}, // TIM4_CH4
-  {PB_9_ALT1,  TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM17, 1, 0)}, // TIM17_CH1
-  {PB_10,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
-  {PB_11,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4
-  {PB_13,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
-  {PB_14,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
-  {PB_14_ALT1, TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 1)}, // TIM8_CH2N
-  {PB_14_ALT2, TIM12, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM12, 1, 0)}, // TIM12_CH1
-  {PB_15,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
-  {PB_15_ALT1, TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 1)}, // TIM8_CH3N
-  {PB_15_ALT2, TIM12, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM12, 2, 0)}, // TIM12_CH2
-  {PC_6,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
-  {PC_6_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 0)}, // TIM8_CH1
-  {PC_7,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
-  {PC_7_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 0)}, // TIM8_CH2
-  {PC_8,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)}, // TIM3_CH3
-  {PC_8_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 0)}, // TIM8_CH3
-  {PC_9,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
-  {PC_9_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 4, 0)}, // TIM8_CH4
-  {PC_12,      TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM15, 1, 0)}, // TIM15_CH1
-  {PD_12,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 1, 0)}, // TIM4_CH1
-  {PD_13,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 2, 0)}, // TIM4_CH2
-  {PD_14,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 3, 0)}, // TIM4_CH3
-  {PD_15,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)}, // TIM4_CH4
-  {PE_4,       TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM15, 1, 1)}, // TIM15_CH1N
-  {PE_5,       TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM15, 1, 0)}, // TIM15_CH1
-  {PE_6,       TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM15, 2, 0)}, // TIM15_CH2
-  {PE_8,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
-  {PE_9,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)}, // TIM1_CH1
-  {PE_10,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
-  {NC,         NP,    0}
-};
-#endif
-
-//*** UART ***
-
-#ifdef HAL_UART_MODULE_ENABLED
-WEAK const PinMap PinMap_UART_TX[] = {
-  {PA_0,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PA_2,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PA_9,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_LPUART)},
-  {PA_9_ALT1,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PA_12,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_UART4)},
-  {PA_15,      UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART7)},
-  {PB_4,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART7)},
-  {PB_6,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART)},
-  {PB_6_ALT1,  UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_UART5)},
-  {PB_6_ALT2,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PB_9,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PB_10,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PB_13,      UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_UART5)},
-  {PB_14,      USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART1)},
-  {PC_6,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
-  {PC_10,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PC_10_ALT1, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PC_12,      UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
-  {PD_1,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PD_5,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PD_8,       USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PE_1,       UART8,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART8)},
-  {PE_8,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
-  {NC,         NP,      0}
-};
-#endif
-
-#ifdef HAL_UART_MODULE_ENABLED
-WEAK const PinMap PinMap_UART_RX[] = {
-  {PA_1,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PA_3,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PA_8,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART7)},
-  {PA_10,      LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_LPUART)},
-  {PA_10_ALT1, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PA_11,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_UART4)},
-  {PB_3,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART7)},
-  {PB_5,       UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_UART5)},
-  {PB_7,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART)},
-  {PB_7_ALT1,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PB_8,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PB_11,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PB_12,      UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_UART5)},
-  {PB_15,      USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART1)},
-  {PC_7,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
-  {PC_11,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PC_11_ALT1, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PD_0,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PD_2,       UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
-  {PD_6,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PD_9,       USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PE_0,       UART8,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART8)},
-  {PE_7,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
-  {NC,         NP,      0}
-};
-#endif
-
-#ifdef HAL_UART_MODULE_ENABLED
-WEAK const PinMap PinMap_UART_RTS[] = {
-  {PA_1,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PA_12,      LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_LPUART)},
-  {PA_12_ALT1, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PA_15,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PB_14,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PB_14_ALT1, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PC_8,       UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
-  {PD_4,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PD_12,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PD_15,      UART8,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART8)},
-  {PE_9,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
-  {NC,         NP,      0}
-};
-#endif
-
-#ifdef HAL_UART_MODULE_ENABLED
-WEAK const PinMap PinMap_UART_CTS[] = {
-  {PA_0,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PA_11,      LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_LPUART)},
-  {PA_11_ALT1, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PB_0,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PB_13,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PB_15,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PC_9,       UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
-  {PD_3,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PD_11,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PD_14,      UART8,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART8)},
-  {PE_10,      UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
-  {NC,         NP,      0}
-};
-#endif
-
-//*** SPI ***
-
-#ifdef HAL_SPI_MODULE_ENABLED
-WEAK const PinMap PinMap_SPI_MOSI[] = {
-  {PA_7,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PA_7_ALT1, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
-  {PB_2,      SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_SPI3)},
-  {PB_5,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PB_5_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_SPI3)},
-  {PB_5_ALT2, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
-  {PB_15,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PC_1,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PC_3_C,    SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PC_12,     SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PD_6,      SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI3)},
-  {PD_7,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PE_6,      SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  {NC,        NP,   0}
-};
-#endif
-
-#ifdef HAL_SPI_MODULE_ENABLED
-WEAK const PinMap PinMap_SPI_MISO[] = {
-  {PA_6,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PA_6_ALT1, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
-  {PB_4,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PB_4_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PB_4_ALT2, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
-  {PB_14,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PC_2_C,    SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PC_11,     SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PE_5,      SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  {NC,        NP,   0}
-};
-#endif
-
-#ifdef HAL_SPI_MODULE_ENABLED
-WEAK const PinMap PinMap_SPI_SCLK[] = {
-  {PA_5,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PA_5_ALT1, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
-  {PA_9,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PA_12,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PB_3,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PB_3_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PB_3_ALT2, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
-  {PB_10,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PB_13,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PC_10,     SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PC_12,     SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI6)},
-  {PD_3,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PE_2,      SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  {NC,        NP,   0}
-};
-#endif
-
-#ifdef HAL_SPI_MODULE_ENABLED
-WEAK const PinMap PinMap_SPI_SSEL[] = {
-  {PA_0,       SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI6)},
-  {PA_4,       SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PA_4_ALT1,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PA_4_ALT2,  SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
-  {PA_11,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PA_15,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PA_15_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PA_15_ALT2, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_SPI6)},
-  {PB_4,       SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_SPI2)},
-  {PB_9,       SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PB_12,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PE_4,       SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  {NC,         NP,   0}
-};
-#endif
-
-//*** FDCAN ***
-
-#ifdef HAL_FDCAN_MODULE_ENABLED
-WEAK const PinMap PinMap_CAN_RD[] = {
-  {PA_11, FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
-  {PB_5,  FDCAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN2)},
-  {PB_8,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
-  {PB_12, FDCAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN2)},
-  {PD_0,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
-  {PD_12, FDCAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF5_FDCAN3)},
-  {NC,    NP,     0}
-};
-#endif
-
-#ifdef HAL_FDCAN_MODULE_ENABLED
-WEAK const PinMap PinMap_CAN_TD[] = {
-  {PA_12, FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
-  {PB_6,  FDCAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN2)},
-  {PB_9,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
-  {PB_13, FDCAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN2)},
-  {PD_1,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
-  {PD_13, FDCAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF5_FDCAN3)},
-  {NC,    NP,     0}
-};
-#endif
-
-//*** ETHERNET ***
-
-#ifdef HAL_ETH_MODULE_ENABLED
-WEAK const PinMap PinMap_Ethernet[] = {
-  {PA_0,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
-  {PA_1,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_REF_CLK
-  {PA_1_ALT1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RX_CLK
-  {PA_2,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_MDIO
-  {PA_3,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_COL
-  {PA_7,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS_DV
-  {PA_7_ALT1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RX_DV
-  {PA_9,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TX_ER
-  {PB_0,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RXD2
-  {PB_1,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RXD3
-  {PB_2,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TX_ER
-  {PB_5,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_PPS_OUT
-  {PB_8,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD3
-  {PB_10,     ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RX_ER
-  {PB_11,     ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TX_EN
-  {PB_12,     ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD0
-  {PB_13,     ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD1
-  {PC_1,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_MDC
-  {PC_2_C,    ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD2
-  {PC_3_C,    ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TX_CLK
-  {PC_4,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RXD0
-  {PC_5,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RXD1
-  {PE_2,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD3
-  {NC,        NP,  0}
-};
-#endif
-
-//*** OCTOSPI ***
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA0[] = {
-  {PA_2,   OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO0
-  {PB_1,   OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO0
-  {PB_12,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO0
-  {PC_3_C, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO0
-  {PC_9,   OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO0
-  {PD_11,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO0
-  {NC,     NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA1[] = {
-  {PB_0,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO1
-  {PC_10, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO1
-  {PD_12, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO1
-  {NC,    NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA2[] = {
-  {PA_3,   OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO2
-  {PA_7,   OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO2
-  {PB_13,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO2
-  {PC_2_C, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO2
-  {PE_2,   OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO2
-  {NC,     NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA3[] = {
-  {PA_1,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO3
-  {PA_6,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO3
-  {PD_13, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO3
-  {NC,    NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA4[] = {
-  {PC_1, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO4
-  {PD_4, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO4
-  {PE_7, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO4
-  {NC,   NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA5[] = {
-  {PC_2_C, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO5
-  {PD_5,   OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO5
-  {PE_8,   OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO5
-  {NC,     NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA6[] = {
-  {PC_3_C, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO6
-  {PD_6,   OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO6
-  {PE_9,   OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO6
-  {NC,     NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA7[] = {
-  {PD_7,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO7
-  {PE_10, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO7
-  {NC,    NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_SCLK[] = {
-  {PA_3, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OCTOSPIM_P1)}, // OCTOSPIM_P1_CLK
-  {PB_2, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_CLK
-  {NC,   NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_SSEL[] = {
-  {PB_6,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_NCS
-  {PB_10, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_NCS
-  {PC_11, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_NCS
-  {NC,    NP,       0}
-};
-#endif
-
-//*** USB ***
-
-#if defined(HAL_PCD_MODULE_ENABLED) || defined(HAL_HCD_MODULE_ENABLED)
-WEAK const PinMap PinMap_USB_OTG_HS[] = {
-#ifdef USE_USB_HS_IN_FS
-  {PA_8,   USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_SOF
-  {PA_9,   USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
-  {PA_10,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ID
-  {PA_11,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)}, // USB_OTG_HS_DM
-  {PA_12,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)}, // USB_OTG_HS_DP
-#else
-  {PA_3,   USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D0
-  {PA_5,   USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_CK
-  {PB_0,   USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D1
-  {PB_1,   USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D2
-  {PB_5,   USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D7
-  {PB_10,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D3
-  {PB_11,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D4
-  {PB_12,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D5
-  {PB_13,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D6
-  {PC_0,   USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_STP
-  {PC_2_C, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_DIR
-  {PC_3_C, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_NXT
-#endif /* USE_USB_HS_IN_FS */
-  {NC,     NP,         0}
-};
-#endif
-
-//*** SD ***
-
-#ifdef HAL_SD_MODULE_ENABLED
-WEAK const PinMap PinMap_SD[] = {
-  {PA_0,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_SDMMC2)}, // SDMMC2_CMD
-  {PB_3,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_SDMMC2)}, // SDMMC2_D2
-  {PB_4,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_SDMMC2)}, // SDMMC2_D3
-  {PB_8,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF7_SDMMC1)}, // SDMMC1_CKIN
-  {PB_8_ALT1, SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D4
-  {PB_8_ALT2, SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_SDMMC2)}, // SDMMC2_D4
-  {PB_9,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF7_SDMMC1)}, // SDMMC1_CDIR
-  {PB_9_ALT1, SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D5
-  {PB_9_ALT2, SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_SDMMC2)}, // SDMMC2_D5
-  {PB_13,     SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D0
-  {PB_14,     SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_SDMMC2)}, // SDMMC2_D0
-  {PB_15,     SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_SDMMC2)}, // SDMMC2_D1
-  {PC_1,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_SDMMC2)}, // SDMMC2_CK
-  {PC_4,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF10_SDMMC2)}, // SDMMC2_CKIN
-  {PC_6,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF8_SDMMC1)}, // SDMMC1_D0DIR
-  {PC_6_ALT1, SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D6
-  {PC_6_ALT2, SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_SDMMC2)}, // SDMMC2_D6
-  {PC_7,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF8_SDMMC1)}, // SDMMC1_D123DIR
-  {PC_7_ALT1, SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D7
-  {PC_7_ALT2, SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_SDMMC2)}, // SDMMC2_D7
-  {PC_8,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D0
-  {PC_9,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D1
-  {PC_10,     SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D2
-  {PC_11,     SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D3
-  {PC_12,     SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDMMC1)}, // SDMMC1_CK
-  {PD_2,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDMMC1)}, // SDMMC1_CMD
-  {PD_6,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF11_SDMMC2)}, // SDMMC2_CK
-  {PD_7,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF11_SDMMC2)}, // SDMMC2_CMD
-  {NC,        NP,     0}
-};
-#endif
-
-#endif /* !CUSTOM_PERIPHERAL_PINS */
diff --git a/variants/STM32H7xx/H725V(E-G)H/variant_generic.h b/variants/STM32H7xx/H725V(E-G)H/variant_generic.h
deleted file mode 100644
index a69a541ffb..0000000000
--- a/variants/STM32H7xx/H725V(E-G)H/variant_generic.h
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
- * All rights reserved.
- *
- * This software component is licensed by ST under BSD 3-Clause license,
- * the "License"; You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *                        opensource.org/licenses/BSD-3-Clause
- *
- *******************************************************************************
- */
-#pragma once
-
-/*----------------------------------------------------------------------------
- *        STM32 pins number
- *----------------------------------------------------------------------------*/
-#define PA0                     PIN_A0
-#define PA1                     PIN_A1
-#define PA2                     PIN_A2
-#define PA3                     PIN_A3
-#define PA4                     PIN_A4
-#define PA5                     PIN_A5
-#define PA6                     PIN_A6
-#define PA7                     PIN_A7
-#define PA8                     8
-#define PA9                     9
-#define PA10                    10
-#define PA11                    11
-#define PA12                    12
-#define PA13                    13
-#define PA14                    14
-#define PA15                    15
-#define PB0                     PIN_A8
-#define PB1                     PIN_A9
-#define PB2                     18
-#define PB3                     19
-#define PB4                     20
-#define PB5                     21
-#define PB6                     22
-#define PB7                     23
-#define PB8                     24
-#define PB9                     25
-#define PB10                    26
-#define PB11                    27
-#define PB12                    28
-#define PB13                    29
-#define PB14                    30
-#define PB15                    31
-#define PC0                     PIN_A10
-#define PC1                     PIN_A11
-#define PC4                     PIN_A12
-#define PC5                     PIN_A13
-#define PC6                     36
-#define PC7                     37
-#define PC8                     38
-#define PC9                     39
-#define PC10                    40
-#define PC11                    41
-#define PC12                    42
-#define PC13                    43
-#define PC14                    44
-#define PC15                    45
-#define PD0                     46
-#define PD1                     47
-#define PD2                     48
-#define PD3                     49
-#define PD4                     50
-#define PD5                     51
-#define PD6                     52
-#define PD7                     53
-#define PD8                     54
-#define PD9                     55
-#define PD10                    56
-#define PD11                    57
-#define PD12                    58
-#define PD13                    59
-#define PD14                    60
-#define PD15                    61
-#define PE0                     62
-#define PE1                     63
-#define PE2                     64
-#define PE3                     65
-#define PE4                     66
-#define PE5                     67
-#define PE6                     68
-#define PE7                     69
-#define PE8                     70
-#define PE9                     71
-#define PE10                    72
-#define PH0                     73
-#define PH1                     74
-#define PC2_C                   PIN_A14
-#define PC3_C                   PIN_A15
-
-// Alternate pins number
-#define PA0_ALT1                (PA0  | ALT1)
-#define PA1_ALT1                (PA1  | ALT1)
-#define PA1_ALT2                (PA1  | ALT2)
-#define PA2_ALT1                (PA2  | ALT1)
-#define PA2_ALT2                (PA2  | ALT2)
-#define PA3_ALT1                (PA3  | ALT1)
-#define PA3_ALT2                (PA3  | ALT2)
-#define PA4_ALT1                (PA4  | ALT1)
-#define PA4_ALT2                (PA4  | ALT2)
-#define PA5_ALT1                (PA5  | ALT1)
-#define PA6_ALT1                (PA6  | ALT1)
-#define PA7_ALT1                (PA7  | ALT1)
-#define PA7_ALT2                (PA7  | ALT2)
-#define PA7_ALT3                (PA7  | ALT3)
-#define PA8_ALT1                (PA8  | ALT1)
-#define PA9_ALT1                (PA9  | ALT1)
-#define PA10_ALT1               (PA10 | ALT1)
-#define PA11_ALT1               (PA11 | ALT1)
-#define PA12_ALT1               (PA12 | ALT1)
-#define PA15_ALT1               (PA15 | ALT1)
-#define PA15_ALT2               (PA15 | ALT2)
-#define PB0_ALT1                (PB0  | ALT1)
-#define PB0_ALT2                (PB0  | ALT2)
-#define PB1_ALT1                (PB1  | ALT1)
-#define PB1_ALT2                (PB1  | ALT2)
-#define PB3_ALT1                (PB3  | ALT1)
-#define PB3_ALT2                (PB3  | ALT2)
-#define PB4_ALT1                (PB4  | ALT1)
-#define PB4_ALT2                (PB4  | ALT2)
-#define PB5_ALT1                (PB5  | ALT1)
-#define PB5_ALT2                (PB5  | ALT2)
-#define PB6_ALT1                (PB6  | ALT1)
-#define PB6_ALT2                (PB6  | ALT2)
-#define PB7_ALT1                (PB7  | ALT1)
-#define PB8_ALT1                (PB8  | ALT1)
-#define PB8_ALT2                (PB8  | ALT2)
-#define PB9_ALT1                (PB9  | ALT1)
-#define PB9_ALT2                (PB9  | ALT2)
-#define PB14_ALT1               (PB14 | ALT1)
-#define PB14_ALT2               (PB14 | ALT2)
-#define PB15_ALT1               (PB15 | ALT1)
-#define PB15_ALT2               (PB15 | ALT2)
-#define PC0_ALT1                (PC0  | ALT1)
-#define PC0_ALT2                (PC0  | ALT2)
-#define PC1_ALT1                (PC1  | ALT1)
-#define PC1_ALT2                (PC1  | ALT2)
-#define PC4_ALT1                (PC4  | ALT1)
-#define PC5_ALT1                (PC5  | ALT1)
-#define PC6_ALT1                (PC6  | ALT1)
-#define PC6_ALT2                (PC6  | ALT2)
-#define PC7_ALT1                (PC7  | ALT1)
-#define PC7_ALT2                (PC7  | ALT2)
-#define PC8_ALT1                (PC8  | ALT1)
-#define PC9_ALT1                (PC9  | ALT1)
-#define PC10_ALT1               (PC10 | ALT1)
-#define PC11_ALT1               (PC11 | ALT1)
-
-#define NUM_DIGITAL_PINS        77
-#define NUM_DUALPAD_PINS        2
-#define NUM_ANALOG_INPUTS       16
-
-// On-board LED pin number
-#ifndef LED_BUILTIN
-  #define LED_BUILTIN           PNUM_NOT_DEFINED
-#endif
-
-// On-board user button
-#ifndef USER_BTN
-  #define USER_BTN              PNUM_NOT_DEFINED
-#endif
-
-// SPI definitions
-#ifndef PIN_SPI_SS
-  #define PIN_SPI_SS            PA4
-#endif
-#ifndef PIN_SPI_SS1
-  #define PIN_SPI_SS1           PA15
-#endif
-#ifndef PIN_SPI_SS2
-  #define PIN_SPI_SS2           PNUM_NOT_DEFINED
-#endif
-#ifndef PIN_SPI_SS3
-  #define PIN_SPI_SS3           PNUM_NOT_DEFINED
-#endif
-#ifndef PIN_SPI_MOSI
-  #define PIN_SPI_MOSI          PA7
-#endif
-#ifndef PIN_SPI_MISO
-  #define PIN_SPI_MISO          PA6
-#endif
-#ifndef PIN_SPI_SCK
-  #define PIN_SPI_SCK           PA5
-#endif
-
-// I2C definitions
-#ifndef PIN_WIRE_SDA
-  #define PIN_WIRE_SDA          PB7
-#endif
-#ifndef PIN_WIRE_SCL
-  #define PIN_WIRE_SCL          PB6
-#endif
-
-// Timer Definitions
-// Use TIM6/TIM7 when possible as servo and tone don't need GPIO output pin
-#ifndef TIMER_TONE
-  #define TIMER_TONE            TIM6
-#endif
-#ifndef TIMER_SERVO
-  #define TIMER_SERVO           TIM7
-#endif
-
-// UART Definitions
-#ifndef SERIAL_UART_INSTANCE
-  #define SERIAL_UART_INSTANCE  4
-#endif
-
-// Default pin used for generic 'Serial' instance
-// Mandatory for Firmata
-#ifndef PIN_SERIAL_RX
-  #define PIN_SERIAL_RX         PA1
-#endif
-#ifndef PIN_SERIAL_TX
-  #define PIN_SERIAL_TX         PA0
-#endif
-
-// Extra HAL modules
-#if !defined(HAL_DAC_MODULE_DISABLED)
-  #define HAL_DAC_MODULE_ENABLED
-#endif
-#if !defined(HAL_ETH_MODULE_DISABLED)
-  #define HAL_ETH_MODULE_ENABLED
-#endif
-#if !defined(HAL_OSPI_MODULE_DISABLED)
-  #define HAL_OSPI_MODULE_ENABLED
-#endif
-#if !defined(HAL_SD_MODULE_DISABLED)
-  #define HAL_SD_MODULE_ENABLED
-#endif
-
-/*----------------------------------------------------------------------------
- *        Arduino objects - C++ only
- *----------------------------------------------------------------------------*/
-
-#ifdef __cplusplus
-  // These serial port names are intended to allow libraries and architecture-neutral
-  // sketches to automatically default to the correct port name for a particular type
-  // of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
-  // the first hardware serial port whose RX/TX pins are not dedicated to another use.
-  //
-  // SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
-  //
-  // SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
-  //
-  // SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
-  //
-  // SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
-  //
-  // SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
-  //                            pins are NOT connected to anything by default.
-  #ifndef SERIAL_PORT_MONITOR
-    #define SERIAL_PORT_MONITOR   Serial
-  #endif
-  #ifndef SERIAL_PORT_HARDWARE
-    #define SERIAL_PORT_HARDWARE  Serial
-  #endif
-#endif
diff --git a/variants/STM32H7xx/H735VGH/PeripheralPins.c b/variants/STM32H7xx/H725V(E-G)H_H735VGH/PeripheralPins.c
similarity index 99%
rename from variants/STM32H7xx/H735VGH/PeripheralPins.c
rename to variants/STM32H7xx/H725V(E-G)H_H735VGH/PeripheralPins.c
index 75bfced9fa..d321bf31a5 100644
--- a/variants/STM32H7xx/H735VGH/PeripheralPins.c
+++ b/variants/STM32H7xx/H725V(E-G)H_H735VGH/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -11,8 +11,9 @@
  *******************************************************************************
  */
 /*
- * Automatically generated from STM32H735VGHx.xml
- * CubeMX DB release 6.0.30
+ * Automatically generated from STM32H725VEHx.xml, STM32H725VGHx.xml
+ * STM32H735VGHx.xml
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32H7xx/H725V(E-G)H/PinNamesVar.h b/variants/STM32H7xx/H725V(E-G)H_H735VGH/PinNamesVar.h
similarity index 100%
rename from variants/STM32H7xx/H725V(E-G)H/PinNamesVar.h
rename to variants/STM32H7xx/H725V(E-G)H_H735VGH/PinNamesVar.h
diff --git a/variants/STM32H7xx/H725V(E-G)H/boards_entry.txt b/variants/STM32H7xx/H725V(E-G)H_H735VGH/boards_entry.txt
similarity index 69%
rename from variants/STM32H7xx/H725V(E-G)H/boards_entry.txt
rename to variants/STM32H7xx/H725V(E-G)H_H735VGH/boards_entry.txt
index 925d0b2e69..c185d085af 100644
--- a/variants/STM32H7xx/H725V(E-G)H/boards_entry.txt
+++ b/variants/STM32H7xx/H725V(E-G)H_H735VGH/boards_entry.txt
@@ -9,7 +9,7 @@ GenH7.menu.pnum.GENERIC_H725VEHX.upload.maximum_size=524288
 GenH7.menu.pnum.GENERIC_H725VEHX.upload.maximum_data_size=1048576
 GenH7.menu.pnum.GENERIC_H725VEHX.build.board=GENERIC_H725VEHX
 GenH7.menu.pnum.GENERIC_H725VEHX.build.product_line=STM32H725xx
-GenH7.menu.pnum.GENERIC_H725VEHX.build.variant=STM32H7xx/H725V(E-G)H
+GenH7.menu.pnum.GENERIC_H725VEHX.build.variant=STM32H7xx/H725V(E-G)H_H735VGH
 
 # Generic H725VGHx
 GenH7.menu.pnum.GENERIC_H725VGHX=Generic H725VGHx
@@ -17,5 +17,13 @@ GenH7.menu.pnum.GENERIC_H725VGHX.upload.maximum_size=1048576
 GenH7.menu.pnum.GENERIC_H725VGHX.upload.maximum_data_size=1048576
 GenH7.menu.pnum.GENERIC_H725VGHX.build.board=GENERIC_H725VGHX
 GenH7.menu.pnum.GENERIC_H725VGHX.build.product_line=STM32H725xx
-GenH7.menu.pnum.GENERIC_H725VGHX.build.variant=STM32H7xx/H725V(E-G)H
+GenH7.menu.pnum.GENERIC_H725VGHX.build.variant=STM32H7xx/H725V(E-G)H_H735VGH
+
+# Generic H735VGHx
+GenH7.menu.pnum.GENERIC_H735VGHX=Generic H735VGHx
+GenH7.menu.pnum.GENERIC_H735VGHX.upload.maximum_size=1048576
+GenH7.menu.pnum.GENERIC_H735VGHX.upload.maximum_data_size=1048576
+GenH7.menu.pnum.GENERIC_H735VGHX.build.board=GENERIC_H735VGHX
+GenH7.menu.pnum.GENERIC_H735VGHX.build.product_line=STM32H735xx
+GenH7.menu.pnum.GENERIC_H735VGHX.build.variant=STM32H7xx/H725V(E-G)H_H735VGH
 
diff --git a/variants/STM32H7xx/H725V(E-G)H/generic_clock.c b/variants/STM32H7xx/H725V(E-G)H_H735VGH/generic_clock.c
similarity index 89%
rename from variants/STM32H7xx/H725V(E-G)H/generic_clock.c
rename to variants/STM32H7xx/H725V(E-G)H_H735VGH/generic_clock.c
index 8a503361c3..3ed70c7654 100644
--- a/variants/STM32H7xx/H725V(E-G)H/generic_clock.c
+++ b/variants/STM32H7xx/H725V(E-G)H_H735VGH/generic_clock.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -10,7 +10,8 @@
  *
  *******************************************************************************
  */
-#if defined(ARDUINO_GENERIC_H725VEHX) || defined(ARDUINO_GENERIC_H725VGHX)
+#if defined(ARDUINO_GENERIC_H725VEHX) || defined(ARDUINO_GENERIC_H725VGHX) ||\
+    defined(ARDUINO_GENERIC_H735VGHX)
 #include "pins_arduino.h"
 
 /**
diff --git a/variants/STM32H7xx/H725V(E-G)H/variant_generic.cpp b/variants/STM32H7xx/H725V(E-G)H_H735VGH/variant_generic.cpp
similarity index 96%
rename from variants/STM32H7xx/H725V(E-G)H/variant_generic.cpp
rename to variants/STM32H7xx/H725V(E-G)H_H735VGH/variant_generic.cpp
index bdab9f05e5..9e516b1ff4 100644
--- a/variants/STM32H7xx/H725V(E-G)H/variant_generic.cpp
+++ b/variants/STM32H7xx/H725V(E-G)H_H735VGH/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -10,7 +10,8 @@
  *
  *******************************************************************************
  */
-#if defined(ARDUINO_GENERIC_H725VEHX) || defined(ARDUINO_GENERIC_H725VGHX)
+#if defined(ARDUINO_GENERIC_H725VEHX) || defined(ARDUINO_GENERIC_H725VGHX) ||\
+    defined(ARDUINO_GENERIC_H735VGHX)
 #include "pins_arduino.h"
 
 // Digital PinName array
diff --git a/variants/STM32H7xx/H735VGH/variant_generic.h b/variants/STM32H7xx/H725V(E-G)H_H735VGH/variant_generic.h
similarity index 99%
rename from variants/STM32H7xx/H735VGH/variant_generic.h
rename to variants/STM32H7xx/H725V(E-G)H_H735VGH/variant_generic.h
index a69a541ffb..180e2c4d1d 100644
--- a/variants/STM32H7xx/H735VGH/variant_generic.h
+++ b/variants/STM32H7xx/H725V(E-G)H_H735VGH/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H725V(E-G)T/PeripheralPins.c b/variants/STM32H7xx/H725V(E-G)T/PeripheralPins.c
deleted file mode 100644
index f5659486f7..0000000000
--- a/variants/STM32H7xx/H725V(E-G)T/PeripheralPins.c
+++ /dev/null
@@ -1,549 +0,0 @@
-/*
- *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
- * All rights reserved.
- *
- * This software component is licensed by ST under BSD 3-Clause license,
- * the "License"; You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *                        opensource.org/licenses/BSD-3-Clause
- *
- *******************************************************************************
- */
-/*
- * Automatically generated from STM32H725VETx.xml, STM32H725VGTx.xml
- * CubeMX DB release 6.0.30
- */
-#if !defined(CUSTOM_PERIPHERAL_PINS)
-#include "Arduino.h"
-#include "PeripheralPins.h"
-
-/* =====
- * Notes:
- * - The pins mentioned Px_y_ALTz are alternative possibilities which use other
- *   HW peripheral instances. You can use them the same way as any other "normal"
- *   pin (i.e. analogWrite(PA7_ALT1, 128);).
- *
- * - Commented lines are alternative possibilities which are not used per default.
- *   If you change them, you will have to know what you do
- * =====
- */
-
-//*** ADC ***
-
-#ifdef HAL_ADC_MODULE_ENABLED
-WEAK const PinMap PinMap_ADC[] = {
-  {PA_0,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 16, 0)}, // ADC1_INP16
-  {PA_1,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 17, 0)}, // ADC1_INP17
-  {PA_2,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC1_INP14
-  {PA_2_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC2_INP14
-  {PA_3,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC1_INP15
-  {PA_3_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC2_INP15
-  {PA_4,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 18, 0)}, // ADC1_INP18
-  {PA_4_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 18, 0)}, // ADC2_INP18
-  {PA_5,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 19, 0)}, // ADC1_INP19
-  {PA_5_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 19, 0)}, // ADC2_INP19
-  {PA_6,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC1_INP3
-  {PA_6_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC2_INP3
-  {PA_7,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC1_INP7
-  {PA_7_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC2_INP7
-  {PB_0,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC1_INP9
-  {PB_0_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC2_INP9
-  {PB_1,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC1_INP5
-  {PB_1_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC2_INP5
-  {PC_0,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC1_INP10
-  {PC_0_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC2_INP10
-  {PC_0_ALT2, ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC3_INP10
-  {PC_1,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC1_INP11
-  {PC_1_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC2_INP11
-  {PC_1_ALT2, ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC3_INP11
-  {PC_2_C,    ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC3_INP0
-  {PC_3_C,    ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC3_INP1
-  {PC_4,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC1_INP4
-  {PC_4_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC2_INP4
-  {PC_5,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC1_INP8
-  {PC_5_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC2_INP8
-  {NC,        NP,   0}
-};
-#endif
-
-//*** DAC ***
-
-#ifdef HAL_DAC_MODULE_ENABLED
-WEAK const PinMap PinMap_DAC[] = {
-  {PA_4, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // DAC1_OUT1
-  {PA_5, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // DAC1_OUT2
-  {NC,   NP,   0}
-};
-#endif
-
-//*** I2C ***
-
-#ifdef HAL_I2C_MODULE_ENABLED
-WEAK const PinMap PinMap_I2C_SDA[] = {
-  {PB_7,      I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
-  {PB_7_ALT1, I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C4)},
-  {PB_9,      I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
-  {PB_9_ALT1, I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C4)},
-  {PB_11,     I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
-  {PC_9,      I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
-  {PC_9_ALT1, I2C5, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C5)},
-  {PC_10,     I2C5, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C5)},
-  {PD_13,     I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C4)},
-  {NC,        NP,   0}
-};
-#endif
-
-#ifdef HAL_I2C_MODULE_ENABLED
-WEAK const PinMap PinMap_I2C_SCL[] = {
-  {PA_8,      I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
-  {PA_8_ALT1, I2C5, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C5)},
-  {PB_6,      I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
-  {PB_6_ALT1, I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C4)},
-  {PB_8,      I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
-  {PB_8_ALT1, I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C4)},
-  {PB_10,     I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
-  {PC_11,     I2C5, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C5)},
-  {PD_12,     I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C4)},
-  {NC,        NP,   0}
-};
-#endif
-
-//*** TIM ***
-
-#ifdef HAL_TIM_MODULE_ENABLED
-WEAK const PinMap PinMap_TIM[] = {
-  {PA_0,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
-  {PA_0_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)}, // TIM5_CH1
-  {PA_1,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
-  {PA_1_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 2, 0)}, // TIM5_CH2
-  {PA_1_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM15, 1, 1)}, // TIM15_CH1N
-  {PA_2,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
-  {PA_2_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 3, 0)}, // TIM5_CH3
-  {PA_2_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM15, 1, 0)}, // TIM15_CH1
-  {PA_3,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4
-  {PA_3_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 4, 0)}, // TIM5_CH4
-  {PA_3_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM15, 2, 0)}, // TIM15_CH2
-  {PA_5,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
-  {PA_5_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 1)}, // TIM8_CH1N
-  {PA_6,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
-  {PA_6_ALT1,  TIM13, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM13, 1, 0)}, // TIM13_CH1
-  {PA_7,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
-  {PA_7_ALT1,  TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
-  {PA_7_ALT2,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 1)}, // TIM8_CH1N
-  {PA_7_ALT3,  TIM14, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM14, 1, 0)}, // TIM14_CH1
-  {PA_8,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)}, // TIM1_CH1
-  {PA_9,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 0)}, // TIM1_CH2
-  {PA_10,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 0)}, // TIM1_CH3
-  {PA_11,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 4, 0)}, // TIM1_CH4
-  {PA_15,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
-  {PB_0,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
-  {PB_0_ALT1,  TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)}, // TIM3_CH3
-  {PB_0_ALT2,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 1)}, // TIM8_CH2N
-  {PB_1,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
-  {PB_1_ALT1,  TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
-  {PB_1_ALT2,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 1)}, // TIM8_CH3N
-  {PB_3,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
-  {PB_4,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
-  {PB_5,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
-  {PB_6,       TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 1, 0)}, // TIM4_CH1
-  {PB_6_ALT1,  TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM16, 1, 1)}, // TIM16_CH1N
-  {PB_7,       TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 2, 0)}, // TIM4_CH2
-  {PB_7_ALT1,  TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM17, 1, 1)}, // TIM17_CH1N
-  {PB_8,       TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 3, 0)}, // TIM4_CH3
-  {PB_8_ALT1,  TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM16, 1, 0)}, // TIM16_CH1
-  {PB_9,       TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)}, // TIM4_CH4
-  {PB_9_ALT1,  TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM17, 1, 0)}, // TIM17_CH1
-  {PB_10,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
-  {PB_11,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4
-  {PB_13,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
-  {PB_14,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
-  {PB_14_ALT1, TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 1)}, // TIM8_CH2N
-  {PB_14_ALT2, TIM12, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM12, 1, 0)}, // TIM12_CH1
-  {PB_15,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
-  {PB_15_ALT1, TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 1)}, // TIM8_CH3N
-  {PB_15_ALT2, TIM12, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM12, 2, 0)}, // TIM12_CH2
-  {PC_6,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
-  {PC_6_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 0)}, // TIM8_CH1
-  {PC_7,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
-  {PC_7_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 0)}, // TIM8_CH2
-  {PC_8,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)}, // TIM3_CH3
-  {PC_8_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 0)}, // TIM8_CH3
-  {PC_9,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
-  {PC_9_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 4, 0)}, // TIM8_CH4
-  {PC_12,      TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM15, 1, 0)}, // TIM15_CH1
-  {PD_12,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 1, 0)}, // TIM4_CH1
-  {PD_13,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 2, 0)}, // TIM4_CH2
-  {PD_14,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 3, 0)}, // TIM4_CH3
-  {PD_15,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)}, // TIM4_CH4
-  {PE_4,       TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM15, 1, 1)}, // TIM15_CH1N
-  {PE_5,       TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM15, 1, 0)}, // TIM15_CH1
-  {PE_8,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
-  {NC,         NP,    0}
-};
-#endif
-
-//*** UART ***
-
-#ifdef HAL_UART_MODULE_ENABLED
-WEAK const PinMap PinMap_UART_TX[] = {
-  {PA_0,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PA_2,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PA_9,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_LPUART)},
-  {PA_9_ALT1,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PA_12,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_UART4)},
-  {PA_15,      UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART7)},
-  {PB_4,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART7)},
-  {PB_6,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART)},
-  {PB_6_ALT1,  UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_UART5)},
-  {PB_6_ALT2,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PB_9,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PB_10,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PB_13,      UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_UART5)},
-  {PB_14,      USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART1)},
-  {PC_6,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
-  {PC_10,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PC_10_ALT1, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PC_12,      UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
-  {PD_1,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PD_5,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PD_8,       USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PE_8,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
-  {NC,         NP,      0}
-};
-#endif
-
-#ifdef HAL_UART_MODULE_ENABLED
-WEAK const PinMap PinMap_UART_RX[] = {
-  {PA_1,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PA_3,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PA_8,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART7)},
-  {PA_10,      LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_LPUART)},
-  {PA_10_ALT1, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PA_11,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_UART4)},
-  {PB_3,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART7)},
-  {PB_5,       UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_UART5)},
-  {PB_7,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART)},
-  {PB_7_ALT1,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PB_8,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PB_11,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PB_12,      UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_UART5)},
-  {PB_15,      USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART1)},
-  {PC_7,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
-  {PC_11,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PC_11_ALT1, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PD_0,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PD_2,       UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
-  {PD_9,       USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PE_7,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
-  {NC,         NP,      0}
-};
-#endif
-
-#ifdef HAL_UART_MODULE_ENABLED
-WEAK const PinMap PinMap_UART_RTS[] = {
-  {PA_1,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PA_12,      LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_LPUART)},
-  {PA_12_ALT1, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PA_15,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PB_14,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PB_14_ALT1, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PC_8,       UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
-  {PD_4,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PD_12,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PD_15,      UART8,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART8)},
-  {NC,         NP,      0}
-};
-#endif
-
-#ifdef HAL_UART_MODULE_ENABLED
-WEAK const PinMap PinMap_UART_CTS[] = {
-  {PA_0,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PA_11,      LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_LPUART)},
-  {PA_11_ALT1, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PB_0,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PB_13,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PB_15,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PC_9,       UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
-  {PD_3,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PD_11,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PD_14,      UART8,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART8)},
-  {NC,         NP,      0}
-};
-#endif
-
-//*** SPI ***
-
-#ifdef HAL_SPI_MODULE_ENABLED
-WEAK const PinMap PinMap_SPI_MOSI[] = {
-  {PA_7,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PA_7_ALT1, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
-  {PB_2,      SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_SPI3)},
-  {PB_5,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PB_5_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_SPI3)},
-  {PB_5_ALT2, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
-  {PB_15,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PC_1,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PC_3_C,    SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PC_12,     SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {NC,        NP,   0}
-};
-#endif
-
-#ifdef HAL_SPI_MODULE_ENABLED
-WEAK const PinMap PinMap_SPI_MISO[] = {
-  {PA_6,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PA_6_ALT1, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
-  {PB_4,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PB_4_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PB_4_ALT2, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
-  {PB_14,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PC_2_C,    SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PC_11,     SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PE_5,      SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  {NC,        NP,   0}
-};
-#endif
-
-#ifdef HAL_SPI_MODULE_ENABLED
-WEAK const PinMap PinMap_SPI_SCLK[] = {
-  {PA_5,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PA_5_ALT1, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
-  {PA_9,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PA_12,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PB_3,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PB_3_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PB_3_ALT2, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
-  {PB_10,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PB_13,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PC_10,     SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PC_12,     SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI6)},
-  {PD_3,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PE_2,      SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  {NC,        NP,   0}
-};
-#endif
-
-#ifdef HAL_SPI_MODULE_ENABLED
-WEAK const PinMap PinMap_SPI_SSEL[] = {
-  {PA_0,       SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI6)},
-  {PA_4,       SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PA_4_ALT1,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PA_4_ALT2,  SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
-  {PA_11,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PA_15,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PA_15_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PA_15_ALT2, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_SPI6)},
-  {PB_4,       SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_SPI2)},
-  {PB_9,       SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PB_12,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PE_4,       SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  {NC,         NP,   0}
-};
-#endif
-
-//*** FDCAN ***
-
-#ifdef HAL_FDCAN_MODULE_ENABLED
-WEAK const PinMap PinMap_CAN_RD[] = {
-  {PA_11, FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
-  {PB_5,  FDCAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN2)},
-  {PB_8,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
-  {PB_12, FDCAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN2)},
-  {PD_0,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
-  {PD_12, FDCAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF5_FDCAN3)},
-  {NC,    NP,     0}
-};
-#endif
-
-#ifdef HAL_FDCAN_MODULE_ENABLED
-WEAK const PinMap PinMap_CAN_TD[] = {
-  {PA_12, FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
-  {PB_6,  FDCAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN2)},
-  {PB_9,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
-  {PB_13, FDCAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN2)},
-  {PD_1,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
-  {PD_13, FDCAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF5_FDCAN3)},
-  {NC,    NP,     0}
-};
-#endif
-
-//*** ETHERNET ***
-
-#ifdef HAL_ETH_MODULE_ENABLED
-WEAK const PinMap PinMap_Ethernet[] = {
-  {PA_0,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
-  {PA_1,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_REF_CLK
-  {PA_1_ALT1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RX_CLK
-  {PA_2,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_MDIO
-  {PA_3,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_COL
-  {PA_7,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS_DV
-  {PA_7_ALT1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RX_DV
-  {PA_9,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TX_ER
-  {PB_0,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RXD2
-  {PB_1,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RXD3
-  {PB_2,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TX_ER
-  {PB_5,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_PPS_OUT
-  {PB_8,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD3
-  {PB_10,     ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RX_ER
-  {PB_11,     ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TX_EN
-  {PB_12,     ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD0
-  {PB_13,     ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD1
-  {PC_1,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_MDC
-  {PC_2_C,    ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD2
-  {PC_3_C,    ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TX_CLK
-  {PC_4,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RXD0
-  {PC_5,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RXD1
-  {PE_2,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD3
-  {NC,        NP,  0}
-};
-#endif
-
-//*** OCTOSPI ***
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA0[] = {
-  {PA_2,   OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO0
-  {PB_1,   OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO0
-  {PB_12,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO0
-  {PC_3_C, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO0
-  {PC_9,   OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO0
-  {PD_11,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO0
-  {NC,     NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA1[] = {
-  {PB_0,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO1
-  {PC_10, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO1
-  {PD_12, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO1
-  {NC,    NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA2[] = {
-  {PA_3,   OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO2
-  {PA_7,   OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO2
-  {PB_13,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO2
-  {PC_2_C, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO2
-  {PE_2,   OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO2
-  {NC,     NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA3[] = {
-  {PA_1,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO3
-  {PA_6,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO3
-  {PD_13, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO3
-  {NC,    NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA4[] = {
-  {PC_1, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO4
-  {PD_4, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO4
-  {PE_7, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO4
-  {NC,   NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA5[] = {
-  {PC_2_C, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO5
-  {PD_5,   OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO5
-  {PE_8,   OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO5
-  {NC,     NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA6[] = {
-  {PC_3_C, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO6
-  {NC,     NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_SCLK[] = {
-  {PA_3, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OCTOSPIM_P1)}, // OCTOSPIM_P1_CLK
-  {PB_2, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_CLK
-  {NC,   NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_SSEL[] = {
-  {PB_6,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_NCS
-  {PB_10, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_NCS
-  {PC_11, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_NCS
-  {NC,    NP,       0}
-};
-#endif
-
-//*** USB ***
-
-#if defined(HAL_PCD_MODULE_ENABLED) || defined(HAL_HCD_MODULE_ENABLED)
-WEAK const PinMap PinMap_USB_OTG_HS[] = {
-#ifdef USE_USB_HS_IN_FS
-  {PA_8,   USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_SOF
-  {PA_9,   USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
-  {PA_10,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ID
-  {PA_11,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)}, // USB_OTG_HS_DM
-  {PA_12,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)}, // USB_OTG_HS_DP
-#else
-  {PA_3,   USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D0
-  {PA_5,   USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_CK
-  {PB_0,   USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D1
-  {PB_1,   USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D2
-  {PB_5,   USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D7
-  {PB_10,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D3
-  {PB_11,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D4
-  {PB_12,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D5
-  {PB_13,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D6
-  {PC_0,   USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_STP
-  {PC_2_C, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_DIR
-  {PC_3_C, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_NXT
-#endif /* USE_USB_HS_IN_FS */
-  {NC,     NP,         0}
-};
-#endif
-
-//*** SD ***
-
-#ifdef HAL_SD_MODULE_ENABLED
-WEAK const PinMap PinMap_SD[] = {
-  {PA_0,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_SDMMC2)}, // SDMMC2_CMD
-  {PB_3,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_SDMMC2)}, // SDMMC2_D2
-  {PB_4,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_SDMMC2)}, // SDMMC2_D3
-  {PB_8,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF7_SDMMC1)}, // SDMMC1_CKIN
-  {PB_8_ALT1, SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D4
-  {PB_8_ALT2, SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_SDMMC2)}, // SDMMC2_D4
-  {PB_9,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF7_SDMMC1)}, // SDMMC1_CDIR
-  {PB_9_ALT1, SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D5
-  {PB_9_ALT2, SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_SDMMC2)}, // SDMMC2_D5
-  {PB_13,     SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D0
-  {PB_14,     SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_SDMMC2)}, // SDMMC2_D0
-  {PB_15,     SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_SDMMC2)}, // SDMMC2_D1
-  {PC_1,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_SDMMC2)}, // SDMMC2_CK
-  {PC_4,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF10_SDMMC2)}, // SDMMC2_CKIN
-  {PC_6,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF8_SDMMC1)}, // SDMMC1_D0DIR
-  {PC_6_ALT1, SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D6
-  {PC_6_ALT2, SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_SDMMC2)}, // SDMMC2_D6
-  {PC_7,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF8_SDMMC1)}, // SDMMC1_D123DIR
-  {PC_7_ALT1, SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D7
-  {PC_7_ALT2, SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_SDMMC2)}, // SDMMC2_D7
-  {PC_8,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D0
-  {PC_9,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D1
-  {PC_10,     SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D2
-  {PC_11,     SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D3
-  {PC_12,     SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDMMC1)}, // SDMMC1_CK
-  {PD_2,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDMMC1)}, // SDMMC1_CMD
-  {NC,        NP,     0}
-};
-#endif
-
-#endif /* !CUSTOM_PERIPHERAL_PINS */
diff --git a/variants/STM32H7xx/H735VGT/PeripheralPins.c b/variants/STM32H7xx/H725V(E-G)T_H735VGT/PeripheralPins.c
similarity index 99%
rename from variants/STM32H7xx/H735VGT/PeripheralPins.c
rename to variants/STM32H7xx/H725V(E-G)T_H735VGT/PeripheralPins.c
index f4c9c208ea..72b24c9d1a 100644
--- a/variants/STM32H7xx/H735VGT/PeripheralPins.c
+++ b/variants/STM32H7xx/H725V(E-G)T_H735VGT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -11,8 +11,9 @@
  *******************************************************************************
  */
 /*
- * Automatically generated from STM32H735VGTx.xml
- * CubeMX DB release 6.0.30
+ * Automatically generated from STM32H725VETx.xml, STM32H725VGTx.xml
+ * STM32H735VGTx.xml
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
@@ -254,7 +255,6 @@ WEAK const PinMap PinMap_UART_RTS[] = {
   {PD_4,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
   {PD_12,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
   {PD_13,      UART9,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART9)},
-  {PD_15,      UART8,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART8)},
   {NC,         NP,      0}
 };
 #endif
@@ -271,7 +271,6 @@ WEAK const PinMap PinMap_UART_CTS[] = {
   {PD_0,       UART9,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART9)},
   {PD_3,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
   {PD_11,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PD_14,      UART8,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART8)},
   {NC,         NP,      0}
 };
 #endif
diff --git a/variants/STM32H7xx/H725V(E-G)T/PinNamesVar.h b/variants/STM32H7xx/H725V(E-G)T_H735VGT/PinNamesVar.h
similarity index 100%
rename from variants/STM32H7xx/H725V(E-G)T/PinNamesVar.h
rename to variants/STM32H7xx/H725V(E-G)T_H735VGT/PinNamesVar.h
diff --git a/variants/STM32H7xx/H725V(E-G)T/boards_entry.txt b/variants/STM32H7xx/H725V(E-G)T_H735VGT/boards_entry.txt
similarity index 69%
rename from variants/STM32H7xx/H725V(E-G)T/boards_entry.txt
rename to variants/STM32H7xx/H725V(E-G)T_H735VGT/boards_entry.txt
index fdb722ebb6..962b861501 100644
--- a/variants/STM32H7xx/H725V(E-G)T/boards_entry.txt
+++ b/variants/STM32H7xx/H725V(E-G)T_H735VGT/boards_entry.txt
@@ -9,7 +9,7 @@ GenH7.menu.pnum.GENERIC_H725VETX.upload.maximum_size=524288
 GenH7.menu.pnum.GENERIC_H725VETX.upload.maximum_data_size=1048576
 GenH7.menu.pnum.GENERIC_H725VETX.build.board=GENERIC_H725VETX
 GenH7.menu.pnum.GENERIC_H725VETX.build.product_line=STM32H725xx
-GenH7.menu.pnum.GENERIC_H725VETX.build.variant=STM32H7xx/H725V(E-G)T
+GenH7.menu.pnum.GENERIC_H725VETX.build.variant=STM32H7xx/H725V(E-G)T_H735VGT
 
 # Generic H725VGTx
 GenH7.menu.pnum.GENERIC_H725VGTX=Generic H725VGTx
@@ -17,5 +17,13 @@ GenH7.menu.pnum.GENERIC_H725VGTX.upload.maximum_size=1048576
 GenH7.menu.pnum.GENERIC_H725VGTX.upload.maximum_data_size=1048576
 GenH7.menu.pnum.GENERIC_H725VGTX.build.board=GENERIC_H725VGTX
 GenH7.menu.pnum.GENERIC_H725VGTX.build.product_line=STM32H725xx
-GenH7.menu.pnum.GENERIC_H725VGTX.build.variant=STM32H7xx/H725V(E-G)T
+GenH7.menu.pnum.GENERIC_H725VGTX.build.variant=STM32H7xx/H725V(E-G)T_H735VGT
+
+# Generic H735VGTx
+GenH7.menu.pnum.GENERIC_H735VGTX=Generic H735VGTx
+GenH7.menu.pnum.GENERIC_H735VGTX.upload.maximum_size=1048576
+GenH7.menu.pnum.GENERIC_H735VGTX.upload.maximum_data_size=1048576
+GenH7.menu.pnum.GENERIC_H735VGTX.build.board=GENERIC_H735VGTX
+GenH7.menu.pnum.GENERIC_H735VGTX.build.product_line=STM32H735xx
+GenH7.menu.pnum.GENERIC_H735VGTX.build.variant=STM32H7xx/H725V(E-G)T_H735VGT
 
diff --git a/variants/STM32H7xx/H725V(E-G)T/generic_clock.c b/variants/STM32H7xx/H725V(E-G)T_H735VGT/generic_clock.c
similarity index 89%
rename from variants/STM32H7xx/H725V(E-G)T/generic_clock.c
rename to variants/STM32H7xx/H725V(E-G)T_H735VGT/generic_clock.c
index a1dce8c98c..0ef517e976 100644
--- a/variants/STM32H7xx/H725V(E-G)T/generic_clock.c
+++ b/variants/STM32H7xx/H725V(E-G)T_H735VGT/generic_clock.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -10,7 +10,8 @@
  *
  *******************************************************************************
  */
-#if defined(ARDUINO_GENERIC_H725VETX) || defined(ARDUINO_GENERIC_H725VGTX)
+#if defined(ARDUINO_GENERIC_H725VETX) || defined(ARDUINO_GENERIC_H725VGTX) ||\
+    defined(ARDUINO_GENERIC_H735VGTX)
 #include "pins_arduino.h"
 
 /**
diff --git a/variants/STM32H7xx/H725V(E-G)T/variant_generic.cpp b/variants/STM32H7xx/H725V(E-G)T_H735VGT/variant_generic.cpp
similarity index 95%
rename from variants/STM32H7xx/H725V(E-G)T/variant_generic.cpp
rename to variants/STM32H7xx/H725V(E-G)T_H735VGT/variant_generic.cpp
index 4905f97e54..4ba20f69ee 100644
--- a/variants/STM32H7xx/H725V(E-G)T/variant_generic.cpp
+++ b/variants/STM32H7xx/H725V(E-G)T_H735VGT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -10,7 +10,8 @@
  *
  *******************************************************************************
  */
-#if defined(ARDUINO_GENERIC_H725VETX) || defined(ARDUINO_GENERIC_H725VGTX)
+#if defined(ARDUINO_GENERIC_H725VETX) || defined(ARDUINO_GENERIC_H725VGTX) ||\
+    defined(ARDUINO_GENERIC_H735VGTX)
 #include "pins_arduino.h"
 
 // Digital PinName array
diff --git a/variants/STM32H7xx/H725V(E-G)T/variant_generic.h b/variants/STM32H7xx/H725V(E-G)T_H735VGT/variant_generic.h
similarity index 99%
rename from variants/STM32H7xx/H725V(E-G)T/variant_generic.h
rename to variants/STM32H7xx/H725V(E-G)T_H735VGT/variant_generic.h
index c3b7057194..fb1a28b9b7 100644
--- a/variants/STM32H7xx/H725V(E-G)T/variant_generic.h
+++ b/variants/STM32H7xx/H725V(E-G)T_H735VGT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H725VGY_H735VGY/PeripheralPins.c b/variants/STM32H7xx/H725VGY_H735VGY/PeripheralPins.c
index 88a58c2a2b..3807345db7 100644
--- a/variants/STM32H7xx/H725VGY_H735VGY/PeripheralPins.c
+++ b/variants/STM32H7xx/H725VGY_H735VGY/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32H725VGYx.xml, STM32H735VGYx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
@@ -234,7 +234,6 @@ WEAK const PinMap PinMap_UART_RX[] = {
   {PD_2,       UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
   {PD_9,       USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
   {PD_14,      UART9,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART9)},
-  {PE_0,       UART8,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART8)},
   {PE_7,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
   {NC,         NP,      0}
 };
@@ -252,7 +251,6 @@ WEAK const PinMap PinMap_UART_RTS[] = {
   {PD_4,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
   {PD_12,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
   {PD_13,      UART9,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART9)},
-  {PD_15,      UART8,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART8)},
   {NC,         NP,      0}
 };
 #endif
@@ -269,7 +267,6 @@ WEAK const PinMap PinMap_UART_CTS[] = {
   {PD_0,       UART9,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART9)},
   {PD_3,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
   {PD_11,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PD_14,      UART8,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART8)},
   {NC,         NP,      0}
 };
 #endif
diff --git a/variants/STM32H7xx/H725VGY_H735VGY/variant_generic.cpp b/variants/STM32H7xx/H725VGY_H735VGY/variant_generic.cpp
index 982c3e5600..04077697ad 100644
--- a/variants/STM32H7xx/H725VGY_H735VGY/variant_generic.cpp
+++ b/variants/STM32H7xx/H725VGY_H735VGY/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H725VGY_H735VGY/variant_generic.h b/variants/STM32H7xx/H725VGY_H735VGY/variant_generic.h
index 8a72b192cd..29808b9a71 100644
--- a/variants/STM32H7xx/H725VGY_H735VGY/variant_generic.h
+++ b/variants/STM32H7xx/H725VGY_H735VGY/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H725Z(E-G)T_H735ZGT/PeripheralPins.c b/variants/STM32H7xx/H725Z(E-G)T_H735ZGT/PeripheralPins.c
index 1e7ea3187a..a3bd56a719 100644
--- a/variants/STM32H7xx/H725Z(E-G)T_H735ZGT/PeripheralPins.c
+++ b/variants/STM32H7xx/H725Z(E-G)T_H735ZGT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32H725ZETx.xml, STM32H725ZGTx.xml
  * STM32H735ZGTx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32H7xx/H725Z(E-G)T_H735ZGT/variant_generic.cpp b/variants/STM32H7xx/H725Z(E-G)T_H735ZGT/variant_generic.cpp
index 53305af18b..0bb8eadc70 100644
--- a/variants/STM32H7xx/H725Z(E-G)T_H735ZGT/variant_generic.cpp
+++ b/variants/STM32H7xx/H725Z(E-G)T_H735ZGT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H725Z(E-G)T_H735ZGT/variant_generic.h b/variants/STM32H7xx/H725Z(E-G)T_H735ZGT/variant_generic.h
index ed8ca7b37c..6bfe25822e 100644
--- a/variants/STM32H7xx/H725Z(E-G)T_H735ZGT/variant_generic.h
+++ b/variants/STM32H7xx/H725Z(E-G)T_H735ZGT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H730ABIxQ/PeripheralPins.c b/variants/STM32H7xx/H730ABIxQ/PeripheralPins.c
deleted file mode 100644
index 40fe5ae466..0000000000
--- a/variants/STM32H7xx/H730ABIxQ/PeripheralPins.c
+++ /dev/null
@@ -1,707 +0,0 @@
-/*
- *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
- * All rights reserved.
- *
- * This software component is licensed by ST under BSD 3-Clause license,
- * the "License"; You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *                        opensource.org/licenses/BSD-3-Clause
- *
- *******************************************************************************
- */
-/*
- * Automatically generated from STM32H730ABIxQ.xml
- * CubeMX DB release 6.0.30
- */
-#if !defined(CUSTOM_PERIPHERAL_PINS)
-#include "Arduino.h"
-#include "PeripheralPins.h"
-
-/* =====
- * Notes:
- * - The pins mentioned Px_y_ALTz are alternative possibilities which use other
- *   HW peripheral instances. You can use them the same way as any other "normal"
- *   pin (i.e. analogWrite(PA7_ALT1, 128);).
- *
- * - Commented lines are alternative possibilities which are not used per default.
- *   If you change them, you will have to know what you do
- * =====
- */
-
-//*** ADC ***
-
-#ifdef HAL_ADC_MODULE_ENABLED
-WEAK const PinMap PinMap_ADC[] = {
-  {PA_0,        ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 16, 0)}, // ADC1_INP16
-  {PA_0_C,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC1_INP0
-  {PA_0_C_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC2_INP0
-  {PA_1,        ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 17, 0)}, // ADC1_INP17
-  {PA_1_C,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC1_INP1
-  {PA_1_C_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC2_INP1
-  {PA_2,        ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC1_INP14
-  {PA_2_ALT1,   ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC2_INP14
-  {PA_3,        ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC1_INP15
-  {PA_3_ALT1,   ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC2_INP15
-  {PA_4,        ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 18, 0)}, // ADC1_INP18
-  {PA_4_ALT1,   ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 18, 0)}, // ADC2_INP18
-  {PA_5,        ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 19, 0)}, // ADC1_INP19
-  {PA_5_ALT1,   ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 19, 0)}, // ADC2_INP19
-  {PA_6,        ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC1_INP3
-  {PA_6_ALT1,   ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC2_INP3
-  {PA_7,        ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC1_INP7
-  {PA_7_ALT1,   ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC2_INP7
-  {PB_0,        ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC1_INP9
-  {PB_0_ALT1,   ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC2_INP9
-  {PB_1,        ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC1_INP5
-  {PB_1_ALT1,   ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC2_INP5
-  {PC_0,        ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC1_INP10
-  {PC_0_ALT1,   ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC2_INP10
-  {PC_0_ALT2,   ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC3_INP10
-  {PC_1,        ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC1_INP11
-  {PC_1_ALT1,   ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC2_INP11
-  {PC_1_ALT2,   ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC3_INP11
-  {PC_2,        ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 12, 0)}, // ADC1_INP12
-  {PC_2_ALT1,   ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 12, 0)}, // ADC2_INP12
-  {PC_2_ALT2,   ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 12, 0)}, // ADC3_INP12
-  {PC_2_C,      ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC3_INP0
-  {PC_3,        ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 13, 0)}, // ADC1_INP13
-  {PC_3_ALT1,   ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 13, 0)}, // ADC2_INP13
-  {PC_3_C,      ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC3_INP1
-  {PC_4,        ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC1_INP4
-  {PC_4_ALT1,   ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC2_INP4
-  {PC_5,        ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC1_INP8
-  {PC_5_ALT1,   ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC2_INP8
-  {PF_3,        ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC3_INP5
-  {PF_4,        ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC3_INP9
-  {PF_5,        ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC3_INP4
-  {PF_6,        ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC3_INP8
-  {PF_7,        ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC3_INP3
-  {PF_8,        ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC3_INP7
-  {PF_9,        ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC3_INP2
-  {PF_10,       ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC3_INP6
-  {PF_11,       ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC1_INP2
-  {PF_12,       ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC1_INP6
-  {PF_13,       ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC2_INP2
-  {PF_14,       ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC2_INP6
-  {PH_2,        ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 13, 0)}, // ADC3_INP13
-  {PH_3,        ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC3_INP14
-  {NC,          NP,   0}
-};
-#endif
-
-//*** DAC ***
-
-#ifdef HAL_DAC_MODULE_ENABLED
-WEAK const PinMap PinMap_DAC[] = {
-  {PA_4, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // DAC1_OUT1
-  {PA_5, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // DAC1_OUT2
-  {NC,   NP,   0}
-};
-#endif
-
-//*** I2C ***
-
-#ifdef HAL_I2C_MODULE_ENABLED
-WEAK const PinMap PinMap_I2C_SDA[] = {
-  {PB_7,      I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
-  {PB_7_ALT1, I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C4)},
-  {PB_9,      I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
-  {PB_9_ALT1, I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C4)},
-  {PB_11,     I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
-  {PC_9,      I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
-  {PC_9_ALT1, I2C5, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C5)},
-  {PC_10,     I2C5, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C5)},
-  {PD_13,     I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C4)},
-  {PF_0,      I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
-  {PF_0_ALT1, I2C5, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C5)},
-  {PF_15,     I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C4)},
-  {PH_12,     I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C4)},
-  {NC,        NP,   0}
-};
-#endif
-
-#ifdef HAL_I2C_MODULE_ENABLED
-WEAK const PinMap PinMap_I2C_SCL[] = {
-  {PA_8,      I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
-  {PA_8_ALT1, I2C5, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C5)},
-  {PB_6,      I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
-  {PB_6_ALT1, I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C4)},
-  {PB_8,      I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
-  {PB_8_ALT1, I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C4)},
-  {PB_10,     I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
-  {PC_11,     I2C5, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C5)},
-  {PD_12,     I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C4)},
-  {PF_1,      I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
-  {PF_1_ALT1, I2C5, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C5)},
-  {PF_14,     I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C4)},
-  {PH_11,     I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C4)},
-  {NC,        NP,   0}
-};
-#endif
-
-//*** TIM ***
-
-#ifdef HAL_TIM_MODULE_ENABLED
-WEAK const PinMap PinMap_TIM[] = {
-  {PA_0,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
-  {PA_0_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)}, // TIM5_CH1
-  {PA_1,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
-  {PA_1_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 2, 0)}, // TIM5_CH2
-  {PA_1_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM15, 1, 1)}, // TIM15_CH1N
-  {PA_2,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
-  {PA_2_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 3, 0)}, // TIM5_CH3
-  {PA_2_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM15, 1, 0)}, // TIM15_CH1
-  {PA_3,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4
-  {PA_3_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 4, 0)}, // TIM5_CH4
-  {PA_3_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM15, 2, 0)}, // TIM15_CH2
-  {PA_5,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
-  {PA_5_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 1)}, // TIM8_CH1N
-  {PA_6,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
-  {PA_6_ALT1,  TIM13, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM13, 1, 0)}, // TIM13_CH1
-  {PA_7,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
-  {PA_7_ALT1,  TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
-  {PA_7_ALT2,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 1)}, // TIM8_CH1N
-  {PA_7_ALT3,  TIM14, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM14, 1, 0)}, // TIM14_CH1
-  {PA_8,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)}, // TIM1_CH1
-  {PA_9,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 0)}, // TIM1_CH2
-  {PA_10,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 0)}, // TIM1_CH3
-  {PA_11,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 4, 0)}, // TIM1_CH4
-  {PA_15,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
-  {PB_0,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
-  {PB_0_ALT1,  TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)}, // TIM3_CH3
-  {PB_0_ALT2,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 1)}, // TIM8_CH2N
-  {PB_1,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
-  {PB_1_ALT1,  TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
-  {PB_1_ALT2,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 1)}, // TIM8_CH3N
-  {PB_3,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
-  {PB_4,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
-  {PB_5,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
-  {PB_6,       TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 1, 0)}, // TIM4_CH1
-  {PB_6_ALT1,  TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM16, 1, 1)}, // TIM16_CH1N
-  {PB_7,       TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 2, 0)}, // TIM4_CH2
-  {PB_7_ALT1,  TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM17, 1, 1)}, // TIM17_CH1N
-  {PB_8,       TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 3, 0)}, // TIM4_CH3
-  {PB_8_ALT1,  TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM16, 1, 0)}, // TIM16_CH1
-  {PB_9,       TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)}, // TIM4_CH4
-  {PB_9_ALT1,  TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM17, 1, 0)}, // TIM17_CH1
-  {PB_10,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
-  {PB_11,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4
-  {PB_13,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
-  {PB_14,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
-  {PB_14_ALT1, TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 1)}, // TIM8_CH2N
-  {PB_14_ALT2, TIM12, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM12, 1, 0)}, // TIM12_CH1
-  {PB_15,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
-  {PB_15_ALT1, TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 1)}, // TIM8_CH3N
-  {PB_15_ALT2, TIM12, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM12, 2, 0)}, // TIM12_CH2
-  {PC_6,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
-  {PC_6_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 0)}, // TIM8_CH1
-  {PC_7,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
-  {PC_7_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 0)}, // TIM8_CH2
-  {PC_8,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)}, // TIM3_CH3
-  {PC_8_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 0)}, // TIM8_CH3
-  {PC_9,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
-  {PC_9_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 4, 0)}, // TIM8_CH4
-  {PC_12,      TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM15, 1, 0)}, // TIM15_CH1
-  {PD_12,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 1, 0)}, // TIM4_CH1
-  {PD_13,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 2, 0)}, // TIM4_CH2
-  {PD_14,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 3, 0)}, // TIM4_CH3
-  {PD_15,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)}, // TIM4_CH4
-  {PE_4,       TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM15, 1, 1)}, // TIM15_CH1N
-  {PE_5,       TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM15, 1, 0)}, // TIM15_CH1
-  {PE_6,       TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM15, 2, 0)}, // TIM15_CH2
-  {PE_8,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
-  {PE_9,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)}, // TIM1_CH1
-  {PE_10,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
-  {PE_11,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 0)}, // TIM1_CH2
-  {PE_12,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
-  {PE_13,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 0)}, // TIM1_CH3
-  {PE_14,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 4, 0)}, // TIM1_CH4
-  {PF_0,       TIM23, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF13_TIM23, 1, 0)}, // TIM23_CH1
-  {PF_1,       TIM23, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF13_TIM23, 2, 0)}, // TIM23_CH2
-  {PF_2,       TIM23, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF13_TIM23, 3, 0)}, // TIM23_CH3
-  {PF_3,       TIM23, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF13_TIM23, 4, 0)}, // TIM23_CH4
-  {PF_6,       TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM16, 1, 0)}, // TIM16_CH1
-  {PF_6_ALT1,  TIM23, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF13_TIM23, 1, 0)}, // TIM23_CH1
-  {PF_7,       TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM17, 1, 0)}, // TIM17_CH1
-  {PF_7_ALT1,  TIM23, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF13_TIM23, 2, 0)}, // TIM23_CH2
-  {PF_8,       TIM13, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM13, 1, 0)}, // TIM13_CH1
-  {PF_8_ALT1,  TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM16, 1, 1)}, // TIM16_CH1N
-  {PF_8_ALT2,  TIM23, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF13_TIM23, 3, 0)}, // TIM23_CH3
-  {PF_9,       TIM14, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM14, 1, 0)}, // TIM14_CH1
-  {PF_9_ALT1,  TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM17, 1, 1)}, // TIM17_CH1N
-  {PF_9_ALT2,  TIM23, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF13_TIM23, 4, 0)}, // TIM23_CH4
-  {PF_11,      TIM24, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM24, 1, 0)}, // TIM24_CH1
-  {PF_12,      TIM24, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM24, 2, 0)}, // TIM24_CH2
-  {PF_13,      TIM24, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM24, 3, 0)}, // TIM24_CH3
-  {PF_14,      TIM24, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM24, 4, 0)}, // TIM24_CH4
-  {PG_12,      TIM23, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF13_TIM23, 1, 0)}, // TIM23_CH1
-  {PG_13,      TIM23, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF13_TIM23, 2, 0)}, // TIM23_CH2
-  {PG_14,      TIM23, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF13_TIM23, 3, 0)}, // TIM23_CH3
-  {PH_10,      TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)}, // TIM5_CH1
-  {PH_11,      TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 2, 0)}, // TIM5_CH2
-  {PH_12,      TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 3, 0)}, // TIM5_CH3
-  {PH_13,      TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 1)}, // TIM8_CH1N
-  {PH_14,      TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 1)}, // TIM8_CH2N
-  {NC,         NP,    0}
-};
-#endif
-
-//*** UART ***
-
-#ifdef HAL_UART_MODULE_ENABLED
-WEAK const PinMap PinMap_UART_TX[] = {
-  {PA_0,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PA_2,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PA_9,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_LPUART)},
-  {PA_9_ALT1,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PA_12,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_UART4)},
-  {PA_15,      UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART7)},
-  {PB_4,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART7)},
-  {PB_6,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART)},
-  {PB_6_ALT1,  UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_UART5)},
-  {PB_6_ALT2,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PB_9,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PB_10,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PB_13,      UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_UART5)},
-  {PB_14,      USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART1)},
-  {PC_6,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
-  {PC_10,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PC_10_ALT1, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PC_12,      UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
-  {PD_1,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PD_5,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PD_8,       USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PD_15,      UART9,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART9)},
-  {PE_1,       UART8,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART8)},
-  {PE_8,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
-  {PF_7,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
-  {PG_1,       UART9,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART9)},
-  {PG_14,      USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
-  {PH_13,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {NC,         NP,      0}
-};
-#endif
-
-#ifdef HAL_UART_MODULE_ENABLED
-WEAK const PinMap PinMap_UART_RX[] = {
-  {PA_1,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PA_3,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PA_8,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART7)},
-  {PA_10,      LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_LPUART)},
-  {PA_10_ALT1, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PA_11,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_UART4)},
-  {PB_3,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART7)},
-  {PB_5,       UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_UART5)},
-  {PB_7,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART)},
-  {PB_7_ALT1,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PB_8,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PB_11,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PB_12,      UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_UART5)},
-  {PB_15,      USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART1)},
-  {PC_7,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
-  {PC_11,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PC_11_ALT1, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PD_0,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PD_2,       UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
-  {PD_6,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PD_9,       USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PD_14,      UART9,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART9)},
-  {PE_0,       UART8,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART8)},
-  {PE_7,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
-  {PF_6,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
-  {PG_0,       UART9,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART9)},
-  {PG_9,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
-  {PH_14,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {NC,         NP,      0}
-};
-#endif
-
-#ifdef HAL_UART_MODULE_ENABLED
-WEAK const PinMap PinMap_UART_RTS[] = {
-  {PA_1,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PA_12,      LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_LPUART)},
-  {PA_12_ALT1, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PA_15,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PB_14,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PB_14_ALT1, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PC_8,       UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
-  {PD_4,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PD_12,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PD_13,      UART9,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART9)},
-  {PD_15,      UART8,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART8)},
-  {PE_9,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
-  {PF_8,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
-  {PG_8,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
-  {PG_12,      USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
-  {NC,         NP,      0}
-};
-#endif
-
-#ifdef HAL_UART_MODULE_ENABLED
-WEAK const PinMap PinMap_UART_CTS[] = {
-  {PA_0,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PA_11,      LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_LPUART)},
-  {PA_11_ALT1, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PB_0,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PB_13,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PB_15,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PC_9,       UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
-  {PD_0,       UART9,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART9)},
-  {PD_3,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PD_11,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PD_14,      UART8,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART8)},
-  {PE_10,      UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
-  {PF_9,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
-  {PG_13,      USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
-  {PG_15,      USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
-  {NC,         NP,      0}
-};
-#endif
-
-//*** SPI ***
-
-#ifdef HAL_SPI_MODULE_ENABLED
-WEAK const PinMap PinMap_SPI_MOSI[] = {
-  {PA_7,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PA_7_ALT1, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
-  {PB_2,      SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_SPI3)},
-  {PB_5,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PB_5_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_SPI3)},
-  {PB_5_ALT2, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
-  {PB_15,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PC_1,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PC_3,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)},
-  {PC_12,     SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PD_6,      SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI3)},
-  {PD_7,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PE_6,      SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  {PE_14,     SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  {PF_9,      SPI5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI5)},
-  {PF_11,     SPI5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI5)},
-  {PG_14,     SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI6)},
-  {NC,        NP,   0}
-};
-#endif
-
-#ifdef HAL_SPI_MODULE_ENABLED
-WEAK const PinMap PinMap_SPI_MISO[] = {
-  {PA_6,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PA_6_ALT1, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
-  {PB_4,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PB_4_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PB_4_ALT2, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
-  {PB_14,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PC_2,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)},
-  {PC_11,     SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PE_5,      SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  {PE_13,     SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  {PF_8,      SPI5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI5)},
-  {PG_9,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PG_12,     SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI6)},
-  {NC,        NP,   0}
-};
-#endif
-
-#ifdef HAL_SPI_MODULE_ENABLED
-WEAK const PinMap PinMap_SPI_SCLK[] = {
-  {PA_5,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PA_5_ALT1, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
-  {PA_9,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PA_12,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PB_3,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PB_3_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PB_3_ALT2, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
-  {PB_10,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PB_13,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PC_10,     SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PC_12,     SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI6)},
-  {PD_3,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PE_2,      SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  {PE_12,     SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  {PF_7,      SPI5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI5)},
-  {PG_11,     SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PG_13,     SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI6)},
-  {NC,        NP,   0}
-};
-#endif
-
-#ifdef HAL_SPI_MODULE_ENABLED
-WEAK const PinMap PinMap_SPI_SSEL[] = {
-  {PA_0,       SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI6)},
-  {PA_4,       SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PA_4_ALT1,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PA_4_ALT2,  SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
-  {PA_11,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PA_15,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PA_15_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PA_15_ALT2, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_SPI6)},
-  {PB_4,       SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_SPI2)},
-  {PB_9,       SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PB_12,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PE_4,       SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  {PE_11,      SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  {PF_6,       SPI5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI5)},
-  {PG_8,       SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI6)},
-  {PG_10,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {NC,         NP,   0}
-};
-#endif
-
-//*** FDCAN ***
-
-#ifdef HAL_FDCAN_MODULE_ENABLED
-WEAK const PinMap PinMap_CAN_RD[] = {
-  {PA_11, FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
-  {PB_5,  FDCAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN2)},
-  {PB_8,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
-  {PB_12, FDCAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN2)},
-  {PD_0,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
-  {PD_12, FDCAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF5_FDCAN3)},
-  {PF_6,  FDCAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF2_FDCAN3)},
-  {PG_10, FDCAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF2_FDCAN3)},
-  {PH_14, FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
-  {NC,    NP,     0}
-};
-#endif
-
-#ifdef HAL_FDCAN_MODULE_ENABLED
-WEAK const PinMap PinMap_CAN_TD[] = {
-  {PA_12, FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
-  {PB_6,  FDCAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN2)},
-  {PB_9,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
-  {PB_13, FDCAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN2)},
-  {PD_1,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
-  {PD_13, FDCAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF5_FDCAN3)},
-  {PF_7,  FDCAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF2_FDCAN3)},
-  {PG_9,  FDCAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF2_FDCAN3)},
-  {PH_13, FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
-  {NC,    NP,     0}
-};
-#endif
-
-//*** ETHERNET ***
-
-#ifdef HAL_ETH_MODULE_ENABLED
-WEAK const PinMap PinMap_Ethernet[] = {
-  {PA_0,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
-  {PA_1,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_REF_CLK
-  {PA_1_ALT1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RX_CLK
-  {PA_2,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_MDIO
-  {PA_3,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_COL
-  {PA_7,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS_DV
-  {PA_7_ALT1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RX_DV
-  {PA_9,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TX_ER
-  {PB_0,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RXD2
-  {PB_1,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RXD3
-  {PB_2,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TX_ER
-  {PB_5,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_PPS_OUT
-  {PB_8,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD3
-  {PB_10,     ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RX_ER
-  {PB_11,     ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TX_EN
-  {PB_12,     ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD0
-  {PB_13,     ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD1
-  {PC_1,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_MDC
-  {PC_2,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)}, // ETH_TXD2
-  {PC_3,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)}, // ETH_TX_CLK
-  {PC_4,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RXD0
-  {PC_5,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RXD1
-  {PE_2,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD3
-  {PG_8,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_PPS_OUT
-  {PG_11,     ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TX_EN
-  {PG_12,     ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD1
-  {PG_13,     ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD0
-  {PG_14,     ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD1
-  {PH_2,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
-  {PH_3,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_COL
-  {NC,        NP,  0}
-};
-#endif
-
-//*** OCTOSPI ***
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA0[] = {
-  {PA_2,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO0
-  {PB_1,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO0
-  {PB_12, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO0
-  {PC_3,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)}, // OCTOSPIM_P1_IO0
-  {PC_9,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO0
-  {PD_11, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO0
-  {PF_0,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P2)}, // OCTOSPIM_P2_IO0
-  {PF_8,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO0
-  {NC,    NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA1[] = {
-  {PB_0,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO1
-  {PC_10, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO1
-  {PD_12, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO1
-  {PF_1,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P2)}, // OCTOSPIM_P2_IO1
-  {PF_9,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO1
-  {NC,    NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA2[] = {
-  {PA_3,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO2
-  {PA_7,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO2
-  {PB_13, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO2
-  {PC_2,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)}, // OCTOSPIM_P1_IO2
-  {PE_2,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO2
-  {PF_2,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P2)}, // OCTOSPIM_P2_IO2
-  {PF_7,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO2
-  {NC,    NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA3[] = {
-  {PA_1,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO3
-  {PA_6,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO3
-  {PD_13, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO3
-  {PF_3,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P2)}, // OCTOSPIM_P2_IO3
-  {PF_6,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO3
-  {NC,    NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA4[] = {
-  {PC_1, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO4
-  {PD_4, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO4
-  {PE_7, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO4
-  {PG_0, OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P2)}, // OCTOSPIM_P2_IO4
-  {PH_2, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO4
-  {NC,   NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA5[] = {
-  {PC_2, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)}, // OCTOSPIM_P1_IO5
-  {PD_5, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO5
-  {PE_8, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO5
-  {PG_1, OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P2)}, // OCTOSPIM_P2_IO5
-  {PH_3, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO5
-  {NC,   NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA6[] = {
-  {PC_3,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)}, // OCTOSPIM_P1_IO6
-  {PD_6,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO6
-  {PE_9,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO6
-  {PG_9,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO6
-  {PG_10, OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_OCTOSPIM_P2)}, // OCTOSPIM_P2_IO6
-  {NC,    NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA7[] = {
-  {PD_7,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO7
-  {PE_10, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO7
-  {PG_11, OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P2)}, // OCTOSPIM_P2_IO7
-  {PG_14, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO7
-  {NC,    NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_SCLK[] = {
-  {PA_3,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OCTOSPIM_P1)}, // OCTOSPIM_P1_CLK
-  {PB_2,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_CLK
-  {PF_4,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P2)}, // OCTOSPIM_P2_CLK
-  {PF_10, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_CLK
-  {NC,    NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_SSEL[] = {
-  {PB_6,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_NCS
-  {PB_10, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_NCS
-  {PC_11, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_NCS
-  {PE_11, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_OCTOSPIM_P1)}, // OCTOSPIM_P1_NCS
-  {PG_6,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_NCS
-  {PG_12, OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_OCTOSPIM_P2)}, // OCTOSPIM_P2_NCS
-  {NC,    NP,       0}
-};
-#endif
-
-//*** USB ***
-
-#if defined(HAL_PCD_MODULE_ENABLED) || defined(HAL_HCD_MODULE_ENABLED)
-WEAK const PinMap PinMap_USB_OTG_HS[] = {
-#ifdef USE_USB_HS_IN_FS
-  {PA_8,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_SOF
-  {PA_9,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
-  {PA_10, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ID
-  {PA_11, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)}, // USB_OTG_HS_DM
-  {PA_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)}, // USB_OTG_HS_DP
-#else
-  {PA_3,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D0
-  {PA_5,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_CK
-  {PB_0,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D1
-  {PB_1,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D2
-  {PB_5,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D7
-  {PB_10, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D3
-  {PB_11, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D4
-  {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D5
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D6
-  {PC_0,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_STP
-  {PC_2,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)}, // USB_OTG_HS_ULPI_DIR
-  {PC_3,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)}, // USB_OTG_HS_ULPI_NXT
-#endif /* USE_USB_HS_IN_FS */
-  {NC,    NP,         0}
-};
-#endif
-
-//*** SD ***
-
-#ifdef HAL_SD_MODULE_ENABLED
-WEAK const PinMap PinMap_SD[] = {
-  {PA_0,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_SDMMC2)}, // SDMMC2_CMD
-  {PB_3,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_SDMMC2)}, // SDMMC2_D2
-  {PB_4,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_SDMMC2)}, // SDMMC2_D3
-  {PB_8,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF7_SDMMC1)}, // SDMMC1_CKIN
-  {PB_8_ALT1, SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D4
-  {PB_8_ALT2, SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_SDMMC2)}, // SDMMC2_D4
-  {PB_9,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF7_SDMMC1)}, // SDMMC1_CDIR
-  {PB_9_ALT1, SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D5
-  {PB_9_ALT2, SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_SDMMC2)}, // SDMMC2_D5
-  {PB_13,     SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D0
-  {PB_14,     SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_SDMMC2)}, // SDMMC2_D0
-  {PB_15,     SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_SDMMC2)}, // SDMMC2_D1
-  {PC_1,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_SDMMC2)}, // SDMMC2_CK
-  {PC_4,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF10_SDMMC2)}, // SDMMC2_CKIN
-  {PC_6,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF8_SDMMC1)}, // SDMMC1_D0DIR
-  {PC_6_ALT1, SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D6
-  {PC_6_ALT2, SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_SDMMC2)}, // SDMMC2_D6
-  {PC_7,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF8_SDMMC1)}, // SDMMC1_D123DIR
-  {PC_7_ALT1, SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D7
-  {PC_7_ALT2, SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_SDMMC2)}, // SDMMC2_D7
-  {PC_8,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D0
-  {PC_9,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D1
-  {PC_10,     SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D2
-  {PC_11,     SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D3
-  {PC_12,     SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDMMC1)}, // SDMMC1_CK
-  {PD_2,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDMMC1)}, // SDMMC1_CMD
-  {PD_6,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF11_SDMMC2)}, // SDMMC2_CK
-  {PD_7,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF11_SDMMC2)}, // SDMMC2_CMD
-  {PG_9,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_SDMMC2)}, // SDMMC2_D0
-  {PG_10,     SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_SDMMC2)}, // SDMMC2_D1
-  {PG_11,     SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_SDMMC2)}, // SDMMC2_D2
-  {PG_12,     SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_SDMMC2)}, // SDMMC2_D3
-  {PG_13,     SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_SDMMC2)}, // SDMMC2_D6
-  {PG_14,     SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_SDMMC2)}, // SDMMC2_D7
-  {NC,        NP,     0}
-};
-#endif
-
-#endif /* !CUSTOM_PERIPHERAL_PINS */
diff --git a/variants/STM32H7xx/H730ABIxQ/PinNamesVar.h b/variants/STM32H7xx/H730ABIxQ/PinNamesVar.h
deleted file mode 100644
index b2dd9759d8..0000000000
--- a/variants/STM32H7xx/H730ABIxQ/PinNamesVar.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/* Dual pad pin name */
-PA_0_C      = PA_0   | PDUAL,
-PA_1_C      = PA_1   | PDUAL,
-PC_2_C      = PC_2   | PDUAL,
-PC_3_C      = PC_3   | PDUAL,
-
-/* Alternate pin name */
-PA_0_ALT1   = PA_0   | ALT1,
-PA_0_C_ALT1 = PA_0_C | ALT1,
-PA_1_ALT1   = PA_1   | ALT1,
-PA_1_ALT2   = PA_1   | ALT2,
-PA_1_C_ALT1 = PA_1_C | ALT1,
-PA_2_ALT1   = PA_2   | ALT1,
-PA_2_ALT2   = PA_2   | ALT2,
-PA_3_ALT1   = PA_3   | ALT1,
-PA_3_ALT2   = PA_3   | ALT2,
-PA_4_ALT1   = PA_4   | ALT1,
-PA_4_ALT2   = PA_4   | ALT2,
-PA_5_ALT1   = PA_5   | ALT1,
-PA_6_ALT1   = PA_6   | ALT1,
-PA_7_ALT1   = PA_7   | ALT1,
-PA_7_ALT2   = PA_7   | ALT2,
-PA_7_ALT3   = PA_7   | ALT3,
-PA_8_ALT1   = PA_8   | ALT1,
-PA_9_ALT1   = PA_9   | ALT1,
-PA_10_ALT1  = PA_10  | ALT1,
-PA_11_ALT1  = PA_11  | ALT1,
-PA_12_ALT1  = PA_12  | ALT1,
-PA_15_ALT1  = PA_15  | ALT1,
-PA_15_ALT2  = PA_15  | ALT2,
-PB_0_ALT1   = PB_0   | ALT1,
-PB_0_ALT2   = PB_0   | ALT2,
-PB_1_ALT1   = PB_1   | ALT1,
-PB_1_ALT2   = PB_1   | ALT2,
-PB_3_ALT1   = PB_3   | ALT1,
-PB_3_ALT2   = PB_3   | ALT2,
-PB_4_ALT1   = PB_4   | ALT1,
-PB_4_ALT2   = PB_4   | ALT2,
-PB_5_ALT1   = PB_5   | ALT1,
-PB_5_ALT2   = PB_5   | ALT2,
-PB_6_ALT1   = PB_6   | ALT1,
-PB_6_ALT2   = PB_6   | ALT2,
-PB_7_ALT1   = PB_7   | ALT1,
-PB_8_ALT1   = PB_8   | ALT1,
-PB_8_ALT2   = PB_8   | ALT2,
-PB_9_ALT1   = PB_9   | ALT1,
-PB_9_ALT2   = PB_9   | ALT2,
-PB_14_ALT1  = PB_14  | ALT1,
-PB_14_ALT2  = PB_14  | ALT2,
-PB_15_ALT1  = PB_15  | ALT1,
-PB_15_ALT2  = PB_15  | ALT2,
-PC_0_ALT1   = PC_0   | ALT1,
-PC_0_ALT2   = PC_0   | ALT2,
-PC_1_ALT1   = PC_1   | ALT1,
-PC_1_ALT2   = PC_1   | ALT2,
-PC_2_ALT1   = PC_2   | ALT1,
-PC_2_ALT2   = PC_2   | ALT2,
-PC_3_ALT1   = PC_3   | ALT1,
-PC_4_ALT1   = PC_4   | ALT1,
-PC_5_ALT1   = PC_5   | ALT1,
-PC_6_ALT1   = PC_6   | ALT1,
-PC_6_ALT2   = PC_6   | ALT2,
-PC_7_ALT1   = PC_7   | ALT1,
-PC_7_ALT2   = PC_7   | ALT2,
-PC_8_ALT1   = PC_8   | ALT1,
-PC_9_ALT1   = PC_9   | ALT1,
-PC_10_ALT1  = PC_10  | ALT1,
-PC_11_ALT1  = PC_11  | ALT1,
-PF_0_ALT1   = PF_0   | ALT1,
-PF_1_ALT1   = PF_1   | ALT1,
-PF_6_ALT1   = PF_6   | ALT1,
-PF_7_ALT1   = PF_7   | ALT1,
-PF_8_ALT1   = PF_8   | ALT1,
-PF_8_ALT2   = PF_8   | ALT2,
-PF_9_ALT1   = PF_9   | ALT1,
-PF_9_ALT2   = PF_9   | ALT2,
-
-/* SYS_WKUP */
-#ifdef PWR_WAKEUP_PIN1
-  SYS_WKUP1 = PA_0,
-#endif
-#ifdef PWR_WAKEUP_PIN2
-  SYS_WKUP2 = PA_2,
-#endif
-#ifdef PWR_WAKEUP_PIN3
-  SYS_WKUP3 = NC,
-#endif
-#ifdef PWR_WAKEUP_PIN4
-  SYS_WKUP4 = PC_13,
-#endif
-#ifdef PWR_WAKEUP_PIN5
-  SYS_WKUP5 = NC,
-#endif
-#ifdef PWR_WAKEUP_PIN6
-  SYS_WKUP6 = PC_1,
-#endif
-#ifdef PWR_WAKEUP_PIN7
-  SYS_WKUP7 = NC,
-#endif
-#ifdef PWR_WAKEUP_PIN8
-  SYS_WKUP8 = NC,
-#endif
-
-/* USB */
-#ifdef USBCON
-  USB_OTG_HS_DM       = PA_11,
-  USB_OTG_HS_DP       = PA_12,
-  USB_OTG_HS_ID       = PA_10,
-  USB_OTG_HS_SOF      = PA_8,
-  USB_OTG_HS_ULPI_CK  = PA_5,
-  USB_OTG_HS_ULPI_D0  = PA_3,
-  USB_OTG_HS_ULPI_D1  = PB_0,
-  USB_OTG_HS_ULPI_D2  = PB_1,
-  USB_OTG_HS_ULPI_D3  = PB_10,
-  USB_OTG_HS_ULPI_D4  = PB_11,
-  USB_OTG_HS_ULPI_D5  = PB_12,
-  USB_OTG_HS_ULPI_D6  = PB_13,
-  USB_OTG_HS_ULPI_D7  = PB_5,
-  USB_OTG_HS_ULPI_DIR = PC_2,
-  USB_OTG_HS_ULPI_NXT = PC_3,
-  USB_OTG_HS_ULPI_STP = PC_0,
-  USB_OTG_HS_VBUS     = PA_9,
-#endif
diff --git a/variants/STM32H7xx/H730ABIxQ/boards_entry.txt b/variants/STM32H7xx/H730ABIxQ/boards_entry.txt
deleted file mode 100644
index aa08212567..0000000000
--- a/variants/STM32H7xx/H730ABIxQ/boards_entry.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-# This file help to add generic board entry.
-# upload.maximum_size and product_line have to be verified
-# and changed if needed.
-# See: https://github.com/stm32duino/wiki/wiki/Add-a-new-variant-%28board%29
-
-# Generic H730ABIxQ
-GenH7.menu.pnum.GENERIC_H730ABIXQ=Generic H730ABIxQ
-GenH7.menu.pnum.GENERIC_H730ABIXQ.upload.maximum_size=131072
-GenH7.menu.pnum.GENERIC_H730ABIXQ.upload.maximum_data_size=1048576
-GenH7.menu.pnum.GENERIC_H730ABIXQ.build.board=GENERIC_H730ABIXQ
-GenH7.menu.pnum.GENERIC_H730ABIXQ.build.product_line=STM32H730xx
-GenH7.menu.pnum.GENERIC_H730ABIXQ.build.variant=STM32H7xx/H730ABIxQ
-
diff --git a/variants/STM32H7xx/H730ABIxQ/variant_generic.cpp b/variants/STM32H7xx/H730ABIxQ/variant_generic.cpp
deleted file mode 100644
index c3591135b7..0000000000
--- a/variants/STM32H7xx/H730ABIxQ/variant_generic.cpp
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
- * All rights reserved.
- *
- * This software component is licensed by ST under BSD 3-Clause license,
- * the "License"; You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *                        opensource.org/licenses/BSD-3-Clause
- *
- *******************************************************************************
- */
-#if defined(ARDUINO_GENERIC_H730ABIXQ)
-#include "pins_arduino.h"
-
-// Digital PinName array
-const PinName digitalPin[] = {
-  PA_0,   // D0/A0
-  PA_1,   // D1/A1
-  PA_2,   // D2/A2
-  PA_3,   // D3/A3
-  PA_4,   // D4/A4
-  PA_5,   // D5/A5
-  PA_6,   // D6/A6
-  PA_7,   // D7/A7
-  PA_8,   // D8
-  PA_9,   // D9
-  PA_10,  // D10
-  PA_11,  // D11
-  PA_12,  // D12
-  PA_13,  // D13
-  PA_14,  // D14
-  PA_15,  // D15
-  PB_0,   // D16/A8
-  PB_1,   // D17/A9
-  PB_2,   // D18
-  PB_3,   // D19
-  PB_4,   // D20
-  PB_5,   // D21
-  PB_6,   // D22
-  PB_7,   // D23
-  PB_8,   // D24
-  PB_9,   // D25
-  PB_10,  // D26
-  PB_11,  // D27
-  PB_12,  // D28
-  PB_13,  // D29
-  PB_14,  // D30
-  PB_15,  // D31
-  PC_0,   // D32/A10
-  PC_1,   // D33/A11
-  PC_2,   // D34/A12
-  PC_3,   // D35/A13
-  PC_4,   // D36/A14
-  PC_5,   // D37/A15
-  PC_6,   // D38
-  PC_7,   // D39
-  PC_8,   // D40
-  PC_9,   // D41
-  PC_10,  // D42
-  PC_11,  // D43
-  PC_12,  // D44
-  PC_13,  // D45
-  PC_14,  // D46
-  PC_15,  // D47
-  PD_0,   // D48
-  PD_1,   // D49
-  PD_2,   // D50
-  PD_3,   // D51
-  PD_4,   // D52
-  PD_5,   // D53
-  PD_6,   // D54
-  PD_7,   // D55
-  PD_8,   // D56
-  PD_9,   // D57
-  PD_10,  // D58
-  PD_11,  // D59
-  PD_12,  // D60
-  PD_13,  // D61
-  PD_14,  // D62
-  PD_15,  // D63
-  PE_0,   // D64
-  PE_1,   // D65
-  PE_2,   // D66
-  PE_3,   // D67
-  PE_4,   // D68
-  PE_5,   // D69
-  PE_6,   // D70
-  PE_7,   // D71
-  PE_8,   // D72
-  PE_9,   // D73
-  PE_10,  // D74
-  PE_11,  // D75
-  PE_12,  // D76
-  PE_13,  // D77
-  PE_14,  // D78
-  PE_15,  // D79
-  PF_0,   // D80
-  PF_1,   // D81
-  PF_2,   // D82
-  PF_3,   // D83/A16
-  PF_4,   // D84/A17
-  PF_5,   // D85/A18
-  PF_6,   // D86/A19
-  PF_7,   // D87/A20
-  PF_8,   // D88/A21
-  PF_9,   // D89/A22
-  PF_10,  // D90/A23
-  PF_11,  // D91/A24
-  PF_12,  // D92/A25
-  PF_13,  // D93/A26
-  PF_14,  // D94/A27
-  PF_15,  // D95
-  PG_0,   // D96
-  PG_1,   // D97
-  PG_2,   // D98
-  PG_3,   // D99
-  PG_4,   // D100
-  PG_5,   // D101
-  PG_6,   // D102
-  PG_7,   // D103
-  PG_8,   // D104
-  PG_9,   // D105
-  PG_10,  // D106
-  PG_11,  // D107
-  PG_12,  // D108
-  PG_13,  // D109
-  PG_14,  // D110
-  PG_15,  // D111
-  PH_0,   // D112
-  PH_1,   // D113
-  PH_2,   // D114/A28
-  PH_3,   // D115/A29
-  PH_10,  // D116
-  PH_11,  // D117
-  PH_12,  // D118
-  PH_13,  // D119
-  PH_14,  // D120
-  PA_0_C, // D121/A30
-  PA_1_C, // D122/A31
-  PC_2_C, // D123/A32
-  PC_3_C  // D124/A33
-};
-
-// Analog (Ax) pin number array
-const uint32_t analogInputPin[] = {
-  0,  // A0,  PA0
-  1,  // A1,  PA1
-  2,  // A2,  PA2
-  3,  // A3,  PA3
-  4,  // A4,  PA4
-  5,  // A5,  PA5
-  6,  // A6,  PA6
-  7,  // A7,  PA7
-  16, // A8,  PB0
-  17, // A9,  PB1
-  32, // A10, PC0
-  33, // A11, PC1
-  34, // A12, PC2
-  35, // A13, PC3
-  36, // A14, PC4
-  37, // A15, PC5
-  83, // A16, PF3
-  84, // A17, PF4
-  85, // A18, PF5
-  86, // A19, PF6
-  87, // A20, PF7
-  88, // A21, PF8
-  89, // A22, PF9
-  90, // A23, PF10
-  91, // A24, PF11
-  92, // A25, PF12
-  93, // A26, PF13
-  94, // A27, PF14
-  114, // A28, PH2
-  115, // A29, PH3
-  121, // A30, PA0_C
-  122, // A31, PA1_C
-  123, // A32, PC2_C
-  124 // A33, PC3_C
-};
-
-#endif /* ARDUINO_GENERIC_* */
diff --git a/variants/STM32H7xx/H730ABIxQ/variant_generic.h b/variants/STM32H7xx/H730ABIxQ/variant_generic.h
deleted file mode 100644
index 591d9d9535..0000000000
--- a/variants/STM32H7xx/H730ABIxQ/variant_generic.h
+++ /dev/null
@@ -1,323 +0,0 @@
-/*
- *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
- * All rights reserved.
- *
- * This software component is licensed by ST under BSD 3-Clause license,
- * the "License"; You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *                        opensource.org/licenses/BSD-3-Clause
- *
- *******************************************************************************
- */
-#pragma once
-
-/*----------------------------------------------------------------------------
- *        STM32 pins number
- *----------------------------------------------------------------------------*/
-#define PA0                     PIN_A0
-#define PA1                     PIN_A1
-#define PA2                     PIN_A2
-#define PA3                     PIN_A3
-#define PA4                     PIN_A4
-#define PA5                     PIN_A5
-#define PA6                     PIN_A6
-#define PA7                     PIN_A7
-#define PA8                     8
-#define PA9                     9
-#define PA10                    10
-#define PA11                    11
-#define PA12                    12
-#define PA13                    13
-#define PA14                    14
-#define PA15                    15
-#define PB0                     PIN_A8
-#define PB1                     PIN_A9
-#define PB2                     18
-#define PB3                     19
-#define PB4                     20
-#define PB5                     21
-#define PB6                     22
-#define PB7                     23
-#define PB8                     24
-#define PB9                     25
-#define PB10                    26
-#define PB11                    27
-#define PB12                    28
-#define PB13                    29
-#define PB14                    30
-#define PB15                    31
-#define PC0                     PIN_A10
-#define PC1                     PIN_A11
-#define PC2                     PIN_A12
-#define PC3                     PIN_A13
-#define PC4                     PIN_A14
-#define PC5                     PIN_A15
-#define PC6                     38
-#define PC7                     39
-#define PC8                     40
-#define PC9                     41
-#define PC10                    42
-#define PC11                    43
-#define PC12                    44
-#define PC13                    45
-#define PC14                    46
-#define PC15                    47
-#define PD0                     48
-#define PD1                     49
-#define PD2                     50
-#define PD3                     51
-#define PD4                     52
-#define PD5                     53
-#define PD6                     54
-#define PD7                     55
-#define PD8                     56
-#define PD9                     57
-#define PD10                    58
-#define PD11                    59
-#define PD12                    60
-#define PD13                    61
-#define PD14                    62
-#define PD15                    63
-#define PE0                     64
-#define PE1                     65
-#define PE2                     66
-#define PE3                     67
-#define PE4                     68
-#define PE5                     69
-#define PE6                     70
-#define PE7                     71
-#define PE8                     72
-#define PE9                     73
-#define PE10                    74
-#define PE11                    75
-#define PE12                    76
-#define PE13                    77
-#define PE14                    78
-#define PE15                    79
-#define PF0                     80
-#define PF1                     81
-#define PF2                     82
-#define PF3                     PIN_A16
-#define PF4                     PIN_A17
-#define PF5                     PIN_A18
-#define PF6                     PIN_A19
-#define PF7                     PIN_A20
-#define PF8                     PIN_A21
-#define PF9                     PIN_A22
-#define PF10                    PIN_A23
-#define PF11                    PIN_A24
-#define PF12                    PIN_A25
-#define PF13                    PIN_A26
-#define PF14                    PIN_A27
-#define PF15                    95
-#define PG0                     96
-#define PG1                     97
-#define PG2                     98
-#define PG3                     99
-#define PG4                     100
-#define PG5                     101
-#define PG6                     102
-#define PG7                     103
-#define PG8                     104
-#define PG9                     105
-#define PG10                    106
-#define PG11                    107
-#define PG12                    108
-#define PG13                    109
-#define PG14                    110
-#define PG15                    111
-#define PH0                     112
-#define PH1                     113
-#define PH2                     PIN_A28
-#define PH3                     PIN_A29
-#define PH10                    116
-#define PH11                    117
-#define PH12                    118
-#define PH13                    119
-#define PH14                    120
-#define PA0_C                   PIN_A30
-#define PA1_C                   PIN_A31
-#define PC2_C                   PIN_A32
-#define PC3_C                   PIN_A33
-
-// Alternate pins number
-#define PA0_ALT1                (PA0   | ALT1)
-#define PA0_C_ALT1              (PA0_C | ALT1)
-#define PA1_ALT1                (PA1   | ALT1)
-#define PA1_ALT2                (PA1   | ALT2)
-#define PA1_C_ALT1              (PA1_C | ALT1)
-#define PA2_ALT1                (PA2   | ALT1)
-#define PA2_ALT2                (PA2   | ALT2)
-#define PA3_ALT1                (PA3   | ALT1)
-#define PA3_ALT2                (PA3   | ALT2)
-#define PA4_ALT1                (PA4   | ALT1)
-#define PA4_ALT2                (PA4   | ALT2)
-#define PA5_ALT1                (PA5   | ALT1)
-#define PA6_ALT1                (PA6   | ALT1)
-#define PA7_ALT1                (PA7   | ALT1)
-#define PA7_ALT2                (PA7   | ALT2)
-#define PA7_ALT3                (PA7   | ALT3)
-#define PA8_ALT1                (PA8   | ALT1)
-#define PA9_ALT1                (PA9   | ALT1)
-#define PA10_ALT1               (PA10  | ALT1)
-#define PA11_ALT1               (PA11  | ALT1)
-#define PA12_ALT1               (PA12  | ALT1)
-#define PA15_ALT1               (PA15  | ALT1)
-#define PA15_ALT2               (PA15  | ALT2)
-#define PB0_ALT1                (PB0   | ALT1)
-#define PB0_ALT2                (PB0   | ALT2)
-#define PB1_ALT1                (PB1   | ALT1)
-#define PB1_ALT2                (PB1   | ALT2)
-#define PB3_ALT1                (PB3   | ALT1)
-#define PB3_ALT2                (PB3   | ALT2)
-#define PB4_ALT1                (PB4   | ALT1)
-#define PB4_ALT2                (PB4   | ALT2)
-#define PB5_ALT1                (PB5   | ALT1)
-#define PB5_ALT2                (PB5   | ALT2)
-#define PB6_ALT1                (PB6   | ALT1)
-#define PB6_ALT2                (PB6   | ALT2)
-#define PB7_ALT1                (PB7   | ALT1)
-#define PB8_ALT1                (PB8   | ALT1)
-#define PB8_ALT2                (PB8   | ALT2)
-#define PB9_ALT1                (PB9   | ALT1)
-#define PB9_ALT2                (PB9   | ALT2)
-#define PB14_ALT1               (PB14  | ALT1)
-#define PB14_ALT2               (PB14  | ALT2)
-#define PB15_ALT1               (PB15  | ALT1)
-#define PB15_ALT2               (PB15  | ALT2)
-#define PC0_ALT1                (PC0   | ALT1)
-#define PC0_ALT2                (PC0   | ALT2)
-#define PC1_ALT1                (PC1   | ALT1)
-#define PC1_ALT2                (PC1   | ALT2)
-#define PC2_ALT1                (PC2   | ALT1)
-#define PC2_ALT2                (PC2   | ALT2)
-#define PC3_ALT1                (PC3   | ALT1)
-#define PC4_ALT1                (PC4   | ALT1)
-#define PC5_ALT1                (PC5   | ALT1)
-#define PC6_ALT1                (PC6   | ALT1)
-#define PC6_ALT2                (PC6   | ALT2)
-#define PC7_ALT1                (PC7   | ALT1)
-#define PC7_ALT2                (PC7   | ALT2)
-#define PC8_ALT1                (PC8   | ALT1)
-#define PC9_ALT1                (PC9   | ALT1)
-#define PC10_ALT1               (PC10  | ALT1)
-#define PC11_ALT1               (PC11  | ALT1)
-#define PF0_ALT1                (PF0   | ALT1)
-#define PF1_ALT1                (PF1   | ALT1)
-#define PF6_ALT1                (PF6   | ALT1)
-#define PF7_ALT1                (PF7   | ALT1)
-#define PF8_ALT1                (PF8   | ALT1)
-#define PF8_ALT2                (PF8   | ALT2)
-#define PF9_ALT1                (PF9   | ALT1)
-#define PF9_ALT2                (PF9   | ALT2)
-
-#define NUM_DIGITAL_PINS        125
-#define NUM_DUALPAD_PINS        4
-#define NUM_ANALOG_INPUTS       34
-
-// On-board LED pin number
-#ifndef LED_BUILTIN
-  #define LED_BUILTIN           PNUM_NOT_DEFINED
-#endif
-
-// On-board user button
-#ifndef USER_BTN
-  #define USER_BTN              PNUM_NOT_DEFINED
-#endif
-
-// SPI definitions
-#ifndef PIN_SPI_SS
-  #define PIN_SPI_SS            PA4
-#endif
-#ifndef PIN_SPI_SS1
-  #define PIN_SPI_SS1           PA15
-#endif
-#ifndef PIN_SPI_SS2
-  #define PIN_SPI_SS2           PG10
-#endif
-#ifndef PIN_SPI_SS3
-  #define PIN_SPI_SS3           PNUM_NOT_DEFINED
-#endif
-#ifndef PIN_SPI_MOSI
-  #define PIN_SPI_MOSI          PA7
-#endif
-#ifndef PIN_SPI_MISO
-  #define PIN_SPI_MISO          PA6
-#endif
-#ifndef PIN_SPI_SCK
-  #define PIN_SPI_SCK           PA5
-#endif
-
-// I2C definitions
-#ifndef PIN_WIRE_SDA
-  #define PIN_WIRE_SDA          PB7
-#endif
-#ifndef PIN_WIRE_SCL
-  #define PIN_WIRE_SCL          PB6
-#endif
-
-// Timer Definitions
-// Use TIM6/TIM7 when possible as servo and tone don't need GPIO output pin
-#ifndef TIMER_TONE
-  #define TIMER_TONE            TIM6
-#endif
-#ifndef TIMER_SERVO
-  #define TIMER_SERVO           TIM7
-#endif
-
-// UART Definitions
-#ifndef SERIAL_UART_INSTANCE
-  #define SERIAL_UART_INSTANCE  4
-#endif
-
-// Default pin used for generic 'Serial' instance
-// Mandatory for Firmata
-#ifndef PIN_SERIAL_RX
-  #define PIN_SERIAL_RX         PA1
-#endif
-#ifndef PIN_SERIAL_TX
-  #define PIN_SERIAL_TX         PA0
-#endif
-
-// Extra HAL modules
-#if !defined(HAL_DAC_MODULE_DISABLED)
-  #define HAL_DAC_MODULE_ENABLED
-#endif
-#if !defined(HAL_ETH_MODULE_DISABLED)
-  #define HAL_ETH_MODULE_ENABLED
-#endif
-#if !defined(HAL_OSPI_MODULE_DISABLED)
-  #define HAL_OSPI_MODULE_ENABLED
-#endif
-#if !defined(HAL_SD_MODULE_DISABLED)
-  #define HAL_SD_MODULE_ENABLED
-#endif
-
-/*----------------------------------------------------------------------------
- *        Arduino objects - C++ only
- *----------------------------------------------------------------------------*/
-
-#ifdef __cplusplus
-  // These serial port names are intended to allow libraries and architecture-neutral
-  // sketches to automatically default to the correct port name for a particular type
-  // of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
-  // the first hardware serial port whose RX/TX pins are not dedicated to another use.
-  //
-  // SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
-  //
-  // SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
-  //
-  // SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
-  //
-  // SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
-  //
-  // SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
-  //                            pins are NOT connected to anything by default.
-  #ifndef SERIAL_PORT_MONITOR
-    #define SERIAL_PORT_MONITOR   Serial
-  #endif
-  #ifndef SERIAL_PORT_HARDWARE
-    #define SERIAL_PORT_HARDWARE  Serial
-  #endif
-#endif
diff --git a/variants/STM32H7xx/H730IBKxQ/PeripheralPins.c b/variants/STM32H7xx/H730IBKxQ/PeripheralPins.c
deleted file mode 100644
index 06e7f9a640..0000000000
--- a/variants/STM32H7xx/H730IBKxQ/PeripheralPins.c
+++ /dev/null
@@ -1,728 +0,0 @@
-/*
- *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
- * All rights reserved.
- *
- * This software component is licensed by ST under BSD 3-Clause license,
- * the "License"; You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *                        opensource.org/licenses/BSD-3-Clause
- *
- *******************************************************************************
- */
-/*
- * Automatically generated from STM32H730IBKxQ.xml
- * CubeMX DB release 6.0.30
- */
-#if !defined(CUSTOM_PERIPHERAL_PINS)
-#include "Arduino.h"
-#include "PeripheralPins.h"
-
-/* =====
- * Notes:
- * - The pins mentioned Px_y_ALTz are alternative possibilities which use other
- *   HW peripheral instances. You can use them the same way as any other "normal"
- *   pin (i.e. analogWrite(PA7_ALT1, 128);).
- *
- * - Commented lines are alternative possibilities which are not used per default.
- *   If you change them, you will have to know what you do
- * =====
- */
-
-//*** ADC ***
-
-#ifdef HAL_ADC_MODULE_ENABLED
-WEAK const PinMap PinMap_ADC[] = {
-  {PA_0,        ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 16, 0)}, // ADC1_INP16
-  {PA_0_C,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC1_INP0
-  {PA_0_C_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC2_INP0
-  {PA_1,        ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 17, 0)}, // ADC1_INP17
-  {PA_1_C,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC1_INP1
-  {PA_1_C_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC2_INP1
-  {PA_2,        ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC1_INP14
-  {PA_2_ALT1,   ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC2_INP14
-  {PA_3,        ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC1_INP15
-  {PA_3_ALT1,   ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC2_INP15
-  {PA_4,        ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 18, 0)}, // ADC1_INP18
-  {PA_4_ALT1,   ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 18, 0)}, // ADC2_INP18
-  {PA_5,        ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 19, 0)}, // ADC1_INP19
-  {PA_5_ALT1,   ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 19, 0)}, // ADC2_INP19
-  {PA_6,        ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC1_INP3
-  {PA_6_ALT1,   ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC2_INP3
-  {PA_7,        ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC1_INP7
-  {PA_7_ALT1,   ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC2_INP7
-  {PB_0,        ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC1_INP9
-  {PB_0_ALT1,   ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC2_INP9
-  {PB_1,        ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC1_INP5
-  {PB_1_ALT1,   ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC2_INP5
-  {PC_0,        ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC1_INP10
-  {PC_0_ALT1,   ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC2_INP10
-  {PC_0_ALT2,   ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC3_INP10
-  {PC_1,        ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC1_INP11
-  {PC_1_ALT1,   ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC2_INP11
-  {PC_1_ALT2,   ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC3_INP11
-  {PC_2,        ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 12, 0)}, // ADC1_INP12
-  {PC_2_ALT1,   ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 12, 0)}, // ADC2_INP12
-  {PC_2_ALT2,   ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 12, 0)}, // ADC3_INP12
-  {PC_2_C,      ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC3_INP0
-  {PC_3,        ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 13, 0)}, // ADC1_INP13
-  {PC_3_ALT1,   ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 13, 0)}, // ADC2_INP13
-  {PC_3_C,      ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC3_INP1
-  {PC_4,        ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC1_INP4
-  {PC_4_ALT1,   ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC2_INP4
-  {PC_5,        ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC1_INP8
-  {PC_5_ALT1,   ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC2_INP8
-  {PF_3,        ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC3_INP5
-  {PF_4,        ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC3_INP9
-  {PF_5,        ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC3_INP4
-  {PF_6,        ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC3_INP8
-  {PF_7,        ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC3_INP3
-  {PF_8,        ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC3_INP7
-  {PF_9,        ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC3_INP2
-  {PF_10,       ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC3_INP6
-  {PF_11,       ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC1_INP2
-  {PF_12,       ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC1_INP6
-  {PF_13,       ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC2_INP2
-  {PF_14,       ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC2_INP6
-  {PH_2,        ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 13, 0)}, // ADC3_INP13
-  {PH_3,        ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC3_INP14
-  {PH_4,        ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC3_INP15
-  {PH_5,        ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 16, 0)}, // ADC3_INP16
-  {NC,          NP,   0}
-};
-#endif
-
-//*** DAC ***
-
-#ifdef HAL_DAC_MODULE_ENABLED
-WEAK const PinMap PinMap_DAC[] = {
-  {PA_4, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // DAC1_OUT1
-  {PA_5, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // DAC1_OUT2
-  {NC,   NP,   0}
-};
-#endif
-
-//*** I2C ***
-
-#ifdef HAL_I2C_MODULE_ENABLED
-WEAK const PinMap PinMap_I2C_SDA[] = {
-  {PB_7,      I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
-  {PB_7_ALT1, I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C4)},
-  {PB_9,      I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
-  {PB_9_ALT1, I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C4)},
-  {PB_11,     I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
-  {PC_9,      I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
-  {PC_9_ALT1, I2C5, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C5)},
-  {PC_10,     I2C5, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C5)},
-  {PD_13,     I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C4)},
-  {PF_0,      I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
-  {PF_0_ALT1, I2C5, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C5)},
-  {PF_15,     I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C4)},
-  {PH_5,      I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
-  {PH_8,      I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
-  {PH_12,     I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C4)},
-  {NC,        NP,   0}
-};
-#endif
-
-#ifdef HAL_I2C_MODULE_ENABLED
-WEAK const PinMap PinMap_I2C_SCL[] = {
-  {PA_8,      I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
-  {PA_8_ALT1, I2C5, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C5)},
-  {PB_6,      I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
-  {PB_6_ALT1, I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C4)},
-  {PB_8,      I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
-  {PB_8_ALT1, I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C4)},
-  {PB_10,     I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
-  {PC_11,     I2C5, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C5)},
-  {PD_12,     I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C4)},
-  {PF_1,      I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
-  {PF_1_ALT1, I2C5, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C5)},
-  {PF_14,     I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C4)},
-  {PH_4,      I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
-  {PH_7,      I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
-  {PH_11,     I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C4)},
-  {NC,        NP,   0}
-};
-#endif
-
-//*** TIM ***
-
-#ifdef HAL_TIM_MODULE_ENABLED
-WEAK const PinMap PinMap_TIM[] = {
-  {PA_0,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
-  {PA_0_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)}, // TIM5_CH1
-  {PA_1,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
-  {PA_1_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 2, 0)}, // TIM5_CH2
-  {PA_1_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM15, 1, 1)}, // TIM15_CH1N
-  {PA_2,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
-  {PA_2_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 3, 0)}, // TIM5_CH3
-  {PA_2_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM15, 1, 0)}, // TIM15_CH1
-  {PA_3,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4
-  {PA_3_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 4, 0)}, // TIM5_CH4
-  {PA_3_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM15, 2, 0)}, // TIM15_CH2
-  {PA_5,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
-  {PA_5_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 1)}, // TIM8_CH1N
-  {PA_6,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
-  {PA_6_ALT1,  TIM13, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM13, 1, 0)}, // TIM13_CH1
-  {PA_7,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
-  {PA_7_ALT1,  TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
-  {PA_7_ALT2,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 1)}, // TIM8_CH1N
-  {PA_7_ALT3,  TIM14, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM14, 1, 0)}, // TIM14_CH1
-  {PA_8,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)}, // TIM1_CH1
-  {PA_9,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 0)}, // TIM1_CH2
-  {PA_10,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 0)}, // TIM1_CH3
-  {PA_11,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 4, 0)}, // TIM1_CH4
-  {PA_15,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
-  {PB_0,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
-  {PB_0_ALT1,  TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)}, // TIM3_CH3
-  {PB_0_ALT2,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 1)}, // TIM8_CH2N
-  {PB_1,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
-  {PB_1_ALT1,  TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
-  {PB_1_ALT2,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 1)}, // TIM8_CH3N
-  {PB_3,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
-  {PB_4,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
-  {PB_5,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
-  {PB_6,       TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 1, 0)}, // TIM4_CH1
-  {PB_6_ALT1,  TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM16, 1, 1)}, // TIM16_CH1N
-  {PB_7,       TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 2, 0)}, // TIM4_CH2
-  {PB_7_ALT1,  TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM17, 1, 1)}, // TIM17_CH1N
-  {PB_8,       TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 3, 0)}, // TIM4_CH3
-  {PB_8_ALT1,  TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM16, 1, 0)}, // TIM16_CH1
-  {PB_9,       TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)}, // TIM4_CH4
-  {PB_9_ALT1,  TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM17, 1, 0)}, // TIM17_CH1
-  {PB_10,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
-  {PB_11,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4
-  {PB_13,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
-  {PB_14,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
-  {PB_14_ALT1, TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 1)}, // TIM8_CH2N
-  {PB_14_ALT2, TIM12, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM12, 1, 0)}, // TIM12_CH1
-  {PB_15,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
-  {PB_15_ALT1, TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 1)}, // TIM8_CH3N
-  {PB_15_ALT2, TIM12, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM12, 2, 0)}, // TIM12_CH2
-  {PC_6,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
-  {PC_6_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 0)}, // TIM8_CH1
-  {PC_7,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
-  {PC_7_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 0)}, // TIM8_CH2
-  {PC_8,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)}, // TIM3_CH3
-  {PC_8_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 0)}, // TIM8_CH3
-  {PC_9,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
-  {PC_9_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 4, 0)}, // TIM8_CH4
-  {PC_12,      TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM15, 1, 0)}, // TIM15_CH1
-  {PD_12,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 1, 0)}, // TIM4_CH1
-  {PD_13,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 2, 0)}, // TIM4_CH2
-  {PD_14,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 3, 0)}, // TIM4_CH3
-  {PD_15,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)}, // TIM4_CH4
-  {PE_4,       TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM15, 1, 1)}, // TIM15_CH1N
-  {PE_5,       TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM15, 1, 0)}, // TIM15_CH1
-  {PE_6,       TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM15, 2, 0)}, // TIM15_CH2
-  {PE_8,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
-  {PE_9,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)}, // TIM1_CH1
-  {PE_10,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
-  {PE_11,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 0)}, // TIM1_CH2
-  {PE_12,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
-  {PE_13,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 0)}, // TIM1_CH3
-  {PE_14,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 4, 0)}, // TIM1_CH4
-  {PF_0,       TIM23, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF13_TIM23, 1, 0)}, // TIM23_CH1
-  {PF_1,       TIM23, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF13_TIM23, 2, 0)}, // TIM23_CH2
-  {PF_2,       TIM23, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF13_TIM23, 3, 0)}, // TIM23_CH3
-  {PF_3,       TIM23, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF13_TIM23, 4, 0)}, // TIM23_CH4
-  {PF_6,       TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM16, 1, 0)}, // TIM16_CH1
-  {PF_6_ALT1,  TIM23, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF13_TIM23, 1, 0)}, // TIM23_CH1
-  {PF_7,       TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM17, 1, 0)}, // TIM17_CH1
-  {PF_7_ALT1,  TIM23, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF13_TIM23, 2, 0)}, // TIM23_CH2
-  {PF_8,       TIM13, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM13, 1, 0)}, // TIM13_CH1
-  {PF_8_ALT1,  TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM16, 1, 1)}, // TIM16_CH1N
-  {PF_8_ALT2,  TIM23, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF13_TIM23, 3, 0)}, // TIM23_CH3
-  {PF_9,       TIM14, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM14, 1, 0)}, // TIM14_CH1
-  {PF_9_ALT1,  TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM17, 1, 1)}, // TIM17_CH1N
-  {PF_9_ALT2,  TIM23, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF13_TIM23, 4, 0)}, // TIM23_CH4
-  {PF_11,      TIM24, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM24, 1, 0)}, // TIM24_CH1
-  {PF_12,      TIM24, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM24, 2, 0)}, // TIM24_CH2
-  {PF_13,      TIM24, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM24, 3, 0)}, // TIM24_CH3
-  {PF_14,      TIM24, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM24, 4, 0)}, // TIM24_CH4
-  {PG_12,      TIM23, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF13_TIM23, 1, 0)}, // TIM23_CH1
-  {PG_13,      TIM23, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF13_TIM23, 2, 0)}, // TIM23_CH2
-  {PG_14,      TIM23, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF13_TIM23, 3, 0)}, // TIM23_CH3
-  {PH_6,       TIM12, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM12, 1, 0)}, // TIM12_CH1
-  {PH_9,       TIM12, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM12, 2, 0)}, // TIM12_CH2
-  {PH_10,      TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)}, // TIM5_CH1
-  {PH_11,      TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 2, 0)}, // TIM5_CH2
-  {PH_12,      TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 3, 0)}, // TIM5_CH3
-  {PH_13,      TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 1)}, // TIM8_CH1N
-  {PH_14,      TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 1)}, // TIM8_CH2N
-  {PH_15,      TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 1)}, // TIM8_CH3N
-  {NC,         NP,    0}
-};
-#endif
-
-//*** UART ***
-
-#ifdef HAL_UART_MODULE_ENABLED
-WEAK const PinMap PinMap_UART_TX[] = {
-  {PA_0,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PA_2,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PA_9,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_LPUART)},
-  {PA_9_ALT1,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PA_12,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_UART4)},
-  {PA_15,      UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART7)},
-  {PB_4,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART7)},
-  {PB_6,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART)},
-  {PB_6_ALT1,  UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_UART5)},
-  {PB_6_ALT2,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PB_9,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PB_10,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PB_13,      UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_UART5)},
-  {PB_14,      USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART1)},
-  {PC_6,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
-  {PC_10,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PC_10_ALT1, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PC_12,      UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
-  {PD_1,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PD_5,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PD_8,       USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PD_15,      UART9,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART9)},
-  {PE_1,       UART8,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART8)},
-  {PE_3,       USART10, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_USART10)},
-  {PE_8,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
-  {PF_7,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
-  {PG_1,       UART9,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART9)},
-  {PG_12,      USART10, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART10)},
-  {PG_14,      USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
-  {PH_13,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {NC,         NP,      0}
-};
-#endif
-
-#ifdef HAL_UART_MODULE_ENABLED
-WEAK const PinMap PinMap_UART_RX[] = {
-  {PA_1,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PA_3,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PA_8,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART7)},
-  {PA_10,      LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_LPUART)},
-  {PA_10_ALT1, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PA_11,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_UART4)},
-  {PB_3,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART7)},
-  {PB_5,       UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_UART5)},
-  {PB_7,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART)},
-  {PB_7_ALT1,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PB_8,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PB_11,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PB_12,      UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_UART5)},
-  {PB_15,      USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART1)},
-  {PC_7,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
-  {PC_11,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PC_11_ALT1, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PD_0,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PD_2,       UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
-  {PD_6,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PD_9,       USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PD_14,      UART9,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART9)},
-  {PE_0,       UART8,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART8)},
-  {PE_2,       USART10, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART10)},
-  {PE_7,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
-  {PF_6,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
-  {PG_0,       UART9,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART9)},
-  {PG_9,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
-  {PG_11,      USART10, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART10)},
-  {PH_14,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {NC,         NP,      0}
-};
-#endif
-
-#ifdef HAL_UART_MODULE_ENABLED
-WEAK const PinMap PinMap_UART_RTS[] = {
-  {PA_1,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PA_12,      LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_LPUART)},
-  {PA_12_ALT1, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PA_15,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PB_14,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PB_14_ALT1, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PC_8,       UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
-  {PD_4,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PD_12,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PD_13,      UART9,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART9)},
-  {PD_15,      UART8,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART8)},
-  {PE_9,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
-  {PF_8,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
-  {PG_8,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
-  {PG_12,      USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
-  {PG_14,      USART10, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART10)},
-  {NC,         NP,      0}
-};
-#endif
-
-#ifdef HAL_UART_MODULE_ENABLED
-WEAK const PinMap PinMap_UART_CTS[] = {
-  {PA_0,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PA_11,      LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_LPUART)},
-  {PA_11_ALT1, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PB_0,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PB_13,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PB_15,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PC_9,       UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
-  {PD_0,       UART9,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART9)},
-  {PD_3,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PD_11,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PD_14,      UART8,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART8)},
-  {PE_10,      UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
-  {PF_9,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
-  {PG_13,      USART10, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART10)},
-  {PG_13_ALT1, USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
-  {PG_15,      USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
-  {NC,         NP,      0}
-};
-#endif
-
-//*** SPI ***
-
-#ifdef HAL_SPI_MODULE_ENABLED
-WEAK const PinMap PinMap_SPI_MOSI[] = {
-  {PA_7,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PA_7_ALT1, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
-  {PB_2,      SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_SPI3)},
-  {PB_5,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PB_5_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_SPI3)},
-  {PB_5_ALT2, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
-  {PB_15,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PC_1,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PC_3,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)},
-  {PC_12,     SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PD_6,      SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI3)},
-  {PD_7,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PE_6,      SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  {PE_14,     SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  {PF_9,      SPI5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI5)},
-  {PF_11,     SPI5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI5)},
-  {PG_14,     SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI6)},
-  {NC,        NP,   0}
-};
-#endif
-
-#ifdef HAL_SPI_MODULE_ENABLED
-WEAK const PinMap PinMap_SPI_MISO[] = {
-  {PA_6,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PA_6_ALT1, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
-  {PB_4,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PB_4_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PB_4_ALT2, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
-  {PB_14,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PC_2,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)},
-  {PC_11,     SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PE_5,      SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  {PE_13,     SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  {PF_8,      SPI5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI5)},
-  {PG_9,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PG_12,     SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI6)},
-  {PH_7,      SPI5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI5)},
-  {NC,        NP,   0}
-};
-#endif
-
-#ifdef HAL_SPI_MODULE_ENABLED
-WEAK const PinMap PinMap_SPI_SCLK[] = {
-  {PA_5,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PA_5_ALT1, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
-  {PA_9,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PA_12,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PB_3,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PB_3_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PB_3_ALT2, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
-  {PB_10,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PB_13,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PC_10,     SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PC_12,     SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI6)},
-  {PD_3,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PE_2,      SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  {PE_12,     SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  {PF_7,      SPI5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI5)},
-  {PG_11,     SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PG_13,     SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI6)},
-  {PH_6,      SPI5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI5)},
-  {NC,        NP,   0}
-};
-#endif
-
-#ifdef HAL_SPI_MODULE_ENABLED
-WEAK const PinMap PinMap_SPI_SSEL[] = {
-  {PA_0,       SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI6)},
-  {PA_4,       SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PA_4_ALT1,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PA_4_ALT2,  SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
-  {PA_11,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PA_15,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PA_15_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PA_15_ALT2, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_SPI6)},
-  {PB_4,       SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_SPI2)},
-  {PB_9,       SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PB_12,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PE_4,       SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  {PE_11,      SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  {PF_6,       SPI5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI5)},
-  {PG_8,       SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI6)},
-  {PG_10,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PH_5,       SPI5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI5)},
-  {NC,         NP,   0}
-};
-#endif
-
-//*** FDCAN ***
-
-#ifdef HAL_FDCAN_MODULE_ENABLED
-WEAK const PinMap PinMap_CAN_RD[] = {
-  {PA_11, FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
-  {PB_5,  FDCAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN2)},
-  {PB_8,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
-  {PB_12, FDCAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN2)},
-  {PD_0,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
-  {PD_12, FDCAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF5_FDCAN3)},
-  {PF_6,  FDCAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF2_FDCAN3)},
-  {PG_10, FDCAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF2_FDCAN3)},
-  {PH_14, FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
-  {NC,    NP,     0}
-};
-#endif
-
-#ifdef HAL_FDCAN_MODULE_ENABLED
-WEAK const PinMap PinMap_CAN_TD[] = {
-  {PA_12, FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
-  {PB_6,  FDCAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN2)},
-  {PB_9,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
-  {PB_13, FDCAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN2)},
-  {PD_1,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
-  {PD_13, FDCAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF5_FDCAN3)},
-  {PF_7,  FDCAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF2_FDCAN3)},
-  {PG_9,  FDCAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF2_FDCAN3)},
-  {PH_13, FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
-  {NC,    NP,     0}
-};
-#endif
-
-//*** ETHERNET ***
-
-#ifdef HAL_ETH_MODULE_ENABLED
-WEAK const PinMap PinMap_Ethernet[] = {
-  {PA_0,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
-  {PA_1,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_REF_CLK
-  {PA_1_ALT1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RX_CLK
-  {PA_2,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_MDIO
-  {PA_3,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_COL
-  {PA_7,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS_DV
-  {PA_7_ALT1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RX_DV
-  {PA_9,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TX_ER
-  {PB_0,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RXD2
-  {PB_1,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RXD3
-  {PB_2,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TX_ER
-  {PB_5,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_PPS_OUT
-  {PB_8,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD3
-  {PB_10,     ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RX_ER
-  {PB_11,     ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TX_EN
-  {PB_12,     ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD0
-  {PB_13,     ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD1
-  {PC_1,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_MDC
-  {PC_2,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)}, // ETH_TXD2
-  {PC_3,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)}, // ETH_TX_CLK
-  {PC_4,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RXD0
-  {PC_5,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RXD1
-  {PE_2,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD3
-  {PG_8,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_PPS_OUT
-  {PG_11,     ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TX_EN
-  {PG_12,     ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD1
-  {PG_13,     ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD0
-  {PG_14,     ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD1
-  {PH_2,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
-  {PH_3,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_COL
-  {PH_6,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RXD2
-  {PH_7,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RXD3
-  {NC,        NP,  0}
-};
-#endif
-
-//*** OCTOSPI ***
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA0[] = {
-  {PA_2,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO0
-  {PB_1,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO0
-  {PB_12, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO0
-  {PC_3,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)}, // OCTOSPIM_P1_IO0
-  {PC_9,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO0
-  {PD_11, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO0
-  {PF_0,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P2)}, // OCTOSPIM_P2_IO0
-  {PF_8,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO0
-  {NC,    NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA1[] = {
-  {PB_0,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO1
-  {PC_10, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO1
-  {PD_12, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO1
-  {PF_1,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P2)}, // OCTOSPIM_P2_IO1
-  {PF_9,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO1
-  {NC,    NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA2[] = {
-  {PA_3,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO2
-  {PA_7,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO2
-  {PB_13, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO2
-  {PC_2,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)}, // OCTOSPIM_P1_IO2
-  {PE_2,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO2
-  {PF_2,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P2)}, // OCTOSPIM_P2_IO2
-  {PF_7,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO2
-  {NC,    NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA3[] = {
-  {PA_1,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO3
-  {PA_6,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO3
-  {PD_13, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO3
-  {PF_3,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P2)}, // OCTOSPIM_P2_IO3
-  {PF_6,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO3
-  {NC,    NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA4[] = {
-  {PC_1, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO4
-  {PD_4, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO4
-  {PE_7, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO4
-  {PG_0, OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P2)}, // OCTOSPIM_P2_IO4
-  {PH_2, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO4
-  {NC,   NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA5[] = {
-  {PC_2, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)}, // OCTOSPIM_P1_IO5
-  {PD_5, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO5
-  {PE_8, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO5
-  {PG_1, OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P2)}, // OCTOSPIM_P2_IO5
-  {PH_3, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO5
-  {NC,   NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA6[] = {
-  {PC_3,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)}, // OCTOSPIM_P1_IO6
-  {PD_6,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO6
-  {PE_9,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO6
-  {PG_9,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO6
-  {PG_10, OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_OCTOSPIM_P2)}, // OCTOSPIM_P2_IO6
-  {NC,    NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA7[] = {
-  {PD_7,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO7
-  {PE_10, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO7
-  {PG_11, OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P2)}, // OCTOSPIM_P2_IO7
-  {PG_14, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO7
-  {NC,    NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_SCLK[] = {
-  {PA_3,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OCTOSPIM_P1)}, // OCTOSPIM_P1_CLK
-  {PB_2,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_CLK
-  {PF_4,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P2)}, // OCTOSPIM_P2_CLK
-  {PF_10, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_CLK
-  {NC,    NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_SSEL[] = {
-  {PB_6,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_NCS
-  {PB_10, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_NCS
-  {PC_11, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_NCS
-  {PE_11, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_OCTOSPIM_P1)}, // OCTOSPIM_P1_NCS
-  {PG_6,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_NCS
-  {PG_12, OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_OCTOSPIM_P2)}, // OCTOSPIM_P2_NCS
-  {NC,    NP,       0}
-};
-#endif
-
-//*** USB ***
-
-#if defined(HAL_PCD_MODULE_ENABLED) || defined(HAL_HCD_MODULE_ENABLED)
-WEAK const PinMap PinMap_USB_OTG_HS[] = {
-#ifdef USE_USB_HS_IN_FS
-  {PA_8,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_SOF
-  {PA_9,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
-  {PA_10, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ID
-  {PA_11, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)}, // USB_OTG_HS_DM
-  {PA_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)}, // USB_OTG_HS_DP
-#else
-  {PA_3,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D0
-  {PA_5,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_CK
-  {PB_0,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D1
-  {PB_1,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D2
-  {PB_5,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D7
-  {PB_10, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D3
-  {PB_11, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D4
-  {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D5
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D6
-  {PC_0,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_STP
-  {PC_2,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)}, // USB_OTG_HS_ULPI_DIR
-  {PC_3,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)}, // USB_OTG_HS_ULPI_NXT
-  {PH_4,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_NXT
-#endif /* USE_USB_HS_IN_FS */
-  {NC,    NP,         0}
-};
-#endif
-
-//*** SD ***
-
-#ifdef HAL_SD_MODULE_ENABLED
-WEAK const PinMap PinMap_SD[] = {
-  {PA_0,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_SDMMC2)}, // SDMMC2_CMD
-  {PB_3,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_SDMMC2)}, // SDMMC2_D2
-  {PB_4,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_SDMMC2)}, // SDMMC2_D3
-  {PB_8,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF7_SDMMC1)}, // SDMMC1_CKIN
-  {PB_8_ALT1, SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D4
-  {PB_8_ALT2, SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_SDMMC2)}, // SDMMC2_D4
-  {PB_9,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF7_SDMMC1)}, // SDMMC1_CDIR
-  {PB_9_ALT1, SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D5
-  {PB_9_ALT2, SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_SDMMC2)}, // SDMMC2_D5
-  {PB_13,     SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D0
-  {PB_14,     SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_SDMMC2)}, // SDMMC2_D0
-  {PB_15,     SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_SDMMC2)}, // SDMMC2_D1
-  {PC_1,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_SDMMC2)}, // SDMMC2_CK
-  {PC_4,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF10_SDMMC2)}, // SDMMC2_CKIN
-  {PC_6,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF8_SDMMC1)}, // SDMMC1_D0DIR
-  {PC_6_ALT1, SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D6
-  {PC_6_ALT2, SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_SDMMC2)}, // SDMMC2_D6
-  {PC_7,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF8_SDMMC1)}, // SDMMC1_D123DIR
-  {PC_7_ALT1, SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D7
-  {PC_7_ALT2, SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_SDMMC2)}, // SDMMC2_D7
-  {PC_8,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D0
-  {PC_9,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D1
-  {PC_10,     SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D2
-  {PC_11,     SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D3
-  {PC_12,     SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDMMC1)}, // SDMMC1_CK
-  {PD_2,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDMMC1)}, // SDMMC1_CMD
-  {PD_6,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF11_SDMMC2)}, // SDMMC2_CK
-  {PD_7,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF11_SDMMC2)}, // SDMMC2_CMD
-  {PG_9,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_SDMMC2)}, // SDMMC2_D0
-  {PG_10,     SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_SDMMC2)}, // SDMMC2_D1
-  {PG_11,     SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_SDMMC2)}, // SDMMC2_D2
-  {PG_12,     SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_SDMMC2)}, // SDMMC2_D3
-  {PG_13,     SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_SDMMC2)}, // SDMMC2_D6
-  {PG_14,     SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_SDMMC2)}, // SDMMC2_D7
-  {NC,        NP,     0}
-};
-#endif
-
-#endif /* !CUSTOM_PERIPHERAL_PINS */
diff --git a/variants/STM32H7xx/H730IBKxQ/PinNamesVar.h b/variants/STM32H7xx/H730IBKxQ/PinNamesVar.h
deleted file mode 100644
index efc8b9e4fd..0000000000
--- a/variants/STM32H7xx/H730IBKxQ/PinNamesVar.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/* Dual pad pin name */
-PA_0_C      = PA_0   | PDUAL,
-PA_1_C      = PA_1   | PDUAL,
-PC_2_C      = PC_2   | PDUAL,
-PC_3_C      = PC_3   | PDUAL,
-
-/* Alternate pin name */
-PA_0_ALT1   = PA_0   | ALT1,
-PA_0_C_ALT1 = PA_0_C | ALT1,
-PA_1_ALT1   = PA_1   | ALT1,
-PA_1_ALT2   = PA_1   | ALT2,
-PA_1_C_ALT1 = PA_1_C | ALT1,
-PA_2_ALT1   = PA_2   | ALT1,
-PA_2_ALT2   = PA_2   | ALT2,
-PA_3_ALT1   = PA_3   | ALT1,
-PA_3_ALT2   = PA_3   | ALT2,
-PA_4_ALT1   = PA_4   | ALT1,
-PA_4_ALT2   = PA_4   | ALT2,
-PA_5_ALT1   = PA_5   | ALT1,
-PA_6_ALT1   = PA_6   | ALT1,
-PA_7_ALT1   = PA_7   | ALT1,
-PA_7_ALT2   = PA_7   | ALT2,
-PA_7_ALT3   = PA_7   | ALT3,
-PA_8_ALT1   = PA_8   | ALT1,
-PA_9_ALT1   = PA_9   | ALT1,
-PA_10_ALT1  = PA_10  | ALT1,
-PA_11_ALT1  = PA_11  | ALT1,
-PA_12_ALT1  = PA_12  | ALT1,
-PA_15_ALT1  = PA_15  | ALT1,
-PA_15_ALT2  = PA_15  | ALT2,
-PB_0_ALT1   = PB_0   | ALT1,
-PB_0_ALT2   = PB_0   | ALT2,
-PB_1_ALT1   = PB_1   | ALT1,
-PB_1_ALT2   = PB_1   | ALT2,
-PB_3_ALT1   = PB_3   | ALT1,
-PB_3_ALT2   = PB_3   | ALT2,
-PB_4_ALT1   = PB_4   | ALT1,
-PB_4_ALT2   = PB_4   | ALT2,
-PB_5_ALT1   = PB_5   | ALT1,
-PB_5_ALT2   = PB_5   | ALT2,
-PB_6_ALT1   = PB_6   | ALT1,
-PB_6_ALT2   = PB_6   | ALT2,
-PB_7_ALT1   = PB_7   | ALT1,
-PB_8_ALT1   = PB_8   | ALT1,
-PB_8_ALT2   = PB_8   | ALT2,
-PB_9_ALT1   = PB_9   | ALT1,
-PB_9_ALT2   = PB_9   | ALT2,
-PB_14_ALT1  = PB_14  | ALT1,
-PB_14_ALT2  = PB_14  | ALT2,
-PB_15_ALT1  = PB_15  | ALT1,
-PB_15_ALT2  = PB_15  | ALT2,
-PC_0_ALT1   = PC_0   | ALT1,
-PC_0_ALT2   = PC_0   | ALT2,
-PC_1_ALT1   = PC_1   | ALT1,
-PC_1_ALT2   = PC_1   | ALT2,
-PC_2_ALT1   = PC_2   | ALT1,
-PC_2_ALT2   = PC_2   | ALT2,
-PC_3_ALT1   = PC_3   | ALT1,
-PC_4_ALT1   = PC_4   | ALT1,
-PC_5_ALT1   = PC_5   | ALT1,
-PC_6_ALT1   = PC_6   | ALT1,
-PC_6_ALT2   = PC_6   | ALT2,
-PC_7_ALT1   = PC_7   | ALT1,
-PC_7_ALT2   = PC_7   | ALT2,
-PC_8_ALT1   = PC_8   | ALT1,
-PC_9_ALT1   = PC_9   | ALT1,
-PC_10_ALT1  = PC_10  | ALT1,
-PC_11_ALT1  = PC_11  | ALT1,
-PF_0_ALT1   = PF_0   | ALT1,
-PF_1_ALT1   = PF_1   | ALT1,
-PF_6_ALT1   = PF_6   | ALT1,
-PF_7_ALT1   = PF_7   | ALT1,
-PF_8_ALT1   = PF_8   | ALT1,
-PF_8_ALT2   = PF_8   | ALT2,
-PF_9_ALT1   = PF_9   | ALT1,
-PF_9_ALT2   = PF_9   | ALT2,
-PG_13_ALT1  = PG_13  | ALT1,
-
-/* SYS_WKUP */
-#ifdef PWR_WAKEUP_PIN1
-  SYS_WKUP1 = PA_0,
-#endif
-#ifdef PWR_WAKEUP_PIN2
-  SYS_WKUP2 = PA_2,
-#endif
-#ifdef PWR_WAKEUP_PIN3
-  SYS_WKUP3 = NC,
-#endif
-#ifdef PWR_WAKEUP_PIN4
-  SYS_WKUP4 = PC_13,
-#endif
-#ifdef PWR_WAKEUP_PIN5
-  SYS_WKUP5 = NC,
-#endif
-#ifdef PWR_WAKEUP_PIN6
-  SYS_WKUP6 = PC_1,
-#endif
-#ifdef PWR_WAKEUP_PIN7
-  SYS_WKUP7 = NC,
-#endif
-#ifdef PWR_WAKEUP_PIN8
-  SYS_WKUP8 = NC,
-#endif
-
-/* USB */
-#ifdef USBCON
-  USB_OTG_HS_DM       = PA_11,
-  USB_OTG_HS_DP       = PA_12,
-  USB_OTG_HS_ID       = PA_10,
-  USB_OTG_HS_SOF      = PA_8,
-  USB_OTG_HS_ULPI_CK  = PA_5,
-  USB_OTG_HS_ULPI_D0  = PA_3,
-  USB_OTG_HS_ULPI_D1  = PB_0,
-  USB_OTG_HS_ULPI_D2  = PB_1,
-  USB_OTG_HS_ULPI_D3  = PB_10,
-  USB_OTG_HS_ULPI_D4  = PB_11,
-  USB_OTG_HS_ULPI_D5  = PB_12,
-  USB_OTG_HS_ULPI_D6  = PB_13,
-  USB_OTG_HS_ULPI_D7  = PB_5,
-  USB_OTG_HS_ULPI_DIR = PC_2,
-  #ifdef USB_OTG_HS_ULPI_NXT_PC_3
-    USB_OTG_HS_ULPI_NXT = PC_3,
-  #endif
-  #ifdef USB_OTG_HS_ULPI_NXT_PH_4
-    USB_OTG_HS_ULPI_NXT = PH_4,
-  #endif
-  USB_OTG_HS_ULPI_STP = PC_0,
-  USB_OTG_HS_VBUS     = PA_9,
-#endif
diff --git a/variants/STM32H7xx/H730IBKxQ/boards_entry.txt b/variants/STM32H7xx/H730IBKxQ/boards_entry.txt
deleted file mode 100644
index 5a98c93cc1..0000000000
--- a/variants/STM32H7xx/H730IBKxQ/boards_entry.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-# This file help to add generic board entry.
-# upload.maximum_size and product_line have to be verified
-# and changed if needed.
-# See: https://github.com/stm32duino/wiki/wiki/Add-a-new-variant-%28board%29
-
-# Generic H730IBKxQ
-GenH7.menu.pnum.GENERIC_H730IBKXQ=Generic H730IBKxQ
-GenH7.menu.pnum.GENERIC_H730IBKXQ.upload.maximum_size=131072
-GenH7.menu.pnum.GENERIC_H730IBKXQ.upload.maximum_data_size=1048576
-GenH7.menu.pnum.GENERIC_H730IBKXQ.build.board=GENERIC_H730IBKXQ
-GenH7.menu.pnum.GENERIC_H730IBKXQ.build.product_line=STM32H730xx
-GenH7.menu.pnum.GENERIC_H730IBKXQ.build.variant=STM32H7xx/H730IBKxQ
-
diff --git a/variants/STM32H7xx/H730IBKxQ/variant_generic.h b/variants/STM32H7xx/H730IBKxQ/variant_generic.h
deleted file mode 100644
index ed63721a22..0000000000
--- a/variants/STM32H7xx/H730IBKxQ/variant_generic.h
+++ /dev/null
@@ -1,331 +0,0 @@
-/*
- *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
- * All rights reserved.
- *
- * This software component is licensed by ST under BSD 3-Clause license,
- * the "License"; You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *                        opensource.org/licenses/BSD-3-Clause
- *
- *******************************************************************************
- */
-#pragma once
-
-/*----------------------------------------------------------------------------
- *        STM32 pins number
- *----------------------------------------------------------------------------*/
-#define PA0                     PIN_A0
-#define PA1                     PIN_A1
-#define PA2                     PIN_A2
-#define PA3                     PIN_A3
-#define PA4                     PIN_A4
-#define PA5                     PIN_A5
-#define PA6                     PIN_A6
-#define PA7                     PIN_A7
-#define PA8                     8
-#define PA9                     9
-#define PA10                    10
-#define PA11                    11
-#define PA12                    12
-#define PA13                    13
-#define PA14                    14
-#define PA15                    15
-#define PB0                     PIN_A8
-#define PB1                     PIN_A9
-#define PB2                     18
-#define PB3                     19
-#define PB4                     20
-#define PB5                     21
-#define PB6                     22
-#define PB7                     23
-#define PB8                     24
-#define PB9                     25
-#define PB10                    26
-#define PB11                    27
-#define PB12                    28
-#define PB13                    29
-#define PB14                    30
-#define PB15                    31
-#define PC0                     PIN_A10
-#define PC1                     PIN_A11
-#define PC2                     PIN_A12
-#define PC3                     PIN_A13
-#define PC4                     PIN_A14
-#define PC5                     PIN_A15
-#define PC6                     38
-#define PC7                     39
-#define PC8                     40
-#define PC9                     41
-#define PC10                    42
-#define PC11                    43
-#define PC12                    44
-#define PC13                    45
-#define PC14                    46
-#define PC15                    47
-#define PD0                     48
-#define PD1                     49
-#define PD2                     50
-#define PD3                     51
-#define PD4                     52
-#define PD5                     53
-#define PD6                     54
-#define PD7                     55
-#define PD8                     56
-#define PD9                     57
-#define PD10                    58
-#define PD11                    59
-#define PD12                    60
-#define PD13                    61
-#define PD14                    62
-#define PD15                    63
-#define PE0                     64
-#define PE1                     65
-#define PE2                     66
-#define PE3                     67
-#define PE4                     68
-#define PE5                     69
-#define PE6                     70
-#define PE7                     71
-#define PE8                     72
-#define PE9                     73
-#define PE10                    74
-#define PE11                    75
-#define PE12                    76
-#define PE13                    77
-#define PE14                    78
-#define PE15                    79
-#define PF0                     80
-#define PF1                     81
-#define PF2                     82
-#define PF3                     PIN_A16
-#define PF4                     PIN_A17
-#define PF5                     PIN_A18
-#define PF6                     PIN_A19
-#define PF7                     PIN_A20
-#define PF8                     PIN_A21
-#define PF9                     PIN_A22
-#define PF10                    PIN_A23
-#define PF11                    PIN_A24
-#define PF12                    PIN_A25
-#define PF13                    PIN_A26
-#define PF14                    PIN_A27
-#define PF15                    95
-#define PG0                     96
-#define PG1                     97
-#define PG2                     98
-#define PG3                     99
-#define PG4                     100
-#define PG5                     101
-#define PG6                     102
-#define PG7                     103
-#define PG8                     104
-#define PG9                     105
-#define PG10                    106
-#define PG11                    107
-#define PG12                    108
-#define PG13                    109
-#define PG14                    110
-#define PG15                    111
-#define PH0                     112
-#define PH1                     113
-#define PH2                     PIN_A28
-#define PH3                     PIN_A29
-#define PH4                     PIN_A30
-#define PH5                     PIN_A31
-#define PH6                     118
-#define PH7                     119
-#define PH8                     120
-#define PH9                     121
-#define PH10                    122
-#define PH11                    123
-#define PH12                    124
-#define PH13                    125
-#define PH14                    126
-#define PH15                    127
-#define PA0_C                   PIN_A32
-#define PA1_C                   PIN_A33
-#define PC2_C                   PIN_A34
-#define PC3_C                   PIN_A35
-
-// Alternate pins number
-#define PA0_ALT1                (PA0   | ALT1)
-#define PA0_C_ALT1              (PA0_C | ALT1)
-#define PA1_ALT1                (PA1   | ALT1)
-#define PA1_ALT2                (PA1   | ALT2)
-#define PA1_C_ALT1              (PA1_C | ALT1)
-#define PA2_ALT1                (PA2   | ALT1)
-#define PA2_ALT2                (PA2   | ALT2)
-#define PA3_ALT1                (PA3   | ALT1)
-#define PA3_ALT2                (PA3   | ALT2)
-#define PA4_ALT1                (PA4   | ALT1)
-#define PA4_ALT2                (PA4   | ALT2)
-#define PA5_ALT1                (PA5   | ALT1)
-#define PA6_ALT1                (PA6   | ALT1)
-#define PA7_ALT1                (PA7   | ALT1)
-#define PA7_ALT2                (PA7   | ALT2)
-#define PA7_ALT3                (PA7   | ALT3)
-#define PA8_ALT1                (PA8   | ALT1)
-#define PA9_ALT1                (PA9   | ALT1)
-#define PA10_ALT1               (PA10  | ALT1)
-#define PA11_ALT1               (PA11  | ALT1)
-#define PA12_ALT1               (PA12  | ALT1)
-#define PA15_ALT1               (PA15  | ALT1)
-#define PA15_ALT2               (PA15  | ALT2)
-#define PB0_ALT1                (PB0   | ALT1)
-#define PB0_ALT2                (PB0   | ALT2)
-#define PB1_ALT1                (PB1   | ALT1)
-#define PB1_ALT2                (PB1   | ALT2)
-#define PB3_ALT1                (PB3   | ALT1)
-#define PB3_ALT2                (PB3   | ALT2)
-#define PB4_ALT1                (PB4   | ALT1)
-#define PB4_ALT2                (PB4   | ALT2)
-#define PB5_ALT1                (PB5   | ALT1)
-#define PB5_ALT2                (PB5   | ALT2)
-#define PB6_ALT1                (PB6   | ALT1)
-#define PB6_ALT2                (PB6   | ALT2)
-#define PB7_ALT1                (PB7   | ALT1)
-#define PB8_ALT1                (PB8   | ALT1)
-#define PB8_ALT2                (PB8   | ALT2)
-#define PB9_ALT1                (PB9   | ALT1)
-#define PB9_ALT2                (PB9   | ALT2)
-#define PB14_ALT1               (PB14  | ALT1)
-#define PB14_ALT2               (PB14  | ALT2)
-#define PB15_ALT1               (PB15  | ALT1)
-#define PB15_ALT2               (PB15  | ALT2)
-#define PC0_ALT1                (PC0   | ALT1)
-#define PC0_ALT2                (PC0   | ALT2)
-#define PC1_ALT1                (PC1   | ALT1)
-#define PC1_ALT2                (PC1   | ALT2)
-#define PC2_ALT1                (PC2   | ALT1)
-#define PC2_ALT2                (PC2   | ALT2)
-#define PC3_ALT1                (PC3   | ALT1)
-#define PC4_ALT1                (PC4   | ALT1)
-#define PC5_ALT1                (PC5   | ALT1)
-#define PC6_ALT1                (PC6   | ALT1)
-#define PC6_ALT2                (PC6   | ALT2)
-#define PC7_ALT1                (PC7   | ALT1)
-#define PC7_ALT2                (PC7   | ALT2)
-#define PC8_ALT1                (PC8   | ALT1)
-#define PC9_ALT1                (PC9   | ALT1)
-#define PC10_ALT1               (PC10  | ALT1)
-#define PC11_ALT1               (PC11  | ALT1)
-#define PF0_ALT1                (PF0   | ALT1)
-#define PF1_ALT1                (PF1   | ALT1)
-#define PF6_ALT1                (PF6   | ALT1)
-#define PF7_ALT1                (PF7   | ALT1)
-#define PF8_ALT1                (PF8   | ALT1)
-#define PF8_ALT2                (PF8   | ALT2)
-#define PF9_ALT1                (PF9   | ALT1)
-#define PF9_ALT2                (PF9   | ALT2)
-#define PG13_ALT1               (PG13  | ALT1)
-
-#define NUM_DIGITAL_PINS        132
-#define NUM_DUALPAD_PINS        4
-#define NUM_ANALOG_INPUTS       36
-
-// On-board LED pin number
-#ifndef LED_BUILTIN
-  #define LED_BUILTIN           PNUM_NOT_DEFINED
-#endif
-
-// On-board user button
-#ifndef USER_BTN
-  #define USER_BTN              PNUM_NOT_DEFINED
-#endif
-
-// SPI definitions
-#ifndef PIN_SPI_SS
-  #define PIN_SPI_SS            PA4
-#endif
-#ifndef PIN_SPI_SS1
-  #define PIN_SPI_SS1           PA15
-#endif
-#ifndef PIN_SPI_SS2
-  #define PIN_SPI_SS2           PG10
-#endif
-#ifndef PIN_SPI_SS3
-  #define PIN_SPI_SS3           PNUM_NOT_DEFINED
-#endif
-#ifndef PIN_SPI_MOSI
-  #define PIN_SPI_MOSI          PA7
-#endif
-#ifndef PIN_SPI_MISO
-  #define PIN_SPI_MISO          PA6
-#endif
-#ifndef PIN_SPI_SCK
-  #define PIN_SPI_SCK           PA5
-#endif
-
-// I2C definitions
-#ifndef PIN_WIRE_SDA
-  #define PIN_WIRE_SDA          PB7
-#endif
-#ifndef PIN_WIRE_SCL
-  #define PIN_WIRE_SCL          PB6
-#endif
-
-// Timer Definitions
-// Use TIM6/TIM7 when possible as servo and tone don't need GPIO output pin
-#ifndef TIMER_TONE
-  #define TIMER_TONE            TIM6
-#endif
-#ifndef TIMER_SERVO
-  #define TIMER_SERVO           TIM7
-#endif
-
-// UART Definitions
-#ifndef SERIAL_UART_INSTANCE
-  #define SERIAL_UART_INSTANCE  4
-#endif
-
-// Default pin used for generic 'Serial' instance
-// Mandatory for Firmata
-#ifndef PIN_SERIAL_RX
-  #define PIN_SERIAL_RX         PA1
-#endif
-#ifndef PIN_SERIAL_TX
-  #define PIN_SERIAL_TX         PA0
-#endif
-
-// Extra HAL modules
-#if !defined(HAL_DAC_MODULE_DISABLED)
-  #define HAL_DAC_MODULE_ENABLED
-#endif
-#if !defined(HAL_ETH_MODULE_DISABLED)
-  #define HAL_ETH_MODULE_ENABLED
-#endif
-#if !defined(HAL_OSPI_MODULE_DISABLED)
-  #define HAL_OSPI_MODULE_ENABLED
-#endif
-#if !defined(HAL_SD_MODULE_DISABLED)
-  #define HAL_SD_MODULE_ENABLED
-#endif
-
-/*----------------------------------------------------------------------------
- *        Arduino objects - C++ only
- *----------------------------------------------------------------------------*/
-
-#ifdef __cplusplus
-  // These serial port names are intended to allow libraries and architecture-neutral
-  // sketches to automatically default to the correct port name for a particular type
-  // of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
-  // the first hardware serial port whose RX/TX pins are not dedicated to another use.
-  //
-  // SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
-  //
-  // SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
-  //
-  // SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
-  //
-  // SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
-  //
-  // SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
-  //                            pins are NOT connected to anything by default.
-  #ifndef SERIAL_PORT_MONITOR
-    #define SERIAL_PORT_MONITOR   Serial
-  #endif
-  #ifndef SERIAL_PORT_HARDWARE
-    #define SERIAL_PORT_HARDWARE  Serial
-  #endif
-#endif
diff --git a/variants/STM32H7xx/H730IBTxQ/PeripheralPins.c b/variants/STM32H7xx/H730IBTxQ/PeripheralPins.c
deleted file mode 100644
index c8a978b9e4..0000000000
--- a/variants/STM32H7xx/H730IBTxQ/PeripheralPins.c
+++ /dev/null
@@ -1,695 +0,0 @@
-/*
- *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
- * All rights reserved.
- *
- * This software component is licensed by ST under BSD 3-Clause license,
- * the "License"; You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *                        opensource.org/licenses/BSD-3-Clause
- *
- *******************************************************************************
- */
-/*
- * Automatically generated from STM32H730IBTxQ.xml
- * CubeMX DB release 6.0.30
- */
-#if !defined(CUSTOM_PERIPHERAL_PINS)
-#include "Arduino.h"
-#include "PeripheralPins.h"
-
-/* =====
- * Notes:
- * - The pins mentioned Px_y_ALTz are alternative possibilities which use other
- *   HW peripheral instances. You can use them the same way as any other "normal"
- *   pin (i.e. analogWrite(PA7_ALT1, 128);).
- *
- * - Commented lines are alternative possibilities which are not used per default.
- *   If you change them, you will have to know what you do
- * =====
- */
-
-//*** ADC ***
-
-#ifdef HAL_ADC_MODULE_ENABLED
-WEAK const PinMap PinMap_ADC[] = {
-  {PA_0,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 16, 0)}, // ADC1_INP16
-  {PA_1,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 17, 0)}, // ADC1_INP17
-  {PA_2,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC1_INP14
-  {PA_2_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC2_INP14
-  {PA_3,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC1_INP15
-  {PA_3_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC2_INP15
-  {PA_4,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 18, 0)}, // ADC1_INP18
-  {PA_4_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 18, 0)}, // ADC2_INP18
-  {PA_5,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 19, 0)}, // ADC1_INP19
-  {PA_5_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 19, 0)}, // ADC2_INP19
-  {PA_6,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC1_INP3
-  {PA_6_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC2_INP3
-  {PA_7,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC1_INP7
-  {PA_7_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC2_INP7
-  {PB_0,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC1_INP9
-  {PB_0_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC2_INP9
-  {PB_1,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC1_INP5
-  {PB_1_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC2_INP5
-  {PC_0,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC1_INP10
-  {PC_0_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC2_INP10
-  {PC_0_ALT2, ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC3_INP10
-  {PC_1,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC1_INP11
-  {PC_1_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC2_INP11
-  {PC_1_ALT2, ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC3_INP11
-  {PC_2_C,    ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC3_INP0
-  {PC_3_C,    ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC3_INP1
-  {PC_4,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC1_INP4
-  {PC_4_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC2_INP4
-  {PC_5,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC1_INP8
-  {PC_5_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC2_INP8
-  {PF_3,      ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC3_INP5
-  {PF_4,      ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC3_INP9
-  {PF_5,      ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC3_INP4
-  {PF_6,      ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC3_INP8
-  {PF_7,      ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC3_INP3
-  {PF_8,      ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC3_INP7
-  {PF_9,      ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC3_INP2
-  {PF_10,     ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC3_INP6
-  {PF_11,     ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC1_INP2
-  {PF_12,     ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC1_INP6
-  {PF_13,     ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC2_INP2
-  {PF_14,     ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC2_INP6
-  {NC,        NP,   0}
-};
-#endif
-
-//*** DAC ***
-
-#ifdef HAL_DAC_MODULE_ENABLED
-WEAK const PinMap PinMap_DAC[] = {
-  {PA_4, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // DAC1_OUT1
-  {PA_5, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // DAC1_OUT2
-  {NC,   NP,   0}
-};
-#endif
-
-//*** I2C ***
-
-#ifdef HAL_I2C_MODULE_ENABLED
-WEAK const PinMap PinMap_I2C_SDA[] = {
-  {PB_7,      I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
-  {PB_7_ALT1, I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C4)},
-  {PB_9,      I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
-  {PB_9_ALT1, I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C4)},
-  {PB_11,     I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
-  {PC_9,      I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
-  {PC_9_ALT1, I2C5, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C5)},
-  {PC_10,     I2C5, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C5)},
-  {PD_13,     I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C4)},
-  {PF_0,      I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
-  {PF_0_ALT1, I2C5, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C5)},
-  {PF_15,     I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C4)},
-  {NC,        NP,   0}
-};
-#endif
-
-#ifdef HAL_I2C_MODULE_ENABLED
-WEAK const PinMap PinMap_I2C_SCL[] = {
-  {PA_8,      I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
-  {PA_8_ALT1, I2C5, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C5)},
-  {PB_6,      I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
-  {PB_6_ALT1, I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C4)},
-  {PB_8,      I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
-  {PB_8_ALT1, I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C4)},
-  {PB_10,     I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
-  {PC_11,     I2C5, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C5)},
-  {PD_12,     I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C4)},
-  {PF_1,      I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
-  {PF_1_ALT1, I2C5, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C5)},
-  {PF_14,     I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C4)},
-  {NC,        NP,   0}
-};
-#endif
-
-//*** TIM ***
-
-#ifdef HAL_TIM_MODULE_ENABLED
-WEAK const PinMap PinMap_TIM[] = {
-  {PA_0,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
-  {PA_0_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)}, // TIM5_CH1
-  {PA_1,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
-  {PA_1_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 2, 0)}, // TIM5_CH2
-  {PA_1_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM15, 1, 1)}, // TIM15_CH1N
-  {PA_2,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
-  {PA_2_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 3, 0)}, // TIM5_CH3
-  {PA_2_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM15, 1, 0)}, // TIM15_CH1
-  {PA_3,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4
-  {PA_3_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 4, 0)}, // TIM5_CH4
-  {PA_3_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM15, 2, 0)}, // TIM15_CH2
-  {PA_5,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
-  {PA_5_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 1)}, // TIM8_CH1N
-  {PA_6,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
-  {PA_6_ALT1,  TIM13, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM13, 1, 0)}, // TIM13_CH1
-  {PA_7,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
-  {PA_7_ALT1,  TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
-  {PA_7_ALT2,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 1)}, // TIM8_CH1N
-  {PA_7_ALT3,  TIM14, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM14, 1, 0)}, // TIM14_CH1
-  {PA_8,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)}, // TIM1_CH1
-  {PA_9,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 0)}, // TIM1_CH2
-  {PA_10,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 0)}, // TIM1_CH3
-  {PA_11,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 4, 0)}, // TIM1_CH4
-  {PA_15,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
-  {PB_0,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
-  {PB_0_ALT1,  TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)}, // TIM3_CH3
-  {PB_0_ALT2,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 1)}, // TIM8_CH2N
-  {PB_1,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
-  {PB_1_ALT1,  TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
-  {PB_1_ALT2,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 1)}, // TIM8_CH3N
-  {PB_3,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
-  {PB_4,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
-  {PB_5,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
-  {PB_6,       TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 1, 0)}, // TIM4_CH1
-  {PB_6_ALT1,  TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM16, 1, 1)}, // TIM16_CH1N
-  {PB_7,       TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 2, 0)}, // TIM4_CH2
-  {PB_7_ALT1,  TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM17, 1, 1)}, // TIM17_CH1N
-  {PB_8,       TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 3, 0)}, // TIM4_CH3
-  {PB_8_ALT1,  TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM16, 1, 0)}, // TIM16_CH1
-  {PB_9,       TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)}, // TIM4_CH4
-  {PB_9_ALT1,  TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM17, 1, 0)}, // TIM17_CH1
-  {PB_10,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
-  {PB_11,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4
-  {PB_13,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
-  {PB_14,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
-  {PB_14_ALT1, TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 1)}, // TIM8_CH2N
-  {PB_14_ALT2, TIM12, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM12, 1, 0)}, // TIM12_CH1
-  {PB_15,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
-  {PB_15_ALT1, TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 1)}, // TIM8_CH3N
-  {PB_15_ALT2, TIM12, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM12, 2, 0)}, // TIM12_CH2
-  {PC_6,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
-  {PC_6_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 0)}, // TIM8_CH1
-  {PC_7,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
-  {PC_7_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 0)}, // TIM8_CH2
-  {PC_8,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)}, // TIM3_CH3
-  {PC_8_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 0)}, // TIM8_CH3
-  {PC_9,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
-  {PC_9_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 4, 0)}, // TIM8_CH4
-  {PC_12,      TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM15, 1, 0)}, // TIM15_CH1
-  {PD_12,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 1, 0)}, // TIM4_CH1
-  {PD_13,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 2, 0)}, // TIM4_CH2
-  {PD_14,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 3, 0)}, // TIM4_CH3
-  {PD_15,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)}, // TIM4_CH4
-  {PE_4,       TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM15, 1, 1)}, // TIM15_CH1N
-  {PE_5,       TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM15, 1, 0)}, // TIM15_CH1
-  {PE_6,       TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM15, 2, 0)}, // TIM15_CH2
-  {PE_8,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
-  {PE_9,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)}, // TIM1_CH1
-  {PE_10,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
-  {PE_11,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 0)}, // TIM1_CH2
-  {PE_12,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
-  {PE_13,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 0)}, // TIM1_CH3
-  {PE_14,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 4, 0)}, // TIM1_CH4
-  {PF_0,       TIM23, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF13_TIM23, 1, 0)}, // TIM23_CH1
-  {PF_1,       TIM23, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF13_TIM23, 2, 0)}, // TIM23_CH2
-  {PF_2,       TIM23, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF13_TIM23, 3, 0)}, // TIM23_CH3
-  {PF_3,       TIM23, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF13_TIM23, 4, 0)}, // TIM23_CH4
-  {PF_6,       TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM16, 1, 0)}, // TIM16_CH1
-  {PF_6_ALT1,  TIM23, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF13_TIM23, 1, 0)}, // TIM23_CH1
-  {PF_7,       TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM17, 1, 0)}, // TIM17_CH1
-  {PF_7_ALT1,  TIM23, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF13_TIM23, 2, 0)}, // TIM23_CH2
-  {PF_8,       TIM13, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM13, 1, 0)}, // TIM13_CH1
-  {PF_8_ALT1,  TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM16, 1, 1)}, // TIM16_CH1N
-  {PF_8_ALT2,  TIM23, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF13_TIM23, 3, 0)}, // TIM23_CH3
-  {PF_9,       TIM14, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM14, 1, 0)}, // TIM14_CH1
-  {PF_9_ALT1,  TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM17, 1, 1)}, // TIM17_CH1N
-  {PF_9_ALT2,  TIM23, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF13_TIM23, 4, 0)}, // TIM23_CH4
-  {PF_11,      TIM24, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM24, 1, 0)}, // TIM24_CH1
-  {PF_12,      TIM24, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM24, 2, 0)}, // TIM24_CH2
-  {PF_13,      TIM24, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM24, 3, 0)}, // TIM24_CH3
-  {PF_14,      TIM24, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM24, 4, 0)}, // TIM24_CH4
-  {PG_12,      TIM23, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF13_TIM23, 1, 0)}, // TIM23_CH1
-  {PG_13,      TIM23, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF13_TIM23, 2, 0)}, // TIM23_CH2
-  {PG_14,      TIM23, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF13_TIM23, 3, 0)}, // TIM23_CH3
-  {PJ_8,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
-  {PJ_8_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 0)}, // TIM8_CH1
-  {PJ_9,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 0)}, // TIM1_CH3
-  {PJ_9_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 1)}, // TIM8_CH1N
-  {PJ_10,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
-  {PJ_10_ALT1, TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 0)}, // TIM8_CH2
-  {PJ_11,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 0)}, // TIM1_CH2
-  {PJ_11_ALT1, TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 1)}, // TIM8_CH2N
-  {PK_0,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
-  {PK_0_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 0)}, // TIM8_CH3
-  {PK_1,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)}, // TIM1_CH1
-  {PK_1_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 1)}, // TIM8_CH3N
-  {NC,         NP,    0}
-};
-#endif
-
-//*** UART ***
-
-#ifdef HAL_UART_MODULE_ENABLED
-WEAK const PinMap PinMap_UART_TX[] = {
-  {PA_0,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PA_2,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PA_9,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_LPUART)},
-  {PA_9_ALT1,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PA_12,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_UART4)},
-  {PA_15,      UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART7)},
-  {PB_4,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART7)},
-  {PB_6,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART)},
-  {PB_6_ALT1,  UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_UART5)},
-  {PB_6_ALT2,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PB_9,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PB_10,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PB_13,      UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_UART5)},
-  {PB_14,      USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART1)},
-  {PC_6,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
-  {PC_10,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PC_10_ALT1, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PC_12,      UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
-  {PD_1,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PD_5,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PD_8,       USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PD_15,      UART9,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART9)},
-  {PE_1,       UART8,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART8)},
-  {PE_3,       USART10, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_USART10)},
-  {PE_8,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
-  {PF_7,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
-  {PG_1,       UART9,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART9)},
-  {PG_12,      USART10, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART10)},
-  {PG_14,      USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
-  {PJ_8,       UART8,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART8)},
-  {NC,         NP,      0}
-};
-#endif
-
-#ifdef HAL_UART_MODULE_ENABLED
-WEAK const PinMap PinMap_UART_RX[] = {
-  {PA_1,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PA_3,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PA_8,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART7)},
-  {PA_10,      LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_LPUART)},
-  {PA_10_ALT1, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PA_11,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_UART4)},
-  {PB_3,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART7)},
-  {PB_5,       UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_UART5)},
-  {PB_7,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART)},
-  {PB_7_ALT1,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PB_8,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PB_11,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PB_12,      UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_UART5)},
-  {PB_15,      USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART1)},
-  {PC_7,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
-  {PC_11,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PC_11_ALT1, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PD_0,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PD_2,       UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
-  {PD_6,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PD_9,       USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PD_14,      UART9,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART9)},
-  {PE_0,       UART8,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART8)},
-  {PE_2,       USART10, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART10)},
-  {PE_7,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
-  {PF_6,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
-  {PG_0,       UART9,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART9)},
-  {PG_9,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
-  {PG_11,      USART10, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART10)},
-  {PJ_9,       UART8,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART8)},
-  {NC,         NP,      0}
-};
-#endif
-
-#ifdef HAL_UART_MODULE_ENABLED
-WEAK const PinMap PinMap_UART_RTS[] = {
-  {PA_1,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PA_12,      LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_LPUART)},
-  {PA_12_ALT1, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PA_15,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PB_14,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PB_14_ALT1, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PC_8,       UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
-  {PD_4,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PD_12,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PD_13,      UART9,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART9)},
-  {PD_15,      UART8,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART8)},
-  {PE_9,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
-  {PF_8,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
-  {PG_8,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
-  {PG_12,      USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
-  {PG_14,      USART10, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART10)},
-  {NC,         NP,      0}
-};
-#endif
-
-#ifdef HAL_UART_MODULE_ENABLED
-WEAK const PinMap PinMap_UART_CTS[] = {
-  {PA_0,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PA_11,      LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_LPUART)},
-  {PA_11_ALT1, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PB_0,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PB_13,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PB_15,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PC_9,       UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
-  {PD_0,       UART9,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART9)},
-  {PD_3,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PD_11,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PD_14,      UART8,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART8)},
-  {PE_10,      UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
-  {PF_9,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
-  {PG_13,      USART10, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART10)},
-  {PG_13_ALT1, USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
-  {PG_15,      USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
-  {NC,         NP,      0}
-};
-#endif
-
-//*** SPI ***
-
-#ifdef HAL_SPI_MODULE_ENABLED
-WEAK const PinMap PinMap_SPI_MOSI[] = {
-  {PA_7,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PA_7_ALT1, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
-  {PB_2,      SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_SPI3)},
-  {PB_5,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PB_5_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_SPI3)},
-  {PB_5_ALT2, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
-  {PB_15,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PC_1,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PC_12,     SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PD_6,      SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI3)},
-  {PD_7,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PE_6,      SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  {PE_14,     SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  {PF_9,      SPI5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI5)},
-  {PF_11,     SPI5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI5)},
-  {PG_14,     SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI6)},
-  {PJ_10,     SPI5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI5)},
-  {NC,        NP,   0}
-};
-#endif
-
-#ifdef HAL_SPI_MODULE_ENABLED
-WEAK const PinMap PinMap_SPI_MISO[] = {
-  {PA_6,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PA_6_ALT1, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
-  {PB_4,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PB_4_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PB_4_ALT2, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
-  {PB_14,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PC_11,     SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PE_5,      SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  {PE_13,     SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  {PF_8,      SPI5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI5)},
-  {PG_9,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PG_12,     SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI6)},
-  {PJ_11,     SPI5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI5)},
-  {NC,        NP,   0}
-};
-#endif
-
-#ifdef HAL_SPI_MODULE_ENABLED
-WEAK const PinMap PinMap_SPI_SCLK[] = {
-  {PA_5,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PA_5_ALT1, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
-  {PA_9,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PA_12,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PB_3,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PB_3_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PB_3_ALT2, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
-  {PB_10,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PB_13,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PC_10,     SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PC_12,     SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI6)},
-  {PD_3,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PE_2,      SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  {PE_12,     SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  {PF_7,      SPI5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI5)},
-  {PG_11,     SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PG_13,     SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI6)},
-  {PK_0,      SPI5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI5)},
-  {NC,        NP,   0}
-};
-#endif
-
-#ifdef HAL_SPI_MODULE_ENABLED
-WEAK const PinMap PinMap_SPI_SSEL[] = {
-  {PA_0,       SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI6)},
-  {PA_4,       SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PA_4_ALT1,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PA_4_ALT2,  SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
-  {PA_11,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PA_15,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PA_15_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PA_15_ALT2, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_SPI6)},
-  {PB_4,       SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_SPI2)},
-  {PB_9,       SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PB_12,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PE_4,       SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  {PE_11,      SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  {PF_6,       SPI5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI5)},
-  {PG_8,       SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI6)},
-  {PG_10,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PK_1,       SPI5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI5)},
-  {NC,         NP,   0}
-};
-#endif
-
-//*** FDCAN ***
-
-#ifdef HAL_FDCAN_MODULE_ENABLED
-WEAK const PinMap PinMap_CAN_RD[] = {
-  {PA_11, FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
-  {PB_5,  FDCAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN2)},
-  {PB_8,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
-  {PB_12, FDCAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN2)},
-  {PD_0,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
-  {PD_12, FDCAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF5_FDCAN3)},
-  {PF_6,  FDCAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF2_FDCAN3)},
-  {PG_10, FDCAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF2_FDCAN3)},
-  {NC,    NP,     0}
-};
-#endif
-
-#ifdef HAL_FDCAN_MODULE_ENABLED
-WEAK const PinMap PinMap_CAN_TD[] = {
-  {PA_12, FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
-  {PB_6,  FDCAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN2)},
-  {PB_9,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
-  {PB_13, FDCAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN2)},
-  {PD_1,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
-  {PD_13, FDCAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF5_FDCAN3)},
-  {PF_7,  FDCAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF2_FDCAN3)},
-  {PG_9,  FDCAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF2_FDCAN3)},
-  {NC,    NP,     0}
-};
-#endif
-
-//*** ETHERNET ***
-
-#ifdef HAL_ETH_MODULE_ENABLED
-WEAK const PinMap PinMap_Ethernet[] = {
-  {PA_0,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
-  {PA_1,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_REF_CLK
-  {PA_1_ALT1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RX_CLK
-  {PA_2,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_MDIO
-  {PA_3,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_COL
-  {PA_7,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS_DV
-  {PA_7_ALT1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RX_DV
-  {PA_9,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TX_ER
-  {PB_0,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RXD2
-  {PB_1,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RXD3
-  {PB_2,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TX_ER
-  {PB_5,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_PPS_OUT
-  {PB_8,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD3
-  {PB_10,     ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RX_ER
-  {PB_11,     ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TX_EN
-  {PB_12,     ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD0
-  {PB_13,     ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD1
-  {PC_1,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_MDC
-  {PC_4,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RXD0
-  {PC_5,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RXD1
-  {PE_2,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD3
-  {PG_8,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_PPS_OUT
-  {PG_11,     ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TX_EN
-  {PG_12,     ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD1
-  {PG_13,     ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD0
-  {PG_14,     ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD1
-  {NC,        NP,  0}
-};
-#endif
-
-//*** OCTOSPI ***
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA0[] = {
-  {PA_2,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO0
-  {PB_1,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO0
-  {PB_12, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO0
-  {PC_9,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO0
-  {PD_11, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO0
-  {PF_0,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P2)}, // OCTOSPIM_P2_IO0
-  {PF_8,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO0
-  {NC,    NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA1[] = {
-  {PB_0,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO1
-  {PC_10, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO1
-  {PD_12, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO1
-  {PF_1,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P2)}, // OCTOSPIM_P2_IO1
-  {PF_9,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO1
-  {NC,    NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA2[] = {
-  {PA_3,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO2
-  {PA_7,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO2
-  {PB_13, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO2
-  {PE_2,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO2
-  {PF_2,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P2)}, // OCTOSPIM_P2_IO2
-  {PF_7,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO2
-  {NC,    NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA3[] = {
-  {PA_1,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO3
-  {PA_6,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO3
-  {PD_13, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO3
-  {PF_3,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P2)}, // OCTOSPIM_P2_IO3
-  {PF_6,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO3
-  {NC,    NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA4[] = {
-  {PC_1, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO4
-  {PD_4, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO4
-  {PE_7, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO4
-  {PG_0, OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P2)}, // OCTOSPIM_P2_IO4
-  {NC,   NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA5[] = {
-  {PD_5, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO5
-  {PE_8, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO5
-  {PG_1, OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P2)}, // OCTOSPIM_P2_IO5
-  {NC,   NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA6[] = {
-  {PD_6,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO6
-  {PE_9,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO6
-  {PG_9,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO6
-  {PG_10, OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_OCTOSPIM_P2)}, // OCTOSPIM_P2_IO6
-  {NC,    NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA7[] = {
-  {PD_7,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO7
-  {PE_10, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO7
-  {PG_11, OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P2)}, // OCTOSPIM_P2_IO7
-  {PG_14, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO7
-  {NC,    NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_SCLK[] = {
-  {PA_3,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OCTOSPIM_P1)}, // OCTOSPIM_P1_CLK
-  {PB_2,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_CLK
-  {PF_4,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P2)}, // OCTOSPIM_P2_CLK
-  {PF_10, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_CLK
-  {NC,    NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_SSEL[] = {
-  {PB_6,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_NCS
-  {PB_10, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_NCS
-  {PC_11, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_NCS
-  {PE_11, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_OCTOSPIM_P1)}, // OCTOSPIM_P1_NCS
-  {PG_6,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_NCS
-  {PG_12, OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_OCTOSPIM_P2)}, // OCTOSPIM_P2_NCS
-  {NC,    NP,       0}
-};
-#endif
-
-//*** USB ***
-
-#if defined(HAL_PCD_MODULE_ENABLED) || defined(HAL_HCD_MODULE_ENABLED)
-WEAK const PinMap PinMap_USB_OTG_HS[] = {
-#ifdef USE_USB_HS_IN_FS
-  {PA_8,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_SOF
-  {PA_9,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
-  {PA_10, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ID
-  {PA_11, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)}, // USB_OTG_HS_DM
-  {PA_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)}, // USB_OTG_HS_DP
-#else
-  {PA_3,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D0
-  {PA_5,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_CK
-  {PB_0,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D1
-  {PB_1,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D2
-  {PB_5,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D7
-  {PB_10, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D3
-  {PB_11, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D4
-  {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D5
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D6
-  {PC_0,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_STP
-#endif /* USE_USB_HS_IN_FS */
-  {NC,    NP,         0}
-};
-#endif
-
-//*** SD ***
-
-#ifdef HAL_SD_MODULE_ENABLED
-WEAK const PinMap PinMap_SD[] = {
-  {PA_0,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_SDMMC2)}, // SDMMC2_CMD
-  {PB_3,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_SDMMC2)}, // SDMMC2_D2
-  {PB_4,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_SDMMC2)}, // SDMMC2_D3
-  {PB_8,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF7_SDMMC1)}, // SDMMC1_CKIN
-  {PB_8_ALT1, SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D4
-  {PB_8_ALT2, SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_SDMMC2)}, // SDMMC2_D4
-  {PB_9,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF7_SDMMC1)}, // SDMMC1_CDIR
-  {PB_9_ALT1, SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D5
-  {PB_9_ALT2, SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_SDMMC2)}, // SDMMC2_D5
-  {PB_13,     SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D0
-  {PB_14,     SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_SDMMC2)}, // SDMMC2_D0
-  {PB_15,     SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_SDMMC2)}, // SDMMC2_D1
-  {PC_1,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_SDMMC2)}, // SDMMC2_CK
-  {PC_4,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF10_SDMMC2)}, // SDMMC2_CKIN
-  {PC_6,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF8_SDMMC1)}, // SDMMC1_D0DIR
-  {PC_6_ALT1, SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D6
-  {PC_6_ALT2, SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_SDMMC2)}, // SDMMC2_D6
-  {PC_7,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF8_SDMMC1)}, // SDMMC1_D123DIR
-  {PC_7_ALT1, SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D7
-  {PC_7_ALT2, SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_SDMMC2)}, // SDMMC2_D7
-  {PC_8,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D0
-  {PC_9,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D1
-  {PC_10,     SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D2
-  {PC_11,     SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D3
-  {PC_12,     SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDMMC1)}, // SDMMC1_CK
-  {PD_2,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDMMC1)}, // SDMMC1_CMD
-  {PD_6,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF11_SDMMC2)}, // SDMMC2_CK
-  {PD_7,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF11_SDMMC2)}, // SDMMC2_CMD
-  {PG_9,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_SDMMC2)}, // SDMMC2_D0
-  {PG_10,     SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_SDMMC2)}, // SDMMC2_D1
-  {PG_11,     SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_SDMMC2)}, // SDMMC2_D2
-  {PG_12,     SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_SDMMC2)}, // SDMMC2_D3
-  {PG_13,     SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_SDMMC2)}, // SDMMC2_D6
-  {PG_14,     SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_SDMMC2)}, // SDMMC2_D7
-  {NC,        NP,     0}
-};
-#endif
-
-#endif /* !CUSTOM_PERIPHERAL_PINS */
diff --git a/variants/STM32H7xx/H730IBTxQ/PinNamesVar.h b/variants/STM32H7xx/H730IBTxQ/PinNamesVar.h
deleted file mode 100644
index 8ee5601fc0..0000000000
--- a/variants/STM32H7xx/H730IBTxQ/PinNamesVar.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/* Dual pad pin name */
-PC_2_C     = PC_2  | PDUAL,
-PC_3_C     = PC_3  | PDUAL,
-
-/* Alternate pin name */
-PA_0_ALT1  = PA_0  | ALT1,
-PA_1_ALT1  = PA_1  | ALT1,
-PA_1_ALT2  = PA_1  | ALT2,
-PA_2_ALT1  = PA_2  | ALT1,
-PA_2_ALT2  = PA_2  | ALT2,
-PA_3_ALT1  = PA_3  | ALT1,
-PA_3_ALT2  = PA_3  | ALT2,
-PA_4_ALT1  = PA_4  | ALT1,
-PA_4_ALT2  = PA_4  | ALT2,
-PA_5_ALT1  = PA_5  | ALT1,
-PA_6_ALT1  = PA_6  | ALT1,
-PA_7_ALT1  = PA_7  | ALT1,
-PA_7_ALT2  = PA_7  | ALT2,
-PA_7_ALT3  = PA_7  | ALT3,
-PA_8_ALT1  = PA_8  | ALT1,
-PA_9_ALT1  = PA_9  | ALT1,
-PA_10_ALT1 = PA_10 | ALT1,
-PA_11_ALT1 = PA_11 | ALT1,
-PA_12_ALT1 = PA_12 | ALT1,
-PA_15_ALT1 = PA_15 | ALT1,
-PA_15_ALT2 = PA_15 | ALT2,
-PB_0_ALT1  = PB_0  | ALT1,
-PB_0_ALT2  = PB_0  | ALT2,
-PB_1_ALT1  = PB_1  | ALT1,
-PB_1_ALT2  = PB_1  | ALT2,
-PB_3_ALT1  = PB_3  | ALT1,
-PB_3_ALT2  = PB_3  | ALT2,
-PB_4_ALT1  = PB_4  | ALT1,
-PB_4_ALT2  = PB_4  | ALT2,
-PB_5_ALT1  = PB_5  | ALT1,
-PB_5_ALT2  = PB_5  | ALT2,
-PB_6_ALT1  = PB_6  | ALT1,
-PB_6_ALT2  = PB_6  | ALT2,
-PB_7_ALT1  = PB_7  | ALT1,
-PB_8_ALT1  = PB_8  | ALT1,
-PB_8_ALT2  = PB_8  | ALT2,
-PB_9_ALT1  = PB_9  | ALT1,
-PB_9_ALT2  = PB_9  | ALT2,
-PB_14_ALT1 = PB_14 | ALT1,
-PB_14_ALT2 = PB_14 | ALT2,
-PB_15_ALT1 = PB_15 | ALT1,
-PB_15_ALT2 = PB_15 | ALT2,
-PC_0_ALT1  = PC_0  | ALT1,
-PC_0_ALT2  = PC_0  | ALT2,
-PC_1_ALT1  = PC_1  | ALT1,
-PC_1_ALT2  = PC_1  | ALT2,
-PC_4_ALT1  = PC_4  | ALT1,
-PC_5_ALT1  = PC_5  | ALT1,
-PC_6_ALT1  = PC_6  | ALT1,
-PC_6_ALT2  = PC_6  | ALT2,
-PC_7_ALT1  = PC_7  | ALT1,
-PC_7_ALT2  = PC_7  | ALT2,
-PC_8_ALT1  = PC_8  | ALT1,
-PC_9_ALT1  = PC_9  | ALT1,
-PC_10_ALT1 = PC_10 | ALT1,
-PC_11_ALT1 = PC_11 | ALT1,
-PF_0_ALT1  = PF_0  | ALT1,
-PF_1_ALT1  = PF_1  | ALT1,
-PF_6_ALT1  = PF_6  | ALT1,
-PF_7_ALT1  = PF_7  | ALT1,
-PF_8_ALT1  = PF_8  | ALT1,
-PF_8_ALT2  = PF_8  | ALT2,
-PF_9_ALT1  = PF_9  | ALT1,
-PF_9_ALT2  = PF_9  | ALT2,
-PG_13_ALT1 = PG_13 | ALT1,
-PJ_8_ALT1  = PJ_8  | ALT1,
-PJ_9_ALT1  = PJ_9  | ALT1,
-PJ_10_ALT1 = PJ_10 | ALT1,
-PJ_11_ALT1 = PJ_11 | ALT1,
-PK_0_ALT1  = PK_0  | ALT1,
-PK_1_ALT1  = PK_1  | ALT1,
-
-/* SYS_WKUP */
-#ifdef PWR_WAKEUP_PIN1
-  SYS_WKUP1 = PA_0,
-#endif
-#ifdef PWR_WAKEUP_PIN2
-  SYS_WKUP2 = PA_2,
-#endif
-#ifdef PWR_WAKEUP_PIN3
-  SYS_WKUP3 = NC,
-#endif
-#ifdef PWR_WAKEUP_PIN4
-  SYS_WKUP4 = PC_13,
-#endif
-#ifdef PWR_WAKEUP_PIN5
-  SYS_WKUP5 = NC,
-#endif
-#ifdef PWR_WAKEUP_PIN6
-  SYS_WKUP6 = PC_1,
-#endif
-#ifdef PWR_WAKEUP_PIN7
-  SYS_WKUP7 = NC,
-#endif
-#ifdef PWR_WAKEUP_PIN8
-  SYS_WKUP8 = NC,
-#endif
-
-/* USB */
-#ifdef USBCON
-  USB_OTG_HS_DM       = PA_11,
-  USB_OTG_HS_DP       = PA_12,
-  USB_OTG_HS_ID       = PA_10,
-  USB_OTG_HS_SOF      = PA_8,
-  USB_OTG_HS_ULPI_CK  = PA_5,
-  USB_OTG_HS_ULPI_D0  = PA_3,
-  USB_OTG_HS_ULPI_D1  = PB_0,
-  USB_OTG_HS_ULPI_D2  = PB_1,
-  USB_OTG_HS_ULPI_D3  = PB_10,
-  USB_OTG_HS_ULPI_D4  = PB_11,
-  USB_OTG_HS_ULPI_D5  = PB_12,
-  USB_OTG_HS_ULPI_D6  = PB_13,
-  USB_OTG_HS_ULPI_D7  = PB_5,
-  USB_OTG_HS_ULPI_STP = PC_0,
-  USB_OTG_HS_VBUS     = PA_9,
-#endif
diff --git a/variants/STM32H7xx/H730IBTxQ/boards_entry.txt b/variants/STM32H7xx/H730IBTxQ/boards_entry.txt
deleted file mode 100644
index a5a49b3f76..0000000000
--- a/variants/STM32H7xx/H730IBTxQ/boards_entry.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-# This file help to add generic board entry.
-# upload.maximum_size and product_line have to be verified
-# and changed if needed.
-# See: https://github.com/stm32duino/wiki/wiki/Add-a-new-variant-%28board%29
-
-# Generic H730IBTxQ
-GenH7.menu.pnum.GENERIC_H730IBTXQ=Generic H730IBTxQ
-GenH7.menu.pnum.GENERIC_H730IBTXQ.upload.maximum_size=131072
-GenH7.menu.pnum.GENERIC_H730IBTXQ.upload.maximum_data_size=1048576
-GenH7.menu.pnum.GENERIC_H730IBTXQ.build.board=GENERIC_H730IBTXQ
-GenH7.menu.pnum.GENERIC_H730IBTXQ.build.product_line=STM32H730xx
-GenH7.menu.pnum.GENERIC_H730IBTXQ.build.variant=STM32H7xx/H730IBTxQ
-
diff --git a/variants/STM32H7xx/H730IBTxQ/variant_generic.cpp b/variants/STM32H7xx/H730IBTxQ/variant_generic.cpp
deleted file mode 100644
index 21fca95f30..0000000000
--- a/variants/STM32H7xx/H730IBTxQ/variant_generic.cpp
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
- * All rights reserved.
- *
- * This software component is licensed by ST under BSD 3-Clause license,
- * the "License"; You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *                        opensource.org/licenses/BSD-3-Clause
- *
- *******************************************************************************
- */
-#if defined(ARDUINO_GENERIC_H730IBTXQ)
-#include "pins_arduino.h"
-
-// Digital PinName array
-const PinName digitalPin[] = {
-  PA_0,   // D0/A0
-  PA_1,   // D1/A1
-  PA_2,   // D2/A2
-  PA_3,   // D3/A3
-  PA_4,   // D4/A4
-  PA_5,   // D5/A5
-  PA_6,   // D6/A6
-  PA_7,   // D7/A7
-  PA_8,   // D8
-  PA_9,   // D9
-  PA_10,  // D10
-  PA_11,  // D11
-  PA_12,  // D12
-  PA_13,  // D13
-  PA_14,  // D14
-  PA_15,  // D15
-  PB_0,   // D16/A8
-  PB_1,   // D17/A9
-  PB_2,   // D18
-  PB_3,   // D19
-  PB_4,   // D20
-  PB_5,   // D21
-  PB_6,   // D22
-  PB_7,   // D23
-  PB_8,   // D24
-  PB_9,   // D25
-  PB_10,  // D26
-  PB_11,  // D27
-  PB_12,  // D28
-  PB_13,  // D29
-  PB_14,  // D30
-  PB_15,  // D31
-  PC_0,   // D32/A10
-  PC_1,   // D33/A11
-  PC_4,   // D34/A12
-  PC_5,   // D35/A13
-  PC_6,   // D36
-  PC_7,   // D37
-  PC_8,   // D38
-  PC_9,   // D39
-  PC_10,  // D40
-  PC_11,  // D41
-  PC_12,  // D42
-  PC_13,  // D43
-  PC_14,  // D44
-  PC_15,  // D45
-  PD_0,   // D46
-  PD_1,   // D47
-  PD_2,   // D48
-  PD_3,   // D49
-  PD_4,   // D50
-  PD_5,   // D51
-  PD_6,   // D52
-  PD_7,   // D53
-  PD_8,   // D54
-  PD_9,   // D55
-  PD_10,  // D56
-  PD_11,  // D57
-  PD_12,  // D58
-  PD_13,  // D59
-  PD_14,  // D60
-  PD_15,  // D61
-  PE_0,   // D62
-  PE_1,   // D63
-  PE_2,   // D64
-  PE_3,   // D65
-  PE_4,   // D66
-  PE_5,   // D67
-  PE_6,   // D68
-  PE_7,   // D69
-  PE_8,   // D70
-  PE_9,   // D71
-  PE_10,  // D72
-  PE_11,  // D73
-  PE_12,  // D74
-  PE_13,  // D75
-  PE_14,  // D76
-  PE_15,  // D77
-  PF_0,   // D78
-  PF_1,   // D79
-  PF_2,   // D80
-  PF_3,   // D81/A14
-  PF_4,   // D82/A15
-  PF_5,   // D83/A16
-  PF_6,   // D84/A17
-  PF_7,   // D85/A18
-  PF_8,   // D86/A19
-  PF_9,   // D87/A20
-  PF_10,  // D88/A21
-  PF_11,  // D89/A22
-  PF_12,  // D90/A23
-  PF_13,  // D91/A24
-  PF_14,  // D92/A25
-  PF_15,  // D93
-  PG_0,   // D94
-  PG_1,   // D95
-  PG_2,   // D96
-  PG_3,   // D97
-  PG_4,   // D98
-  PG_5,   // D99
-  PG_6,   // D100
-  PG_7,   // D101
-  PG_8,   // D102
-  PG_9,   // D103
-  PG_10,  // D104
-  PG_11,  // D105
-  PG_12,  // D106
-  PG_13,  // D107
-  PG_14,  // D108
-  PG_15,  // D109
-  PH_0,   // D110
-  PH_1,   // D111
-  PJ_8,   // D112
-  PJ_9,   // D113
-  PJ_10,  // D114
-  PJ_11,  // D115
-  PK_0,   // D116
-  PK_1,   // D117
-  PK_2,   // D118
-  PC_2_C, // D119/A26
-  PC_3_C  // D120/A27
-};
-
-// Analog (Ax) pin number array
-const uint32_t analogInputPin[] = {
-  0,  // A0,  PA0
-  1,  // A1,  PA1
-  2,  // A2,  PA2
-  3,  // A3,  PA3
-  4,  // A4,  PA4
-  5,  // A5,  PA5
-  6,  // A6,  PA6
-  7,  // A7,  PA7
-  16, // A8,  PB0
-  17, // A9,  PB1
-  32, // A10, PC0
-  33, // A11, PC1
-  34, // A12, PC4
-  35, // A13, PC5
-  81, // A14, PF3
-  82, // A15, PF4
-  83, // A16, PF5
-  84, // A17, PF6
-  85, // A18, PF7
-  86, // A19, PF8
-  87, // A20, PF9
-  88, // A21, PF10
-  89, // A22, PF11
-  90, // A23, PF12
-  91, // A24, PF13
-  92, // A25, PF14
-  119, // A26, PC2_C
-  120 // A27, PC3_C
-};
-
-#endif /* ARDUINO_GENERIC_* */
diff --git a/variants/STM32H7xx/H730IBTxQ/variant_generic.h b/variants/STM32H7xx/H730IBTxQ/variant_generic.h
deleted file mode 100644
index 411d13311b..0000000000
--- a/variants/STM32H7xx/H730IBTxQ/variant_generic.h
+++ /dev/null
@@ -1,321 +0,0 @@
-/*
- *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
- * All rights reserved.
- *
- * This software component is licensed by ST under BSD 3-Clause license,
- * the "License"; You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *                        opensource.org/licenses/BSD-3-Clause
- *
- *******************************************************************************
- */
-#pragma once
-
-/*----------------------------------------------------------------------------
- *        STM32 pins number
- *----------------------------------------------------------------------------*/
-#define PA0                     PIN_A0
-#define PA1                     PIN_A1
-#define PA2                     PIN_A2
-#define PA3                     PIN_A3
-#define PA4                     PIN_A4
-#define PA5                     PIN_A5
-#define PA6                     PIN_A6
-#define PA7                     PIN_A7
-#define PA8                     8
-#define PA9                     9
-#define PA10                    10
-#define PA11                    11
-#define PA12                    12
-#define PA13                    13
-#define PA14                    14
-#define PA15                    15
-#define PB0                     PIN_A8
-#define PB1                     PIN_A9
-#define PB2                     18
-#define PB3                     19
-#define PB4                     20
-#define PB5                     21
-#define PB6                     22
-#define PB7                     23
-#define PB8                     24
-#define PB9                     25
-#define PB10                    26
-#define PB11                    27
-#define PB12                    28
-#define PB13                    29
-#define PB14                    30
-#define PB15                    31
-#define PC0                     PIN_A10
-#define PC1                     PIN_A11
-#define PC4                     PIN_A12
-#define PC5                     PIN_A13
-#define PC6                     36
-#define PC7                     37
-#define PC8                     38
-#define PC9                     39
-#define PC10                    40
-#define PC11                    41
-#define PC12                    42
-#define PC13                    43
-#define PC14                    44
-#define PC15                    45
-#define PD0                     46
-#define PD1                     47
-#define PD2                     48
-#define PD3                     49
-#define PD4                     50
-#define PD5                     51
-#define PD6                     52
-#define PD7                     53
-#define PD8                     54
-#define PD9                     55
-#define PD10                    56
-#define PD11                    57
-#define PD12                    58
-#define PD13                    59
-#define PD14                    60
-#define PD15                    61
-#define PE0                     62
-#define PE1                     63
-#define PE2                     64
-#define PE3                     65
-#define PE4                     66
-#define PE5                     67
-#define PE6                     68
-#define PE7                     69
-#define PE8                     70
-#define PE9                     71
-#define PE10                    72
-#define PE11                    73
-#define PE12                    74
-#define PE13                    75
-#define PE14                    76
-#define PE15                    77
-#define PF0                     78
-#define PF1                     79
-#define PF2                     80
-#define PF3                     PIN_A14
-#define PF4                     PIN_A15
-#define PF5                     PIN_A16
-#define PF6                     PIN_A17
-#define PF7                     PIN_A18
-#define PF8                     PIN_A19
-#define PF9                     PIN_A20
-#define PF10                    PIN_A21
-#define PF11                    PIN_A22
-#define PF12                    PIN_A23
-#define PF13                    PIN_A24
-#define PF14                    PIN_A25
-#define PF15                    93
-#define PG0                     94
-#define PG1                     95
-#define PG2                     96
-#define PG3                     97
-#define PG4                     98
-#define PG5                     99
-#define PG6                     100
-#define PG7                     101
-#define PG8                     102
-#define PG9                     103
-#define PG10                    104
-#define PG11                    105
-#define PG12                    106
-#define PG13                    107
-#define PG14                    108
-#define PG15                    109
-#define PH0                     110
-#define PH1                     111
-#define PJ8                     112
-#define PJ9                     113
-#define PJ10                    114
-#define PJ11                    115
-#define PK0                     116
-#define PK1                     117
-#define PK2                     118
-#define PC2_C                   PIN_A26
-#define PC3_C                   PIN_A27
-
-// Alternate pins number
-#define PA0_ALT1                (PA0  | ALT1)
-#define PA1_ALT1                (PA1  | ALT1)
-#define PA1_ALT2                (PA1  | ALT2)
-#define PA2_ALT1                (PA2  | ALT1)
-#define PA2_ALT2                (PA2  | ALT2)
-#define PA3_ALT1                (PA3  | ALT1)
-#define PA3_ALT2                (PA3  | ALT2)
-#define PA4_ALT1                (PA4  | ALT1)
-#define PA4_ALT2                (PA4  | ALT2)
-#define PA5_ALT1                (PA5  | ALT1)
-#define PA6_ALT1                (PA6  | ALT1)
-#define PA7_ALT1                (PA7  | ALT1)
-#define PA7_ALT2                (PA7  | ALT2)
-#define PA7_ALT3                (PA7  | ALT3)
-#define PA8_ALT1                (PA8  | ALT1)
-#define PA9_ALT1                (PA9  | ALT1)
-#define PA10_ALT1               (PA10 | ALT1)
-#define PA11_ALT1               (PA11 | ALT1)
-#define PA12_ALT1               (PA12 | ALT1)
-#define PA15_ALT1               (PA15 | ALT1)
-#define PA15_ALT2               (PA15 | ALT2)
-#define PB0_ALT1                (PB0  | ALT1)
-#define PB0_ALT2                (PB0  | ALT2)
-#define PB1_ALT1                (PB1  | ALT1)
-#define PB1_ALT2                (PB1  | ALT2)
-#define PB3_ALT1                (PB3  | ALT1)
-#define PB3_ALT2                (PB3  | ALT2)
-#define PB4_ALT1                (PB4  | ALT1)
-#define PB4_ALT2                (PB4  | ALT2)
-#define PB5_ALT1                (PB5  | ALT1)
-#define PB5_ALT2                (PB5  | ALT2)
-#define PB6_ALT1                (PB6  | ALT1)
-#define PB6_ALT2                (PB6  | ALT2)
-#define PB7_ALT1                (PB7  | ALT1)
-#define PB8_ALT1                (PB8  | ALT1)
-#define PB8_ALT2                (PB8  | ALT2)
-#define PB9_ALT1                (PB9  | ALT1)
-#define PB9_ALT2                (PB9  | ALT2)
-#define PB14_ALT1               (PB14 | ALT1)
-#define PB14_ALT2               (PB14 | ALT2)
-#define PB15_ALT1               (PB15 | ALT1)
-#define PB15_ALT2               (PB15 | ALT2)
-#define PC0_ALT1                (PC0  | ALT1)
-#define PC0_ALT2                (PC0  | ALT2)
-#define PC1_ALT1                (PC1  | ALT1)
-#define PC1_ALT2                (PC1  | ALT2)
-#define PC4_ALT1                (PC4  | ALT1)
-#define PC5_ALT1                (PC5  | ALT1)
-#define PC6_ALT1                (PC6  | ALT1)
-#define PC6_ALT2                (PC6  | ALT2)
-#define PC7_ALT1                (PC7  | ALT1)
-#define PC7_ALT2                (PC7  | ALT2)
-#define PC8_ALT1                (PC8  | ALT1)
-#define PC9_ALT1                (PC9  | ALT1)
-#define PC10_ALT1               (PC10 | ALT1)
-#define PC11_ALT1               (PC11 | ALT1)
-#define PF0_ALT1                (PF0  | ALT1)
-#define PF1_ALT1                (PF1  | ALT1)
-#define PF6_ALT1                (PF6  | ALT1)
-#define PF7_ALT1                (PF7  | ALT1)
-#define PF8_ALT1                (PF8  | ALT1)
-#define PF8_ALT2                (PF8  | ALT2)
-#define PF9_ALT1                (PF9  | ALT1)
-#define PF9_ALT2                (PF9  | ALT2)
-#define PG13_ALT1               (PG13 | ALT1)
-#define PJ8_ALT1                (PJ8  | ALT1)
-#define PJ9_ALT1                (PJ9  | ALT1)
-#define PJ10_ALT1               (PJ10 | ALT1)
-#define PJ11_ALT1               (PJ11 | ALT1)
-#define PK0_ALT1                (PK0  | ALT1)
-#define PK1_ALT1                (PK1  | ALT1)
-
-#define NUM_DIGITAL_PINS        121
-#define NUM_DUALPAD_PINS        2
-#define NUM_ANALOG_INPUTS       28
-
-// On-board LED pin number
-#ifndef LED_BUILTIN
-  #define LED_BUILTIN           PNUM_NOT_DEFINED
-#endif
-
-// On-board user button
-#ifndef USER_BTN
-  #define USER_BTN              PNUM_NOT_DEFINED
-#endif
-
-// SPI definitions
-#ifndef PIN_SPI_SS
-  #define PIN_SPI_SS            PA4
-#endif
-#ifndef PIN_SPI_SS1
-  #define PIN_SPI_SS1           PA15
-#endif
-#ifndef PIN_SPI_SS2
-  #define PIN_SPI_SS2           PG10
-#endif
-#ifndef PIN_SPI_SS3
-  #define PIN_SPI_SS3           PNUM_NOT_DEFINED
-#endif
-#ifndef PIN_SPI_MOSI
-  #define PIN_SPI_MOSI          PA7
-#endif
-#ifndef PIN_SPI_MISO
-  #define PIN_SPI_MISO          PA6
-#endif
-#ifndef PIN_SPI_SCK
-  #define PIN_SPI_SCK           PA5
-#endif
-
-// I2C definitions
-#ifndef PIN_WIRE_SDA
-  #define PIN_WIRE_SDA          PB7
-#endif
-#ifndef PIN_WIRE_SCL
-  #define PIN_WIRE_SCL          PB6
-#endif
-
-// Timer Definitions
-// Use TIM6/TIM7 when possible as servo and tone don't need GPIO output pin
-#ifndef TIMER_TONE
-  #define TIMER_TONE            TIM6
-#endif
-#ifndef TIMER_SERVO
-  #define TIMER_SERVO           TIM7
-#endif
-
-// UART Definitions
-#ifndef SERIAL_UART_INSTANCE
-  #define SERIAL_UART_INSTANCE  4
-#endif
-
-// Default pin used for generic 'Serial' instance
-// Mandatory for Firmata
-#ifndef PIN_SERIAL_RX
-  #define PIN_SERIAL_RX         PA1
-#endif
-#ifndef PIN_SERIAL_TX
-  #define PIN_SERIAL_TX         PA0
-#endif
-
-// Extra HAL modules
-#if !defined(HAL_DAC_MODULE_DISABLED)
-  #define HAL_DAC_MODULE_ENABLED
-#endif
-#if !defined(HAL_ETH_MODULE_DISABLED)
-  #define HAL_ETH_MODULE_ENABLED
-#endif
-#if !defined(HAL_OSPI_MODULE_DISABLED)
-  #define HAL_OSPI_MODULE_ENABLED
-#endif
-#if !defined(HAL_SD_MODULE_DISABLED)
-  #define HAL_SD_MODULE_ENABLED
-#endif
-
-/*----------------------------------------------------------------------------
- *        Arduino objects - C++ only
- *----------------------------------------------------------------------------*/
-
-#ifdef __cplusplus
-  // These serial port names are intended to allow libraries and architecture-neutral
-  // sketches to automatically default to the correct port name for a particular type
-  // of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
-  // the first hardware serial port whose RX/TX pins are not dedicated to another use.
-  //
-  // SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
-  //
-  // SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
-  //
-  // SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
-  //
-  // SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
-  //
-  // SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
-  //                            pins are NOT connected to anything by default.
-  #ifndef SERIAL_PORT_MONITOR
-    #define SERIAL_PORT_MONITOR   Serial
-  #endif
-  #ifndef SERIAL_PORT_HARDWARE
-    #define SERIAL_PORT_HARDWARE  Serial
-  #endif
-#endif
diff --git a/variants/STM32H7xx/H730VB(H-T)/PeripheralPins.c b/variants/STM32H7xx/H730VB(H-T)/PeripheralPins.c
deleted file mode 100644
index 80147d34a8..0000000000
--- a/variants/STM32H7xx/H730VB(H-T)/PeripheralPins.c
+++ /dev/null
@@ -1,577 +0,0 @@
-/*
- *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
- * All rights reserved.
- *
- * This software component is licensed by ST under BSD 3-Clause license,
- * the "License"; You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *                        opensource.org/licenses/BSD-3-Clause
- *
- *******************************************************************************
- */
-/*
- * Automatically generated from STM32H730VBHx.xml, STM32H730VBTx.xml
- * CubeMX DB release 6.0.30
- */
-#if !defined(CUSTOM_PERIPHERAL_PINS)
-#include "Arduino.h"
-#include "PeripheralPins.h"
-
-/* =====
- * Notes:
- * - The pins mentioned Px_y_ALTz are alternative possibilities which use other
- *   HW peripheral instances. You can use them the same way as any other "normal"
- *   pin (i.e. analogWrite(PA7_ALT1, 128);).
- *
- * - Commented lines are alternative possibilities which are not used per default.
- *   If you change them, you will have to know what you do
- * =====
- */
-
-//*** ADC ***
-
-#ifdef HAL_ADC_MODULE_ENABLED
-WEAK const PinMap PinMap_ADC[] = {
-  {PA_0,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 16, 0)}, // ADC1_INP16
-  {PA_1,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 17, 0)}, // ADC1_INP17
-  {PA_2,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC1_INP14
-  {PA_2_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC2_INP14
-  {PA_3,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC1_INP15
-  {PA_3_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC2_INP15
-  {PA_4,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 18, 0)}, // ADC1_INP18
-  {PA_4_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 18, 0)}, // ADC2_INP18
-  {PA_5,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 19, 0)}, // ADC1_INP19
-  {PA_5_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 19, 0)}, // ADC2_INP19
-  {PA_6,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC1_INP3
-  {PA_6_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC2_INP3
-  {PA_7,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC1_INP7
-  {PA_7_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC2_INP7
-  {PB_0,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC1_INP9
-  {PB_0_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC2_INP9
-  {PB_1,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC1_INP5
-  {PB_1_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC2_INP5
-  {PC_0,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC1_INP10
-  {PC_0_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC2_INP10
-  {PC_0_ALT2, ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC3_INP10
-  {PC_1,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC1_INP11
-  {PC_1_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC2_INP11
-  {PC_1_ALT2, ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC3_INP11
-  {PC_2_C,    ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC3_INP0
-  {PC_3_C,    ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC3_INP1
-  {PC_4,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC1_INP4
-  {PC_4_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC2_INP4
-  {PC_5,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC1_INP8
-  {PC_5_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC2_INP8
-  {NC,        NP,   0}
-};
-#endif
-
-//*** DAC ***
-
-#ifdef HAL_DAC_MODULE_ENABLED
-WEAK const PinMap PinMap_DAC[] = {
-  {PA_4, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // DAC1_OUT1
-  {PA_5, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // DAC1_OUT2
-  {NC,   NP,   0}
-};
-#endif
-
-//*** I2C ***
-
-#ifdef HAL_I2C_MODULE_ENABLED
-WEAK const PinMap PinMap_I2C_SDA[] = {
-  {PB_7,      I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
-  {PB_7_ALT1, I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C4)},
-  {PB_9,      I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
-  {PB_9_ALT1, I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C4)},
-  {PB_11,     I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
-  {PC_9,      I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
-  {PC_9_ALT1, I2C5, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C5)},
-  {PC_10,     I2C5, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C5)},
-  {PD_13,     I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C4)},
-  {NC,        NP,   0}
-};
-#endif
-
-#ifdef HAL_I2C_MODULE_ENABLED
-WEAK const PinMap PinMap_I2C_SCL[] = {
-  {PA_8,      I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
-  {PA_8_ALT1, I2C5, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C5)},
-  {PB_6,      I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
-  {PB_6_ALT1, I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C4)},
-  {PB_8,      I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
-  {PB_8_ALT1, I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C4)},
-  {PB_10,     I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
-  {PC_11,     I2C5, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C5)},
-  {PD_12,     I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C4)},
-  {NC,        NP,   0}
-};
-#endif
-
-//*** TIM ***
-
-#ifdef HAL_TIM_MODULE_ENABLED
-WEAK const PinMap PinMap_TIM[] = {
-  {PA_0,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
-  {PA_0_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)}, // TIM5_CH1
-  {PA_1,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
-  {PA_1_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 2, 0)}, // TIM5_CH2
-  {PA_1_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM15, 1, 1)}, // TIM15_CH1N
-  {PA_2,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
-  {PA_2_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 3, 0)}, // TIM5_CH3
-  {PA_2_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM15, 1, 0)}, // TIM15_CH1
-  {PA_3,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4
-  {PA_3_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 4, 0)}, // TIM5_CH4
-  {PA_3_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM15, 2, 0)}, // TIM15_CH2
-  {PA_5,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
-  {PA_5_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 1)}, // TIM8_CH1N
-  {PA_6,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
-  {PA_6_ALT1,  TIM13, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM13, 1, 0)}, // TIM13_CH1
-  {PA_7,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
-  {PA_7_ALT1,  TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
-  {PA_7_ALT2,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 1)}, // TIM8_CH1N
-  {PA_7_ALT3,  TIM14, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM14, 1, 0)}, // TIM14_CH1
-  {PA_8,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)}, // TIM1_CH1
-  {PA_9,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 0)}, // TIM1_CH2
-  {PA_10,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 0)}, // TIM1_CH3
-  {PA_11,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 4, 0)}, // TIM1_CH4
-  {PA_15,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
-  {PB_0,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
-  {PB_0_ALT1,  TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)}, // TIM3_CH3
-  {PB_0_ALT2,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 1)}, // TIM8_CH2N
-  {PB_1,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
-  {PB_1_ALT1,  TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
-  {PB_1_ALT2,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 1)}, // TIM8_CH3N
-  {PB_3,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
-  {PB_4,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
-  {PB_5,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
-  {PB_6,       TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 1, 0)}, // TIM4_CH1
-  {PB_6_ALT1,  TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM16, 1, 1)}, // TIM16_CH1N
-  {PB_7,       TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 2, 0)}, // TIM4_CH2
-  {PB_7_ALT1,  TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM17, 1, 1)}, // TIM17_CH1N
-  {PB_8,       TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 3, 0)}, // TIM4_CH3
-  {PB_8_ALT1,  TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM16, 1, 0)}, // TIM16_CH1
-  {PB_9,       TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)}, // TIM4_CH4
-  {PB_9_ALT1,  TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM17, 1, 0)}, // TIM17_CH1
-  {PB_10,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
-  {PB_11,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4
-  {PB_13,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
-  {PB_14,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
-  {PB_14_ALT1, TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 1)}, // TIM8_CH2N
-  {PB_14_ALT2, TIM12, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM12, 1, 0)}, // TIM12_CH1
-  {PB_15,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
-  {PB_15_ALT1, TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 1)}, // TIM8_CH3N
-  {PB_15_ALT2, TIM12, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM12, 2, 0)}, // TIM12_CH2
-  {PC_6,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
-  {PC_6_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 0)}, // TIM8_CH1
-  {PC_7,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
-  {PC_7_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 0)}, // TIM8_CH2
-  {PC_8,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)}, // TIM3_CH3
-  {PC_8_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 0)}, // TIM8_CH3
-  {PC_9,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
-  {PC_9_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 4, 0)}, // TIM8_CH4
-  {PC_12,      TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM15, 1, 0)}, // TIM15_CH1
-  {PD_12,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 1, 0)}, // TIM4_CH1
-  {PD_13,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 2, 0)}, // TIM4_CH2
-  {PD_14,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 3, 0)}, // TIM4_CH3
-  {PD_15,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)}, // TIM4_CH4
-  {PE_4,       TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM15, 1, 1)}, // TIM15_CH1N
-  {PE_5,       TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM15, 1, 0)}, // TIM15_CH1
-  {PE_6,       TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM15, 2, 0)}, // TIM15_CH2
-  {PE_8,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
-  {PE_9,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)}, // TIM1_CH1
-  {PE_10,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
-  {PE_11,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 0)}, // TIM1_CH2
-  {PE_12,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
-  {PE_13,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 0)}, // TIM1_CH3
-  {PE_14,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 4, 0)}, // TIM1_CH4
-  {NC,         NP,    0}
-};
-#endif
-
-//*** UART ***
-
-#ifdef HAL_UART_MODULE_ENABLED
-WEAK const PinMap PinMap_UART_TX[] = {
-  {PA_0,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PA_2,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PA_9,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_LPUART)},
-  {PA_9_ALT1,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PA_12,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_UART4)},
-  {PA_15,      UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART7)},
-  {PB_4,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART7)},
-  {PB_6,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART)},
-  {PB_6_ALT1,  UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_UART5)},
-  {PB_6_ALT2,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PB_9,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PB_10,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PB_13,      UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_UART5)},
-  {PB_14,      USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART1)},
-  {PC_6,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
-  {PC_10,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PC_10_ALT1, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PC_12,      UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
-  {PD_1,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PD_5,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PD_8,       USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PD_15,      UART9,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART9)},
-  {PE_1,       UART8,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART8)},
-  {PE_3,       USART10, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_USART10)},
-  {PE_8,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
-  {NC,         NP,      0}
-};
-#endif
-
-#ifdef HAL_UART_MODULE_ENABLED
-WEAK const PinMap PinMap_UART_RX[] = {
-  {PA_1,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PA_3,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PA_8,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART7)},
-  {PA_10,      LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_LPUART)},
-  {PA_10_ALT1, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PA_11,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_UART4)},
-  {PB_3,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART7)},
-  {PB_5,       UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_UART5)},
-  {PB_7,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART)},
-  {PB_7_ALT1,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PB_8,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PB_11,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PB_12,      UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_UART5)},
-  {PB_15,      USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART1)},
-  {PC_7,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
-  {PC_11,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PC_11_ALT1, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PD_0,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PD_2,       UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
-  {PD_6,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PD_9,       USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PD_14,      UART9,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART9)},
-  {PE_0,       UART8,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART8)},
-  {PE_2,       USART10, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART10)},
-  {PE_7,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
-  {NC,         NP,      0}
-};
-#endif
-
-#ifdef HAL_UART_MODULE_ENABLED
-WEAK const PinMap PinMap_UART_RTS[] = {
-  {PA_1,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PA_12,      LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_LPUART)},
-  {PA_12_ALT1, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PA_15,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PB_14,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PB_14_ALT1, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PC_8,       UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
-  {PD_4,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PD_12,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PD_13,      UART9,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART9)},
-  {PD_15,      UART8,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART8)},
-  {PE_9,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
-  {NC,         NP,      0}
-};
-#endif
-
-#ifdef HAL_UART_MODULE_ENABLED
-WEAK const PinMap PinMap_UART_CTS[] = {
-  {PA_0,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PA_11,      LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_LPUART)},
-  {PA_11_ALT1, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PB_0,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PB_13,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PB_15,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PC_9,       UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
-  {PD_0,       UART9,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART9)},
-  {PD_3,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PD_11,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PD_14,      UART8,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART8)},
-  {PE_10,      UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
-  {NC,         NP,      0}
-};
-#endif
-
-//*** SPI ***
-
-#ifdef HAL_SPI_MODULE_ENABLED
-WEAK const PinMap PinMap_SPI_MOSI[] = {
-  {PA_7,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PA_7_ALT1, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
-  {PB_2,      SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_SPI3)},
-  {PB_5,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PB_5_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_SPI3)},
-  {PB_5_ALT2, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
-  {PB_15,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PC_1,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PC_12,     SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PD_6,      SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI3)},
-  {PD_7,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PE_6,      SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  {PE_14,     SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  {NC,        NP,   0}
-};
-#endif
-
-#ifdef HAL_SPI_MODULE_ENABLED
-WEAK const PinMap PinMap_SPI_MISO[] = {
-  {PA_6,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PA_6_ALT1, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
-  {PB_4,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PB_4_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PB_4_ALT2, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
-  {PB_14,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PC_11,     SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PE_5,      SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  {PE_13,     SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  {NC,        NP,   0}
-};
-#endif
-
-#ifdef HAL_SPI_MODULE_ENABLED
-WEAK const PinMap PinMap_SPI_SCLK[] = {
-  {PA_5,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PA_5_ALT1, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
-  {PA_9,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PA_12,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PB_3,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PB_3_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PB_3_ALT2, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
-  {PB_10,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PB_13,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PC_10,     SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PC_12,     SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI6)},
-  {PD_3,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PE_2,      SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  {PE_12,     SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  {NC,        NP,   0}
-};
-#endif
-
-#ifdef HAL_SPI_MODULE_ENABLED
-WEAK const PinMap PinMap_SPI_SSEL[] = {
-  {PA_0,       SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI6)},
-  {PA_4,       SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PA_4_ALT1,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PA_4_ALT2,  SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
-  {PA_11,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PA_15,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PA_15_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PA_15_ALT2, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_SPI6)},
-  {PB_4,       SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_SPI2)},
-  {PB_9,       SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PB_12,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PE_4,       SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  {PE_11,      SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  {NC,         NP,   0}
-};
-#endif
-
-//*** FDCAN ***
-
-#ifdef HAL_FDCAN_MODULE_ENABLED
-WEAK const PinMap PinMap_CAN_RD[] = {
-  {PA_11, FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
-  {PB_5,  FDCAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN2)},
-  {PB_8,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
-  {PB_12, FDCAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN2)},
-  {PD_0,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
-  {PD_12, FDCAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF5_FDCAN3)},
-  {NC,    NP,     0}
-};
-#endif
-
-#ifdef HAL_FDCAN_MODULE_ENABLED
-WEAK const PinMap PinMap_CAN_TD[] = {
-  {PA_12, FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
-  {PB_6,  FDCAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN2)},
-  {PB_9,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
-  {PB_13, FDCAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN2)},
-  {PD_1,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
-  {PD_13, FDCAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF5_FDCAN3)},
-  {NC,    NP,     0}
-};
-#endif
-
-//*** ETHERNET ***
-
-#ifdef HAL_ETH_MODULE_ENABLED
-WEAK const PinMap PinMap_Ethernet[] = {
-  {PA_0,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
-  {PA_1,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_REF_CLK
-  {PA_1_ALT1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RX_CLK
-  {PA_2,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_MDIO
-  {PA_3,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_COL
-  {PA_7,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS_DV
-  {PA_7_ALT1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RX_DV
-  {PA_9,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TX_ER
-  {PB_0,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RXD2
-  {PB_1,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RXD3
-  {PB_2,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TX_ER
-  {PB_5,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_PPS_OUT
-  {PB_8,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD3
-  {PB_10,     ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RX_ER
-  {PB_11,     ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TX_EN
-  {PB_12,     ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD0
-  {PB_13,     ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD1
-  {PC_1,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_MDC
-  {PC_4,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RXD0
-  {PC_5,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RXD1
-  {PE_2,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD3
-  {NC,        NP,  0}
-};
-#endif
-
-//*** OCTOSPI ***
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA0[] = {
-  {PA_2,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO0
-  {PB_1,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO0
-  {PB_12, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO0
-  {PC_9,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO0
-  {PD_11, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO0
-  {NC,    NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA1[] = {
-  {PB_0,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO1
-  {PC_10, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO1
-  {PD_12, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO1
-  {NC,    NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA2[] = {
-  {PA_3,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO2
-  {PA_7,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO2
-  {PB_13, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO2
-  {PE_2,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO2
-  {NC,    NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA3[] = {
-  {PA_1,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO3
-  {PA_6,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO3
-  {PD_13, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO3
-  {NC,    NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA4[] = {
-  {PC_1, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO4
-  {PD_4, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO4
-  {PE_7, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO4
-  {NC,   NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA5[] = {
-  {PD_5, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO5
-  {PE_8, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO5
-  {NC,   NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA6[] = {
-  {PD_6, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO6
-  {PE_9, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO6
-  {NC,   NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA7[] = {
-  {PD_7,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO7
-  {PE_10, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO7
-  {NC,    NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_SCLK[] = {
-  {PA_3, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OCTOSPIM_P1)}, // OCTOSPIM_P1_CLK
-  {PB_2, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_CLK
-  {NC,   NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_SSEL[] = {
-  {PB_6,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_NCS
-  {PB_10, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_NCS
-  {PC_11, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_NCS
-  {PE_11, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_OCTOSPIM_P1)}, // OCTOSPIM_P1_NCS
-  {NC,    NP,       0}
-};
-#endif
-
-//*** USB ***
-
-#if defined(HAL_PCD_MODULE_ENABLED) || defined(HAL_HCD_MODULE_ENABLED)
-WEAK const PinMap PinMap_USB_OTG_HS[] = {
-#ifdef USE_USB_HS_IN_FS
-  {PA_8,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_SOF
-  {PA_9,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
-  {PA_10, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ID
-  {PA_11, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)}, // USB_OTG_HS_DM
-  {PA_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)}, // USB_OTG_HS_DP
-#else
-  {PA_3,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D0
-  {PA_5,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_CK
-  {PB_0,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D1
-  {PB_1,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D2
-  {PB_5,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D7
-  {PB_10, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D3
-  {PB_11, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D4
-  {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D5
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D6
-  {PC_0,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_STP
-#endif /* USE_USB_HS_IN_FS */
-  {NC,    NP,         0}
-};
-#endif
-
-//*** SD ***
-
-#ifdef HAL_SD_MODULE_ENABLED
-WEAK const PinMap PinMap_SD[] = {
-  {PA_0,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_SDMMC2)}, // SDMMC2_CMD
-  {PB_3,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_SDMMC2)}, // SDMMC2_D2
-  {PB_4,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_SDMMC2)}, // SDMMC2_D3
-  {PB_8,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF7_SDMMC1)}, // SDMMC1_CKIN
-  {PB_8_ALT1, SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D4
-  {PB_8_ALT2, SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_SDMMC2)}, // SDMMC2_D4
-  {PB_9,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF7_SDMMC1)}, // SDMMC1_CDIR
-  {PB_9_ALT1, SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D5
-  {PB_9_ALT2, SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_SDMMC2)}, // SDMMC2_D5
-  {PB_13,     SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D0
-  {PB_14,     SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_SDMMC2)}, // SDMMC2_D0
-  {PB_15,     SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_SDMMC2)}, // SDMMC2_D1
-  {PC_1,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_SDMMC2)}, // SDMMC2_CK
-  {PC_4,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF10_SDMMC2)}, // SDMMC2_CKIN
-  {PC_6,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF8_SDMMC1)}, // SDMMC1_D0DIR
-  {PC_6_ALT1, SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D6
-  {PC_6_ALT2, SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_SDMMC2)}, // SDMMC2_D6
-  {PC_7,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF8_SDMMC1)}, // SDMMC1_D123DIR
-  {PC_7_ALT1, SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D7
-  {PC_7_ALT2, SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_SDMMC2)}, // SDMMC2_D7
-  {PC_8,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D0
-  {PC_9,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D1
-  {PC_10,     SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D2
-  {PC_11,     SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D3
-  {PC_12,     SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDMMC1)}, // SDMMC1_CK
-  {PD_2,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDMMC1)}, // SDMMC1_CMD
-  {PD_6,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF11_SDMMC2)}, // SDMMC2_CK
-  {PD_7,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF11_SDMMC2)}, // SDMMC2_CMD
-  {NC,        NP,     0}
-};
-#endif
-
-#endif /* !CUSTOM_PERIPHERAL_PINS */
diff --git a/variants/STM32H7xx/H730VB(H-T)/PinNamesVar.h b/variants/STM32H7xx/H730VB(H-T)/PinNamesVar.h
deleted file mode 100644
index c2575ad38a..0000000000
--- a/variants/STM32H7xx/H730VB(H-T)/PinNamesVar.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/* Dual pad pin name */
-PC_2_C     = PC_2  | PDUAL,
-PC_3_C     = PC_3  | PDUAL,
-
-/* Alternate pin name */
-PA_0_ALT1  = PA_0  | ALT1,
-PA_1_ALT1  = PA_1  | ALT1,
-PA_1_ALT2  = PA_1  | ALT2,
-PA_2_ALT1  = PA_2  | ALT1,
-PA_2_ALT2  = PA_2  | ALT2,
-PA_3_ALT1  = PA_3  | ALT1,
-PA_3_ALT2  = PA_3  | ALT2,
-PA_4_ALT1  = PA_4  | ALT1,
-PA_4_ALT2  = PA_4  | ALT2,
-PA_5_ALT1  = PA_5  | ALT1,
-PA_6_ALT1  = PA_6  | ALT1,
-PA_7_ALT1  = PA_7  | ALT1,
-PA_7_ALT2  = PA_7  | ALT2,
-PA_7_ALT3  = PA_7  | ALT3,
-PA_8_ALT1  = PA_8  | ALT1,
-PA_9_ALT1  = PA_9  | ALT1,
-PA_10_ALT1 = PA_10 | ALT1,
-PA_11_ALT1 = PA_11 | ALT1,
-PA_12_ALT1 = PA_12 | ALT1,
-PA_15_ALT1 = PA_15 | ALT1,
-PA_15_ALT2 = PA_15 | ALT2,
-PB_0_ALT1  = PB_0  | ALT1,
-PB_0_ALT2  = PB_0  | ALT2,
-PB_1_ALT1  = PB_1  | ALT1,
-PB_1_ALT2  = PB_1  | ALT2,
-PB_3_ALT1  = PB_3  | ALT1,
-PB_3_ALT2  = PB_3  | ALT2,
-PB_4_ALT1  = PB_4  | ALT1,
-PB_4_ALT2  = PB_4  | ALT2,
-PB_5_ALT1  = PB_5  | ALT1,
-PB_5_ALT2  = PB_5  | ALT2,
-PB_6_ALT1  = PB_6  | ALT1,
-PB_6_ALT2  = PB_6  | ALT2,
-PB_7_ALT1  = PB_7  | ALT1,
-PB_8_ALT1  = PB_8  | ALT1,
-PB_8_ALT2  = PB_8  | ALT2,
-PB_9_ALT1  = PB_9  | ALT1,
-PB_9_ALT2  = PB_9  | ALT2,
-PB_14_ALT1 = PB_14 | ALT1,
-PB_14_ALT2 = PB_14 | ALT2,
-PB_15_ALT1 = PB_15 | ALT1,
-PB_15_ALT2 = PB_15 | ALT2,
-PC_0_ALT1  = PC_0  | ALT1,
-PC_0_ALT2  = PC_0  | ALT2,
-PC_1_ALT1  = PC_1  | ALT1,
-PC_1_ALT2  = PC_1  | ALT2,
-PC_4_ALT1  = PC_4  | ALT1,
-PC_5_ALT1  = PC_5  | ALT1,
-PC_6_ALT1  = PC_6  | ALT1,
-PC_6_ALT2  = PC_6  | ALT2,
-PC_7_ALT1  = PC_7  | ALT1,
-PC_7_ALT2  = PC_7  | ALT2,
-PC_8_ALT1  = PC_8  | ALT1,
-PC_9_ALT1  = PC_9  | ALT1,
-PC_10_ALT1 = PC_10 | ALT1,
-PC_11_ALT1 = PC_11 | ALT1,
-
-/* SYS_WKUP */
-#ifdef PWR_WAKEUP_PIN1
-  SYS_WKUP1 = PA_0,
-#endif
-#ifdef PWR_WAKEUP_PIN2
-  SYS_WKUP2 = PA_2,
-#endif
-#ifdef PWR_WAKEUP_PIN3
-  SYS_WKUP3 = NC,
-#endif
-#ifdef PWR_WAKEUP_PIN4
-  SYS_WKUP4 = PC_13,
-#endif
-#ifdef PWR_WAKEUP_PIN5
-  SYS_WKUP5 = NC,
-#endif
-#ifdef PWR_WAKEUP_PIN6
-  SYS_WKUP6 = PC_1,
-#endif
-#ifdef PWR_WAKEUP_PIN7
-  SYS_WKUP7 = NC,
-#endif
-#ifdef PWR_WAKEUP_PIN8
-  SYS_WKUP8 = NC,
-#endif
-
-/* USB */
-#ifdef USBCON
-  USB_OTG_HS_DM       = PA_11,
-  USB_OTG_HS_DP       = PA_12,
-  USB_OTG_HS_ID       = PA_10,
-  USB_OTG_HS_SOF      = PA_8,
-  USB_OTG_HS_ULPI_CK  = PA_5,
-  USB_OTG_HS_ULPI_D0  = PA_3,
-  USB_OTG_HS_ULPI_D1  = PB_0,
-  USB_OTG_HS_ULPI_D2  = PB_1,
-  USB_OTG_HS_ULPI_D3  = PB_10,
-  USB_OTG_HS_ULPI_D4  = PB_11,
-  USB_OTG_HS_ULPI_D5  = PB_12,
-  USB_OTG_HS_ULPI_D6  = PB_13,
-  USB_OTG_HS_ULPI_D7  = PB_5,
-  USB_OTG_HS_ULPI_STP = PC_0,
-  USB_OTG_HS_VBUS     = PA_9,
-#endif
diff --git a/variants/STM32H7xx/H730VB(H-T)/boards_entry.txt b/variants/STM32H7xx/H730VB(H-T)/boards_entry.txt
deleted file mode 100644
index 01d7b0c4df..0000000000
--- a/variants/STM32H7xx/H730VB(H-T)/boards_entry.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file help to add generic board entry.
-# upload.maximum_size and product_line have to be verified
-# and changed if needed.
-# See: https://github.com/stm32duino/wiki/wiki/Add-a-new-variant-%28board%29
-
-# Generic H730VBHx
-GenH7.menu.pnum.GENERIC_H730VBHX=Generic H730VBHx
-GenH7.menu.pnum.GENERIC_H730VBHX.upload.maximum_size=131072
-GenH7.menu.pnum.GENERIC_H730VBHX.upload.maximum_data_size=1048576
-GenH7.menu.pnum.GENERIC_H730VBHX.build.board=GENERIC_H730VBHX
-GenH7.menu.pnum.GENERIC_H730VBHX.build.product_line=STM32H730xx
-GenH7.menu.pnum.GENERIC_H730VBHX.build.variant=STM32H7xx/H730VB(H-T)
-
-# Generic H730VBTx
-GenH7.menu.pnum.GENERIC_H730VBTX=Generic H730VBTx
-GenH7.menu.pnum.GENERIC_H730VBTX.upload.maximum_size=131072
-GenH7.menu.pnum.GENERIC_H730VBTX.upload.maximum_data_size=1048576
-GenH7.menu.pnum.GENERIC_H730VBTX.build.board=GENERIC_H730VBTX
-GenH7.menu.pnum.GENERIC_H730VBTX.build.product_line=STM32H730xx
-GenH7.menu.pnum.GENERIC_H730VBTX.build.variant=STM32H7xx/H730VB(H-T)
-
diff --git a/variants/STM32H7xx/H730VB(H-T)/generic_clock.c b/variants/STM32H7xx/H730VB(H-T)/generic_clock.c
deleted file mode 100644
index 4518e37d01..0000000000
--- a/variants/STM32H7xx/H730VB(H-T)/generic_clock.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
- * All rights reserved.
- *
- * This software component is licensed by ST under BSD 3-Clause license,
- * the "License"; You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *                        opensource.org/licenses/BSD-3-Clause
- *
- *******************************************************************************
- */
-#if defined(ARDUINO_GENERIC_H730VBHX) || defined(ARDUINO_GENERIC_H730VBTX)
-#include "pins_arduino.h"
-
-/**
-  * @brief  System Clock Configuration
-  * @param  None
-  * @retval None
-  */
-WEAK void SystemClock_Config(void)
-{
-  /* SystemClock_Config can be generated by STM32CubeMX */
-#warning "SystemClock_Config() is empty. Default clock at reset is used."
-}
-
-#endif /* ARDUINO_GENERIC_* */
diff --git a/variants/STM32H7xx/H730VB(H-T)/variant_generic.cpp b/variants/STM32H7xx/H730VB(H-T)/variant_generic.cpp
deleted file mode 100644
index c4aa140181..0000000000
--- a/variants/STM32H7xx/H730VB(H-T)/variant_generic.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
- * All rights reserved.
- *
- * This software component is licensed by ST under BSD 3-Clause license,
- * the "License"; You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *                        opensource.org/licenses/BSD-3-Clause
- *
- *******************************************************************************
- */
-#if defined(ARDUINO_GENERIC_H730VBHX) || defined(ARDUINO_GENERIC_H730VBTX)
-#include "pins_arduino.h"
-
-// Digital PinName array
-const PinName digitalPin[] = {
-  PA_0,   // D0/A0
-  PA_1,   // D1/A1
-  PA_2,   // D2/A2
-  PA_3,   // D3/A3
-  PA_4,   // D4/A4
-  PA_5,   // D5/A5
-  PA_6,   // D6/A6
-  PA_7,   // D7/A7
-  PA_8,   // D8
-  PA_9,   // D9
-  PA_10,  // D10
-  PA_11,  // D11
-  PA_12,  // D12
-  PA_13,  // D13
-  PA_14,  // D14
-  PA_15,  // D15
-  PB_0,   // D16/A8
-  PB_1,   // D17/A9
-  PB_2,   // D18
-  PB_3,   // D19
-  PB_4,   // D20
-  PB_5,   // D21
-  PB_6,   // D22
-  PB_7,   // D23
-  PB_8,   // D24
-  PB_9,   // D25
-  PB_10,  // D26
-  PB_11,  // D27
-  PB_12,  // D28
-  PB_13,  // D29
-  PB_14,  // D30
-  PB_15,  // D31
-  PC_0,   // D32/A10
-  PC_1,   // D33/A11
-  PC_4,   // D34/A12
-  PC_5,   // D35/A13
-  PC_6,   // D36
-  PC_7,   // D37
-  PC_8,   // D38
-  PC_9,   // D39
-  PC_10,  // D40
-  PC_11,  // D41
-  PC_12,  // D42
-  PC_13,  // D43
-  PC_14,  // D44
-  PC_15,  // D45
-  PD_0,   // D46
-  PD_1,   // D47
-  PD_2,   // D48
-  PD_3,   // D49
-  PD_4,   // D50
-  PD_5,   // D51
-  PD_6,   // D52
-  PD_7,   // D53
-  PD_8,   // D54
-  PD_9,   // D55
-  PD_10,  // D56
-  PD_11,  // D57
-  PD_12,  // D58
-  PD_13,  // D59
-  PD_14,  // D60
-  PD_15,  // D61
-  PE_0,   // D62
-  PE_1,   // D63
-  PE_2,   // D64
-  PE_3,   // D65
-  PE_4,   // D66
-  PE_5,   // D67
-  PE_6,   // D68
-  PE_7,   // D69
-  PE_8,   // D70
-  PE_9,   // D71
-  PE_10,  // D72
-  PE_11,  // D73
-  PE_12,  // D74
-  PE_13,  // D75
-  PE_14,  // D76
-  PE_15,  // D77
-  PH_0,   // D78
-  PH_1,   // D79
-  PC_2_C, // D80/A14
-  PC_3_C  // D81/A15
-};
-
-// Analog (Ax) pin number array
-const uint32_t analogInputPin[] = {
-  0,  // A0,  PA0
-  1,  // A1,  PA1
-  2,  // A2,  PA2
-  3,  // A3,  PA3
-  4,  // A4,  PA4
-  5,  // A5,  PA5
-  6,  // A6,  PA6
-  7,  // A7,  PA7
-  16, // A8,  PB0
-  17, // A9,  PB1
-  32, // A10, PC0
-  33, // A11, PC1
-  34, // A12, PC4
-  35, // A13, PC5
-  80, // A14, PC2_C
-  81  // A15, PC3_C
-};
-
-#endif /* ARDUINO_GENERIC_* */
diff --git a/variants/STM32H7xx/H730VB(H-T)/variant_generic.h b/variants/STM32H7xx/H730VB(H-T)/variant_generic.h
deleted file mode 100644
index 04b68247d7..0000000000
--- a/variants/STM32H7xx/H730VB(H-T)/variant_generic.h
+++ /dev/null
@@ -1,267 +0,0 @@
-/*
- *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
- * All rights reserved.
- *
- * This software component is licensed by ST under BSD 3-Clause license,
- * the "License"; You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *                        opensource.org/licenses/BSD-3-Clause
- *
- *******************************************************************************
- */
-#pragma once
-
-/*----------------------------------------------------------------------------
- *        STM32 pins number
- *----------------------------------------------------------------------------*/
-#define PA0                     PIN_A0
-#define PA1                     PIN_A1
-#define PA2                     PIN_A2
-#define PA3                     PIN_A3
-#define PA4                     PIN_A4
-#define PA5                     PIN_A5
-#define PA6                     PIN_A6
-#define PA7                     PIN_A7
-#define PA8                     8
-#define PA9                     9
-#define PA10                    10
-#define PA11                    11
-#define PA12                    12
-#define PA13                    13
-#define PA14                    14
-#define PA15                    15
-#define PB0                     PIN_A8
-#define PB1                     PIN_A9
-#define PB2                     18
-#define PB3                     19
-#define PB4                     20
-#define PB5                     21
-#define PB6                     22
-#define PB7                     23
-#define PB8                     24
-#define PB9                     25
-#define PB10                    26
-#define PB11                    27
-#define PB12                    28
-#define PB13                    29
-#define PB14                    30
-#define PB15                    31
-#define PC0                     PIN_A10
-#define PC1                     PIN_A11
-#define PC4                     PIN_A12
-#define PC5                     PIN_A13
-#define PC6                     36
-#define PC7                     37
-#define PC8                     38
-#define PC9                     39
-#define PC10                    40
-#define PC11                    41
-#define PC12                    42
-#define PC13                    43
-#define PC14                    44
-#define PC15                    45
-#define PD0                     46
-#define PD1                     47
-#define PD2                     48
-#define PD3                     49
-#define PD4                     50
-#define PD5                     51
-#define PD6                     52
-#define PD7                     53
-#define PD8                     54
-#define PD9                     55
-#define PD10                    56
-#define PD11                    57
-#define PD12                    58
-#define PD13                    59
-#define PD14                    60
-#define PD15                    61
-#define PE0                     62
-#define PE1                     63
-#define PE2                     64
-#define PE3                     65
-#define PE4                     66
-#define PE5                     67
-#define PE6                     68
-#define PE7                     69
-#define PE8                     70
-#define PE9                     71
-#define PE10                    72
-#define PE11                    73
-#define PE12                    74
-#define PE13                    75
-#define PE14                    76
-#define PE15                    77
-#define PH0                     78
-#define PH1                     79
-#define PC2_C                   PIN_A14
-#define PC3_C                   PIN_A15
-
-// Alternate pins number
-#define PA0_ALT1                (PA0  | ALT1)
-#define PA1_ALT1                (PA1  | ALT1)
-#define PA1_ALT2                (PA1  | ALT2)
-#define PA2_ALT1                (PA2  | ALT1)
-#define PA2_ALT2                (PA2  | ALT2)
-#define PA3_ALT1                (PA3  | ALT1)
-#define PA3_ALT2                (PA3  | ALT2)
-#define PA4_ALT1                (PA4  | ALT1)
-#define PA4_ALT2                (PA4  | ALT2)
-#define PA5_ALT1                (PA5  | ALT1)
-#define PA6_ALT1                (PA6  | ALT1)
-#define PA7_ALT1                (PA7  | ALT1)
-#define PA7_ALT2                (PA7  | ALT2)
-#define PA7_ALT3                (PA7  | ALT3)
-#define PA8_ALT1                (PA8  | ALT1)
-#define PA9_ALT1                (PA9  | ALT1)
-#define PA10_ALT1               (PA10 | ALT1)
-#define PA11_ALT1               (PA11 | ALT1)
-#define PA12_ALT1               (PA12 | ALT1)
-#define PA15_ALT1               (PA15 | ALT1)
-#define PA15_ALT2               (PA15 | ALT2)
-#define PB0_ALT1                (PB0  | ALT1)
-#define PB0_ALT2                (PB0  | ALT2)
-#define PB1_ALT1                (PB1  | ALT1)
-#define PB1_ALT2                (PB1  | ALT2)
-#define PB3_ALT1                (PB3  | ALT1)
-#define PB3_ALT2                (PB3  | ALT2)
-#define PB4_ALT1                (PB4  | ALT1)
-#define PB4_ALT2                (PB4  | ALT2)
-#define PB5_ALT1                (PB5  | ALT1)
-#define PB5_ALT2                (PB5  | ALT2)
-#define PB6_ALT1                (PB6  | ALT1)
-#define PB6_ALT2                (PB6  | ALT2)
-#define PB7_ALT1                (PB7  | ALT1)
-#define PB8_ALT1                (PB8  | ALT1)
-#define PB8_ALT2                (PB8  | ALT2)
-#define PB9_ALT1                (PB9  | ALT1)
-#define PB9_ALT2                (PB9  | ALT2)
-#define PB14_ALT1               (PB14 | ALT1)
-#define PB14_ALT2               (PB14 | ALT2)
-#define PB15_ALT1               (PB15 | ALT1)
-#define PB15_ALT2               (PB15 | ALT2)
-#define PC0_ALT1                (PC0  | ALT1)
-#define PC0_ALT2                (PC0  | ALT2)
-#define PC1_ALT1                (PC1  | ALT1)
-#define PC1_ALT2                (PC1  | ALT2)
-#define PC4_ALT1                (PC4  | ALT1)
-#define PC5_ALT1                (PC5  | ALT1)
-#define PC6_ALT1                (PC6  | ALT1)
-#define PC6_ALT2                (PC6  | ALT2)
-#define PC7_ALT1                (PC7  | ALT1)
-#define PC7_ALT2                (PC7  | ALT2)
-#define PC8_ALT1                (PC8  | ALT1)
-#define PC9_ALT1                (PC9  | ALT1)
-#define PC10_ALT1               (PC10 | ALT1)
-#define PC11_ALT1               (PC11 | ALT1)
-
-#define NUM_DIGITAL_PINS        82
-#define NUM_DUALPAD_PINS        2
-#define NUM_ANALOG_INPUTS       16
-
-// On-board LED pin number
-#ifndef LED_BUILTIN
-  #define LED_BUILTIN           PNUM_NOT_DEFINED
-#endif
-
-// On-board user button
-#ifndef USER_BTN
-  #define USER_BTN              PNUM_NOT_DEFINED
-#endif
-
-// SPI definitions
-#ifndef PIN_SPI_SS
-  #define PIN_SPI_SS            PA4
-#endif
-#ifndef PIN_SPI_SS1
-  #define PIN_SPI_SS1           PA15
-#endif
-#ifndef PIN_SPI_SS2
-  #define PIN_SPI_SS2           PNUM_NOT_DEFINED
-#endif
-#ifndef PIN_SPI_SS3
-  #define PIN_SPI_SS3           PNUM_NOT_DEFINED
-#endif
-#ifndef PIN_SPI_MOSI
-  #define PIN_SPI_MOSI          PA7
-#endif
-#ifndef PIN_SPI_MISO
-  #define PIN_SPI_MISO          PA6
-#endif
-#ifndef PIN_SPI_SCK
-  #define PIN_SPI_SCK           PA5
-#endif
-
-// I2C definitions
-#ifndef PIN_WIRE_SDA
-  #define PIN_WIRE_SDA          PB7
-#endif
-#ifndef PIN_WIRE_SCL
-  #define PIN_WIRE_SCL          PB6
-#endif
-
-// Timer Definitions
-// Use TIM6/TIM7 when possible as servo and tone don't need GPIO output pin
-#ifndef TIMER_TONE
-  #define TIMER_TONE            TIM6
-#endif
-#ifndef TIMER_SERVO
-  #define TIMER_SERVO           TIM7
-#endif
-
-// UART Definitions
-#ifndef SERIAL_UART_INSTANCE
-  #define SERIAL_UART_INSTANCE  4
-#endif
-
-// Default pin used for generic 'Serial' instance
-// Mandatory for Firmata
-#ifndef PIN_SERIAL_RX
-  #define PIN_SERIAL_RX         PA1
-#endif
-#ifndef PIN_SERIAL_TX
-  #define PIN_SERIAL_TX         PA0
-#endif
-
-// Extra HAL modules
-#if !defined(HAL_DAC_MODULE_DISABLED)
-  #define HAL_DAC_MODULE_ENABLED
-#endif
-#if !defined(HAL_ETH_MODULE_DISABLED)
-  #define HAL_ETH_MODULE_ENABLED
-#endif
-#if !defined(HAL_OSPI_MODULE_DISABLED)
-  #define HAL_OSPI_MODULE_ENABLED
-#endif
-#if !defined(HAL_SD_MODULE_DISABLED)
-  #define HAL_SD_MODULE_ENABLED
-#endif
-
-/*----------------------------------------------------------------------------
- *        Arduino objects - C++ only
- *----------------------------------------------------------------------------*/
-
-#ifdef __cplusplus
-  // These serial port names are intended to allow libraries and architecture-neutral
-  // sketches to automatically default to the correct port name for a particular type
-  // of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
-  // the first hardware serial port whose RX/TX pins are not dedicated to another use.
-  //
-  // SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
-  //
-  // SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
-  //
-  // SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
-  //
-  // SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
-  //
-  // SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
-  //                            pins are NOT connected to anything by default.
-  #ifndef SERIAL_PORT_MONITOR
-    #define SERIAL_PORT_MONITOR   Serial
-  #endif
-  #ifndef SERIAL_PORT_HARDWARE
-    #define SERIAL_PORT_HARDWARE  Serial
-  #endif
-#endif
diff --git a/variants/STM32H7xx/H730ZBT/PeripheralPins.c b/variants/STM32H7xx/H730ZBT/PeripheralPins.c
deleted file mode 100644
index c79150e4cb..0000000000
--- a/variants/STM32H7xx/H730ZBT/PeripheralPins.c
+++ /dev/null
@@ -1,677 +0,0 @@
-/*
- *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
- * All rights reserved.
- *
- * This software component is licensed by ST under BSD 3-Clause license,
- * the "License"; You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *                        opensource.org/licenses/BSD-3-Clause
- *
- *******************************************************************************
- */
-/*
- * Automatically generated from STM32H730ZBTx.xml
- * CubeMX DB release 6.0.30
- */
-#if !defined(CUSTOM_PERIPHERAL_PINS)
-#include "Arduino.h"
-#include "PeripheralPins.h"
-
-/* =====
- * Notes:
- * - The pins mentioned Px_y_ALTz are alternative possibilities which use other
- *   HW peripheral instances. You can use them the same way as any other "normal"
- *   pin (i.e. analogWrite(PA7_ALT1, 128);).
- *
- * - Commented lines are alternative possibilities which are not used per default.
- *   If you change them, you will have to know what you do
- * =====
- */
-
-//*** ADC ***
-
-#ifdef HAL_ADC_MODULE_ENABLED
-WEAK const PinMap PinMap_ADC[] = {
-  {PA_0,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 16, 0)}, // ADC1_INP16
-  {PA_1,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 17, 0)}, // ADC1_INP17
-  {PA_2,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC1_INP14
-  {PA_2_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC2_INP14
-  {PA_3,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC1_INP15
-  {PA_3_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC2_INP15
-  {PA_4,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 18, 0)}, // ADC1_INP18
-  {PA_4_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 18, 0)}, // ADC2_INP18
-  {PA_5,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 19, 0)}, // ADC1_INP19
-  {PA_5_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 19, 0)}, // ADC2_INP19
-  {PA_6,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC1_INP3
-  {PA_6_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC2_INP3
-  {PA_7,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC1_INP7
-  {PA_7_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC2_INP7
-  {PB_0,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC1_INP9
-  {PB_0_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC2_INP9
-  {PB_1,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC1_INP5
-  {PB_1_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC2_INP5
-  {PC_0,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC1_INP10
-  {PC_0_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC2_INP10
-  {PC_0_ALT2, ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC3_INP10
-  {PC_1,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC1_INP11
-  {PC_1_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC2_INP11
-  {PC_1_ALT2, ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC3_INP11
-  {PC_2_C,    ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC3_INP0
-  {PC_3_C,    ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC3_INP1
-  {PC_4,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC1_INP4
-  {PC_4_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC2_INP4
-  {PC_5,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC1_INP8
-  {PC_5_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC2_INP8
-  {PF_3,      ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC3_INP5
-  {PF_4,      ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC3_INP9
-  {PF_5,      ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC3_INP4
-  {PF_6,      ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC3_INP8
-  {PF_7,      ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC3_INP3
-  {PF_8,      ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC3_INP7
-  {PF_9,      ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC3_INP2
-  {PF_10,     ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC3_INP6
-  {PF_11,     ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC1_INP2
-  {PF_12,     ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC1_INP6
-  {PF_13,     ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC2_INP2
-  {PF_14,     ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC2_INP6
-  {NC,        NP,   0}
-};
-#endif
-
-//*** DAC ***
-
-#ifdef HAL_DAC_MODULE_ENABLED
-WEAK const PinMap PinMap_DAC[] = {
-  {PA_4, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // DAC1_OUT1
-  {PA_5, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // DAC1_OUT2
-  {NC,   NP,   0}
-};
-#endif
-
-//*** I2C ***
-
-#ifdef HAL_I2C_MODULE_ENABLED
-WEAK const PinMap PinMap_I2C_SDA[] = {
-  {PB_7,      I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
-  {PB_7_ALT1, I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C4)},
-  {PB_9,      I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
-  {PB_9_ALT1, I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C4)},
-  {PB_11,     I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
-  {PC_9,      I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
-  {PC_9_ALT1, I2C5, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C5)},
-  {PC_10,     I2C5, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C5)},
-  {PD_13,     I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C4)},
-  {PF_0,      I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
-  {PF_0_ALT1, I2C5, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C5)},
-  {PF_15,     I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C4)},
-  {NC,        NP,   0}
-};
-#endif
-
-#ifdef HAL_I2C_MODULE_ENABLED
-WEAK const PinMap PinMap_I2C_SCL[] = {
-  {PA_8,      I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
-  {PA_8_ALT1, I2C5, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C5)},
-  {PB_6,      I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
-  {PB_6_ALT1, I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C4)},
-  {PB_8,      I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
-  {PB_8_ALT1, I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C4)},
-  {PB_10,     I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
-  {PC_11,     I2C5, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C5)},
-  {PD_12,     I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C4)},
-  {PF_1,      I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
-  {PF_1_ALT1, I2C5, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C5)},
-  {PF_14,     I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C4)},
-  {NC,        NP,   0}
-};
-#endif
-
-//*** TIM ***
-
-#ifdef HAL_TIM_MODULE_ENABLED
-WEAK const PinMap PinMap_TIM[] = {
-  {PA_0,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
-  {PA_0_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)}, // TIM5_CH1
-  {PA_1,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
-  {PA_1_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 2, 0)}, // TIM5_CH2
-  {PA_1_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM15, 1, 1)}, // TIM15_CH1N
-  {PA_2,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
-  {PA_2_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 3, 0)}, // TIM5_CH3
-  {PA_2_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM15, 1, 0)}, // TIM15_CH1
-  {PA_3,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4
-  {PA_3_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 4, 0)}, // TIM5_CH4
-  {PA_3_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM15, 2, 0)}, // TIM15_CH2
-  {PA_5,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
-  {PA_5_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 1)}, // TIM8_CH1N
-  {PA_6,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
-  {PA_6_ALT1,  TIM13, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM13, 1, 0)}, // TIM13_CH1
-  {PA_7,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
-  {PA_7_ALT1,  TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
-  {PA_7_ALT2,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 1)}, // TIM8_CH1N
-  {PA_7_ALT3,  TIM14, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM14, 1, 0)}, // TIM14_CH1
-  {PA_8,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)}, // TIM1_CH1
-  {PA_9,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 0)}, // TIM1_CH2
-  {PA_10,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 0)}, // TIM1_CH3
-  {PA_11,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 4, 0)}, // TIM1_CH4
-  {PA_15,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
-  {PB_0,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
-  {PB_0_ALT1,  TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)}, // TIM3_CH3
-  {PB_0_ALT2,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 1)}, // TIM8_CH2N
-  {PB_1,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
-  {PB_1_ALT1,  TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
-  {PB_1_ALT2,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 1)}, // TIM8_CH3N
-  {PB_3,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
-  {PB_4,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
-  {PB_5,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
-  {PB_6,       TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 1, 0)}, // TIM4_CH1
-  {PB_6_ALT1,  TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM16, 1, 1)}, // TIM16_CH1N
-  {PB_7,       TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 2, 0)}, // TIM4_CH2
-  {PB_7_ALT1,  TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM17, 1, 1)}, // TIM17_CH1N
-  {PB_8,       TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 3, 0)}, // TIM4_CH3
-  {PB_8_ALT1,  TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM16, 1, 0)}, // TIM16_CH1
-  {PB_9,       TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)}, // TIM4_CH4
-  {PB_9_ALT1,  TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM17, 1, 0)}, // TIM17_CH1
-  {PB_10,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
-  {PB_11,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4
-  {PB_13,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
-  {PB_14,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
-  {PB_14_ALT1, TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 1)}, // TIM8_CH2N
-  {PB_14_ALT2, TIM12, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM12, 1, 0)}, // TIM12_CH1
-  {PB_15,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
-  {PB_15_ALT1, TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 1)}, // TIM8_CH3N
-  {PB_15_ALT2, TIM12, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM12, 2, 0)}, // TIM12_CH2
-  {PC_6,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
-  {PC_6_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 0)}, // TIM8_CH1
-  {PC_7,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
-  {PC_7_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 0)}, // TIM8_CH2
-  {PC_8,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)}, // TIM3_CH3
-  {PC_8_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 0)}, // TIM8_CH3
-  {PC_9,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
-  {PC_9_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 4, 0)}, // TIM8_CH4
-  {PC_12,      TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM15, 1, 0)}, // TIM15_CH1
-  {PD_12,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 1, 0)}, // TIM4_CH1
-  {PD_13,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 2, 0)}, // TIM4_CH2
-  {PD_14,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 3, 0)}, // TIM4_CH3
-  {PD_15,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)}, // TIM4_CH4
-  {PE_4,       TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM15, 1, 1)}, // TIM15_CH1N
-  {PE_5,       TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM15, 1, 0)}, // TIM15_CH1
-  {PE_6,       TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM15, 2, 0)}, // TIM15_CH2
-  {PE_8,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
-  {PE_9,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)}, // TIM1_CH1
-  {PE_10,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
-  {PE_11,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 0)}, // TIM1_CH2
-  {PE_12,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
-  {PE_13,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 0)}, // TIM1_CH3
-  {PE_14,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 4, 0)}, // TIM1_CH4
-  {PF_0,       TIM23, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF13_TIM23, 1, 0)}, // TIM23_CH1
-  {PF_1,       TIM23, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF13_TIM23, 2, 0)}, // TIM23_CH2
-  {PF_2,       TIM23, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF13_TIM23, 3, 0)}, // TIM23_CH3
-  {PF_3,       TIM23, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF13_TIM23, 4, 0)}, // TIM23_CH4
-  {PF_6,       TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM16, 1, 0)}, // TIM16_CH1
-  {PF_6_ALT1,  TIM23, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF13_TIM23, 1, 0)}, // TIM23_CH1
-  {PF_7,       TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM17, 1, 0)}, // TIM17_CH1
-  {PF_7_ALT1,  TIM23, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF13_TIM23, 2, 0)}, // TIM23_CH2
-  {PF_8,       TIM13, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM13, 1, 0)}, // TIM13_CH1
-  {PF_8_ALT1,  TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM16, 1, 1)}, // TIM16_CH1N
-  {PF_8_ALT2,  TIM23, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF13_TIM23, 3, 0)}, // TIM23_CH3
-  {PF_9,       TIM14, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM14, 1, 0)}, // TIM14_CH1
-  {PF_9_ALT1,  TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM17, 1, 1)}, // TIM17_CH1N
-  {PF_9_ALT2,  TIM23, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF13_TIM23, 4, 0)}, // TIM23_CH4
-  {PF_11,      TIM24, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM24, 1, 0)}, // TIM24_CH1
-  {PF_12,      TIM24, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM24, 2, 0)}, // TIM24_CH2
-  {PF_13,      TIM24, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM24, 3, 0)}, // TIM24_CH3
-  {PF_14,      TIM24, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM24, 4, 0)}, // TIM24_CH4
-  {PG_12,      TIM23, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF13_TIM23, 1, 0)}, // TIM23_CH1
-  {PG_13,      TIM23, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF13_TIM23, 2, 0)}, // TIM23_CH2
-  {PG_14,      TIM23, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF13_TIM23, 3, 0)}, // TIM23_CH3
-  {NC,         NP,    0}
-};
-#endif
-
-//*** UART ***
-
-#ifdef HAL_UART_MODULE_ENABLED
-WEAK const PinMap PinMap_UART_TX[] = {
-  {PA_0,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PA_2,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PA_9,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_LPUART)},
-  {PA_9_ALT1,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PA_12,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_UART4)},
-  {PA_15,      UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART7)},
-  {PB_4,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART7)},
-  {PB_6,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART)},
-  {PB_6_ALT1,  UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_UART5)},
-  {PB_6_ALT2,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PB_9,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PB_10,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PB_13,      UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_UART5)},
-  {PB_14,      USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART1)},
-  {PC_6,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
-  {PC_10,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PC_10_ALT1, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PC_12,      UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
-  {PD_1,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PD_5,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PD_8,       USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PD_15,      UART9,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART9)},
-  {PE_1,       UART8,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART8)},
-  {PE_3,       USART10, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_USART10)},
-  {PE_8,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
-  {PF_7,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
-  {PG_1,       UART9,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART9)},
-  {PG_12,      USART10, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART10)},
-  {PG_14,      USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
-  {NC,         NP,      0}
-};
-#endif
-
-#ifdef HAL_UART_MODULE_ENABLED
-WEAK const PinMap PinMap_UART_RX[] = {
-  {PA_1,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PA_3,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PA_8,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART7)},
-  {PA_10,      LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_LPUART)},
-  {PA_10_ALT1, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PA_11,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_UART4)},
-  {PB_3,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART7)},
-  {PB_5,       UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_UART5)},
-  {PB_7,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART)},
-  {PB_7_ALT1,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PB_8,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PB_11,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PB_12,      UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_UART5)},
-  {PB_15,      USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART1)},
-  {PC_7,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
-  {PC_11,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PC_11_ALT1, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PD_0,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PD_2,       UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
-  {PD_6,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PD_9,       USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PD_14,      UART9,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART9)},
-  {PE_0,       UART8,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART8)},
-  {PE_2,       USART10, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART10)},
-  {PE_7,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
-  {PF_6,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
-  {PG_0,       UART9,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART9)},
-  {PG_9,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
-  {PG_11,      USART10, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART10)},
-  {NC,         NP,      0}
-};
-#endif
-
-#ifdef HAL_UART_MODULE_ENABLED
-WEAK const PinMap PinMap_UART_RTS[] = {
-  {PA_1,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PA_12,      LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_LPUART)},
-  {PA_12_ALT1, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PA_15,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PB_14,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PB_14_ALT1, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PC_8,       UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
-  {PD_4,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PD_12,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PD_13,      UART9,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART9)},
-  {PD_15,      UART8,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART8)},
-  {PE_9,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
-  {PF_8,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
-  {PG_8,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
-  {PG_12,      USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
-  {PG_14,      USART10, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART10)},
-  {NC,         NP,      0}
-};
-#endif
-
-#ifdef HAL_UART_MODULE_ENABLED
-WEAK const PinMap PinMap_UART_CTS[] = {
-  {PA_0,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PA_11,      LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_LPUART)},
-  {PA_11_ALT1, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PB_0,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PB_13,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PB_15,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
-  {PC_9,       UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
-  {PD_0,       UART9,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART9)},
-  {PD_3,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PD_11,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
-  {PD_14,      UART8,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART8)},
-  {PE_10,      UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
-  {PF_9,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
-  {PG_13,      USART10, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART10)},
-  {PG_13_ALT1, USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
-  {PG_15,      USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
-  {NC,         NP,      0}
-};
-#endif
-
-//*** SPI ***
-
-#ifdef HAL_SPI_MODULE_ENABLED
-WEAK const PinMap PinMap_SPI_MOSI[] = {
-  {PA_7,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PA_7_ALT1, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
-  {PB_2,      SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_SPI3)},
-  {PB_5,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PB_5_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_SPI3)},
-  {PB_5_ALT2, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
-  {PB_15,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PC_1,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PC_12,     SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PD_6,      SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI3)},
-  {PD_7,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PE_6,      SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  {PE_14,     SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  {PF_9,      SPI5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI5)},
-  {PF_11,     SPI5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI5)},
-  {PG_14,     SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI6)},
-  {NC,        NP,   0}
-};
-#endif
-
-#ifdef HAL_SPI_MODULE_ENABLED
-WEAK const PinMap PinMap_SPI_MISO[] = {
-  {PA_6,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PA_6_ALT1, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
-  {PB_4,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PB_4_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PB_4_ALT2, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
-  {PB_14,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PC_11,     SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PE_5,      SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  {PE_13,     SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  {PF_8,      SPI5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI5)},
-  {PG_9,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PG_12,     SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI6)},
-  {NC,        NP,   0}
-};
-#endif
-
-#ifdef HAL_SPI_MODULE_ENABLED
-WEAK const PinMap PinMap_SPI_SCLK[] = {
-  {PA_5,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PA_5_ALT1, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
-  {PA_9,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PA_12,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PB_3,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PB_3_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PB_3_ALT2, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
-  {PB_10,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PB_13,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PC_10,     SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PC_12,     SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI6)},
-  {PD_3,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PE_2,      SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  {PE_12,     SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  {PF_7,      SPI5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI5)},
-  {PG_11,     SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PG_13,     SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI6)},
-  {NC,        NP,   0}
-};
-#endif
-
-#ifdef HAL_SPI_MODULE_ENABLED
-WEAK const PinMap PinMap_SPI_SSEL[] = {
-  {PA_0,       SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI6)},
-  {PA_4,       SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PA_4_ALT1,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PA_4_ALT2,  SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
-  {PA_11,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PA_15,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PA_15_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PA_15_ALT2, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_SPI6)},
-  {PB_4,       SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_SPI2)},
-  {PB_9,       SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PB_12,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PE_4,       SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  {PE_11,      SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  {PF_6,       SPI5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI5)},
-  {PG_8,       SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI6)},
-  {PG_10,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {NC,         NP,   0}
-};
-#endif
-
-//*** FDCAN ***
-
-#ifdef HAL_FDCAN_MODULE_ENABLED
-WEAK const PinMap PinMap_CAN_RD[] = {
-  {PA_11, FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
-  {PB_5,  FDCAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN2)},
-  {PB_8,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
-  {PB_12, FDCAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN2)},
-  {PD_0,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
-  {PD_12, FDCAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF5_FDCAN3)},
-  {PF_6,  FDCAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF2_FDCAN3)},
-  {PG_10, FDCAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF2_FDCAN3)},
-  {NC,    NP,     0}
-};
-#endif
-
-#ifdef HAL_FDCAN_MODULE_ENABLED
-WEAK const PinMap PinMap_CAN_TD[] = {
-  {PA_12, FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
-  {PB_6,  FDCAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN2)},
-  {PB_9,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
-  {PB_13, FDCAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN2)},
-  {PD_1,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
-  {PD_13, FDCAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF5_FDCAN3)},
-  {PF_7,  FDCAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF2_FDCAN3)},
-  {PG_9,  FDCAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF2_FDCAN3)},
-  {NC,    NP,     0}
-};
-#endif
-
-//*** ETHERNET ***
-
-#ifdef HAL_ETH_MODULE_ENABLED
-WEAK const PinMap PinMap_Ethernet[] = {
-  {PA_0,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
-  {PA_1,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_REF_CLK
-  {PA_1_ALT1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RX_CLK
-  {PA_2,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_MDIO
-  {PA_3,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_COL
-  {PA_7,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS_DV
-  {PA_7_ALT1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RX_DV
-  {PA_9,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TX_ER
-  {PB_0,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RXD2
-  {PB_1,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RXD3
-  {PB_2,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TX_ER
-  {PB_5,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_PPS_OUT
-  {PB_8,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD3
-  {PB_10,     ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RX_ER
-  {PB_11,     ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TX_EN
-  {PB_12,     ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD0
-  {PB_13,     ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD1
-  {PC_1,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_MDC
-  {PC_4,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RXD0
-  {PC_5,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RXD1
-  {PE_2,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD3
-  {PG_8,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_PPS_OUT
-  {PG_11,     ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TX_EN
-  {PG_12,     ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD1
-  {PG_13,     ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD0
-  {PG_14,     ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD1
-  {NC,        NP,  0}
-};
-#endif
-
-//*** OCTOSPI ***
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA0[] = {
-  {PA_2,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO0
-  {PB_1,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO0
-  {PB_12, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO0
-  {PC_9,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO0
-  {PD_11, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO0
-  {PF_0,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P2)}, // OCTOSPIM_P2_IO0
-  {PF_8,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO0
-  {NC,    NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA1[] = {
-  {PB_0,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO1
-  {PC_10, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO1
-  {PD_12, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO1
-  {PF_1,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P2)}, // OCTOSPIM_P2_IO1
-  {PF_9,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO1
-  {NC,    NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA2[] = {
-  {PA_3,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO2
-  {PA_7,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO2
-  {PB_13, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO2
-  {PE_2,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO2
-  {PF_2,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P2)}, // OCTOSPIM_P2_IO2
-  {PF_7,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO2
-  {NC,    NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA3[] = {
-  {PA_1,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO3
-  {PA_6,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO3
-  {PD_13, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO3
-  {PF_3,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P2)}, // OCTOSPIM_P2_IO3
-  {PF_6,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO3
-  {NC,    NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA4[] = {
-  {PC_1, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO4
-  {PD_4, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO4
-  {PE_7, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO4
-  {PG_0, OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P2)}, // OCTOSPIM_P2_IO4
-  {NC,   NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA5[] = {
-  {PD_5, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO5
-  {PE_8, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO5
-  {PG_1, OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P2)}, // OCTOSPIM_P2_IO5
-  {NC,   NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA6[] = {
-  {PD_6,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO6
-  {PE_9,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO6
-  {PG_9,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO6
-  {PG_10, OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_OCTOSPIM_P2)}, // OCTOSPIM_P2_IO6
-  {NC,    NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_DATA7[] = {
-  {PD_7,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO7
-  {PE_10, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO7
-  {PG_11, OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P2)}, // OCTOSPIM_P2_IO7
-  {PG_14, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_IO7
-  {NC,    NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_SCLK[] = {
-  {PA_3,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OCTOSPIM_P1)}, // OCTOSPIM_P1_CLK
-  {PB_2,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_CLK
-  {PF_4,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P2)}, // OCTOSPIM_P2_CLK
-  {PF_10, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_CLK
-  {NC,    NP,       0}
-};
-#endif
-
-#ifdef HAL_OSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_OCTOSPI_SSEL[] = {
-  {PB_6,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_NCS
-  {PB_10, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_NCS
-  {PC_11, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_OCTOSPIM_P1)}, // OCTOSPIM_P1_NCS
-  {PE_11, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_OCTOSPIM_P1)}, // OCTOSPIM_P1_NCS
-  {PG_6,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // OCTOSPIM_P1_NCS
-  {PG_12, OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_OCTOSPIM_P2)}, // OCTOSPIM_P2_NCS
-  {NC,    NP,       0}
-};
-#endif
-
-//*** USB ***
-
-#if defined(HAL_PCD_MODULE_ENABLED) || defined(HAL_HCD_MODULE_ENABLED)
-WEAK const PinMap PinMap_USB_OTG_HS[] = {
-#ifdef USE_USB_HS_IN_FS
-  {PA_8,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_SOF
-  {PA_9,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
-  {PA_10, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ID
-  {PA_11, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)}, // USB_OTG_HS_DM
-  {PA_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)}, // USB_OTG_HS_DP
-#else
-  {PA_3,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D0
-  {PA_5,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_CK
-  {PB_0,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D1
-  {PB_1,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D2
-  {PB_5,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D7
-  {PB_10, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D3
-  {PB_11, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D4
-  {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D5
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_D6
-  {PC_0,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_HS)}, // USB_OTG_HS_ULPI_STP
-#endif /* USE_USB_HS_IN_FS */
-  {NC,    NP,         0}
-};
-#endif
-
-//*** SD ***
-
-#ifdef HAL_SD_MODULE_ENABLED
-WEAK const PinMap PinMap_SD[] = {
-  {PA_0,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_SDMMC2)}, // SDMMC2_CMD
-  {PB_3,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_SDMMC2)}, // SDMMC2_D2
-  {PB_4,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_SDMMC2)}, // SDMMC2_D3
-  {PB_8,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF7_SDMMC1)}, // SDMMC1_CKIN
-  {PB_8_ALT1, SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D4
-  {PB_8_ALT2, SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_SDMMC2)}, // SDMMC2_D4
-  {PB_9,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF7_SDMMC1)}, // SDMMC1_CDIR
-  {PB_9_ALT1, SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D5
-  {PB_9_ALT2, SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_SDMMC2)}, // SDMMC2_D5
-  {PB_13,     SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D0
-  {PB_14,     SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_SDMMC2)}, // SDMMC2_D0
-  {PB_15,     SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_SDMMC2)}, // SDMMC2_D1
-  {PC_1,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_SDMMC2)}, // SDMMC2_CK
-  {PC_4,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF10_SDMMC2)}, // SDMMC2_CKIN
-  {PC_6,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF8_SDMMC1)}, // SDMMC1_D0DIR
-  {PC_6_ALT1, SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D6
-  {PC_6_ALT2, SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_SDMMC2)}, // SDMMC2_D6
-  {PC_7,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF8_SDMMC1)}, // SDMMC1_D123DIR
-  {PC_7_ALT1, SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D7
-  {PC_7_ALT2, SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_SDMMC2)}, // SDMMC2_D7
-  {PC_8,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D0
-  {PC_9,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D1
-  {PC_10,     SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D2
-  {PC_11,     SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D3
-  {PC_12,     SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDMMC1)}, // SDMMC1_CK
-  {PD_2,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDMMC1)}, // SDMMC1_CMD
-  {PD_6,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF11_SDMMC2)}, // SDMMC2_CK
-  {PD_7,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF11_SDMMC2)}, // SDMMC2_CMD
-  {PG_9,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_SDMMC2)}, // SDMMC2_D0
-  {PG_10,     SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_SDMMC2)}, // SDMMC2_D1
-  {PG_11,     SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_SDMMC2)}, // SDMMC2_D2
-  {PG_12,     SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_SDMMC2)}, // SDMMC2_D3
-  {PG_13,     SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_SDMMC2)}, // SDMMC2_D6
-  {PG_14,     SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_SDMMC2)}, // SDMMC2_D7
-  {NC,        NP,     0}
-};
-#endif
-
-#endif /* !CUSTOM_PERIPHERAL_PINS */
diff --git a/variants/STM32H7xx/H730ZBT/boards_entry.txt b/variants/STM32H7xx/H730ZBT/boards_entry.txt
deleted file mode 100644
index db2d670a8a..0000000000
--- a/variants/STM32H7xx/H730ZBT/boards_entry.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-# This file help to add generic board entry.
-# upload.maximum_size and product_line have to be verified
-# and changed if needed.
-# See: https://github.com/stm32duino/wiki/wiki/Add-a-new-variant-%28board%29
-
-# Generic H730ZBTx
-GenH7.menu.pnum.GENERIC_H730ZBTX=Generic H730ZBTx
-GenH7.menu.pnum.GENERIC_H730ZBTX.upload.maximum_size=131072
-GenH7.menu.pnum.GENERIC_H730ZBTX.upload.maximum_data_size=1048576
-GenH7.menu.pnum.GENERIC_H730ZBTX.build.board=GENERIC_H730ZBTX
-GenH7.menu.pnum.GENERIC_H730ZBTX.build.product_line=STM32H730xx
-GenH7.menu.pnum.GENERIC_H730ZBTX.build.variant=STM32H7xx/H730ZBT
-
diff --git a/variants/STM32H7xx/H730ZBT/generic_clock.c b/variants/STM32H7xx/H730ZBT/generic_clock.c
deleted file mode 100644
index 1850caa7b3..0000000000
--- a/variants/STM32H7xx/H730ZBT/generic_clock.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
- * All rights reserved.
- *
- * This software component is licensed by ST under BSD 3-Clause license,
- * the "License"; You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *                        opensource.org/licenses/BSD-3-Clause
- *
- *******************************************************************************
- */
-#if defined(ARDUINO_GENERIC_H730ZBTX)
-#include "pins_arduino.h"
-
-/**
-  * @brief  System Clock Configuration
-  * @param  None
-  * @retval None
-  */
-WEAK void SystemClock_Config(void)
-{
-  /* SystemClock_Config can be generated by STM32CubeMX */
-#warning "SystemClock_Config() is empty. Default clock at reset is used."
-}
-
-#endif /* ARDUINO_GENERIC_* */
diff --git a/variants/STM32H7xx/H730ZBT/variant_generic.cpp b/variants/STM32H7xx/H730ZBT/variant_generic.cpp
deleted file mode 100644
index f0d493a035..0000000000
--- a/variants/STM32H7xx/H730ZBT/variant_generic.cpp
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
- * All rights reserved.
- *
- * This software component is licensed by ST under BSD 3-Clause license,
- * the "License"; You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *                        opensource.org/licenses/BSD-3-Clause
- *
- *******************************************************************************
- */
-#if defined(ARDUINO_GENERIC_H730ZBTX)
-#include "pins_arduino.h"
-
-// Digital PinName array
-const PinName digitalPin[] = {
-  PA_0,   // D0/A0
-  PA_1,   // D1/A1
-  PA_2,   // D2/A2
-  PA_3,   // D3/A3
-  PA_4,   // D4/A4
-  PA_5,   // D5/A5
-  PA_6,   // D6/A6
-  PA_7,   // D7/A7
-  PA_8,   // D8
-  PA_9,   // D9
-  PA_10,  // D10
-  PA_11,  // D11
-  PA_12,  // D12
-  PA_13,  // D13
-  PA_14,  // D14
-  PA_15,  // D15
-  PB_0,   // D16/A8
-  PB_1,   // D17/A9
-  PB_2,   // D18
-  PB_3,   // D19
-  PB_4,   // D20
-  PB_5,   // D21
-  PB_6,   // D22
-  PB_7,   // D23
-  PB_8,   // D24
-  PB_9,   // D25
-  PB_10,  // D26
-  PB_11,  // D27
-  PB_12,  // D28
-  PB_13,  // D29
-  PB_14,  // D30
-  PB_15,  // D31
-  PC_0,   // D32/A10
-  PC_1,   // D33/A11
-  PC_4,   // D34/A12
-  PC_5,   // D35/A13
-  PC_6,   // D36
-  PC_7,   // D37
-  PC_8,   // D38
-  PC_9,   // D39
-  PC_10,  // D40
-  PC_11,  // D41
-  PC_12,  // D42
-  PC_13,  // D43
-  PC_14,  // D44
-  PC_15,  // D45
-  PD_0,   // D46
-  PD_1,   // D47
-  PD_2,   // D48
-  PD_3,   // D49
-  PD_4,   // D50
-  PD_5,   // D51
-  PD_6,   // D52
-  PD_7,   // D53
-  PD_8,   // D54
-  PD_9,   // D55
-  PD_10,  // D56
-  PD_11,  // D57
-  PD_12,  // D58
-  PD_13,  // D59
-  PD_14,  // D60
-  PD_15,  // D61
-  PE_0,   // D62
-  PE_1,   // D63
-  PE_2,   // D64
-  PE_3,   // D65
-  PE_4,   // D66
-  PE_5,   // D67
-  PE_6,   // D68
-  PE_7,   // D69
-  PE_8,   // D70
-  PE_9,   // D71
-  PE_10,  // D72
-  PE_11,  // D73
-  PE_12,  // D74
-  PE_13,  // D75
-  PE_14,  // D76
-  PE_15,  // D77
-  PF_0,   // D78
-  PF_1,   // D79
-  PF_2,   // D80
-  PF_3,   // D81/A14
-  PF_4,   // D82/A15
-  PF_5,   // D83/A16
-  PF_6,   // D84/A17
-  PF_7,   // D85/A18
-  PF_8,   // D86/A19
-  PF_9,   // D87/A20
-  PF_10,  // D88/A21
-  PF_11,  // D89/A22
-  PF_12,  // D90/A23
-  PF_13,  // D91/A24
-  PF_14,  // D92/A25
-  PF_15,  // D93
-  PG_0,   // D94
-  PG_1,   // D95
-  PG_2,   // D96
-  PG_3,   // D97
-  PG_4,   // D98
-  PG_5,   // D99
-  PG_6,   // D100
-  PG_7,   // D101
-  PG_8,   // D102
-  PG_9,   // D103
-  PG_10,  // D104
-  PG_11,  // D105
-  PG_12,  // D106
-  PG_13,  // D107
-  PG_14,  // D108
-  PG_15,  // D109
-  PH_0,   // D110
-  PH_1,   // D111
-  PC_2_C, // D112/A26
-  PC_3_C  // D113/A27
-};
-
-// Analog (Ax) pin number array
-const uint32_t analogInputPin[] = {
-  0,  // A0,  PA0
-  1,  // A1,  PA1
-  2,  // A2,  PA2
-  3,  // A3,  PA3
-  4,  // A4,  PA4
-  5,  // A5,  PA5
-  6,  // A6,  PA6
-  7,  // A7,  PA7
-  16, // A8,  PB0
-  17, // A9,  PB1
-  32, // A10, PC0
-  33, // A11, PC1
-  34, // A12, PC4
-  35, // A13, PC5
-  81, // A14, PF3
-  82, // A15, PF4
-  83, // A16, PF5
-  84, // A17, PF6
-  85, // A18, PF7
-  86, // A19, PF8
-  87, // A20, PF9
-  88, // A21, PF10
-  89, // A22, PF11
-  90, // A23, PF12
-  91, // A24, PF13
-  92, // A25, PF14
-  112, // A26, PC2_C
-  113 // A27, PC3_C
-};
-
-#endif /* ARDUINO_GENERIC_* */
diff --git a/variants/STM32H7xx/H730ZBT/variant_generic.h b/variants/STM32H7xx/H730ZBT/variant_generic.h
deleted file mode 100644
index d443f5c1fd..0000000000
--- a/variants/STM32H7xx/H730ZBT/variant_generic.h
+++ /dev/null
@@ -1,308 +0,0 @@
-/*
- *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
- * All rights reserved.
- *
- * This software component is licensed by ST under BSD 3-Clause license,
- * the "License"; You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *                        opensource.org/licenses/BSD-3-Clause
- *
- *******************************************************************************
- */
-#pragma once
-
-/*----------------------------------------------------------------------------
- *        STM32 pins number
- *----------------------------------------------------------------------------*/
-#define PA0                     PIN_A0
-#define PA1                     PIN_A1
-#define PA2                     PIN_A2
-#define PA3                     PIN_A3
-#define PA4                     PIN_A4
-#define PA5                     PIN_A5
-#define PA6                     PIN_A6
-#define PA7                     PIN_A7
-#define PA8                     8
-#define PA9                     9
-#define PA10                    10
-#define PA11                    11
-#define PA12                    12
-#define PA13                    13
-#define PA14                    14
-#define PA15                    15
-#define PB0                     PIN_A8
-#define PB1                     PIN_A9
-#define PB2                     18
-#define PB3                     19
-#define PB4                     20
-#define PB5                     21
-#define PB6                     22
-#define PB7                     23
-#define PB8                     24
-#define PB9                     25
-#define PB10                    26
-#define PB11                    27
-#define PB12                    28
-#define PB13                    29
-#define PB14                    30
-#define PB15                    31
-#define PC0                     PIN_A10
-#define PC1                     PIN_A11
-#define PC4                     PIN_A12
-#define PC5                     PIN_A13
-#define PC6                     36
-#define PC7                     37
-#define PC8                     38
-#define PC9                     39
-#define PC10                    40
-#define PC11                    41
-#define PC12                    42
-#define PC13                    43
-#define PC14                    44
-#define PC15                    45
-#define PD0                     46
-#define PD1                     47
-#define PD2                     48
-#define PD3                     49
-#define PD4                     50
-#define PD5                     51
-#define PD6                     52
-#define PD7                     53
-#define PD8                     54
-#define PD9                     55
-#define PD10                    56
-#define PD11                    57
-#define PD12                    58
-#define PD13                    59
-#define PD14                    60
-#define PD15                    61
-#define PE0                     62
-#define PE1                     63
-#define PE2                     64
-#define PE3                     65
-#define PE4                     66
-#define PE5                     67
-#define PE6                     68
-#define PE7                     69
-#define PE8                     70
-#define PE9                     71
-#define PE10                    72
-#define PE11                    73
-#define PE12                    74
-#define PE13                    75
-#define PE14                    76
-#define PE15                    77
-#define PF0                     78
-#define PF1                     79
-#define PF2                     80
-#define PF3                     PIN_A14
-#define PF4                     PIN_A15
-#define PF5                     PIN_A16
-#define PF6                     PIN_A17
-#define PF7                     PIN_A18
-#define PF8                     PIN_A19
-#define PF9                     PIN_A20
-#define PF10                    PIN_A21
-#define PF11                    PIN_A22
-#define PF12                    PIN_A23
-#define PF13                    PIN_A24
-#define PF14                    PIN_A25
-#define PF15                    93
-#define PG0                     94
-#define PG1                     95
-#define PG2                     96
-#define PG3                     97
-#define PG4                     98
-#define PG5                     99
-#define PG6                     100
-#define PG7                     101
-#define PG8                     102
-#define PG9                     103
-#define PG10                    104
-#define PG11                    105
-#define PG12                    106
-#define PG13                    107
-#define PG14                    108
-#define PG15                    109
-#define PH0                     110
-#define PH1                     111
-#define PC2_C                   PIN_A26
-#define PC3_C                   PIN_A27
-
-// Alternate pins number
-#define PA0_ALT1                (PA0  | ALT1)
-#define PA1_ALT1                (PA1  | ALT1)
-#define PA1_ALT2                (PA1  | ALT2)
-#define PA2_ALT1                (PA2  | ALT1)
-#define PA2_ALT2                (PA2  | ALT2)
-#define PA3_ALT1                (PA3  | ALT1)
-#define PA3_ALT2                (PA3  | ALT2)
-#define PA4_ALT1                (PA4  | ALT1)
-#define PA4_ALT2                (PA4  | ALT2)
-#define PA5_ALT1                (PA5  | ALT1)
-#define PA6_ALT1                (PA6  | ALT1)
-#define PA7_ALT1                (PA7  | ALT1)
-#define PA7_ALT2                (PA7  | ALT2)
-#define PA7_ALT3                (PA7  | ALT3)
-#define PA8_ALT1                (PA8  | ALT1)
-#define PA9_ALT1                (PA9  | ALT1)
-#define PA10_ALT1               (PA10 | ALT1)
-#define PA11_ALT1               (PA11 | ALT1)
-#define PA12_ALT1               (PA12 | ALT1)
-#define PA15_ALT1               (PA15 | ALT1)
-#define PA15_ALT2               (PA15 | ALT2)
-#define PB0_ALT1                (PB0  | ALT1)
-#define PB0_ALT2                (PB0  | ALT2)
-#define PB1_ALT1                (PB1  | ALT1)
-#define PB1_ALT2                (PB1  | ALT2)
-#define PB3_ALT1                (PB3  | ALT1)
-#define PB3_ALT2                (PB3  | ALT2)
-#define PB4_ALT1                (PB4  | ALT1)
-#define PB4_ALT2                (PB4  | ALT2)
-#define PB5_ALT1                (PB5  | ALT1)
-#define PB5_ALT2                (PB5  | ALT2)
-#define PB6_ALT1                (PB6  | ALT1)
-#define PB6_ALT2                (PB6  | ALT2)
-#define PB7_ALT1                (PB7  | ALT1)
-#define PB8_ALT1                (PB8  | ALT1)
-#define PB8_ALT2                (PB8  | ALT2)
-#define PB9_ALT1                (PB9  | ALT1)
-#define PB9_ALT2                (PB9  | ALT2)
-#define PB14_ALT1               (PB14 | ALT1)
-#define PB14_ALT2               (PB14 | ALT2)
-#define PB15_ALT1               (PB15 | ALT1)
-#define PB15_ALT2               (PB15 | ALT2)
-#define PC0_ALT1                (PC0  | ALT1)
-#define PC0_ALT2                (PC0  | ALT2)
-#define PC1_ALT1                (PC1  | ALT1)
-#define PC1_ALT2                (PC1  | ALT2)
-#define PC4_ALT1                (PC4  | ALT1)
-#define PC5_ALT1                (PC5  | ALT1)
-#define PC6_ALT1                (PC6  | ALT1)
-#define PC6_ALT2                (PC6  | ALT2)
-#define PC7_ALT1                (PC7  | ALT1)
-#define PC7_ALT2                (PC7  | ALT2)
-#define PC8_ALT1                (PC8  | ALT1)
-#define PC9_ALT1                (PC9  | ALT1)
-#define PC10_ALT1               (PC10 | ALT1)
-#define PC11_ALT1               (PC11 | ALT1)
-#define PF0_ALT1                (PF0  | ALT1)
-#define PF1_ALT1                (PF1  | ALT1)
-#define PF6_ALT1                (PF6  | ALT1)
-#define PF7_ALT1                (PF7  | ALT1)
-#define PF8_ALT1                (PF8  | ALT1)
-#define PF8_ALT2                (PF8  | ALT2)
-#define PF9_ALT1                (PF9  | ALT1)
-#define PF9_ALT2                (PF9  | ALT2)
-#define PG13_ALT1               (PG13 | ALT1)
-
-#define NUM_DIGITAL_PINS        114
-#define NUM_DUALPAD_PINS        2
-#define NUM_ANALOG_INPUTS       28
-
-// On-board LED pin number
-#ifndef LED_BUILTIN
-  #define LED_BUILTIN           PNUM_NOT_DEFINED
-#endif
-
-// On-board user button
-#ifndef USER_BTN
-  #define USER_BTN              PNUM_NOT_DEFINED
-#endif
-
-// SPI definitions
-#ifndef PIN_SPI_SS
-  #define PIN_SPI_SS            PA4
-#endif
-#ifndef PIN_SPI_SS1
-  #define PIN_SPI_SS1           PA15
-#endif
-#ifndef PIN_SPI_SS2
-  #define PIN_SPI_SS2           PG10
-#endif
-#ifndef PIN_SPI_SS3
-  #define PIN_SPI_SS3           PNUM_NOT_DEFINED
-#endif
-#ifndef PIN_SPI_MOSI
-  #define PIN_SPI_MOSI          PA7
-#endif
-#ifndef PIN_SPI_MISO
-  #define PIN_SPI_MISO          PA6
-#endif
-#ifndef PIN_SPI_SCK
-  #define PIN_SPI_SCK           PA5
-#endif
-
-// I2C definitions
-#ifndef PIN_WIRE_SDA
-  #define PIN_WIRE_SDA          PB7
-#endif
-#ifndef PIN_WIRE_SCL
-  #define PIN_WIRE_SCL          PB6
-#endif
-
-// Timer Definitions
-// Use TIM6/TIM7 when possible as servo and tone don't need GPIO output pin
-#ifndef TIMER_TONE
-  #define TIMER_TONE            TIM6
-#endif
-#ifndef TIMER_SERVO
-  #define TIMER_SERVO           TIM7
-#endif
-
-// UART Definitions
-#ifndef SERIAL_UART_INSTANCE
-  #define SERIAL_UART_INSTANCE  4
-#endif
-
-// Default pin used for generic 'Serial' instance
-// Mandatory for Firmata
-#ifndef PIN_SERIAL_RX
-  #define PIN_SERIAL_RX         PA1
-#endif
-#ifndef PIN_SERIAL_TX
-  #define PIN_SERIAL_TX         PA0
-#endif
-
-// Extra HAL modules
-#if !defined(HAL_DAC_MODULE_DISABLED)
-  #define HAL_DAC_MODULE_ENABLED
-#endif
-#if !defined(HAL_ETH_MODULE_DISABLED)
-  #define HAL_ETH_MODULE_ENABLED
-#endif
-#if !defined(HAL_OSPI_MODULE_DISABLED)
-  #define HAL_OSPI_MODULE_ENABLED
-#endif
-#if !defined(HAL_SD_MODULE_DISABLED)
-  #define HAL_SD_MODULE_ENABLED
-#endif
-
-/*----------------------------------------------------------------------------
- *        Arduino objects - C++ only
- *----------------------------------------------------------------------------*/
-
-#ifdef __cplusplus
-  // These serial port names are intended to allow libraries and architecture-neutral
-  // sketches to automatically default to the correct port name for a particular type
-  // of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
-  // the first hardware serial port whose RX/TX pins are not dedicated to another use.
-  //
-  // SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
-  //
-  // SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
-  //
-  // SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
-  //
-  // SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
-  //
-  // SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
-  //                            pins are NOT connected to anything by default.
-  #ifndef SERIAL_PORT_MONITOR
-    #define SERIAL_PORT_MONITOR   Serial
-  #endif
-  #ifndef SERIAL_PORT_HARDWARE
-    #define SERIAL_PORT_HARDWARE  Serial
-  #endif
-#endif
diff --git a/variants/STM32H7xx/H735VGH/PinNamesVar.h b/variants/STM32H7xx/H735VGH/PinNamesVar.h
deleted file mode 100644
index 3bd0ed8fcd..0000000000
--- a/variants/STM32H7xx/H735VGH/PinNamesVar.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/* Dual pad pin name */
-PC_2_C     = PC_2  | PDUAL,
-PC_3_C     = PC_3  | PDUAL,
-
-/* Alternate pin name */
-PA_0_ALT1  = PA_0  | ALT1,
-PA_1_ALT1  = PA_1  | ALT1,
-PA_1_ALT2  = PA_1  | ALT2,
-PA_2_ALT1  = PA_2  | ALT1,
-PA_2_ALT2  = PA_2  | ALT2,
-PA_3_ALT1  = PA_3  | ALT1,
-PA_3_ALT2  = PA_3  | ALT2,
-PA_4_ALT1  = PA_4  | ALT1,
-PA_4_ALT2  = PA_4  | ALT2,
-PA_5_ALT1  = PA_5  | ALT1,
-PA_6_ALT1  = PA_6  | ALT1,
-PA_7_ALT1  = PA_7  | ALT1,
-PA_7_ALT2  = PA_7  | ALT2,
-PA_7_ALT3  = PA_7  | ALT3,
-PA_8_ALT1  = PA_8  | ALT1,
-PA_9_ALT1  = PA_9  | ALT1,
-PA_10_ALT1 = PA_10 | ALT1,
-PA_11_ALT1 = PA_11 | ALT1,
-PA_12_ALT1 = PA_12 | ALT1,
-PA_15_ALT1 = PA_15 | ALT1,
-PA_15_ALT2 = PA_15 | ALT2,
-PB_0_ALT1  = PB_0  | ALT1,
-PB_0_ALT2  = PB_0  | ALT2,
-PB_1_ALT1  = PB_1  | ALT1,
-PB_1_ALT2  = PB_1  | ALT2,
-PB_3_ALT1  = PB_3  | ALT1,
-PB_3_ALT2  = PB_3  | ALT2,
-PB_4_ALT1  = PB_4  | ALT1,
-PB_4_ALT2  = PB_4  | ALT2,
-PB_5_ALT1  = PB_5  | ALT1,
-PB_5_ALT2  = PB_5  | ALT2,
-PB_6_ALT1  = PB_6  | ALT1,
-PB_6_ALT2  = PB_6  | ALT2,
-PB_7_ALT1  = PB_7  | ALT1,
-PB_8_ALT1  = PB_8  | ALT1,
-PB_8_ALT2  = PB_8  | ALT2,
-PB_9_ALT1  = PB_9  | ALT1,
-PB_9_ALT2  = PB_9  | ALT2,
-PB_14_ALT1 = PB_14 | ALT1,
-PB_14_ALT2 = PB_14 | ALT2,
-PB_15_ALT1 = PB_15 | ALT1,
-PB_15_ALT2 = PB_15 | ALT2,
-PC_0_ALT1  = PC_0  | ALT1,
-PC_0_ALT2  = PC_0  | ALT2,
-PC_1_ALT1  = PC_1  | ALT1,
-PC_1_ALT2  = PC_1  | ALT2,
-PC_4_ALT1  = PC_4  | ALT1,
-PC_5_ALT1  = PC_5  | ALT1,
-PC_6_ALT1  = PC_6  | ALT1,
-PC_6_ALT2  = PC_6  | ALT2,
-PC_7_ALT1  = PC_7  | ALT1,
-PC_7_ALT2  = PC_7  | ALT2,
-PC_8_ALT1  = PC_8  | ALT1,
-PC_9_ALT1  = PC_9  | ALT1,
-PC_10_ALT1 = PC_10 | ALT1,
-PC_11_ALT1 = PC_11 | ALT1,
-
-/* SYS_WKUP */
-#ifdef PWR_WAKEUP_PIN1
-  SYS_WKUP1 = PA_0,
-#endif
-#ifdef PWR_WAKEUP_PIN2
-  SYS_WKUP2 = PA_2,
-#endif
-#ifdef PWR_WAKEUP_PIN3
-  SYS_WKUP3 = NC,
-#endif
-#ifdef PWR_WAKEUP_PIN4
-  SYS_WKUP4 = PC_13,
-#endif
-#ifdef PWR_WAKEUP_PIN5
-  SYS_WKUP5 = NC,
-#endif
-#ifdef PWR_WAKEUP_PIN6
-  SYS_WKUP6 = PC_1,
-#endif
-#ifdef PWR_WAKEUP_PIN7
-  SYS_WKUP7 = NC,
-#endif
-#ifdef PWR_WAKEUP_PIN8
-  SYS_WKUP8 = NC,
-#endif
-
-/* USB */
-#ifdef USBCON
-  USB_OTG_HS_DM       = PA_11,
-  USB_OTG_HS_DP       = PA_12,
-  USB_OTG_HS_ID       = PA_10,
-  USB_OTG_HS_SOF      = PA_8,
-  USB_OTG_HS_ULPI_CK  = PA_5,
-  USB_OTG_HS_ULPI_D0  = PA_3,
-  USB_OTG_HS_ULPI_D1  = PB_0,
-  USB_OTG_HS_ULPI_D2  = PB_1,
-  USB_OTG_HS_ULPI_D3  = PB_10,
-  USB_OTG_HS_ULPI_D4  = PB_11,
-  USB_OTG_HS_ULPI_D5  = PB_12,
-  USB_OTG_HS_ULPI_D6  = PB_13,
-  USB_OTG_HS_ULPI_D7  = PB_5,
-  USB_OTG_HS_ULPI_DIR = PC_2_C,
-  USB_OTG_HS_ULPI_NXT = PC_3_C,
-  USB_OTG_HS_ULPI_STP = PC_0,
-  USB_OTG_HS_VBUS     = PA_9,
-#endif
diff --git a/variants/STM32H7xx/H735VGH/boards_entry.txt b/variants/STM32H7xx/H735VGH/boards_entry.txt
deleted file mode 100644
index 0a12c450e4..0000000000
--- a/variants/STM32H7xx/H735VGH/boards_entry.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-# This file help to add generic board entry.
-# upload.maximum_size and product_line have to be verified
-# and changed if needed.
-# See: https://github.com/stm32duino/wiki/wiki/Add-a-new-variant-%28board%29
-
-# Generic H735VGHx
-GenH7.menu.pnum.GENERIC_H735VGHX=Generic H735VGHx
-GenH7.menu.pnum.GENERIC_H735VGHX.upload.maximum_size=1048576
-GenH7.menu.pnum.GENERIC_H735VGHX.upload.maximum_data_size=1048576
-GenH7.menu.pnum.GENERIC_H735VGHX.build.board=GENERIC_H735VGHX
-GenH7.menu.pnum.GENERIC_H735VGHX.build.product_line=STM32H735xx
-GenH7.menu.pnum.GENERIC_H735VGHX.build.variant=STM32H7xx/H735VGH
-
diff --git a/variants/STM32H7xx/H735VGH/generic_clock.c b/variants/STM32H7xx/H735VGH/generic_clock.c
deleted file mode 100644
index 7afdc6e1c1..0000000000
--- a/variants/STM32H7xx/H735VGH/generic_clock.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
- * All rights reserved.
- *
- * This software component is licensed by ST under BSD 3-Clause license,
- * the "License"; You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *                        opensource.org/licenses/BSD-3-Clause
- *
- *******************************************************************************
- */
-#if defined(ARDUINO_GENERIC_H735VGHX)
-#include "pins_arduino.h"
-
-/**
-  * @brief  System Clock Configuration
-  * @param  None
-  * @retval None
-  */
-WEAK void SystemClock_Config(void)
-{
-  /* SystemClock_Config can be generated by STM32CubeMX */
-#warning "SystemClock_Config() is empty. Default clock at reset is used."
-}
-
-#endif /* ARDUINO_GENERIC_* */
diff --git a/variants/STM32H7xx/H735VGH/variant_generic.cpp b/variants/STM32H7xx/H735VGH/variant_generic.cpp
deleted file mode 100644
index 1e1197c8ec..0000000000
--- a/variants/STM32H7xx/H735VGH/variant_generic.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
- * All rights reserved.
- *
- * This software component is licensed by ST under BSD 3-Clause license,
- * the "License"; You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *                        opensource.org/licenses/BSD-3-Clause
- *
- *******************************************************************************
- */
-#if defined(ARDUINO_GENERIC_H735VGHX)
-#include "pins_arduino.h"
-
-// Digital PinName array
-const PinName digitalPin[] = {
-  PA_0,   // D0/A0
-  PA_1,   // D1/A1
-  PA_2,   // D2/A2
-  PA_3,   // D3/A3
-  PA_4,   // D4/A4
-  PA_5,   // D5/A5
-  PA_6,   // D6/A6
-  PA_7,   // D7/A7
-  PA_8,   // D8
-  PA_9,   // D9
-  PA_10,  // D10
-  PA_11,  // D11
-  PA_12,  // D12
-  PA_13,  // D13
-  PA_14,  // D14
-  PA_15,  // D15
-  PB_0,   // D16/A8
-  PB_1,   // D17/A9
-  PB_2,   // D18
-  PB_3,   // D19
-  PB_4,   // D20
-  PB_5,   // D21
-  PB_6,   // D22
-  PB_7,   // D23
-  PB_8,   // D24
-  PB_9,   // D25
-  PB_10,  // D26
-  PB_11,  // D27
-  PB_12,  // D28
-  PB_13,  // D29
-  PB_14,  // D30
-  PB_15,  // D31
-  PC_0,   // D32/A10
-  PC_1,   // D33/A11
-  PC_4,   // D34/A12
-  PC_5,   // D35/A13
-  PC_6,   // D36
-  PC_7,   // D37
-  PC_8,   // D38
-  PC_9,   // D39
-  PC_10,  // D40
-  PC_11,  // D41
-  PC_12,  // D42
-  PC_13,  // D43
-  PC_14,  // D44
-  PC_15,  // D45
-  PD_0,   // D46
-  PD_1,   // D47
-  PD_2,   // D48
-  PD_3,   // D49
-  PD_4,   // D50
-  PD_5,   // D51
-  PD_6,   // D52
-  PD_7,   // D53
-  PD_8,   // D54
-  PD_9,   // D55
-  PD_10,  // D56
-  PD_11,  // D57
-  PD_12,  // D58
-  PD_13,  // D59
-  PD_14,  // D60
-  PD_15,  // D61
-  PE_0,   // D62
-  PE_1,   // D63
-  PE_2,   // D64
-  PE_3,   // D65
-  PE_4,   // D66
-  PE_5,   // D67
-  PE_6,   // D68
-  PE_7,   // D69
-  PE_8,   // D70
-  PE_9,   // D71
-  PE_10,  // D72
-  PH_0,   // D73
-  PH_1,   // D74
-  PC_2_C, // D75/A14
-  PC_3_C  // D76/A15
-};
-
-// Analog (Ax) pin number array
-const uint32_t analogInputPin[] = {
-  0,  // A0,  PA0
-  1,  // A1,  PA1
-  2,  // A2,  PA2
-  3,  // A3,  PA3
-  4,  // A4,  PA4
-  5,  // A5,  PA5
-  6,  // A6,  PA6
-  7,  // A7,  PA7
-  16, // A8,  PB0
-  17, // A9,  PB1
-  32, // A10, PC0
-  33, // A11, PC1
-  34, // A12, PC4
-  35, // A13, PC5
-  75, // A14, PC2_C
-  76  // A15, PC3_C
-};
-
-#endif /* ARDUINO_GENERIC_* */
diff --git a/variants/STM32H7xx/H735VGT/PinNamesVar.h b/variants/STM32H7xx/H735VGT/PinNamesVar.h
deleted file mode 100644
index 3bd0ed8fcd..0000000000
--- a/variants/STM32H7xx/H735VGT/PinNamesVar.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/* Dual pad pin name */
-PC_2_C     = PC_2  | PDUAL,
-PC_3_C     = PC_3  | PDUAL,
-
-/* Alternate pin name */
-PA_0_ALT1  = PA_0  | ALT1,
-PA_1_ALT1  = PA_1  | ALT1,
-PA_1_ALT2  = PA_1  | ALT2,
-PA_2_ALT1  = PA_2  | ALT1,
-PA_2_ALT2  = PA_2  | ALT2,
-PA_3_ALT1  = PA_3  | ALT1,
-PA_3_ALT2  = PA_3  | ALT2,
-PA_4_ALT1  = PA_4  | ALT1,
-PA_4_ALT2  = PA_4  | ALT2,
-PA_5_ALT1  = PA_5  | ALT1,
-PA_6_ALT1  = PA_6  | ALT1,
-PA_7_ALT1  = PA_7  | ALT1,
-PA_7_ALT2  = PA_7  | ALT2,
-PA_7_ALT3  = PA_7  | ALT3,
-PA_8_ALT1  = PA_8  | ALT1,
-PA_9_ALT1  = PA_9  | ALT1,
-PA_10_ALT1 = PA_10 | ALT1,
-PA_11_ALT1 = PA_11 | ALT1,
-PA_12_ALT1 = PA_12 | ALT1,
-PA_15_ALT1 = PA_15 | ALT1,
-PA_15_ALT2 = PA_15 | ALT2,
-PB_0_ALT1  = PB_0  | ALT1,
-PB_0_ALT2  = PB_0  | ALT2,
-PB_1_ALT1  = PB_1  | ALT1,
-PB_1_ALT2  = PB_1  | ALT2,
-PB_3_ALT1  = PB_3  | ALT1,
-PB_3_ALT2  = PB_3  | ALT2,
-PB_4_ALT1  = PB_4  | ALT1,
-PB_4_ALT2  = PB_4  | ALT2,
-PB_5_ALT1  = PB_5  | ALT1,
-PB_5_ALT2  = PB_5  | ALT2,
-PB_6_ALT1  = PB_6  | ALT1,
-PB_6_ALT2  = PB_6  | ALT2,
-PB_7_ALT1  = PB_7  | ALT1,
-PB_8_ALT1  = PB_8  | ALT1,
-PB_8_ALT2  = PB_8  | ALT2,
-PB_9_ALT1  = PB_9  | ALT1,
-PB_9_ALT2  = PB_9  | ALT2,
-PB_14_ALT1 = PB_14 | ALT1,
-PB_14_ALT2 = PB_14 | ALT2,
-PB_15_ALT1 = PB_15 | ALT1,
-PB_15_ALT2 = PB_15 | ALT2,
-PC_0_ALT1  = PC_0  | ALT1,
-PC_0_ALT2  = PC_0  | ALT2,
-PC_1_ALT1  = PC_1  | ALT1,
-PC_1_ALT2  = PC_1  | ALT2,
-PC_4_ALT1  = PC_4  | ALT1,
-PC_5_ALT1  = PC_5  | ALT1,
-PC_6_ALT1  = PC_6  | ALT1,
-PC_6_ALT2  = PC_6  | ALT2,
-PC_7_ALT1  = PC_7  | ALT1,
-PC_7_ALT2  = PC_7  | ALT2,
-PC_8_ALT1  = PC_8  | ALT1,
-PC_9_ALT1  = PC_9  | ALT1,
-PC_10_ALT1 = PC_10 | ALT1,
-PC_11_ALT1 = PC_11 | ALT1,
-
-/* SYS_WKUP */
-#ifdef PWR_WAKEUP_PIN1
-  SYS_WKUP1 = PA_0,
-#endif
-#ifdef PWR_WAKEUP_PIN2
-  SYS_WKUP2 = PA_2,
-#endif
-#ifdef PWR_WAKEUP_PIN3
-  SYS_WKUP3 = NC,
-#endif
-#ifdef PWR_WAKEUP_PIN4
-  SYS_WKUP4 = PC_13,
-#endif
-#ifdef PWR_WAKEUP_PIN5
-  SYS_WKUP5 = NC,
-#endif
-#ifdef PWR_WAKEUP_PIN6
-  SYS_WKUP6 = PC_1,
-#endif
-#ifdef PWR_WAKEUP_PIN7
-  SYS_WKUP7 = NC,
-#endif
-#ifdef PWR_WAKEUP_PIN8
-  SYS_WKUP8 = NC,
-#endif
-
-/* USB */
-#ifdef USBCON
-  USB_OTG_HS_DM       = PA_11,
-  USB_OTG_HS_DP       = PA_12,
-  USB_OTG_HS_ID       = PA_10,
-  USB_OTG_HS_SOF      = PA_8,
-  USB_OTG_HS_ULPI_CK  = PA_5,
-  USB_OTG_HS_ULPI_D0  = PA_3,
-  USB_OTG_HS_ULPI_D1  = PB_0,
-  USB_OTG_HS_ULPI_D2  = PB_1,
-  USB_OTG_HS_ULPI_D3  = PB_10,
-  USB_OTG_HS_ULPI_D4  = PB_11,
-  USB_OTG_HS_ULPI_D5  = PB_12,
-  USB_OTG_HS_ULPI_D6  = PB_13,
-  USB_OTG_HS_ULPI_D7  = PB_5,
-  USB_OTG_HS_ULPI_DIR = PC_2_C,
-  USB_OTG_HS_ULPI_NXT = PC_3_C,
-  USB_OTG_HS_ULPI_STP = PC_0,
-  USB_OTG_HS_VBUS     = PA_9,
-#endif
diff --git a/variants/STM32H7xx/H735VGT/boards_entry.txt b/variants/STM32H7xx/H735VGT/boards_entry.txt
deleted file mode 100644
index e6cad639fc..0000000000
--- a/variants/STM32H7xx/H735VGT/boards_entry.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-# This file help to add generic board entry.
-# upload.maximum_size and product_line have to be verified
-# and changed if needed.
-# See: https://github.com/stm32duino/wiki/wiki/Add-a-new-variant-%28board%29
-
-# Generic H735VGTx
-GenH7.menu.pnum.GENERIC_H735VGTX=Generic H735VGTx
-GenH7.menu.pnum.GENERIC_H735VGTX.upload.maximum_size=1048576
-GenH7.menu.pnum.GENERIC_H735VGTX.upload.maximum_data_size=1048576
-GenH7.menu.pnum.GENERIC_H735VGTX.build.board=GENERIC_H735VGTX
-GenH7.menu.pnum.GENERIC_H735VGTX.build.product_line=STM32H735xx
-GenH7.menu.pnum.GENERIC_H735VGTX.build.variant=STM32H7xx/H735VGT
-
diff --git a/variants/STM32H7xx/H735VGT/generic_clock.c b/variants/STM32H7xx/H735VGT/generic_clock.c
deleted file mode 100644
index a95dba8cd9..0000000000
--- a/variants/STM32H7xx/H735VGT/generic_clock.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
- * All rights reserved.
- *
- * This software component is licensed by ST under BSD 3-Clause license,
- * the "License"; You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *                        opensource.org/licenses/BSD-3-Clause
- *
- *******************************************************************************
- */
-#if defined(ARDUINO_GENERIC_H735VGTX)
-#include "pins_arduino.h"
-
-/**
-  * @brief  System Clock Configuration
-  * @param  None
-  * @retval None
-  */
-WEAK void SystemClock_Config(void)
-{
-  /* SystemClock_Config can be generated by STM32CubeMX */
-#warning "SystemClock_Config() is empty. Default clock at reset is used."
-}
-
-#endif /* ARDUINO_GENERIC_* */
diff --git a/variants/STM32H7xx/H735VGT/variant_generic.cpp b/variants/STM32H7xx/H735VGT/variant_generic.cpp
deleted file mode 100644
index 2d268191d4..0000000000
--- a/variants/STM32H7xx/H735VGT/variant_generic.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
- * All rights reserved.
- *
- * This software component is licensed by ST under BSD 3-Clause license,
- * the "License"; You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *                        opensource.org/licenses/BSD-3-Clause
- *
- *******************************************************************************
- */
-#if defined(ARDUINO_GENERIC_H735VGTX)
-#include "pins_arduino.h"
-
-// Digital PinName array
-const PinName digitalPin[] = {
-  PA_0,   // D0/A0
-  PA_1,   // D1/A1
-  PA_2,   // D2/A2
-  PA_3,   // D3/A3
-  PA_4,   // D4/A4
-  PA_5,   // D5/A5
-  PA_6,   // D6/A6
-  PA_7,   // D7/A7
-  PA_8,   // D8
-  PA_9,   // D9
-  PA_10,  // D10
-  PA_11,  // D11
-  PA_12,  // D12
-  PA_13,  // D13
-  PA_14,  // D14
-  PA_15,  // D15
-  PB_0,   // D16/A8
-  PB_1,   // D17/A9
-  PB_2,   // D18
-  PB_3,   // D19
-  PB_4,   // D20
-  PB_5,   // D21
-  PB_6,   // D22
-  PB_7,   // D23
-  PB_8,   // D24
-  PB_9,   // D25
-  PB_10,  // D26
-  PB_11,  // D27
-  PB_12,  // D28
-  PB_13,  // D29
-  PB_14,  // D30
-  PB_15,  // D31
-  PC_0,   // D32/A10
-  PC_1,   // D33/A11
-  PC_4,   // D34/A12
-  PC_5,   // D35/A13
-  PC_6,   // D36
-  PC_7,   // D37
-  PC_8,   // D38
-  PC_9,   // D39
-  PC_10,  // D40
-  PC_11,  // D41
-  PC_12,  // D42
-  PC_13,  // D43
-  PC_14,  // D44
-  PC_15,  // D45
-  PD_0,   // D46
-  PD_1,   // D47
-  PD_2,   // D48
-  PD_3,   // D49
-  PD_4,   // D50
-  PD_5,   // D51
-  PD_8,   // D52
-  PD_9,   // D53
-  PD_10,  // D54
-  PD_11,  // D55
-  PD_12,  // D56
-  PD_13,  // D57
-  PD_14,  // D58
-  PD_15,  // D59
-  PE_2,   // D60
-  PE_4,   // D61
-  PE_5,   // D62
-  PE_7,   // D63
-  PE_8,   // D64
-  PH_0,   // D65
-  PH_1,   // D66
-  PC_2_C, // D67/A14
-  PC_3_C  // D68/A15
-};
-
-// Analog (Ax) pin number array
-const uint32_t analogInputPin[] = {
-  0,  // A0,  PA0
-  1,  // A1,  PA1
-  2,  // A2,  PA2
-  3,  // A3,  PA3
-  4,  // A4,  PA4
-  5,  // A5,  PA5
-  6,  // A6,  PA6
-  7,  // A7,  PA7
-  16, // A8,  PB0
-  17, // A9,  PB1
-  32, // A10, PC0
-  33, // A11, PC1
-  34, // A12, PC4
-  35, // A13, PC5
-  67, // A14, PC2_C
-  68  // A15, PC3_C
-};
-
-#endif /* ARDUINO_GENERIC_* */
diff --git a/variants/STM32H7xx/H735VGT/variant_generic.h b/variants/STM32H7xx/H735VGT/variant_generic.h
deleted file mode 100644
index c3b7057194..0000000000
--- a/variants/STM32H7xx/H735VGT/variant_generic.h
+++ /dev/null
@@ -1,254 +0,0 @@
-/*
- *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
- * All rights reserved.
- *
- * This software component is licensed by ST under BSD 3-Clause license,
- * the "License"; You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *                        opensource.org/licenses/BSD-3-Clause
- *
- *******************************************************************************
- */
-#pragma once
-
-/*----------------------------------------------------------------------------
- *        STM32 pins number
- *----------------------------------------------------------------------------*/
-#define PA0                     PIN_A0
-#define PA1                     PIN_A1
-#define PA2                     PIN_A2
-#define PA3                     PIN_A3
-#define PA4                     PIN_A4
-#define PA5                     PIN_A5
-#define PA6                     PIN_A6
-#define PA7                     PIN_A7
-#define PA8                     8
-#define PA9                     9
-#define PA10                    10
-#define PA11                    11
-#define PA12                    12
-#define PA13                    13
-#define PA14                    14
-#define PA15                    15
-#define PB0                     PIN_A8
-#define PB1                     PIN_A9
-#define PB2                     18
-#define PB3                     19
-#define PB4                     20
-#define PB5                     21
-#define PB6                     22
-#define PB7                     23
-#define PB8                     24
-#define PB9                     25
-#define PB10                    26
-#define PB11                    27
-#define PB12                    28
-#define PB13                    29
-#define PB14                    30
-#define PB15                    31
-#define PC0                     PIN_A10
-#define PC1                     PIN_A11
-#define PC4                     PIN_A12
-#define PC5                     PIN_A13
-#define PC6                     36
-#define PC7                     37
-#define PC8                     38
-#define PC9                     39
-#define PC10                    40
-#define PC11                    41
-#define PC12                    42
-#define PC13                    43
-#define PC14                    44
-#define PC15                    45
-#define PD0                     46
-#define PD1                     47
-#define PD2                     48
-#define PD3                     49
-#define PD4                     50
-#define PD5                     51
-#define PD8                     52
-#define PD9                     53
-#define PD10                    54
-#define PD11                    55
-#define PD12                    56
-#define PD13                    57
-#define PD14                    58
-#define PD15                    59
-#define PE2                     60
-#define PE4                     61
-#define PE5                     62
-#define PE7                     63
-#define PE8                     64
-#define PH0                     65
-#define PH1                     66
-#define PC2_C                   PIN_A14
-#define PC3_C                   PIN_A15
-
-// Alternate pins number
-#define PA0_ALT1                (PA0  | ALT1)
-#define PA1_ALT1                (PA1  | ALT1)
-#define PA1_ALT2                (PA1  | ALT2)
-#define PA2_ALT1                (PA2  | ALT1)
-#define PA2_ALT2                (PA2  | ALT2)
-#define PA3_ALT1                (PA3  | ALT1)
-#define PA3_ALT2                (PA3  | ALT2)
-#define PA4_ALT1                (PA4  | ALT1)
-#define PA4_ALT2                (PA4  | ALT2)
-#define PA5_ALT1                (PA5  | ALT1)
-#define PA6_ALT1                (PA6  | ALT1)
-#define PA7_ALT1                (PA7  | ALT1)
-#define PA7_ALT2                (PA7  | ALT2)
-#define PA7_ALT3                (PA7  | ALT3)
-#define PA8_ALT1                (PA8  | ALT1)
-#define PA9_ALT1                (PA9  | ALT1)
-#define PA10_ALT1               (PA10 | ALT1)
-#define PA11_ALT1               (PA11 | ALT1)
-#define PA12_ALT1               (PA12 | ALT1)
-#define PA15_ALT1               (PA15 | ALT1)
-#define PA15_ALT2               (PA15 | ALT2)
-#define PB0_ALT1                (PB0  | ALT1)
-#define PB0_ALT2                (PB0  | ALT2)
-#define PB1_ALT1                (PB1  | ALT1)
-#define PB1_ALT2                (PB1  | ALT2)
-#define PB3_ALT1                (PB3  | ALT1)
-#define PB3_ALT2                (PB3  | ALT2)
-#define PB4_ALT1                (PB4  | ALT1)
-#define PB4_ALT2                (PB4  | ALT2)
-#define PB5_ALT1                (PB5  | ALT1)
-#define PB5_ALT2                (PB5  | ALT2)
-#define PB6_ALT1                (PB6  | ALT1)
-#define PB6_ALT2                (PB6  | ALT2)
-#define PB7_ALT1                (PB7  | ALT1)
-#define PB8_ALT1                (PB8  | ALT1)
-#define PB8_ALT2                (PB8  | ALT2)
-#define PB9_ALT1                (PB9  | ALT1)
-#define PB9_ALT2                (PB9  | ALT2)
-#define PB14_ALT1               (PB14 | ALT1)
-#define PB14_ALT2               (PB14 | ALT2)
-#define PB15_ALT1               (PB15 | ALT1)
-#define PB15_ALT2               (PB15 | ALT2)
-#define PC0_ALT1                (PC0  | ALT1)
-#define PC0_ALT2                (PC0  | ALT2)
-#define PC1_ALT1                (PC1  | ALT1)
-#define PC1_ALT2                (PC1  | ALT2)
-#define PC4_ALT1                (PC4  | ALT1)
-#define PC5_ALT1                (PC5  | ALT1)
-#define PC6_ALT1                (PC6  | ALT1)
-#define PC6_ALT2                (PC6  | ALT2)
-#define PC7_ALT1                (PC7  | ALT1)
-#define PC7_ALT2                (PC7  | ALT2)
-#define PC8_ALT1                (PC8  | ALT1)
-#define PC9_ALT1                (PC9  | ALT1)
-#define PC10_ALT1               (PC10 | ALT1)
-#define PC11_ALT1               (PC11 | ALT1)
-
-#define NUM_DIGITAL_PINS        69
-#define NUM_DUALPAD_PINS        2
-#define NUM_ANALOG_INPUTS       16
-
-// On-board LED pin number
-#ifndef LED_BUILTIN
-  #define LED_BUILTIN           PNUM_NOT_DEFINED
-#endif
-
-// On-board user button
-#ifndef USER_BTN
-  #define USER_BTN              PNUM_NOT_DEFINED
-#endif
-
-// SPI definitions
-#ifndef PIN_SPI_SS
-  #define PIN_SPI_SS            PA4
-#endif
-#ifndef PIN_SPI_SS1
-  #define PIN_SPI_SS1           PA15
-#endif
-#ifndef PIN_SPI_SS2
-  #define PIN_SPI_SS2           PNUM_NOT_DEFINED
-#endif
-#ifndef PIN_SPI_SS3
-  #define PIN_SPI_SS3           PNUM_NOT_DEFINED
-#endif
-#ifndef PIN_SPI_MOSI
-  #define PIN_SPI_MOSI          PA7
-#endif
-#ifndef PIN_SPI_MISO
-  #define PIN_SPI_MISO          PA6
-#endif
-#ifndef PIN_SPI_SCK
-  #define PIN_SPI_SCK           PA5
-#endif
-
-// I2C definitions
-#ifndef PIN_WIRE_SDA
-  #define PIN_WIRE_SDA          PB7
-#endif
-#ifndef PIN_WIRE_SCL
-  #define PIN_WIRE_SCL          PB6
-#endif
-
-// Timer Definitions
-// Use TIM6/TIM7 when possible as servo and tone don't need GPIO output pin
-#ifndef TIMER_TONE
-  #define TIMER_TONE            TIM6
-#endif
-#ifndef TIMER_SERVO
-  #define TIMER_SERVO           TIM7
-#endif
-
-// UART Definitions
-#ifndef SERIAL_UART_INSTANCE
-  #define SERIAL_UART_INSTANCE  4
-#endif
-
-// Default pin used for generic 'Serial' instance
-// Mandatory for Firmata
-#ifndef PIN_SERIAL_RX
-  #define PIN_SERIAL_RX         PA1
-#endif
-#ifndef PIN_SERIAL_TX
-  #define PIN_SERIAL_TX         PA0
-#endif
-
-// Extra HAL modules
-#if !defined(HAL_DAC_MODULE_DISABLED)
-  #define HAL_DAC_MODULE_ENABLED
-#endif
-#if !defined(HAL_ETH_MODULE_DISABLED)
-  #define HAL_ETH_MODULE_ENABLED
-#endif
-#if !defined(HAL_OSPI_MODULE_DISABLED)
-  #define HAL_OSPI_MODULE_ENABLED
-#endif
-#if !defined(HAL_SD_MODULE_DISABLED)
-  #define HAL_SD_MODULE_ENABLED
-#endif
-
-/*----------------------------------------------------------------------------
- *        Arduino objects - C++ only
- *----------------------------------------------------------------------------*/
-
-#ifdef __cplusplus
-  // These serial port names are intended to allow libraries and architecture-neutral
-  // sketches to automatically default to the correct port name for a particular type
-  // of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
-  // the first hardware serial port whose RX/TX pins are not dedicated to another use.
-  //
-  // SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
-  //
-  // SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
-  //
-  // SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
-  //
-  // SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
-  //
-  // SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
-  //                            pins are NOT connected to anything by default.
-  #ifndef SERIAL_PORT_MONITOR
-    #define SERIAL_PORT_MONITOR   Serial
-  #endif
-  #ifndef SERIAL_PORT_HARDWARE
-    #define SERIAL_PORT_HARDWARE  Serial
-  #endif
-#endif
diff --git a/variants/STM32H7xx/H742A(G-I)I_H743A(G-I)I_H753AII/PeripheralPins.c b/variants/STM32H7xx/H742A(G-I)I_H743A(G-I)I_H753AII/PeripheralPins.c
index 9d4bffb944..73573f4cad 100644
--- a/variants/STM32H7xx/H742A(G-I)I_H743A(G-I)I_H753AII/PeripheralPins.c
+++ b/variants/STM32H7xx/H742A(G-I)I_H743A(G-I)I_H753AII/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32H742A(G-I)Ix.xml, STM32H743A(G-I)Ix.xml
  * STM32H753AIIx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32H7xx/H742A(G-I)I_H743A(G-I)I_H753AII/variant_generic.cpp b/variants/STM32H7xx/H742A(G-I)I_H743A(G-I)I_H753AII/variant_generic.cpp
index cc670a0356..03267052ff 100644
--- a/variants/STM32H7xx/H742A(G-I)I_H743A(G-I)I_H753AII/variant_generic.cpp
+++ b/variants/STM32H7xx/H742A(G-I)I_H743A(G-I)I_H753AII/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H742A(G-I)I_H743A(G-I)I_H753AII/variant_generic.h b/variants/STM32H7xx/H742A(G-I)I_H743A(G-I)I_H753AII/variant_generic.h
index 6e1fd0577c..51e97a3894 100644
--- a/variants/STM32H7xx/H742A(G-I)I_H743A(G-I)I_H753AII/variant_generic.h
+++ b/variants/STM32H7xx/H742A(G-I)I_H743A(G-I)I_H753AII/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H742B(G-I)T_H743B(G-I)T_H753BIT/PeripheralPins.c b/variants/STM32H7xx/H742B(G-I)T_H743B(G-I)T_H753BIT/PeripheralPins.c
index 9c1b3875af..c75d6e10d9 100644
--- a/variants/STM32H7xx/H742B(G-I)T_H743B(G-I)T_H753BIT/PeripheralPins.c
+++ b/variants/STM32H7xx/H742B(G-I)T_H743B(G-I)T_H753BIT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -15,7 +15,7 @@
  * STM32H743BITx.xml, STM32H745BGTx.xml
  * STM32H745BITx.xml, STM32H753BITx.xml
  * STM32H755BITx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32H7xx/H742B(G-I)T_H743B(G-I)T_H753BIT/variant_generic.cpp b/variants/STM32H7xx/H742B(G-I)T_H743B(G-I)T_H753BIT/variant_generic.cpp
index b9444564d3..7c5c3a45f8 100644
--- a/variants/STM32H7xx/H742B(G-I)T_H743B(G-I)T_H753BIT/variant_generic.cpp
+++ b/variants/STM32H7xx/H742B(G-I)T_H743B(G-I)T_H753BIT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H742B(G-I)T_H743B(G-I)T_H753BIT/variant_generic.h b/variants/STM32H7xx/H742B(G-I)T_H743B(G-I)T_H753BIT/variant_generic.h
index 91cc95bd6e..073fd36545 100644
--- a/variants/STM32H7xx/H742B(G-I)T_H743B(G-I)T_H753BIT/variant_generic.h
+++ b/variants/STM32H7xx/H742B(G-I)T_H743B(G-I)T_H753BIT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)/PeripheralPins.c b/variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)/PeripheralPins.c
index 5416fcd3fd..1bf71982f1 100644
--- a/variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)/PeripheralPins.c
+++ b/variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -18,7 +18,7 @@
  * STM32H750IBKx.xml, STM32H750IBTx.xml
  * STM32H753IIKx.xml, STM32H753IITx.xml
  * STM32H757BITx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)/variant_generic.cpp b/variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)/variant_generic.cpp
index c05287f8d2..d815ac1b22 100644
--- a/variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)/variant_generic.cpp
+++ b/variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)/variant_generic.h b/variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)/variant_generic.h
index 59324f2d9f..06365645c3 100644
--- a/variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)/variant_generic.h
+++ b/variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H742V(G-I)(H-T)_H743V(G-I)(H-T)_H750VBT_H753VI(H-T)/PeripheralPins.c b/variants/STM32H7xx/H742V(G-I)(H-T)_H743V(G-I)(H-T)_H750VBT_H753VI(H-T)/PeripheralPins.c
index dc6a541158..4da7c36692 100644
--- a/variants/STM32H7xx/H742V(G-I)(H-T)_H743V(G-I)(H-T)_H750VBT_H753VI(H-T)/PeripheralPins.c
+++ b/variants/STM32H7xx/H742V(G-I)(H-T)_H743V(G-I)(H-T)_H750VBT_H753VI(H-T)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -15,7 +15,7 @@
  * STM32H743V(G-I)Hx.xml, STM32H743VGTx.xml
  * STM32H743VITx.xml, STM32H750VBTx.xml
  * STM32H753VIHx.xml, STM32H753VITx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32H7xx/H742V(G-I)(H-T)_H743V(G-I)(H-T)_H750VBT_H753VI(H-T)/variant_generic.cpp b/variants/STM32H7xx/H742V(G-I)(H-T)_H743V(G-I)(H-T)_H750VBT_H753VI(H-T)/variant_generic.cpp
index 9f9225cad0..3f56411182 100644
--- a/variants/STM32H7xx/H742V(G-I)(H-T)_H743V(G-I)(H-T)_H750VBT_H753VI(H-T)/variant_generic.cpp
+++ b/variants/STM32H7xx/H742V(G-I)(H-T)_H743V(G-I)(H-T)_H750VBT_H753VI(H-T)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H742V(G-I)(H-T)_H743V(G-I)(H-T)_H750VBT_H753VI(H-T)/variant_generic.h b/variants/STM32H7xx/H742V(G-I)(H-T)_H743V(G-I)(H-T)_H750VBT_H753VI(H-T)/variant_generic.h
index d0d17d7f1c..1747b5c69f 100644
--- a/variants/STM32H7xx/H742V(G-I)(H-T)_H743V(G-I)(H-T)_H750VBT_H753VI(H-T)/variant_generic.h
+++ b/variants/STM32H7xx/H742V(G-I)(H-T)_H743V(G-I)(H-T)_H750VBT_H753VI(H-T)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H742X(G-I)H_H743X(G-I)H_H745X(G-I)H_H747X(G-I)H_H750XBH_H753XIH_H755XIH_H757XIH/PeripheralPins.c b/variants/STM32H7xx/H742X(G-I)H_H743X(G-I)H_H745X(G-I)H_H747X(G-I)H_H750XBH_H753XIH_H755XIH_H757XIH/PeripheralPins.c
index 6328424cba..852bba06df 100644
--- a/variants/STM32H7xx/H742X(G-I)H_H743X(G-I)H_H745X(G-I)H_H747X(G-I)H_H750XBH_H753XIH_H755XIH_H757XIH/PeripheralPins.c
+++ b/variants/STM32H7xx/H742X(G-I)H_H743X(G-I)H_H745X(G-I)H_H747X(G-I)H_H750XBH_H753XIH_H755XIH_H757XIH/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -17,7 +17,7 @@
  * STM32H747XIHx.xml, STM32H750XBHx.xml
  * STM32H753XIHx.xml, STM32H755XIHx.xml
  * STM32H757XIHx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32H7xx/H742X(G-I)H_H743X(G-I)H_H745X(G-I)H_H747X(G-I)H_H750XBH_H753XIH_H755XIH_H757XIH/boards_entry.txt b/variants/STM32H7xx/H742X(G-I)H_H743X(G-I)H_H745X(G-I)H_H747X(G-I)H_H750XBH_H753XIH_H755XIH_H757XIH/boards_entry.txt
index d9499924be..0d67e5c2a2 100644
--- a/variants/STM32H7xx/H742X(G-I)H_H743X(G-I)H_H745X(G-I)H_H747X(G-I)H_H750XBH_H753XIH_H755XIH_H757XIH/boards_entry.txt
+++ b/variants/STM32H7xx/H742X(G-I)H_H743X(G-I)H_H745X(G-I)H_H747X(G-I)H_H750XBH_H753XIH_H755XIH_H757XIH/boards_entry.txt
@@ -40,7 +40,7 @@ GenH7.menu.pnum.GENERIC_H745XGHX=Generic H745XGHx
 GenH7.menu.pnum.GENERIC_H745XGHX.upload.maximum_size=1048576
 GenH7.menu.pnum.GENERIC_H745XGHX.upload.maximum_data_size=884736
 GenH7.menu.pnum.GENERIC_H745XGHX.build.board=GENERIC_H745XGHX
-GenH7.menu.pnum.GENERIC_H745XGHX.build.product_line=STM32H745xx
+GenH7.menu.pnum.GENERIC_H745XGHX.build.product_line=STM32H745xG
 GenH7.menu.pnum.GENERIC_H745XGHX.build.variant=STM32H7xx/H742X(G-I)H_H743X(G-I)H_H745X(G-I)H_H747X(G-I)H_H750XBH_H753XIH_H755XIH_H757XIH
 
 # Generic H745XIHx
@@ -56,7 +56,7 @@ GenH7.menu.pnum.GENERIC_H747XGHX=Generic H747XGHx
 GenH7.menu.pnum.GENERIC_H747XGHX.upload.maximum_size=1048576
 GenH7.menu.pnum.GENERIC_H747XGHX.upload.maximum_data_size=884736
 GenH7.menu.pnum.GENERIC_H747XGHX.build.board=GENERIC_H747XGHX
-GenH7.menu.pnum.GENERIC_H747XGHX.build.product_line=STM32H747xx
+GenH7.menu.pnum.GENERIC_H747XGHX.build.product_line=STM32H747xG
 GenH7.menu.pnum.GENERIC_H747XGHX.build.variant=STM32H7xx/H742X(G-I)H_H743X(G-I)H_H745X(G-I)H_H747X(G-I)H_H750XBH_H753XIH_H755XIH_H757XIH
 
 # Generic H747XIHx
diff --git a/variants/STM32H7xx/H742X(G-I)H_H743X(G-I)H_H745X(G-I)H_H747X(G-I)H_H750XBH_H753XIH_H755XIH_H757XIH/variant_generic.cpp b/variants/STM32H7xx/H742X(G-I)H_H743X(G-I)H_H745X(G-I)H_H747X(G-I)H_H750XBH_H753XIH_H755XIH_H757XIH/variant_generic.cpp
index b9bd7efd7f..76fb4b88a6 100644
--- a/variants/STM32H7xx/H742X(G-I)H_H743X(G-I)H_H745X(G-I)H_H747X(G-I)H_H750XBH_H753XIH_H755XIH_H757XIH/variant_generic.cpp
+++ b/variants/STM32H7xx/H742X(G-I)H_H743X(G-I)H_H745X(G-I)H_H747X(G-I)H_H750XBH_H753XIH_H755XIH_H757XIH/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H742X(G-I)H_H743X(G-I)H_H745X(G-I)H_H747X(G-I)H_H750XBH_H753XIH_H755XIH_H757XIH/variant_generic.h b/variants/STM32H7xx/H742X(G-I)H_H743X(G-I)H_H745X(G-I)H_H747X(G-I)H_H750XBH_H753XIH_H755XIH_H757XIH/variant_generic.h
index 47e91218b3..aee4abc4f7 100644
--- a/variants/STM32H7xx/H742X(G-I)H_H743X(G-I)H_H745X(G-I)H_H747X(G-I)H_H750XBH_H753XIH_H755XIH_H757XIH/variant_generic.h
+++ b/variants/STM32H7xx/H742X(G-I)H_H743X(G-I)H_H745X(G-I)H_H747X(G-I)H_H750XBH_H753XIH_H755XIH_H757XIH/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H742Z(G-I)T_H743Z(G-I)T_H747A(G-I)I_H747I(G-I)T_H750ZBT_H753ZIT_H757AII_H757IIT/PeripheralPins.c b/variants/STM32H7xx/H742Z(G-I)T_H743Z(G-I)T_H747A(G-I)I_H747I(G-I)T_H750ZBT_H753ZIT_H757AII_H757IIT/PeripheralPins.c
index b2c1e2a069..677fe8f4fe 100644
--- a/variants/STM32H7xx/H742Z(G-I)T_H743Z(G-I)T_H747A(G-I)I_H747I(G-I)T_H750ZBT_H753ZIT_H757AII_H757IIT/PeripheralPins.c
+++ b/variants/STM32H7xx/H742Z(G-I)T_H743Z(G-I)T_H747A(G-I)I_H747I(G-I)T_H750ZBT_H753ZIT_H757AII_H757IIT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -16,7 +16,7 @@
  * STM32H747IGTx.xml, STM32H747IITx.xml
  * STM32H750ZBTx.xml, STM32H753ZITx.xml
  * STM32H757AIIx.xml, STM32H757IITx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32H7xx/H742Z(G-I)T_H743Z(G-I)T_H747A(G-I)I_H747I(G-I)T_H750ZBT_H753ZIT_H757AII_H757IIT/boards_entry.txt b/variants/STM32H7xx/H742Z(G-I)T_H743Z(G-I)T_H747A(G-I)I_H747I(G-I)T_H750ZBT_H753ZIT_H757AII_H757IIT/boards_entry.txt
index dd90d27666..532d06567e 100644
--- a/variants/STM32H7xx/H742Z(G-I)T_H743Z(G-I)T_H747A(G-I)I_H747I(G-I)T_H750ZBT_H753ZIT_H757AII_H757IIT/boards_entry.txt
+++ b/variants/STM32H7xx/H742Z(G-I)T_H743Z(G-I)T_H747A(G-I)I_H747I(G-I)T_H750ZBT_H753ZIT_H757AII_H757IIT/boards_entry.txt
@@ -56,7 +56,7 @@ GenH7.menu.pnum.GENERIC_H747IGTX=Generic H747IGTx
 GenH7.menu.pnum.GENERIC_H747IGTX.upload.maximum_size=1048576
 GenH7.menu.pnum.GENERIC_H747IGTX.upload.maximum_data_size=884736
 GenH7.menu.pnum.GENERIC_H747IGTX.build.board=GENERIC_H747IGTX
-GenH7.menu.pnum.GENERIC_H747IGTX.build.product_line=STM32H747xx
+GenH7.menu.pnum.GENERIC_H747IGTX.build.product_line=STM32H747xG
 GenH7.menu.pnum.GENERIC_H747IGTX.build.variant=STM32H7xx/H742Z(G-I)T_H743Z(G-I)T_H747A(G-I)I_H747I(G-I)T_H750ZBT_H753ZIT_H757AII_H757IIT
 
 # Generic H747IITx
diff --git a/variants/STM32H7xx/H742Z(G-I)T_H743Z(G-I)T_H747A(G-I)I_H747I(G-I)T_H750ZBT_H753ZIT_H757AII_H757IIT/variant_generic.cpp b/variants/STM32H7xx/H742Z(G-I)T_H743Z(G-I)T_H747A(G-I)I_H747I(G-I)T_H750ZBT_H753ZIT_H757AII_H757IIT/variant_generic.cpp
index 2e4e96e958..1432440def 100644
--- a/variants/STM32H7xx/H742Z(G-I)T_H743Z(G-I)T_H747A(G-I)I_H747I(G-I)T_H750ZBT_H753ZIT_H757AII_H757IIT/variant_generic.cpp
+++ b/variants/STM32H7xx/H742Z(G-I)T_H743Z(G-I)T_H747A(G-I)I_H747I(G-I)T_H750ZBT_H753ZIT_H757AII_H757IIT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H742Z(G-I)T_H743Z(G-I)T_H747A(G-I)I_H747I(G-I)T_H750ZBT_H753ZIT_H757AII_H757IIT/variant_generic.h b/variants/STM32H7xx/H742Z(G-I)T_H743Z(G-I)T_H747A(G-I)I_H747I(G-I)T_H750ZBT_H753ZIT_H757AII_H757IIT/variant_generic.h
index 8ca52b1496..b903988d00 100644
--- a/variants/STM32H7xx/H742Z(G-I)T_H743Z(G-I)T_H747A(G-I)I_H747I(G-I)T_H750ZBT_H753ZIT_H757AII_H757IIT/variant_generic.h
+++ b/variants/STM32H7xx/H742Z(G-I)T_H743Z(G-I)T_H747A(G-I)I_H747I(G-I)T_H750ZBT_H753ZIT_H757AII_H757IIT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H745B(G-I)T_H755BIT/PeripheralPins.c b/variants/STM32H7xx/H745B(G-I)T_H755BIT/PeripheralPins.c
index 3bc79e34ff..f4937d087e 100644
--- a/variants/STM32H7xx/H745B(G-I)T_H755BIT/PeripheralPins.c
+++ b/variants/STM32H7xx/H745B(G-I)T_H755BIT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32H745BGTx.xml, STM32H745BITx.xml
  * STM32H755BITx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32H7xx/H745B(G-I)T_H755BIT/boards_entry.txt b/variants/STM32H7xx/H745B(G-I)T_H755BIT/boards_entry.txt
index c65ca13da7..c07e83565b 100644
--- a/variants/STM32H7xx/H745B(G-I)T_H755BIT/boards_entry.txt
+++ b/variants/STM32H7xx/H745B(G-I)T_H755BIT/boards_entry.txt
@@ -8,7 +8,7 @@ GenH7.menu.pnum.GENERIC_H745BGTX=Generic H745BGTx
 GenH7.menu.pnum.GENERIC_H745BGTX.upload.maximum_size=1048576
 GenH7.menu.pnum.GENERIC_H745BGTX.upload.maximum_data_size=884736
 GenH7.menu.pnum.GENERIC_H745BGTX.build.board=GENERIC_H745BGTX
-GenH7.menu.pnum.GENERIC_H745BGTX.build.product_line=STM32H745xx
+GenH7.menu.pnum.GENERIC_H745BGTX.build.product_line=STM32H745xG
 GenH7.menu.pnum.GENERIC_H745BGTX.build.variant=STM32H7xx/H745B(G-I)T_H755BIT
 
 # Generic H745BITx
diff --git a/variants/STM32H7xx/H745B(G-I)T_H755BIT/variant_generic.cpp b/variants/STM32H7xx/H745B(G-I)T_H755BIT/variant_generic.cpp
index 4c0ca65ffe..59fe05815e 100644
--- a/variants/STM32H7xx/H745B(G-I)T_H755BIT/variant_generic.cpp
+++ b/variants/STM32H7xx/H745B(G-I)T_H755BIT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H745B(G-I)T_H755BIT/variant_generic.h b/variants/STM32H7xx/H745B(G-I)T_H755BIT/variant_generic.h
index 6cdeffc82a..ccee47ed41 100644
--- a/variants/STM32H7xx/H745B(G-I)T_H755BIT/variant_generic.h
+++ b/variants/STM32H7xx/H745B(G-I)T_H755BIT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H745I(G-I)K_H755IIK/PeripheralPins.c b/variants/STM32H7xx/H745I(G-I)K_H755IIK/PeripheralPins.c
index 96c93d171e..cff712cb1a 100644
--- a/variants/STM32H7xx/H745I(G-I)K_H755IIK/PeripheralPins.c
+++ b/variants/STM32H7xx/H745I(G-I)K_H755IIK/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32H745IGKx.xml, STM32H745IIKx.xml
  * STM32H755IIKx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32H7xx/H745I(G-I)K_H755IIK/boards_entry.txt b/variants/STM32H7xx/H745I(G-I)K_H755IIK/boards_entry.txt
index 78d7e91ec6..5063c86a15 100644
--- a/variants/STM32H7xx/H745I(G-I)K_H755IIK/boards_entry.txt
+++ b/variants/STM32H7xx/H745I(G-I)K_H755IIK/boards_entry.txt
@@ -8,7 +8,7 @@ GenH7.menu.pnum.GENERIC_H745IGKX=Generic H745IGKx
 GenH7.menu.pnum.GENERIC_H745IGKX.upload.maximum_size=1048576
 GenH7.menu.pnum.GENERIC_H745IGKX.upload.maximum_data_size=884736
 GenH7.menu.pnum.GENERIC_H745IGKX.build.board=GENERIC_H745IGKX
-GenH7.menu.pnum.GENERIC_H745IGKX.build.product_line=STM32H745xx
+GenH7.menu.pnum.GENERIC_H745IGKX.build.product_line=STM32H745xG
 GenH7.menu.pnum.GENERIC_H745IGKX.build.variant=STM32H7xx/H745I(G-I)K_H755IIK
 
 # Generic H745IIKx
diff --git a/variants/STM32H7xx/H745I(G-I)K_H755IIK/variant_generic.cpp b/variants/STM32H7xx/H745I(G-I)K_H755IIK/variant_generic.cpp
index 62fd074dee..97a96a4a8c 100644
--- a/variants/STM32H7xx/H745I(G-I)K_H755IIK/variant_generic.cpp
+++ b/variants/STM32H7xx/H745I(G-I)K_H755IIK/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H745I(G-I)K_H755IIK/variant_generic.h b/variants/STM32H7xx/H745I(G-I)K_H755IIK/variant_generic.h
index 4cc26a856a..cae7a35f93 100644
--- a/variants/STM32H7xx/H745I(G-I)K_H755IIK/variant_generic.h
+++ b/variants/STM32H7xx/H745I(G-I)K_H755IIK/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H745I(G-I)T_H755IIT/PeripheralPins.c b/variants/STM32H7xx/H745I(G-I)T_H755IIT/PeripheralPins.c
index 8b9361b408..1734c07a28 100644
--- a/variants/STM32H7xx/H745I(G-I)T_H755IIT/PeripheralPins.c
+++ b/variants/STM32H7xx/H745I(G-I)T_H755IIT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32H745IGTx.xml, STM32H745IITx.xml
  * STM32H755IITx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32H7xx/H745I(G-I)T_H755IIT/boards_entry.txt b/variants/STM32H7xx/H745I(G-I)T_H755IIT/boards_entry.txt
index 975ab6ebd6..20d5754321 100644
--- a/variants/STM32H7xx/H745I(G-I)T_H755IIT/boards_entry.txt
+++ b/variants/STM32H7xx/H745I(G-I)T_H755IIT/boards_entry.txt
@@ -8,7 +8,7 @@ GenH7.menu.pnum.GENERIC_H745IGTX=Generic H745IGTx
 GenH7.menu.pnum.GENERIC_H745IGTX.upload.maximum_size=1048576
 GenH7.menu.pnum.GENERIC_H745IGTX.upload.maximum_data_size=884736
 GenH7.menu.pnum.GENERIC_H745IGTX.build.board=GENERIC_H745IGTX
-GenH7.menu.pnum.GENERIC_H745IGTX.build.product_line=STM32H745xx
+GenH7.menu.pnum.GENERIC_H745IGTX.build.product_line=STM32H745xG
 GenH7.menu.pnum.GENERIC_H745IGTX.build.variant=STM32H7xx/H745I(G-I)T_H755IIT
 
 # Generic H745IITx
diff --git a/variants/STM32H7xx/H745I(G-I)T_H755IIT/variant_generic.cpp b/variants/STM32H7xx/H745I(G-I)T_H755IIT/variant_generic.cpp
index 173df49f78..27306a3cf3 100644
--- a/variants/STM32H7xx/H745I(G-I)T_H755IIT/variant_generic.cpp
+++ b/variants/STM32H7xx/H745I(G-I)T_H755IIT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H745I(G-I)T_H755IIT/variant_generic.h b/variants/STM32H7xx/H745I(G-I)T_H755IIT/variant_generic.h
index 36aabd6630..a415844630 100644
--- a/variants/STM32H7xx/H745I(G-I)T_H755IIT/variant_generic.h
+++ b/variants/STM32H7xx/H745I(G-I)T_H755IIT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H745Z(G-I)T_H755ZIT/PeripheralPins.c b/variants/STM32H7xx/H745Z(G-I)T_H755ZIT/PeripheralPins.c
index 1058377475..a69760e3c6 100644
--- a/variants/STM32H7xx/H745Z(G-I)T_H755ZIT/PeripheralPins.c
+++ b/variants/STM32H7xx/H745Z(G-I)T_H755ZIT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32H745ZGTx.xml, STM32H745ZITx.xml
  * STM32H755ZITx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32H7xx/H745Z(G-I)T_H755ZIT/boards_entry.txt b/variants/STM32H7xx/H745Z(G-I)T_H755ZIT/boards_entry.txt
index f53f5b188a..693bde19d6 100644
--- a/variants/STM32H7xx/H745Z(G-I)T_H755ZIT/boards_entry.txt
+++ b/variants/STM32H7xx/H745Z(G-I)T_H755ZIT/boards_entry.txt
@@ -8,7 +8,7 @@ GenH7.menu.pnum.GENERIC_H745ZGTX=Generic H745ZGTx
 GenH7.menu.pnum.GENERIC_H745ZGTX.upload.maximum_size=1048576
 GenH7.menu.pnum.GENERIC_H745ZGTX.upload.maximum_data_size=884736
 GenH7.menu.pnum.GENERIC_H745ZGTX.build.board=GENERIC_H745ZGTX
-GenH7.menu.pnum.GENERIC_H745ZGTX.build.product_line=STM32H745xx
+GenH7.menu.pnum.GENERIC_H745ZGTX.build.product_line=STM32H745xG
 GenH7.menu.pnum.GENERIC_H745ZGTX.build.variant=STM32H7xx/H745Z(G-I)T_H755ZIT
 
 # Generic H745ZITx
diff --git a/variants/STM32H7xx/H745Z(G-I)T_H755ZIT/variant_generic.cpp b/variants/STM32H7xx/H745Z(G-I)T_H755ZIT/variant_generic.cpp
index 61a6a47f6b..8d36a2517c 100644
--- a/variants/STM32H7xx/H745Z(G-I)T_H755ZIT/variant_generic.cpp
+++ b/variants/STM32H7xx/H745Z(G-I)T_H755ZIT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H745Z(G-I)T_H755ZIT/variant_generic.h b/variants/STM32H7xx/H745Z(G-I)T_H755ZIT/variant_generic.h
index 6e409acaff..58c636e5e7 100644
--- a/variants/STM32H7xx/H745Z(G-I)T_H755ZIT/variant_generic.h
+++ b/variants/STM32H7xx/H745Z(G-I)T_H755ZIT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H747B(G-I)T_H757BIT/PeripheralPins.c b/variants/STM32H7xx/H747B(G-I)T_H757BIT/PeripheralPins.c
index ef0d0f37ea..dfb0a4973a 100644
--- a/variants/STM32H7xx/H747B(G-I)T_H757BIT/PeripheralPins.c
+++ b/variants/STM32H7xx/H747B(G-I)T_H757BIT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32H747BGTx.xml, STM32H747BITx.xml
  * STM32H757BITx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32H7xx/H747B(G-I)T_H757BIT/boards_entry.txt b/variants/STM32H7xx/H747B(G-I)T_H757BIT/boards_entry.txt
index e3760d54e9..8b9d7c8e00 100644
--- a/variants/STM32H7xx/H747B(G-I)T_H757BIT/boards_entry.txt
+++ b/variants/STM32H7xx/H747B(G-I)T_H757BIT/boards_entry.txt
@@ -8,7 +8,7 @@ GenH7.menu.pnum.GENERIC_H747BGTX=Generic H747BGTx
 GenH7.menu.pnum.GENERIC_H747BGTX.upload.maximum_size=1048576
 GenH7.menu.pnum.GENERIC_H747BGTX.upload.maximum_data_size=884736
 GenH7.menu.pnum.GENERIC_H747BGTX.build.board=GENERIC_H747BGTX
-GenH7.menu.pnum.GENERIC_H747BGTX.build.product_line=STM32H747xx
+GenH7.menu.pnum.GENERIC_H747BGTX.build.product_line=STM32H747xG
 GenH7.menu.pnum.GENERIC_H747BGTX.build.variant=STM32H7xx/H747B(G-I)T_H757BIT
 
 # Generic H747BITx
diff --git a/variants/STM32H7xx/H747B(G-I)T_H757BIT/variant_generic.cpp b/variants/STM32H7xx/H747B(G-I)T_H757BIT/variant_generic.cpp
index a22bea4aa3..9cab4a0173 100644
--- a/variants/STM32H7xx/H747B(G-I)T_H757BIT/variant_generic.cpp
+++ b/variants/STM32H7xx/H747B(G-I)T_H757BIT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H747B(G-I)T_H757BIT/variant_generic.h b/variants/STM32H7xx/H747B(G-I)T_H757BIT/variant_generic.h
index 863cff5b0a..44ac33f829 100644
--- a/variants/STM32H7xx/H747B(G-I)T_H757BIT/variant_generic.h
+++ b/variants/STM32H7xx/H747B(G-I)T_H757BIT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H747ZIY_H757ZIY/PeripheralPins.c b/variants/STM32H7xx/H747ZIY_H757ZIY/PeripheralPins.c
index 01a33596db..8401a64dcf 100644
--- a/variants/STM32H7xx/H747ZIY_H757ZIY/PeripheralPins.c
+++ b/variants/STM32H7xx/H747ZIY_H757ZIY/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32H747ZIYx.xml, STM32H757ZIYx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32H7xx/H747ZIY_H757ZIY/variant_generic.cpp b/variants/STM32H7xx/H747ZIY_H757ZIY/variant_generic.cpp
index 0ed0a51b77..c2939f139c 100644
--- a/variants/STM32H7xx/H747ZIY_H757ZIY/variant_generic.cpp
+++ b/variants/STM32H7xx/H747ZIY_H757ZIY/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H747ZIY_H757ZIY/variant_generic.h b/variants/STM32H7xx/H747ZIY_H757ZIY/variant_generic.h
index b18589c2b6..80cdc0694c 100644
--- a/variants/STM32H7xx/H747ZIY_H757ZIY/variant_generic.h
+++ b/variants/STM32H7xx/H747ZIY_H757ZIY/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H7A3A(G-I)IxQ_H7B0ABIxQ_H7B3AIIxQ/PeripheralPins.c b/variants/STM32H7xx/H7A3A(G-I)IxQ_H7B0ABIxQ_H7B3AIIxQ/PeripheralPins.c
index cb12d7a700..39582dd788 100644
--- a/variants/STM32H7xx/H7A3A(G-I)IxQ_H7B0ABIxQ_H7B3AIIxQ/PeripheralPins.c
+++ b/variants/STM32H7xx/H7A3A(G-I)IxQ_H7B0ABIxQ_H7B3AIIxQ/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32H7A3A(G-I)IxQ.xml, STM32H7B0ABIxQ.xml
  * STM32H7B3AIIxQ.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32H7xx/H7A3A(G-I)IxQ_H7B0ABIxQ_H7B3AIIxQ/variant_generic.cpp b/variants/STM32H7xx/H7A3A(G-I)IxQ_H7B0ABIxQ_H7B3AIIxQ/variant_generic.cpp
index 4e698706d1..8230c9ed44 100644
--- a/variants/STM32H7xx/H7A3A(G-I)IxQ_H7B0ABIxQ_H7B3AIIxQ/variant_generic.cpp
+++ b/variants/STM32H7xx/H7A3A(G-I)IxQ_H7B0ABIxQ_H7B3AIIxQ/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H7A3A(G-I)IxQ_H7B0ABIxQ_H7B3AIIxQ/variant_generic.h b/variants/STM32H7xx/H7A3A(G-I)IxQ_H7B0ABIxQ_H7B3AIIxQ/variant_generic.h
index 6358ac3c3a..c5f179450e 100644
--- a/variants/STM32H7xx/H7A3A(G-I)IxQ_H7B0ABIxQ_H7B3AIIxQ/variant_generic.h
+++ b/variants/STM32H7xx/H7A3A(G-I)IxQ_H7B0ABIxQ_H7B3AIIxQ/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H7A3I(G-I)(K-T)_H7B0IBT_H7B3II(K-T)/PeripheralPins.c b/variants/STM32H7xx/H7A3I(G-I)(K-T)_H7B0IBT_H7B3II(K-T)/PeripheralPins.c
index 7a930dafd8..dca49e431d 100644
--- a/variants/STM32H7xx/H7A3I(G-I)(K-T)_H7B0IBT_H7B3II(K-T)/PeripheralPins.c
+++ b/variants/STM32H7xx/H7A3I(G-I)(K-T)_H7B0IBT_H7B3II(K-T)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -14,7 +14,7 @@
  * Automatically generated from STM32H7A3I(G-I)Kx.xml, STM32H7A3I(G-I)Tx.xml
  * STM32H7B0IBTx.xml, STM32H7B3IIKx.xml
  * STM32H7B3IITx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32H7xx/H7A3I(G-I)(K-T)_H7B0IBT_H7B3II(K-T)/variant_generic.cpp b/variants/STM32H7xx/H7A3I(G-I)(K-T)_H7B0IBT_H7B3II(K-T)/variant_generic.cpp
index de3fdd2748..17e7d2482d 100644
--- a/variants/STM32H7xx/H7A3I(G-I)(K-T)_H7B0IBT_H7B3II(K-T)/variant_generic.cpp
+++ b/variants/STM32H7xx/H7A3I(G-I)(K-T)_H7B0IBT_H7B3II(K-T)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H7A3I(G-I)(K-T)_H7B0IBT_H7B3II(K-T)/variant_generic.h b/variants/STM32H7xx/H7A3I(G-I)(K-T)_H7B0IBT_H7B3II(K-T)/variant_generic.h
index 2ad3a846f4..c9892dd7cb 100644
--- a/variants/STM32H7xx/H7A3I(G-I)(K-T)_H7B0IBT_H7B3II(K-T)/variant_generic.h
+++ b/variants/STM32H7xx/H7A3I(G-I)(K-T)_H7B0IBT_H7B3II(K-T)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H7A3I(G-I)KxQ_H7B0IBKxQ_H7B3IIKxQ/PeripheralPins.c b/variants/STM32H7xx/H7A3I(G-I)KxQ_H7B0IBKxQ_H7B3IIKxQ/PeripheralPins.c
index 21ec8c6dfb..62ed1570e2 100644
--- a/variants/STM32H7xx/H7A3I(G-I)KxQ_H7B0IBKxQ_H7B3IIKxQ/PeripheralPins.c
+++ b/variants/STM32H7xx/H7A3I(G-I)KxQ_H7B0IBKxQ_H7B3IIKxQ/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32H7A3I(G-I)KxQ.xml, STM32H7B0IBKxQ.xml
  * STM32H7B3IIKxQ.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32H7xx/H7A3I(G-I)KxQ_H7B0IBKxQ_H7B3IIKxQ/variant_generic.cpp b/variants/STM32H7xx/H7A3I(G-I)KxQ_H7B0IBKxQ_H7B3IIKxQ/variant_generic.cpp
index 242613607c..ee15d5f4c6 100644
--- a/variants/STM32H7xx/H7A3I(G-I)KxQ_H7B0IBKxQ_H7B3IIKxQ/variant_generic.cpp
+++ b/variants/STM32H7xx/H7A3I(G-I)KxQ_H7B0IBKxQ_H7B3IIKxQ/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H7A3I(G-I)KxQ_H7B0IBKxQ_H7B3IIKxQ/variant_generic.h b/variants/STM32H7xx/H7A3I(G-I)KxQ_H7B0IBKxQ_H7B3IIKxQ/variant_generic.h
index 07ed008e74..1e96bb327e 100644
--- a/variants/STM32H7xx/H7A3I(G-I)KxQ_H7B0IBKxQ_H7B3IIKxQ/variant_generic.h
+++ b/variants/STM32H7xx/H7A3I(G-I)KxQ_H7B0IBKxQ_H7B3IIKxQ/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H7A3I(G-I)TxQ_H7B3IITxQ/PeripheralPins.c b/variants/STM32H7xx/H7A3I(G-I)TxQ_H7B3IITxQ/PeripheralPins.c
index 3eb3ae0196..ed0675fabf 100644
--- a/variants/STM32H7xx/H7A3I(G-I)TxQ_H7B3IITxQ/PeripheralPins.c
+++ b/variants/STM32H7xx/H7A3I(G-I)TxQ_H7B3IITxQ/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32H7A3I(G-I)TxQ.xml, STM32H7B3IITxQ.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32H7xx/H7A3I(G-I)TxQ_H7B3IITxQ/variant_generic.cpp b/variants/STM32H7xx/H7A3I(G-I)TxQ_H7B3IITxQ/variant_generic.cpp
index 0a1bfa6ee8..c8494fcd19 100644
--- a/variants/STM32H7xx/H7A3I(G-I)TxQ_H7B3IITxQ/variant_generic.cpp
+++ b/variants/STM32H7xx/H7A3I(G-I)TxQ_H7B3IITxQ/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H7A3I(G-I)TxQ_H7B3IITxQ/variant_generic.h b/variants/STM32H7xx/H7A3I(G-I)TxQ_H7B3IITxQ/variant_generic.h
index b1fefd861c..e3713b43fc 100644
--- a/variants/STM32H7xx/H7A3I(G-I)TxQ_H7B3IITxQ/variant_generic.h
+++ b/variants/STM32H7xx/H7A3I(G-I)TxQ_H7B3IITxQ/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H7A3L(G-I)HxQ_H7B3LIHxQ/PeripheralPins.c b/variants/STM32H7xx/H7A3L(G-I)HxQ_H7B3LIHxQ/PeripheralPins.c
index 0e4e59876c..de4851dce8 100644
--- a/variants/STM32H7xx/H7A3L(G-I)HxQ_H7B3LIHxQ/PeripheralPins.c
+++ b/variants/STM32H7xx/H7A3L(G-I)HxQ_H7B3LIHxQ/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32H7A3L(G-I)HxQ.xml, STM32H7B3LIHxQ.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32H7xx/H7A3L(G-I)HxQ_H7B3LIHxQ/variant_generic.cpp b/variants/STM32H7xx/H7A3L(G-I)HxQ_H7B3LIHxQ/variant_generic.cpp
index 672aa68ede..b22e5a52d2 100644
--- a/variants/STM32H7xx/H7A3L(G-I)HxQ_H7B3LIHxQ/variant_generic.cpp
+++ b/variants/STM32H7xx/H7A3L(G-I)HxQ_H7B3LIHxQ/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H7A3L(G-I)HxQ_H7B3LIHxQ/variant_generic.h b/variants/STM32H7xx/H7A3L(G-I)HxQ_H7B3LIHxQ/variant_generic.h
index 8b1047c770..917945a7eb 100644
--- a/variants/STM32H7xx/H7A3L(G-I)HxQ_H7B3LIHxQ/variant_generic.h
+++ b/variants/STM32H7xx/H7A3L(G-I)HxQ_H7B3LIHxQ/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H7A3N(G-I)H_H7B3NIH/PeripheralPins.c b/variants/STM32H7xx/H7A3N(G-I)H_H7B3NIH/PeripheralPins.c
index 07a74e227b..cc3a7c0166 100644
--- a/variants/STM32H7xx/H7A3N(G-I)H_H7B3NIH/PeripheralPins.c
+++ b/variants/STM32H7xx/H7A3N(G-I)H_H7B3NIH/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32H7A3N(G-I)Hx.xml, STM32H7B3NIHx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32H7xx/H7A3N(G-I)H_H7B3NIH/variant_generic.cpp b/variants/STM32H7xx/H7A3N(G-I)H_H7B3NIH/variant_generic.cpp
index b5383f65e6..8cd4bf5aa1 100644
--- a/variants/STM32H7xx/H7A3N(G-I)H_H7B3NIH/variant_generic.cpp
+++ b/variants/STM32H7xx/H7A3N(G-I)H_H7B3NIH/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H7A3N(G-I)H_H7B3NIH/variant_generic.h b/variants/STM32H7xx/H7A3N(G-I)H_H7B3NIH/variant_generic.h
index 18af234727..6bac2beb6d 100644
--- a/variants/STM32H7xx/H7A3N(G-I)H_H7B3NIH/variant_generic.h
+++ b/variants/STM32H7xx/H7A3N(G-I)H_H7B3NIH/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H7A3QIYxQ_H7B3QIYxQ/PeripheralPins.c b/variants/STM32H7xx/H7A3QIYxQ_H7B3QIYxQ/PeripheralPins.c
index 037dcf0733..545c868e09 100644
--- a/variants/STM32H7xx/H7A3QIYxQ_H7B3QIYxQ/PeripheralPins.c
+++ b/variants/STM32H7xx/H7A3QIYxQ_H7B3QIYxQ/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32H7A3QIYxQ.xml, STM32H7B3QIYxQ.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32H7xx/H7A3QIYxQ_H7B3QIYxQ/variant_generic.cpp b/variants/STM32H7xx/H7A3QIYxQ_H7B3QIYxQ/variant_generic.cpp
index 2b987222ed..2d1afac0ad 100644
--- a/variants/STM32H7xx/H7A3QIYxQ_H7B3QIYxQ/variant_generic.cpp
+++ b/variants/STM32H7xx/H7A3QIYxQ_H7B3QIYxQ/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H7A3QIYxQ_H7B3QIYxQ/variant_generic.h b/variants/STM32H7xx/H7A3QIYxQ_H7B3QIYxQ/variant_generic.h
index 2291ed14fd..8e39642149 100644
--- a/variants/STM32H7xx/H7A3QIYxQ_H7B3QIYxQ/variant_generic.h
+++ b/variants/STM32H7xx/H7A3QIYxQ_H7B3QIYxQ/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H7A3R(G-I)T_H7B0RBT_H7B3RIT/PeripheralPins.c b/variants/STM32H7xx/H7A3R(G-I)T_H7B0RBT_H7B3RIT/PeripheralPins.c
index e66d98c171..58b8cc7ba7 100644
--- a/variants/STM32H7xx/H7A3R(G-I)T_H7B0RBT_H7B3RIT/PeripheralPins.c
+++ b/variants/STM32H7xx/H7A3R(G-I)T_H7B0RBT_H7B3RIT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32H7A3R(G-I)Tx.xml, STM32H7B0RBTx.xml
  * STM32H7B3RITx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32H7xx/H7A3R(G-I)T_H7B0RBT_H7B3RIT/variant_generic.cpp b/variants/STM32H7xx/H7A3R(G-I)T_H7B0RBT_H7B3RIT/variant_generic.cpp
index 5dd67ba65f..ca908b5b55 100644
--- a/variants/STM32H7xx/H7A3R(G-I)T_H7B0RBT_H7B3RIT/variant_generic.cpp
+++ b/variants/STM32H7xx/H7A3R(G-I)T_H7B0RBT_H7B3RIT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H7A3R(G-I)T_H7B0RBT_H7B3RIT/variant_generic.h b/variants/STM32H7xx/H7A3R(G-I)T_H7B0RBT_H7B3RIT/variant_generic.h
index 55ffd072fe..346431a2a5 100644
--- a/variants/STM32H7xx/H7A3R(G-I)T_H7B0RBT_H7B3RIT/variant_generic.h
+++ b/variants/STM32H7xx/H7A3R(G-I)T_H7B0RBT_H7B3RIT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H7A3V(G-I)(H-T)_H7B0VBT_H7B3VI(H-T)/PeripheralPins.c b/variants/STM32H7xx/H7A3V(G-I)(H-T)_H7B0VBT_H7B3VI(H-T)/PeripheralPins.c
index e3e5a3917a..f9795dd4c4 100644
--- a/variants/STM32H7xx/H7A3V(G-I)(H-T)_H7B0VBT_H7B3VI(H-T)/PeripheralPins.c
+++ b/variants/STM32H7xx/H7A3V(G-I)(H-T)_H7B0VBT_H7B3VI(H-T)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -14,7 +14,7 @@
  * Automatically generated from STM32H7A3V(G-I)Hx.xml, STM32H7A3V(G-I)Tx.xml
  * STM32H7B0VBTx.xml, STM32H7B3VIHx.xml
  * STM32H7B3VITx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32H7xx/H7A3V(G-I)(H-T)_H7B0VBT_H7B3VI(H-T)/variant_generic.cpp b/variants/STM32H7xx/H7A3V(G-I)(H-T)_H7B0VBT_H7B3VI(H-T)/variant_generic.cpp
index 87756858e7..0e16da7834 100644
--- a/variants/STM32H7xx/H7A3V(G-I)(H-T)_H7B0VBT_H7B3VI(H-T)/variant_generic.cpp
+++ b/variants/STM32H7xx/H7A3V(G-I)(H-T)_H7B0VBT_H7B3VI(H-T)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H7A3V(G-I)(H-T)_H7B0VBT_H7B3VI(H-T)/variant_generic.h b/variants/STM32H7xx/H7A3V(G-I)(H-T)_H7B0VBT_H7B3VI(H-T)/variant_generic.h
index be4efb0590..364340d864 100644
--- a/variants/STM32H7xx/H7A3V(G-I)(H-T)_H7B0VBT_H7B3VI(H-T)/variant_generic.h
+++ b/variants/STM32H7xx/H7A3V(G-I)(H-T)_H7B0VBT_H7B3VI(H-T)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H7A3V(G-I)HxQ_H7B3VIHxQ/PeripheralPins.c b/variants/STM32H7xx/H7A3V(G-I)HxQ_H7B3VIHxQ/PeripheralPins.c
index f4666e2506..1b7d6615e3 100644
--- a/variants/STM32H7xx/H7A3V(G-I)HxQ_H7B3VIHxQ/PeripheralPins.c
+++ b/variants/STM32H7xx/H7A3V(G-I)HxQ_H7B3VIHxQ/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32H7A3V(G-I)HxQ.xml, STM32H7B3VIHxQ.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32H7xx/H7A3V(G-I)HxQ_H7B3VIHxQ/variant_generic.cpp b/variants/STM32H7xx/H7A3V(G-I)HxQ_H7B3VIHxQ/variant_generic.cpp
index c57bd26a62..be17ffb92a 100644
--- a/variants/STM32H7xx/H7A3V(G-I)HxQ_H7B3VIHxQ/variant_generic.cpp
+++ b/variants/STM32H7xx/H7A3V(G-I)HxQ_H7B3VIHxQ/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H7A3V(G-I)HxQ_H7B3VIHxQ/variant_generic.h b/variants/STM32H7xx/H7A3V(G-I)HxQ_H7B3VIHxQ/variant_generic.h
index 1a30a38bab..6aa4a76675 100644
--- a/variants/STM32H7xx/H7A3V(G-I)HxQ_H7B3VIHxQ/variant_generic.h
+++ b/variants/STM32H7xx/H7A3V(G-I)HxQ_H7B3VIHxQ/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H7A3V(G-I)TxQ_H7B3VITxQ/PeripheralPins.c b/variants/STM32H7xx/H7A3V(G-I)TxQ_H7B3VITxQ/PeripheralPins.c
index ad350bf73a..887a5ec815 100644
--- a/variants/STM32H7xx/H7A3V(G-I)TxQ_H7B3VITxQ/PeripheralPins.c
+++ b/variants/STM32H7xx/H7A3V(G-I)TxQ_H7B3VITxQ/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32H7A3V(G-I)TxQ.xml, STM32H7B3VITxQ.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32H7xx/H7A3V(G-I)TxQ_H7B3VITxQ/variant_generic.cpp b/variants/STM32H7xx/H7A3V(G-I)TxQ_H7B3VITxQ/variant_generic.cpp
index 1c2afe09b0..d874c7962e 100644
--- a/variants/STM32H7xx/H7A3V(G-I)TxQ_H7B3VITxQ/variant_generic.cpp
+++ b/variants/STM32H7xx/H7A3V(G-I)TxQ_H7B3VITxQ/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H7A3V(G-I)TxQ_H7B3VITxQ/variant_generic.h b/variants/STM32H7xx/H7A3V(G-I)TxQ_H7B3VITxQ/variant_generic.h
index 6817d56e67..ceb569e1cf 100644
--- a/variants/STM32H7xx/H7A3V(G-I)TxQ_H7B3VITxQ/variant_generic.h
+++ b/variants/STM32H7xx/H7A3V(G-I)TxQ_H7B3VITxQ/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H7A3Z(G-I)T_H7B0ZBT_H7B3ZIT/PeripheralPins.c b/variants/STM32H7xx/H7A3Z(G-I)T_H7B0ZBT_H7B3ZIT/PeripheralPins.c
index b07fcb9823..e4104f378b 100644
--- a/variants/STM32H7xx/H7A3Z(G-I)T_H7B0ZBT_H7B3ZIT/PeripheralPins.c
+++ b/variants/STM32H7xx/H7A3Z(G-I)T_H7B0ZBT_H7B3ZIT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32H7A3Z(G-I)Tx.xml, STM32H7B0ZBTx.xml
  * STM32H7B3ZITx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32H7xx/H7A3Z(G-I)T_H7B0ZBT_H7B3ZIT/variant_generic.cpp b/variants/STM32H7xx/H7A3Z(G-I)T_H7B0ZBT_H7B3ZIT/variant_generic.cpp
index b7bafa7a80..d6f2fa0f04 100644
--- a/variants/STM32H7xx/H7A3Z(G-I)T_H7B0ZBT_H7B3ZIT/variant_generic.cpp
+++ b/variants/STM32H7xx/H7A3Z(G-I)T_H7B0ZBT_H7B3ZIT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H7A3Z(G-I)T_H7B0ZBT_H7B3ZIT/variant_generic.h b/variants/STM32H7xx/H7A3Z(G-I)T_H7B0ZBT_H7B3ZIT/variant_generic.h
index 6544faf8d5..15ef9a9703 100644
--- a/variants/STM32H7xx/H7A3Z(G-I)T_H7B0ZBT_H7B3ZIT/variant_generic.h
+++ b/variants/STM32H7xx/H7A3Z(G-I)T_H7B0ZBT_H7B3ZIT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H7A3Z(G-I)TxQ_H7B3ZITxQ/PeripheralPins.c b/variants/STM32H7xx/H7A3Z(G-I)TxQ_H7B3ZITxQ/PeripheralPins.c
index ffda0fb70e..b02b92caa7 100644
--- a/variants/STM32H7xx/H7A3Z(G-I)TxQ_H7B3ZITxQ/PeripheralPins.c
+++ b/variants/STM32H7xx/H7A3Z(G-I)TxQ_H7B3ZITxQ/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32H7A3Z(G-I)TxQ.xml, STM32H7B3ZITxQ.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32H7xx/H7A3Z(G-I)TxQ_H7B3ZITxQ/variant_generic.cpp b/variants/STM32H7xx/H7A3Z(G-I)TxQ_H7B3ZITxQ/variant_generic.cpp
index c3155d9a92..61bb138651 100644
--- a/variants/STM32H7xx/H7A3Z(G-I)TxQ_H7B3ZITxQ/variant_generic.cpp
+++ b/variants/STM32H7xx/H7A3Z(G-I)TxQ_H7B3ZITxQ/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32H7xx/H7A3Z(G-I)TxQ_H7B3ZITxQ/variant_generic.h b/variants/STM32H7xx/H7A3Z(G-I)TxQ_H7B3ZITxQ/variant_generic.h
index c2d68262c6..403cf0613f 100644
--- a/variants/STM32H7xx/H7A3Z(G-I)TxQ_H7B3ZITxQ/variant_generic.h
+++ b/variants/STM32H7xx/H7A3Z(G-I)TxQ_H7B3ZITxQ/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L010C6T/PeripheralPins.c b/variants/STM32L0xx/L010C6T/PeripheralPins.c
index 0bcc29b456..b2251a59f8 100644
--- a/variants/STM32L0xx/L010C6T/PeripheralPins.c
+++ b/variants/STM32L0xx/L010C6T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L010C6Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L0xx/L010C6T/variant_generic.cpp b/variants/STM32L0xx/L010C6T/variant_generic.cpp
index bf6ba82e93..b89a02541b 100644
--- a/variants/STM32L0xx/L010C6T/variant_generic.cpp
+++ b/variants/STM32L0xx/L010C6T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L010C6T/variant_generic.h b/variants/STM32L0xx/L010C6T/variant_generic.h
index ac0b7c6fc1..83102b75da 100644
--- a/variants/STM32L0xx/L010C6T/variant_generic.h
+++ b/variants/STM32L0xx/L010C6T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L010F4P_L011F(3-4)P_L021F4P/PeripheralPins.c b/variants/STM32L0xx/L010F4P_L011F(3-4)P_L021F4P/PeripheralPins.c
index d91b8d2e2a..bcf607aef2 100644
--- a/variants/STM32L0xx/L010F4P_L011F(3-4)P_L021F4P/PeripheralPins.c
+++ b/variants/STM32L0xx/L010F4P_L011F(3-4)P_L021F4P/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32L010F4Px.xml, STM32L011F(3-4)Px.xml
  * STM32L021F4Px.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L0xx/L010F4P_L011F(3-4)P_L021F4P/variant_generic.cpp b/variants/STM32L0xx/L010F4P_L011F(3-4)P_L021F4P/variant_generic.cpp
index a610ca0abc..526c4d1a0f 100644
--- a/variants/STM32L0xx/L010F4P_L011F(3-4)P_L021F4P/variant_generic.cpp
+++ b/variants/STM32L0xx/L010F4P_L011F(3-4)P_L021F4P/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L010F4P_L011F(3-4)P_L021F4P/variant_generic.h b/variants/STM32L0xx/L010F4P_L011F(3-4)P_L021F4P/variant_generic.h
index 8b81f14671..1f6c462ded 100644
--- a/variants/STM32L0xx/L010F4P_L011F(3-4)P_L021F4P/variant_generic.h
+++ b/variants/STM32L0xx/L010F4P_L011F(3-4)P_L021F4P/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L010K4T_L011K(3-4)T_L021K4T/PeripheralPins.c b/variants/STM32L0xx/L010K4T_L011K(3-4)T_L021K4T/PeripheralPins.c
index d9752abd5b..36f9caa961 100644
--- a/variants/STM32L0xx/L010K4T_L011K(3-4)T_L021K4T/PeripheralPins.c
+++ b/variants/STM32L0xx/L010K4T_L011K(3-4)T_L021K4T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32L010K4Tx.xml, STM32L011K(3-4)Tx.xml
  * STM32L021K4Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L0xx/L010K4T_L011K(3-4)T_L021K4T/variant_generic.cpp b/variants/STM32L0xx/L010K4T_L011K(3-4)T_L021K4T/variant_generic.cpp
index 2976667a68..76c3d4a806 100644
--- a/variants/STM32L0xx/L010K4T_L011K(3-4)T_L021K4T/variant_generic.cpp
+++ b/variants/STM32L0xx/L010K4T_L011K(3-4)T_L021K4T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L010K4T_L011K(3-4)T_L021K4T/variant_generic.h b/variants/STM32L0xx/L010K4T_L011K(3-4)T_L021K4T/variant_generic.h
index c23f4b5812..c13f71de7f 100644
--- a/variants/STM32L0xx/L010K4T_L011K(3-4)T_L021K4T/variant_generic.h
+++ b/variants/STM32L0xx/L010K4T_L011K(3-4)T_L021K4T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L010K8T/PeripheralPins.c b/variants/STM32L0xx/L010K8T/PeripheralPins.c
index 33ecec522a..aaeb073b1e 100644
--- a/variants/STM32L0xx/L010K8T/PeripheralPins.c
+++ b/variants/STM32L0xx/L010K8T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L010K8Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L0xx/L010K8T/variant_generic.cpp b/variants/STM32L0xx/L010K8T/variant_generic.cpp
index 9678026359..313369d1a8 100644
--- a/variants/STM32L0xx/L010K8T/variant_generic.cpp
+++ b/variants/STM32L0xx/L010K8T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L010K8T/variant_generic.h b/variants/STM32L0xx/L010K8T/variant_generic.h
index 0d77972632..51bb38596e 100644
--- a/variants/STM32L0xx/L010K8T/variant_generic.h
+++ b/variants/STM32L0xx/L010K8T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L010R8T/PeripheralPins.c b/variants/STM32L0xx/L010R8T/PeripheralPins.c
index 5bb2dec16a..4eb3ac9e1a 100644
--- a/variants/STM32L0xx/L010R8T/PeripheralPins.c
+++ b/variants/STM32L0xx/L010R8T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L010R8Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L0xx/L010R8T/variant_generic.cpp b/variants/STM32L0xx/L010R8T/variant_generic.cpp
index f3d976e868..55a7f727f9 100644
--- a/variants/STM32L0xx/L010R8T/variant_generic.cpp
+++ b/variants/STM32L0xx/L010R8T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L010R8T/variant_generic.h b/variants/STM32L0xx/L010R8T/variant_generic.h
index ea88dd1d24..5d0aef468b 100644
--- a/variants/STM32L0xx/L010R8T/variant_generic.h
+++ b/variants/STM32L0xx/L010R8T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L010RBT/PeripheralPins.c b/variants/STM32L0xx/L010RBT/PeripheralPins.c
index 54988eba6c..ccf6e46f1a 100644
--- a/variants/STM32L0xx/L010RBT/PeripheralPins.c
+++ b/variants/STM32L0xx/L010RBT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L010RBTx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L0xx/L010RBT/variant_generic.cpp b/variants/STM32L0xx/L010RBT/variant_generic.cpp
index 192a39906e..3fb06d2c69 100644
--- a/variants/STM32L0xx/L010RBT/variant_generic.cpp
+++ b/variants/STM32L0xx/L010RBT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L010RBT/variant_generic.h b/variants/STM32L0xx/L010RBT/variant_generic.h
index badfb66335..ee2f65c3a8 100644
--- a/variants/STM32L0xx/L010RBT/variant_generic.h
+++ b/variants/STM32L0xx/L010RBT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L011D(3-4)P_L021D4P/PeripheralPins.c b/variants/STM32L0xx/L011D(3-4)P_L021D4P/PeripheralPins.c
index 64d4786b33..42e93da6cb 100644
--- a/variants/STM32L0xx/L011D(3-4)P_L021D4P/PeripheralPins.c
+++ b/variants/STM32L0xx/L011D(3-4)P_L021D4P/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L011D(3-4)Px.xml, STM32L021D4Px.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L0xx/L011D(3-4)P_L021D4P/variant_generic.cpp b/variants/STM32L0xx/L011D(3-4)P_L021D4P/variant_generic.cpp
index 94ab75e89b..5d65353952 100644
--- a/variants/STM32L0xx/L011D(3-4)P_L021D4P/variant_generic.cpp
+++ b/variants/STM32L0xx/L011D(3-4)P_L021D4P/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L011D(3-4)P_L021D4P/variant_generic.h b/variants/STM32L0xx/L011D(3-4)P_L021D4P/variant_generic.h
index ad524b2355..f5d60719e6 100644
--- a/variants/STM32L0xx/L011D(3-4)P_L021D4P/variant_generic.h
+++ b/variants/STM32L0xx/L011D(3-4)P_L021D4P/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L011E(3-4)Y/PeripheralPins.c b/variants/STM32L0xx/L011E(3-4)Y/PeripheralPins.c
index 969ee8636e..8cbe99c261 100644
--- a/variants/STM32L0xx/L011E(3-4)Y/PeripheralPins.c
+++ b/variants/STM32L0xx/L011E(3-4)Y/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L011E(3-4)Yx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L0xx/L011E(3-4)Y/variant_generic.cpp b/variants/STM32L0xx/L011E(3-4)Y/variant_generic.cpp
index eb97154091..13246061ad 100644
--- a/variants/STM32L0xx/L011E(3-4)Y/variant_generic.cpp
+++ b/variants/STM32L0xx/L011E(3-4)Y/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L011E(3-4)Y/variant_generic.h b/variants/STM32L0xx/L011E(3-4)Y/variant_generic.h
index 632c15bc21..853e8afdae 100644
--- a/variants/STM32L0xx/L011E(3-4)Y/variant_generic.h
+++ b/variants/STM32L0xx/L011E(3-4)Y/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L011F(3-4)U_L021F4U/PeripheralPins.c b/variants/STM32L0xx/L011F(3-4)U_L021F4U/PeripheralPins.c
index fe725429a6..fdbdc66fe7 100644
--- a/variants/STM32L0xx/L011F(3-4)U_L021F4U/PeripheralPins.c
+++ b/variants/STM32L0xx/L011F(3-4)U_L021F4U/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L011F(3-4)Ux.xml, STM32L021F4Ux.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L0xx/L011F(3-4)U_L021F4U/variant_generic.cpp b/variants/STM32L0xx/L011F(3-4)U_L021F4U/variant_generic.cpp
index ef64e1e432..2bb421588f 100644
--- a/variants/STM32L0xx/L011F(3-4)U_L021F4U/variant_generic.cpp
+++ b/variants/STM32L0xx/L011F(3-4)U_L021F4U/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L011F(3-4)U_L021F4U/variant_generic.h b/variants/STM32L0xx/L011F(3-4)U_L021F4U/variant_generic.h
index 508d458a5e..87e71800ee 100644
--- a/variants/STM32L0xx/L011F(3-4)U_L021F4U/variant_generic.h
+++ b/variants/STM32L0xx/L011F(3-4)U_L021F4U/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L011G(3-4)U_L021G4U/PeripheralPins.c b/variants/STM32L0xx/L011G(3-4)U_L021G4U/PeripheralPins.c
index f83dcc33d1..d3702fab08 100644
--- a/variants/STM32L0xx/L011G(3-4)U_L021G4U/PeripheralPins.c
+++ b/variants/STM32L0xx/L011G(3-4)U_L021G4U/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L011G(3-4)Ux.xml, STM32L021G4Ux.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L0xx/L011G(3-4)U_L021G4U/variant_generic.cpp b/variants/STM32L0xx/L011G(3-4)U_L021G4U/variant_generic.cpp
index f0ae500137..537d2083ff 100644
--- a/variants/STM32L0xx/L011G(3-4)U_L021G4U/variant_generic.cpp
+++ b/variants/STM32L0xx/L011G(3-4)U_L021G4U/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L011G(3-4)U_L021G4U/variant_generic.h b/variants/STM32L0xx/L011G(3-4)U_L021G4U/variant_generic.h
index 4642b33c5b..e46f828259 100644
--- a/variants/STM32L0xx/L011G(3-4)U_L021G4U/variant_generic.h
+++ b/variants/STM32L0xx/L011G(3-4)U_L021G4U/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L011K(3-4)U_L021K4U/PeripheralPins.c b/variants/STM32L0xx/L011K(3-4)U_L021K4U/PeripheralPins.c
index 944a13f741..54f4cd4410 100644
--- a/variants/STM32L0xx/L011K(3-4)U_L021K4U/PeripheralPins.c
+++ b/variants/STM32L0xx/L011K(3-4)U_L021K4U/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L011K(3-4)Ux.xml, STM32L021K4Ux.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L0xx/L011K(3-4)U_L021K4U/variant_generic.cpp b/variants/STM32L0xx/L011K(3-4)U_L021K4U/variant_generic.cpp
index e0db16e10e..4d858bce50 100644
--- a/variants/STM32L0xx/L011K(3-4)U_L021K4U/variant_generic.cpp
+++ b/variants/STM32L0xx/L011K(3-4)U_L021K4U/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L011K(3-4)U_L021K4U/variant_generic.h b/variants/STM32L0xx/L011K(3-4)U_L021K4U/variant_generic.h
index b04b1bc921..54a74b11c5 100644
--- a/variants/STM32L0xx/L011K(3-4)U_L021K4U/variant_generic.h
+++ b/variants/STM32L0xx/L011K(3-4)U_L021K4U/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L031C(4-6)(T-U)_L041C4T_L041C6(T-U)/PeripheralPins.c b/variants/STM32L0xx/L031C(4-6)(T-U)_L041C4T_L041C6(T-U)/PeripheralPins.c
index d8efe7d326..e1a089952b 100644
--- a/variants/STM32L0xx/L031C(4-6)(T-U)_L041C4T_L041C6(T-U)/PeripheralPins.c
+++ b/variants/STM32L0xx/L031C(4-6)(T-U)_L041C4T_L041C6(T-U)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32L031C(4-6)Tx.xml, STM32L031C(4-6)Ux.xml
  * STM32L041C(4-6)Tx.xml, STM32L041C6Ux.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L0xx/L031C(4-6)(T-U)_L041C4T_L041C6(T-U)/variant_generic.cpp b/variants/STM32L0xx/L031C(4-6)(T-U)_L041C4T_L041C6(T-U)/variant_generic.cpp
index 0f8137608c..7ded5188de 100644
--- a/variants/STM32L0xx/L031C(4-6)(T-U)_L041C4T_L041C6(T-U)/variant_generic.cpp
+++ b/variants/STM32L0xx/L031C(4-6)(T-U)_L041C4T_L041C6(T-U)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L031C(4-6)(T-U)_L041C4T_L041C6(T-U)/variant_generic.h b/variants/STM32L0xx/L031C(4-6)(T-U)_L041C4T_L041C6(T-U)/variant_generic.h
index 849bb18363..af76fc3006 100644
--- a/variants/STM32L0xx/L031C(4-6)(T-U)_L041C4T_L041C6(T-U)/variant_generic.h
+++ b/variants/STM32L0xx/L031C(4-6)(T-U)_L041C4T_L041C6(T-U)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L031E(4-6)Y_L041E6Y/PeripheralPins.c b/variants/STM32L0xx/L031E(4-6)Y_L041E6Y/PeripheralPins.c
index 5466630ff0..ec067d454c 100644
--- a/variants/STM32L0xx/L031E(4-6)Y_L041E6Y/PeripheralPins.c
+++ b/variants/STM32L0xx/L031E(4-6)Y_L041E6Y/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L031E(4-6)Yx.xml, STM32L041E6Yx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L0xx/L031E(4-6)Y_L041E6Y/variant_generic.cpp b/variants/STM32L0xx/L031E(4-6)Y_L041E6Y/variant_generic.cpp
index 61f4845ebf..f6356b5b14 100644
--- a/variants/STM32L0xx/L031E(4-6)Y_L041E6Y/variant_generic.cpp
+++ b/variants/STM32L0xx/L031E(4-6)Y_L041E6Y/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L031E(4-6)Y_L041E6Y/variant_generic.h b/variants/STM32L0xx/L031E(4-6)Y_L041E6Y/variant_generic.h
index 73821d9587..ab3956bfc6 100644
--- a/variants/STM32L0xx/L031E(4-6)Y_L041E6Y/variant_generic.h
+++ b/variants/STM32L0xx/L031E(4-6)Y_L041E6Y/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L031F(4-6)P_L041F6P/PeripheralPins.c b/variants/STM32L0xx/L031F(4-6)P_L041F6P/PeripheralPins.c
index c207e09eac..df4be1fb3a 100644
--- a/variants/STM32L0xx/L031F(4-6)P_L041F6P/PeripheralPins.c
+++ b/variants/STM32L0xx/L031F(4-6)P_L041F6P/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L031F(4-6)Px.xml, STM32L041F6Px.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L0xx/L031F(4-6)P_L041F6P/variant_generic.cpp b/variants/STM32L0xx/L031F(4-6)P_L041F6P/variant_generic.cpp
index edfde23f79..431405e50f 100644
--- a/variants/STM32L0xx/L031F(4-6)P_L041F6P/variant_generic.cpp
+++ b/variants/STM32L0xx/L031F(4-6)P_L041F6P/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L031F(4-6)P_L041F6P/variant_generic.h b/variants/STM32L0xx/L031F(4-6)P_L041F6P/variant_generic.h
index 87201f18c4..00cc1fd77d 100644
--- a/variants/STM32L0xx/L031F(4-6)P_L041F6P/variant_generic.h
+++ b/variants/STM32L0xx/L031F(4-6)P_L041F6P/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L031G(4-6)U_L041G6U/PeripheralPins.c b/variants/STM32L0xx/L031G(4-6)U_L041G6U/PeripheralPins.c
index 6f752dcc3c..8157c1f373 100644
--- a/variants/STM32L0xx/L031G(4-6)U_L041G6U/PeripheralPins.c
+++ b/variants/STM32L0xx/L031G(4-6)U_L041G6U/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L031G(4-6)Ux.xml, STM32L041G6Ux.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L0xx/L031G(4-6)U_L041G6U/variant_generic.cpp b/variants/STM32L0xx/L031G(4-6)U_L041G6U/variant_generic.cpp
index 516df65635..60cb21ac52 100644
--- a/variants/STM32L0xx/L031G(4-6)U_L041G6U/variant_generic.cpp
+++ b/variants/STM32L0xx/L031G(4-6)U_L041G6U/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L031G(4-6)U_L041G6U/variant_generic.h b/variants/STM32L0xx/L031G(4-6)U_L041G6U/variant_generic.h
index da72efce05..084aa0592e 100644
--- a/variants/STM32L0xx/L031G(4-6)U_L041G6U/variant_generic.h
+++ b/variants/STM32L0xx/L031G(4-6)U_L041G6U/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L031G6UxS_L041G6UxS/PeripheralPins.c b/variants/STM32L0xx/L031G6UxS_L041G6UxS/PeripheralPins.c
index 8edbdde48b..20288a1c62 100644
--- a/variants/STM32L0xx/L031G6UxS_L041G6UxS/PeripheralPins.c
+++ b/variants/STM32L0xx/L031G6UxS_L041G6UxS/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L031G6UxS.xml, STM32L041G6UxS.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L0xx/L031G6UxS_L041G6UxS/variant_generic.cpp b/variants/STM32L0xx/L031G6UxS_L041G6UxS/variant_generic.cpp
index 6a34da3b46..22854dd254 100644
--- a/variants/STM32L0xx/L031G6UxS_L041G6UxS/variant_generic.cpp
+++ b/variants/STM32L0xx/L031G6UxS_L041G6UxS/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L031G6UxS_L041G6UxS/variant_generic.h b/variants/STM32L0xx/L031G6UxS_L041G6UxS/variant_generic.h
index edf3524f10..d02d85b064 100644
--- a/variants/STM32L0xx/L031G6UxS_L041G6UxS/variant_generic.h
+++ b/variants/STM32L0xx/L031G6UxS_L041G6UxS/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L031K(4-6)T_L041K6T/PeripheralPins.c b/variants/STM32L0xx/L031K(4-6)T_L041K6T/PeripheralPins.c
index cd3c412bec..464baa04ca 100644
--- a/variants/STM32L0xx/L031K(4-6)T_L041K6T/PeripheralPins.c
+++ b/variants/STM32L0xx/L031K(4-6)T_L041K6T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L031K(4-6)Tx.xml, STM32L041K6Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L0xx/L031K(4-6)T_L041K6T/variant_generic.cpp b/variants/STM32L0xx/L031K(4-6)T_L041K6T/variant_generic.cpp
index 69769cfbe1..2bdac463ae 100644
--- a/variants/STM32L0xx/L031K(4-6)T_L041K6T/variant_generic.cpp
+++ b/variants/STM32L0xx/L031K(4-6)T_L041K6T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L031K(4-6)T_L041K6T/variant_generic.h b/variants/STM32L0xx/L031K(4-6)T_L041K6T/variant_generic.h
index dab6985abc..d3a093f6c6 100644
--- a/variants/STM32L0xx/L031K(4-6)T_L041K6T/variant_generic.h
+++ b/variants/STM32L0xx/L031K(4-6)T_L041K6T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L031K(4-6)U_L041K6U/PeripheralPins.c b/variants/STM32L0xx/L031K(4-6)U_L041K6U/PeripheralPins.c
index 9b8aa4e480..ffc9b3fa68 100644
--- a/variants/STM32L0xx/L031K(4-6)U_L041K6U/PeripheralPins.c
+++ b/variants/STM32L0xx/L031K(4-6)U_L041K6U/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L031K(4-6)Ux.xml, STM32L041K6Ux.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L0xx/L031K(4-6)U_L041K6U/variant_generic.cpp b/variants/STM32L0xx/L031K(4-6)U_L041K6U/variant_generic.cpp
index ac4cb08548..9f6e970432 100644
--- a/variants/STM32L0xx/L031K(4-6)U_L041K6U/variant_generic.cpp
+++ b/variants/STM32L0xx/L031K(4-6)U_L041K6U/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L031K(4-6)U_L041K6U/variant_generic.h b/variants/STM32L0xx/L031K(4-6)U_L041K6U/variant_generic.h
index 45d3459aa5..c2b7588f37 100644
--- a/variants/STM32L0xx/L031K(4-6)U_L041K6U/variant_generic.h
+++ b/variants/STM32L0xx/L031K(4-6)U_L041K6U/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L051C(6-8)(T-U)/PeripheralPins.c b/variants/STM32L0xx/L051C(6-8)(T-U)/PeripheralPins.c
index 1830087a9e..a9950fec73 100644
--- a/variants/STM32L0xx/L051C(6-8)(T-U)/PeripheralPins.c
+++ b/variants/STM32L0xx/L051C(6-8)(T-U)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L051C(6-8)Tx.xml, STM32L051C(6-8)Ux.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L0xx/L051C(6-8)(T-U)/variant_generic.cpp b/variants/STM32L0xx/L051C(6-8)(T-U)/variant_generic.cpp
index 1c24ff0bc1..55dffcd3cd 100644
--- a/variants/STM32L0xx/L051C(6-8)(T-U)/variant_generic.cpp
+++ b/variants/STM32L0xx/L051C(6-8)(T-U)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L051C(6-8)(T-U)/variant_generic.h b/variants/STM32L0xx/L051C(6-8)(T-U)/variant_generic.h
index ccd8acd205..dfc701c5f1 100644
--- a/variants/STM32L0xx/L051C(6-8)(T-U)/variant_generic.h
+++ b/variants/STM32L0xx/L051C(6-8)(T-U)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L051K(6-8)T/PeripheralPins.c b/variants/STM32L0xx/L051K(6-8)T/PeripheralPins.c
index 15e2f8c718..d0f1c24c10 100644
--- a/variants/STM32L0xx/L051K(6-8)T/PeripheralPins.c
+++ b/variants/STM32L0xx/L051K(6-8)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L051K(6-8)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L0xx/L051K(6-8)T/variant_generic.cpp b/variants/STM32L0xx/L051K(6-8)T/variant_generic.cpp
index 55a31493fd..166ef2f38f 100644
--- a/variants/STM32L0xx/L051K(6-8)T/variant_generic.cpp
+++ b/variants/STM32L0xx/L051K(6-8)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L051K(6-8)T/variant_generic.h b/variants/STM32L0xx/L051K(6-8)T/variant_generic.h
index 707baac065..4adadf6332 100644
--- a/variants/STM32L0xx/L051K(6-8)T/variant_generic.h
+++ b/variants/STM32L0xx/L051K(6-8)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L051K(6-8)U/PeripheralPins.c b/variants/STM32L0xx/L051K(6-8)U/PeripheralPins.c
index a4539b5492..0719c165cf 100644
--- a/variants/STM32L0xx/L051K(6-8)U/PeripheralPins.c
+++ b/variants/STM32L0xx/L051K(6-8)U/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L051K(6-8)Ux.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L0xx/L051K(6-8)U/variant_generic.cpp b/variants/STM32L0xx/L051K(6-8)U/variant_generic.cpp
index 6928490b99..b362475d5f 100644
--- a/variants/STM32L0xx/L051K(6-8)U/variant_generic.cpp
+++ b/variants/STM32L0xx/L051K(6-8)U/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L051K(6-8)U/variant_generic.h b/variants/STM32L0xx/L051K(6-8)U/variant_generic.h
index f7d78d8f76..2436b9835e 100644
--- a/variants/STM32L0xx/L051K(6-8)U/variant_generic.h
+++ b/variants/STM32L0xx/L051K(6-8)U/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L051R(6-8)H/PeripheralPins.c b/variants/STM32L0xx/L051R(6-8)H/PeripheralPins.c
index 7e43f1dfdd..4cc71b7940 100644
--- a/variants/STM32L0xx/L051R(6-8)H/PeripheralPins.c
+++ b/variants/STM32L0xx/L051R(6-8)H/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L051R(6-8)Hx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L0xx/L051R(6-8)H/variant_generic.cpp b/variants/STM32L0xx/L051R(6-8)H/variant_generic.cpp
index 6c1eed4e75..d3f601fb30 100644
--- a/variants/STM32L0xx/L051R(6-8)H/variant_generic.cpp
+++ b/variants/STM32L0xx/L051R(6-8)H/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L051R(6-8)H/variant_generic.h b/variants/STM32L0xx/L051R(6-8)H/variant_generic.h
index e256fab783..bccaf4a15a 100644
--- a/variants/STM32L0xx/L051R(6-8)H/variant_generic.h
+++ b/variants/STM32L0xx/L051R(6-8)H/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L051R(6-8)T/PeripheralPins.c b/variants/STM32L0xx/L051R(6-8)T/PeripheralPins.c
index feb93967b0..d3f57a6547 100644
--- a/variants/STM32L0xx/L051R(6-8)T/PeripheralPins.c
+++ b/variants/STM32L0xx/L051R(6-8)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L051R(6-8)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L0xx/L051R(6-8)T/variant_generic.cpp b/variants/STM32L0xx/L051R(6-8)T/variant_generic.cpp
index 748b826a62..4d83ff4d16 100644
--- a/variants/STM32L0xx/L051R(6-8)T/variant_generic.cpp
+++ b/variants/STM32L0xx/L051R(6-8)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L051R(6-8)T/variant_generic.h b/variants/STM32L0xx/L051R(6-8)T/variant_generic.h
index 961864aba4..3408565dc3 100644
--- a/variants/STM32L0xx/L051R(6-8)T/variant_generic.h
+++ b/variants/STM32L0xx/L051R(6-8)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L051T(6-8)Y/PeripheralPins.c b/variants/STM32L0xx/L051T(6-8)Y/PeripheralPins.c
index 7f27a4245a..a22927cbfa 100644
--- a/variants/STM32L0xx/L051T(6-8)Y/PeripheralPins.c
+++ b/variants/STM32L0xx/L051T(6-8)Y/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L051T(6-8)Yx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L0xx/L051T(6-8)Y/variant_generic.cpp b/variants/STM32L0xx/L051T(6-8)Y/variant_generic.cpp
index e5a2f4a53d..935bccd4fb 100644
--- a/variants/STM32L0xx/L051T(6-8)Y/variant_generic.cpp
+++ b/variants/STM32L0xx/L051T(6-8)Y/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L051T(6-8)Y/variant_generic.h b/variants/STM32L0xx/L051T(6-8)Y/variant_generic.h
index e8a1891732..872f92a309 100644
--- a/variants/STM32L0xx/L051T(6-8)Y/variant_generic.h
+++ b/variants/STM32L0xx/L051T(6-8)Y/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L052C(6-8)(T-U)_L053C(6-8)(T-U)_L062C8U_L063C8(T-U)/PeripheralPins.c b/variants/STM32L0xx/L052C(6-8)(T-U)_L053C(6-8)(T-U)_L062C8U_L063C8(T-U)/PeripheralPins.c
index be7c2eadeb..3d10777c67 100644
--- a/variants/STM32L0xx/L052C(6-8)(T-U)_L053C(6-8)(T-U)_L062C8U_L063C8(T-U)/PeripheralPins.c
+++ b/variants/STM32L0xx/L052C(6-8)(T-U)_L053C(6-8)(T-U)_L062C8U_L063C8(T-U)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -15,7 +15,7 @@
  * STM32L053C(6-8)Tx.xml, STM32L053C(6-8)Ux.xml
  * STM32L062C8Ux.xml, STM32L063C8Tx.xml
  * STM32L063C8Ux.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L0xx/L052C(6-8)(T-U)_L053C(6-8)(T-U)_L062C8U_L063C8(T-U)/variant_generic.cpp b/variants/STM32L0xx/L052C(6-8)(T-U)_L053C(6-8)(T-U)_L062C8U_L063C8(T-U)/variant_generic.cpp
index 6b3a222453..529e0b34a1 100644
--- a/variants/STM32L0xx/L052C(6-8)(T-U)_L053C(6-8)(T-U)_L062C8U_L063C8(T-U)/variant_generic.cpp
+++ b/variants/STM32L0xx/L052C(6-8)(T-U)_L053C(6-8)(T-U)_L062C8U_L063C8(T-U)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L052C(6-8)(T-U)_L053C(6-8)(T-U)_L062C8U_L063C8(T-U)/variant_generic.h b/variants/STM32L0xx/L052C(6-8)(T-U)_L053C(6-8)(T-U)_L062C8U_L063C8(T-U)/variant_generic.h
index 93d8edd321..f7f69da0c0 100644
--- a/variants/STM32L0xx/L052C(6-8)(T-U)_L053C(6-8)(T-U)_L062C8U_L063C8(T-U)/variant_generic.h
+++ b/variants/STM32L0xx/L052C(6-8)(T-U)_L053C(6-8)(T-U)_L062C8U_L063C8(T-U)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L052K(6-8)T_L062K8T/PeripheralPins.c b/variants/STM32L0xx/L052K(6-8)T_L062K8T/PeripheralPins.c
index bb97561170..e9de8cc161 100644
--- a/variants/STM32L0xx/L052K(6-8)T_L062K8T/PeripheralPins.c
+++ b/variants/STM32L0xx/L052K(6-8)T_L062K8T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L052K(6-8)Tx.xml, STM32L062K8Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L0xx/L052K(6-8)T_L062K8T/variant_generic.cpp b/variants/STM32L0xx/L052K(6-8)T_L062K8T/variant_generic.cpp
index a9e3486acc..e5306769b6 100644
--- a/variants/STM32L0xx/L052K(6-8)T_L062K8T/variant_generic.cpp
+++ b/variants/STM32L0xx/L052K(6-8)T_L062K8T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L052K(6-8)T_L062K8T/variant_generic.h b/variants/STM32L0xx/L052K(6-8)T_L062K8T/variant_generic.h
index c550fa4c83..ff2f9884e1 100644
--- a/variants/STM32L0xx/L052K(6-8)T_L062K8T/variant_generic.h
+++ b/variants/STM32L0xx/L052K(6-8)T_L062K8T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L052K(6-8)U_L062K8U/PeripheralPins.c b/variants/STM32L0xx/L052K(6-8)U_L062K8U/PeripheralPins.c
index ae7bf6f85f..0eb93c8d7f 100644
--- a/variants/STM32L0xx/L052K(6-8)U_L062K8U/PeripheralPins.c
+++ b/variants/STM32L0xx/L052K(6-8)U_L062K8U/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L052K(6-8)Ux.xml, STM32L062K8Ux.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L0xx/L052K(6-8)U_L062K8U/variant_generic.cpp b/variants/STM32L0xx/L052K(6-8)U_L062K8U/variant_generic.cpp
index 2c135b203b..2173583d1c 100644
--- a/variants/STM32L0xx/L052K(6-8)U_L062K8U/variant_generic.cpp
+++ b/variants/STM32L0xx/L052K(6-8)U_L062K8U/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L052K(6-8)U_L062K8U/variant_generic.h b/variants/STM32L0xx/L052K(6-8)U_L062K8U/variant_generic.h
index adfa8a1e1c..5263956aae 100644
--- a/variants/STM32L0xx/L052K(6-8)U_L062K8U/variant_generic.h
+++ b/variants/STM32L0xx/L052K(6-8)U_L062K8U/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L052R(6-8)H_L053R(6-8)H/PeripheralPins.c b/variants/STM32L0xx/L052R(6-8)H_L053R(6-8)H/PeripheralPins.c
index 26500f8c37..e88a228e93 100644
--- a/variants/STM32L0xx/L052R(6-8)H_L053R(6-8)H/PeripheralPins.c
+++ b/variants/STM32L0xx/L052R(6-8)H_L053R(6-8)H/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L052R(6-8)Hx.xml, STM32L053R(6-8)Hx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L0xx/L052R(6-8)H_L053R(6-8)H/variant_generic.cpp b/variants/STM32L0xx/L052R(6-8)H_L053R(6-8)H/variant_generic.cpp
index 4d7b4e28ae..fb9e011534 100644
--- a/variants/STM32L0xx/L052R(6-8)H_L053R(6-8)H/variant_generic.cpp
+++ b/variants/STM32L0xx/L052R(6-8)H_L053R(6-8)H/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L052R(6-8)H_L053R(6-8)H/variant_generic.h b/variants/STM32L0xx/L052R(6-8)H_L053R(6-8)H/variant_generic.h
index 9adb1a0063..88f7334581 100644
--- a/variants/STM32L0xx/L052R(6-8)H_L053R(6-8)H/variant_generic.h
+++ b/variants/STM32L0xx/L052R(6-8)H_L053R(6-8)H/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L052R(6-8)T_L053R(6-8)T_L063R8T/PeripheralPins.c b/variants/STM32L0xx/L052R(6-8)T_L053R(6-8)T_L063R8T/PeripheralPins.c
index 02b6bc7944..6dce322a5f 100644
--- a/variants/STM32L0xx/L052R(6-8)T_L053R(6-8)T_L063R8T/PeripheralPins.c
+++ b/variants/STM32L0xx/L052R(6-8)T_L053R(6-8)T_L063R8T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32L052R(6-8)Tx.xml, STM32L053R(6-8)Tx.xml
  * STM32L063R8Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L0xx/L052R(6-8)T_L053R(6-8)T_L063R8T/variant_generic.cpp b/variants/STM32L0xx/L052R(6-8)T_L053R(6-8)T_L063R8T/variant_generic.cpp
index 8d59fb2781..efad8d0b35 100644
--- a/variants/STM32L0xx/L052R(6-8)T_L053R(6-8)T_L063R8T/variant_generic.cpp
+++ b/variants/STM32L0xx/L052R(6-8)T_L053R(6-8)T_L063R8T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L052R(6-8)T_L053R(6-8)T_L063R8T/variant_generic.h b/variants/STM32L0xx/L052R(6-8)T_L053R(6-8)T_L063R8T/variant_generic.h
index 68cb214767..d555cdd920 100644
--- a/variants/STM32L0xx/L052R(6-8)T_L053R(6-8)T_L063R8T/variant_generic.h
+++ b/variants/STM32L0xx/L052R(6-8)T_L053R(6-8)T_L063R8T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L052T6Y_L052T8(F-Y)/PeripheralPins.c b/variants/STM32L0xx/L052T6Y_L052T8(F-Y)/PeripheralPins.c
index 6956f806eb..bd682e44e8 100644
--- a/variants/STM32L0xx/L052T6Y_L052T8(F-Y)/PeripheralPins.c
+++ b/variants/STM32L0xx/L052T6Y_L052T8(F-Y)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L052T(6-8)Yx.xml, STM32L052T8Fx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L0xx/L052T6Y_L052T8(F-Y)/variant_generic.cpp b/variants/STM32L0xx/L052T6Y_L052T8(F-Y)/variant_generic.cpp
index f267752770..13191882bf 100644
--- a/variants/STM32L0xx/L052T6Y_L052T8(F-Y)/variant_generic.cpp
+++ b/variants/STM32L0xx/L052T6Y_L052T8(F-Y)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L052T6Y_L052T8(F-Y)/variant_generic.h b/variants/STM32L0xx/L052T6Y_L052T8(F-Y)/variant_generic.h
index e95529613c..a203ccc125 100644
--- a/variants/STM32L0xx/L052T6Y_L052T8(F-Y)/variant_generic.h
+++ b/variants/STM32L0xx/L052T6Y_L052T8(F-Y)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L071C(8-B-Z)(T-U)_L081CBT_L081CZ(T-U)/PeripheralPins.c b/variants/STM32L0xx/L071C(8-B-Z)(T-U)_L081CBT_L081CZ(T-U)/PeripheralPins.c
index 46f717c3d8..9d3bd1cccb 100644
--- a/variants/STM32L0xx/L071C(8-B-Z)(T-U)_L081CBT_L081CZ(T-U)/PeripheralPins.c
+++ b/variants/STM32L0xx/L071C(8-B-Z)(T-U)_L081CBT_L081CZ(T-U)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -14,7 +14,7 @@
  * Automatically generated from STM32L071C(B-Z)Tx.xml, STM32L071C(B-Z)Ux.xml
  * STM32L071C8Tx.xml, STM32L071C8Ux.xml
  * STM32L081C(B-Z)Tx.xml, STM32L081CZUx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L0xx/L071C(8-B-Z)(T-U)_L081CBT_L081CZ(T-U)/variant_generic.cpp b/variants/STM32L0xx/L071C(8-B-Z)(T-U)_L081CBT_L081CZ(T-U)/variant_generic.cpp
index 26179ca2e8..30e4b02e11 100644
--- a/variants/STM32L0xx/L071C(8-B-Z)(T-U)_L081CBT_L081CZ(T-U)/variant_generic.cpp
+++ b/variants/STM32L0xx/L071C(8-B-Z)(T-U)_L081CBT_L081CZ(T-U)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L071C(8-B-Z)(T-U)_L081CBT_L081CZ(T-U)/variant_generic.h b/variants/STM32L0xx/L071C(8-B-Z)(T-U)_L081CBT_L081CZ(T-U)/variant_generic.h
index 1471b1ce11..0dedf96ec0 100644
--- a/variants/STM32L0xx/L071C(8-B-Z)(T-U)_L081CBT_L081CZ(T-U)/variant_generic.h
+++ b/variants/STM32L0xx/L071C(8-B-Z)(T-U)_L081CBT_L081CZ(T-U)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L071C(B-Z)Y/PeripheralPins.c b/variants/STM32L0xx/L071C(B-Z)Y/PeripheralPins.c
index 7b0b23bfdc..552f61198a 100644
--- a/variants/STM32L0xx/L071C(B-Z)Y/PeripheralPins.c
+++ b/variants/STM32L0xx/L071C(B-Z)Y/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L071C(B-Z)Yx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L0xx/L071C(B-Z)Y/variant_generic.cpp b/variants/STM32L0xx/L071C(B-Z)Y/variant_generic.cpp
index 030a355a4d..d13190c24f 100644
--- a/variants/STM32L0xx/L071C(B-Z)Y/variant_generic.cpp
+++ b/variants/STM32L0xx/L071C(B-Z)Y/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L071C(B-Z)Y/variant_generic.h b/variants/STM32L0xx/L071C(B-Z)Y/variant_generic.h
index 0e82443737..7179e1200b 100644
--- a/variants/STM32L0xx/L071C(B-Z)Y/variant_generic.h
+++ b/variants/STM32L0xx/L071C(B-Z)Y/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L071K(8-B-Z)U_L081KZU/PeripheralPins.c b/variants/STM32L0xx/L071K(8-B-Z)U_L081KZU/PeripheralPins.c
index b278aa810b..98d2ea86a5 100644
--- a/variants/STM32L0xx/L071K(8-B-Z)U_L081KZU/PeripheralPins.c
+++ b/variants/STM32L0xx/L071K(8-B-Z)U_L081KZU/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32L071K(B-Z)Ux.xml, STM32L071K8Ux.xml
  * STM32L081KZUx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L0xx/L071K(8-B-Z)U_L081KZU/variant_generic.cpp b/variants/STM32L0xx/L071K(8-B-Z)U_L081KZU/variant_generic.cpp
index 7276c2aa14..85004137c8 100644
--- a/variants/STM32L0xx/L071K(8-B-Z)U_L081KZU/variant_generic.cpp
+++ b/variants/STM32L0xx/L071K(8-B-Z)U_L081KZU/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L071K(8-B-Z)U_L081KZU/variant_generic.h b/variants/STM32L0xx/L071K(8-B-Z)U_L081KZU/variant_generic.h
index 75da555b06..790234d8f2 100644
--- a/variants/STM32L0xx/L071K(8-B-Z)U_L081KZU/variant_generic.h
+++ b/variants/STM32L0xx/L071K(8-B-Z)U_L081KZU/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L071K(B-Z)T_L081KZT/PeripheralPins.c b/variants/STM32L0xx/L071K(B-Z)T_L081KZT/PeripheralPins.c
index c74a2a7383..d3b95c8cfa 100644
--- a/variants/STM32L0xx/L071K(B-Z)T_L081KZT/PeripheralPins.c
+++ b/variants/STM32L0xx/L071K(B-Z)T_L081KZT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L071K(B-Z)Tx.xml, STM32L081KZTx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L0xx/L071K(B-Z)T_L081KZT/variant_generic.cpp b/variants/STM32L0xx/L071K(B-Z)T_L081KZT/variant_generic.cpp
index f7211c8277..b0e66d700f 100644
--- a/variants/STM32L0xx/L071K(B-Z)T_L081KZT/variant_generic.cpp
+++ b/variants/STM32L0xx/L071K(B-Z)T_L081KZT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L071K(B-Z)T_L081KZT/variant_generic.h b/variants/STM32L0xx/L071K(B-Z)T_L081KZT/variant_generic.h
index cb2969bf5a..9b27742b0d 100644
--- a/variants/STM32L0xx/L071K(B-Z)T_L081KZT/variant_generic.h
+++ b/variants/STM32L0xx/L071K(B-Z)T_L081KZT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L071R(B-Z)H/PeripheralPins.c b/variants/STM32L0xx/L071R(B-Z)H/PeripheralPins.c
index 8e7f8d1382..b525c05f0d 100644
--- a/variants/STM32L0xx/L071R(B-Z)H/PeripheralPins.c
+++ b/variants/STM32L0xx/L071R(B-Z)H/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L071R(B-Z)Hx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L0xx/L071R(B-Z)H/variant_generic.cpp b/variants/STM32L0xx/L071R(B-Z)H/variant_generic.cpp
index c666082619..cb1092ad4c 100644
--- a/variants/STM32L0xx/L071R(B-Z)H/variant_generic.cpp
+++ b/variants/STM32L0xx/L071R(B-Z)H/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L071R(B-Z)H/variant_generic.h b/variants/STM32L0xx/L071R(B-Z)H/variant_generic.h
index 1ce24aa1c7..e71db33672 100644
--- a/variants/STM32L0xx/L071R(B-Z)H/variant_generic.h
+++ b/variants/STM32L0xx/L071R(B-Z)H/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L071R(B-Z)T/PeripheralPins.c b/variants/STM32L0xx/L071R(B-Z)T/PeripheralPins.c
index ec04ac6e3e..95f6494dc6 100644
--- a/variants/STM32L0xx/L071R(B-Z)T/PeripheralPins.c
+++ b/variants/STM32L0xx/L071R(B-Z)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L071R(B-Z)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L0xx/L071R(B-Z)T/variant_generic.cpp b/variants/STM32L0xx/L071R(B-Z)T/variant_generic.cpp
index 2b6db2c817..99984d3818 100644
--- a/variants/STM32L0xx/L071R(B-Z)T/variant_generic.cpp
+++ b/variants/STM32L0xx/L071R(B-Z)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L071R(B-Z)T/variant_generic.h b/variants/STM32L0xx/L071R(B-Z)T/variant_generic.h
index 5825430c61..742d922b45 100644
--- a/variants/STM32L0xx/L071R(B-Z)T/variant_generic.h
+++ b/variants/STM32L0xx/L071R(B-Z)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L071V(8-B-Z)(I-T)/PeripheralPins.c b/variants/STM32L0xx/L071V(8-B-Z)(I-T)/PeripheralPins.c
index c432f7d9d0..7c2ee3762d 100644
--- a/variants/STM32L0xx/L071V(8-B-Z)(I-T)/PeripheralPins.c
+++ b/variants/STM32L0xx/L071V(8-B-Z)(I-T)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32L071V(B-Z)Ix.xml, STM32L071V(B-Z)Tx.xml
  * STM32L071V8Ix.xml, STM32L071V8Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L0xx/L071V(8-B-Z)(I-T)/variant_generic.cpp b/variants/STM32L0xx/L071V(8-B-Z)(I-T)/variant_generic.cpp
index 87d646775c..8b8ce17967 100644
--- a/variants/STM32L0xx/L071V(8-B-Z)(I-T)/variant_generic.cpp
+++ b/variants/STM32L0xx/L071V(8-B-Z)(I-T)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L071V(8-B-Z)(I-T)/variant_generic.h b/variants/STM32L0xx/L071V(8-B-Z)(I-T)/variant_generic.h
index 8ab8d8941f..fa41c302c1 100644
--- a/variants/STM32L0xx/L071V(8-B-Z)(I-T)/variant_generic.h
+++ b/variants/STM32L0xx/L071V(8-B-Z)(I-T)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L072C(B-Z)(T-U)_L073C(B-Z)(T-U)_L082CZU_L083CBT_L083CZ(T-U)/PeripheralPins.c b/variants/STM32L0xx/L072C(B-Z)(T-U)_L073C(B-Z)(T-U)_L082CZU_L083CBT_L083CZ(T-U)/PeripheralPins.c
index 24e0ad1ee7..eb628c0bec 100644
--- a/variants/STM32L0xx/L072C(B-Z)(T-U)_L073C(B-Z)(T-U)_L082CZU_L083CBT_L083CZ(T-U)/PeripheralPins.c
+++ b/variants/STM32L0xx/L072C(B-Z)(T-U)_L073C(B-Z)(T-U)_L082CZU_L083CBT_L083CZ(T-U)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -15,7 +15,7 @@
  * STM32L073C(B-Z)Tx.xml, STM32L073C(B-Z)Ux.xml
  * STM32L082CZUx.xml, STM32L083C(B-Z)Tx.xml
  * STM32L083CZUx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L0xx/L072C(B-Z)(T-U)_L073C(B-Z)(T-U)_L082CZU_L083CBT_L083CZ(T-U)/variant_generic.cpp b/variants/STM32L0xx/L072C(B-Z)(T-U)_L073C(B-Z)(T-U)_L082CZU_L083CBT_L083CZ(T-U)/variant_generic.cpp
index d1f5817262..0e5734b0d1 100644
--- a/variants/STM32L0xx/L072C(B-Z)(T-U)_L073C(B-Z)(T-U)_L082CZU_L083CBT_L083CZ(T-U)/variant_generic.cpp
+++ b/variants/STM32L0xx/L072C(B-Z)(T-U)_L073C(B-Z)(T-U)_L082CZU_L083CBT_L083CZ(T-U)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L072C(B-Z)(T-U)_L073C(B-Z)(T-U)_L082CZU_L083CBT_L083CZ(T-U)/variant_generic.h b/variants/STM32L0xx/L072C(B-Z)(T-U)_L073C(B-Z)(T-U)_L082CZU_L083CBT_L083CZ(T-U)/variant_generic.h
index 75bc2f2679..f3c538e859 100644
--- a/variants/STM32L0xx/L072C(B-Z)(T-U)_L073C(B-Z)(T-U)_L082CZU_L083CBT_L083CZ(T-U)/variant_generic.h
+++ b/variants/STM32L0xx/L072C(B-Z)(T-U)_L073C(B-Z)(T-U)_L082CZU_L083CBT_L083CZ(T-U)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L072CBY_L072CZ(E-Y)_L073CZY_L082CZY/PeripheralPins.c b/variants/STM32L0xx/L072CBY_L072CZ(E-Y)_L073CZY_L082CZY/PeripheralPins.c
index acd75015b7..51a2a1be32 100644
--- a/variants/STM32L0xx/L072CBY_L072CZ(E-Y)_L073CZY_L082CZY/PeripheralPins.c
+++ b/variants/STM32L0xx/L072CBY_L072CZ(E-Y)_L073CZY_L082CZY/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32L072C(B-Z)Yx.xml, STM32L072CZEx.xml
  * STM32L073CZYx.xml, STM32L082CZYx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L0xx/L072CBY_L072CZ(E-Y)_L073CZY_L082CZY/variant_generic.cpp b/variants/STM32L0xx/L072CBY_L072CZ(E-Y)_L073CZY_L082CZY/variant_generic.cpp
index ee45b0f565..09b4523592 100644
--- a/variants/STM32L0xx/L072CBY_L072CZ(E-Y)_L073CZY_L082CZY/variant_generic.cpp
+++ b/variants/STM32L0xx/L072CBY_L072CZ(E-Y)_L073CZY_L082CZY/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L072CBY_L072CZ(E-Y)_L073CZY_L082CZY/variant_generic.h b/variants/STM32L0xx/L072CBY_L072CZ(E-Y)_L073CZY_L082CZY/variant_generic.h
index e6dc107aba..23bb67de86 100644
--- a/variants/STM32L0xx/L072CBY_L072CZ(E-Y)_L073CZY_L082CZY/variant_generic.h
+++ b/variants/STM32L0xx/L072CBY_L072CZ(E-Y)_L073CZY_L082CZY/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L072K(B-Z)T_L082K(B-Z)T/PeripheralPins.c b/variants/STM32L0xx/L072K(B-Z)T_L082K(B-Z)T/PeripheralPins.c
index e21f7e08fa..feef17c8d9 100644
--- a/variants/STM32L0xx/L072K(B-Z)T_L082K(B-Z)T/PeripheralPins.c
+++ b/variants/STM32L0xx/L072K(B-Z)T_L082K(B-Z)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L072K(B-Z)Tx.xml, STM32L082K(B-Z)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L0xx/L072K(B-Z)T_L082K(B-Z)T/variant_generic.cpp b/variants/STM32L0xx/L072K(B-Z)T_L082K(B-Z)T/variant_generic.cpp
index 53db7781ae..d03d9ba5a9 100644
--- a/variants/STM32L0xx/L072K(B-Z)T_L082K(B-Z)T/variant_generic.cpp
+++ b/variants/STM32L0xx/L072K(B-Z)T_L082K(B-Z)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L072K(B-Z)T_L082K(B-Z)T/variant_generic.h b/variants/STM32L0xx/L072K(B-Z)T_L082K(B-Z)T/variant_generic.h
index 9c7cc20962..e152dc1f49 100644
--- a/variants/STM32L0xx/L072K(B-Z)T_L082K(B-Z)T/variant_generic.h
+++ b/variants/STM32L0xx/L072K(B-Z)T_L082K(B-Z)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L072K(B-Z)U_L082K(B-Z)U/PeripheralPins.c b/variants/STM32L0xx/L072K(B-Z)U_L082K(B-Z)U/PeripheralPins.c
index bd80da03ed..64b34ae619 100644
--- a/variants/STM32L0xx/L072K(B-Z)U_L082K(B-Z)U/PeripheralPins.c
+++ b/variants/STM32L0xx/L072K(B-Z)U_L082K(B-Z)U/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L072K(B-Z)Ux.xml, STM32L082K(B-Z)Ux.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L0xx/L072K(B-Z)U_L082K(B-Z)U/variant_generic.cpp b/variants/STM32L0xx/L072K(B-Z)U_L082K(B-Z)U/variant_generic.cpp
index 4f8b2126e3..e2b4874aec 100644
--- a/variants/STM32L0xx/L072K(B-Z)U_L082K(B-Z)U/variant_generic.cpp
+++ b/variants/STM32L0xx/L072K(B-Z)U_L082K(B-Z)U/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L072K(B-Z)U_L082K(B-Z)U/variant_generic.h b/variants/STM32L0xx/L072K(B-Z)U_L082K(B-Z)U/variant_generic.h
index abbcba09a6..474e29f49c 100644
--- a/variants/STM32L0xx/L072K(B-Z)U_L082K(B-Z)U/variant_generic.h
+++ b/variants/STM32L0xx/L072K(B-Z)U_L082K(B-Z)U/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L072R(B-Z)(H-I)_L073RBH_L073RZ(H-I)_L083R(B-Z)H/PeripheralPins.c b/variants/STM32L0xx/L072R(B-Z)(H-I)_L073RBH_L073RZ(H-I)_L083R(B-Z)H/PeripheralPins.c
index 66feb6d66f..83134a1e2a 100644
--- a/variants/STM32L0xx/L072R(B-Z)(H-I)_L073RBH_L073RZ(H-I)_L083R(B-Z)H/PeripheralPins.c
+++ b/variants/STM32L0xx/L072R(B-Z)(H-I)_L073RBH_L073RZ(H-I)_L083R(B-Z)H/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -14,7 +14,7 @@
  * Automatically generated from STM32L072R(B-Z)Hx.xml, STM32L072R(B-Z)Ix.xml
  * STM32L073R(B-Z)Hx.xml, STM32L073RZIx.xml
  * STM32L083R(B-Z)Hx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L0xx/L072R(B-Z)(H-I)_L073RBH_L073RZ(H-I)_L083R(B-Z)H/variant_generic.cpp b/variants/STM32L0xx/L072R(B-Z)(H-I)_L073RBH_L073RZ(H-I)_L083R(B-Z)H/variant_generic.cpp
index d7e8ec0fda..22abc3ae77 100644
--- a/variants/STM32L0xx/L072R(B-Z)(H-I)_L073RBH_L073RZ(H-I)_L083R(B-Z)H/variant_generic.cpp
+++ b/variants/STM32L0xx/L072R(B-Z)(H-I)_L073RBH_L073RZ(H-I)_L083R(B-Z)H/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L072R(B-Z)(H-I)_L073RBH_L073RZ(H-I)_L083R(B-Z)H/variant_generic.h b/variants/STM32L0xx/L072R(B-Z)(H-I)_L073RBH_L073RZ(H-I)_L083R(B-Z)H/variant_generic.h
index f8aa96687b..d6ddf71b9c 100644
--- a/variants/STM32L0xx/L072R(B-Z)(H-I)_L073RBH_L073RZ(H-I)_L083R(B-Z)H/variant_generic.h
+++ b/variants/STM32L0xx/L072R(B-Z)(H-I)_L073RBH_L073RZ(H-I)_L083R(B-Z)H/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L072R(B-Z)T_L073R(B-Z)T_L083R(B-Z)T/PeripheralPins.c b/variants/STM32L0xx/L072R(B-Z)T_L073R(B-Z)T_L083R(B-Z)T/PeripheralPins.c
index 416e8d5e6a..c8a54a90a3 100644
--- a/variants/STM32L0xx/L072R(B-Z)T_L073R(B-Z)T_L083R(B-Z)T/PeripheralPins.c
+++ b/variants/STM32L0xx/L072R(B-Z)T_L073R(B-Z)T_L083R(B-Z)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32L072R(B-Z)Tx.xml, STM32L073R(B-Z)Tx.xml
  * STM32L083R(B-Z)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L0xx/L072R(B-Z)T_L073R(B-Z)T_L083R(B-Z)T/variant_generic.cpp b/variants/STM32L0xx/L072R(B-Z)T_L073R(B-Z)T_L083R(B-Z)T/variant_generic.cpp
index 0e3f7cac24..483cbb6227 100644
--- a/variants/STM32L0xx/L072R(B-Z)T_L073R(B-Z)T_L083R(B-Z)T/variant_generic.cpp
+++ b/variants/STM32L0xx/L072R(B-Z)T_L073R(B-Z)T_L083R(B-Z)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L072R(B-Z)T_L073R(B-Z)T_L083R(B-Z)T/variant_generic.h b/variants/STM32L0xx/L072R(B-Z)T_L073R(B-Z)T_L083R(B-Z)T/variant_generic.h
index 42a1346ea7..b02adbb818 100644
--- a/variants/STM32L0xx/L072R(B-Z)T_L073R(B-Z)T_L083R(B-Z)T/variant_generic.h
+++ b/variants/STM32L0xx/L072R(B-Z)T_L073R(B-Z)T_L083R(B-Z)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L072V(8-B-Z)(I-T)_L073V(8-B-Z)(I-T)_L083V(8-B-Z)(I-T)/PeripheralPins.c b/variants/STM32L0xx/L072V(8-B-Z)(I-T)_L073V(8-B-Z)(I-T)_L083V(8-B-Z)(I-T)/PeripheralPins.c
index 53ab0d4c59..e8f0c8a946 100644
--- a/variants/STM32L0xx/L072V(8-B-Z)(I-T)_L073V(8-B-Z)(I-T)_L083V(8-B-Z)(I-T)/PeripheralPins.c
+++ b/variants/STM32L0xx/L072V(8-B-Z)(I-T)_L073V(8-B-Z)(I-T)_L083V(8-B-Z)(I-T)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -17,7 +17,7 @@
  * STM32L073V8Ix.xml, STM32L073V8Tx.xml
  * STM32L083V(B-Z)Ix.xml, STM32L083V(B-Z)Tx.xml
  * STM32L083V8Ix.xml, STM32L083V8Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L0xx/L072V(8-B-Z)(I-T)_L073V(8-B-Z)(I-T)_L083V(8-B-Z)(I-T)/variant_generic.cpp b/variants/STM32L0xx/L072V(8-B-Z)(I-T)_L073V(8-B-Z)(I-T)_L083V(8-B-Z)(I-T)/variant_generic.cpp
index 2f726b2fb7..acddd25a4c 100644
--- a/variants/STM32L0xx/L072V(8-B-Z)(I-T)_L073V(8-B-Z)(I-T)_L083V(8-B-Z)(I-T)/variant_generic.cpp
+++ b/variants/STM32L0xx/L072V(8-B-Z)(I-T)_L073V(8-B-Z)(I-T)_L083V(8-B-Z)(I-T)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L0xx/L072V(8-B-Z)(I-T)_L073V(8-B-Z)(I-T)_L083V(8-B-Z)(I-T)/variant_generic.h b/variants/STM32L0xx/L072V(8-B-Z)(I-T)_L073V(8-B-Z)(I-T)_L083V(8-B-Z)(I-T)/variant_generic.h
index b5e82f0ec4..7c01bcc38e 100644
--- a/variants/STM32L0xx/L072V(8-B-Z)(I-T)_L073V(8-B-Z)(I-T)_L083V(8-B-Z)(I-T)/variant_generic.h
+++ b/variants/STM32L0xx/L072V(8-B-Z)(I-T)_L073V(8-B-Z)(I-T)_L083V(8-B-Z)(I-T)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L1xx/L100C6Ux(A)_L151C(6-8-B)(T-U)x(A)_L152C(6-8-B)(T-U)x(A)/PeripheralPins.c b/variants/STM32L1xx/L100C6Ux(A)_L151C(6-8-B)(T-U)x(A)_L152C(6-8-B)(T-U)x(A)/PeripheralPins.c
index 3e7f7bb6bb..1a5c3fe6a5 100644
--- a/variants/STM32L1xx/L100C6Ux(A)_L151C(6-8-B)(T-U)x(A)_L152C(6-8-B)(T-U)x(A)/PeripheralPins.c
+++ b/variants/STM32L1xx/L100C6Ux(A)_L151C(6-8-B)(T-U)x(A)_L152C(6-8-B)(T-U)x(A)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -16,7 +16,7 @@
  * STM32L151C(6-8-B)Ux.xml, STM32L151C(6-8-B)UxA.xml
  * STM32L152C(6-8-B)Tx.xml, STM32L152C(6-8-B)TxA.xml
  * STM32L152C(6-8-B)Ux.xml, STM32L152C(6-8-B)UxA.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L1xx/L100C6Ux(A)_L151C(6-8-B)(T-U)x(A)_L152C(6-8-B)(T-U)x(A)/variant_generic.cpp b/variants/STM32L1xx/L100C6Ux(A)_L151C(6-8-B)(T-U)x(A)_L152C(6-8-B)(T-U)x(A)/variant_generic.cpp
index 3b783fe936..ef29a3be80 100644
--- a/variants/STM32L1xx/L100C6Ux(A)_L151C(6-8-B)(T-U)x(A)_L152C(6-8-B)(T-U)x(A)/variant_generic.cpp
+++ b/variants/STM32L1xx/L100C6Ux(A)_L151C(6-8-B)(T-U)x(A)_L152C(6-8-B)(T-U)x(A)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L1xx/L100C6Ux(A)_L151C(6-8-B)(T-U)x(A)_L152C(6-8-B)(T-U)x(A)/variant_generic.h b/variants/STM32L1xx/L100C6Ux(A)_L151C(6-8-B)(T-U)x(A)_L152C(6-8-B)(T-U)x(A)/variant_generic.h
index 8e4b24f7f6..28ef1364eb 100644
--- a/variants/STM32L1xx/L100C6Ux(A)_L151C(6-8-B)(T-U)x(A)_L152C(6-8-B)(T-U)x(A)/variant_generic.h
+++ b/variants/STM32L1xx/L100C6Ux(A)_L151C(6-8-B)(T-U)x(A)_L152C(6-8-B)(T-U)x(A)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L1xx/L100R(8-B)Tx(A)_L151R(6-8-B)Tx(A)_L152R(6-8-B)Tx(A)/PeripheralPins.c b/variants/STM32L1xx/L100R(8-B)Tx(A)_L151R(6-8-B)Tx(A)_L152R(6-8-B)Tx(A)/PeripheralPins.c
index 80736e0571..4617afb7f4 100644
--- a/variants/STM32L1xx/L100R(8-B)Tx(A)_L151R(6-8-B)Tx(A)_L152R(6-8-B)Tx(A)/PeripheralPins.c
+++ b/variants/STM32L1xx/L100R(8-B)Tx(A)_L151R(6-8-B)Tx(A)_L152R(6-8-B)Tx(A)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -14,7 +14,7 @@
  * Automatically generated from STM32L100R(8-B)Tx.xml, STM32L100R(8-B)TxA.xml
  * STM32L151R(6-8-B)Tx.xml, STM32L151R(6-8-B)TxA.xml
  * STM32L152R(6-8-B)Tx.xml, STM32L152R(6-8-B)TxA.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L1xx/L100R(8-B)Tx(A)_L151R(6-8-B)Tx(A)_L152R(6-8-B)Tx(A)/variant_generic.cpp b/variants/STM32L1xx/L100R(8-B)Tx(A)_L151R(6-8-B)Tx(A)_L152R(6-8-B)Tx(A)/variant_generic.cpp
index 6925b03473..2d121a41b8 100644
--- a/variants/STM32L1xx/L100R(8-B)Tx(A)_L151R(6-8-B)Tx(A)_L152R(6-8-B)Tx(A)/variant_generic.cpp
+++ b/variants/STM32L1xx/L100R(8-B)Tx(A)_L151R(6-8-B)Tx(A)_L152R(6-8-B)Tx(A)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L1xx/L100R(8-B)Tx(A)_L151R(6-8-B)Tx(A)_L152R(6-8-B)Tx(A)/variant_generic.h b/variants/STM32L1xx/L100R(8-B)Tx(A)_L151R(6-8-B)Tx(A)_L152R(6-8-B)Tx(A)/variant_generic.h
index 146759fefa..a5116d2d1c 100644
--- a/variants/STM32L1xx/L100R(8-B)Tx(A)_L151R(6-8-B)Tx(A)_L152R(6-8-B)Tx(A)/variant_generic.h
+++ b/variants/STM32L1xx/L100R(8-B)Tx(A)_L151R(6-8-B)Tx(A)_L152R(6-8-B)Tx(A)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L1xx/L100RCT/PeripheralPins.c b/variants/STM32L1xx/L100RCT/PeripheralPins.c
index 2da243f004..0b0f811642 100644
--- a/variants/STM32L1xx/L100RCT/PeripheralPins.c
+++ b/variants/STM32L1xx/L100RCT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L100RCTx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L1xx/L100RCT/variant_generic.cpp b/variants/STM32L1xx/L100RCT/variant_generic.cpp
index dcc7f9c501..7682a1fd84 100644
--- a/variants/STM32L1xx/L100RCT/variant_generic.cpp
+++ b/variants/STM32L1xx/L100RCT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L1xx/L100RCT/variant_generic.h b/variants/STM32L1xx/L100RCT/variant_generic.h
index 5f1c960ffa..2ad075a895 100644
--- a/variants/STM32L1xx/L100RCT/variant_generic.h
+++ b/variants/STM32L1xx/L100RCT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L1xx/L151CC(T-U)_L152CC(T-U)/PeripheralPins.c b/variants/STM32L1xx/L151CC(T-U)_L152CC(T-U)/PeripheralPins.c
index 0148128dd1..f4ec0fd976 100644
--- a/variants/STM32L1xx/L151CC(T-U)_L152CC(T-U)/PeripheralPins.c
+++ b/variants/STM32L1xx/L151CC(T-U)_L152CC(T-U)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32L151CCTx.xml, STM32L151CCUx.xml
  * STM32L152CCTx.xml, STM32L152CCUx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L1xx/L151CC(T-U)_L152CC(T-U)/variant_generic.cpp b/variants/STM32L1xx/L151CC(T-U)_L152CC(T-U)/variant_generic.cpp
index 33ba0b9032..54b4bef1ad 100644
--- a/variants/STM32L1xx/L151CC(T-U)_L152CC(T-U)/variant_generic.cpp
+++ b/variants/STM32L1xx/L151CC(T-U)_L152CC(T-U)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L1xx/L151CC(T-U)_L152CC(T-U)/variant_generic.h b/variants/STM32L1xx/L151CC(T-U)_L152CC(T-U)/variant_generic.h
index e0a5ab474c..1745ce4c01 100644
--- a/variants/STM32L1xx/L151CC(T-U)_L152CC(T-U)/variant_generic.h
+++ b/variants/STM32L1xx/L151CC(T-U)_L152CC(T-U)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L1xx/L151QCH_L152QCH_L162QCH/PeripheralPins.c b/variants/STM32L1xx/L151QCH_L152QCH_L162QCH/PeripheralPins.c
index b3272a0c41..0461ab2cc9 100644
--- a/variants/STM32L1xx/L151QCH_L152QCH_L162QCH/PeripheralPins.c
+++ b/variants/STM32L1xx/L151QCH_L152QCH_L162QCH/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32L151QCHx.xml, STM32L152QCHx.xml
  * STM32L162QCHx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L1xx/L151QCH_L152QCH_L162QCH/variant_generic.cpp b/variants/STM32L1xx/L151QCH_L152QCH_L162QCH/variant_generic.cpp
index 29f64b86f7..459a612950 100644
--- a/variants/STM32L1xx/L151QCH_L152QCH_L162QCH/variant_generic.cpp
+++ b/variants/STM32L1xx/L151QCH_L152QCH_L162QCH/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L1xx/L151QCH_L152QCH_L162QCH/variant_generic.h b/variants/STM32L1xx/L151QCH_L152QCH_L162QCH/variant_generic.h
index f127e35857..bd8564bd0f 100644
--- a/variants/STM32L1xx/L151QCH_L152QCH_L162QCH/variant_generic.h
+++ b/variants/STM32L1xx/L151QCH_L152QCH_L162QCH/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L1xx/L151QDH_L152QDH_L162QDH/PeripheralPins.c b/variants/STM32L1xx/L151QDH_L152QDH_L162QDH/PeripheralPins.c
index 43d40a7c83..c5901aa310 100644
--- a/variants/STM32L1xx/L151QDH_L152QDH_L162QDH/PeripheralPins.c
+++ b/variants/STM32L1xx/L151QDH_L152QDH_L162QDH/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32L151QDHx.xml, STM32L152QDHx.xml
  * STM32L162QDHx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L1xx/L151QDH_L152QDH_L162QDH/variant_generic.cpp b/variants/STM32L1xx/L151QDH_L152QDH_L162QDH/variant_generic.cpp
index f06457ca3e..edc5660b60 100644
--- a/variants/STM32L1xx/L151QDH_L152QDH_L162QDH/variant_generic.cpp
+++ b/variants/STM32L1xx/L151QDH_L152QDH_L162QDH/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L1xx/L151QDH_L152QDH_L162QDH/variant_generic.h b/variants/STM32L1xx/L151QDH_L152QDH_L162QDH/variant_generic.h
index 2c8b0f7c82..8fac393198 100644
--- a/variants/STM32L1xx/L151QDH_L152QDH_L162QDH/variant_generic.h
+++ b/variants/STM32L1xx/L151QDH_L152QDH_L162QDH/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L1xx/L151QEH_L152QEH/PeripheralPins.c b/variants/STM32L1xx/L151QEH_L152QEH/PeripheralPins.c
index 47a8f17859..aaad87c2bd 100644
--- a/variants/STM32L1xx/L151QEH_L152QEH/PeripheralPins.c
+++ b/variants/STM32L1xx/L151QEH_L152QEH/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L151QEHx.xml, STM32L152QEHx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L1xx/L151QEH_L152QEH/variant_generic.cpp b/variants/STM32L1xx/L151QEH_L152QEH/variant_generic.cpp
index 4ab785a307..ff2a754522 100644
--- a/variants/STM32L1xx/L151QEH_L152QEH/variant_generic.cpp
+++ b/variants/STM32L1xx/L151QEH_L152QEH/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L1xx/L151QEH_L152QEH/variant_generic.h b/variants/STM32L1xx/L151QEH_L152QEH/variant_generic.h
index 57befb111a..5b8cc804d8 100644
--- a/variants/STM32L1xx/L151QEH_L152QEH/variant_generic.h
+++ b/variants/STM32L1xx/L151QEH_L152QEH/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L1xx/L151R(6-8-B)Hx(A)_L152R(6-8-B)Hx(A)/PeripheralPins.c b/variants/STM32L1xx/L151R(6-8-B)Hx(A)_L152R(6-8-B)Hx(A)/PeripheralPins.c
index 41841f1799..3142ed4ef3 100644
--- a/variants/STM32L1xx/L151R(6-8-B)Hx(A)_L152R(6-8-B)Hx(A)/PeripheralPins.c
+++ b/variants/STM32L1xx/L151R(6-8-B)Hx(A)_L152R(6-8-B)Hx(A)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32L151R(6-8-B)Hx.xml, STM32L151R(6-8-B)HxA.xml
  * STM32L152R(6-8-B)Hx.xml, STM32L152R(6-8-B)HxA.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L1xx/L151R(6-8-B)Hx(A)_L152R(6-8-B)Hx(A)/variant_generic.cpp b/variants/STM32L1xx/L151R(6-8-B)Hx(A)_L152R(6-8-B)Hx(A)/variant_generic.cpp
index 0e2c0eeb28..e31155eac5 100644
--- a/variants/STM32L1xx/L151R(6-8-B)Hx(A)_L152R(6-8-B)Hx(A)/variant_generic.cpp
+++ b/variants/STM32L1xx/L151R(6-8-B)Hx(A)_L152R(6-8-B)Hx(A)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L1xx/L151R(6-8-B)Hx(A)_L152R(6-8-B)Hx(A)/variant_generic.h b/variants/STM32L1xx/L151R(6-8-B)Hx(A)_L152R(6-8-B)Hx(A)/variant_generic.h
index ca07c79a95..9880d4d9b7 100644
--- a/variants/STM32L1xx/L151R(6-8-B)Hx(A)_L152R(6-8-B)Hx(A)/variant_generic.h
+++ b/variants/STM32L1xx/L151R(6-8-B)Hx(A)_L152R(6-8-B)Hx(A)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L1xx/L151RC(T-Y)x(A)_L151UCY_L152RCTx(A)_L152UCY_L162RCTx(A)/PeripheralPins.c b/variants/STM32L1xx/L151RC(T-Y)x(A)_L151UCY_L152RCTx(A)_L152UCY_L162RCTx(A)/PeripheralPins.c
index 0588c68e7f..332248c7de 100644
--- a/variants/STM32L1xx/L151RC(T-Y)x(A)_L151UCY_L152RCTx(A)_L152UCY_L162RCTx(A)/PeripheralPins.c
+++ b/variants/STM32L1xx/L151RC(T-Y)x(A)_L151UCY_L152RCTx(A)_L152UCY_L162RCTx(A)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -16,7 +16,7 @@
  * STM32L152RCTx.xml, STM32L152RCTxA.xml
  * STM32L152UCYx.xml, STM32L162RCTx.xml
  * STM32L162RCTxA.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L1xx/L151RC(T-Y)x(A)_L151UCY_L152RCTx(A)_L152UCY_L162RCTx(A)/variant_generic.cpp b/variants/STM32L1xx/L151RC(T-Y)x(A)_L151UCY_L152RCTx(A)_L152UCY_L162RCTx(A)/variant_generic.cpp
index fa19b90402..b0d5312fa0 100644
--- a/variants/STM32L1xx/L151RC(T-Y)x(A)_L151UCY_L152RCTx(A)_L152UCY_L162RCTx(A)/variant_generic.cpp
+++ b/variants/STM32L1xx/L151RC(T-Y)x(A)_L151UCY_L152RCTx(A)_L152UCY_L162RCTx(A)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L1xx/L151RC(T-Y)x(A)_L151UCY_L152RCTx(A)_L152UCY_L162RCTx(A)/variant_generic.h b/variants/STM32L1xx/L151RC(T-Y)x(A)_L151UCY_L152RCTx(A)_L152UCY_L162RCTx(A)/variant_generic.h
index dc69325d1f..70cb80a016 100644
--- a/variants/STM32L1xx/L151RC(T-Y)x(A)_L151UCY_L152RCTx(A)_L152UCY_L162RCTx(A)/variant_generic.h
+++ b/variants/STM32L1xx/L151RC(T-Y)x(A)_L151UCY_L152RCTx(A)_L152UCY_L162RCTx(A)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L1xx/L151RD(T-Y)_L152RD(T-Y)_L162RD(T-Y)/PeripheralPins.c b/variants/STM32L1xx/L151RD(T-Y)_L152RD(T-Y)_L162RD(T-Y)/PeripheralPins.c
index 1e0403d23e..281e719010 100644
--- a/variants/STM32L1xx/L151RD(T-Y)_L152RD(T-Y)_L162RD(T-Y)/PeripheralPins.c
+++ b/variants/STM32L1xx/L151RD(T-Y)_L152RD(T-Y)_L162RD(T-Y)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -14,7 +14,7 @@
  * Automatically generated from STM32L151RDTx.xml, STM32L151RDYx.xml
  * STM32L152RDTx.xml, STM32L152RDYx.xml
  * STM32L162RDTx.xml, STM32L162RDYx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L1xx/L151RD(T-Y)_L152RD(T-Y)_L162RD(T-Y)/variant_generic.cpp b/variants/STM32L1xx/L151RD(T-Y)_L152RD(T-Y)_L162RD(T-Y)/variant_generic.cpp
index ff6a367be8..d268b885bf 100644
--- a/variants/STM32L1xx/L151RD(T-Y)_L152RD(T-Y)_L162RD(T-Y)/variant_generic.cpp
+++ b/variants/STM32L1xx/L151RD(T-Y)_L152RD(T-Y)_L162RD(T-Y)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L1xx/L151RD(T-Y)_L152RD(T-Y)_L162RD(T-Y)/variant_generic.h b/variants/STM32L1xx/L151RD(T-Y)_L152RD(T-Y)_L162RD(T-Y)/variant_generic.h
index 0ecad30aff..dc07adb0e3 100644
--- a/variants/STM32L1xx/L151RD(T-Y)_L152RD(T-Y)_L162RD(T-Y)/variant_generic.h
+++ b/variants/STM32L1xx/L151RD(T-Y)_L152RD(T-Y)_L162RD(T-Y)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L1xx/L151RET_L152RET_L162RET/PeripheralPins.c b/variants/STM32L1xx/L151RET_L152RET_L162RET/PeripheralPins.c
index 2f51ad5dcc..6ff66806d0 100644
--- a/variants/STM32L1xx/L151RET_L152RET_L162RET/PeripheralPins.c
+++ b/variants/STM32L1xx/L151RET_L152RET_L162RET/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32L151RETx.xml, STM32L152RETx.xml
  * STM32L162RETx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L1xx/L151RET_L152RET_L162RET/variant_generic.cpp b/variants/STM32L1xx/L151RET_L152RET_L162RET/variant_generic.cpp
index a7e9043d4f..7383ce4d14 100644
--- a/variants/STM32L1xx/L151RET_L152RET_L162RET/variant_generic.cpp
+++ b/variants/STM32L1xx/L151RET_L152RET_L162RET/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L1xx/L151RET_L152RET_L162RET/variant_generic.h b/variants/STM32L1xx/L151RET_L152RET_L162RET/variant_generic.h
index 04b9f1d382..14862f7d49 100644
--- a/variants/STM32L1xx/L151RET_L152RET_L162RET/variant_generic.h
+++ b/variants/STM32L1xx/L151RET_L152RET_L162RET/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L1xx/L151V(8-B)(H-T)x(A)_L152V(8-B)(H-T)x(A)/PeripheralPins.c b/variants/STM32L1xx/L151V(8-B)(H-T)x(A)_L152V(8-B)(H-T)x(A)/PeripheralPins.c
index 96ab6d837f..42200c2fa9 100644
--- a/variants/STM32L1xx/L151V(8-B)(H-T)x(A)_L152V(8-B)(H-T)x(A)/PeripheralPins.c
+++ b/variants/STM32L1xx/L151V(8-B)(H-T)x(A)_L152V(8-B)(H-T)x(A)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -15,7 +15,7 @@
  * STM32L151V(8-B)Tx.xml, STM32L151V(8-B)TxA.xml
  * STM32L152V(8-B)Hx.xml, STM32L152V(8-B)HxA.xml
  * STM32L152V(8-B)Tx.xml, STM32L152V(8-B)TxA.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L1xx/L151V(8-B)(H-T)x(A)_L152V(8-B)(H-T)x(A)/variant_generic.cpp b/variants/STM32L1xx/L151V(8-B)(H-T)x(A)_L152V(8-B)(H-T)x(A)/variant_generic.cpp
index 69a32d868c..75204f3661 100644
--- a/variants/STM32L1xx/L151V(8-B)(H-T)x(A)_L152V(8-B)(H-T)x(A)/variant_generic.cpp
+++ b/variants/STM32L1xx/L151V(8-B)(H-T)x(A)_L152V(8-B)(H-T)x(A)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L1xx/L151V(8-B)(H-T)x(A)_L152V(8-B)(H-T)x(A)/variant_generic.h b/variants/STM32L1xx/L151V(8-B)(H-T)x(A)_L152V(8-B)(H-T)x(A)/variant_generic.h
index e0c047fe7a..0f1c4b9748 100644
--- a/variants/STM32L1xx/L151V(8-B)(H-T)x(A)_L152V(8-B)(H-T)x(A)/variant_generic.h
+++ b/variants/STM32L1xx/L151V(8-B)(H-T)x(A)_L152V(8-B)(H-T)x(A)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L1xx/L151VC(H-T)x(A)_L152VC(H-T)x(A)_L162VC(H-T)x(A)/PeripheralPins.c b/variants/STM32L1xx/L151VC(H-T)x(A)_L152VC(H-T)x(A)_L162VC(H-T)x(A)/PeripheralPins.c
index 8726a8d602..970a66236e 100644
--- a/variants/STM32L1xx/L151VC(H-T)x(A)_L152VC(H-T)x(A)_L162VC(H-T)x(A)/PeripheralPins.c
+++ b/variants/STM32L1xx/L151VC(H-T)x(A)_L152VC(H-T)x(A)_L162VC(H-T)x(A)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -16,7 +16,7 @@
  * STM32L152VCTx.xml, STM32L152VCTxA.xml
  * STM32L162VCHx.xml, STM32L162VCTx.xml
  * STM32L162VCTxA.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L1xx/L151VC(H-T)x(A)_L152VC(H-T)x(A)_L162VC(H-T)x(A)/variant_generic.cpp b/variants/STM32L1xx/L151VC(H-T)x(A)_L152VC(H-T)x(A)_L162VC(H-T)x(A)/variant_generic.cpp
index 95b8f59e34..44ebb2210b 100644
--- a/variants/STM32L1xx/L151VC(H-T)x(A)_L152VC(H-T)x(A)_L162VC(H-T)x(A)/variant_generic.cpp
+++ b/variants/STM32L1xx/L151VC(H-T)x(A)_L152VC(H-T)x(A)_L162VC(H-T)x(A)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L1xx/L151VC(H-T)x(A)_L152VC(H-T)x(A)_L162VC(H-T)x(A)/variant_generic.h b/variants/STM32L1xx/L151VC(H-T)x(A)_L152VC(H-T)x(A)_L162VC(H-T)x(A)/variant_generic.h
index af3ef57923..237700f485 100644
--- a/variants/STM32L1xx/L151VC(H-T)x(A)_L152VC(H-T)x(A)_L162VC(H-T)x(A)/variant_generic.h
+++ b/variants/STM32L1xx/L151VC(H-T)x(A)_L152VC(H-T)x(A)_L162VC(H-T)x(A)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L1xx/L151VD(T-Y)xX_L151VE(T-Y)_L152VDTxX_L152VE(T-Y)_L162VDYxX_L162VE(T-Y)/PeripheralPins.c b/variants/STM32L1xx/L151VD(T-Y)xX_L151VE(T-Y)_L152VDTxX_L152VE(T-Y)_L162VDYxX_L162VE(T-Y)/PeripheralPins.c
index 2f99824a1a..b8591e4ae8 100644
--- a/variants/STM32L1xx/L151VD(T-Y)xX_L151VE(T-Y)_L152VDTxX_L152VE(T-Y)_L162VDYxX_L162VE(T-Y)/PeripheralPins.c
+++ b/variants/STM32L1xx/L151VD(T-Y)xX_L151VE(T-Y)_L152VDTxX_L152VE(T-Y)_L162VDYxX_L162VE(T-Y)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -16,7 +16,7 @@
  * STM32L152VDTxX.xml, STM32L152VETx.xml
  * STM32L152VEYx.xml, STM32L162VDYxX.xml
  * STM32L162VETx.xml, STM32L162VEYx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L1xx/L151VD(T-Y)xX_L151VE(T-Y)_L152VDTxX_L152VE(T-Y)_L162VDYxX_L162VE(T-Y)/variant_generic.cpp b/variants/STM32L1xx/L151VD(T-Y)xX_L151VE(T-Y)_L152VDTxX_L152VE(T-Y)_L162VDYxX_L162VE(T-Y)/variant_generic.cpp
index 3afca666fc..6fecf7a124 100644
--- a/variants/STM32L1xx/L151VD(T-Y)xX_L151VE(T-Y)_L152VDTxX_L152VE(T-Y)_L162VDYxX_L162VE(T-Y)/variant_generic.cpp
+++ b/variants/STM32L1xx/L151VD(T-Y)xX_L151VE(T-Y)_L152VDTxX_L152VE(T-Y)_L162VDYxX_L162VE(T-Y)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L1xx/L151VD(T-Y)xX_L151VE(T-Y)_L152VDTxX_L152VE(T-Y)_L162VDYxX_L162VE(T-Y)/variant_generic.h b/variants/STM32L1xx/L151VD(T-Y)xX_L151VE(T-Y)_L152VDTxX_L152VE(T-Y)_L162VDYxX_L162VE(T-Y)/variant_generic.h
index f94db12023..2635392eef 100644
--- a/variants/STM32L1xx/L151VD(T-Y)xX_L151VE(T-Y)_L152VDTxX_L152VE(T-Y)_L162VDYxX_L162VE(T-Y)/variant_generic.h
+++ b/variants/STM32L1xx/L151VD(T-Y)xX_L151VE(T-Y)_L152VDTxX_L152VE(T-Y)_L162VDYxX_L162VE(T-Y)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L1xx/L151VDT_L152VDT_L162VDT/PeripheralPins.c b/variants/STM32L1xx/L151VDT_L152VDT_L162VDT/PeripheralPins.c
index 265c9056c2..b0734a71e9 100644
--- a/variants/STM32L1xx/L151VDT_L152VDT_L162VDT/PeripheralPins.c
+++ b/variants/STM32L1xx/L151VDT_L152VDT_L162VDT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32L151VDTx.xml, STM32L152VDTx.xml
  * STM32L162VDTx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L1xx/L151VDT_L152VDT_L162VDT/variant_generic.cpp b/variants/STM32L1xx/L151VDT_L152VDT_L162VDT/variant_generic.cpp
index 3b2aa17808..207bd415ed 100644
--- a/variants/STM32L1xx/L151VDT_L152VDT_L162VDT/variant_generic.cpp
+++ b/variants/STM32L1xx/L151VDT_L152VDT_L162VDT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L1xx/L151VDT_L152VDT_L162VDT/variant_generic.h b/variants/STM32L1xx/L151VDT_L152VDT_L162VDT/variant_generic.h
index 6c77dc6203..06c598cf17 100644
--- a/variants/STM32L1xx/L151VDT_L152VDT_L162VDT/variant_generic.h
+++ b/variants/STM32L1xx/L151VDT_L152VDT_L162VDT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L1xx/L151ZCT_L152ZCT_L162ZCT/PeripheralPins.c b/variants/STM32L1xx/L151ZCT_L152ZCT_L162ZCT/PeripheralPins.c
index 82c7312d2e..6101406a7e 100644
--- a/variants/STM32L1xx/L151ZCT_L152ZCT_L162ZCT/PeripheralPins.c
+++ b/variants/STM32L1xx/L151ZCT_L152ZCT_L162ZCT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32L151ZCTx.xml, STM32L152ZCTx.xml
  * STM32L162ZCTx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L1xx/L151ZCT_L152ZCT_L162ZCT/variant_generic.cpp b/variants/STM32L1xx/L151ZCT_L152ZCT_L162ZCT/variant_generic.cpp
index e20591fc9a..766acb9974 100644
--- a/variants/STM32L1xx/L151ZCT_L152ZCT_L162ZCT/variant_generic.cpp
+++ b/variants/STM32L1xx/L151ZCT_L152ZCT_L162ZCT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L1xx/L151ZCT_L152ZCT_L162ZCT/variant_generic.h b/variants/STM32L1xx/L151ZCT_L152ZCT_L162ZCT/variant_generic.h
index cb0248d941..ee6c6b5ebc 100644
--- a/variants/STM32L1xx/L151ZCT_L152ZCT_L162ZCT/variant_generic.h
+++ b/variants/STM32L1xx/L151ZCT_L152ZCT_L162ZCT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L1xx/L151ZDT_L152ZDT_L162ZDT/PeripheralPins.c b/variants/STM32L1xx/L151ZDT_L152ZDT_L162ZDT/PeripheralPins.c
index 9c8fd50c71..ba67a7facc 100644
--- a/variants/STM32L1xx/L151ZDT_L152ZDT_L162ZDT/PeripheralPins.c
+++ b/variants/STM32L1xx/L151ZDT_L152ZDT_L162ZDT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32L151ZDTx.xml, STM32L152ZDTx.xml
  * STM32L162ZDTx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L1xx/L151ZDT_L152ZDT_L162ZDT/variant_generic.cpp b/variants/STM32L1xx/L151ZDT_L152ZDT_L162ZDT/variant_generic.cpp
index ca752188c4..a0ff156ff3 100644
--- a/variants/STM32L1xx/L151ZDT_L152ZDT_L162ZDT/variant_generic.cpp
+++ b/variants/STM32L1xx/L151ZDT_L152ZDT_L162ZDT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L1xx/L151ZDT_L152ZDT_L162ZDT/variant_generic.h b/variants/STM32L1xx/L151ZDT_L152ZDT_L162ZDT/variant_generic.h
index f7afb2dc2e..a6c3f10183 100644
--- a/variants/STM32L1xx/L151ZDT_L152ZDT_L162ZDT/variant_generic.h
+++ b/variants/STM32L1xx/L151ZDT_L152ZDT_L162ZDT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L1xx/L151ZET_L152ZET_L162ZET/PeripheralPins.c b/variants/STM32L1xx/L151ZET_L152ZET_L162ZET/PeripheralPins.c
index 9656e9d7eb..0887df6a0c 100644
--- a/variants/STM32L1xx/L151ZET_L152ZET_L162ZET/PeripheralPins.c
+++ b/variants/STM32L1xx/L151ZET_L152ZET_L162ZET/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32L151ZETx.xml, STM32L152ZETx.xml
  * STM32L162ZETx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L1xx/L151ZET_L152ZET_L162ZET/variant_generic.cpp b/variants/STM32L1xx/L151ZET_L152ZET_L162ZET/variant_generic.cpp
index d96a764892..3912e01435 100644
--- a/variants/STM32L1xx/L151ZET_L152ZET_L162ZET/variant_generic.cpp
+++ b/variants/STM32L1xx/L151ZET_L152ZET_L162ZET/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L1xx/L151ZET_L152ZET_L162ZET/variant_generic.h b/variants/STM32L1xx/L151ZET_L152ZET_L162ZET/variant_generic.h
index e06af6ceb6..c2426f25e8 100644
--- a/variants/STM32L1xx/L151ZET_L152ZET_L162ZET/variant_generic.h
+++ b/variants/STM32L1xx/L151ZET_L152ZET_L162ZET/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L412C(8-B)(T-U)_L422CB(T-U)/PeripheralPins.c b/variants/STM32L4xx/L412C(8-B)(T-U)_L422CB(T-U)/PeripheralPins.c
index cdef73ca34..1181a94f8f 100644
--- a/variants/STM32L4xx/L412C(8-B)(T-U)_L422CB(T-U)/PeripheralPins.c
+++ b/variants/STM32L4xx/L412C(8-B)(T-U)_L422CB(T-U)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -14,7 +14,7 @@
  * Automatically generated from STM32L412C8Tx.xml, STM32L412C8Ux.xml
  * STM32L412CBTx.xml, STM32L412CBUx.xml
  * STM32L422CBTx.xml, STM32L422CBUx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L412C(8-B)(T-U)_L422CB(T-U)/variant_generic.cpp b/variants/STM32L4xx/L412C(8-B)(T-U)_L422CB(T-U)/variant_generic.cpp
index af660c6261..c5e2a55d0f 100644
--- a/variants/STM32L4xx/L412C(8-B)(T-U)_L422CB(T-U)/variant_generic.cpp
+++ b/variants/STM32L4xx/L412C(8-B)(T-U)_L422CB(T-U)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L412C(8-B)(T-U)_L422CB(T-U)/variant_generic.h b/variants/STM32L4xx/L412C(8-B)(T-U)_L422CB(T-U)/variant_generic.h
index 181eef87ab..45b48a0284 100644
--- a/variants/STM32L4xx/L412C(8-B)(T-U)_L422CB(T-U)/variant_generic.h
+++ b/variants/STM32L4xx/L412C(8-B)(T-U)_L422CB(T-U)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L412CB(T-U)xP/PeripheralPins.c b/variants/STM32L4xx/L412CB(T-U)xP/PeripheralPins.c
index a711c85e77..358552012d 100644
--- a/variants/STM32L4xx/L412CB(T-U)xP/PeripheralPins.c
+++ b/variants/STM32L4xx/L412CB(T-U)xP/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L412CBTxP.xml, STM32L412CBUxP.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L412CB(T-U)xP/variant_generic.cpp b/variants/STM32L4xx/L412CB(T-U)xP/variant_generic.cpp
index 712ffd8101..984178e85b 100644
--- a/variants/STM32L4xx/L412CB(T-U)xP/variant_generic.cpp
+++ b/variants/STM32L4xx/L412CB(T-U)xP/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L412CB(T-U)xP/variant_generic.h b/variants/STM32L4xx/L412CB(T-U)xP/variant_generic.h
index 2141be8618..7a7bdd46f4 100644
--- a/variants/STM32L4xx/L412CB(T-U)xP/variant_generic.h
+++ b/variants/STM32L4xx/L412CB(T-U)xP/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L412K(8-B)(T-U)_L422KB(T-U)/PeripheralPins.c b/variants/STM32L4xx/L412K(8-B)(T-U)_L422KB(T-U)/PeripheralPins.c
index 4f74b087a9..67fadbd4c3 100644
--- a/variants/STM32L4xx/L412K(8-B)(T-U)_L422KB(T-U)/PeripheralPins.c
+++ b/variants/STM32L4xx/L412K(8-B)(T-U)_L422KB(T-U)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -14,7 +14,7 @@
  * Automatically generated from STM32L412K8Tx.xml, STM32L412K8Ux.xml
  * STM32L412KBTx.xml, STM32L412KBUx.xml
  * STM32L422KBTx.xml, STM32L422KBUx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L412K(8-B)(T-U)_L422KB(T-U)/variant_generic.cpp b/variants/STM32L4xx/L412K(8-B)(T-U)_L422KB(T-U)/variant_generic.cpp
index f9a1cd6b4c..cce495f125 100644
--- a/variants/STM32L4xx/L412K(8-B)(T-U)_L422KB(T-U)/variant_generic.cpp
+++ b/variants/STM32L4xx/L412K(8-B)(T-U)_L422KB(T-U)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L412K(8-B)(T-U)_L422KB(T-U)/variant_generic.h b/variants/STM32L4xx/L412K(8-B)(T-U)_L422KB(T-U)/variant_generic.h
index f251a9d50b..237562ab93 100644
--- a/variants/STM32L4xx/L412K(8-B)(T-U)_L422KB(T-U)/variant_generic.h
+++ b/variants/STM32L4xx/L412K(8-B)(T-U)_L422KB(T-U)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L412R(8-B)(I-T)_L422RB(I-T)/PeripheralPins.c b/variants/STM32L4xx/L412R(8-B)(I-T)_L422RB(I-T)/PeripheralPins.c
index 703b335c8c..593afc7bf2 100644
--- a/variants/STM32L4xx/L412R(8-B)(I-T)_L422RB(I-T)/PeripheralPins.c
+++ b/variants/STM32L4xx/L412R(8-B)(I-T)_L422RB(I-T)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -14,7 +14,7 @@
  * Automatically generated from STM32L412R8Ix.xml, STM32L412R8Tx.xml
  * STM32L412RBIx.xml, STM32L412RBTx.xml
  * STM32L422RBIx.xml, STM32L422RBTx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L412R(8-B)(I-T)_L422RB(I-T)/variant_generic.cpp b/variants/STM32L4xx/L412R(8-B)(I-T)_L422RB(I-T)/variant_generic.cpp
index 060b2eb680..d61f412ede 100644
--- a/variants/STM32L4xx/L412R(8-B)(I-T)_L422RB(I-T)/variant_generic.cpp
+++ b/variants/STM32L4xx/L412R(8-B)(I-T)_L422RB(I-T)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L412R(8-B)(I-T)_L422RB(I-T)/variant_generic.h b/variants/STM32L4xx/L412R(8-B)(I-T)_L422RB(I-T)/variant_generic.h
index 2a36660d4b..a6df8f45bd 100644
--- a/variants/STM32L4xx/L412R(8-B)(I-T)_L422RB(I-T)/variant_generic.h
+++ b/variants/STM32L4xx/L412R(8-B)(I-T)_L422RB(I-T)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L412RB(I-T)xP/PeripheralPins.c b/variants/STM32L4xx/L412RB(I-T)xP/PeripheralPins.c
index 617e799395..9b3b4fd3e6 100644
--- a/variants/STM32L4xx/L412RB(I-T)xP/PeripheralPins.c
+++ b/variants/STM32L4xx/L412RB(I-T)xP/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L412RBIxP.xml, STM32L412RBTxP.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L412RB(I-T)xP/variant_generic.cpp b/variants/STM32L4xx/L412RB(I-T)xP/variant_generic.cpp
index 800498a44a..3e81eae7c9 100644
--- a/variants/STM32L4xx/L412RB(I-T)xP/variant_generic.cpp
+++ b/variants/STM32L4xx/L412RB(I-T)xP/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L412RB(I-T)xP/variant_generic.h b/variants/STM32L4xx/L412RB(I-T)xP/variant_generic.h
index 08447c2dd2..509b1d2ef9 100644
--- a/variants/STM32L4xx/L412RB(I-T)xP/variant_generic.h
+++ b/variants/STM32L4xx/L412RB(I-T)xP/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L412T(8-B)Y_L422TBY/PeripheralPins.c b/variants/STM32L4xx/L412T(8-B)Y_L422TBY/PeripheralPins.c
index 9c47ded7e7..14b737fe3b 100644
--- a/variants/STM32L4xx/L412T(8-B)Y_L422TBY/PeripheralPins.c
+++ b/variants/STM32L4xx/L412T(8-B)Y_L422TBY/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32L412T8Yx.xml, STM32L412TBYx.xml
  * STM32L422TBYx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L412T(8-B)Y_L422TBY/variant_generic.cpp b/variants/STM32L4xx/L412T(8-B)Y_L422TBY/variant_generic.cpp
index d09e8e2f68..d660e5172a 100644
--- a/variants/STM32L4xx/L412T(8-B)Y_L422TBY/variant_generic.cpp
+++ b/variants/STM32L4xx/L412T(8-B)Y_L422TBY/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L412T(8-B)Y_L422TBY/variant_generic.h b/variants/STM32L4xx/L412T(8-B)Y_L422TBY/variant_generic.h
index 9192e59141..bd2d77172a 100644
--- a/variants/STM32L4xx/L412T(8-B)Y_L422TBY/variant_generic.h
+++ b/variants/STM32L4xx/L412T(8-B)Y_L422TBY/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L412TBYxP/PeripheralPins.c b/variants/STM32L4xx/L412TBYxP/PeripheralPins.c
index 52b95ec4ec..2a7c3cab57 100644
--- a/variants/STM32L4xx/L412TBYxP/PeripheralPins.c
+++ b/variants/STM32L4xx/L412TBYxP/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L412TBYxP.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L412TBYxP/variant_generic.cpp b/variants/STM32L4xx/L412TBYxP/variant_generic.cpp
index aee368adb8..6019cf3aae 100644
--- a/variants/STM32L4xx/L412TBYxP/variant_generic.cpp
+++ b/variants/STM32L4xx/L412TBYxP/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L412TBYxP/variant_generic.h b/variants/STM32L4xx/L412TBYxP/variant_generic.h
index ea432e576c..14c3815862 100644
--- a/variants/STM32L4xx/L412TBYxP/variant_generic.h
+++ b/variants/STM32L4xx/L412TBYxP/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L431C(B-C)(T-U)/PeripheralPins.c b/variants/STM32L4xx/L431C(B-C)(T-U)/PeripheralPins.c
index 2ad796e989..8841dc6be3 100644
--- a/variants/STM32L4xx/L431C(B-C)(T-U)/PeripheralPins.c
+++ b/variants/STM32L4xx/L431C(B-C)(T-U)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L431C(B-C)Tx.xml, STM32L431C(B-C)Ux.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L431C(B-C)(T-U)/variant_generic.cpp b/variants/STM32L4xx/L431C(B-C)(T-U)/variant_generic.cpp
index 9c912f6fcc..3c40f60e5a 100644
--- a/variants/STM32L4xx/L431C(B-C)(T-U)/variant_generic.cpp
+++ b/variants/STM32L4xx/L431C(B-C)(T-U)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L431C(B-C)(T-U)/variant_generic.h b/variants/STM32L4xx/L431C(B-C)(T-U)/variant_generic.h
index fbb9d091e6..b3f3cacaf6 100644
--- a/variants/STM32L4xx/L431C(B-C)(T-U)/variant_generic.h
+++ b/variants/STM32L4xx/L431C(B-C)(T-U)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L431C(B-C)Y/PeripheralPins.c b/variants/STM32L4xx/L431C(B-C)Y/PeripheralPins.c
index 8b3efe753a..358337eaaf 100644
--- a/variants/STM32L4xx/L431C(B-C)Y/PeripheralPins.c
+++ b/variants/STM32L4xx/L431C(B-C)Y/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L431C(B-C)Yx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L431C(B-C)Y/variant_generic.cpp b/variants/STM32L4xx/L431C(B-C)Y/variant_generic.cpp
index 6c65ae79fe..682adc9281 100644
--- a/variants/STM32L4xx/L431C(B-C)Y/variant_generic.cpp
+++ b/variants/STM32L4xx/L431C(B-C)Y/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L431C(B-C)Y/variant_generic.h b/variants/STM32L4xx/L431C(B-C)Y/variant_generic.h
index 2f87f4c8e9..61d6a9acf7 100644
--- a/variants/STM32L4xx/L431C(B-C)Y/variant_generic.h
+++ b/variants/STM32L4xx/L431C(B-C)Y/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L431K(B-C)U/PeripheralPins.c b/variants/STM32L4xx/L431K(B-C)U/PeripheralPins.c
index a2f68db754..5443855be1 100644
--- a/variants/STM32L4xx/L431K(B-C)U/PeripheralPins.c
+++ b/variants/STM32L4xx/L431K(B-C)U/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L431K(B-C)Ux.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L431K(B-C)U/variant_generic.cpp b/variants/STM32L4xx/L431K(B-C)U/variant_generic.cpp
index 74f1df4036..99c66d8448 100644
--- a/variants/STM32L4xx/L431K(B-C)U/variant_generic.cpp
+++ b/variants/STM32L4xx/L431K(B-C)U/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L431K(B-C)U/variant_generic.h b/variants/STM32L4xx/L431K(B-C)U/variant_generic.h
index 79cabdce99..2e458674ee 100644
--- a/variants/STM32L4xx/L431K(B-C)U/variant_generic.h
+++ b/variants/STM32L4xx/L431K(B-C)U/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L431R(B-C)(I-T-Y)/PeripheralPins.c b/variants/STM32L4xx/L431R(B-C)(I-T-Y)/PeripheralPins.c
index 584a1e326b..d3c41e8797 100644
--- a/variants/STM32L4xx/L431R(B-C)(I-T-Y)/PeripheralPins.c
+++ b/variants/STM32L4xx/L431R(B-C)(I-T-Y)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32L431R(B-C)Ix.xml, STM32L431R(B-C)Tx.xml
  * STM32L431R(B-C)Yx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L431R(B-C)(I-T-Y)/variant_generic.cpp b/variants/STM32L4xx/L431R(B-C)(I-T-Y)/variant_generic.cpp
index 0eab967c1d..3e14155efa 100644
--- a/variants/STM32L4xx/L431R(B-C)(I-T-Y)/variant_generic.cpp
+++ b/variants/STM32L4xx/L431R(B-C)(I-T-Y)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L431R(B-C)(I-T-Y)/variant_generic.h b/variants/STM32L4xx/L431R(B-C)(I-T-Y)/variant_generic.h
index e16d9b187b..df04501042 100644
--- a/variants/STM32L4xx/L431R(B-C)(I-T-Y)/variant_generic.h
+++ b/variants/STM32L4xx/L431R(B-C)(I-T-Y)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L431VC(I-T)/PeripheralPins.c b/variants/STM32L4xx/L431VC(I-T)/PeripheralPins.c
index df0d06e069..d4cc880e8e 100644
--- a/variants/STM32L4xx/L431VC(I-T)/PeripheralPins.c
+++ b/variants/STM32L4xx/L431VC(I-T)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L431VCIx.xml, STM32L431VCTx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L431VC(I-T)/variant_generic.cpp b/variants/STM32L4xx/L431VC(I-T)/variant_generic.cpp
index dacfe41845..65a9b3823f 100644
--- a/variants/STM32L4xx/L431VC(I-T)/variant_generic.cpp
+++ b/variants/STM32L4xx/L431VC(I-T)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L431VC(I-T)/variant_generic.h b/variants/STM32L4xx/L431VC(I-T)/variant_generic.h
index 8f32f2ce9c..a9f1771063 100644
--- a/variants/STM32L4xx/L431VC(I-T)/variant_generic.h
+++ b/variants/STM32L4xx/L431VC(I-T)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L432K(B-C)U_L442KCU/PeripheralPins.c b/variants/STM32L4xx/L432K(B-C)U_L442KCU/PeripheralPins.c
index a50bf86708..2450fa10a2 100644
--- a/variants/STM32L4xx/L432K(B-C)U_L442KCU/PeripheralPins.c
+++ b/variants/STM32L4xx/L432K(B-C)U_L442KCU/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L432K(B-C)Ux.xml, STM32L442KCUx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L432K(B-C)U_L442KCU/variant_generic.cpp b/variants/STM32L4xx/L432K(B-C)U_L442KCU/variant_generic.cpp
index 169c77c02c..d9c49bf853 100644
--- a/variants/STM32L4xx/L432K(B-C)U_L442KCU/variant_generic.cpp
+++ b/variants/STM32L4xx/L432K(B-C)U_L442KCU/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L432K(B-C)U_L442KCU/variant_generic.h b/variants/STM32L4xx/L432K(B-C)U_L442KCU/variant_generic.h
index 79cabdce99..2e458674ee 100644
--- a/variants/STM32L4xx/L432K(B-C)U_L442KCU/variant_generic.h
+++ b/variants/STM32L4xx/L432K(B-C)U_L442KCU/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L433C(B-C)(T-U)_L443CC(T-U)/PeripheralPins.c b/variants/STM32L4xx/L433C(B-C)(T-U)_L443CC(T-U)/PeripheralPins.c
index 7468cb49dc..ad10259984 100644
--- a/variants/STM32L4xx/L433C(B-C)(T-U)_L443CC(T-U)/PeripheralPins.c
+++ b/variants/STM32L4xx/L433C(B-C)(T-U)_L443CC(T-U)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32L433C(B-C)Tx.xml, STM32L433C(B-C)Ux.xml
  * STM32L443CCTx.xml, STM32L443CCUx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L433C(B-C)(T-U)_L443CC(T-U)/variant_generic.cpp b/variants/STM32L4xx/L433C(B-C)(T-U)_L443CC(T-U)/variant_generic.cpp
index 7d9108fd18..f824d985df 100644
--- a/variants/STM32L4xx/L433C(B-C)(T-U)_L443CC(T-U)/variant_generic.cpp
+++ b/variants/STM32L4xx/L433C(B-C)(T-U)_L443CC(T-U)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L433C(B-C)(T-U)_L443CC(T-U)/variant_generic.h b/variants/STM32L4xx/L433C(B-C)(T-U)_L443CC(T-U)/variant_generic.h
index fbb9d091e6..b3f3cacaf6 100644
--- a/variants/STM32L4xx/L433C(B-C)(T-U)_L443CC(T-U)/variant_generic.h
+++ b/variants/STM32L4xx/L433C(B-C)(T-U)_L443CC(T-U)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L433C(B-C)Y_L443CCY/PeripheralPins.c b/variants/STM32L4xx/L433C(B-C)Y_L443CC(F-Y)/PeripheralPins.c
similarity index 99%
rename from variants/STM32L4xx/L433C(B-C)Y_L443CCY/PeripheralPins.c
rename to variants/STM32L4xx/L433C(B-C)Y_L443CC(F-Y)/PeripheralPins.c
index 59f425b243..992fd7ec27 100644
--- a/variants/STM32L4xx/L433C(B-C)Y_L443CCY/PeripheralPins.c
+++ b/variants/STM32L4xx/L433C(B-C)Y_L443CC(F-Y)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -11,8 +11,9 @@
  *******************************************************************************
  */
 /*
- * Automatically generated from STM32L433C(B-C)Yx.xml, STM32L443CCYx.xml
- * CubeMX DB release 6.0.30
+ * Automatically generated from STM32L433C(B-C)Yx.xml, STM32L443CCFx.xml
+ * STM32L443CCYx.xml
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L433C(B-C)Y_L443CCY/PinNamesVar.h b/variants/STM32L4xx/L433C(B-C)Y_L443CC(F-Y)/PinNamesVar.h
similarity index 100%
rename from variants/STM32L4xx/L433C(B-C)Y_L443CCY/PinNamesVar.h
rename to variants/STM32L4xx/L433C(B-C)Y_L443CC(F-Y)/PinNamesVar.h
diff --git a/variants/STM32L4xx/L433C(B-C)Y_L443CCY/boards_entry.txt b/variants/STM32L4xx/L433C(B-C)Y_L443CC(F-Y)/boards_entry.txt
similarity index 75%
rename from variants/STM32L4xx/L433C(B-C)Y_L443CCY/boards_entry.txt
rename to variants/STM32L4xx/L433C(B-C)Y_L443CC(F-Y)/boards_entry.txt
index f8c22f3dd5..22abb6b92b 100644
--- a/variants/STM32L4xx/L433C(B-C)Y_L443CCY/boards_entry.txt
+++ b/variants/STM32L4xx/L433C(B-C)Y_L443CC(F-Y)/boards_entry.txt
@@ -9,7 +9,7 @@ GenL4.menu.pnum.GENERIC_L433CBYX.upload.maximum_size=131072
 GenL4.menu.pnum.GENERIC_L433CBYX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L433CBYX.build.board=GENERIC_L433CBYX
 GenL4.menu.pnum.GENERIC_L433CBYX.build.product_line=STM32L433xx
-GenL4.menu.pnum.GENERIC_L433CBYX.build.variant=STM32L4xx/L433C(B-C)Y_L443CCY
+GenL4.menu.pnum.GENERIC_L433CBYX.build.variant=STM32L4xx/L433C(B-C)Y_L443CC(F-Y)
 
 # Generic L433CCYx
 GenL4.menu.pnum.GENERIC_L433CCYX=Generic L433CCYx
@@ -17,7 +17,15 @@ GenL4.menu.pnum.GENERIC_L433CCYX.upload.maximum_size=262144
 GenL4.menu.pnum.GENERIC_L433CCYX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L433CCYX.build.board=GENERIC_L433CCYX
 GenL4.menu.pnum.GENERIC_L433CCYX.build.product_line=STM32L433xx
-GenL4.menu.pnum.GENERIC_L433CCYX.build.variant=STM32L4xx/L433C(B-C)Y_L443CCY
+GenL4.menu.pnum.GENERIC_L433CCYX.build.variant=STM32L4xx/L433C(B-C)Y_L443CC(F-Y)
+
+# Generic L443CCFx
+GenL4.menu.pnum.GENERIC_L443CCFX=Generic L443CCFx
+GenL4.menu.pnum.GENERIC_L443CCFX.upload.maximum_size=262144
+GenL4.menu.pnum.GENERIC_L443CCFX.upload.maximum_data_size=65536
+GenL4.menu.pnum.GENERIC_L443CCFX.build.board=GENERIC_L443CCFX
+GenL4.menu.pnum.GENERIC_L443CCFX.build.product_line=STM32L443xx
+GenL4.menu.pnum.GENERIC_L443CCFX.build.variant=STM32L4xx/L433C(B-C)Y_L443CC(F-Y)
 
 # Generic L443CCYx
 GenL4.menu.pnum.GENERIC_L443CCYX=Generic L443CCYx
@@ -25,5 +33,5 @@ GenL4.menu.pnum.GENERIC_L443CCYX.upload.maximum_size=262144
 GenL4.menu.pnum.GENERIC_L443CCYX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L443CCYX.build.board=GENERIC_L443CCYX
 GenL4.menu.pnum.GENERIC_L443CCYX.build.product_line=STM32L443xx
-GenL4.menu.pnum.GENERIC_L443CCYX.build.variant=STM32L4xx/L433C(B-C)Y_L443CCY
+GenL4.menu.pnum.GENERIC_L443CCYX.build.variant=STM32L4xx/L433C(B-C)Y_L443CC(F-Y)
 
diff --git a/variants/STM32L4xx/L433C(B-C)Y_L443CCY/generic_clock.c b/variants/STM32L4xx/L433C(B-C)Y_L443CC(F-Y)/generic_clock.c
similarity index 87%
rename from variants/STM32L4xx/L433C(B-C)Y_L443CCY/generic_clock.c
rename to variants/STM32L4xx/L433C(B-C)Y_L443CC(F-Y)/generic_clock.c
index 0d25ced1d8..6dfb25fefe 100644
--- a/variants/STM32L4xx/L433C(B-C)Y_L443CCY/generic_clock.c
+++ b/variants/STM32L4xx/L433C(B-C)Y_L443CC(F-Y)/generic_clock.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -11,7 +11,7 @@
  *******************************************************************************
  */
 #if defined(ARDUINO_GENERIC_L433CBYX) || defined(ARDUINO_GENERIC_L433CCYX) ||\
-    defined(ARDUINO_GENERIC_L443CCYX)
+    defined(ARDUINO_GENERIC_L443CCFX) || defined(ARDUINO_GENERIC_L443CCYX)
 #include "pins_arduino.h"
 
 /**
diff --git a/variants/STM32L4xx/L433C(B-C)Y_L443CCY/variant_generic.cpp b/variants/STM32L4xx/L433C(B-C)Y_L443CC(F-Y)/variant_generic.cpp
similarity index 93%
rename from variants/STM32L4xx/L433C(B-C)Y_L443CCY/variant_generic.cpp
rename to variants/STM32L4xx/L433C(B-C)Y_L443CC(F-Y)/variant_generic.cpp
index 559c052204..514dcc7f39 100644
--- a/variants/STM32L4xx/L433C(B-C)Y_L443CCY/variant_generic.cpp
+++ b/variants/STM32L4xx/L433C(B-C)Y_L443CC(F-Y)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -11,7 +11,7 @@
  *******************************************************************************
  */
 #if defined(ARDUINO_GENERIC_L433CBYX) || defined(ARDUINO_GENERIC_L433CCYX) ||\
-    defined(ARDUINO_GENERIC_L443CCYX)
+    defined(ARDUINO_GENERIC_L443CCFX) || defined(ARDUINO_GENERIC_L443CCYX)
 #include "pins_arduino.h"
 
 // Digital PinName array
diff --git a/variants/STM32L4xx/L433C(B-C)Y_L443CCY/variant_generic.h b/variants/STM32L4xx/L433C(B-C)Y_L443CC(F-Y)/variant_generic.h
similarity index 99%
rename from variants/STM32L4xx/L433C(B-C)Y_L443CCY/variant_generic.h
rename to variants/STM32L4xx/L433C(B-C)Y_L443CC(F-Y)/variant_generic.h
index 2f87f4c8e9..61d6a9acf7 100644
--- a/variants/STM32L4xx/L433C(B-C)Y_L443CCY/variant_generic.h
+++ b/variants/STM32L4xx/L433C(B-C)Y_L443CC(F-Y)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L433R(B-C)(I-T-Y)_L443RC(I-T-Y)/PeripheralPins.c b/variants/STM32L4xx/L433R(B-C)(I-T-Y)_L443RC(I-T-Y)/PeripheralPins.c
index 1ee0b0d07c..3fbc3143d3 100644
--- a/variants/STM32L4xx/L433R(B-C)(I-T-Y)_L443RC(I-T-Y)/PeripheralPins.c
+++ b/variants/STM32L4xx/L433R(B-C)(I-T-Y)_L443RC(I-T-Y)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -14,7 +14,7 @@
  * Automatically generated from STM32L433R(B-C)Ix.xml, STM32L433R(B-C)Tx.xml
  * STM32L433R(B-C)Yx.xml, STM32L443RCIx.xml
  * STM32L443RCTx.xml, STM32L443RCYx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L433R(B-C)(I-T-Y)_L443RC(I-T-Y)/variant_generic.cpp b/variants/STM32L4xx/L433R(B-C)(I-T-Y)_L443RC(I-T-Y)/variant_generic.cpp
index bffa1f32fa..f8eef18086 100644
--- a/variants/STM32L4xx/L433R(B-C)(I-T-Y)_L443RC(I-T-Y)/variant_generic.cpp
+++ b/variants/STM32L4xx/L433R(B-C)(I-T-Y)_L443RC(I-T-Y)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L433R(B-C)(I-T-Y)_L443RC(I-T-Y)/variant_generic.h b/variants/STM32L4xx/L433R(B-C)(I-T-Y)_L443RC(I-T-Y)/variant_generic.h
index e16d9b187b..df04501042 100644
--- a/variants/STM32L4xx/L433R(B-C)(I-T-Y)_L443RC(I-T-Y)/variant_generic.h
+++ b/variants/STM32L4xx/L433R(B-C)(I-T-Y)_L443RC(I-T-Y)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L433RCTxP/PeripheralPins.c b/variants/STM32L4xx/L433RCTxP/PeripheralPins.c
index 6b22afbbef..a811e2d9ed 100644
--- a/variants/STM32L4xx/L433RCTxP/PeripheralPins.c
+++ b/variants/STM32L4xx/L433RCTxP/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L433RCTxP.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L433RCTxP/variant_generic.cpp b/variants/STM32L4xx/L433RCTxP/variant_generic.cpp
index 34ed31a884..61d97e4d47 100644
--- a/variants/STM32L4xx/L433RCTxP/variant_generic.cpp
+++ b/variants/STM32L4xx/L433RCTxP/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L433RCTxP/variant_generic.h b/variants/STM32L4xx/L433RCTxP/variant_generic.h
index f2270b1014..cc77719e52 100644
--- a/variants/STM32L4xx/L433RCTxP/variant_generic.h
+++ b/variants/STM32L4xx/L433RCTxP/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L433VC(I-T)_L443VC(I-T)/PeripheralPins.c b/variants/STM32L4xx/L433VC(I-T)_L443VC(I-T)/PeripheralPins.c
index 152c72c934..8445880db1 100644
--- a/variants/STM32L4xx/L433VC(I-T)_L443VC(I-T)/PeripheralPins.c
+++ b/variants/STM32L4xx/L433VC(I-T)_L443VC(I-T)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32L433VCIx.xml, STM32L433VCTx.xml
  * STM32L443VCIx.xml, STM32L443VCTx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L433VC(I-T)_L443VC(I-T)/variant_generic.cpp b/variants/STM32L4xx/L433VC(I-T)_L443VC(I-T)/variant_generic.cpp
index 777d646bf3..5ff262c85f 100644
--- a/variants/STM32L4xx/L433VC(I-T)_L443VC(I-T)/variant_generic.cpp
+++ b/variants/STM32L4xx/L433VC(I-T)_L443VC(I-T)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L433VC(I-T)_L443VC(I-T)/variant_generic.h b/variants/STM32L4xx/L433VC(I-T)_L443VC(I-T)/variant_generic.h
index 8f32f2ce9c..a9f1771063 100644
--- a/variants/STM32L4xx/L433VC(I-T)_L443VC(I-T)/variant_generic.h
+++ b/variants/STM32L4xx/L433VC(I-T)_L443VC(I-T)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L451CCU_L451CE(T-U)/PeripheralPins.c b/variants/STM32L4xx/L451CCU_L451CE(T-U)/PeripheralPins.c
index 576a09060a..f9fe4ecfb5 100644
--- a/variants/STM32L4xx/L451CCU_L451CE(T-U)/PeripheralPins.c
+++ b/variants/STM32L4xx/L451CCU_L451CE(T-U)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L451C(C-E)Ux.xml, STM32L451CETx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L451CCU_L451CE(T-U)/variant_generic.cpp b/variants/STM32L4xx/L451CCU_L451CE(T-U)/variant_generic.cpp
index 6b86ce705b..5d46670795 100644
--- a/variants/STM32L4xx/L451CCU_L451CE(T-U)/variant_generic.cpp
+++ b/variants/STM32L4xx/L451CCU_L451CE(T-U)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L451CCU_L451CE(T-U)/variant_generic.h b/variants/STM32L4xx/L451CCU_L451CE(T-U)/variant_generic.h
index 0c06417663..5477558723 100644
--- a/variants/STM32L4xx/L451CCU_L451CE(T-U)/variant_generic.h
+++ b/variants/STM32L4xx/L451CCU_L451CE(T-U)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L451R(C-E)(I-T-Y)/PeripheralPins.c b/variants/STM32L4xx/L451R(C-E)(I-T-Y)/PeripheralPins.c
index cbf4ced5e3..51567f04fb 100644
--- a/variants/STM32L4xx/L451R(C-E)(I-T-Y)/PeripheralPins.c
+++ b/variants/STM32L4xx/L451R(C-E)(I-T-Y)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32L451R(C-E)Ix.xml, STM32L451R(C-E)Tx.xml
  * STM32L451R(C-E)Yx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L451R(C-E)(I-T-Y)/variant_generic.cpp b/variants/STM32L4xx/L451R(C-E)(I-T-Y)/variant_generic.cpp
index f3b42d63ff..722a05aedb 100644
--- a/variants/STM32L4xx/L451R(C-E)(I-T-Y)/variant_generic.cpp
+++ b/variants/STM32L4xx/L451R(C-E)(I-T-Y)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L451R(C-E)(I-T-Y)/variant_generic.h b/variants/STM32L4xx/L451R(C-E)(I-T-Y)/variant_generic.h
index aaea351fd5..acb529355e 100644
--- a/variants/STM32L4xx/L451R(C-E)(I-T-Y)/variant_generic.h
+++ b/variants/STM32L4xx/L451R(C-E)(I-T-Y)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L451V(C-E)(I-T)/PeripheralPins.c b/variants/STM32L4xx/L451V(C-E)(I-T)/PeripheralPins.c
index 4828f8a2db..f6052ca5b7 100644
--- a/variants/STM32L4xx/L451V(C-E)(I-T)/PeripheralPins.c
+++ b/variants/STM32L4xx/L451V(C-E)(I-T)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L451V(C-E)Ix.xml, STM32L451V(C-E)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L451V(C-E)(I-T)/variant_generic.cpp b/variants/STM32L4xx/L451V(C-E)(I-T)/variant_generic.cpp
index 399ae983d3..6cfead339d 100644
--- a/variants/STM32L4xx/L451V(C-E)(I-T)/variant_generic.cpp
+++ b/variants/STM32L4xx/L451V(C-E)(I-T)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L451V(C-E)(I-T)/variant_generic.h b/variants/STM32L4xx/L451V(C-E)(I-T)/variant_generic.h
index 5cd0680427..b6dc2af6d1 100644
--- a/variants/STM32L4xx/L451V(C-E)(I-T)/variant_generic.h
+++ b/variants/STM32L4xx/L451V(C-E)(I-T)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L452CCU_L452CE(T-U)_L462CE(T-U)/PeripheralPins.c b/variants/STM32L4xx/L452CCU_L452CE(T-U)x(P)_L462CE(T-U)/PeripheralPins.c
similarity index 99%
rename from variants/STM32L4xx/L452CCU_L452CE(T-U)_L462CE(T-U)/PeripheralPins.c
rename to variants/STM32L4xx/L452CCU_L452CE(T-U)x(P)_L462CE(T-U)/PeripheralPins.c
index 24d6a53bd9..41d92a3c76 100644
--- a/variants/STM32L4xx/L452CCU_L452CE(T-U)_L462CE(T-U)/PeripheralPins.c
+++ b/variants/STM32L4xx/L452CCU_L452CE(T-U)x(P)_L462CE(T-U)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,8 +12,9 @@
  */
 /*
  * Automatically generated from STM32L452C(C-E)Ux.xml, STM32L452CETx.xml
- * STM32L462CETx.xml, STM32L462CEUx.xml
- * CubeMX DB release 6.0.30
+ * STM32L452CETxP.xml, STM32L462CETx.xml
+ * STM32L462CEUx.xml
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L452CCU_L452CE(T-U)_L462CE(T-U)/PinNamesVar.h b/variants/STM32L4xx/L452CCU_L452CE(T-U)x(P)_L462CE(T-U)/PinNamesVar.h
similarity index 100%
rename from variants/STM32L4xx/L452CCU_L452CE(T-U)_L462CE(T-U)/PinNamesVar.h
rename to variants/STM32L4xx/L452CCU_L452CE(T-U)x(P)_L462CE(T-U)/PinNamesVar.h
diff --git a/variants/STM32L4xx/L452CCU_L452CE(T-U)_L462CE(T-U)/boards_entry.txt b/variants/STM32L4xx/L452CCU_L452CE(T-U)x(P)_L462CE(T-U)/boards_entry.txt
similarity index 78%
rename from variants/STM32L4xx/L452CCU_L452CE(T-U)_L462CE(T-U)/boards_entry.txt
rename to variants/STM32L4xx/L452CCU_L452CE(T-U)x(P)_L462CE(T-U)/boards_entry.txt
index 98e80c80a2..5511b01165 100644
--- a/variants/STM32L4xx/L452CCU_L452CE(T-U)_L462CE(T-U)/boards_entry.txt
+++ b/variants/STM32L4xx/L452CCU_L452CE(T-U)x(P)_L462CE(T-U)/boards_entry.txt
@@ -9,7 +9,7 @@ GenL4.menu.pnum.GENERIC_L452CCUX.upload.maximum_size=262144
 GenL4.menu.pnum.GENERIC_L452CCUX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L452CCUX.build.board=GENERIC_L452CCUX
 GenL4.menu.pnum.GENERIC_L452CCUX.build.product_line=STM32L452xx
-GenL4.menu.pnum.GENERIC_L452CCUX.build.variant=STM32L4xx/L452CCU_L452CE(T-U)_L462CE(T-U)
+GenL4.menu.pnum.GENERIC_L452CCUX.build.variant=STM32L4xx/L452CCU_L452CE(T-U)x(P)_L462CE(T-U)
 
 # Generic L452CEUx
 GenL4.menu.pnum.GENERIC_L452CEUX=Generic L452CEUx
@@ -17,7 +17,7 @@ GenL4.menu.pnum.GENERIC_L452CEUX.upload.maximum_size=524288
 GenL4.menu.pnum.GENERIC_L452CEUX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L452CEUX.build.board=GENERIC_L452CEUX
 GenL4.menu.pnum.GENERIC_L452CEUX.build.product_line=STM32L452xx
-GenL4.menu.pnum.GENERIC_L452CEUX.build.variant=STM32L4xx/L452CCU_L452CE(T-U)_L462CE(T-U)
+GenL4.menu.pnum.GENERIC_L452CEUX.build.variant=STM32L4xx/L452CCU_L452CE(T-U)x(P)_L462CE(T-U)
 
 # Generic L452CETx
 GenL4.menu.pnum.GENERIC_L452CETX=Generic L452CETx
@@ -25,7 +25,15 @@ GenL4.menu.pnum.GENERIC_L452CETX.upload.maximum_size=524288
 GenL4.menu.pnum.GENERIC_L452CETX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L452CETX.build.board=GENERIC_L452CETX
 GenL4.menu.pnum.GENERIC_L452CETX.build.product_line=STM32L452xx
-GenL4.menu.pnum.GENERIC_L452CETX.build.variant=STM32L4xx/L452CCU_L452CE(T-U)_L462CE(T-U)
+GenL4.menu.pnum.GENERIC_L452CETX.build.variant=STM32L4xx/L452CCU_L452CE(T-U)x(P)_L462CE(T-U)
+
+# Generic L452CETxP
+GenL4.menu.pnum.GENERIC_L452CETXP=Generic L452CETxP
+GenL4.menu.pnum.GENERIC_L452CETXP.upload.maximum_size=524288
+GenL4.menu.pnum.GENERIC_L452CETXP.upload.maximum_data_size=163840
+GenL4.menu.pnum.GENERIC_L452CETXP.build.board=GENERIC_L452CETXP
+GenL4.menu.pnum.GENERIC_L452CETXP.build.product_line=STM32L452xx
+GenL4.menu.pnum.GENERIC_L452CETXP.build.variant=STM32L4xx/L452CCU_L452CE(T-U)x(P)_L462CE(T-U)
 
 # Generic L462CETx
 GenL4.menu.pnum.GENERIC_L462CETX=Generic L462CETx
@@ -33,7 +41,7 @@ GenL4.menu.pnum.GENERIC_L462CETX.upload.maximum_size=524288
 GenL4.menu.pnum.GENERIC_L462CETX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L462CETX.build.board=GENERIC_L462CETX
 GenL4.menu.pnum.GENERIC_L462CETX.build.product_line=STM32L462xx
-GenL4.menu.pnum.GENERIC_L462CETX.build.variant=STM32L4xx/L452CCU_L452CE(T-U)_L462CE(T-U)
+GenL4.menu.pnum.GENERIC_L462CETX.build.variant=STM32L4xx/L452CCU_L452CE(T-U)x(P)_L462CE(T-U)
 
 # Generic L462CEUx
 GenL4.menu.pnum.GENERIC_L462CEUX=Generic L462CEUx
@@ -41,5 +49,5 @@ GenL4.menu.pnum.GENERIC_L462CEUX.upload.maximum_size=524288
 GenL4.menu.pnum.GENERIC_L462CEUX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L462CEUX.build.board=GENERIC_L462CEUX
 GenL4.menu.pnum.GENERIC_L462CEUX.build.product_line=STM32L462xx
-GenL4.menu.pnum.GENERIC_L462CEUX.build.variant=STM32L4xx/L452CCU_L452CE(T-U)_L462CE(T-U)
+GenL4.menu.pnum.GENERIC_L462CEUX.build.variant=STM32L4xx/L452CCU_L452CE(T-U)x(P)_L462CE(T-U)
 
diff --git a/variants/STM32L4xx/L452CCU_L452CE(T-U)_L462CE(T-U)/generic_clock.c b/variants/STM32L4xx/L452CCU_L452CE(T-U)x(P)_L462CE(T-U)/generic_clock.c
similarity index 81%
rename from variants/STM32L4xx/L452CCU_L452CE(T-U)_L462CE(T-U)/generic_clock.c
rename to variants/STM32L4xx/L452CCU_L452CE(T-U)x(P)_L462CE(T-U)/generic_clock.c
index 6e515c46e7..6add92cb39 100644
--- a/variants/STM32L4xx/L452CCU_L452CE(T-U)_L462CE(T-U)/generic_clock.c
+++ b/variants/STM32L4xx/L452CCU_L452CE(T-U)x(P)_L462CE(T-U)/generic_clock.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -11,8 +11,8 @@
  *******************************************************************************
  */
 #if defined(ARDUINO_GENERIC_L452CCUX) || defined(ARDUINO_GENERIC_L452CETX) ||\
-    defined(ARDUINO_GENERIC_L452CEUX) || defined(ARDUINO_GENERIC_L462CETX) ||\
-    defined(ARDUINO_GENERIC_L462CEUX)
+    defined(ARDUINO_GENERIC_L452CETXP) || defined(ARDUINO_GENERIC_L452CEUX) ||\
+    defined(ARDUINO_GENERIC_L462CETX) || defined(ARDUINO_GENERIC_L462CEUX)
 #include "pins_arduino.h"
 
 /**
diff --git a/variants/STM32L4xx/L452CCU_L452CE(T-U)_L462CE(T-U)/variant_generic.cpp b/variants/STM32L4xx/L452CCU_L452CE(T-U)x(P)_L462CE(T-U)/variant_generic.cpp
similarity index 88%
rename from variants/STM32L4xx/L452CCU_L452CE(T-U)_L462CE(T-U)/variant_generic.cpp
rename to variants/STM32L4xx/L452CCU_L452CE(T-U)x(P)_L462CE(T-U)/variant_generic.cpp
index bd3b0fac48..2d576c6888 100644
--- a/variants/STM32L4xx/L452CCU_L452CE(T-U)_L462CE(T-U)/variant_generic.cpp
+++ b/variants/STM32L4xx/L452CCU_L452CE(T-U)x(P)_L462CE(T-U)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -11,8 +11,8 @@
  *******************************************************************************
  */
 #if defined(ARDUINO_GENERIC_L452CCUX) || defined(ARDUINO_GENERIC_L452CETX) ||\
-    defined(ARDUINO_GENERIC_L452CEUX) || defined(ARDUINO_GENERIC_L462CETX) ||\
-    defined(ARDUINO_GENERIC_L462CEUX)
+    defined(ARDUINO_GENERIC_L452CETXP) || defined(ARDUINO_GENERIC_L452CEUX) ||\
+    defined(ARDUINO_GENERIC_L462CETX) || defined(ARDUINO_GENERIC_L462CEUX)
 #include "pins_arduino.h"
 
 // Digital PinName array
diff --git a/variants/STM32L4xx/L452CCU_L452CE(T-U)_L462CE(T-U)/variant_generic.h b/variants/STM32L4xx/L452CCU_L452CE(T-U)x(P)_L462CE(T-U)/variant_generic.h
similarity index 99%
rename from variants/STM32L4xx/L452CCU_L452CE(T-U)_L462CE(T-U)/variant_generic.h
rename to variants/STM32L4xx/L452CCU_L452CE(T-U)x(P)_L462CE(T-U)/variant_generic.h
index 0c06417663..5477558723 100644
--- a/variants/STM32L4xx/L452CCU_L452CE(T-U)_L462CE(T-U)/variant_generic.h
+++ b/variants/STM32L4xx/L452CCU_L452CE(T-U)x(P)_L462CE(T-U)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L452R(C-E)(I-T-Y)_L462RE(I-T-Y)/generic_clock.c b/variants/STM32L4xx/L452R(C-E)(I-T-Y)_L462RE(I-T-Y)/generic_clock.c
deleted file mode 100644
index 388b68d321..0000000000
--- a/variants/STM32L4xx/L452R(C-E)(I-T-Y)_L462RE(I-T-Y)/generic_clock.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
- * All rights reserved.
- *
- * This software component is licensed by ST under BSD 3-Clause license,
- * the "License"; You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *                        opensource.org/licenses/BSD-3-Clause
- *
- *******************************************************************************
- */
-#if defined(ARDUINO_GENERIC_L452RCIX) || defined(ARDUINO_GENERIC_L452RCTX) ||\
-    defined(ARDUINO_GENERIC_L452RCYX) || defined(ARDUINO_GENERIC_L452REIX) ||\
-    defined(ARDUINO_GENERIC_L452RETX) || defined(ARDUINO_GENERIC_L452REYX) ||\
-    defined(ARDUINO_GENERIC_L462REIX) || defined(ARDUINO_GENERIC_L462RETX) ||\
-    defined(ARDUINO_GENERIC_L462REYX)
-#include "pins_arduino.h"
-
-/**
-  * @brief  System Clock Configuration
-  * @param  None
-  * @retval None
-  */
-WEAK void SystemClock_Config(void)
-{
-  RCC_OscInitTypeDef RCC_OscInitStruct = {};
-  RCC_ClkInitTypeDef RCC_ClkInitStruct = {};
-  RCC_PeriphCLKInitTypeDef PeriphClkInit = {};
-
-  /*
-   * Initializes the RCC Oscillators according to the specified parameters
-   * in the RCC_OscInitTypeDef structure.
-   */
-  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI48 | RCC_OSCILLATORTYPE_MSI;
-  RCC_OscInitStruct.HSI48State = RCC_HSI48_ON;
-  RCC_OscInitStruct.MSIState = RCC_MSI_ON;
-  RCC_OscInitStruct.MSICalibrationValue = 0;
-  RCC_OscInitStruct.MSIClockRange = RCC_MSIRANGE_6;
-  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
-  RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_MSI;
-  RCC_OscInitStruct.PLL.PLLM = 1;
-  RCC_OscInitStruct.PLL.PLLN = 40;
-  RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV7;
-  RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV2;
-  RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2;
-  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {
-    Error_Handler();
-  }
-  /* Initializes the CPU, AHB and APB buses clocks */
-  RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_SYSCLK
-                                | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2;
-  RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
-  RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
-  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1;
-  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
-
-  if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_4) != HAL_OK) {
-    Error_Handler();
-  }
-  PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_USB;
-  PeriphClkInit.UsbClockSelection = RCC_USBCLKSOURCE_HSI48;
-  if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK) {
-    Error_Handler();
-  }
-  /* Configure the main internal regulator output voltage */
-  if (HAL_PWREx_ControlVoltageScaling(PWR_REGULATOR_VOLTAGE_SCALE1) != HAL_OK) {
-    Error_Handler();
-  }
-}
-
-#endif /* ARDUINO_GENERIC_* */
diff --git a/variants/STM32L4xx/L452R(C-E)(I-T-Y)_L462RE(I-T-Y)/PeripheralPins.c b/variants/STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)/PeripheralPins.c
similarity index 99%
rename from variants/STM32L4xx/L452R(C-E)(I-T-Y)_L462RE(I-T-Y)/PeripheralPins.c
rename to variants/STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)/PeripheralPins.c
index f51bf3c91c..227efb3c73 100644
--- a/variants/STM32L4xx/L452R(C-E)(I-T-Y)_L462RE(I-T-Y)/PeripheralPins.c
+++ b/variants/STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,9 +12,10 @@
  */
 /*
  * Automatically generated from STM32L452R(C-E)Ix.xml, STM32L452R(C-E)Tx.xml
- * STM32L452R(C-E)Yx.xml, STM32L462REIx.xml
- * STM32L462RETx.xml, STM32L462REYx.xml
- * CubeMX DB release 6.0.30
+ * STM32L452R(C-E)Yx.xml, STM32L452REYxP.xml
+ * STM32L462REIx.xml, STM32L462RETx.xml
+ * STM32L462REYx.xml
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L452R(C-E)(I-T-Y)_L462RE(I-T-Y)/PinNamesVar.h b/variants/STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)/PinNamesVar.h
similarity index 100%
rename from variants/STM32L4xx/L452R(C-E)(I-T-Y)_L462RE(I-T-Y)/PinNamesVar.h
rename to variants/STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)/PinNamesVar.h
diff --git a/variants/STM32L4xx/L452R(C-E)(I-T-Y)_L462RE(I-T-Y)/boards_entry.txt b/variants/STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)/boards_entry.txt
similarity index 69%
rename from variants/STM32L4xx/L452R(C-E)(I-T-Y)_L462RE(I-T-Y)/boards_entry.txt
rename to variants/STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)/boards_entry.txt
index 7b82e5f009..7ec72b286e 100644
--- a/variants/STM32L4xx/L452R(C-E)(I-T-Y)_L462RE(I-T-Y)/boards_entry.txt
+++ b/variants/STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)/boards_entry.txt
@@ -9,7 +9,7 @@ GenL4.menu.pnum.GENERIC_L452RCIX.upload.maximum_size=262144
 GenL4.menu.pnum.GENERIC_L452RCIX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L452RCIX.build.board=GENERIC_L452RCIX
 GenL4.menu.pnum.GENERIC_L452RCIX.build.product_line=STM32L452xx
-GenL4.menu.pnum.GENERIC_L452RCIX.build.variant=STM32L4xx/L452R(C-E)(I-T-Y)_L462RE(I-T-Y)
+GenL4.menu.pnum.GENERIC_L452RCIX.build.variant=STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)
 
 # Generic L452REIx
 GenL4.menu.pnum.GENERIC_L452REIX=Generic L452REIx
@@ -17,7 +17,7 @@ GenL4.menu.pnum.GENERIC_L452REIX.upload.maximum_size=524288
 GenL4.menu.pnum.GENERIC_L452REIX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L452REIX.build.board=GENERIC_L452REIX
 GenL4.menu.pnum.GENERIC_L452REIX.build.product_line=STM32L452xx
-GenL4.menu.pnum.GENERIC_L452REIX.build.variant=STM32L4xx/L452R(C-E)(I-T-Y)_L462RE(I-T-Y)
+GenL4.menu.pnum.GENERIC_L452REIX.build.variant=STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)
 
 # Generic L452RCTx
 GenL4.menu.pnum.GENERIC_L452RCTX=Generic L452RCTx
@@ -25,7 +25,7 @@ GenL4.menu.pnum.GENERIC_L452RCTX.upload.maximum_size=262144
 GenL4.menu.pnum.GENERIC_L452RCTX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L452RCTX.build.board=GENERIC_L452RCTX
 GenL4.menu.pnum.GENERIC_L452RCTX.build.product_line=STM32L452xx
-GenL4.menu.pnum.GENERIC_L452RCTX.build.variant=STM32L4xx/L452R(C-E)(I-T-Y)_L462RE(I-T-Y)
+GenL4.menu.pnum.GENERIC_L452RCTX.build.variant=STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)
 
 # Generic L452RETx
 GenL4.menu.pnum.GENERIC_L452RETX=Generic L452RETx
@@ -33,7 +33,7 @@ GenL4.menu.pnum.GENERIC_L452RETX.upload.maximum_size=524288
 GenL4.menu.pnum.GENERIC_L452RETX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L452RETX.build.board=GENERIC_L452RETX
 GenL4.menu.pnum.GENERIC_L452RETX.build.product_line=STM32L452xx
-GenL4.menu.pnum.GENERIC_L452RETX.build.variant=STM32L4xx/L452R(C-E)(I-T-Y)_L462RE(I-T-Y)
+GenL4.menu.pnum.GENERIC_L452RETX.build.variant=STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)
 
 # Generic L452RCYx
 GenL4.menu.pnum.GENERIC_L452RCYX=Generic L452RCYx
@@ -41,7 +41,7 @@ GenL4.menu.pnum.GENERIC_L452RCYX.upload.maximum_size=262144
 GenL4.menu.pnum.GENERIC_L452RCYX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L452RCYX.build.board=GENERIC_L452RCYX
 GenL4.menu.pnum.GENERIC_L452RCYX.build.product_line=STM32L452xx
-GenL4.menu.pnum.GENERIC_L452RCYX.build.variant=STM32L4xx/L452R(C-E)(I-T-Y)_L462RE(I-T-Y)
+GenL4.menu.pnum.GENERIC_L452RCYX.build.variant=STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)
 
 # Generic L452REYx
 GenL4.menu.pnum.GENERIC_L452REYX=Generic L452REYx
@@ -49,7 +49,15 @@ GenL4.menu.pnum.GENERIC_L452REYX.upload.maximum_size=524288
 GenL4.menu.pnum.GENERIC_L452REYX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L452REYX.build.board=GENERIC_L452REYX
 GenL4.menu.pnum.GENERIC_L452REYX.build.product_line=STM32L452xx
-GenL4.menu.pnum.GENERIC_L452REYX.build.variant=STM32L4xx/L452R(C-E)(I-T-Y)_L462RE(I-T-Y)
+GenL4.menu.pnum.GENERIC_L452REYX.build.variant=STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)
+
+# Generic L452REYxP
+GenL4.menu.pnum.GENERIC_L452REYXP=Generic L452REYxP
+GenL4.menu.pnum.GENERIC_L452REYXP.upload.maximum_size=524288
+GenL4.menu.pnum.GENERIC_L452REYXP.upload.maximum_data_size=163840
+GenL4.menu.pnum.GENERIC_L452REYXP.build.board=GENERIC_L452REYXP
+GenL4.menu.pnum.GENERIC_L452REYXP.build.product_line=STM32L452xx
+GenL4.menu.pnum.GENERIC_L452REYXP.build.variant=STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)
 
 # Generic L462REIx
 GenL4.menu.pnum.GENERIC_L462REIX=Generic L462REIx
@@ -57,7 +65,7 @@ GenL4.menu.pnum.GENERIC_L462REIX.upload.maximum_size=524288
 GenL4.menu.pnum.GENERIC_L462REIX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L462REIX.build.board=GENERIC_L462REIX
 GenL4.menu.pnum.GENERIC_L462REIX.build.product_line=STM32L462xx
-GenL4.menu.pnum.GENERIC_L462REIX.build.variant=STM32L4xx/L452R(C-E)(I-T-Y)_L462RE(I-T-Y)
+GenL4.menu.pnum.GENERIC_L462REIX.build.variant=STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)
 
 # Generic L462RETx
 GenL4.menu.pnum.GENERIC_L462RETX=Generic L462RETx
@@ -65,7 +73,7 @@ GenL4.menu.pnum.GENERIC_L462RETX.upload.maximum_size=524288
 GenL4.menu.pnum.GENERIC_L462RETX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L462RETX.build.board=GENERIC_L462RETX
 GenL4.menu.pnum.GENERIC_L462RETX.build.product_line=STM32L462xx
-GenL4.menu.pnum.GENERIC_L462RETX.build.variant=STM32L4xx/L452R(C-E)(I-T-Y)_L462RE(I-T-Y)
+GenL4.menu.pnum.GENERIC_L462RETX.build.variant=STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)
 
 # Generic L462REYx
 GenL4.menu.pnum.GENERIC_L462REYX=Generic L462REYx
@@ -73,5 +81,5 @@ GenL4.menu.pnum.GENERIC_L462REYX.upload.maximum_size=524288
 GenL4.menu.pnum.GENERIC_L462REYX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L462REYX.build.board=GENERIC_L462REYX
 GenL4.menu.pnum.GENERIC_L462REYX.build.product_line=STM32L462xx
-GenL4.menu.pnum.GENERIC_L462REYX.build.variant=STM32L4xx/L452R(C-E)(I-T-Y)_L462RE(I-T-Y)
+GenL4.menu.pnum.GENERIC_L462REYX.build.variant=STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)
 
diff --git a/variants/STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)/generic_clock.c b/variants/STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)/generic_clock.c
new file mode 100644
index 0000000000..4821d87fb4
--- /dev/null
+++ b/variants/STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)/generic_clock.c
@@ -0,0 +1,31 @@
+/*
+ *******************************************************************************
+ * Copyright (c) 2020, STMicroelectronics
+ * All rights reserved.
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ *******************************************************************************
+ */
+#if defined(ARDUINO_GENERIC_L452RCIX) || defined(ARDUINO_GENERIC_L452RCTX) ||\
+    defined(ARDUINO_GENERIC_L452RCYX) || defined(ARDUINO_GENERIC_L452REIX) ||\
+    defined(ARDUINO_GENERIC_L452RETX) || defined(ARDUINO_GENERIC_L452REYX) ||\
+    defined(ARDUINO_GENERIC_L452REYXP) || defined(ARDUINO_GENERIC_L462REIX) ||\
+    defined(ARDUINO_GENERIC_L462RETX) || defined(ARDUINO_GENERIC_L462REYX)
+#include "pins_arduino.h"
+
+/**
+  * @brief  System Clock Configuration
+  * @param  None
+  * @retval None
+  */
+WEAK void SystemClock_Config(void)
+{
+  /* SystemClock_Config can be generated by STM32CubeMX */
+#warning "SystemClock_Config() is empty. Default clock at reset is used."
+}
+
+#endif /* ARDUINO_GENERIC_* */
diff --git a/variants/STM32L4xx/L452R(C-E)(I-T-Y)_L462RE(I-T-Y)/ldscript.ld b/variants/STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)/ldscript.ld
similarity index 100%
rename from variants/STM32L4xx/L452R(C-E)(I-T-Y)_L462RE(I-T-Y)/ldscript.ld
rename to variants/STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)/ldscript.ld
diff --git a/variants/STM32L4xx/L452R(C-E)(I-T-Y)_L462RE(I-T-Y)/variant_NUCLEO_L452RE.cpp b/variants/STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)/variant_NUCLEO_L452RE.cpp
similarity index 100%
rename from variants/STM32L4xx/L452R(C-E)(I-T-Y)_L462RE(I-T-Y)/variant_NUCLEO_L452RE.cpp
rename to variants/STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)/variant_NUCLEO_L452RE.cpp
diff --git a/variants/STM32L4xx/L452R(C-E)(I-T-Y)_L462RE(I-T-Y)/variant_NUCLEO_L452RE.h b/variants/STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)/variant_NUCLEO_L452RE.h
similarity index 100%
rename from variants/STM32L4xx/L452R(C-E)(I-T-Y)_L462RE(I-T-Y)/variant_NUCLEO_L452RE.h
rename to variants/STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)/variant_NUCLEO_L452RE.h
diff --git a/variants/STM32L4xx/L452R(C-E)(I-T-Y)_L462RE(I-T-Y)/variant_generic.cpp b/variants/STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)/variant_generic.cpp
similarity index 91%
rename from variants/STM32L4xx/L452R(C-E)(I-T-Y)_L462RE(I-T-Y)/variant_generic.cpp
rename to variants/STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)/variant_generic.cpp
index a2d2ca0a82..979c59a274 100644
--- a/variants/STM32L4xx/L452R(C-E)(I-T-Y)_L462RE(I-T-Y)/variant_generic.cpp
+++ b/variants/STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,8 +13,8 @@
 #if defined(ARDUINO_GENERIC_L452RCIX) || defined(ARDUINO_GENERIC_L452RCTX) ||\
     defined(ARDUINO_GENERIC_L452RCYX) || defined(ARDUINO_GENERIC_L452REIX) ||\
     defined(ARDUINO_GENERIC_L452RETX) || defined(ARDUINO_GENERIC_L452REYX) ||\
-    defined(ARDUINO_GENERIC_L462REIX) || defined(ARDUINO_GENERIC_L462RETX) ||\
-    defined(ARDUINO_GENERIC_L462REYX)
+    defined(ARDUINO_GENERIC_L452REYXP) || defined(ARDUINO_GENERIC_L462REIX) ||\
+    defined(ARDUINO_GENERIC_L462RETX) || defined(ARDUINO_GENERIC_L462REYX)
 #include "pins_arduino.h"
 
 // Digital PinName array
diff --git a/variants/STM32L4xx/L452R(C-E)(I-T-Y)_L462RE(I-T-Y)/variant_generic.h b/variants/STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)/variant_generic.h
similarity index 99%
rename from variants/STM32L4xx/L452R(C-E)(I-T-Y)_L462RE(I-T-Y)/variant_generic.h
rename to variants/STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)/variant_generic.h
index aaea351fd5..acb529355e 100644
--- a/variants/STM32L4xx/L452R(C-E)(I-T-Y)_L462RE(I-T-Y)/variant_generic.h
+++ b/variants/STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L452RETxP/PeripheralPins.c b/variants/STM32L4xx/L452RETxP/PeripheralPins.c
index 7de4847705..cf9d015129 100644
--- a/variants/STM32L4xx/L452RETxP/PeripheralPins.c
+++ b/variants/STM32L4xx/L452RETxP/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L452RETxP.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L452RETxP/variant_generic.cpp b/variants/STM32L4xx/L452RETxP/variant_generic.cpp
index 2963bda17c..797e508f13 100644
--- a/variants/STM32L4xx/L452RETxP/variant_generic.cpp
+++ b/variants/STM32L4xx/L452RETxP/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L452RETxP/variant_generic.h b/variants/STM32L4xx/L452RETxP/variant_generic.h
index a08766436d..ea4d55ccb4 100644
--- a/variants/STM32L4xx/L452RETxP/variant_generic.h
+++ b/variants/STM32L4xx/L452RETxP/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L452V(C-E)(I-T)_L462VE(I-T)/PeripheralPins.c b/variants/STM32L4xx/L452V(C-E)(I-T)_L462VE(I-T)/PeripheralPins.c
index 07cc27e9b3..8c0cebf536 100644
--- a/variants/STM32L4xx/L452V(C-E)(I-T)_L462VE(I-T)/PeripheralPins.c
+++ b/variants/STM32L4xx/L452V(C-E)(I-T)_L462VE(I-T)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32L452V(C-E)Ix.xml, STM32L452V(C-E)Tx.xml
  * STM32L462VEIx.xml, STM32L462VETx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L452V(C-E)(I-T)_L462VE(I-T)/variant_generic.cpp b/variants/STM32L4xx/L452V(C-E)(I-T)_L462VE(I-T)/variant_generic.cpp
index 90430286ef..64856e38ba 100644
--- a/variants/STM32L4xx/L452V(C-E)(I-T)_L462VE(I-T)/variant_generic.cpp
+++ b/variants/STM32L4xx/L452V(C-E)(I-T)_L462VE(I-T)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L452V(C-E)(I-T)_L462VE(I-T)/variant_generic.h b/variants/STM32L4xx/L452V(C-E)(I-T)_L462VE(I-T)/variant_generic.h
index 5cd0680427..b6dc2af6d1 100644
--- a/variants/STM32L4xx/L452V(C-E)(I-T)_L462VE(I-T)/variant_generic.h
+++ b/variants/STM32L4xx/L452V(C-E)(I-T)_L462VE(I-T)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L471Q(E-G)I/PeripheralPins.c b/variants/STM32L4xx/L471Q(E-G)I/PeripheralPins.c
index 56599d18b7..fab8c9efe0 100644
--- a/variants/STM32L4xx/L471Q(E-G)I/PeripheralPins.c
+++ b/variants/STM32L4xx/L471Q(E-G)I/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L471Q(E-G)Ix.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L471Q(E-G)I/variant_generic.cpp b/variants/STM32L4xx/L471Q(E-G)I/variant_generic.cpp
index 1d00105a07..22d471bb03 100644
--- a/variants/STM32L4xx/L471Q(E-G)I/variant_generic.cpp
+++ b/variants/STM32L4xx/L471Q(E-G)I/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L471Q(E-G)I/variant_generic.h b/variants/STM32L4xx/L471Q(E-G)I/variant_generic.h
index 31194ebdb1..f985744e1c 100644
--- a/variants/STM32L4xx/L471Q(E-G)I/variant_generic.h
+++ b/variants/STM32L4xx/L471Q(E-G)I/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L471R(E-G)T/PeripheralPins.c b/variants/STM32L4xx/L471R(E-G)T/PeripheralPins.c
index 8f390bf471..10145dd90f 100644
--- a/variants/STM32L4xx/L471R(E-G)T/PeripheralPins.c
+++ b/variants/STM32L4xx/L471R(E-G)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L471R(E-G)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L471R(E-G)T/variant_generic.cpp b/variants/STM32L4xx/L471R(E-G)T/variant_generic.cpp
index 020a8880b3..df8301fd21 100644
--- a/variants/STM32L4xx/L471R(E-G)T/variant_generic.cpp
+++ b/variants/STM32L4xx/L471R(E-G)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L471R(E-G)T/variant_generic.h b/variants/STM32L4xx/L471R(E-G)T/variant_generic.h
index 3a93aade86..b076a32b32 100644
--- a/variants/STM32L4xx/L471R(E-G)T/variant_generic.h
+++ b/variants/STM32L4xx/L471R(E-G)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L471V(E-G)T/PeripheralPins.c b/variants/STM32L4xx/L471V(E-G)T/PeripheralPins.c
index c8ba3c7ac5..0b1c8261fd 100644
--- a/variants/STM32L4xx/L471V(E-G)T/PeripheralPins.c
+++ b/variants/STM32L4xx/L471V(E-G)T/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L471V(E-G)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L471V(E-G)T/variant_generic.cpp b/variants/STM32L4xx/L471V(E-G)T/variant_generic.cpp
index 172cfc180c..a871161822 100644
--- a/variants/STM32L4xx/L471V(E-G)T/variant_generic.cpp
+++ b/variants/STM32L4xx/L471V(E-G)T/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L471V(E-G)T/variant_generic.h b/variants/STM32L4xx/L471V(E-G)T/variant_generic.h
index 7a10cbd056..df94faa80a 100644
--- a/variants/STM32L4xx/L471V(E-G)T/variant_generic.h
+++ b/variants/STM32L4xx/L471V(E-G)T/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L471Z(E-G)(J-T)/PeripheralPins.c b/variants/STM32L4xx/L471Z(E-G)(J-T)/PeripheralPins.c
index 57bffcdce0..84ad4d4db5 100644
--- a/variants/STM32L4xx/L471Z(E-G)(J-T)/PeripheralPins.c
+++ b/variants/STM32L4xx/L471Z(E-G)(J-T)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L471Z(E-G)Jx.xml, STM32L471Z(E-G)Tx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L471Z(E-G)(J-T)/variant_generic.cpp b/variants/STM32L4xx/L471Z(E-G)(J-T)/variant_generic.cpp
index a216eb7b9a..13d74be027 100644
--- a/variants/STM32L4xx/L471Z(E-G)(J-T)/variant_generic.cpp
+++ b/variants/STM32L4xx/L471Z(E-G)(J-T)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L471Z(E-G)(J-T)/variant_generic.h b/variants/STM32L4xx/L471Z(E-G)(J-T)/variant_generic.h
index bb4667d410..92efc44332 100644
--- a/variants/STM32L4xx/L471Z(E-G)(J-T)/variant_generic.h
+++ b/variants/STM32L4xx/L471Z(E-G)(J-T)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L475R(C-E-G)T_L476R(C-E-G)T_L486RGT/PeripheralPins.c b/variants/STM32L4xx/L475R(C-E-G)T_L476R(C-E-G)T_L486RGT/PeripheralPins.c
index cfc8fb69bb..58488e603a 100644
--- a/variants/STM32L4xx/L475R(C-E-G)T_L476R(C-E-G)T_L486RGT/PeripheralPins.c
+++ b/variants/STM32L4xx/L475R(C-E-G)T_L476R(C-E-G)T_L486RGT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32L475R(C-E-G)Tx.xml, STM32L476R(C-E-G)Tx.xml
  * STM32L486RGTx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L475R(C-E-G)T_L476R(C-E-G)T_L486RGT/variant_generic.cpp b/variants/STM32L4xx/L475R(C-E-G)T_L476R(C-E-G)T_L486RGT/variant_generic.cpp
index 095e2d7eb0..dfecf8a64e 100644
--- a/variants/STM32L4xx/L475R(C-E-G)T_L476R(C-E-G)T_L486RGT/variant_generic.cpp
+++ b/variants/STM32L4xx/L475R(C-E-G)T_L476R(C-E-G)T_L486RGT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L475R(C-E-G)T_L476R(C-E-G)T_L486RGT/variant_generic.h b/variants/STM32L4xx/L475R(C-E-G)T_L476R(C-E-G)T_L486RGT/variant_generic.h
index 3a93aade86..b076a32b32 100644
--- a/variants/STM32L4xx/L475R(C-E-G)T_L476R(C-E-G)T_L486RGT/variant_generic.h
+++ b/variants/STM32L4xx/L475R(C-E-G)T_L476R(C-E-G)T_L486RGT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L475V(C-E-G)T_L476V(C-E-G)T_L486VGT/PeripheralPins.c b/variants/STM32L4xx/L475V(C-E-G)T_L476V(C-E-G)T_L486VGT/PeripheralPins.c
index 7f6edc5b70..3f5fdd9142 100644
--- a/variants/STM32L4xx/L475V(C-E-G)T_L476V(C-E-G)T_L486VGT/PeripheralPins.c
+++ b/variants/STM32L4xx/L475V(C-E-G)T_L476V(C-E-G)T_L486VGT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32L475V(C-E-G)Tx.xml, STM32L476V(C-E-G)Tx.xml
  * STM32L486VGTx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L475V(C-E-G)T_L476V(C-E-G)T_L486VGT/variant_generic.cpp b/variants/STM32L4xx/L475V(C-E-G)T_L476V(C-E-G)T_L486VGT/variant_generic.cpp
index 88e41f57bf..67ceb35d21 100644
--- a/variants/STM32L4xx/L475V(C-E-G)T_L476V(C-E-G)T_L486VGT/variant_generic.cpp
+++ b/variants/STM32L4xx/L475V(C-E-G)T_L476V(C-E-G)T_L486VGT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L475V(C-E-G)T_L476V(C-E-G)T_L486VGT/variant_generic.h b/variants/STM32L4xx/L475V(C-E-G)T_L476V(C-E-G)T_L486VGT/variant_generic.h
index 7a10cbd056..df94faa80a 100644
--- a/variants/STM32L4xx/L475V(C-E-G)T_L476V(C-E-G)T_L486VGT/variant_generic.h
+++ b/variants/STM32L4xx/L475V(C-E-G)T_L476V(C-E-G)T_L486VGT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L476J(E-G)Y_L485J(C-E)Y_L486JGY/PeripheralPins.c b/variants/STM32L4xx/L476J(E-G)Y_L485J(C-E)Y_L486JGY/PeripheralPins.c
index 291a81ff06..d6bef9e227 100644
--- a/variants/STM32L4xx/L476J(E-G)Y_L485J(C-E)Y_L486JGY/PeripheralPins.c
+++ b/variants/STM32L4xx/L476J(E-G)Y_L485J(C-E)Y_L486JGY/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32L476J(E-G)Yx.xml, STM32L485J(C-E)Yx.xml
  * STM32L486JGYx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L476J(E-G)Y_L485J(C-E)Y_L486JGY/variant_generic.cpp b/variants/STM32L4xx/L476J(E-G)Y_L485J(C-E)Y_L486JGY/variant_generic.cpp
index bc882c449f..62176d4200 100644
--- a/variants/STM32L4xx/L476J(E-G)Y_L485J(C-E)Y_L486JGY/variant_generic.cpp
+++ b/variants/STM32L4xx/L476J(E-G)Y_L485J(C-E)Y_L486JGY/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L476J(E-G)Y_L485J(C-E)Y_L486JGY/variant_generic.h b/variants/STM32L4xx/L476J(E-G)Y_L485J(C-E)Y_L486JGY/variant_generic.h
index 6e778aaa15..f53d05e19c 100644
--- a/variants/STM32L4xx/L476J(E-G)Y_L485J(C-E)Y_L486JGY/variant_generic.h
+++ b/variants/STM32L4xx/L476J(E-G)Y_L485J(C-E)Y_L486JGY/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L476JGYxP/PeripheralPins.c b/variants/STM32L4xx/L476JGYxP/PeripheralPins.c
index f138786674..adcbc41784 100644
--- a/variants/STM32L4xx/L476JGYxP/PeripheralPins.c
+++ b/variants/STM32L4xx/L476JGYxP/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L476JGYxP.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L476JGYxP/variant_generic.cpp b/variants/STM32L4xx/L476JGYxP/variant_generic.cpp
index e36cb531b1..353e539712 100644
--- a/variants/STM32L4xx/L476JGYxP/variant_generic.cpp
+++ b/variants/STM32L4xx/L476JGYxP/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L476JGYxP/variant_generic.h b/variants/STM32L4xx/L476JGYxP/variant_generic.h
index 86d1149634..e126b45fd4 100644
--- a/variants/STM32L4xx/L476JGYxP/variant_generic.h
+++ b/variants/STM32L4xx/L476JGYxP/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L476M(E-G)Y/PeripheralPins.c b/variants/STM32L4xx/L476M(E-G)Y/PeripheralPins.c
index 027ff11e5c..a84535df37 100644
--- a/variants/STM32L4xx/L476M(E-G)Y/PeripheralPins.c
+++ b/variants/STM32L4xx/L476M(E-G)Y/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L476M(E-G)Yx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L476M(E-G)Y/variant_generic.cpp b/variants/STM32L4xx/L476M(E-G)Y/variant_generic.cpp
index 0b529132d6..c518278c2e 100644
--- a/variants/STM32L4xx/L476M(E-G)Y/variant_generic.cpp
+++ b/variants/STM32L4xx/L476M(E-G)Y/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L476M(E-G)Y/variant_generic.h b/variants/STM32L4xx/L476M(E-G)Y/variant_generic.h
index 3a79fc42f6..504b91d0b7 100644
--- a/variants/STM32L4xx/L476M(E-G)Y/variant_generic.h
+++ b/variants/STM32L4xx/L476M(E-G)Y/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L476Q(E-G)I_L486QGI/PeripheralPins.c b/variants/STM32L4xx/L476QEI_L476QGIx(P)_L486QGI/PeripheralPins.c
similarity index 99%
rename from variants/STM32L4xx/L476Q(E-G)I_L486QGI/PeripheralPins.c
rename to variants/STM32L4xx/L476QEI_L476QGIx(P)_L486QGI/PeripheralPins.c
index 6a295a1d87..80e849f0a1 100644
--- a/variants/STM32L4xx/L476Q(E-G)I_L486QGI/PeripheralPins.c
+++ b/variants/STM32L4xx/L476QEI_L476QGIx(P)_L486QGI/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -11,8 +11,9 @@
  *******************************************************************************
  */
 /*
- * Automatically generated from STM32L476Q(E-G)Ix.xml, STM32L486QGIx.xml
- * CubeMX DB release 6.0.30
+ * Automatically generated from STM32L476Q(E-G)Ix.xml, STM32L476QGIxP.xml
+ * STM32L486QGIx.xml
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L476Q(E-G)I_L486QGI/PinNamesVar.h b/variants/STM32L4xx/L476QEI_L476QGIx(P)_L486QGI/PinNamesVar.h
similarity index 100%
rename from variants/STM32L4xx/L476Q(E-G)I_L486QGI/PinNamesVar.h
rename to variants/STM32L4xx/L476QEI_L476QGIx(P)_L486QGI/PinNamesVar.h
diff --git a/variants/STM32L4xx/L476Q(E-G)I_L486QGI/boards_entry.txt b/variants/STM32L4xx/L476QEI_L476QGIx(P)_L486QGI/boards_entry.txt
similarity index 63%
rename from variants/STM32L4xx/L476Q(E-G)I_L486QGI/boards_entry.txt
rename to variants/STM32L4xx/L476QEI_L476QGIx(P)_L486QGI/boards_entry.txt
index 1b3be8150f..4d3a16f6ed 100644
--- a/variants/STM32L4xx/L476Q(E-G)I_L486QGI/boards_entry.txt
+++ b/variants/STM32L4xx/L476QEI_L476QGIx(P)_L486QGI/boards_entry.txt
@@ -9,7 +9,7 @@ GenL4.menu.pnum.GENERIC_L476QEIX.upload.maximum_size=524288
 GenL4.menu.pnum.GENERIC_L476QEIX.upload.maximum_data_size=131072
 GenL4.menu.pnum.GENERIC_L476QEIX.build.board=GENERIC_L476QEIX
 GenL4.menu.pnum.GENERIC_L476QEIX.build.product_line=STM32L476xx
-GenL4.menu.pnum.GENERIC_L476QEIX.build.variant=STM32L4xx/L476Q(E-G)I_L486QGI
+GenL4.menu.pnum.GENERIC_L476QEIX.build.variant=STM32L4xx/L476QEI_L476QGIx(P)_L486QGI
 
 # Generic L476QGIx
 GenL4.menu.pnum.GENERIC_L476QGIX=Generic L476QGIx
@@ -17,7 +17,15 @@ GenL4.menu.pnum.GENERIC_L476QGIX.upload.maximum_size=1048576
 GenL4.menu.pnum.GENERIC_L476QGIX.upload.maximum_data_size=131072
 GenL4.menu.pnum.GENERIC_L476QGIX.build.board=GENERIC_L476QGIX
 GenL4.menu.pnum.GENERIC_L476QGIX.build.product_line=STM32L476xx
-GenL4.menu.pnum.GENERIC_L476QGIX.build.variant=STM32L4xx/L476Q(E-G)I_L486QGI
+GenL4.menu.pnum.GENERIC_L476QGIX.build.variant=STM32L4xx/L476QEI_L476QGIx(P)_L486QGI
+
+# Generic L476QGIxP
+GenL4.menu.pnum.GENERIC_L476QGIXP=Generic L476QGIxP
+GenL4.menu.pnum.GENERIC_L476QGIXP.upload.maximum_size=1048576
+GenL4.menu.pnum.GENERIC_L476QGIXP.upload.maximum_data_size=131072
+GenL4.menu.pnum.GENERIC_L476QGIXP.build.board=GENERIC_L476QGIXP
+GenL4.menu.pnum.GENERIC_L476QGIXP.build.product_line=STM32L476xx
+GenL4.menu.pnum.GENERIC_L476QGIXP.build.variant=STM32L4xx/L476QEI_L476QGIx(P)_L486QGI
 
 # Generic L486QGIx
 GenL4.menu.pnum.GENERIC_L486QGIX=Generic L486QGIx
@@ -25,5 +33,5 @@ GenL4.menu.pnum.GENERIC_L486QGIX.upload.maximum_size=1048576
 GenL4.menu.pnum.GENERIC_L486QGIX.upload.maximum_data_size=131072
 GenL4.menu.pnum.GENERIC_L486QGIX.build.board=GENERIC_L486QGIX
 GenL4.menu.pnum.GENERIC_L486QGIX.build.product_line=STM32L486xx
-GenL4.menu.pnum.GENERIC_L486QGIX.build.variant=STM32L4xx/L476Q(E-G)I_L486QGI
+GenL4.menu.pnum.GENERIC_L486QGIX.build.variant=STM32L4xx/L476QEI_L476QGIx(P)_L486QGI
 
diff --git a/variants/STM32L4xx/L476Q(E-G)I_L486QGI/generic_clock.c b/variants/STM32L4xx/L476QEI_L476QGIx(P)_L486QGI/generic_clock.c
similarity index 87%
rename from variants/STM32L4xx/L476Q(E-G)I_L486QGI/generic_clock.c
rename to variants/STM32L4xx/L476QEI_L476QGIx(P)_L486QGI/generic_clock.c
index 65e66f750a..ef28f60fbe 100644
--- a/variants/STM32L4xx/L476Q(E-G)I_L486QGI/generic_clock.c
+++ b/variants/STM32L4xx/L476QEI_L476QGIx(P)_L486QGI/generic_clock.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -11,7 +11,7 @@
  *******************************************************************************
  */
 #if defined(ARDUINO_GENERIC_L476QEIX) || defined(ARDUINO_GENERIC_L476QGIX) ||\
-    defined(ARDUINO_GENERIC_L486QGIX)
+    defined(ARDUINO_GENERIC_L476QGIXP) || defined(ARDUINO_GENERIC_L486QGIX)
 #include "pins_arduino.h"
 
 /**
diff --git a/variants/STM32L4xx/L476Q(E-G)I_L486QGI/variant_generic.cpp b/variants/STM32L4xx/L476QEI_L476QGIx(P)_L486QGI/variant_generic.cpp
similarity index 96%
rename from variants/STM32L4xx/L476Q(E-G)I_L486QGI/variant_generic.cpp
rename to variants/STM32L4xx/L476QEI_L476QGIx(P)_L486QGI/variant_generic.cpp
index b349aa8a9a..85f8994cec 100644
--- a/variants/STM32L4xx/L476Q(E-G)I_L486QGI/variant_generic.cpp
+++ b/variants/STM32L4xx/L476QEI_L476QGIx(P)_L486QGI/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -11,7 +11,7 @@
  *******************************************************************************
  */
 #if defined(ARDUINO_GENERIC_L476QEIX) || defined(ARDUINO_GENERIC_L476QGIX) ||\
-    defined(ARDUINO_GENERIC_L486QGIX)
+    defined(ARDUINO_GENERIC_L476QGIXP) || defined(ARDUINO_GENERIC_L486QGIX)
 #include "pins_arduino.h"
 
 // Digital PinName array
diff --git a/variants/STM32L4xx/L476Q(E-G)I_L486QGI/variant_generic.h b/variants/STM32L4xx/L476QEI_L476QGIx(P)_L486QGI/variant_generic.h
similarity index 99%
rename from variants/STM32L4xx/L476Q(E-G)I_L486QGI/variant_generic.h
rename to variants/STM32L4xx/L476QEI_L476QGIx(P)_L486QGI/variant_generic.h
index 31194ebdb1..f985744e1c 100644
--- a/variants/STM32L4xx/L476Q(E-G)I_L486QGI/variant_generic.h
+++ b/variants/STM32L4xx/L476QEI_L476QGIx(P)_L486QGI/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L476ZET_L476ZG(J-T)_L486ZGT/PeripheralPins.c b/variants/STM32L4xx/L476ZET_L476ZG(J-T)_L486ZGT/PeripheralPins.c
index 82b1bf7a10..3176c94c3e 100644
--- a/variants/STM32L4xx/L476ZET_L476ZG(J-T)_L486ZGT/PeripheralPins.c
+++ b/variants/STM32L4xx/L476ZET_L476ZG(J-T)_L486ZGT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32L476Z(E-G)Tx.xml, STM32L476ZGJx.xml
  * STM32L486ZGTx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L476ZET_L476ZG(J-T)_L486ZGT/variant_generic.cpp b/variants/STM32L4xx/L476ZET_L476ZG(J-T)_L486ZGT/variant_generic.cpp
index e2fc7eb76c..12dda561c1 100644
--- a/variants/STM32L4xx/L476ZET_L476ZG(J-T)_L486ZGT/variant_generic.cpp
+++ b/variants/STM32L4xx/L476ZET_L476ZG(J-T)_L486ZGT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L476ZET_L476ZG(J-T)_L486ZGT/variant_generic.h b/variants/STM32L4xx/L476ZET_L476ZG(J-T)_L486ZGT/variant_generic.h
index bb4667d410..92efc44332 100644
--- a/variants/STM32L4xx/L476ZET_L476ZG(J-T)_L486ZGT/variant_generic.h
+++ b/variants/STM32L4xx/L476ZET_L476ZG(J-T)_L486ZGT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L476ZGTxP/PeripheralPins.c b/variants/STM32L4xx/L476ZGTxP/PeripheralPins.c
index 7c2ba015fa..6c3c625cc9 100644
--- a/variants/STM32L4xx/L476ZGTxP/PeripheralPins.c
+++ b/variants/STM32L4xx/L476ZGTxP/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L476ZGTxP.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L476ZGTxP/variant_generic.cpp b/variants/STM32L4xx/L476ZGTxP/variant_generic.cpp
index 64002709de..e8a15e3a7b 100644
--- a/variants/STM32L4xx/L476ZGTxP/variant_generic.cpp
+++ b/variants/STM32L4xx/L476ZGTxP/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L476ZGTxP/variant_generic.h b/variants/STM32L4xx/L476ZGTxP/variant_generic.h
index 1563b2342a..dee0b4f070 100644
--- a/variants/STM32L4xx/L476ZGTxP/variant_generic.h
+++ b/variants/STM32L4xx/L476ZGTxP/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L496A(E-G)I_L4A6AGI/PeripheralPins.c b/variants/STM32L4xx/L496A(E-G)I_L4A6AGI/PeripheralPins.c
index 47850f9fd8..ee472c9812 100644
--- a/variants/STM32L4xx/L496A(E-G)I_L4A6AGI/PeripheralPins.c
+++ b/variants/STM32L4xx/L496A(E-G)I_L4A6AGI/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L496A(E-G)Ix.xml, STM32L4A6AGIx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L496A(E-G)I_L4A6AGI/variant_generic.cpp b/variants/STM32L4xx/L496A(E-G)I_L4A6AGI/variant_generic.cpp
index 198588af9e..d73ca9e56e 100644
--- a/variants/STM32L4xx/L496A(E-G)I_L4A6AGI/variant_generic.cpp
+++ b/variants/STM32L4xx/L496A(E-G)I_L4A6AGI/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L496A(E-G)I_L4A6AGI/variant_generic.h b/variants/STM32L4xx/L496A(E-G)I_L4A6AGI/variant_generic.h
index 164df7636d..b4cb13a5cf 100644
--- a/variants/STM32L4xx/L496A(E-G)I_L4A6AGI/variant_generic.h
+++ b/variants/STM32L4xx/L496A(E-G)I_L4A6AGI/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L496AGIxP_L4A6AGIxP/PeripheralPins.c b/variants/STM32L4xx/L496AGIxP_L4A6AGIxP/PeripheralPins.c
index f5bde69494..7f629e652f 100644
--- a/variants/STM32L4xx/L496AGIxP_L4A6AGIxP/PeripheralPins.c
+++ b/variants/STM32L4xx/L496AGIxP_L4A6AGIxP/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L496AGIxP.xml, STM32L4A6AGIxP.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L496AGIxP_L4A6AGIxP/variant_generic.cpp b/variants/STM32L4xx/L496AGIxP_L4A6AGIxP/variant_generic.cpp
index c3fc0c7620..d0b5081ffd 100644
--- a/variants/STM32L4xx/L496AGIxP_L4A6AGIxP/variant_generic.cpp
+++ b/variants/STM32L4xx/L496AGIxP_L4A6AGIxP/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L496AGIxP_L4A6AGIxP/variant_generic.h b/variants/STM32L4xx/L496AGIxP_L4A6AGIxP/variant_generic.h
index 17392d1a75..f4debec6ee 100644
--- a/variants/STM32L4xx/L496AGIxP_L4A6AGIxP/variant_generic.h
+++ b/variants/STM32L4xx/L496AGIxP_L4A6AGIxP/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L496Q(E-G)I_L4A6QGI/PeripheralPins.c b/variants/STM32L4xx/L496Q(E-G)I_L4A6QGI/PeripheralPins.c
index 80a9802b23..72f0bf5fee 100644
--- a/variants/STM32L4xx/L496Q(E-G)I_L4A6QGI/PeripheralPins.c
+++ b/variants/STM32L4xx/L496Q(E-G)I_L4A6QGI/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L496Q(E-G)Ix.xml, STM32L4A6QGIx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L496Q(E-G)I_L4A6QGI/variant_generic.cpp b/variants/STM32L4xx/L496Q(E-G)I_L4A6QGI/variant_generic.cpp
index 13361616fb..1f57f94900 100644
--- a/variants/STM32L4xx/L496Q(E-G)I_L4A6QGI/variant_generic.cpp
+++ b/variants/STM32L4xx/L496Q(E-G)I_L4A6QGI/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L496Q(E-G)I_L4A6QGI/variant_generic.h b/variants/STM32L4xx/L496Q(E-G)I_L4A6QGI/variant_generic.h
index 90246e211a..cd0181e00d 100644
--- a/variants/STM32L4xx/L496Q(E-G)I_L4A6QGI/variant_generic.h
+++ b/variants/STM32L4xx/L496Q(E-G)I_L4A6QGI/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L496QGIxP_L4A6QGIxP/PeripheralPins.c b/variants/STM32L4xx/L496QGIx(P-S)_L4A6QGIxP/PeripheralPins.c
similarity index 99%
rename from variants/STM32L4xx/L496QGIxP_L4A6QGIxP/PeripheralPins.c
rename to variants/STM32L4xx/L496QGIx(P-S)_L4A6QGIxP/PeripheralPins.c
index 575b5ce4c1..2ee60142e8 100644
--- a/variants/STM32L4xx/L496QGIxP_L4A6QGIxP/PeripheralPins.c
+++ b/variants/STM32L4xx/L496QGIx(P-S)_L4A6QGIxP/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -11,8 +11,9 @@
  *******************************************************************************
  */
 /*
- * Automatically generated from STM32L496QGIxP.xml, STM32L4A6QGIxP.xml
- * CubeMX DB release 6.0.30
+ * Automatically generated from STM32L496QGIxP.xml, STM32L496QGIxS.xml
+ * STM32L4A6QGIxP.xml
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L496QGIxP_L4A6QGIxP/PinNamesVar.h b/variants/STM32L4xx/L496QGIx(P-S)_L4A6QGIxP/PinNamesVar.h
similarity index 100%
rename from variants/STM32L4xx/L496QGIxP_L4A6QGIxP/PinNamesVar.h
rename to variants/STM32L4xx/L496QGIx(P-S)_L4A6QGIxP/PinNamesVar.h
diff --git a/variants/STM32L4xx/L496QGIxP_L4A6QGIxP/boards_entry.txt b/variants/STM32L4xx/L496QGIx(P-S)_L4A6QGIxP/boards_entry.txt
similarity index 68%
rename from variants/STM32L4xx/L496QGIxP_L4A6QGIxP/boards_entry.txt
rename to variants/STM32L4xx/L496QGIx(P-S)_L4A6QGIxP/boards_entry.txt
index b880113fc1..024ab27996 100644
--- a/variants/STM32L4xx/L496QGIxP_L4A6QGIxP/boards_entry.txt
+++ b/variants/STM32L4xx/L496QGIx(P-S)_L4A6QGIxP/boards_entry.txt
@@ -9,7 +9,15 @@ GenL4.menu.pnum.GENERIC_L496QGIXP.upload.maximum_size=1048576
 GenL4.menu.pnum.GENERIC_L496QGIXP.upload.maximum_data_size=327680
 GenL4.menu.pnum.GENERIC_L496QGIXP.build.board=GENERIC_L496QGIXP
 GenL4.menu.pnum.GENERIC_L496QGIXP.build.product_line=STM32L496xx
-GenL4.menu.pnum.GENERIC_L496QGIXP.build.variant=STM32L4xx/L496QGIxP_L4A6QGIxP
+GenL4.menu.pnum.GENERIC_L496QGIXP.build.variant=STM32L4xx/L496QGIx(P-S)_L4A6QGIxP
+
+# Generic L496QGIxS
+GenL4.menu.pnum.GENERIC_L496QGIXS=Generic L496QGIxS
+GenL4.menu.pnum.GENERIC_L496QGIXS.upload.maximum_size=1048576
+GenL4.menu.pnum.GENERIC_L496QGIXS.upload.maximum_data_size=327680
+GenL4.menu.pnum.GENERIC_L496QGIXS.build.board=GENERIC_L496QGIXS
+GenL4.menu.pnum.GENERIC_L496QGIXS.build.product_line=STM32L4A6xx
+GenL4.menu.pnum.GENERIC_L496QGIXS.build.variant=STM32L4xx/L496QGIx(P-S)_L4A6QGIxP
 
 # Generic L4A6QGIxP
 GenL4.menu.pnum.GENERIC_L4A6QGIXP=Generic L4A6QGIxP
@@ -17,5 +25,5 @@ GenL4.menu.pnum.GENERIC_L4A6QGIXP.upload.maximum_size=1048576
 GenL4.menu.pnum.GENERIC_L4A6QGIXP.upload.maximum_data_size=327680
 GenL4.menu.pnum.GENERIC_L4A6QGIXP.build.board=GENERIC_L4A6QGIXP
 GenL4.menu.pnum.GENERIC_L4A6QGIXP.build.product_line=STM32L4A6xx
-GenL4.menu.pnum.GENERIC_L4A6QGIXP.build.variant=STM32L4xx/L496QGIxP_L4A6QGIxP
+GenL4.menu.pnum.GENERIC_L4A6QGIXP.build.variant=STM32L4xx/L496QGIx(P-S)_L4A6QGIxP
 
diff --git a/variants/STM32L4xx/L496QGIxP_L4A6QGIxP/generic_clock.c b/variants/STM32L4xx/L496QGIx(P-S)_L4A6QGIxP/generic_clock.c
similarity index 89%
rename from variants/STM32L4xx/L496QGIxP_L4A6QGIxP/generic_clock.c
rename to variants/STM32L4xx/L496QGIx(P-S)_L4A6QGIxP/generic_clock.c
index 619f8ee8eb..8a3eef9ac7 100644
--- a/variants/STM32L4xx/L496QGIxP_L4A6QGIxP/generic_clock.c
+++ b/variants/STM32L4xx/L496QGIx(P-S)_L4A6QGIxP/generic_clock.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -10,7 +10,8 @@
  *
  *******************************************************************************
  */
-#if defined(ARDUINO_GENERIC_L496QGIXP) || defined(ARDUINO_GENERIC_L4A6QGIXP)
+#if defined(ARDUINO_GENERIC_L496QGIXP) || defined(ARDUINO_GENERIC_L496QGIXS) ||\
+    defined(ARDUINO_GENERIC_L4A6QGIXP)
 #include "pins_arduino.h"
 
 /**
diff --git a/variants/STM32L4xx/L496QGIxP_L4A6QGIxP/variant_generic.cpp b/variants/STM32L4xx/L496QGIx(P-S)_L4A6QGIxP/variant_generic.cpp
similarity index 96%
rename from variants/STM32L4xx/L496QGIxP_L4A6QGIxP/variant_generic.cpp
rename to variants/STM32L4xx/L496QGIx(P-S)_L4A6QGIxP/variant_generic.cpp
index 6cb5603017..6c27b76811 100644
--- a/variants/STM32L4xx/L496QGIxP_L4A6QGIxP/variant_generic.cpp
+++ b/variants/STM32L4xx/L496QGIx(P-S)_L4A6QGIxP/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -10,7 +10,8 @@
  *
  *******************************************************************************
  */
-#if defined(ARDUINO_GENERIC_L496QGIXP) || defined(ARDUINO_GENERIC_L4A6QGIXP)
+#if defined(ARDUINO_GENERIC_L496QGIXP) || defined(ARDUINO_GENERIC_L496QGIXS) ||\
+    defined(ARDUINO_GENERIC_L4A6QGIXP)
 #include "pins_arduino.h"
 
 // Digital PinName array
diff --git a/variants/STM32L4xx/L496QGIxP_L4A6QGIxP/variant_generic.h b/variants/STM32L4xx/L496QGIx(P-S)_L4A6QGIxP/variant_generic.h
similarity index 99%
rename from variants/STM32L4xx/L496QGIxP_L4A6QGIxP/variant_generic.h
rename to variants/STM32L4xx/L496QGIx(P-S)_L4A6QGIxP/variant_generic.h
index 39c0cb0330..36cd143111 100644
--- a/variants/STM32L4xx/L496QGIxP_L4A6QGIxP/variant_generic.h
+++ b/variants/STM32L4xx/L496QGIx(P-S)_L4A6QGIxP/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L496R(E-G)T_L4A6RGT/PeripheralPins.c b/variants/STM32L4xx/L496R(E-G)T_L4A6RGT/PeripheralPins.c
index b4bbf7fadc..90bea73262 100644
--- a/variants/STM32L4xx/L496R(E-G)T_L4A6RGT/PeripheralPins.c
+++ b/variants/STM32L4xx/L496R(E-G)T_L4A6RGT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L496R(E-G)Tx.xml, STM32L4A6RGTx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L496R(E-G)T_L4A6RGT/variant_generic.cpp b/variants/STM32L4xx/L496R(E-G)T_L4A6RGT/variant_generic.cpp
index ea7841d543..83bf42d83c 100644
--- a/variants/STM32L4xx/L496R(E-G)T_L4A6RGT/variant_generic.cpp
+++ b/variants/STM32L4xx/L496R(E-G)T_L4A6RGT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L496R(E-G)T_L4A6RGT/variant_generic.h b/variants/STM32L4xx/L496R(E-G)T_L4A6RGT/variant_generic.h
index 1d3bb472cb..638157bb28 100644
--- a/variants/STM32L4xx/L496R(E-G)T_L4A6RGT/variant_generic.h
+++ b/variants/STM32L4xx/L496R(E-G)T_L4A6RGT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L496RGTxP/PeripheralPins.c b/variants/STM32L4xx/L496RGTxP/PeripheralPins.c
index 58da1fcc16..76e56643e7 100644
--- a/variants/STM32L4xx/L496RGTxP/PeripheralPins.c
+++ b/variants/STM32L4xx/L496RGTxP/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L496RGTxP.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L496RGTxP/variant_generic.cpp b/variants/STM32L4xx/L496RGTxP/variant_generic.cpp
index 88c0e7b528..ef829f7d3e 100644
--- a/variants/STM32L4xx/L496RGTxP/variant_generic.cpp
+++ b/variants/STM32L4xx/L496RGTxP/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L496RGTxP/variant_generic.h b/variants/STM32L4xx/L496RGTxP/variant_generic.h
index 3924fc91df..ce9bf563de 100644
--- a/variants/STM32L4xx/L496RGTxP/variant_generic.h
+++ b/variants/STM32L4xx/L496RGTxP/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L496V(E-G)T_L4A6VGT/PeripheralPins.c b/variants/STM32L4xx/L496V(E-G)T_L4A6VGT/PeripheralPins.c
index 2ceea8168d..0946383fcb 100644
--- a/variants/STM32L4xx/L496V(E-G)T_L4A6VGT/PeripheralPins.c
+++ b/variants/STM32L4xx/L496V(E-G)T_L4A6VGT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L496V(E-G)Tx.xml, STM32L4A6VGTx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L496V(E-G)T_L4A6VGT/variant_generic.cpp b/variants/STM32L4xx/L496V(E-G)T_L4A6VGT/variant_generic.cpp
index 272de14ff1..64909708f6 100644
--- a/variants/STM32L4xx/L496V(E-G)T_L4A6VGT/variant_generic.cpp
+++ b/variants/STM32L4xx/L496V(E-G)T_L4A6VGT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L496V(E-G)T_L4A6VGT/variant_generic.h b/variants/STM32L4xx/L496V(E-G)T_L4A6VGT/variant_generic.h
index a2dde99d58..d046cb7994 100644
--- a/variants/STM32L4xx/L496V(E-G)T_L4A6VGT/variant_generic.h
+++ b/variants/STM32L4xx/L496V(E-G)T_L4A6VGT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L496VGTxP_L4A6VGTxP/PeripheralPins.c b/variants/STM32L4xx/L496VGTxP_L4A6VGTxP/PeripheralPins.c
index 4ff3ed5e3b..3f82e7d598 100644
--- a/variants/STM32L4xx/L496VGTxP_L4A6VGTxP/PeripheralPins.c
+++ b/variants/STM32L4xx/L496VGTxP_L4A6VGTxP/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L496VGTxP.xml, STM32L4A6VGTxP.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L496VGTxP_L4A6VGTxP/variant_generic.cpp b/variants/STM32L4xx/L496VGTxP_L4A6VGTxP/variant_generic.cpp
index 957d468575..fb18919f5f 100644
--- a/variants/STM32L4xx/L496VGTxP_L4A6VGTxP/variant_generic.cpp
+++ b/variants/STM32L4xx/L496VGTxP_L4A6VGTxP/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L496VGTxP_L4A6VGTxP/variant_generic.h b/variants/STM32L4xx/L496VGTxP_L4A6VGTxP/variant_generic.h
index 4283237efb..91467d2e32 100644
--- a/variants/STM32L4xx/L496VGTxP_L4A6VGTxP/variant_generic.h
+++ b/variants/STM32L4xx/L496VGTxP_L4A6VGTxP/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L496VGY_L4A6VGY/PeripheralPins.c b/variants/STM32L4xx/L496VGY_L4A6VGY/PeripheralPins.c
index d30b84e9ed..5f1526d22b 100644
--- a/variants/STM32L4xx/L496VGY_L4A6VGY/PeripheralPins.c
+++ b/variants/STM32L4xx/L496VGY_L4A6VGY/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L496VGYx.xml, STM32L4A6VGYx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L496VGY_L4A6VGY/variant_generic.cpp b/variants/STM32L4xx/L496VGY_L4A6VGY/variant_generic.cpp
index 4ca23a77c5..9875172394 100644
--- a/variants/STM32L4xx/L496VGY_L4A6VGY/variant_generic.cpp
+++ b/variants/STM32L4xx/L496VGY_L4A6VGY/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L496VGY_L4A6VGY/variant_generic.h b/variants/STM32L4xx/L496VGY_L4A6VGY/variant_generic.h
index 8fae017413..27c7be5b17 100644
--- a/variants/STM32L4xx/L496VGY_L4A6VGY/variant_generic.h
+++ b/variants/STM32L4xx/L496VGY_L4A6VGY/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L496VGYxP_L4A6VGYxP/PeripheralPins.c b/variants/STM32L4xx/L496VGYxP_L4A6VGYxP/PeripheralPins.c
index 8b6de73259..484e0d900e 100644
--- a/variants/STM32L4xx/L496VGYxP_L4A6VGYxP/PeripheralPins.c
+++ b/variants/STM32L4xx/L496VGYxP_L4A6VGYxP/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L496VGYxP.xml, STM32L4A6VGYxP.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L496VGYxP_L4A6VGYxP/variant_generic.cpp b/variants/STM32L4xx/L496VGYxP_L4A6VGYxP/variant_generic.cpp
index 5515e5a32b..6c1040f553 100644
--- a/variants/STM32L4xx/L496VGYxP_L4A6VGYxP/variant_generic.cpp
+++ b/variants/STM32L4xx/L496VGYxP_L4A6VGYxP/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L496VGYxP_L4A6VGYxP/variant_generic.h b/variants/STM32L4xx/L496VGYxP_L4A6VGYxP/variant_generic.h
index 32ccee72e8..710a577925 100644
--- a/variants/STM32L4xx/L496VGYxP_L4A6VGYxP/variant_generic.h
+++ b/variants/STM32L4xx/L496VGYxP_L4A6VGYxP/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L496WGYxP/PeripheralPins.c b/variants/STM32L4xx/L496WGYxP/PeripheralPins.c
index 6a117b7c13..bc0525fe89 100644
--- a/variants/STM32L4xx/L496WGYxP/PeripheralPins.c
+++ b/variants/STM32L4xx/L496WGYxP/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L496WGYxP.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L496WGYxP/variant_generic.cpp b/variants/STM32L4xx/L496WGYxP/variant_generic.cpp
index e020af4837..1c205598b6 100644
--- a/variants/STM32L4xx/L496WGYxP/variant_generic.cpp
+++ b/variants/STM32L4xx/L496WGYxP/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L496WGYxP/variant_generic.h b/variants/STM32L4xx/L496WGYxP/variant_generic.h
index e6a9b4aeee..3da306c5ee 100644
--- a/variants/STM32L4xx/L496WGYxP/variant_generic.h
+++ b/variants/STM32L4xx/L496WGYxP/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L496Z(E-G)T_L4A6ZGT/PeripheralPins.c b/variants/STM32L4xx/L496Z(E-G)T_L4A6ZGT/PeripheralPins.c
index c815c2db52..de25513fdd 100644
--- a/variants/STM32L4xx/L496Z(E-G)T_L4A6ZGT/PeripheralPins.c
+++ b/variants/STM32L4xx/L496Z(E-G)T_L4A6ZGT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L496Z(E-G)Tx.xml, STM32L4A6ZGTx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L496Z(E-G)T_L4A6ZGT/variant_generic.cpp b/variants/STM32L4xx/L496Z(E-G)T_L4A6ZGT/variant_generic.cpp
index 05ad706477..7bf313b56d 100644
--- a/variants/STM32L4xx/L496Z(E-G)T_L4A6ZGT/variant_generic.cpp
+++ b/variants/STM32L4xx/L496Z(E-G)T_L4A6ZGT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L496Z(E-G)T_L4A6ZGT/variant_generic.h b/variants/STM32L4xx/L496Z(E-G)T_L4A6ZGT/variant_generic.h
index 68f45f34c2..bb49533440 100644
--- a/variants/STM32L4xx/L496Z(E-G)T_L4A6ZGT/variant_generic.h
+++ b/variants/STM32L4xx/L496Z(E-G)T_L4A6ZGT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L496ZGTxP_L4A6ZGTxP/PeripheralPins.c b/variants/STM32L4xx/L496ZGTxP_L4A6ZGTxP/PeripheralPins.c
index e911f44b18..263f0b0f32 100644
--- a/variants/STM32L4xx/L496ZGTxP_L4A6ZGTxP/PeripheralPins.c
+++ b/variants/STM32L4xx/L496ZGTxP_L4A6ZGTxP/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L496ZGTxP.xml, STM32L4A6ZGTxP.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L496ZGTxP_L4A6ZGTxP/variant_generic.cpp b/variants/STM32L4xx/L496ZGTxP_L4A6ZGTxP/variant_generic.cpp
index 1f8db1c137..45ca37fa42 100644
--- a/variants/STM32L4xx/L496ZGTxP_L4A6ZGTxP/variant_generic.cpp
+++ b/variants/STM32L4xx/L496ZGTxP_L4A6ZGTxP/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L496ZGTxP_L4A6ZGTxP/variant_generic.h b/variants/STM32L4xx/L496ZGTxP_L4A6ZGTxP/variant_generic.h
index 4fb4a03ffa..8ca27c0580 100644
--- a/variants/STM32L4xx/L496ZGTxP_L4A6ZGTxP/variant_generic.h
+++ b/variants/STM32L4xx/L496ZGTxP_L4A6ZGTxP/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L4A6RGTxP/PeripheralPins.c b/variants/STM32L4xx/L4A6RGTxP/PeripheralPins.c
index f26e8a818c..c7b6a708fe 100644
--- a/variants/STM32L4xx/L4A6RGTxP/PeripheralPins.c
+++ b/variants/STM32L4xx/L4A6RGTxP/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L4A6RGTxP.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L4A6RGTxP/variant_generic.cpp b/variants/STM32L4xx/L4A6RGTxP/variant_generic.cpp
index e3ec397a83..4ab45eb2f7 100644
--- a/variants/STM32L4xx/L4A6RGTxP/variant_generic.cpp
+++ b/variants/STM32L4xx/L4A6RGTxP/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L4A6RGTxP/variant_generic.h b/variants/STM32L4xx/L4A6RGTxP/variant_generic.h
index 6d2c8aaada..b2fa1e42f4 100644
--- a/variants/STM32L4xx/L4A6RGTxP/variant_generic.h
+++ b/variants/STM32L4xx/L4A6RGTxP/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L4P5A(G-E)I_L4Q5AGI/PeripheralPins.c b/variants/STM32L4xx/L4P5A(G-E)I_L4Q5AGI/PeripheralPins.c
index 372e798678..3dba0b71cb 100644
--- a/variants/STM32L4xx/L4P5A(G-E)I_L4Q5AGI/PeripheralPins.c
+++ b/variants/STM32L4xx/L4P5A(G-E)I_L4Q5AGI/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L4P5A(G-E)Ix.xml, STM32L4Q5AGIx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L4P5A(G-E)I_L4Q5AGI/variant_generic.cpp b/variants/STM32L4xx/L4P5A(G-E)I_L4Q5AGI/variant_generic.cpp
index 373d9678b5..def6212291 100644
--- a/variants/STM32L4xx/L4P5A(G-E)I_L4Q5AGI/variant_generic.cpp
+++ b/variants/STM32L4xx/L4P5A(G-E)I_L4Q5AGI/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L4P5A(G-E)I_L4Q5AGI/variant_generic.h b/variants/STM32L4xx/L4P5A(G-E)I_L4Q5AGI/variant_generic.h
index 5c4365be15..2a532ee1fb 100644
--- a/variants/STM32L4xx/L4P5A(G-E)I_L4Q5AGI/variant_generic.h
+++ b/variants/STM32L4xx/L4P5A(G-E)I_L4Q5AGI/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L4P5AGIxP_L4Q5AGIxP/PeripheralPins.c b/variants/STM32L4xx/L4P5AGIxP_L4Q5AGIxP/PeripheralPins.c
index 5b99608db7..ce760cbc0e 100644
--- a/variants/STM32L4xx/L4P5AGIxP_L4Q5AGIxP/PeripheralPins.c
+++ b/variants/STM32L4xx/L4P5AGIxP_L4Q5AGIxP/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L4P5AGIxP.xml, STM32L4Q5AGIxP.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L4P5AGIxP_L4Q5AGIxP/variant_generic.cpp b/variants/STM32L4xx/L4P5AGIxP_L4Q5AGIxP/variant_generic.cpp
index 37eac81650..7ea034315d 100644
--- a/variants/STM32L4xx/L4P5AGIxP_L4Q5AGIxP/variant_generic.cpp
+++ b/variants/STM32L4xx/L4P5AGIxP_L4Q5AGIxP/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L4P5AGIxP_L4Q5AGIxP/variant_generic.h b/variants/STM32L4xx/L4P5AGIxP_L4Q5AGIxP/variant_generic.h
index 57aaef4b7f..c1c2c6503c 100644
--- a/variants/STM32L4xx/L4P5AGIxP_L4Q5AGIxP/variant_generic.h
+++ b/variants/STM32L4xx/L4P5AGIxP_L4Q5AGIxP/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L4P5C(E-G)(T-U)_L4Q5CG(T-U)/PeripheralPins.c b/variants/STM32L4xx/L4P5C(E-G)(T-U)_L4Q5CG(T-U)/PeripheralPins.c
index 1846eba3e3..1a1e47cf04 100644
--- a/variants/STM32L4xx/L4P5C(E-G)(T-U)_L4Q5CG(T-U)/PeripheralPins.c
+++ b/variants/STM32L4xx/L4P5C(E-G)(T-U)_L4Q5CG(T-U)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32L4P5C(G-E)Tx.xml, STM32L4P5C(G-E)Ux.xml
  * STM32L4Q5CGTx.xml, STM32L4Q5CGUx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L4P5C(E-G)(T-U)_L4Q5CG(T-U)/variant_generic.cpp b/variants/STM32L4xx/L4P5C(E-G)(T-U)_L4Q5CG(T-U)/variant_generic.cpp
index 37ba76c5d0..7c9ceb5dfd 100644
--- a/variants/STM32L4xx/L4P5C(E-G)(T-U)_L4Q5CG(T-U)/variant_generic.cpp
+++ b/variants/STM32L4xx/L4P5C(E-G)(T-U)_L4Q5CG(T-U)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L4P5C(E-G)(T-U)_L4Q5CG(T-U)/variant_generic.h b/variants/STM32L4xx/L4P5C(E-G)(T-U)_L4Q5CG(T-U)/variant_generic.h
index 06c366709d..d01a463bc7 100644
--- a/variants/STM32L4xx/L4P5C(E-G)(T-U)_L4Q5CG(T-U)/variant_generic.h
+++ b/variants/STM32L4xx/L4P5C(E-G)(T-U)_L4Q5CG(T-U)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L4P5CG(T-U)xP_L4Q5CG(T-U)xP/PeripheralPins.c b/variants/STM32L4xx/L4P5CG(T-U)xP_L4Q5CG(T-U)xP/PeripheralPins.c
index 89ed9351e0..605a722de2 100644
--- a/variants/STM32L4xx/L4P5CG(T-U)xP_L4Q5CG(T-U)xP/PeripheralPins.c
+++ b/variants/STM32L4xx/L4P5CG(T-U)xP_L4Q5CG(T-U)xP/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32L4P5CGTxP.xml, STM32L4P5CGUxP.xml
  * STM32L4Q5CGTxP.xml, STM32L4Q5CGUxP.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L4P5CG(T-U)xP_L4Q5CG(T-U)xP/variant_generic.cpp b/variants/STM32L4xx/L4P5CG(T-U)xP_L4Q5CG(T-U)xP/variant_generic.cpp
index c3974c0417..58c6f3c650 100644
--- a/variants/STM32L4xx/L4P5CG(T-U)xP_L4Q5CG(T-U)xP/variant_generic.cpp
+++ b/variants/STM32L4xx/L4P5CG(T-U)xP_L4Q5CG(T-U)xP/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L4P5CG(T-U)xP_L4Q5CG(T-U)xP/variant_generic.h b/variants/STM32L4xx/L4P5CG(T-U)xP_L4Q5CG(T-U)xP/variant_generic.h
index f33eaf7cdd..526fec94df 100644
--- a/variants/STM32L4xx/L4P5CG(T-U)xP_L4Q5CG(T-U)xP/variant_generic.h
+++ b/variants/STM32L4xx/L4P5CG(T-U)xP_L4Q5CG(T-U)xP/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L4P5Q(G-E)I_L4Q5QGI/PeripheralPins.c b/variants/STM32L4xx/L4P5Q(G-E)I_L4Q5QGI/PeripheralPins.c
index b3e4154128..dbece32afc 100644
--- a/variants/STM32L4xx/L4P5Q(G-E)I_L4Q5QGI/PeripheralPins.c
+++ b/variants/STM32L4xx/L4P5Q(G-E)I_L4Q5QGI/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L4P5Q(G-E)Ix.xml, STM32L4Q5QGIx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L4P5Q(G-E)I_L4Q5QGI/variant_generic.cpp b/variants/STM32L4xx/L4P5Q(G-E)I_L4Q5QGI/variant_generic.cpp
index c3e071ff50..070e5ae4d8 100644
--- a/variants/STM32L4xx/L4P5Q(G-E)I_L4Q5QGI/variant_generic.cpp
+++ b/variants/STM32L4xx/L4P5Q(G-E)I_L4Q5QGI/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L4P5Q(G-E)I_L4Q5QGI/variant_generic.h b/variants/STM32L4xx/L4P5Q(G-E)I_L4Q5QGI/variant_generic.h
index 46a3c6b26d..21bcf98bb6 100644
--- a/variants/STM32L4xx/L4P5Q(G-E)I_L4Q5QGI/variant_generic.h
+++ b/variants/STM32L4xx/L4P5Q(G-E)I_L4Q5QGI/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L4P5QGIxP_L4Q5QGIxP/PeripheralPins.c b/variants/STM32L4xx/L4P5QGIx(P-S)_L4Q5QGIxP/PeripheralPins.c
similarity index 99%
rename from variants/STM32L4xx/L4P5QGIxP_L4Q5QGIxP/PeripheralPins.c
rename to variants/STM32L4xx/L4P5QGIx(P-S)_L4Q5QGIxP/PeripheralPins.c
index 84a944bc7c..fcc14f27fe 100644
--- a/variants/STM32L4xx/L4P5QGIxP_L4Q5QGIxP/PeripheralPins.c
+++ b/variants/STM32L4xx/L4P5QGIx(P-S)_L4Q5QGIxP/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -11,8 +11,9 @@
  *******************************************************************************
  */
 /*
- * Automatically generated from STM32L4P5QGIxP.xml, STM32L4Q5QGIxP.xml
- * CubeMX DB release 6.0.30
+ * Automatically generated from STM32L4P5QGIxP.xml, STM32L4P5QGIxS.xml
+ * STM32L4Q5QGIxP.xml
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L4P5QGIxP_L4Q5QGIxP/PinNamesVar.h b/variants/STM32L4xx/L4P5QGIx(P-S)_L4Q5QGIxP/PinNamesVar.h
similarity index 100%
rename from variants/STM32L4xx/L4P5QGIxP_L4Q5QGIxP/PinNamesVar.h
rename to variants/STM32L4xx/L4P5QGIx(P-S)_L4Q5QGIxP/PinNamesVar.h
diff --git a/variants/STM32L4xx/L4P5QGIxP_L4Q5QGIxP/boards_entry.txt b/variants/STM32L4xx/L4P5QGIx(P-S)_L4Q5QGIxP/boards_entry.txt
similarity index 68%
rename from variants/STM32L4xx/L4P5QGIxP_L4Q5QGIxP/boards_entry.txt
rename to variants/STM32L4xx/L4P5QGIx(P-S)_L4Q5QGIxP/boards_entry.txt
index 9c46e8cfd2..65c3e4b266 100644
--- a/variants/STM32L4xx/L4P5QGIxP_L4Q5QGIxP/boards_entry.txt
+++ b/variants/STM32L4xx/L4P5QGIx(P-S)_L4Q5QGIxP/boards_entry.txt
@@ -9,7 +9,15 @@ GenL4.menu.pnum.GENERIC_L4P5QGIXP.upload.maximum_size=1048576
 GenL4.menu.pnum.GENERIC_L4P5QGIXP.upload.maximum_data_size=327680
 GenL4.menu.pnum.GENERIC_L4P5QGIXP.build.board=GENERIC_L4P5QGIXP
 GenL4.menu.pnum.GENERIC_L4P5QGIXP.build.product_line=STM32L4P5xx
-GenL4.menu.pnum.GENERIC_L4P5QGIXP.build.variant=STM32L4xx/L4P5QGIxP_L4Q5QGIxP
+GenL4.menu.pnum.GENERIC_L4P5QGIXP.build.variant=STM32L4xx/L4P5QGIx(P-S)_L4Q5QGIxP
+
+# Generic L4P5QGIxS
+GenL4.menu.pnum.GENERIC_L4P5QGIXS=Generic L4P5QGIxS
+GenL4.menu.pnum.GENERIC_L4P5QGIXS.upload.maximum_size=1048576
+GenL4.menu.pnum.GENERIC_L4P5QGIXS.upload.maximum_data_size=327680
+GenL4.menu.pnum.GENERIC_L4P5QGIXS.build.board=GENERIC_L4P5QGIXS
+GenL4.menu.pnum.GENERIC_L4P5QGIXS.build.product_line=STM32L4Q5xx
+GenL4.menu.pnum.GENERIC_L4P5QGIXS.build.variant=STM32L4xx/L4P5QGIx(P-S)_L4Q5QGIxP
 
 # Generic L4Q5QGIxP
 GenL4.menu.pnum.GENERIC_L4Q5QGIXP=Generic L4Q5QGIxP
@@ -17,5 +25,5 @@ GenL4.menu.pnum.GENERIC_L4Q5QGIXP.upload.maximum_size=1048576
 GenL4.menu.pnum.GENERIC_L4Q5QGIXP.upload.maximum_data_size=327680
 GenL4.menu.pnum.GENERIC_L4Q5QGIXP.build.board=GENERIC_L4Q5QGIXP
 GenL4.menu.pnum.GENERIC_L4Q5QGIXP.build.product_line=STM32L4Q5xx
-GenL4.menu.pnum.GENERIC_L4Q5QGIXP.build.variant=STM32L4xx/L4P5QGIxP_L4Q5QGIxP
+GenL4.menu.pnum.GENERIC_L4Q5QGIXP.build.variant=STM32L4xx/L4P5QGIx(P-S)_L4Q5QGIxP
 
diff --git a/variants/STM32L4xx/L4P5QGIxP_L4Q5QGIxP/generic_clock.c b/variants/STM32L4xx/L4P5QGIx(P-S)_L4Q5QGIxP/generic_clock.c
similarity index 89%
rename from variants/STM32L4xx/L4P5QGIxP_L4Q5QGIxP/generic_clock.c
rename to variants/STM32L4xx/L4P5QGIx(P-S)_L4Q5QGIxP/generic_clock.c
index f515d7fa1e..33ec0188f6 100644
--- a/variants/STM32L4xx/L4P5QGIxP_L4Q5QGIxP/generic_clock.c
+++ b/variants/STM32L4xx/L4P5QGIx(P-S)_L4Q5QGIxP/generic_clock.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -10,7 +10,8 @@
  *
  *******************************************************************************
  */
-#if defined(ARDUINO_GENERIC_L4P5QGIXP) || defined(ARDUINO_GENERIC_L4Q5QGIXP)
+#if defined(ARDUINO_GENERIC_L4P5QGIXP) || defined(ARDUINO_GENERIC_L4P5QGIXS) ||\
+    defined(ARDUINO_GENERIC_L4Q5QGIXP)
 #include "pins_arduino.h"
 
 /**
diff --git a/variants/STM32L4xx/L4P5QGIxP_L4Q5QGIxP/variant_generic.cpp b/variants/STM32L4xx/L4P5QGIx(P-S)_L4Q5QGIxP/variant_generic.cpp
similarity index 96%
rename from variants/STM32L4xx/L4P5QGIxP_L4Q5QGIxP/variant_generic.cpp
rename to variants/STM32L4xx/L4P5QGIx(P-S)_L4Q5QGIxP/variant_generic.cpp
index 319b974b91..503f4962ee 100644
--- a/variants/STM32L4xx/L4P5QGIxP_L4Q5QGIxP/variant_generic.cpp
+++ b/variants/STM32L4xx/L4P5QGIx(P-S)_L4Q5QGIxP/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -10,7 +10,8 @@
  *
  *******************************************************************************
  */
-#if defined(ARDUINO_GENERIC_L4P5QGIXP) || defined(ARDUINO_GENERIC_L4Q5QGIXP)
+#if defined(ARDUINO_GENERIC_L4P5QGIXP) || defined(ARDUINO_GENERIC_L4P5QGIXS) ||\
+    defined(ARDUINO_GENERIC_L4Q5QGIXP)
 #include "pins_arduino.h"
 
 // Digital PinName array
diff --git a/variants/STM32L4xx/L4P5QGIxP_L4Q5QGIxP/variant_generic.h b/variants/STM32L4xx/L4P5QGIx(P-S)_L4Q5QGIxP/variant_generic.h
similarity index 99%
rename from variants/STM32L4xx/L4P5QGIxP_L4Q5QGIxP/variant_generic.h
rename to variants/STM32L4xx/L4P5QGIx(P-S)_L4Q5QGIxP/variant_generic.h
index c6685d85bd..a22c1755cf 100644
--- a/variants/STM32L4xx/L4P5QGIxP_L4Q5QGIxP/variant_generic.h
+++ b/variants/STM32L4xx/L4P5QGIx(P-S)_L4Q5QGIxP/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L4P5R(G-E)T_L4Q5RGT/PeripheralPins.c b/variants/STM32L4xx/L4P5R(G-E)T_L4Q5RGT/PeripheralPins.c
index 3836ed5533..67b03f2ba9 100644
--- a/variants/STM32L4xx/L4P5R(G-E)T_L4Q5RGT/PeripheralPins.c
+++ b/variants/STM32L4xx/L4P5R(G-E)T_L4Q5RGT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L4P5R(G-E)Tx.xml, STM32L4Q5RGTx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L4P5R(G-E)T_L4Q5RGT/variant_generic.cpp b/variants/STM32L4xx/L4P5R(G-E)T_L4Q5RGT/variant_generic.cpp
index a63504bd2a..b352c94cff 100644
--- a/variants/STM32L4xx/L4P5R(G-E)T_L4Q5RGT/variant_generic.cpp
+++ b/variants/STM32L4xx/L4P5R(G-E)T_L4Q5RGT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L4P5R(G-E)T_L4Q5RGT/variant_generic.h b/variants/STM32L4xx/L4P5R(G-E)T_L4Q5RGT/variant_generic.h
index a76d3be7ae..51d8f02d0a 100644
--- a/variants/STM32L4xx/L4P5R(G-E)T_L4Q5RGT/variant_generic.h
+++ b/variants/STM32L4xx/L4P5R(G-E)T_L4Q5RGT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L4P5RGTxP_L4Q5RGTxP/PeripheralPins.c b/variants/STM32L4xx/L4P5RGTxP_L4Q5RGTxP/PeripheralPins.c
index 4701d81f28..52871f5423 100644
--- a/variants/STM32L4xx/L4P5RGTxP_L4Q5RGTxP/PeripheralPins.c
+++ b/variants/STM32L4xx/L4P5RGTxP_L4Q5RGTxP/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L4P5RGTxP.xml, STM32L4Q5RGTxP.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L4P5RGTxP_L4Q5RGTxP/variant_generic.cpp b/variants/STM32L4xx/L4P5RGTxP_L4Q5RGTxP/variant_generic.cpp
index 9d23fbd7bd..e42e6af52c 100644
--- a/variants/STM32L4xx/L4P5RGTxP_L4Q5RGTxP/variant_generic.cpp
+++ b/variants/STM32L4xx/L4P5RGTxP_L4Q5RGTxP/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L4P5RGTxP_L4Q5RGTxP/variant_generic.h b/variants/STM32L4xx/L4P5RGTxP_L4Q5RGTxP/variant_generic.h
index 834ca5517a..232946dadf 100644
--- a/variants/STM32L4xx/L4P5RGTxP_L4Q5RGTxP/variant_generic.h
+++ b/variants/STM32L4xx/L4P5RGTxP_L4Q5RGTxP/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L4P5V(G-E)T_L4Q5VGT/PeripheralPins.c b/variants/STM32L4xx/L4P5V(G-E)T_L4Q5VGT/PeripheralPins.c
index b96d798d4c..7e998d1a8b 100644
--- a/variants/STM32L4xx/L4P5V(G-E)T_L4Q5VGT/PeripheralPins.c
+++ b/variants/STM32L4xx/L4P5V(G-E)T_L4Q5VGT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L4P5V(G-E)Tx.xml, STM32L4Q5VGTx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L4P5V(G-E)T_L4Q5VGT/variant_generic.cpp b/variants/STM32L4xx/L4P5V(G-E)T_L4Q5VGT/variant_generic.cpp
index 7f52a3751f..ce986e7ff3 100644
--- a/variants/STM32L4xx/L4P5V(G-E)T_L4Q5VGT/variant_generic.cpp
+++ b/variants/STM32L4xx/L4P5V(G-E)T_L4Q5VGT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L4P5V(G-E)T_L4Q5VGT/variant_generic.h b/variants/STM32L4xx/L4P5V(G-E)T_L4Q5VGT/variant_generic.h
index 0140eb328c..5d00b89e28 100644
--- a/variants/STM32L4xx/L4P5V(G-E)T_L4Q5VGT/variant_generic.h
+++ b/variants/STM32L4xx/L4P5V(G-E)T_L4Q5VGT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L4P5V(G-E)Y_L4Q5VGY/PeripheralPins.c b/variants/STM32L4xx/L4P5V(G-E)Y_L4Q5VGY/PeripheralPins.c
index 7fe5b4d5bd..cb13899ce7 100644
--- a/variants/STM32L4xx/L4P5V(G-E)Y_L4Q5VGY/PeripheralPins.c
+++ b/variants/STM32L4xx/L4P5V(G-E)Y_L4Q5VGY/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L4P5V(G-E)Yx.xml, STM32L4Q5VGYx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L4P5V(G-E)Y_L4Q5VGY/variant_generic.cpp b/variants/STM32L4xx/L4P5V(G-E)Y_L4Q5VGY/variant_generic.cpp
index 970f758ea3..06cabae19b 100644
--- a/variants/STM32L4xx/L4P5V(G-E)Y_L4Q5VGY/variant_generic.cpp
+++ b/variants/STM32L4xx/L4P5V(G-E)Y_L4Q5VGY/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L4P5V(G-E)Y_L4Q5VGY/variant_generic.h b/variants/STM32L4xx/L4P5V(G-E)Y_L4Q5VGY/variant_generic.h
index 5345feb5ae..d3348f1074 100644
--- a/variants/STM32L4xx/L4P5V(G-E)Y_L4Q5VGY/variant_generic.h
+++ b/variants/STM32L4xx/L4P5V(G-E)Y_L4Q5VGY/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L4P5VGTxP_L4Q5VGTxP/PeripheralPins.c b/variants/STM32L4xx/L4P5VGTxP_L4Q5VGTxP/PeripheralPins.c
index b691e17d99..0684b50af8 100644
--- a/variants/STM32L4xx/L4P5VGTxP_L4Q5VGTxP/PeripheralPins.c
+++ b/variants/STM32L4xx/L4P5VGTxP_L4Q5VGTxP/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L4P5VGTxP.xml, STM32L4Q5VGTxP.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L4P5VGTxP_L4Q5VGTxP/variant_generic.cpp b/variants/STM32L4xx/L4P5VGTxP_L4Q5VGTxP/variant_generic.cpp
index f81311ac2c..b1c1c07829 100644
--- a/variants/STM32L4xx/L4P5VGTxP_L4Q5VGTxP/variant_generic.cpp
+++ b/variants/STM32L4xx/L4P5VGTxP_L4Q5VGTxP/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L4P5VGTxP_L4Q5VGTxP/variant_generic.h b/variants/STM32L4xx/L4P5VGTxP_L4Q5VGTxP/variant_generic.h
index ab73df5859..6371fce67e 100644
--- a/variants/STM32L4xx/L4P5VGTxP_L4Q5VGTxP/variant_generic.h
+++ b/variants/STM32L4xx/L4P5VGTxP_L4Q5VGTxP/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L4P5VGYxP_L4Q5VGYxP/PeripheralPins.c b/variants/STM32L4xx/L4P5VGYxP_L4Q5VGYxP/PeripheralPins.c
index 9ac48c01d2..e87126ea8d 100644
--- a/variants/STM32L4xx/L4P5VGYxP_L4Q5VGYxP/PeripheralPins.c
+++ b/variants/STM32L4xx/L4P5VGYxP_L4Q5VGYxP/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L4P5VGYxP.xml, STM32L4Q5VGYxP.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L4P5VGYxP_L4Q5VGYxP/variant_generic.cpp b/variants/STM32L4xx/L4P5VGYxP_L4Q5VGYxP/variant_generic.cpp
index 89596d5f1c..f1165ac32e 100644
--- a/variants/STM32L4xx/L4P5VGYxP_L4Q5VGYxP/variant_generic.cpp
+++ b/variants/STM32L4xx/L4P5VGYxP_L4Q5VGYxP/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L4P5VGYxP_L4Q5VGYxP/variant_generic.h b/variants/STM32L4xx/L4P5VGYxP_L4Q5VGYxP/variant_generic.h
index a8b1e75539..2d7d7cb17a 100644
--- a/variants/STM32L4xx/L4P5VGYxP_L4Q5VGYxP/variant_generic.h
+++ b/variants/STM32L4xx/L4P5VGYxP_L4Q5VGYxP/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L4P5Z(G-E)T_L4Q5ZGT/PeripheralPins.c b/variants/STM32L4xx/L4P5Z(G-E)T_L4Q5ZGT/PeripheralPins.c
index 94ac6ab969..283f90e898 100644
--- a/variants/STM32L4xx/L4P5Z(G-E)T_L4Q5ZGT/PeripheralPins.c
+++ b/variants/STM32L4xx/L4P5Z(G-E)T_L4Q5ZGT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L4P5Z(G-E)Tx.xml, STM32L4Q5ZGTx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L4P5Z(G-E)T_L4Q5ZGT/variant_generic.cpp b/variants/STM32L4xx/L4P5Z(G-E)T_L4Q5ZGT/variant_generic.cpp
index 3ce1c8a81e..0cc714818e 100644
--- a/variants/STM32L4xx/L4P5Z(G-E)T_L4Q5ZGT/variant_generic.cpp
+++ b/variants/STM32L4xx/L4P5Z(G-E)T_L4Q5ZGT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L4P5Z(G-E)T_L4Q5ZGT/variant_generic.h b/variants/STM32L4xx/L4P5Z(G-E)T_L4Q5ZGT/variant_generic.h
index e91d4b09f0..325b74edda 100644
--- a/variants/STM32L4xx/L4P5Z(G-E)T_L4Q5ZGT/variant_generic.h
+++ b/variants/STM32L4xx/L4P5Z(G-E)T_L4Q5ZGT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L4P5ZGTxP_L4Q5ZGTxP/PeripheralPins.c b/variants/STM32L4xx/L4P5ZGTxP_L4Q5ZGTxP/PeripheralPins.c
index ba489d57cf..307de1d0dd 100644
--- a/variants/STM32L4xx/L4P5ZGTxP_L4Q5ZGTxP/PeripheralPins.c
+++ b/variants/STM32L4xx/L4P5ZGTxP_L4Q5ZGTxP/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L4P5ZGTxP.xml, STM32L4Q5ZGTxP.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L4P5ZGTxP_L4Q5ZGTxP/variant_generic.cpp b/variants/STM32L4xx/L4P5ZGTxP_L4Q5ZGTxP/variant_generic.cpp
index 6cb7f77794..a93ff39944 100644
--- a/variants/STM32L4xx/L4P5ZGTxP_L4Q5ZGTxP/variant_generic.cpp
+++ b/variants/STM32L4xx/L4P5ZGTxP_L4Q5ZGTxP/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L4P5ZGTxP_L4Q5ZGTxP/variant_generic.h b/variants/STM32L4xx/L4P5ZGTxP_L4Q5ZGTxP/variant_generic.h
index 17ac74a207..33310b19d8 100644
--- a/variants/STM32L4xx/L4P5ZGTxP_L4Q5ZGTxP/variant_generic.h
+++ b/variants/STM32L4xx/L4P5ZGTxP_L4Q5ZGTxP/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L4R5A(G-I)I_L4R7AII_L4S5AII_L4S7AII/PeripheralPins.c b/variants/STM32L4xx/L4R5AGI_L4R5AIIx(P)_L4R7AII_L4S5AII_L4S7AII/PeripheralPins.c
similarity index 99%
rename from variants/STM32L4xx/L4R5A(G-I)I_L4R7AII_L4S5AII_L4S7AII/PeripheralPins.c
rename to variants/STM32L4xx/L4R5AGI_L4R5AIIx(P)_L4R7AII_L4S5AII_L4S7AII/PeripheralPins.c
index 8aa0f9b66f..cb43bc7209 100644
--- a/variants/STM32L4xx/L4R5A(G-I)I_L4R7AII_L4S5AII_L4S7AII/PeripheralPins.c
+++ b/variants/STM32L4xx/L4R5AGI_L4R5AIIx(P)_L4R7AII_L4S5AII_L4S7AII/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -11,9 +11,10 @@
  *******************************************************************************
  */
 /*
- * Automatically generated from STM32L4R5A(G-I)Ix.xml, STM32L4R7AIIx.xml
- * STM32L4S5AIIx.xml, STM32L4S7AIIx.xml
- * CubeMX DB release 6.0.30
+ * Automatically generated from STM32L4R5A(G-I)Ix.xml, STM32L4R5AIIxP.xml
+ * STM32L4R7AIIx.xml, STM32L4S5AIIx.xml
+ * STM32L4S7AIIx.xml
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L4R5A(G-I)I_L4R7AII_L4S5AII_L4S7AII/PinNamesVar.h b/variants/STM32L4xx/L4R5AGI_L4R5AIIx(P)_L4R7AII_L4S5AII_L4S7AII/PinNamesVar.h
similarity index 100%
rename from variants/STM32L4xx/L4R5A(G-I)I_L4R7AII_L4S5AII_L4S7AII/PinNamesVar.h
rename to variants/STM32L4xx/L4R5AGI_L4R5AIIx(P)_L4R7AII_L4S5AII_L4S7AII/PinNamesVar.h
diff --git a/variants/STM32L4xx/L4R5A(G-I)I_L4R7AII_L4S5AII_L4S7AII/boards_entry.txt b/variants/STM32L4xx/L4R5AGI_L4R5AIIx(P)_L4R7AII_L4S5AII_L4S7AII/boards_entry.txt
similarity index 65%
rename from variants/STM32L4xx/L4R5A(G-I)I_L4R7AII_L4S5AII_L4S7AII/boards_entry.txt
rename to variants/STM32L4xx/L4R5AGI_L4R5AIIx(P)_L4R7AII_L4S5AII_L4S7AII/boards_entry.txt
index 10aa25070f..a2bfb0d837 100644
--- a/variants/STM32L4xx/L4R5A(G-I)I_L4R7AII_L4S5AII_L4S7AII/boards_entry.txt
+++ b/variants/STM32L4xx/L4R5AGI_L4R5AIIx(P)_L4R7AII_L4S5AII_L4S7AII/boards_entry.txt
@@ -9,7 +9,7 @@ GenL4.menu.pnum.GENERIC_L4R5AGIX.upload.maximum_size=1048576
 GenL4.menu.pnum.GENERIC_L4R5AGIX.upload.maximum_data_size=655360
 GenL4.menu.pnum.GENERIC_L4R5AGIX.build.board=GENERIC_L4R5AGIX
 GenL4.menu.pnum.GENERIC_L4R5AGIX.build.product_line=STM32L4R5xx
-GenL4.menu.pnum.GENERIC_L4R5AGIX.build.variant=STM32L4xx/L4R5A(G-I)I_L4R7AII_L4S5AII_L4S7AII
+GenL4.menu.pnum.GENERIC_L4R5AGIX.build.variant=STM32L4xx/L4R5AGI_L4R5AIIx(P)_L4R7AII_L4S5AII_L4S7AII
 
 # Generic L4R5AIIx
 GenL4.menu.pnum.GENERIC_L4R5AIIX=Generic L4R5AIIx
@@ -17,7 +17,15 @@ GenL4.menu.pnum.GENERIC_L4R5AIIX.upload.maximum_size=2097152
 GenL4.menu.pnum.GENERIC_L4R5AIIX.upload.maximum_data_size=655360
 GenL4.menu.pnum.GENERIC_L4R5AIIX.build.board=GENERIC_L4R5AIIX
 GenL4.menu.pnum.GENERIC_L4R5AIIX.build.product_line=STM32L4R5xx
-GenL4.menu.pnum.GENERIC_L4R5AIIX.build.variant=STM32L4xx/L4R5A(G-I)I_L4R7AII_L4S5AII_L4S7AII
+GenL4.menu.pnum.GENERIC_L4R5AIIX.build.variant=STM32L4xx/L4R5AGI_L4R5AIIx(P)_L4R7AII_L4S5AII_L4S7AII
+
+# Generic L4R5AIIxP
+GenL4.menu.pnum.GENERIC_L4R5AIIXP=Generic L4R5AIIxP
+GenL4.menu.pnum.GENERIC_L4R5AIIXP.upload.maximum_size=2097152
+GenL4.menu.pnum.GENERIC_L4R5AIIXP.upload.maximum_data_size=655360
+GenL4.menu.pnum.GENERIC_L4R5AIIXP.build.board=GENERIC_L4R5AIIXP
+GenL4.menu.pnum.GENERIC_L4R5AIIXP.build.product_line=STM32L4R5xx
+GenL4.menu.pnum.GENERIC_L4R5AIIXP.build.variant=STM32L4xx/L4R5AGI_L4R5AIIx(P)_L4R7AII_L4S5AII_L4S7AII
 
 # Generic L4R7AIIx
 GenL4.menu.pnum.GENERIC_L4R7AIIX=Generic L4R7AIIx
@@ -25,7 +33,7 @@ GenL4.menu.pnum.GENERIC_L4R7AIIX.upload.maximum_size=2097152
 GenL4.menu.pnum.GENERIC_L4R7AIIX.upload.maximum_data_size=655360
 GenL4.menu.pnum.GENERIC_L4R7AIIX.build.board=GENERIC_L4R7AIIX
 GenL4.menu.pnum.GENERIC_L4R7AIIX.build.product_line=STM32L4R7xx
-GenL4.menu.pnum.GENERIC_L4R7AIIX.build.variant=STM32L4xx/L4R5A(G-I)I_L4R7AII_L4S5AII_L4S7AII
+GenL4.menu.pnum.GENERIC_L4R7AIIX.build.variant=STM32L4xx/L4R5AGI_L4R5AIIx(P)_L4R7AII_L4S5AII_L4S7AII
 
 # Generic L4S5AIIx
 GenL4.menu.pnum.GENERIC_L4S5AIIX=Generic L4S5AIIx
@@ -33,7 +41,7 @@ GenL4.menu.pnum.GENERIC_L4S5AIIX.upload.maximum_size=2097152
 GenL4.menu.pnum.GENERIC_L4S5AIIX.upload.maximum_data_size=655360
 GenL4.menu.pnum.GENERIC_L4S5AIIX.build.board=GENERIC_L4S5AIIX
 GenL4.menu.pnum.GENERIC_L4S5AIIX.build.product_line=STM32L4S5xx
-GenL4.menu.pnum.GENERIC_L4S5AIIX.build.variant=STM32L4xx/L4R5A(G-I)I_L4R7AII_L4S5AII_L4S7AII
+GenL4.menu.pnum.GENERIC_L4S5AIIX.build.variant=STM32L4xx/L4R5AGI_L4R5AIIx(P)_L4R7AII_L4S5AII_L4S7AII
 
 # Generic L4S7AIIx
 GenL4.menu.pnum.GENERIC_L4S7AIIX=Generic L4S7AIIx
@@ -41,5 +49,5 @@ GenL4.menu.pnum.GENERIC_L4S7AIIX.upload.maximum_size=2097152
 GenL4.menu.pnum.GENERIC_L4S7AIIX.upload.maximum_data_size=655360
 GenL4.menu.pnum.GENERIC_L4S7AIIX.build.board=GENERIC_L4S7AIIX
 GenL4.menu.pnum.GENERIC_L4S7AIIX.build.product_line=STM32L4S7xx
-GenL4.menu.pnum.GENERIC_L4S7AIIX.build.variant=STM32L4xx/L4R5A(G-I)I_L4R7AII_L4S5AII_L4S7AII
+GenL4.menu.pnum.GENERIC_L4S7AIIX.build.variant=STM32L4xx/L4R5AGI_L4R5AIIx(P)_L4R7AII_L4S5AII_L4S7AII
 
diff --git a/variants/STM32L4xx/L4R5A(G-I)I_L4R7AII_L4S5AII_L4S7AII/generic_clock.c b/variants/STM32L4xx/L4R5AGI_L4R5AIIx(P)_L4R7AII_L4S5AII_L4S7AII/generic_clock.c
similarity index 81%
rename from variants/STM32L4xx/L4R5A(G-I)I_L4R7AII_L4S5AII_L4S7AII/generic_clock.c
rename to variants/STM32L4xx/L4R5AGI_L4R5AIIx(P)_L4R7AII_L4S5AII_L4S7AII/generic_clock.c
index 5325197ed0..80fc31ef42 100644
--- a/variants/STM32L4xx/L4R5A(G-I)I_L4R7AII_L4S5AII_L4S7AII/generic_clock.c
+++ b/variants/STM32L4xx/L4R5AGI_L4R5AIIx(P)_L4R7AII_L4S5AII_L4S7AII/generic_clock.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -11,8 +11,8 @@
  *******************************************************************************
  */
 #if defined(ARDUINO_GENERIC_L4R5AGIX) || defined(ARDUINO_GENERIC_L4R5AIIX) ||\
-    defined(ARDUINO_GENERIC_L4R7AIIX) || defined(ARDUINO_GENERIC_L4S5AIIX) ||\
-    defined(ARDUINO_GENERIC_L4S7AIIX)
+    defined(ARDUINO_GENERIC_L4R5AIIXP) || defined(ARDUINO_GENERIC_L4R7AIIX) ||\
+    defined(ARDUINO_GENERIC_L4S5AIIX) || defined(ARDUINO_GENERIC_L4S7AIIX)
 #include "pins_arduino.h"
 
 /**
diff --git a/variants/STM32L4xx/L4R5A(G-I)I_L4R7AII_L4S5AII_L4S7AII/variant_generic.cpp b/variants/STM32L4xx/L4R5AGI_L4R5AIIx(P)_L4R7AII_L4S5AII_L4S7AII/variant_generic.cpp
similarity index 94%
rename from variants/STM32L4xx/L4R5A(G-I)I_L4R7AII_L4S5AII_L4S7AII/variant_generic.cpp
rename to variants/STM32L4xx/L4R5AGI_L4R5AIIx(P)_L4R7AII_L4S5AII_L4S7AII/variant_generic.cpp
index ac77e5a6e1..803fb850e6 100644
--- a/variants/STM32L4xx/L4R5A(G-I)I_L4R7AII_L4S5AII_L4S7AII/variant_generic.cpp
+++ b/variants/STM32L4xx/L4R5AGI_L4R5AIIx(P)_L4R7AII_L4S5AII_L4S7AII/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -11,8 +11,8 @@
  *******************************************************************************
  */
 #if defined(ARDUINO_GENERIC_L4R5AGIX) || defined(ARDUINO_GENERIC_L4R5AIIX) ||\
-    defined(ARDUINO_GENERIC_L4R7AIIX) || defined(ARDUINO_GENERIC_L4S5AIIX) ||\
-    defined(ARDUINO_GENERIC_L4S7AIIX)
+    defined(ARDUINO_GENERIC_L4R5AIIXP) || defined(ARDUINO_GENERIC_L4R7AIIX) ||\
+    defined(ARDUINO_GENERIC_L4S5AIIX) || defined(ARDUINO_GENERIC_L4S7AIIX)
 #include "pins_arduino.h"
 
 // Digital PinName array
diff --git a/variants/STM32L4xx/L4R5A(G-I)I_L4R7AII_L4S5AII_L4S7AII/variant_generic.h b/variants/STM32L4xx/L4R5AGI_L4R5AIIx(P)_L4R7AII_L4S5AII_L4S7AII/variant_generic.h
similarity index 99%
rename from variants/STM32L4xx/L4R5A(G-I)I_L4R7AII_L4S5AII_L4S7AII/variant_generic.h
rename to variants/STM32L4xx/L4R5AGI_L4R5AIIx(P)_L4R7AII_L4S5AII_L4S7AII/variant_generic.h
index 193ee5f23e..5d58f55b30 100644
--- a/variants/STM32L4xx/L4R5A(G-I)I_L4R7AII_L4S5AII_L4S7AII/variant_generic.h
+++ b/variants/STM32L4xx/L4R5AGI_L4R5AIIx(P)_L4R7AII_L4S5AII_L4S7AII/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L4R5Q(G-I)I_L4S5QII/PeripheralPins.c b/variants/STM32L4xx/L4R5QGIx(S)_L4R5QIIx(P)_L4S5QII/PeripheralPins.c
similarity index 99%
rename from variants/STM32L4xx/L4R5Q(G-I)I_L4S5QII/PeripheralPins.c
rename to variants/STM32L4xx/L4R5QGIx(S)_L4R5QIIx(P)_L4S5QII/PeripheralPins.c
index c433192920..70585898c9 100644
--- a/variants/STM32L4xx/L4R5Q(G-I)I_L4S5QII/PeripheralPins.c
+++ b/variants/STM32L4xx/L4R5QGIx(S)_L4R5QIIx(P)_L4S5QII/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -11,8 +11,9 @@
  *******************************************************************************
  */
 /*
- * Automatically generated from STM32L4R5Q(G-I)Ix.xml, STM32L4S5QIIx.xml
- * CubeMX DB release 6.0.30
+ * Automatically generated from STM32L4R5Q(G-I)Ix.xml, STM32L4R5QGIxS.xml
+ * STM32L4R5QIIxP.xml, STM32L4S5QIIx.xml
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L4R5Q(G-I)I_L4S5QII/PinNamesVar.h b/variants/STM32L4xx/L4R5QGIx(S)_L4R5QIIx(P)_L4S5QII/PinNamesVar.h
similarity index 100%
rename from variants/STM32L4xx/L4R5Q(G-I)I_L4S5QII/PinNamesVar.h
rename to variants/STM32L4xx/L4R5QGIx(S)_L4R5QIIx(P)_L4S5QII/PinNamesVar.h
diff --git a/variants/STM32L4xx/L4R5Q(G-I)I_L4S5QII/boards_entry.txt b/variants/STM32L4xx/L4R5QGIx(S)_L4R5QIIx(P)_L4S5QII/boards_entry.txt
similarity index 51%
rename from variants/STM32L4xx/L4R5Q(G-I)I_L4S5QII/boards_entry.txt
rename to variants/STM32L4xx/L4R5QGIx(S)_L4R5QIIx(P)_L4S5QII/boards_entry.txt
index 342e12b435..d2eea14b36 100644
--- a/variants/STM32L4xx/L4R5Q(G-I)I_L4S5QII/boards_entry.txt
+++ b/variants/STM32L4xx/L4R5QGIx(S)_L4R5QIIx(P)_L4S5QII/boards_entry.txt
@@ -9,7 +9,7 @@ GenL4.menu.pnum.GENERIC_L4R5QGIX.upload.maximum_size=1048576
 GenL4.menu.pnum.GENERIC_L4R5QGIX.upload.maximum_data_size=655360
 GenL4.menu.pnum.GENERIC_L4R5QGIX.build.board=GENERIC_L4R5QGIX
 GenL4.menu.pnum.GENERIC_L4R5QGIX.build.product_line=STM32L4R5xx
-GenL4.menu.pnum.GENERIC_L4R5QGIX.build.variant=STM32L4xx/L4R5Q(G-I)I_L4S5QII
+GenL4.menu.pnum.GENERIC_L4R5QGIX.build.variant=STM32L4xx/L4R5QGIx(S)_L4R5QIIx(P)_L4S5QII
 
 # Generic L4R5QIIx
 GenL4.menu.pnum.GENERIC_L4R5QIIX=Generic L4R5QIIx
@@ -17,7 +17,23 @@ GenL4.menu.pnum.GENERIC_L4R5QIIX.upload.maximum_size=2097152
 GenL4.menu.pnum.GENERIC_L4R5QIIX.upload.maximum_data_size=655360
 GenL4.menu.pnum.GENERIC_L4R5QIIX.build.board=GENERIC_L4R5QIIX
 GenL4.menu.pnum.GENERIC_L4R5QIIX.build.product_line=STM32L4R5xx
-GenL4.menu.pnum.GENERIC_L4R5QIIX.build.variant=STM32L4xx/L4R5Q(G-I)I_L4S5QII
+GenL4.menu.pnum.GENERIC_L4R5QIIX.build.variant=STM32L4xx/L4R5QGIx(S)_L4R5QIIx(P)_L4S5QII
+
+# Generic L4R5QGIxS
+GenL4.menu.pnum.GENERIC_L4R5QGIXS=Generic L4R5QGIxS
+GenL4.menu.pnum.GENERIC_L4R5QGIXS.upload.maximum_size=1048576
+GenL4.menu.pnum.GENERIC_L4R5QGIXS.upload.maximum_data_size=655360
+GenL4.menu.pnum.GENERIC_L4R5QGIXS.build.board=GENERIC_L4R5QGIXS
+GenL4.menu.pnum.GENERIC_L4R5QGIXS.build.product_line=STM32L4R7xx
+GenL4.menu.pnum.GENERIC_L4R5QGIXS.build.variant=STM32L4xx/L4R5QGIx(S)_L4R5QIIx(P)_L4S5QII
+
+# Generic L4R5QIIxP
+GenL4.menu.pnum.GENERIC_L4R5QIIXP=Generic L4R5QIIxP
+GenL4.menu.pnum.GENERIC_L4R5QIIXP.upload.maximum_size=2097152
+GenL4.menu.pnum.GENERIC_L4R5QIIXP.upload.maximum_data_size=655360
+GenL4.menu.pnum.GENERIC_L4R5QIIXP.build.board=GENERIC_L4R5QIIXP
+GenL4.menu.pnum.GENERIC_L4R5QIIXP.build.product_line=STM32L4R5xx
+GenL4.menu.pnum.GENERIC_L4R5QIIXP.build.variant=STM32L4xx/L4R5QGIx(S)_L4R5QIIx(P)_L4S5QII
 
 # Generic L4S5QIIx
 GenL4.menu.pnum.GENERIC_L4S5QIIX=Generic L4S5QIIx
@@ -25,5 +41,5 @@ GenL4.menu.pnum.GENERIC_L4S5QIIX.upload.maximum_size=2097152
 GenL4.menu.pnum.GENERIC_L4S5QIIX.upload.maximum_data_size=655360
 GenL4.menu.pnum.GENERIC_L4S5QIIX.build.board=GENERIC_L4S5QIIX
 GenL4.menu.pnum.GENERIC_L4S5QIIX.build.product_line=STM32L4S5xx
-GenL4.menu.pnum.GENERIC_L4S5QIIX.build.variant=STM32L4xx/L4R5Q(G-I)I_L4S5QII
+GenL4.menu.pnum.GENERIC_L4S5QIIX.build.variant=STM32L4xx/L4R5QGIx(S)_L4R5QIIx(P)_L4S5QII
 
diff --git a/variants/STM32L4xx/L4R5Q(G-I)I_L4S5QII/generic_clock.c b/variants/STM32L4xx/L4R5QGIx(S)_L4R5QIIx(P)_L4S5QII/generic_clock.c
similarity index 86%
rename from variants/STM32L4xx/L4R5Q(G-I)I_L4S5QII/generic_clock.c
rename to variants/STM32L4xx/L4R5QGIx(S)_L4R5QIIx(P)_L4S5QII/generic_clock.c
index de763a9706..c0d9320844 100644
--- a/variants/STM32L4xx/L4R5Q(G-I)I_L4S5QII/generic_clock.c
+++ b/variants/STM32L4xx/L4R5QGIx(S)_L4R5QIIx(P)_L4S5QII/generic_clock.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -10,7 +10,8 @@
  *
  *******************************************************************************
  */
-#if defined(ARDUINO_GENERIC_L4R5QGIX) || defined(ARDUINO_GENERIC_L4R5QIIX) ||\
+#if defined(ARDUINO_GENERIC_L4R5QGIX) || defined(ARDUINO_GENERIC_L4R5QGIXS) ||\
+    defined(ARDUINO_GENERIC_L4R5QIIX) || defined(ARDUINO_GENERIC_L4R5QIIXP) ||\
     defined(ARDUINO_GENERIC_L4S5QIIX)
 #include "pins_arduino.h"
 
diff --git a/variants/STM32L4xx/L4R5Q(G-I)I_L4S5QII/variant_generic.cpp b/variants/STM32L4xx/L4R5QGIx(S)_L4R5QIIx(P)_L4S5QII/variant_generic.cpp
similarity index 95%
rename from variants/STM32L4xx/L4R5Q(G-I)I_L4S5QII/variant_generic.cpp
rename to variants/STM32L4xx/L4R5QGIx(S)_L4R5QIIx(P)_L4S5QII/variant_generic.cpp
index 4ed7e569dc..983c3d0715 100644
--- a/variants/STM32L4xx/L4R5Q(G-I)I_L4S5QII/variant_generic.cpp
+++ b/variants/STM32L4xx/L4R5QGIx(S)_L4R5QIIx(P)_L4S5QII/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -10,7 +10,8 @@
  *
  *******************************************************************************
  */
-#if defined(ARDUINO_GENERIC_L4R5QGIX) || defined(ARDUINO_GENERIC_L4R5QIIX) ||\
+#if defined(ARDUINO_GENERIC_L4R5QGIX) || defined(ARDUINO_GENERIC_L4R5QGIXS) ||\
+    defined(ARDUINO_GENERIC_L4R5QIIX) || defined(ARDUINO_GENERIC_L4R5QIIXP) ||\
     defined(ARDUINO_GENERIC_L4S5QIIX)
 #include "pins_arduino.h"
 
diff --git a/variants/STM32L4xx/L4R5Q(G-I)I_L4S5QII/variant_generic.h b/variants/STM32L4xx/L4R5QGIx(S)_L4R5QIIx(P)_L4S5QII/variant_generic.h
similarity index 99%
rename from variants/STM32L4xx/L4R5Q(G-I)I_L4S5QII/variant_generic.h
rename to variants/STM32L4xx/L4R5QGIx(S)_L4R5QIIx(P)_L4S5QII/variant_generic.h
index 8e1dc0ce4f..286e226d4e 100644
--- a/variants/STM32L4xx/L4R5Q(G-I)I_L4S5QII/variant_generic.h
+++ b/variants/STM32L4xx/L4R5QGIx(S)_L4R5QIIx(P)_L4S5QII/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L4R5V(G-I)T_L4R7VIT_L4S5VIT_L4S7VIT/PeripheralPins.c b/variants/STM32L4xx/L4R5V(G-I)T_L4R7VIT_L4S5VIT_L4S7VIT/PeripheralPins.c
index 20694d3a2d..a786bed078 100644
--- a/variants/STM32L4xx/L4R5V(G-I)T_L4R7VIT_L4S5VIT_L4S7VIT/PeripheralPins.c
+++ b/variants/STM32L4xx/L4R5V(G-I)T_L4R7VIT_L4S5VIT_L4S7VIT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32L4R5V(G-I)Tx.xml, STM32L4R7VITx.xml
  * STM32L4S5VITx.xml, STM32L4S7VITx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L4R5V(G-I)T_L4R7VIT_L4S5VIT_L4S7VIT/variant_generic.cpp b/variants/STM32L4xx/L4R5V(G-I)T_L4R7VIT_L4S5VIT_L4S7VIT/variant_generic.cpp
index 33feb262e8..23fc065b8c 100644
--- a/variants/STM32L4xx/L4R5V(G-I)T_L4R7VIT_L4S5VIT_L4S7VIT/variant_generic.cpp
+++ b/variants/STM32L4xx/L4R5V(G-I)T_L4R7VIT_L4S5VIT_L4S7VIT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L4R5V(G-I)T_L4R7VIT_L4S5VIT_L4S7VIT/variant_generic.h b/variants/STM32L4xx/L4R5V(G-I)T_L4R7VIT_L4S5VIT_L4S7VIT/variant_generic.h
index 5b8b0aa1a9..a0c062b8be 100644
--- a/variants/STM32L4xx/L4R5V(G-I)T_L4R7VIT_L4S5VIT_L4S7VIT/variant_generic.h
+++ b/variants/STM32L4xx/L4R5V(G-I)T_L4R7VIT_L4S5VIT_L4S7VIT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L4R5Z(G-I)T_L4R7ZIT_L4S5ZIT_L4S7ZIT/PeripheralPins.c b/variants/STM32L4xx/L4R5Z(G-I)T_L4R7ZIT_L4S5ZIT_L4S7ZIT/PeripheralPins.c
index dcb6879916..0a025c5757 100644
--- a/variants/STM32L4xx/L4R5Z(G-I)T_L4R7ZIT_L4S5ZIT_L4S7ZIT/PeripheralPins.c
+++ b/variants/STM32L4xx/L4R5Z(G-I)T_L4R7ZIT_L4S5ZIT_L4S7ZIT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32L4R5Z(G-I)Tx.xml, STM32L4R7ZITx.xml
  * STM32L4S5ZITx.xml, STM32L4S7ZITx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L4R5Z(G-I)T_L4R7ZIT_L4S5ZIT_L4S7ZIT/variant_generic.cpp b/variants/STM32L4xx/L4R5Z(G-I)T_L4R7ZIT_L4S5ZIT_L4S7ZIT/variant_generic.cpp
index 7a16e560e2..6fc2755fd4 100644
--- a/variants/STM32L4xx/L4R5Z(G-I)T_L4R7ZIT_L4S5ZIT_L4S7ZIT/variant_generic.cpp
+++ b/variants/STM32L4xx/L4R5Z(G-I)T_L4R7ZIT_L4S5ZIT_L4S7ZIT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L4R5Z(G-I)T_L4R7ZIT_L4S5ZIT_L4S7ZIT/variant_generic.h b/variants/STM32L4xx/L4R5Z(G-I)T_L4R7ZIT_L4S5ZIT_L4S7ZIT/variant_generic.h
index 7c25d3158d..5362986675 100644
--- a/variants/STM32L4xx/L4R5Z(G-I)T_L4R7ZIT_L4S5ZIT_L4S7ZIT/variant_generic.h
+++ b/variants/STM32L4xx/L4R5Z(G-I)T_L4R7ZIT_L4S5ZIT_L4S7ZIT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L4R5Z(G-I)Y_L4R9Z(G-I)Y_L4S5ZIY_L4S9ZIY/PeripheralPins.c b/variants/STM32L4xx/L4R5Z(G-I)Y_L4R9Z(G-I)Y_L4S5ZIY_L4S9ZIY/PeripheralPins.c
index 1a3a7be47d..2b00cff111 100644
--- a/variants/STM32L4xx/L4R5Z(G-I)Y_L4R9Z(G-I)Y_L4S5ZIY_L4S9ZIY/PeripheralPins.c
+++ b/variants/STM32L4xx/L4R5Z(G-I)Y_L4R9Z(G-I)Y_L4S5ZIY_L4S9ZIY/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32L4R5Z(G-I)Yx.xml, STM32L4R9Z(G-I)Yx.xml
  * STM32L4S5ZIYx.xml, STM32L4S9ZIYx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L4R5Z(G-I)Y_L4R9Z(G-I)Y_L4S5ZIY_L4S9ZIY/variant_generic.cpp b/variants/STM32L4xx/L4R5Z(G-I)Y_L4R9Z(G-I)Y_L4S5ZIY_L4S9ZIY/variant_generic.cpp
index 196062065e..1860e7b07f 100644
--- a/variants/STM32L4xx/L4R5Z(G-I)Y_L4R9Z(G-I)Y_L4S5ZIY_L4S9ZIY/variant_generic.cpp
+++ b/variants/STM32L4xx/L4R5Z(G-I)Y_L4R9Z(G-I)Y_L4S5ZIY_L4S9ZIY/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L4R5Z(G-I)Y_L4R9Z(G-I)Y_L4S5ZIY_L4S9ZIY/variant_generic.h b/variants/STM32L4xx/L4R5Z(G-I)Y_L4R9Z(G-I)Y_L4S5ZIY_L4S9ZIY/variant_generic.h
index f49a543844..2c89ba6d87 100644
--- a/variants/STM32L4xx/L4R5Z(G-I)Y_L4R9Z(G-I)Y_L4S5ZIY_L4S9ZIY/variant_generic.h
+++ b/variants/STM32L4xx/L4R5Z(G-I)Y_L4R9Z(G-I)Y_L4S5ZIY_L4S9ZIY/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L4R5ZITxP/PeripheralPins.c b/variants/STM32L4xx/L4R5ZITxP/PeripheralPins.c
index 5578d267ea..9b560f8148 100644
--- a/variants/STM32L4xx/L4R5ZITxP/PeripheralPins.c
+++ b/variants/STM32L4xx/L4R5ZITxP/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L4R5ZITxP.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L4R5ZITxP/variant_generic.cpp b/variants/STM32L4xx/L4R5ZITxP/variant_generic.cpp
index 05bbdd18b6..3af66f64c5 100644
--- a/variants/STM32L4xx/L4R5ZITxP/variant_generic.cpp
+++ b/variants/STM32L4xx/L4R5ZITxP/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L4R5ZITxP/variant_generic.h b/variants/STM32L4xx/L4R5ZITxP/variant_generic.h
index 769191de0d..da55f45555 100644
--- a/variants/STM32L4xx/L4R5ZITxP/variant_generic.h
+++ b/variants/STM32L4xx/L4R5ZITxP/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L4R9A(G-I)I_L4S9AII/PeripheralPins.c b/variants/STM32L4xx/L4R9A(G-I)I_L4S9AII/PeripheralPins.c
index ab0c095fa4..f7a403300f 100644
--- a/variants/STM32L4xx/L4R9A(G-I)I_L4S9AII/PeripheralPins.c
+++ b/variants/STM32L4xx/L4R9A(G-I)I_L4S9AII/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L4R9A(G-I)Ix.xml, STM32L4S9AIIx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L4R9A(G-I)I_L4S9AII/variant_generic.cpp b/variants/STM32L4xx/L4R9A(G-I)I_L4S9AII/variant_generic.cpp
index e33505d542..5543fb5e6e 100644
--- a/variants/STM32L4xx/L4R9A(G-I)I_L4S9AII/variant_generic.cpp
+++ b/variants/STM32L4xx/L4R9A(G-I)I_L4S9AII/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L4R9A(G-I)I_L4S9AII/variant_generic.h b/variants/STM32L4xx/L4R9A(G-I)I_L4S9AII/variant_generic.h
index 31d0f5fa4f..60cb50d700 100644
--- a/variants/STM32L4xx/L4R9A(G-I)I_L4S9AII/variant_generic.h
+++ b/variants/STM32L4xx/L4R9A(G-I)I_L4S9AII/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L4R9V(G-I)T_L4S9VIT/PeripheralPins.c b/variants/STM32L4xx/L4R9V(G-I)T_L4S9VIT/PeripheralPins.c
index 688c0cc2aa..fc02b50616 100644
--- a/variants/STM32L4xx/L4R9V(G-I)T_L4S9VIT/PeripheralPins.c
+++ b/variants/STM32L4xx/L4R9V(G-I)T_L4S9VIT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L4R9V(G-I)Tx.xml, STM32L4S9VITx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L4R9V(G-I)T_L4S9VIT/variant_generic.cpp b/variants/STM32L4xx/L4R9V(G-I)T_L4S9VIT/variant_generic.cpp
index 47b8470624..fc47a85e0c 100644
--- a/variants/STM32L4xx/L4R9V(G-I)T_L4S9VIT/variant_generic.cpp
+++ b/variants/STM32L4xx/L4R9V(G-I)T_L4S9VIT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L4R9V(G-I)T_L4S9VIT/variant_generic.h b/variants/STM32L4xx/L4R9V(G-I)T_L4S9VIT/variant_generic.h
index 169f346233..97d1338b5d 100644
--- a/variants/STM32L4xx/L4R9V(G-I)T_L4S9VIT/variant_generic.h
+++ b/variants/STM32L4xx/L4R9V(G-I)T_L4S9VIT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L4R9Z(G-I)J_L4S9ZIJ/PeripheralPins.c b/variants/STM32L4xx/L4R9Z(G-I)J_L4S9ZIJ/PeripheralPins.c
index 542dff374e..df56951435 100644
--- a/variants/STM32L4xx/L4R9Z(G-I)J_L4S9ZIJ/PeripheralPins.c
+++ b/variants/STM32L4xx/L4R9Z(G-I)J_L4S9ZIJ/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L4R9Z(G-I)Jx.xml, STM32L4S9ZIJx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L4R9Z(G-I)J_L4S9ZIJ/variant_generic.cpp b/variants/STM32L4xx/L4R9Z(G-I)J_L4S9ZIJ/variant_generic.cpp
index c85f61ae94..f5c85869a6 100644
--- a/variants/STM32L4xx/L4R9Z(G-I)J_L4S9ZIJ/variant_generic.cpp
+++ b/variants/STM32L4xx/L4R9Z(G-I)J_L4S9ZIJ/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L4R9Z(G-I)J_L4S9ZIJ/variant_generic.h b/variants/STM32L4xx/L4R9Z(G-I)J_L4S9ZIJ/variant_generic.h
index dc47214e70..28963e9116 100644
--- a/variants/STM32L4xx/L4R9Z(G-I)J_L4S9ZIJ/variant_generic.h
+++ b/variants/STM32L4xx/L4R9Z(G-I)J_L4S9ZIJ/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L4R9Z(G-I)T_L4S9ZIT/PeripheralPins.c b/variants/STM32L4xx/L4R9Z(G-I)T_L4S9ZIT/PeripheralPins.c
index f66c52956b..8acea3edef 100644
--- a/variants/STM32L4xx/L4R9Z(G-I)T_L4S9ZIT/PeripheralPins.c
+++ b/variants/STM32L4xx/L4R9Z(G-I)T_L4S9ZIT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L4R9Z(G-I)Tx.xml, STM32L4S9ZITx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L4R9Z(G-I)T_L4S9ZIT/variant_generic.cpp b/variants/STM32L4xx/L4R9Z(G-I)T_L4S9ZIT/variant_generic.cpp
index 4147525333..cae8456923 100644
--- a/variants/STM32L4xx/L4R9Z(G-I)T_L4S9ZIT/variant_generic.cpp
+++ b/variants/STM32L4xx/L4R9Z(G-I)T_L4S9ZIT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L4R9Z(G-I)T_L4S9ZIT/variant_generic.h b/variants/STM32L4xx/L4R9Z(G-I)T_L4S9ZIT/variant_generic.h
index 92b1d7babc..90164f25f9 100644
--- a/variants/STM32L4xx/L4R9Z(G-I)T_L4S9ZIT/variant_generic.h
+++ b/variants/STM32L4xx/L4R9Z(G-I)T_L4S9ZIT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L4R9ZIYxP/PeripheralPins.c b/variants/STM32L4xx/L4R9ZIYxP/PeripheralPins.c
index d2300d2b86..72a6eaecf8 100644
--- a/variants/STM32L4xx/L4R9ZIYxP/PeripheralPins.c
+++ b/variants/STM32L4xx/L4R9ZIYxP/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L4R9ZIYxP.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L4xx/L4R9ZIYxP/variant_generic.cpp b/variants/STM32L4xx/L4R9ZIYxP/variant_generic.cpp
index bc4c9e39f3..1abc435933 100644
--- a/variants/STM32L4xx/L4R9ZIYxP/variant_generic.cpp
+++ b/variants/STM32L4xx/L4R9ZIYxP/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L4xx/L4R9ZIYxP/variant_generic.h b/variants/STM32L4xx/L4R9ZIYxP/variant_generic.h
index b02d89a5cf..c0c57fb515 100644
--- a/variants/STM32L4xx/L4R9ZIYxP/variant_generic.h
+++ b/variants/STM32L4xx/L4R9ZIYxP/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L5xx/L552C(C-E)(T-U)_L562CE(T-U)/PeripheralPins.c b/variants/STM32L5xx/L552C(C-E)(T-U)_L562CE(T-U)/PeripheralPins.c
index 0092401ccb..ee3a6c2a26 100644
--- a/variants/STM32L5xx/L552C(C-E)(T-U)_L562CE(T-U)/PeripheralPins.c
+++ b/variants/STM32L5xx/L552C(C-E)(T-U)_L562CE(T-U)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32L552C(C-E)Tx.xml, STM32L552C(C-E)Ux.xml
  * STM32L562CETx.xml, STM32L562CEUx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L5xx/L552C(C-E)(T-U)_L562CE(T-U)/variant_generic.cpp b/variants/STM32L5xx/L552C(C-E)(T-U)_L562CE(T-U)/variant_generic.cpp
index 089ad67e37..9779c5c80a 100644
--- a/variants/STM32L5xx/L552C(C-E)(T-U)_L562CE(T-U)/variant_generic.cpp
+++ b/variants/STM32L5xx/L552C(C-E)(T-U)_L562CE(T-U)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L5xx/L552C(C-E)(T-U)_L562CE(T-U)/variant_generic.h b/variants/STM32L5xx/L552C(C-E)(T-U)_L562CE(T-U)/variant_generic.h
index 7f6323f9cd..279cf23977 100644
--- a/variants/STM32L5xx/L552C(C-E)(T-U)_L562CE(T-U)/variant_generic.h
+++ b/variants/STM32L5xx/L552C(C-E)(T-U)_L562CE(T-U)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L5xx/L552CE(T-U)xP_L562CE(T-U)xP/PeripheralPins.c b/variants/STM32L5xx/L552CE(T-U)xP_L562CE(T-U)xP/PeripheralPins.c
index d7e40270ca..326551ec50 100644
--- a/variants/STM32L5xx/L552CE(T-U)xP_L562CE(T-U)xP/PeripheralPins.c
+++ b/variants/STM32L5xx/L552CE(T-U)xP_L562CE(T-U)xP/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32L552CETxP.xml, STM32L552CEUxP.xml
  * STM32L562CETxP.xml, STM32L562CEUxP.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L5xx/L552CE(T-U)xP_L562CE(T-U)xP/variant_generic.cpp b/variants/STM32L5xx/L552CE(T-U)xP_L562CE(T-U)xP/variant_generic.cpp
index 99e2556875..7a510265b8 100644
--- a/variants/STM32L5xx/L552CE(T-U)xP_L562CE(T-U)xP/variant_generic.cpp
+++ b/variants/STM32L5xx/L552CE(T-U)xP_L562CE(T-U)xP/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L5xx/L552CE(T-U)xP_L562CE(T-U)xP/variant_generic.h b/variants/STM32L5xx/L552CE(T-U)xP_L562CE(T-U)xP/variant_generic.h
index eda02b64ed..f829c64213 100644
--- a/variants/STM32L5xx/L552CE(T-U)xP_L562CE(T-U)xP/variant_generic.h
+++ b/variants/STM32L5xx/L552CE(T-U)xP_L562CE(T-U)xP/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L5xx/L552MEYxP_L562MEYxP/PeripheralPins.c b/variants/STM32L5xx/L552MEYxP_L562MEYxP/PeripheralPins.c
index 34a5d752f8..660875cfb8 100644
--- a/variants/STM32L5xx/L552MEYxP_L562MEYxP/PeripheralPins.c
+++ b/variants/STM32L5xx/L552MEYxP_L562MEYxP/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L552MEYxP.xml, STM32L562MEYxP.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L5xx/L552MEYxP_L562MEYxP/variant_generic.cpp b/variants/STM32L5xx/L552MEYxP_L562MEYxP/variant_generic.cpp
index aea026a355..8bc753dc34 100644
--- a/variants/STM32L5xx/L552MEYxP_L562MEYxP/variant_generic.cpp
+++ b/variants/STM32L5xx/L552MEYxP_L562MEYxP/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L5xx/L552MEYxP_L562MEYxP/variant_generic.h b/variants/STM32L5xx/L552MEYxP_L562MEYxP/variant_generic.h
index 9e7e45e274..028c070d21 100644
--- a/variants/STM32L5xx/L552MEYxP_L562MEYxP/variant_generic.h
+++ b/variants/STM32L5xx/L552MEYxP_L562MEYxP/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L5xx/L552MEYxQ_L562MEYxQ/PeripheralPins.c b/variants/STM32L5xx/L552MEYxQ_L562MEYxQ/PeripheralPins.c
index 83bad2794f..cb4168c915 100644
--- a/variants/STM32L5xx/L552MEYxQ_L562MEYxQ/PeripheralPins.c
+++ b/variants/STM32L5xx/L552MEYxQ_L562MEYxQ/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L552MEYxQ.xml, STM32L562MEYxQ.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L5xx/L552MEYxQ_L562MEYxQ/variant_generic.cpp b/variants/STM32L5xx/L552MEYxQ_L562MEYxQ/variant_generic.cpp
index ff5e0c1ee3..cce26b9042 100644
--- a/variants/STM32L5xx/L552MEYxQ_L562MEYxQ/variant_generic.cpp
+++ b/variants/STM32L5xx/L552MEYxQ_L562MEYxQ/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L5xx/L552MEYxQ_L562MEYxQ/variant_generic.h b/variants/STM32L5xx/L552MEYxQ_L562MEYxQ/variant_generic.h
index e5c6cdda2d..38024c30e3 100644
--- a/variants/STM32L5xx/L552MEYxQ_L562MEYxQ/variant_generic.h
+++ b/variants/STM32L5xx/L552MEYxQ_L562MEYxQ/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L5xx/L552Q(C-E)IxQ_L562QEIxQ/PeripheralPins.c b/variants/STM32L5xx/L552Q(C-E)IxQ_L562QEIxQ/PeripheralPins.c
index 8e85034b16..ae7ab17579 100644
--- a/variants/STM32L5xx/L552Q(C-E)IxQ_L562QEIxQ/PeripheralPins.c
+++ b/variants/STM32L5xx/L552Q(C-E)IxQ_L562QEIxQ/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L552Q(C-E)IxQ.xml, STM32L562QEIxQ.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L5xx/L552Q(C-E)IxQ_L562QEIxQ/variant_generic.cpp b/variants/STM32L5xx/L552Q(C-E)IxQ_L562QEIxQ/variant_generic.cpp
index 5214f1c158..58cff1d4a5 100644
--- a/variants/STM32L5xx/L552Q(C-E)IxQ_L562QEIxQ/variant_generic.cpp
+++ b/variants/STM32L5xx/L552Q(C-E)IxQ_L562QEIxQ/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L5xx/L552Q(C-E)IxQ_L562QEIxQ/variant_generic.h b/variants/STM32L5xx/L552Q(C-E)IxQ_L562QEIxQ/variant_generic.h
index d8c0dfc288..382b93ca7a 100644
--- a/variants/STM32L5xx/L552Q(C-E)IxQ_L562QEIxQ/variant_generic.h
+++ b/variants/STM32L5xx/L552Q(C-E)IxQ_L562QEIxQ/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L5xx/L552QEI_L562QEI/PeripheralPins.c b/variants/STM32L5xx/L552QEI_L562QEI/PeripheralPins.c
index 18bd67a9b6..abb44be161 100644
--- a/variants/STM32L5xx/L552QEI_L562QEI/PeripheralPins.c
+++ b/variants/STM32L5xx/L552QEI_L562QEI/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L552QEIx.xml, STM32L562QEIx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L5xx/L552QEI_L562QEI/variant_generic.cpp b/variants/STM32L5xx/L552QEI_L562QEI/variant_generic.cpp
index a49817476c..a8f210854b 100644
--- a/variants/STM32L5xx/L552QEI_L562QEI/variant_generic.cpp
+++ b/variants/STM32L5xx/L552QEI_L562QEI/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L5xx/L552QEI_L562QEI/variant_generic.h b/variants/STM32L5xx/L552QEI_L562QEI/variant_generic.h
index f63dd9e0e5..e7695fe866 100644
--- a/variants/STM32L5xx/L552QEI_L562QEI/variant_generic.h
+++ b/variants/STM32L5xx/L552QEI_L562QEI/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L5xx/L552QEIxP_L562QEIxP/PeripheralPins.c b/variants/STM32L5xx/L552QEIxP_L562QEIxP/PeripheralPins.c
index d24f97a949..7d1baab7a0 100644
--- a/variants/STM32L5xx/L552QEIxP_L562QEIxP/PeripheralPins.c
+++ b/variants/STM32L5xx/L552QEIxP_L562QEIxP/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L552QEIxP.xml, STM32L562QEIxP.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L5xx/L552QEIxP_L562QEIxP/variant_generic.cpp b/variants/STM32L5xx/L552QEIxP_L562QEIxP/variant_generic.cpp
index c60285d3e0..989b7a4392 100644
--- a/variants/STM32L5xx/L552QEIxP_L562QEIxP/variant_generic.cpp
+++ b/variants/STM32L5xx/L552QEIxP_L562QEIxP/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L5xx/L552QEIxP_L562QEIxP/variant_generic.h b/variants/STM32L5xx/L552QEIxP_L562QEIxP/variant_generic.h
index 2c667676af..cbe6266fcf 100644
--- a/variants/STM32L5xx/L552QEIxP_L562QEIxP/variant_generic.h
+++ b/variants/STM32L5xx/L552QEIxP_L562QEIxP/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L5xx/L552R(C-E)T_L562RET/PeripheralPins.c b/variants/STM32L5xx/L552R(C-E)T_L562RET/PeripheralPins.c
index 3a7183b263..bc056ca2d0 100644
--- a/variants/STM32L5xx/L552R(C-E)T_L562RET/PeripheralPins.c
+++ b/variants/STM32L5xx/L552R(C-E)T_L562RET/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L552R(C-E)Tx.xml, STM32L562RETx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L5xx/L552R(C-E)T_L562RET/variant_generic.cpp b/variants/STM32L5xx/L552R(C-E)T_L562RET/variant_generic.cpp
index ae661ffeab..8c87cb56e9 100644
--- a/variants/STM32L5xx/L552R(C-E)T_L562RET/variant_generic.cpp
+++ b/variants/STM32L5xx/L552R(C-E)T_L562RET/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L5xx/L552R(C-E)T_L562RET/variant_generic.h b/variants/STM32L5xx/L552R(C-E)T_L562RET/variant_generic.h
index eda324902b..03617b0349 100644
--- a/variants/STM32L5xx/L552R(C-E)T_L562RET/variant_generic.h
+++ b/variants/STM32L5xx/L552R(C-E)T_L562RET/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L5xx/L552RETxP_L562RETxP/PeripheralPins.c b/variants/STM32L5xx/L552RETxP_L562RETxP/PeripheralPins.c
index 55455851e9..f97a0c54a2 100644
--- a/variants/STM32L5xx/L552RETxP_L562RETxP/PeripheralPins.c
+++ b/variants/STM32L5xx/L552RETxP_L562RETxP/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L552RETxP.xml, STM32L562RETxP.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L5xx/L552RETxP_L562RETxP/variant_generic.cpp b/variants/STM32L5xx/L552RETxP_L562RETxP/variant_generic.cpp
index bd40818ce3..e6376b9deb 100644
--- a/variants/STM32L5xx/L552RETxP_L562RETxP/variant_generic.cpp
+++ b/variants/STM32L5xx/L552RETxP_L562RETxP/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L5xx/L552RETxP_L562RETxP/variant_generic.h b/variants/STM32L5xx/L552RETxP_L562RETxP/variant_generic.h
index 4e80a23425..266854fc24 100644
--- a/variants/STM32L5xx/L552RETxP_L562RETxP/variant_generic.h
+++ b/variants/STM32L5xx/L552RETxP_L562RETxP/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L5xx/L552RETxQ_L562RETxQ/PeripheralPins.c b/variants/STM32L5xx/L552RETxQ_L562RETxQ/PeripheralPins.c
index 5ba820dda0..5c035e196d 100644
--- a/variants/STM32L5xx/L552RETxQ_L562RETxQ/PeripheralPins.c
+++ b/variants/STM32L5xx/L552RETxQ_L562RETxQ/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L552RETxQ.xml, STM32L562RETxQ.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L5xx/L552RETxQ_L562RETxQ/variant_generic.cpp b/variants/STM32L5xx/L552RETxQ_L562RETxQ/variant_generic.cpp
index b0dd90f819..147a5d589e 100644
--- a/variants/STM32L5xx/L552RETxQ_L562RETxQ/variant_generic.cpp
+++ b/variants/STM32L5xx/L552RETxQ_L562RETxQ/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L5xx/L552RETxQ_L562RETxQ/variant_generic.h b/variants/STM32L5xx/L552RETxQ_L562RETxQ/variant_generic.h
index fdcdb24975..bf2d06bb6f 100644
--- a/variants/STM32L5xx/L552RETxQ_L562RETxQ/variant_generic.h
+++ b/variants/STM32L5xx/L552RETxQ_L562RETxQ/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L5xx/L552V(C-E)TxQ_L562VETxQ/PeripheralPins.c b/variants/STM32L5xx/L552V(C-E)TxQ_L562VETxQ/PeripheralPins.c
index 7cc3536d97..efcd776189 100644
--- a/variants/STM32L5xx/L552V(C-E)TxQ_L562VETxQ/PeripheralPins.c
+++ b/variants/STM32L5xx/L552V(C-E)TxQ_L562VETxQ/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L552V(C-E)TxQ.xml, STM32L562VETxQ.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L5xx/L552V(C-E)TxQ_L562VETxQ/variant_generic.cpp b/variants/STM32L5xx/L552V(C-E)TxQ_L562VETxQ/variant_generic.cpp
index 39159186c0..55482b1221 100644
--- a/variants/STM32L5xx/L552V(C-E)TxQ_L562VETxQ/variant_generic.cpp
+++ b/variants/STM32L5xx/L552V(C-E)TxQ_L562VETxQ/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L5xx/L552V(C-E)TxQ_L562VETxQ/variant_generic.h b/variants/STM32L5xx/L552V(C-E)TxQ_L562VETxQ/variant_generic.h
index 448bc6e6af..4b7d003542 100644
--- a/variants/STM32L5xx/L552V(C-E)TxQ_L562VETxQ/variant_generic.h
+++ b/variants/STM32L5xx/L552V(C-E)TxQ_L562VETxQ/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L5xx/L552VET_L562VET/PeripheralPins.c b/variants/STM32L5xx/L552VET_L562VET/PeripheralPins.c
index 51c6fd140a..978e578efc 100644
--- a/variants/STM32L5xx/L552VET_L562VET/PeripheralPins.c
+++ b/variants/STM32L5xx/L552VET_L562VET/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L552VETx.xml, STM32L562VETx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L5xx/L552VET_L562VET/variant_generic.cpp b/variants/STM32L5xx/L552VET_L562VET/variant_generic.cpp
index 39be86e65f..c27e64ab84 100644
--- a/variants/STM32L5xx/L552VET_L562VET/variant_generic.cpp
+++ b/variants/STM32L5xx/L552VET_L562VET/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L5xx/L552VET_L562VET/variant_generic.h b/variants/STM32L5xx/L552VET_L562VET/variant_generic.h
index 757dc3ab09..adeac81b2e 100644
--- a/variants/STM32L5xx/L552VET_L562VET/variant_generic.h
+++ b/variants/STM32L5xx/L552VET_L562VET/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L5xx/L552Z(C-E)TxQ_L562ZETxQ/PeripheralPins.c b/variants/STM32L5xx/L552Z(C-E)TxQ_L562ZETxQ/PeripheralPins.c
index 572bc5a904..5fc22bd7c1 100644
--- a/variants/STM32L5xx/L552Z(C-E)TxQ_L562ZETxQ/PeripheralPins.c
+++ b/variants/STM32L5xx/L552Z(C-E)TxQ_L562ZETxQ/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L552Z(C-E)TxQ.xml, STM32L562ZETxQ.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L5xx/L552Z(C-E)TxQ_L562ZETxQ/variant_generic.cpp b/variants/STM32L5xx/L552Z(C-E)TxQ_L562ZETxQ/variant_generic.cpp
index 4ccb3ded43..d73ab05447 100644
--- a/variants/STM32L5xx/L552Z(C-E)TxQ_L562ZETxQ/variant_generic.cpp
+++ b/variants/STM32L5xx/L552Z(C-E)TxQ_L562ZETxQ/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L5xx/L552Z(C-E)TxQ_L562ZETxQ/variant_generic.h b/variants/STM32L5xx/L552Z(C-E)TxQ_L562ZETxQ/variant_generic.h
index e239b33fae..e2ec4e3915 100644
--- a/variants/STM32L5xx/L552Z(C-E)TxQ_L562ZETxQ/variant_generic.h
+++ b/variants/STM32L5xx/L552Z(C-E)TxQ_L562ZETxQ/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L5xx/L552ZET_L562ZET/PeripheralPins.c b/variants/STM32L5xx/L552ZET_L562ZET/PeripheralPins.c
index f7e85ed56c..b725737335 100644
--- a/variants/STM32L5xx/L552ZET_L562ZET/PeripheralPins.c
+++ b/variants/STM32L5xx/L552ZET_L562ZET/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32L552ZETx.xml, STM32L562ZETx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32L5xx/L552ZET_L562ZET/variant_generic.cpp b/variants/STM32L5xx/L552ZET_L562ZET/variant_generic.cpp
index abab7d05f1..c0cdb4f69a 100644
--- a/variants/STM32L5xx/L552ZET_L562ZET/variant_generic.cpp
+++ b/variants/STM32L5xx/L552ZET_L562ZET/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32L5xx/L552ZET_L562ZET/variant_generic.h b/variants/STM32L5xx/L552ZET_L562ZET/variant_generic.h
index 792da6e128..a56358d0c4 100644
--- a/variants/STM32L5xx/L552ZET_L562ZET/variant_generic.h
+++ b/variants/STM32L5xx/L552ZET_L562ZET/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32MP1xx/MP151AA(B-D)_MP151CA(B-D)_MP151DA(B-D)_MP151FA(B-D)/PeripheralPins.c b/variants/STM32MP1xx/MP151AA(B-D)_MP151CA(B-D)_MP151DA(B-D)_MP151FA(B-D)/PeripheralPins.c
index 4d7a3fdad2..5365925b6b 100644
--- a/variants/STM32MP1xx/MP151AA(B-D)_MP151CA(B-D)_MP151DA(B-D)_MP151FA(B-D)/PeripheralPins.c
+++ b/variants/STM32MP1xx/MP151AA(B-D)_MP151CA(B-D)_MP151DA(B-D)_MP151FA(B-D)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -15,7 +15,7 @@
  * STM32MP151CABx.xml, STM32MP151CADx.xml
  * STM32MP151DABx.xml, STM32MP151DADx.xml
  * STM32MP151FABx.xml, STM32MP151FADx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32MP1xx/MP151AA(B-D)_MP151CA(B-D)_MP151DA(B-D)_MP151FA(B-D)/variant_generic.cpp b/variants/STM32MP1xx/MP151AA(B-D)_MP151CA(B-D)_MP151DA(B-D)_MP151FA(B-D)/variant_generic.cpp
index ee61387e7a..544394e727 100644
--- a/variants/STM32MP1xx/MP151AA(B-D)_MP151CA(B-D)_MP151DA(B-D)_MP151FA(B-D)/variant_generic.cpp
+++ b/variants/STM32MP1xx/MP151AA(B-D)_MP151CA(B-D)_MP151DA(B-D)_MP151FA(B-D)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32MP1xx/MP151AA(B-D)_MP151CA(B-D)_MP151DA(B-D)_MP151FA(B-D)/variant_generic.h b/variants/STM32MP1xx/MP151AA(B-D)_MP151CA(B-D)_MP151DA(B-D)_MP151FA(B-D)/variant_generic.h
index 23c482efae..0e460e5411 100644
--- a/variants/STM32MP1xx/MP151AA(B-D)_MP151CA(B-D)_MP151DA(B-D)_MP151FA(B-D)/variant_generic.h
+++ b/variants/STM32MP1xx/MP151AA(B-D)_MP151CA(B-D)_MP151DA(B-D)_MP151FA(B-D)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32MP1xx/MP151AAA_MP151CAA_MP151DAA_MP151FAA/PeripheralPins.c b/variants/STM32MP1xx/MP151AAA_MP151CAA_MP151DAA_MP151FAA/PeripheralPins.c
index 17c88d0d57..303e4a5fd1 100644
--- a/variants/STM32MP1xx/MP151AAA_MP151CAA_MP151DAA_MP151FAA/PeripheralPins.c
+++ b/variants/STM32MP1xx/MP151AAA_MP151CAA_MP151DAA_MP151FAA/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32MP151AAAx.xml, STM32MP151CAAx.xml
  * STM32MP151DAAx.xml, STM32MP151FAAx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32MP1xx/MP151AAA_MP151CAA_MP151DAA_MP151FAA/variant_generic.cpp b/variants/STM32MP1xx/MP151AAA_MP151CAA_MP151DAA_MP151FAA/variant_generic.cpp
index 3678a9bb8f..9be94b5baa 100644
--- a/variants/STM32MP1xx/MP151AAA_MP151CAA_MP151DAA_MP151FAA/variant_generic.cpp
+++ b/variants/STM32MP1xx/MP151AAA_MP151CAA_MP151DAA_MP151FAA/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32MP1xx/MP151AAA_MP151CAA_MP151DAA_MP151FAA/variant_generic.h b/variants/STM32MP1xx/MP151AAA_MP151CAA_MP151DAA_MP151FAA/variant_generic.h
index 344bfbd85f..102550aa56 100644
--- a/variants/STM32MP1xx/MP151AAA_MP151CAA_MP151DAA_MP151FAA/variant_generic.h
+++ b/variants/STM32MP1xx/MP151AAA_MP151CAA_MP151DAA_MP151FAA/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32MP1xx/MP151AAC_MP151CAC_MP151DAC_MP151FAC/PeripheralPins.c b/variants/STM32MP1xx/MP151AAC_MP151CAC_MP151DAC_MP151FAC/PeripheralPins.c
index f0f939a7a7..ba67819185 100644
--- a/variants/STM32MP1xx/MP151AAC_MP151CAC_MP151DAC_MP151FAC/PeripheralPins.c
+++ b/variants/STM32MP1xx/MP151AAC_MP151CAC_MP151DAC_MP151FAC/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32MP151AACx.xml, STM32MP151CACx.xml
  * STM32MP151DACx.xml, STM32MP151FACx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32MP1xx/MP151AAC_MP151CAC_MP151DAC_MP151FAC/variant_generic.cpp b/variants/STM32MP1xx/MP151AAC_MP151CAC_MP151DAC_MP151FAC/variant_generic.cpp
index 90bdcce1e5..69c41b07a0 100644
--- a/variants/STM32MP1xx/MP151AAC_MP151CAC_MP151DAC_MP151FAC/variant_generic.cpp
+++ b/variants/STM32MP1xx/MP151AAC_MP151CAC_MP151DAC_MP151FAC/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32MP1xx/MP151AAC_MP151CAC_MP151DAC_MP151FAC/variant_generic.h b/variants/STM32MP1xx/MP151AAC_MP151CAC_MP151DAC_MP151FAC/variant_generic.h
index 953864cd37..b38ab3a032 100644
--- a/variants/STM32MP1xx/MP151AAC_MP151CAC_MP151DAC_MP151FAC/variant_generic.h
+++ b/variants/STM32MP1xx/MP151AAC_MP151CAC_MP151DAC_MP151FAC/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32MP1xx/MP153AA(B-D)_MP153CA(B-D)_MP153DA(B-D)_MP153FA(B-D)_MP157AA(B-D)_MP157CA(B-D)_MP157DA(B-D)_MP157FA(B-D)/PeripheralPins.c b/variants/STM32MP1xx/MP153AA(B-D)_MP153CA(B-D)_MP153DA(B-D)_MP153FA(B-D)_MP157AA(B-D)_MP157CA(B-D)_MP157DA(B-D)_MP157FA(B-D)/PeripheralPins.c
index 8b3ca4833b..233b241849 100644
--- a/variants/STM32MP1xx/MP153AA(B-D)_MP153CA(B-D)_MP153DA(B-D)_MP153FA(B-D)_MP157AA(B-D)_MP157CA(B-D)_MP157DA(B-D)_MP157FA(B-D)/PeripheralPins.c
+++ b/variants/STM32MP1xx/MP153AA(B-D)_MP153CA(B-D)_MP153DA(B-D)_MP153FA(B-D)_MP157AA(B-D)_MP157CA(B-D)_MP157DA(B-D)_MP157FA(B-D)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -19,7 +19,7 @@
  * STM32MP157CABx.xml, STM32MP157CADx.xml
  * STM32MP157DABx.xml, STM32MP157DADx.xml
  * STM32MP157FABx.xml, STM32MP157FADx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32MP1xx/MP153AA(B-D)_MP153CA(B-D)_MP153DA(B-D)_MP153FA(B-D)_MP157AA(B-D)_MP157CA(B-D)_MP157DA(B-D)_MP157FA(B-D)/variant_generic.cpp b/variants/STM32MP1xx/MP153AA(B-D)_MP153CA(B-D)_MP153DA(B-D)_MP153FA(B-D)_MP157AA(B-D)_MP157CA(B-D)_MP157DA(B-D)_MP157FA(B-D)/variant_generic.cpp
index 62510bfe42..0cdf5f33cc 100644
--- a/variants/STM32MP1xx/MP153AA(B-D)_MP153CA(B-D)_MP153DA(B-D)_MP153FA(B-D)_MP157AA(B-D)_MP157CA(B-D)_MP157DA(B-D)_MP157FA(B-D)/variant_generic.cpp
+++ b/variants/STM32MP1xx/MP153AA(B-D)_MP153CA(B-D)_MP153DA(B-D)_MP153FA(B-D)_MP157AA(B-D)_MP157CA(B-D)_MP157DA(B-D)_MP157FA(B-D)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32MP1xx/MP153AA(B-D)_MP153CA(B-D)_MP153DA(B-D)_MP153FA(B-D)_MP157AA(B-D)_MP157CA(B-D)_MP157DA(B-D)_MP157FA(B-D)/variant_generic.h b/variants/STM32MP1xx/MP153AA(B-D)_MP153CA(B-D)_MP153DA(B-D)_MP153FA(B-D)_MP157AA(B-D)_MP157CA(B-D)_MP157DA(B-D)_MP157FA(B-D)/variant_generic.h
index 23c482efae..0e460e5411 100644
--- a/variants/STM32MP1xx/MP153AA(B-D)_MP153CA(B-D)_MP153DA(B-D)_MP153FA(B-D)_MP157AA(B-D)_MP157CA(B-D)_MP157DA(B-D)_MP157FA(B-D)/variant_generic.h
+++ b/variants/STM32MP1xx/MP153AA(B-D)_MP153CA(B-D)_MP153DA(B-D)_MP153FA(B-D)_MP157AA(B-D)_MP157CA(B-D)_MP157DA(B-D)_MP157FA(B-D)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32MP1xx/MP153AAA_MP153CAA_MP153DAA_MP153FAA_MP157AAA_MP157CAA_MP157DAA_MP157FAA/PeripheralPins.c b/variants/STM32MP1xx/MP153AAA_MP153CAA_MP153DAA_MP153FAA_MP157AAA_MP157CAA_MP157DAA_MP157FAA/PeripheralPins.c
index 30f418df90..4052d2de2a 100644
--- a/variants/STM32MP1xx/MP153AAA_MP153CAA_MP153DAA_MP153FAA_MP157AAA_MP157CAA_MP157DAA_MP157FAA/PeripheralPins.c
+++ b/variants/STM32MP1xx/MP153AAA_MP153CAA_MP153DAA_MP153FAA_MP157AAA_MP157CAA_MP157DAA_MP157FAA/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -15,7 +15,7 @@
  * STM32MP153DAAx.xml, STM32MP153FAAx.xml
  * STM32MP157AAAx.xml, STM32MP157CAAx.xml
  * STM32MP157DAAx.xml, STM32MP157FAAx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32MP1xx/MP153AAA_MP153CAA_MP153DAA_MP153FAA_MP157AAA_MP157CAA_MP157DAA_MP157FAA/variant_generic.cpp b/variants/STM32MP1xx/MP153AAA_MP153CAA_MP153DAA_MP153FAA_MP157AAA_MP157CAA_MP157DAA_MP157FAA/variant_generic.cpp
index 0e6989d880..44526ee738 100644
--- a/variants/STM32MP1xx/MP153AAA_MP153CAA_MP153DAA_MP153FAA_MP157AAA_MP157CAA_MP157DAA_MP157FAA/variant_generic.cpp
+++ b/variants/STM32MP1xx/MP153AAA_MP153CAA_MP153DAA_MP153FAA_MP157AAA_MP157CAA_MP157DAA_MP157FAA/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32MP1xx/MP153AAA_MP153CAA_MP153DAA_MP153FAA_MP157AAA_MP157CAA_MP157DAA_MP157FAA/variant_generic.h b/variants/STM32MP1xx/MP153AAA_MP153CAA_MP153DAA_MP153FAA_MP157AAA_MP157CAA_MP157DAA_MP157FAA/variant_generic.h
index 344bfbd85f..102550aa56 100644
--- a/variants/STM32MP1xx/MP153AAA_MP153CAA_MP153DAA_MP153FAA_MP157AAA_MP157CAA_MP157DAA_MP157FAA/variant_generic.h
+++ b/variants/STM32MP1xx/MP153AAA_MP153CAA_MP153DAA_MP153FAA_MP157AAA_MP157CAA_MP157DAA_MP157FAA/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32MP1xx/MP153AAC_MP153CAC_MP153DAC_MP153FAC_MP157AAC_MP157CAC_MP157DAC_MP157FAC/PeripheralPins.c b/variants/STM32MP1xx/MP153AAC_MP153CAC_MP153DAC_MP153FAC_MP157AAC_MP157CAC_MP157DAC_MP157FAC/PeripheralPins.c
index b60365a725..1bea780668 100644
--- a/variants/STM32MP1xx/MP153AAC_MP153CAC_MP153DAC_MP153FAC_MP157AAC_MP157CAC_MP157DAC_MP157FAC/PeripheralPins.c
+++ b/variants/STM32MP1xx/MP153AAC_MP153CAC_MP153DAC_MP153FAC_MP157AAC_MP157CAC_MP157DAC_MP157FAC/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -15,7 +15,7 @@
  * STM32MP153DACx.xml, STM32MP153FACx.xml
  * STM32MP157AACx.xml, STM32MP157CACx.xml
  * STM32MP157DACx.xml, STM32MP157FACx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32MP1xx/MP153AAC_MP153CAC_MP153DAC_MP153FAC_MP157AAC_MP157CAC_MP157DAC_MP157FAC/variant_generic.cpp b/variants/STM32MP1xx/MP153AAC_MP153CAC_MP153DAC_MP153FAC_MP157AAC_MP157CAC_MP157DAC_MP157FAC/variant_generic.cpp
index 2dbe3e3341..ae19bd1103 100644
--- a/variants/STM32MP1xx/MP153AAC_MP153CAC_MP153DAC_MP153FAC_MP157AAC_MP157CAC_MP157DAC_MP157FAC/variant_generic.cpp
+++ b/variants/STM32MP1xx/MP153AAC_MP153CAC_MP153DAC_MP153FAC_MP157AAC_MP157CAC_MP157DAC_MP157FAC/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32MP1xx/MP153AAC_MP153CAC_MP153DAC_MP153FAC_MP157AAC_MP157CAC_MP157DAC_MP157FAC/variant_generic.h b/variants/STM32MP1xx/MP153AAC_MP153CAC_MP153DAC_MP153FAC_MP157AAC_MP157CAC_MP157DAC_MP157FAC/variant_generic.h
index 953864cd37..b38ab3a032 100644
--- a/variants/STM32MP1xx/MP153AAC_MP153CAC_MP153DAC_MP153FAC_MP157AAC_MP157CAC_MP157DAC_MP157FAC/variant_generic.h
+++ b/variants/STM32MP1xx/MP153AAC_MP153CAC_MP153DAC_MP153FAC_MP157AAC_MP157CAC_MP157DAC_MP157FAC/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32U5xx/U575A(G-I)I_U585AII/PeripheralPins.c b/variants/STM32U5xx/U575A(G-I)I_U585AII/PeripheralPins.c
index 2c339c2380..42f7311ef1 100644
--- a/variants/STM32U5xx/U575A(G-I)I_U585AII/PeripheralPins.c
+++ b/variants/STM32U5xx/U575A(G-I)I_U585AII/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32U575AGIx.xml, STM32U575AIIx.xml
  * STM32U585AIIx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32U5xx/U575A(G-I)I_U585AII/variant_generic.cpp b/variants/STM32U5xx/U575A(G-I)I_U585AII/variant_generic.cpp
index 1cd871b1b2..6bac9cf9f1 100644
--- a/variants/STM32U5xx/U575A(G-I)I_U585AII/variant_generic.cpp
+++ b/variants/STM32U5xx/U575A(G-I)I_U585AII/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32U5xx/U575A(G-I)I_U585AII/variant_generic.h b/variants/STM32U5xx/U575A(G-I)I_U585AII/variant_generic.h
index 6dfd1c2e67..9e7ff5a188 100644
--- a/variants/STM32U5xx/U575A(G-I)I_U585AII/variant_generic.h
+++ b/variants/STM32U5xx/U575A(G-I)I_U585AII/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32U5xx/U575A(G-I)IxQ_U585AIIxQ/PeripheralPins.c b/variants/STM32U5xx/U575A(G-I)IxQ_U585AIIxQ/PeripheralPins.c
index 69f6e87941..dda8804b3d 100644
--- a/variants/STM32U5xx/U575A(G-I)IxQ_U585AIIxQ/PeripheralPins.c
+++ b/variants/STM32U5xx/U575A(G-I)IxQ_U585AIIxQ/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32U575AGIxQ.xml, STM32U575AIIxQ.xml
  * STM32U585AIIxQ.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32U5xx/U575A(G-I)IxQ_U585AIIxQ/variant_generic.cpp b/variants/STM32U5xx/U575A(G-I)IxQ_U585AIIxQ/variant_generic.cpp
index 8a0af02192..d7bd29b800 100644
--- a/variants/STM32U5xx/U575A(G-I)IxQ_U585AIIxQ/variant_generic.cpp
+++ b/variants/STM32U5xx/U575A(G-I)IxQ_U585AIIxQ/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32U5xx/U575A(G-I)IxQ_U585AIIxQ/variant_generic.h b/variants/STM32U5xx/U575A(G-I)IxQ_U585AIIxQ/variant_generic.h
index a824476814..5db0620ab7 100644
--- a/variants/STM32U5xx/U575A(G-I)IxQ_U585AIIxQ/variant_generic.h
+++ b/variants/STM32U5xx/U575A(G-I)IxQ_U585AIIxQ/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32U5xx/U575C(G-I)(T-U)_U585CI(T-U)/PeripheralPins.c b/variants/STM32U5xx/U575C(G-I)(T-U)_U585CI(T-U)/PeripheralPins.c
index f2d96cf06e..1a1f6a5cd9 100644
--- a/variants/STM32U5xx/U575C(G-I)(T-U)_U585CI(T-U)/PeripheralPins.c
+++ b/variants/STM32U5xx/U575C(G-I)(T-U)_U585CI(T-U)/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -14,7 +14,7 @@
  * Automatically generated from STM32U575CGTx.xml, STM32U575CGUx.xml
  * STM32U575CITx.xml, STM32U575CIUx.xml
  * STM32U585CITx.xml, STM32U585CIUx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32U5xx/U575C(G-I)(T-U)_U585CI(T-U)/variant_generic.cpp b/variants/STM32U5xx/U575C(G-I)(T-U)_U585CI(T-U)/variant_generic.cpp
index 5541308a30..aa156b792b 100644
--- a/variants/STM32U5xx/U575C(G-I)(T-U)_U585CI(T-U)/variant_generic.cpp
+++ b/variants/STM32U5xx/U575C(G-I)(T-U)_U585CI(T-U)/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32U5xx/U575C(G-I)(T-U)_U585CI(T-U)/variant_generic.h b/variants/STM32U5xx/U575C(G-I)(T-U)_U585CI(T-U)/variant_generic.h
index 59cd2dc8b0..783db929f9 100644
--- a/variants/STM32U5xx/U575C(G-I)(T-U)_U585CI(T-U)/variant_generic.h
+++ b/variants/STM32U5xx/U575C(G-I)(T-U)_U585CI(T-U)/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32U5xx/U575C(G-I)(T-U)xQ_U585CI(T-U)xQ/PeripheralPins.c b/variants/STM32U5xx/U575C(G-I)(T-U)xQ_U585CI(T-U)xQ/PeripheralPins.c
index 192758696e..a14021cc07 100644
--- a/variants/STM32U5xx/U575C(G-I)(T-U)xQ_U585CI(T-U)xQ/PeripheralPins.c
+++ b/variants/STM32U5xx/U575C(G-I)(T-U)xQ_U585CI(T-U)xQ/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -14,7 +14,7 @@
  * Automatically generated from STM32U575CGTxQ.xml, STM32U575CGUxQ.xml
  * STM32U575CITxQ.xml, STM32U575CIUxQ.xml
  * STM32U585CITxQ.xml, STM32U585CIUxQ.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32U5xx/U575C(G-I)(T-U)xQ_U585CI(T-U)xQ/variant_generic.cpp b/variants/STM32U5xx/U575C(G-I)(T-U)xQ_U585CI(T-U)xQ/variant_generic.cpp
index ac70f283cc..8b04bde2eb 100644
--- a/variants/STM32U5xx/U575C(G-I)(T-U)xQ_U585CI(T-U)xQ/variant_generic.cpp
+++ b/variants/STM32U5xx/U575C(G-I)(T-U)xQ_U585CI(T-U)xQ/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32U5xx/U575C(G-I)(T-U)xQ_U585CI(T-U)xQ/variant_generic.h b/variants/STM32U5xx/U575C(G-I)(T-U)xQ_U585CI(T-U)xQ/variant_generic.h
index 371234d2b8..7ef12bfad1 100644
--- a/variants/STM32U5xx/U575C(G-I)(T-U)xQ_U585CI(T-U)xQ/variant_generic.h
+++ b/variants/STM32U5xx/U575C(G-I)(T-U)xQ_U585CI(T-U)xQ/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32U5xx/U575O(G-I)YxQ_U585OIYxQ/PeripheralPins.c b/variants/STM32U5xx/U575O(G-I)YxQ_U585OIYxQ/PeripheralPins.c
index 6905527ff3..b97028adc8 100644
--- a/variants/STM32U5xx/U575O(G-I)YxQ_U585OIYxQ/PeripheralPins.c
+++ b/variants/STM32U5xx/U575O(G-I)YxQ_U585OIYxQ/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32U575OGYxQ.xml, STM32U575OIYxQ.xml
  * STM32U585OIYxQ.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32U5xx/U575O(G-I)YxQ_U585OIYxQ/variant_generic.cpp b/variants/STM32U5xx/U575O(G-I)YxQ_U585OIYxQ/variant_generic.cpp
index f4f443b4ad..1f2e1c0442 100644
--- a/variants/STM32U5xx/U575O(G-I)YxQ_U585OIYxQ/variant_generic.cpp
+++ b/variants/STM32U5xx/U575O(G-I)YxQ_U585OIYxQ/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32U5xx/U575O(G-I)YxQ_U585OIYxQ/variant_generic.h b/variants/STM32U5xx/U575O(G-I)YxQ_U585OIYxQ/variant_generic.h
index b638463376..ccbe75106a 100644
--- a/variants/STM32U5xx/U575O(G-I)YxQ_U585OIYxQ/variant_generic.h
+++ b/variants/STM32U5xx/U575O(G-I)YxQ_U585OIYxQ/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32U5xx/U575Q(G-I)I_U585QII/PeripheralPins.c b/variants/STM32U5xx/U575Q(G-I)I_U585QII/PeripheralPins.c
index c44797d4a3..5874c3f976 100644
--- a/variants/STM32U5xx/U575Q(G-I)I_U585QII/PeripheralPins.c
+++ b/variants/STM32U5xx/U575Q(G-I)I_U585QII/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32U575QGIx.xml, STM32U575QIIx.xml
  * STM32U585QIIx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32U5xx/U575Q(G-I)I_U585QII/variant_generic.cpp b/variants/STM32U5xx/U575Q(G-I)I_U585QII/variant_generic.cpp
index 2cf0ef267c..f1d5cd86e9 100644
--- a/variants/STM32U5xx/U575Q(G-I)I_U585QII/variant_generic.cpp
+++ b/variants/STM32U5xx/U575Q(G-I)I_U585QII/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32U5xx/U575Q(G-I)I_U585QII/variant_generic.h b/variants/STM32U5xx/U575Q(G-I)I_U585QII/variant_generic.h
index 850d452490..bd27b63aaf 100644
--- a/variants/STM32U5xx/U575Q(G-I)I_U585QII/variant_generic.h
+++ b/variants/STM32U5xx/U575Q(G-I)I_U585QII/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32U5xx/U575Q(G-I)IxQ_U585QEIxQ/PeripheralPins.c b/variants/STM32U5xx/U575Q(G-I)IxQ_U585QIIxQ/PeripheralPins.c
similarity index 99%
rename from variants/STM32U5xx/U575Q(G-I)IxQ_U585QEIxQ/PeripheralPins.c
rename to variants/STM32U5xx/U575Q(G-I)IxQ_U585QIIxQ/PeripheralPins.c
index 547a790ce5..ecfd447a8c 100644
--- a/variants/STM32U5xx/U575Q(G-I)IxQ_U585QEIxQ/PeripheralPins.c
+++ b/variants/STM32U5xx/U575Q(G-I)IxQ_U585QIIxQ/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,8 +12,8 @@
  */
 /*
  * Automatically generated from STM32U575QGIxQ.xml, STM32U575QIIxQ.xml
- * STM32U585QEIxQ.xml
- * CubeMX DB release 6.0.30
+ * STM32U585QIIxQ.xml
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32U5xx/U575Q(G-I)IxQ_U585QEIxQ/PinNamesVar.h b/variants/STM32U5xx/U575Q(G-I)IxQ_U585QIIxQ/PinNamesVar.h
similarity index 100%
rename from variants/STM32U5xx/U575Q(G-I)IxQ_U585QEIxQ/PinNamesVar.h
rename to variants/STM32U5xx/U575Q(G-I)IxQ_U585QIIxQ/PinNamesVar.h
diff --git a/variants/STM32U5xx/U575Q(G-I)IxQ_U585QEIxQ/boards_entry.txt b/variants/STM32U5xx/U575Q(G-I)IxQ_U585QIIxQ/boards_entry.txt
similarity index 69%
rename from variants/STM32U5xx/U575Q(G-I)IxQ_U585QEIxQ/boards_entry.txt
rename to variants/STM32U5xx/U575Q(G-I)IxQ_U585QIIxQ/boards_entry.txt
index 8b258f2ae8..663de6acb7 100644
--- a/variants/STM32U5xx/U575Q(G-I)IxQ_U585QEIxQ/boards_entry.txt
+++ b/variants/STM32U5xx/U575Q(G-I)IxQ_U585QIIxQ/boards_entry.txt
@@ -9,7 +9,7 @@ GenU5.menu.pnum.GENERIC_U575QGIXQ.upload.maximum_size=1048576
 GenU5.menu.pnum.GENERIC_U575QGIXQ.upload.maximum_data_size=262144
 GenU5.menu.pnum.GENERIC_U575QGIXQ.build.board=GENERIC_U575QGIXQ
 GenU5.menu.pnum.GENERIC_U575QGIXQ.build.product_line=STM32U575xx
-GenU5.menu.pnum.GENERIC_U575QGIXQ.build.variant=STM32U5xx/U575Q(G-I)IxQ_U585QEIxQ
+GenU5.menu.pnum.GENERIC_U575QGIXQ.build.variant=STM32U5xx/U575Q(G-I)IxQ_U585QIIxQ
 
 # Generic U575QIIxQ
 GenU5.menu.pnum.GENERIC_U575QIIXQ=Generic U575QIIxQ
@@ -17,13 +17,13 @@ GenU5.menu.pnum.GENERIC_U575QIIXQ.upload.maximum_size=2097152
 GenU5.menu.pnum.GENERIC_U575QIIXQ.upload.maximum_data_size=262144
 GenU5.menu.pnum.GENERIC_U575QIIXQ.build.board=GENERIC_U575QIIXQ
 GenU5.menu.pnum.GENERIC_U575QIIXQ.build.product_line=STM32U575xx
-GenU5.menu.pnum.GENERIC_U575QIIXQ.build.variant=STM32U5xx/U575Q(G-I)IxQ_U585QEIxQ
+GenU5.menu.pnum.GENERIC_U575QIIXQ.build.variant=STM32U5xx/U575Q(G-I)IxQ_U585QIIxQ
 
-# Generic U585QEIxQ
-GenU5.menu.pnum.GENERIC_U585QEIXQ=Generic U585QEIxQ
-GenU5.menu.pnum.GENERIC_U585QEIXQ.upload.maximum_size=524288
-GenU5.menu.pnum.GENERIC_U585QEIXQ.upload.maximum_data_size=262144
-GenU5.menu.pnum.GENERIC_U585QEIXQ.build.board=GENERIC_U585QEIXQ
-GenU5.menu.pnum.GENERIC_U585QEIXQ.build.product_line=STM32U585xx
-GenU5.menu.pnum.GENERIC_U585QEIXQ.build.variant=STM32U5xx/U575Q(G-I)IxQ_U585QEIxQ
+# Generic U585QIIxQ
+GenU5.menu.pnum.GENERIC_U585QIIXQ=Generic U585QIIxQ
+GenU5.menu.pnum.GENERIC_U585QIIXQ.upload.maximum_size=2097152
+GenU5.menu.pnum.GENERIC_U585QIIXQ.upload.maximum_data_size=262144
+GenU5.menu.pnum.GENERIC_U585QIIXQ.build.board=GENERIC_U585QIIXQ
+GenU5.menu.pnum.GENERIC_U585QIIXQ.build.product_line=STM32U585xx
+GenU5.menu.pnum.GENERIC_U585QIIXQ.build.variant=STM32U5xx/U575Q(G-I)IxQ_U585QIIxQ
 
diff --git a/variants/STM32U5xx/U575Q(G-I)IxQ_U585QEIxQ/generic_clock.c b/variants/STM32U5xx/U575Q(G-I)IxQ_U585QIIxQ/generic_clock.c
similarity index 90%
rename from variants/STM32U5xx/U575Q(G-I)IxQ_U585QEIxQ/generic_clock.c
rename to variants/STM32U5xx/U575Q(G-I)IxQ_U585QIIxQ/generic_clock.c
index 200f846636..b6d9bbf076 100644
--- a/variants/STM32U5xx/U575Q(G-I)IxQ_U585QEIxQ/generic_clock.c
+++ b/variants/STM32U5xx/U575Q(G-I)IxQ_U585QIIxQ/generic_clock.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -11,7 +11,7 @@
  *******************************************************************************
  */
 #if defined(ARDUINO_GENERIC_U575QGIXQ) || defined(ARDUINO_GENERIC_U575QIIXQ) ||\
-    defined(ARDUINO_GENERIC_U585QEIXQ)
+    defined(ARDUINO_GENERIC_U585QIIXQ)
 #include "pins_arduino.h"
 
 /**
diff --git a/variants/STM32U5xx/U575Q(G-I)IxQ_U585QEIxQ/variant_generic.cpp b/variants/STM32U5xx/U575Q(G-I)IxQ_U585QIIxQ/variant_generic.cpp
similarity index 97%
rename from variants/STM32U5xx/U575Q(G-I)IxQ_U585QEIxQ/variant_generic.cpp
rename to variants/STM32U5xx/U575Q(G-I)IxQ_U585QIIxQ/variant_generic.cpp
index d17c565b67..916e8d9184 100644
--- a/variants/STM32U5xx/U575Q(G-I)IxQ_U585QEIxQ/variant_generic.cpp
+++ b/variants/STM32U5xx/U575Q(G-I)IxQ_U585QIIxQ/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -11,7 +11,7 @@
  *******************************************************************************
  */
 #if defined(ARDUINO_GENERIC_U575QGIXQ) || defined(ARDUINO_GENERIC_U575QIIXQ) ||\
-    defined(ARDUINO_GENERIC_U585QEIXQ)
+    defined(ARDUINO_GENERIC_U585QIIXQ)
 #include "pins_arduino.h"
 
 // Digital PinName array
diff --git a/variants/STM32U5xx/U575Q(G-I)IxQ_U585QEIxQ/variant_generic.h b/variants/STM32U5xx/U575Q(G-I)IxQ_U585QIIxQ/variant_generic.h
similarity index 99%
rename from variants/STM32U5xx/U575Q(G-I)IxQ_U585QEIxQ/variant_generic.h
rename to variants/STM32U5xx/U575Q(G-I)IxQ_U585QIIxQ/variant_generic.h
index 7e351dc456..a9331720b6 100644
--- a/variants/STM32U5xx/U575Q(G-I)IxQ_U585QEIxQ/variant_generic.h
+++ b/variants/STM32U5xx/U575Q(G-I)IxQ_U585QIIxQ/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32U5xx/U575R(G-I)T_U585RIT/PeripheralPins.c b/variants/STM32U5xx/U575R(G-I)T_U585RIT/PeripheralPins.c
index 81776349c3..c6b99f8cc1 100644
--- a/variants/STM32U5xx/U575R(G-I)T_U585RIT/PeripheralPins.c
+++ b/variants/STM32U5xx/U575R(G-I)T_U585RIT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32U575RGTx.xml, STM32U575RITx.xml
  * STM32U585RITx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32U5xx/U575R(G-I)T_U585RIT/variant_generic.cpp b/variants/STM32U5xx/U575R(G-I)T_U585RIT/variant_generic.cpp
index 76f3b713c4..2a5dfba8aa 100644
--- a/variants/STM32U5xx/U575R(G-I)T_U585RIT/variant_generic.cpp
+++ b/variants/STM32U5xx/U575R(G-I)T_U585RIT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32U5xx/U575R(G-I)T_U585RIT/variant_generic.h b/variants/STM32U5xx/U575R(G-I)T_U585RIT/variant_generic.h
index 7048392349..dc731799f5 100644
--- a/variants/STM32U5xx/U575R(G-I)T_U585RIT/variant_generic.h
+++ b/variants/STM32U5xx/U575R(G-I)T_U585RIT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32U5xx/U575R(G-I)TxQ_U585RITxQ/PeripheralPins.c b/variants/STM32U5xx/U575R(G-I)TxQ_U585RITxQ/PeripheralPins.c
index bd99bece9c..5a1ba9ddb3 100644
--- a/variants/STM32U5xx/U575R(G-I)TxQ_U585RITxQ/PeripheralPins.c
+++ b/variants/STM32U5xx/U575R(G-I)TxQ_U585RITxQ/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32U575RGTxQ.xml, STM32U575RITxQ.xml
  * STM32U585RITxQ.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32U5xx/U575R(G-I)TxQ_U585RITxQ/variant_generic.cpp b/variants/STM32U5xx/U575R(G-I)TxQ_U585RITxQ/variant_generic.cpp
index 9ed4a8f5dc..d7fa67475a 100644
--- a/variants/STM32U5xx/U575R(G-I)TxQ_U585RITxQ/variant_generic.cpp
+++ b/variants/STM32U5xx/U575R(G-I)TxQ_U585RITxQ/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32U5xx/U575R(G-I)TxQ_U585RITxQ/variant_generic.h b/variants/STM32U5xx/U575R(G-I)TxQ_U585RITxQ/variant_generic.h
index fe6970c284..cbe95efc24 100644
--- a/variants/STM32U5xx/U575R(G-I)TxQ_U585RITxQ/variant_generic.h
+++ b/variants/STM32U5xx/U575R(G-I)TxQ_U585RITxQ/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32U5xx/U575V(G-I)T_U585VIT/PeripheralPins.c b/variants/STM32U5xx/U575V(G-I)T_U585VIT/PeripheralPins.c
index ea5a3ac3ad..b8c96d8150 100644
--- a/variants/STM32U5xx/U575V(G-I)T_U585VIT/PeripheralPins.c
+++ b/variants/STM32U5xx/U575V(G-I)T_U585VIT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32U575VGTx.xml, STM32U575VITx.xml
  * STM32U585VITx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32U5xx/U575V(G-I)T_U585VIT/variant_generic.cpp b/variants/STM32U5xx/U575V(G-I)T_U585VIT/variant_generic.cpp
index 098b7dc295..a31af43734 100644
--- a/variants/STM32U5xx/U575V(G-I)T_U585VIT/variant_generic.cpp
+++ b/variants/STM32U5xx/U575V(G-I)T_U585VIT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32U5xx/U575V(G-I)T_U585VIT/variant_generic.h b/variants/STM32U5xx/U575V(G-I)T_U585VIT/variant_generic.h
index c8280edc6e..0e044f8c7e 100644
--- a/variants/STM32U5xx/U575V(G-I)T_U585VIT/variant_generic.h
+++ b/variants/STM32U5xx/U575V(G-I)T_U585VIT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32U5xx/U575V(G-I)TxQ_U585VITxQ/PeripheralPins.c b/variants/STM32U5xx/U575V(G-I)TxQ_U585VITxQ/PeripheralPins.c
index eb691cf281..0ee4467cea 100644
--- a/variants/STM32U5xx/U575V(G-I)TxQ_U585VITxQ/PeripheralPins.c
+++ b/variants/STM32U5xx/U575V(G-I)TxQ_U585VITxQ/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32U575VGTxQ.xml, STM32U575VITxQ.xml
  * STM32U585VITxQ.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32U5xx/U575V(G-I)TxQ_U585VITxQ/variant_generic.cpp b/variants/STM32U5xx/U575V(G-I)TxQ_U585VITxQ/variant_generic.cpp
index 0b39f8d38c..e482e03138 100644
--- a/variants/STM32U5xx/U575V(G-I)TxQ_U585VITxQ/variant_generic.cpp
+++ b/variants/STM32U5xx/U575V(G-I)TxQ_U585VITxQ/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32U5xx/U575V(G-I)TxQ_U585VITxQ/variant_generic.h b/variants/STM32U5xx/U575V(G-I)TxQ_U585VITxQ/variant_generic.h
index 16535a06b0..21f4d376ae 100644
--- a/variants/STM32U5xx/U575V(G-I)TxQ_U585VITxQ/variant_generic.h
+++ b/variants/STM32U5xx/U575V(G-I)TxQ_U585VITxQ/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32U5xx/U575Z(G-I)T_U585ZIT/PeripheralPins.c b/variants/STM32U5xx/U575Z(G-I)T_U585ZIT/PeripheralPins.c
index 27b71e1719..54c0d22ea5 100644
--- a/variants/STM32U5xx/U575Z(G-I)T_U585ZIT/PeripheralPins.c
+++ b/variants/STM32U5xx/U575Z(G-I)T_U585ZIT/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32U575ZGTx.xml, STM32U575ZITx.xml
  * STM32U585ZITx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32U5xx/U575Z(G-I)T_U585ZIT/variant_generic.cpp b/variants/STM32U5xx/U575Z(G-I)T_U585ZIT/variant_generic.cpp
index 350a92c0aa..bdc3bb2bbc 100644
--- a/variants/STM32U5xx/U575Z(G-I)T_U585ZIT/variant_generic.cpp
+++ b/variants/STM32U5xx/U575Z(G-I)T_U585ZIT/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32U5xx/U575Z(G-I)T_U585ZIT/variant_generic.h b/variants/STM32U5xx/U575Z(G-I)T_U585ZIT/variant_generic.h
index e9a84f85e6..75074fe106 100644
--- a/variants/STM32U5xx/U575Z(G-I)T_U585ZIT/variant_generic.h
+++ b/variants/STM32U5xx/U575Z(G-I)T_U585ZIT/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32U5xx/U575Z(G-I)TxQ_U585ZETxQ/PeripheralPins.c b/variants/STM32U5xx/U575Z(G-I)TxQ_U585ZITxQ/PeripheralPins.c
similarity index 99%
rename from variants/STM32U5xx/U575Z(G-I)TxQ_U585ZETxQ/PeripheralPins.c
rename to variants/STM32U5xx/U575Z(G-I)TxQ_U585ZITxQ/PeripheralPins.c
index c985f3a6f6..ed73b2e782 100644
--- a/variants/STM32U5xx/U575Z(G-I)TxQ_U585ZETxQ/PeripheralPins.c
+++ b/variants/STM32U5xx/U575Z(G-I)TxQ_U585ZITxQ/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,8 +12,8 @@
  */
 /*
  * Automatically generated from STM32U575ZGTxQ.xml, STM32U575ZITxQ.xml
- * STM32U585ZETxQ.xml
- * CubeMX DB release 6.0.30
+ * STM32U585ZITxQ.xml
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32U5xx/U575Z(G-I)TxQ_U585ZETxQ/PeripheralPins_NUCLEO_U575ZI_Q.c b/variants/STM32U5xx/U575Z(G-I)TxQ_U585ZITxQ/PeripheralPins_NUCLEO_U575ZI_Q.c
similarity index 100%
rename from variants/STM32U5xx/U575Z(G-I)TxQ_U585ZETxQ/PeripheralPins_NUCLEO_U575ZI_Q.c
rename to variants/STM32U5xx/U575Z(G-I)TxQ_U585ZITxQ/PeripheralPins_NUCLEO_U575ZI_Q.c
diff --git a/variants/STM32U5xx/U575Z(G-I)TxQ_U585ZETxQ/PinNamesVar.h b/variants/STM32U5xx/U575Z(G-I)TxQ_U585ZITxQ/PinNamesVar.h
similarity index 100%
rename from variants/STM32U5xx/U575Z(G-I)TxQ_U585ZETxQ/PinNamesVar.h
rename to variants/STM32U5xx/U575Z(G-I)TxQ_U585ZITxQ/PinNamesVar.h
diff --git a/variants/STM32U5xx/U575Z(G-I)TxQ_U585ZETxQ/boards_entry.txt b/variants/STM32U5xx/U575Z(G-I)TxQ_U585ZITxQ/boards_entry.txt
similarity index 69%
rename from variants/STM32U5xx/U575Z(G-I)TxQ_U585ZETxQ/boards_entry.txt
rename to variants/STM32U5xx/U575Z(G-I)TxQ_U585ZITxQ/boards_entry.txt
index 79899b131f..e297ed309d 100644
--- a/variants/STM32U5xx/U575Z(G-I)TxQ_U585ZETxQ/boards_entry.txt
+++ b/variants/STM32U5xx/U575Z(G-I)TxQ_U585ZITxQ/boards_entry.txt
@@ -9,7 +9,7 @@ GenU5.menu.pnum.GENERIC_U575ZGTXQ.upload.maximum_size=1048576
 GenU5.menu.pnum.GENERIC_U575ZGTXQ.upload.maximum_data_size=262144
 GenU5.menu.pnum.GENERIC_U575ZGTXQ.build.board=GENERIC_U575ZGTXQ
 GenU5.menu.pnum.GENERIC_U575ZGTXQ.build.product_line=STM32U575xx
-GenU5.menu.pnum.GENERIC_U575ZGTXQ.build.variant=STM32U5xx/U575Z(G-I)TxQ_U585ZETxQ
+GenU5.menu.pnum.GENERIC_U575ZGTXQ.build.variant=STM32U5xx/U575Z(G-I)TxQ_U585ZITxQ
 
 # Generic U575ZITxQ
 GenU5.menu.pnum.GENERIC_U575ZITXQ=Generic U575ZITxQ
@@ -17,13 +17,13 @@ GenU5.menu.pnum.GENERIC_U575ZITXQ.upload.maximum_size=2097152
 GenU5.menu.pnum.GENERIC_U575ZITXQ.upload.maximum_data_size=262144
 GenU5.menu.pnum.GENERIC_U575ZITXQ.build.board=GENERIC_U575ZITXQ
 GenU5.menu.pnum.GENERIC_U575ZITXQ.build.product_line=STM32U575xx
-GenU5.menu.pnum.GENERIC_U575ZITXQ.build.variant=STM32U5xx/U575Z(G-I)TxQ_U585ZETxQ
+GenU5.menu.pnum.GENERIC_U575ZITXQ.build.variant=STM32U5xx/U575Z(G-I)TxQ_U585ZITxQ
 
-# Generic U585ZETxQ
-GenU5.menu.pnum.GENERIC_U585ZETXQ=Generic U585ZETxQ
-GenU5.menu.pnum.GENERIC_U585ZETXQ.upload.maximum_size=524288
-GenU5.menu.pnum.GENERIC_U585ZETXQ.upload.maximum_data_size=262144
-GenU5.menu.pnum.GENERIC_U585ZETXQ.build.board=GENERIC_U585ZETXQ
-GenU5.menu.pnum.GENERIC_U585ZETXQ.build.product_line=STM32U585xx
-GenU5.menu.pnum.GENERIC_U585ZETXQ.build.variant=STM32U5xx/U575Z(G-I)TxQ_U585ZETxQ
+# Generic U585ZITxQ
+GenU5.menu.pnum.GENERIC_U585ZITXQ=Generic U585ZITxQ
+GenU5.menu.pnum.GENERIC_U585ZITXQ.upload.maximum_size=2097152
+GenU5.menu.pnum.GENERIC_U585ZITXQ.upload.maximum_data_size=262144
+GenU5.menu.pnum.GENERIC_U585ZITXQ.build.board=GENERIC_U585ZITXQ
+GenU5.menu.pnum.GENERIC_U585ZITXQ.build.product_line=STM32U585xx
+GenU5.menu.pnum.GENERIC_U585ZITXQ.build.variant=STM32U5xx/U575Z(G-I)TxQ_U585ZITxQ
 
diff --git a/variants/STM32U5xx/U575Z(G-I)TxQ_U585ZETxQ/generic_clock.c b/variants/STM32U5xx/U575Z(G-I)TxQ_U585ZITxQ/generic_clock.c
similarity index 97%
rename from variants/STM32U5xx/U575Z(G-I)TxQ_U585ZETxQ/generic_clock.c
rename to variants/STM32U5xx/U575Z(G-I)TxQ_U585ZITxQ/generic_clock.c
index 3567f93b9b..4b95bb38c0 100644
--- a/variants/STM32U5xx/U575Z(G-I)TxQ_U585ZETxQ/generic_clock.c
+++ b/variants/STM32U5xx/U575Z(G-I)TxQ_U585ZITxQ/generic_clock.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -11,7 +11,7 @@
  *******************************************************************************
  */
 #if defined(ARDUINO_GENERIC_U575ZGTXQ) || defined(ARDUINO_GENERIC_U575ZITXQ) ||\
-    defined(ARDUINO_GENERIC_U585ZETXQ)
+    defined(ARDUINO_GENERIC_U585ZITXQ)
 #include "pins_arduino.h"
 
 /**
diff --git a/variants/STM32U5xx/U575Z(G-I)TxQ_U585ZETxQ/ldscript.ld b/variants/STM32U5xx/U575Z(G-I)TxQ_U585ZITxQ/ldscript.ld
similarity index 100%
rename from variants/STM32U5xx/U575Z(G-I)TxQ_U585ZETxQ/ldscript.ld
rename to variants/STM32U5xx/U575Z(G-I)TxQ_U585ZITxQ/ldscript.ld
diff --git a/variants/STM32U5xx/U575Z(G-I)TxQ_U585ZETxQ/variant_NUCLEO_U575ZI_Q.cpp b/variants/STM32U5xx/U575Z(G-I)TxQ_U585ZITxQ/variant_NUCLEO_U575ZI_Q.cpp
similarity index 100%
rename from variants/STM32U5xx/U575Z(G-I)TxQ_U585ZETxQ/variant_NUCLEO_U575ZI_Q.cpp
rename to variants/STM32U5xx/U575Z(G-I)TxQ_U585ZITxQ/variant_NUCLEO_U575ZI_Q.cpp
diff --git a/variants/STM32U5xx/U575Z(G-I)TxQ_U585ZETxQ/variant_NUCLEO_U575ZI_Q.h b/variants/STM32U5xx/U575Z(G-I)TxQ_U585ZITxQ/variant_NUCLEO_U575ZI_Q.h
similarity index 100%
rename from variants/STM32U5xx/U575Z(G-I)TxQ_U585ZETxQ/variant_NUCLEO_U575ZI_Q.h
rename to variants/STM32U5xx/U575Z(G-I)TxQ_U585ZITxQ/variant_NUCLEO_U575ZI_Q.h
diff --git a/variants/STM32U5xx/U575Z(G-I)TxQ_U585ZETxQ/variant_generic.cpp b/variants/STM32U5xx/U575Z(G-I)TxQ_U585ZITxQ/variant_generic.cpp
similarity index 97%
rename from variants/STM32U5xx/U575Z(G-I)TxQ_U585ZETxQ/variant_generic.cpp
rename to variants/STM32U5xx/U575Z(G-I)TxQ_U585ZITxQ/variant_generic.cpp
index f5b205656a..be2ccec822 100644
--- a/variants/STM32U5xx/U575Z(G-I)TxQ_U585ZETxQ/variant_generic.cpp
+++ b/variants/STM32U5xx/U575Z(G-I)TxQ_U585ZITxQ/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -11,7 +11,7 @@
  *******************************************************************************
  */
 #if defined(ARDUINO_GENERIC_U575ZGTXQ) || defined(ARDUINO_GENERIC_U575ZITXQ) ||\
-    defined(ARDUINO_GENERIC_U585ZETXQ)
+    defined(ARDUINO_GENERIC_U585ZITXQ)
 #include "pins_arduino.h"
 
 // Digital PinName array
diff --git a/variants/STM32U5xx/U575Z(G-I)TxQ_U585ZETxQ/variant_generic.h b/variants/STM32U5xx/U575Z(G-I)TxQ_U585ZITxQ/variant_generic.h
similarity index 99%
rename from variants/STM32U5xx/U575Z(G-I)TxQ_U585ZETxQ/variant_generic.h
rename to variants/STM32U5xx/U575Z(G-I)TxQ_U585ZITxQ/variant_generic.h
index 1e0702bf9a..7eed45938d 100644
--- a/variants/STM32U5xx/U575Z(G-I)TxQ_U585ZETxQ/variant_generic.h
+++ b/variants/STM32U5xx/U575Z(G-I)TxQ_U585ZITxQ/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32U5xx/U595ZJTxQ_U5A5ZJTxQ/PeripheralPins.c b/variants/STM32U5xx/U595ZJTxQ_U5A5ZJTxQ/PeripheralPins.c
new file mode 100644
index 0000000000..827e8c137a
--- /dev/null
+++ b/variants/STM32U5xx/U595ZJTxQ_U5A5ZJTxQ/PeripheralPins.c
@@ -0,0 +1,593 @@
+/*
+ *******************************************************************************
+ * Copyright (c) 2020, STMicroelectronics
+ * All rights reserved.
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ *******************************************************************************
+ */
+/*
+ * Automatically generated from STM32U595ZJTxQ.xml, STM32U5A5ZJTxQ.xml
+ * CubeMX DB release 6.0.50
+ */
+#if !defined(CUSTOM_PERIPHERAL_PINS)
+#include "Arduino.h"
+#include "PeripheralPins.h"
+
+/* =====
+ * Notes:
+ * - The pins mentioned Px_y_ALTz are alternative possibilities which use other
+ *   HW peripheral instances. You can use them the same way as any other "normal"
+ *   pin (i.e. analogWrite(PA7_ALT1, 128);).
+ *
+ * - Commented lines are alternative possibilities which are not used per default.
+ *   If you change them, you will have to know what you do
+ * =====
+ */
+
+//*** ADC ***
+
+#ifdef HAL_ADC_MODULE_ENABLED
+WEAK const PinMap PinMap_ADC[] = {
+  {PA_0,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC1_IN5
+  {PA_0_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC2_IN5
+  {PA_1,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC1_IN6
+  {PA_1_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC2_IN6
+  {PA_2,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC1_IN7
+  {PA_2_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC2_IN7
+  {PA_3,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC1_IN8
+  {PA_3_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC2_IN8
+  {PA_4,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC1_IN9
+  {PA_4_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC2_IN9
+  {PA_4_ALT2, ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC4_IN9
+  {PA_5,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC1_IN10
+  {PA_5_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC2_IN10
+  {PA_5_ALT2, ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC4_IN10
+  {PA_6,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC1_IN11
+  {PA_6_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC2_IN11
+  {PA_6_ALT2, ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC4_IN11
+  {PA_7,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 12, 0)}, // ADC1_IN12
+  {PA_7_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 12, 0)}, // ADC2_IN12
+  {PA_7_ALT2, ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 20, 0)}, // ADC4_IN20
+  {PB_0,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC1_IN15
+  {PB_0_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC2_IN15
+  {PB_0_ALT2, ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 18, 0)}, // ADC4_IN18
+  {PB_1,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 16, 0)}, // ADC1_IN16
+  {PB_1_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 16, 0)}, // ADC2_IN16
+  {PB_1_ALT2, ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 19, 0)}, // ADC4_IN19
+  {PB_2,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 17, 0)}, // ADC1_IN17
+  {PB_2_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 17, 0)}, // ADC2_IN17
+  {PC_0,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC1_IN1
+  {PC_0_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC2_IN1
+  {PC_0_ALT2, ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC4_IN1
+  {PC_1,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC1_IN2
+  {PC_1_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC2_IN2
+  {PC_1_ALT2, ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC4_IN2
+  {PC_2,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC1_IN3
+  {PC_2_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC2_IN3
+  {PC_2_ALT2, ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC4_IN3
+  {PC_3,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC1_IN4
+  {PC_3_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC2_IN4
+  {PC_3_ALT2, ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC4_IN4
+  {PD_11,     ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC4_IN15
+  {PD_12,     ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 16, 0)}, // ADC4_IN16
+  {PD_13,     ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 17, 0)}, // ADC4_IN17
+  {PF_14,     ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC4_IN5
+  {PF_15,     ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC4_IN6
+  {PG_0,      ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC4_IN7
+  {PG_1,      ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC4_IN8
+  {NC,        NP,   0}
+};
+#endif
+
+//*** DAC ***
+
+#ifdef HAL_DAC_MODULE_ENABLED
+WEAK const PinMap PinMap_DAC[] = {
+  {PA_4, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // DAC1_OUT1
+  {PA_5, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // DAC1_OUT2
+  {NC,   NP,   0}
+};
+#endif
+
+//*** I2C ***
+
+#ifdef HAL_I2C_MODULE_ENABLED
+WEAK const PinMap PinMap_I2C_SDA[] = {
+  {PB_3,       I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  {PB_4,       I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
+  {PB_7,       I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  {PB_7_ALT1,  I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF5_I2C4)},
+  {PB_9,       I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  {PB_11,      I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
+  {PB_11_ALT1, I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF3_I2C4)},
+  {PB_14,      I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
+  {PC_1,       I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
+  {PD_0,       I2C5, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C5)},
+  {PD_0_ALT1,  I2C6, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF2_I2C6)},
+  {PD_13,      I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C4)},
+  {PF_0,       I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
+  {PF_0_ALT1,  I2C6, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF2_I2C6)},
+  {PF_15,      I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C4)},
+  {PG_8,       I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
+  {PG_13,      I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  {NC,         NP,   0}
+};
+#endif
+
+#ifdef HAL_I2C_MODULE_ENABLED
+WEAK const PinMap PinMap_I2C_SCL[] = {
+  {PA_7,       I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
+  {PB_6,       I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  {PB_6_ALT1,  I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF5_I2C4)},
+  {PB_8,       I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  {PB_10,      I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
+  {PB_10_ALT1, I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF3_I2C4)},
+  {PB_13,      I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
+  {PC_0,       I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
+  {PD_1,       I2C5, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C5)},
+  {PD_1_ALT1,  I2C6, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF2_I2C6)},
+  {PD_12,      I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C4)},
+  {PF_1,       I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
+  {PF_1_ALT1,  I2C6, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF2_I2C6)},
+  {PF_14,      I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C4)},
+  {PG_7,       I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
+  {PG_14,      I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  {NC,         NP,   0}
+};
+#endif
+
+//*** TIM ***
+
+#ifdef HAL_TIM_MODULE_ENABLED
+WEAK const PinMap PinMap_TIM[] = {
+  {PA_0,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
+  {PA_0_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)}, // TIM5_CH1
+  {PA_1,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
+  {PA_1_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 2, 0)}, // TIM5_CH2
+  {PA_1_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM15, 1, 1)}, // TIM15_CH1N
+  {PA_2,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
+  {PA_2_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 3, 0)}, // TIM5_CH3
+  {PA_2_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM15, 1, 0)}, // TIM15_CH1
+  {PA_3,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4
+  {PA_3_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 4, 0)}, // TIM5_CH4
+  {PA_3_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM15, 2, 0)}, // TIM15_CH2
+  {PA_5,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
+  {PA_5_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 1)}, // TIM8_CH1N
+  {PA_6,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
+  {PA_6_ALT1,  TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM16, 1, 0)}, // TIM16_CH1
+  {PA_7,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
+  {PA_7_ALT1,  TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
+  {PA_7_ALT2,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 1)}, // TIM8_CH1N
+  {PA_7_ALT3,  TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM17, 1, 0)}, // TIM17_CH1
+  {PA_8,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)}, // TIM1_CH1
+  {PA_9,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 0)}, // TIM1_CH2
+  {PA_10,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 0)}, // TIM1_CH3
+  {PA_11,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 4, 0)}, // TIM1_CH4
+  {PA_15,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
+  {PB_0,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
+  {PB_0_ALT1,  TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)}, // TIM3_CH3
+  {PB_0_ALT2,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 1)}, // TIM8_CH2N
+  {PB_1,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
+  {PB_1_ALT1,  TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
+  {PB_1_ALT2,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 1)}, // TIM8_CH3N
+  {PB_2,       TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 4, 1)}, // TIM8_CH4N
+  {PB_3,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
+  {PB_4,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
+  {PB_5,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
+  {PB_6,       TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 1, 0)}, // TIM4_CH1
+  {PB_6_ALT1,  TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM16, 1, 1)}, // TIM16_CH1N
+  {PB_7,       TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 2, 0)}, // TIM4_CH2
+  {PB_7_ALT1,  TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM17, 1, 1)}, // TIM17_CH1N
+  {PB_8,       TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 3, 0)}, // TIM4_CH3
+  {PB_8_ALT1,  TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM16, 1, 0)}, // TIM16_CH1
+  {PB_9,       TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)}, // TIM4_CH4
+  {PB_9_ALT1,  TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM17, 1, 0)}, // TIM17_CH1
+  {PB_10,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
+  {PB_11,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4
+  {PB_13,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
+  {PB_13_ALT1, TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM15, 1, 1)}, // TIM15_CH1N
+  {PB_14,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
+  {PB_14_ALT1, TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 1)}, // TIM8_CH2N
+  {PB_14_ALT2, TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM15, 1, 0)}, // TIM15_CH1
+  {PB_15,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
+  {PB_15_ALT1, TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 1)}, // TIM8_CH3N
+  {PB_15_ALT2, TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM15, 2, 0)}, // TIM15_CH2
+  {PC_6,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
+  {PC_6_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 0)}, // TIM8_CH1
+  {PC_7,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
+  {PC_7_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 0)}, // TIM8_CH2
+  {PC_8,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)}, // TIM3_CH3
+  {PC_8_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 0)}, // TIM8_CH3
+  {PC_9,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
+  {PC_9_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 4, 0)}, // TIM8_CH4
+  {PD_0,       TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 4, 1)}, // TIM8_CH4N
+  {PD_12,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 1, 0)}, // TIM4_CH1
+  {PD_13,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 2, 0)}, // TIM4_CH2
+  {PD_14,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 3, 0)}, // TIM4_CH3
+  {PD_15,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)}, // TIM4_CH4
+  {PE_0,       TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM16, 1, 0)}, // TIM16_CH1
+  {PE_1,       TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM17, 1, 0)}, // TIM17_CH1
+  {PE_3,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
+  {PE_4,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
+  {PE_5,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)}, // TIM3_CH3
+  {PE_6,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
+  {PE_8,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
+  {PE_9,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)}, // TIM1_CH1
+  {PE_10,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
+  {PE_11,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 0)}, // TIM1_CH2
+  {PE_12,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
+  {PE_13,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 0)}, // TIM1_CH3
+  {PE_14,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 4, 0)}, // TIM1_CH4
+  {PE_15,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM1, 4, 1)}, // TIM1_CH4N
+  {PF_6,       TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)}, // TIM5_CH1
+  {PF_7,       TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 2, 0)}, // TIM5_CH2
+  {PF_8,       TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 3, 0)}, // TIM5_CH3
+  {PF_9,       TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 4, 0)}, // TIM5_CH4
+  {PF_9_ALT1,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM15, 1, 0)}, // TIM15_CH1
+  {PF_10,      TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM15, 2, 0)}, // TIM15_CH2
+  {PG_9,       TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM15, 1, 1)}, // TIM15_CH1N
+  {PG_10,      TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM15, 1, 0)}, // TIM15_CH1
+  {NC,         NP,    0}
+};
+#endif
+
+//*** UART ***
+
+#ifdef HAL_UART_MODULE_ENABLED
+WEAK const PinMap PinMap_UART_TX[] = {
+  {PA_0,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
+  {PA_2,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
+  {PA_2_ALT1,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PA_7,       USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PA_9,       USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {PB_6,       USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {PB_10,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PB_11,      LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
+  {PC_1,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
+  {PC_3,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {PC_9,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {PC_10,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
+  {PC_10_ALT1, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PC_12,      UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
+  {PD_5,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PD_8,       USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PE_1,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {PF_0,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {PF_3,       UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
+  {PG_7,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
+  {PG_9,       USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {NC,         NP,      0}
+};
+#endif
+
+#ifdef HAL_UART_MODULE_ENABLED
+WEAK const PinMap PinMap_UART_RX[] = {
+  {PA_1,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
+  {PA_3,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
+  {PA_3_ALT1,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PA_5,       USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PA_10,      USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {PA_15,      USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_USART2)},
+  {PB_7,       USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {PB_10,      LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
+  {PB_11,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PC_0,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
+  {PC_2,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {PC_8,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {PC_11,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
+  {PC_11_ALT1, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PD_2,       UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
+  {PD_6,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PD_9,       USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PE_0,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {PF_1,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {PF_4,       UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
+  {PG_8,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
+  {PG_10,      USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {NC,         NP,      0}
+};
+#endif
+
+#ifdef HAL_UART_MODULE_ENABLED
+WEAK const PinMap PinMap_UART_RTS[] = {
+  {PA_1,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PA_12,      USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {PA_15,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
+  {PA_15_ALT1, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PB_1,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
+  {PB_1_ALT1,  USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PB_3,       USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {PB_4,       UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
+  {PB_14,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PD_2,       USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PD_4,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PD_12,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PD_15,      USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {PE_4,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {PF_4,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {PG_6,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
+  {PG_12,      USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {NC,         NP,      0}
+};
+#endif
+
+#ifdef HAL_UART_MODULE_ENABLED
+WEAK const PinMap PinMap_UART_CTS[] = {
+  {PA_0,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PA_6,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
+  {PA_6_ALT1,  USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PA_11,      USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {PB_4,       USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {PB_5,       UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
+  {PB_7,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
+  {PB_13,      LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
+  {PB_13_ALT1, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PC_0,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {PD_3,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PD_11,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PD_13,      USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {PE_3,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {PF_3,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {PG_5,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
+  {NC,         NP,      0}
+};
+#endif
+
+//*** SPI ***
+
+#ifdef HAL_SPI_MODULE_ENABLED
+WEAK const PinMap PinMap_SPI_MOSI[] = {
+  {PA_7,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PA_12,     SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PB_5,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PB_5_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PB_15,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PC_1,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_SPI2)},
+  {PC_3,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PC_12,     SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PD_4,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PD_6,      SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI3)},
+  {PE_15,     SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PG_4,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {NC,        NP,   0}
+};
+#endif
+
+#ifdef HAL_SPI_MODULE_ENABLED
+WEAK const PinMap PinMap_SPI_MISO[] = {
+  {PA_6,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PA_11,     SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PB_4,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PB_4_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PB_14,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PC_2,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PC_11,     SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PD_3,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PE_14,     SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PG_3,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PG_10,     SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {NC,        NP,   0}
+};
+#endif
+
+#ifdef HAL_SPI_MODULE_ENABLED
+WEAK const PinMap PinMap_SPI_SCLK[] = {
+  {PA_1,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PA_5,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PA_9,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_SPI2)},
+  {PB_3,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PB_3_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PB_10,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PB_13,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PC_10,     SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PD_1,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PD_3,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_SPI2)},
+  {PE_13,     SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PG_2,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PG_9,      SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {NC,        NP,   0}
+};
+#endif
+
+#ifdef HAL_SPI_MODULE_ENABLED
+WEAK const PinMap PinMap_SPI_SSEL[] = {
+  {PA_4,       SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PA_4_ALT1,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PA_15,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PA_15_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PB_0,       SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PB_9,       SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PD_0,       SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PE_12,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PG_5,       SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PG_12,      SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {NC,         NP,   0}
+};
+#endif
+
+//*** FDCAN ***
+
+#ifdef HAL_FDCAN_MODULE_ENABLED
+WEAK const PinMap PinMap_CAN_RD[] = {
+  {PA_11, FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
+  {PB_8,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
+  {PD_0,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
+  {PF_7,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
+  {NC,    NP,     0}
+};
+#endif
+
+#ifdef HAL_FDCAN_MODULE_ENABLED
+WEAK const PinMap PinMap_CAN_TD[] = {
+  {PA_12, FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
+  {PB_9,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
+  {PD_1,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
+  {PF_8,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
+  {NC,    NP,     0}
+};
+#endif
+
+//*** No ETHERNET ***
+
+//*** OCTOSPI ***
+
+#ifdef HAL_OSPI_MODULE_ENABLED
+WEAK const PinMap PinMap_OCTOSPI_DATA0[] = {
+  {PB_1,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO0
+  {PE_12, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO0
+  {PF_0,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P2_IO0
+  {PF_8,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO0
+  {NC,    NP,       0}
+};
+#endif
+
+#ifdef HAL_OSPI_MODULE_ENABLED
+WEAK const PinMap PinMap_OCTOSPI_DATA1[] = {
+  {PB_0,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO1
+  {PE_13, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO1
+  {PF_1,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P2_IO1
+  {PF_9,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO1
+  {NC,    NP,       0}
+};
+#endif
+
+#ifdef HAL_OSPI_MODULE_ENABLED
+WEAK const PinMap PinMap_OCTOSPI_DATA2[] = {
+  {PA_7,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO2
+  {PE_14, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO2
+  {PF_2,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P2_IO2
+  {PF_7,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO2
+  {NC,    NP,       0}
+};
+#endif
+
+#ifdef HAL_OSPI_MODULE_ENABLED
+WEAK const PinMap PinMap_OCTOSPI_DATA3[] = {
+  {PA_6,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO3
+  {PE_15, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO3
+  {PF_3,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P2_IO3
+  {PF_6,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO3
+  {NC,    NP,       0}
+};
+#endif
+
+#ifdef HAL_OSPI_MODULE_ENABLED
+WEAK const PinMap PinMap_OCTOSPI_DATA4[] = {
+  {PC_1, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO4
+  {PD_4, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO4
+  {PG_0, OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P2_IO4
+  {NC,   NP,       0}
+};
+#endif
+
+#ifdef HAL_OSPI_MODULE_ENABLED
+WEAK const PinMap PinMap_OCTOSPI_DATA5[] = {
+  {PC_2, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO5
+  {PD_5, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO5
+  {PG_1, OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P2_IO5
+  {NC,   NP,       0}
+};
+#endif
+
+#ifdef HAL_OSPI_MODULE_ENABLED
+WEAK const PinMap PinMap_OCTOSPI_DATA6[] = {
+  {PC_3, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO6
+  {PD_6, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO6
+  {PG_9, OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P2_IO6
+  {NC,   NP,       0}
+};
+#endif
+
+#ifdef HAL_OSPI_MODULE_ENABLED
+WEAK const PinMap PinMap_OCTOSPI_DATA7[] = {
+  {PC_0,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_OCTOSPI1)}, // OCTOSPIM_P1_IO7
+  {PD_7,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO7
+  {PG_10, OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P2_IO7
+  {NC,    NP,       0}
+};
+#endif
+
+#ifdef HAL_OSPI_MODULE_ENABLED
+WEAK const PinMap PinMap_OCTOSPI_SCLK[] = {
+  {PA_3,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_CLK
+  {PB_10, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_CLK
+  {PE_10, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_CLK
+  {PF_4,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P2_CLK
+  {PF_10, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_OCTOSPI1)}, // OCTOSPIM_P1_CLK
+  {NC,    NP,       0}
+};
+#endif
+
+#ifdef HAL_OSPI_MODULE_ENABLED
+WEAK const PinMap PinMap_OCTOSPI_SSEL[] = {
+  {PA_0,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P2_NCS
+  {PA_2,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_NCS
+  {PA_4,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_OCTOSPI1)}, // OCTOSPIM_P1_NCS
+  {PA_12, OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_OCTOSPI1)}, // OCTOSPIM_P2_NCS
+  {PB_11, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_NCS
+  {PC_11, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P1_NCS
+  {PD_3,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P2_NCS
+  {PE_11, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_NCS
+  {PF_6,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P2_NCS
+  {PG_12, OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P2_NCS
+  {NC,    NP,       0}
+};
+#endif
+
+//*** USB ***
+
+#if defined(HAL_PCD_MODULE_ENABLED) || defined(HAL_HCD_MODULE_ENABLED)
+WEAK const PinMap PinMap_USB_OTG_HS[] = {
+#ifdef USE_USB_HS_IN_FS
+  {PA_8,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_USB_HS)}, // USB_OTG_HS_SOF
+  {PA_9,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
+  {PA_10, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_USB_HS)}, // USB_OTG_HS_ID
+  {PA_11, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)}, // USB_OTG_HS_DM
+  {PA_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)}, // USB_OTG_HS_DP
+  {PA_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_USB_HS)}, // USB_OTG_HS_SOF
+#endif /* USE_USB_HS_IN_FS */
+  {NC,    NP,         0}
+};
+#endif
+
+//*** SD ***
+
+#ifdef HAL_SD_MODULE_ENABLED
+WEAK const PinMap PinMap_SD[] = {
+  {PA_0,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDMMC2)}, // SDMMC2_CMD
+  {PB_3,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC2)}, // SDMMC2_D2
+  {PB_4,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC2)}, // SDMMC2_D3
+  {PB_8,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF8_SDMMC1)}, // SDMMC1_CKIN
+  {PB_8_ALT1, SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D4
+  {PB_8_ALT2, SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_SDMMC2)}, // SDMMC2_D4
+  {PB_9,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF8_SDMMC1)}, // SDMMC1_CDIR
+  {PB_9_ALT1, SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D5
+  {PB_9_ALT2, SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_SDMMC2)}, // SDMMC2_D5
+  {PB_14,     SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC2)}, // SDMMC2_D0
+  {PB_15,     SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC2)}, // SDMMC2_D1
+  {PC_0,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D5
+  {PC_1,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDMMC2)}, // SDMMC2_CK
+  {PC_6,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF8_SDMMC1)}, // SDMMC1_D0DIR
+  {PC_6_ALT1, SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D6
+  {PC_6_ALT2, SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_SDMMC2)}, // SDMMC2_D6
+  {PC_7,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF8_SDMMC1)}, // SDMMC1_D123DIR
+  {PC_7_ALT1, SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D7
+  {PC_7_ALT2, SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_SDMMC2)}, // SDMMC2_D7
+  {PC_8,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D0
+  {PC_9,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D1
+  {PC_10,     SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D2
+  {PC_11,     SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D3
+  {PC_12,     SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDMMC1)}, // SDMMC1_CK
+  {PD_2,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDMMC1)}, // SDMMC1_CMD
+  {PD_6,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF11_SDMMC2)}, // SDMMC2_CK
+  {PD_7,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF11_SDMMC2)}, // SDMMC2_CMD
+  {NC,        NP,     0}
+};
+#endif
+
+#endif /* !CUSTOM_PERIPHERAL_PINS */
diff --git a/variants/STM32H7xx/H730ZBT/PinNamesVar.h b/variants/STM32U5xx/U595ZJTxQ_U5A5ZJTxQ/PinNamesVar.h
similarity index 51%
rename from variants/STM32H7xx/H730ZBT/PinNamesVar.h
rename to variants/STM32U5xx/U595ZJTxQ_U5A5ZJTxQ/PinNamesVar.h
index 2d55689892..dd1b3db60c 100644
--- a/variants/STM32H7xx/H730ZBT/PinNamesVar.h
+++ b/variants/STM32U5xx/U595ZJTxQ_U5A5ZJTxQ/PinNamesVar.h
@@ -1,7 +1,3 @@
-/* Dual pad pin name */
-PC_2_C     = PC_2  | PDUAL,
-PC_3_C     = PC_3  | PDUAL,
-
 /* Alternate pin name */
 PA_0_ALT1  = PA_0  | ALT1,
 PA_1_ALT1  = PA_1  | ALT1,
@@ -13,34 +9,30 @@ PA_3_ALT2  = PA_3  | ALT2,
 PA_4_ALT1  = PA_4  | ALT1,
 PA_4_ALT2  = PA_4  | ALT2,
 PA_5_ALT1  = PA_5  | ALT1,
+PA_5_ALT2  = PA_5  | ALT2,
 PA_6_ALT1  = PA_6  | ALT1,
+PA_6_ALT2  = PA_6  | ALT2,
 PA_7_ALT1  = PA_7  | ALT1,
 PA_7_ALT2  = PA_7  | ALT2,
 PA_7_ALT3  = PA_7  | ALT3,
-PA_8_ALT1  = PA_8  | ALT1,
-PA_9_ALT1  = PA_9  | ALT1,
-PA_10_ALT1 = PA_10 | ALT1,
-PA_11_ALT1 = PA_11 | ALT1,
-PA_12_ALT1 = PA_12 | ALT1,
 PA_15_ALT1 = PA_15 | ALT1,
-PA_15_ALT2 = PA_15 | ALT2,
 PB_0_ALT1  = PB_0  | ALT1,
 PB_0_ALT2  = PB_0  | ALT2,
 PB_1_ALT1  = PB_1  | ALT1,
 PB_1_ALT2  = PB_1  | ALT2,
+PB_2_ALT1  = PB_2  | ALT1,
 PB_3_ALT1  = PB_3  | ALT1,
-PB_3_ALT2  = PB_3  | ALT2,
 PB_4_ALT1  = PB_4  | ALT1,
-PB_4_ALT2  = PB_4  | ALT2,
 PB_5_ALT1  = PB_5  | ALT1,
-PB_5_ALT2  = PB_5  | ALT2,
 PB_6_ALT1  = PB_6  | ALT1,
-PB_6_ALT2  = PB_6  | ALT2,
 PB_7_ALT1  = PB_7  | ALT1,
 PB_8_ALT1  = PB_8  | ALT1,
 PB_8_ALT2  = PB_8  | ALT2,
 PB_9_ALT1  = PB_9  | ALT1,
 PB_9_ALT2  = PB_9  | ALT2,
+PB_10_ALT1 = PB_10 | ALT1,
+PB_11_ALT1 = PB_11 | ALT1,
+PB_13_ALT1 = PB_13 | ALT1,
 PB_14_ALT1 = PB_14 | ALT1,
 PB_14_ALT2 = PB_14 | ALT2,
 PB_15_ALT1 = PB_15 | ALT1,
@@ -49,8 +41,10 @@ PC_0_ALT1  = PC_0  | ALT1,
 PC_0_ALT2  = PC_0  | ALT2,
 PC_1_ALT1  = PC_1  | ALT1,
 PC_1_ALT2  = PC_1  | ALT2,
-PC_4_ALT1  = PC_4  | ALT1,
-PC_5_ALT1  = PC_5  | ALT1,
+PC_2_ALT1  = PC_2  | ALT1,
+PC_2_ALT2  = PC_2  | ALT2,
+PC_3_ALT1  = PC_3  | ALT1,
+PC_3_ALT2  = PC_3  | ALT2,
 PC_6_ALT1  = PC_6  | ALT1,
 PC_6_ALT2  = PC_6  | ALT2,
 PC_7_ALT1  = PC_7  | ALT1,
@@ -59,57 +53,93 @@ PC_8_ALT1  = PC_8  | ALT1,
 PC_9_ALT1  = PC_9  | ALT1,
 PC_10_ALT1 = PC_10 | ALT1,
 PC_11_ALT1 = PC_11 | ALT1,
+PD_0_ALT1  = PD_0  | ALT1,
+PD_1_ALT1  = PD_1  | ALT1,
 PF_0_ALT1  = PF_0  | ALT1,
 PF_1_ALT1  = PF_1  | ALT1,
-PF_6_ALT1  = PF_6  | ALT1,
-PF_7_ALT1  = PF_7  | ALT1,
-PF_8_ALT1  = PF_8  | ALT1,
-PF_8_ALT2  = PF_8  | ALT2,
 PF_9_ALT1  = PF_9  | ALT1,
-PF_9_ALT2  = PF_9  | ALT2,
-PG_13_ALT1 = PG_13 | ALT1,
 
 /* SYS_WKUP */
 #ifdef PWR_WAKEUP_PIN1
-  SYS_WKUP1 = PA_0,
+  SYS_WKUP1 = PE_4,
+#endif
+#ifdef PWR_WAKEUP_PIN1
+  SYS_WKUP1_1 = PA_0,
+#endif
+#ifdef PWR_WAKEUP_PIN1
+  SYS_WKUP1_2 = PB_2,
+#endif
+#ifdef PWR_WAKEUP_PIN2
+  SYS_WKUP2 = PE_5,
+#endif
+#ifdef PWR_WAKEUP_PIN2
+  SYS_WKUP2_1 = PC_13,
 #endif
 #ifdef PWR_WAKEUP_PIN2
-  SYS_WKUP2 = PA_2,
+  SYS_WKUP2_2 = PA_4,
+#endif
+#ifdef PWR_WAKEUP_PIN3
+  SYS_WKUP3 = PE_6,
+#endif
+#ifdef PWR_WAKEUP_PIN3
+  SYS_WKUP3_1 = PA_1,
 #endif
 #ifdef PWR_WAKEUP_PIN3
-  SYS_WKUP3 = NC,
+  SYS_WKUP3_2 = PB_6,
+#endif
+#ifdef PWR_WAKEUP_PIN4
+  SYS_WKUP4 = PA_2,
 #endif
 #ifdef PWR_WAKEUP_PIN4
-  SYS_WKUP4 = PC_13,
+  SYS_WKUP4_1 = PB_1,
+#endif
+#ifdef PWR_WAKEUP_PIN4
+  SYS_WKUP4_2 = PB_7,
+#endif
+#ifdef PWR_WAKEUP_PIN5
+  SYS_WKUP5 = PA_3,
 #endif
 #ifdef PWR_WAKEUP_PIN5
-  SYS_WKUP5 = NC,
+  SYS_WKUP5_1 = PB_8,
+#endif
+#ifdef PWR_WAKEUP_PIN6
+  SYS_WKUP6 = PA_5,
+#endif
+#ifdef PWR_WAKEUP_PIN6
+  SYS_WKUP6_1 = PE_7,
 #endif
 #ifdef PWR_WAKEUP_PIN6
-  SYS_WKUP6 = PC_1,
+  SYS_WKUP6_2 = PB_5,
 #endif
 #ifdef PWR_WAKEUP_PIN7
-  SYS_WKUP7 = NC,
+  SYS_WKUP7 = PA_6,
+#endif
+#ifdef PWR_WAKEUP_PIN7
+  SYS_WKUP7_1 = PE_8,
+#endif
+#ifdef PWR_WAKEUP_PIN7
+  SYS_WKUP7_2 = PB_15,
+#endif
+#ifdef PWR_WAKEUP_PIN8
+  SYS_WKUP8 = PF_2,
+#endif
+#ifdef PWR_WAKEUP_PIN8
+  SYS_WKUP8_1 = PA_7,
 #endif
 #ifdef PWR_WAKEUP_PIN8
-  SYS_WKUP8 = NC,
+  SYS_WKUP8_2 = PB_10,
 #endif
 
 /* USB */
 #ifdef USBCON
-  USB_OTG_HS_DM       = PA_11,
-  USB_OTG_HS_DP       = PA_12,
-  USB_OTG_HS_ID       = PA_10,
-  USB_OTG_HS_SOF      = PA_8,
-  USB_OTG_HS_ULPI_CK  = PA_5,
-  USB_OTG_HS_ULPI_D0  = PA_3,
-  USB_OTG_HS_ULPI_D1  = PB_0,
-  USB_OTG_HS_ULPI_D2  = PB_1,
-  USB_OTG_HS_ULPI_D3  = PB_10,
-  USB_OTG_HS_ULPI_D4  = PB_11,
-  USB_OTG_HS_ULPI_D5  = PB_12,
-  USB_OTG_HS_ULPI_D6  = PB_13,
-  USB_OTG_HS_ULPI_D7  = PB_5,
-  USB_OTG_HS_ULPI_STP = PC_0,
-  USB_OTG_HS_VBUS     = PA_9,
+  USB_OTG_HS_DM   = PA_11,
+  USB_OTG_HS_DP   = PA_12,
+  USB_OTG_HS_ID   = PA_10,
+  #ifdef USB_OTG_HS_SOF_PA_8
+    USB_OTG_HS_SOF  = PA_8,
+  #endif
+  #ifdef USB_OTG_HS_SOF_PA_14
+    USB_OTG_HS_SOF  = PA_14,
+  #endif
+  USB_OTG_HS_VBUS = PA_9,
 #endif
diff --git a/variants/STM32U5xx/U595ZJTxQ_U5A5ZJTxQ/boards_entry.txt b/variants/STM32U5xx/U595ZJTxQ_U5A5ZJTxQ/boards_entry.txt
new file mode 100644
index 0000000000..420e73b413
--- /dev/null
+++ b/variants/STM32U5xx/U595ZJTxQ_U5A5ZJTxQ/boards_entry.txt
@@ -0,0 +1,21 @@
+# This file help to add generic board entry.
+# upload.maximum_size and product_line have to be verified
+# and changed if needed.
+# See: https://github.com/stm32duino/wiki/wiki/Add-a-new-variant-%28board%29
+
+# Generic U595ZJTxQ
+GenU5.menu.pnum.GENERIC_U595ZJTXQ=Generic U595ZJTxQ
+GenU5.menu.pnum.GENERIC_U595ZJTXQ.upload.maximum_size=73728
+GenU5.menu.pnum.GENERIC_U595ZJTXQ.upload.maximum_data_size=262144
+GenU5.menu.pnum.GENERIC_U595ZJTXQ.build.board=GENERIC_U595ZJTXQ
+GenU5.menu.pnum.GENERIC_U595ZJTXQ.build.product_line=
+GenU5.menu.pnum.GENERIC_U595ZJTXQ.build.variant=STM32U5xx/U595ZJTxQ_U5A5ZJTxQ
+
+# Generic U5A5ZJTxQ
+GenU5.menu.pnum.GENERIC_U5A5ZJTXQ=Generic U5A5ZJTxQ
+GenU5.menu.pnum.GENERIC_U5A5ZJTXQ.upload.maximum_size=73728
+GenU5.menu.pnum.GENERIC_U5A5ZJTXQ.upload.maximum_data_size=262144
+GenU5.menu.pnum.GENERIC_U5A5ZJTXQ.build.board=GENERIC_U5A5ZJTXQ
+GenU5.menu.pnum.GENERIC_U5A5ZJTXQ.build.product_line=
+GenU5.menu.pnum.GENERIC_U5A5ZJTXQ.build.variant=STM32U5xx/U595ZJTxQ_U5A5ZJTxQ
+
diff --git a/variants/STM32H7xx/H730IBTxQ/generic_clock.c b/variants/STM32U5xx/U595ZJTxQ_U5A5ZJTxQ/generic_clock.c
similarity index 86%
rename from variants/STM32H7xx/H730IBTxQ/generic_clock.c
rename to variants/STM32U5xx/U595ZJTxQ_U5A5ZJTxQ/generic_clock.c
index 4d1cfdedb2..6a7f9bf43f 100644
--- a/variants/STM32H7xx/H730IBTxQ/generic_clock.c
+++ b/variants/STM32U5xx/U595ZJTxQ_U5A5ZJTxQ/generic_clock.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -10,7 +10,7 @@
  *
  *******************************************************************************
  */
-#if defined(ARDUINO_GENERIC_H730IBTXQ)
+#if defined(ARDUINO_GENERIC_U595ZJTXQ) || defined(ARDUINO_GENERIC_U5A5ZJTXQ)
 #include "pins_arduino.h"
 
 /**
diff --git a/variants/STM32U5xx/U595ZJTxQ_U5A5ZJTxQ/variant_generic.cpp b/variants/STM32U5xx/U595ZJTxQ_U5A5ZJTxQ/variant_generic.cpp
new file mode 100644
index 0000000000..f2e972841d
--- /dev/null
+++ b/variants/STM32U5xx/U595ZJTxQ_U5A5ZJTxQ/variant_generic.cpp
@@ -0,0 +1,157 @@
+/*
+ *******************************************************************************
+ * Copyright (c) 2020, STMicroelectronics
+ * All rights reserved.
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ *******************************************************************************
+ */
+#if defined(ARDUINO_GENERIC_U595ZJTXQ) || defined(ARDUINO_GENERIC_U5A5ZJTXQ)
+#include "pins_arduino.h"
+
+// Digital PinName array
+const PinName digitalPin[] = {
+  PA_0,   // D0/A0
+  PA_1,   // D1/A1
+  PA_2,   // D2/A2
+  PA_3,   // D3/A3
+  PA_4,   // D4/A4
+  PA_5,   // D5/A5
+  PA_6,   // D6/A6
+  PA_7,   // D7/A7
+  PA_8,   // D8
+  PA_9,   // D9
+  PA_10,  // D10
+  PA_11,  // D11
+  PA_12,  // D12
+  PA_13,  // D13
+  PA_14,  // D14
+  PA_15,  // D15
+  PB_0,   // D16/A8
+  PB_1,   // D17/A9
+  PB_2,   // D18/A10
+  PB_3,   // D19
+  PB_4,   // D20
+  PB_5,   // D21
+  PB_6,   // D22
+  PB_7,   // D23
+  PB_8,   // D24
+  PB_9,   // D25
+  PB_10,  // D26
+  PB_11,  // D27
+  PB_13,  // D28
+  PB_14,  // D29
+  PB_15,  // D30
+  PC_0,   // D31/A11
+  PC_1,   // D32/A12
+  PC_2,   // D33/A13
+  PC_3,   // D34/A14
+  PC_6,   // D35
+  PC_7,   // D36
+  PC_8,   // D37
+  PC_9,   // D38
+  PC_10,  // D39
+  PC_11,  // D40
+  PC_12,  // D41
+  PC_13,  // D42
+  PC_14,  // D43
+  PC_15,  // D44
+  PD_0,   // D45
+  PD_1,   // D46
+  PD_2,   // D47
+  PD_3,   // D48
+  PD_4,   // D49
+  PD_5,   // D50
+  PD_6,   // D51
+  PD_7,   // D52
+  PD_8,   // D53
+  PD_9,   // D54
+  PD_10,  // D55
+  PD_11,  // D56/A15
+  PD_12,  // D57/A16
+  PD_13,  // D58/A17
+  PD_14,  // D59
+  PD_15,  // D60
+  PE_0,   // D61
+  PE_1,   // D62
+  PE_2,   // D63
+  PE_3,   // D64
+  PE_4,   // D65
+  PE_5,   // D66
+  PE_6,   // D67
+  PE_7,   // D68
+  PE_8,   // D69
+  PE_9,   // D70
+  PE_10,  // D71
+  PE_11,  // D72
+  PE_12,  // D73
+  PE_13,  // D74
+  PE_14,  // D75
+  PE_15,  // D76
+  PF_0,   // D77
+  PF_1,   // D78
+  PF_2,   // D79
+  PF_3,   // D80
+  PF_4,   // D81
+  PF_5,   // D82
+  PF_6,   // D83
+  PF_7,   // D84
+  PF_8,   // D85
+  PF_9,   // D86
+  PF_10,  // D87
+  PF_11,  // D88
+  PF_12,  // D89
+  PF_13,  // D90
+  PF_14,  // D91/A18
+  PF_15,  // D92/A19
+  PG_0,   // D93/A20
+  PG_1,   // D94/A21
+  PG_2,   // D95
+  PG_3,   // D96
+  PG_4,   // D97
+  PG_5,   // D98
+  PG_6,   // D99
+  PG_7,   // D100
+  PG_8,   // D101
+  PG_9,   // D102
+  PG_10,  // D103
+  PG_12,  // D104
+  PG_13,  // D105
+  PG_14,  // D106
+  PG_15,  // D107
+  PH_0,   // D108
+  PH_1,   // D109
+  PH_3    // D110
+};
+
+// Analog (Ax) pin number array
+const uint32_t analogInputPin[] = {
+  0,  // A0,  PA0
+  1,  // A1,  PA1
+  2,  // A2,  PA2
+  3,  // A3,  PA3
+  4,  // A4,  PA4
+  5,  // A5,  PA5
+  6,  // A6,  PA6
+  7,  // A7,  PA7
+  16, // A8,  PB0
+  17, // A9,  PB1
+  18, // A10, PB2
+  31, // A11, PC0
+  32, // A12, PC1
+  33, // A13, PC2
+  34, // A14, PC3
+  56, // A15, PD11
+  57, // A16, PD12
+  58, // A17, PD13
+  91, // A18, PF14
+  92, // A19, PF15
+  93, // A20, PG0
+  94  // A21, PG1
+};
+
+#endif /* ARDUINO_GENERIC_* */
diff --git a/variants/STM32U5xx/U595ZJTxQ_U5A5ZJTxQ/variant_generic.h b/variants/STM32U5xx/U595ZJTxQ_U5A5ZJTxQ/variant_generic.h
new file mode 100644
index 0000000000..958ffbe253
--- /dev/null
+++ b/variants/STM32U5xx/U595ZJTxQ_U5A5ZJTxQ/variant_generic.h
@@ -0,0 +1,312 @@
+/*
+ *******************************************************************************
+ * Copyright (c) 2020, STMicroelectronics
+ * All rights reserved.
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ *******************************************************************************
+ */
+#pragma once
+
+/*----------------------------------------------------------------------------
+ *        STM32 pins number
+ *----------------------------------------------------------------------------*/
+#define PA0                     PIN_A0
+#define PA1                     PIN_A1
+#define PA2                     PIN_A2
+#define PA3                     PIN_A3
+#define PA4                     PIN_A4
+#define PA5                     PIN_A5
+#define PA6                     PIN_A6
+#define PA7                     PIN_A7
+#define PA8                     8
+#define PA9                     9
+#define PA10                    10
+#define PA11                    11
+#define PA12                    12
+#define PA13                    13
+#define PA14                    14
+#define PA15                    15
+#define PB0                     PIN_A8
+#define PB1                     PIN_A9
+#define PB2                     PIN_A10
+#define PB3                     19
+#define PB4                     20
+#define PB5                     21
+#define PB6                     22
+#define PB7                     23
+#define PB8                     24
+#define PB9                     25
+#define PB10                    26
+#define PB11                    27
+#define PB13                    28
+#define PB14                    29
+#define PB15                    30
+#define PC0                     PIN_A11
+#define PC1                     PIN_A12
+#define PC2                     PIN_A13
+#define PC3                     PIN_A14
+#define PC6                     35
+#define PC7                     36
+#define PC8                     37
+#define PC9                     38
+#define PC10                    39
+#define PC11                    40
+#define PC12                    41
+#define PC13                    42
+#define PC14                    43
+#define PC15                    44
+#define PD0                     45
+#define PD1                     46
+#define PD2                     47
+#define PD3                     48
+#define PD4                     49
+#define PD5                     50
+#define PD6                     51
+#define PD7                     52
+#define PD8                     53
+#define PD9                     54
+#define PD10                    55
+#define PD11                    PIN_A15
+#define PD12                    PIN_A16
+#define PD13                    PIN_A17
+#define PD14                    59
+#define PD15                    60
+#define PE0                     61
+#define PE1                     62
+#define PE2                     63
+#define PE3                     64
+#define PE4                     65
+#define PE5                     66
+#define PE6                     67
+#define PE7                     68
+#define PE8                     69
+#define PE9                     70
+#define PE10                    71
+#define PE11                    72
+#define PE12                    73
+#define PE13                    74
+#define PE14                    75
+#define PE15                    76
+#define PF0                     77
+#define PF1                     78
+#define PF2                     79
+#define PF3                     80
+#define PF4                     81
+#define PF5                     82
+#define PF6                     83
+#define PF7                     84
+#define PF8                     85
+#define PF9                     86
+#define PF10                    87
+#define PF11                    88
+#define PF12                    89
+#define PF13                    90
+#define PF14                    PIN_A18
+#define PF15                    PIN_A19
+#define PG0                     PIN_A20
+#define PG1                     PIN_A21
+#define PG2                     95
+#define PG3                     96
+#define PG4                     97
+#define PG5                     98
+#define PG6                     99
+#define PG7                     100
+#define PG8                     101
+#define PG9                     102
+#define PG10                    103
+#define PG12                    104
+#define PG13                    105
+#define PG14                    106
+#define PG15                    107
+#define PH0                     108
+#define PH1                     109
+#define PH3                     110
+
+// Alternate pins number
+#define PA0_ALT1                (PA0  | ALT1)
+#define PA1_ALT1                (PA1  | ALT1)
+#define PA1_ALT2                (PA1  | ALT2)
+#define PA2_ALT1                (PA2  | ALT1)
+#define PA2_ALT2                (PA2  | ALT2)
+#define PA3_ALT1                (PA3  | ALT1)
+#define PA3_ALT2                (PA3  | ALT2)
+#define PA4_ALT1                (PA4  | ALT1)
+#define PA4_ALT2                (PA4  | ALT2)
+#define PA5_ALT1                (PA5  | ALT1)
+#define PA5_ALT2                (PA5  | ALT2)
+#define PA6_ALT1                (PA6  | ALT1)
+#define PA6_ALT2                (PA6  | ALT2)
+#define PA7_ALT1                (PA7  | ALT1)
+#define PA7_ALT2                (PA7  | ALT2)
+#define PA7_ALT3                (PA7  | ALT3)
+#define PA15_ALT1               (PA15 | ALT1)
+#define PB0_ALT1                (PB0  | ALT1)
+#define PB0_ALT2                (PB0  | ALT2)
+#define PB1_ALT1                (PB1  | ALT1)
+#define PB1_ALT2                (PB1  | ALT2)
+#define PB2_ALT1                (PB2  | ALT1)
+#define PB3_ALT1                (PB3  | ALT1)
+#define PB4_ALT1                (PB4  | ALT1)
+#define PB5_ALT1                (PB5  | ALT1)
+#define PB6_ALT1                (PB6  | ALT1)
+#define PB7_ALT1                (PB7  | ALT1)
+#define PB8_ALT1                (PB8  | ALT1)
+#define PB8_ALT2                (PB8  | ALT2)
+#define PB9_ALT1                (PB9  | ALT1)
+#define PB9_ALT2                (PB9  | ALT2)
+#define PB10_ALT1               (PB10 | ALT1)
+#define PB11_ALT1               (PB11 | ALT1)
+#define PB13_ALT1               (PB13 | ALT1)
+#define PB14_ALT1               (PB14 | ALT1)
+#define PB14_ALT2               (PB14 | ALT2)
+#define PB15_ALT1               (PB15 | ALT1)
+#define PB15_ALT2               (PB15 | ALT2)
+#define PC0_ALT1                (PC0  | ALT1)
+#define PC0_ALT2                (PC0  | ALT2)
+#define PC1_ALT1                (PC1  | ALT1)
+#define PC1_ALT2                (PC1  | ALT2)
+#define PC2_ALT1                (PC2  | ALT1)
+#define PC2_ALT2                (PC2  | ALT2)
+#define PC3_ALT1                (PC3  | ALT1)
+#define PC3_ALT2                (PC3  | ALT2)
+#define PC6_ALT1                (PC6  | ALT1)
+#define PC6_ALT2                (PC6  | ALT2)
+#define PC7_ALT1                (PC7  | ALT1)
+#define PC7_ALT2                (PC7  | ALT2)
+#define PC8_ALT1                (PC8  | ALT1)
+#define PC9_ALT1                (PC9  | ALT1)
+#define PC10_ALT1               (PC10 | ALT1)
+#define PC11_ALT1               (PC11 | ALT1)
+#define PD0_ALT1                (PD0  | ALT1)
+#define PD1_ALT1                (PD1  | ALT1)
+#define PF0_ALT1                (PF0  | ALT1)
+#define PF1_ALT1                (PF1  | ALT1)
+#define PF9_ALT1                (PF9  | ALT1)
+
+#define NUM_DIGITAL_PINS        111
+#define NUM_ANALOG_INPUTS       22
+
+// On-board LED pin number
+#ifndef LED_BUILTIN
+  #define LED_BUILTIN           PNUM_NOT_DEFINED
+#endif
+
+// On-board user button
+#ifndef USER_BTN
+  #define USER_BTN              PNUM_NOT_DEFINED
+#endif
+
+// SPI definitions
+#ifndef PIN_SPI_SS
+  #define PIN_SPI_SS            PA4
+#endif
+#ifndef PIN_SPI_SS1
+  #define PIN_SPI_SS1           PA15
+#endif
+#ifndef PIN_SPI_SS2
+  #define PIN_SPI_SS2           PB0
+#endif
+#ifndef PIN_SPI_SS3
+  #define PIN_SPI_SS3           PE12
+#endif
+#ifndef PIN_SPI_MOSI
+  #define PIN_SPI_MOSI          PA7
+#endif
+#ifndef PIN_SPI_MISO
+  #define PIN_SPI_MISO          PA6
+#endif
+#ifndef PIN_SPI_SCK
+  #define PIN_SPI_SCK           PA1
+#endif
+
+// I2C definitions
+#ifndef PIN_WIRE_SDA
+  #define PIN_WIRE_SDA          PB3
+#endif
+#ifndef PIN_WIRE_SCL
+  #define PIN_WIRE_SCL          PB6
+#endif
+
+// Timer Definitions
+// Use TIM6/TIM7 when possible as servo and tone don't need GPIO output pin
+#ifndef TIMER_TONE
+  #define TIMER_TONE            TIM6
+#endif
+#ifndef TIMER_SERVO
+  #define TIMER_SERVO           TIM7
+#endif
+
+// UART Definitions
+#ifndef SERIAL_UART_INSTANCE
+  #define SERIAL_UART_INSTANCE  4
+#endif
+
+// Default pin used for generic 'Serial' instance
+// Mandatory for Firmata
+#ifndef PIN_SERIAL_RX
+  #define PIN_SERIAL_RX         PA1
+#endif
+#ifndef PIN_SERIAL_TX
+  #define PIN_SERIAL_TX         PA0
+#endif
+
+// Extra HAL modules
+#if !defined(HAL_DAC_MODULE_DISABLED)
+  #define HAL_DAC_MODULE_ENABLED
+#endif
+#if !defined(HAL_OSPI_MODULE_DISABLED)
+  #define HAL_OSPI_MODULE_ENABLED
+#endif
+#if !defined(HAL_SD_MODULE_DISABLED)
+  #define HAL_SD_MODULE_ENABLED
+#endif
+
+// Alternate SYS_WKUP definition
+#define PWR_WAKEUP_PIN1_1
+#define PWR_WAKEUP_PIN1_2
+#define PWR_WAKEUP_PIN2_1
+#define PWR_WAKEUP_PIN2_2
+#define PWR_WAKEUP_PIN3_1
+#define PWR_WAKEUP_PIN3_2
+#define PWR_WAKEUP_PIN4_1
+#define PWR_WAKEUP_PIN4_2
+#define PWR_WAKEUP_PIN5_1
+#define PWR_WAKEUP_PIN6_1
+#define PWR_WAKEUP_PIN6_2
+#define PWR_WAKEUP_PIN7_1
+#define PWR_WAKEUP_PIN7_2
+#define PWR_WAKEUP_PIN8_1
+#define PWR_WAKEUP_PIN8_2
+
+/*----------------------------------------------------------------------------
+ *        Arduino objects - C++ only
+ *----------------------------------------------------------------------------*/
+
+#ifdef __cplusplus
+  // These serial port names are intended to allow libraries and architecture-neutral
+  // sketches to automatically default to the correct port name for a particular type
+  // of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
+  // the first hardware serial port whose RX/TX pins are not dedicated to another use.
+  //
+  // SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
+  //
+  // SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
+  //
+  // SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
+  //
+  // SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
+  //
+  // SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
+  //                            pins are NOT connected to anything by default.
+  #ifndef SERIAL_PORT_MONITOR
+    #define SERIAL_PORT_MONITOR   Serial
+  #endif
+  #ifndef SERIAL_PORT_HARDWARE
+    #define SERIAL_PORT_HARDWARE  Serial
+  #endif
+#endif
diff --git a/variants/STM32U5xx/U599BJYxQ_U5A9BJYxQ/PeripheralPins.c b/variants/STM32U5xx/U599BJYxQ_U5A9BJYxQ/PeripheralPins.c
new file mode 100644
index 0000000000..f0f5fc4f2e
--- /dev/null
+++ b/variants/STM32U5xx/U599BJYxQ_U5A9BJYxQ/PeripheralPins.c
@@ -0,0 +1,647 @@
+/*
+ *******************************************************************************
+ * Copyright (c) 2020, STMicroelectronics
+ * All rights reserved.
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ *******************************************************************************
+ */
+/*
+ * Automatically generated from STM32U599BJYxQ.xml, STM32U5A9BJYxQ.xml
+ * CubeMX DB release 6.0.50
+ */
+#if !defined(CUSTOM_PERIPHERAL_PINS)
+#include "Arduino.h"
+#include "PeripheralPins.h"
+
+/* =====
+ * Notes:
+ * - The pins mentioned Px_y_ALTz are alternative possibilities which use other
+ *   HW peripheral instances. You can use them the same way as any other "normal"
+ *   pin (i.e. analogWrite(PA7_ALT1, 128);).
+ *
+ * - Commented lines are alternative possibilities which are not used per default.
+ *   If you change them, you will have to know what you do
+ * =====
+ */
+
+//*** ADC ***
+
+#ifdef HAL_ADC_MODULE_ENABLED
+WEAK const PinMap PinMap_ADC[] = {
+  {PA_0,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC1_IN5
+  {PA_0_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC2_IN5
+  {PA_1,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC1_IN6
+  {PA_1_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC2_IN6
+  {PA_2,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC1_IN7
+  {PA_2_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC2_IN7
+  {PA_3,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC1_IN8
+  {PA_3_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC2_IN8
+  {PA_4,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC1_IN9
+  {PA_4_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC2_IN9
+  {PA_4_ALT2, ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC4_IN9
+  {PA_5,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC1_IN10
+  {PA_5_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC2_IN10
+  {PA_5_ALT2, ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC4_IN10
+  {PA_6,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC1_IN11
+  {PA_6_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC2_IN11
+  {PA_6_ALT2, ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC4_IN11
+  {PA_7,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 12, 0)}, // ADC1_IN12
+  {PA_7_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 12, 0)}, // ADC2_IN12
+  {PA_7_ALT2, ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 20, 0)}, // ADC4_IN20
+  {PB_0,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC1_IN15
+  {PB_0_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC2_IN15
+  {PB_0_ALT2, ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 18, 0)}, // ADC4_IN18
+  {PB_1,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 16, 0)}, // ADC1_IN16
+  {PB_1_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 16, 0)}, // ADC2_IN16
+  {PB_1_ALT2, ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 19, 0)}, // ADC4_IN19
+  {PB_2,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 17, 0)}, // ADC1_IN17
+  {PB_2_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 17, 0)}, // ADC2_IN17
+  {PC_0,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC1_IN1
+  {PC_0_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC2_IN1
+  {PC_0_ALT2, ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC4_IN1
+  {PC_1,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC1_IN2
+  {PC_1_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC2_IN2
+  {PC_1_ALT2, ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC4_IN2
+  {PC_2,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC1_IN3
+  {PC_2_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC2_IN3
+  {PC_2_ALT2, ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC4_IN3
+  {PC_3,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC1_IN4
+  {PC_3_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC2_IN4
+  {PC_3_ALT2, ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC4_IN4
+  {PC_4,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 13, 0)}, // ADC1_IN13
+  {PC_4_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 13, 0)}, // ADC2_IN13
+  {PC_4_ALT2, ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 22, 0)}, // ADC4_IN22
+  {PC_5,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC1_IN14
+  {PC_5_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC2_IN14
+  {PC_5_ALT2, ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 23, 0)}, // ADC4_IN23
+  {PD_11,     ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC4_IN15
+  {PD_12,     ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 16, 0)}, // ADC4_IN16
+  {PD_13,     ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 17, 0)}, // ADC4_IN17
+  {PF_14,     ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC4_IN5
+  {PF_15,     ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC4_IN6
+  {PG_0,      ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC4_IN7
+  {PG_1,      ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC4_IN8
+  {NC,        NP,   0}
+};
+#endif
+
+//*** DAC ***
+
+#ifdef HAL_DAC_MODULE_ENABLED
+WEAK const PinMap PinMap_DAC[] = {
+  {PA_4, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // DAC1_OUT1
+  {PA_5, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // DAC1_OUT2
+  {NC,   NP,   0}
+};
+#endif
+
+//*** I2C ***
+
+#ifdef HAL_I2C_MODULE_ENABLED
+WEAK const PinMap PinMap_I2C_SDA[] = {
+  {PB_3,       I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  {PB_4,       I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
+  {PB_7,       I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  {PB_7_ALT1,  I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF5_I2C4)},
+  {PB_9,       I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  {PB_11,      I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
+  {PB_11_ALT1, I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF3_I2C4)},
+  {PB_14,      I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
+  {PC_1,       I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
+  {PD_0,       I2C5, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C5)},
+  {PD_0_ALT1,  I2C6, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF2_I2C6)},
+  {PD_13,      I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C4)},
+  {PF_0,       I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
+  {PF_0_ALT1,  I2C6, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF2_I2C6)},
+  {PF_15,      I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C4)},
+  {PG_8,       I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
+  {PG_13,      I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  {PH_4,       I2C5, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF2_I2C5)},
+  {PH_5,       I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
+  {PH_8,       I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
+  {NC,         NP,   0}
+};
+#endif
+
+#ifdef HAL_I2C_MODULE_ENABLED
+WEAK const PinMap PinMap_I2C_SCL[] = {
+  {PA_7,       I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
+  {PB_6,       I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  {PB_6_ALT1,  I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF5_I2C4)},
+  {PB_8,       I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  {PB_10,      I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
+  {PB_10_ALT1, I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF3_I2C4)},
+  {PB_13,      I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
+  {PC_0,       I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
+  {PD_1,       I2C5, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C5)},
+  {PD_1_ALT1,  I2C6, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF2_I2C6)},
+  {PD_12,      I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C4)},
+  {PF_1,       I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
+  {PF_1_ALT1,  I2C6, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF2_I2C6)},
+  {PF_14,      I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C4)},
+  {PG_7,       I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
+  {PG_14,      I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  {PH_4,       I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
+  {PH_5,       I2C5, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF2_I2C5)},
+  {PH_7,       I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
+  {NC,         NP,   0}
+};
+#endif
+
+//*** TIM ***
+
+#ifdef HAL_TIM_MODULE_ENABLED
+WEAK const PinMap PinMap_TIM[] = {
+  {PA_0,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
+  {PA_0_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)}, // TIM5_CH1
+  {PA_1,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
+  {PA_1_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 2, 0)}, // TIM5_CH2
+  {PA_1_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM15, 1, 1)}, // TIM15_CH1N
+  {PA_2,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
+  {PA_2_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 3, 0)}, // TIM5_CH3
+  {PA_2_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM15, 1, 0)}, // TIM15_CH1
+  {PA_3,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4
+  {PA_3_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 4, 0)}, // TIM5_CH4
+  {PA_3_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM15, 2, 0)}, // TIM15_CH2
+  {PA_5,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
+  {PA_5_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 1)}, // TIM8_CH1N
+  {PA_6,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
+  {PA_6_ALT1,  TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM16, 1, 0)}, // TIM16_CH1
+  {PA_7,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
+  {PA_7_ALT1,  TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
+  {PA_7_ALT2,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 1)}, // TIM8_CH1N
+  {PA_7_ALT3,  TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM17, 1, 0)}, // TIM17_CH1
+  {PA_8,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)}, // TIM1_CH1
+  {PA_9,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 0)}, // TIM1_CH2
+  {PA_10,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 0)}, // TIM1_CH3
+  {PA_11,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 4, 0)}, // TIM1_CH4
+  {PA_15,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
+  {PB_0,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
+  {PB_0_ALT1,  TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)}, // TIM3_CH3
+  {PB_0_ALT2,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 1)}, // TIM8_CH2N
+  {PB_1,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
+  {PB_1_ALT1,  TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
+  {PB_1_ALT2,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 1)}, // TIM8_CH3N
+  {PB_2,       TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 4, 1)}, // TIM8_CH4N
+  {PB_3,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
+  {PB_4,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
+  {PB_5,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
+  {PB_6,       TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 1, 0)}, // TIM4_CH1
+  {PB_6_ALT1,  TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM16, 1, 1)}, // TIM16_CH1N
+  {PB_7,       TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 2, 0)}, // TIM4_CH2
+  {PB_7_ALT1,  TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM17, 1, 1)}, // TIM17_CH1N
+  {PB_8,       TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 3, 0)}, // TIM4_CH3
+  {PB_8_ALT1,  TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM16, 1, 0)}, // TIM16_CH1
+  {PB_9,       TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)}, // TIM4_CH4
+  {PB_9_ALT1,  TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM17, 1, 0)}, // TIM17_CH1
+  {PB_10,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
+  {PB_11,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4
+  {PB_13,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
+  {PB_13_ALT1, TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM15, 1, 1)}, // TIM15_CH1N
+  {PB_14,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
+  {PB_14_ALT1, TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 1)}, // TIM8_CH2N
+  {PB_14_ALT2, TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM15, 1, 0)}, // TIM15_CH1
+  {PB_15,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
+  {PB_15_ALT1, TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 1)}, // TIM8_CH3N
+  {PB_15_ALT2, TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM15, 2, 0)}, // TIM15_CH2
+  {PC_5,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 4, 1)}, // TIM1_CH4N
+  {PC_6,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
+  {PC_6_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 0)}, // TIM8_CH1
+  {PC_7,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
+  {PC_7_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 0)}, // TIM8_CH2
+  {PC_8,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)}, // TIM3_CH3
+  {PC_8_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 0)}, // TIM8_CH3
+  {PC_9,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
+  {PC_9_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 4, 0)}, // TIM8_CH4
+  {PD_0,       TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 4, 1)}, // TIM8_CH4N
+  {PD_12,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 1, 0)}, // TIM4_CH1
+  {PD_13,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 2, 0)}, // TIM4_CH2
+  {PD_14,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 3, 0)}, // TIM4_CH3
+  {PD_15,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)}, // TIM4_CH4
+  {PE_0,       TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM16, 1, 0)}, // TIM16_CH1
+  {PE_1,       TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM17, 1, 0)}, // TIM17_CH1
+  {PE_3,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
+  {PE_4,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
+  {PE_5,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)}, // TIM3_CH3
+  {PE_6,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
+  {PE_8,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
+  {PE_9,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)}, // TIM1_CH1
+  {PE_10,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
+  {PE_11,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 0)}, // TIM1_CH2
+  {PE_12,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
+  {PE_13,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 0)}, // TIM1_CH3
+  {PE_14,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 4, 0)}, // TIM1_CH4
+  {PE_15,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM1, 4, 1)}, // TIM1_CH4N
+  {PF_6,       TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)}, // TIM5_CH1
+  {PF_7,       TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 2, 0)}, // TIM5_CH2
+  {PF_8,       TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 3, 0)}, // TIM5_CH3
+  {PF_9,       TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 4, 0)}, // TIM5_CH4
+  {PF_9_ALT1,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM15, 1, 0)}, // TIM15_CH1
+  {PF_10,      TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM15, 2, 0)}, // TIM15_CH2
+  {PG_9,       TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM15, 1, 1)}, // TIM15_CH1N
+  {PG_10,      TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM15, 1, 0)}, // TIM15_CH1
+  {PG_11,      TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM15, 2, 0)}, // TIM15_CH2
+  {PH_10,      TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)}, // TIM5_CH1
+  {PH_11,      TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 2, 0)}, // TIM5_CH2
+  {PH_12,      TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 3, 0)}, // TIM5_CH3
+  {PH_12_ALT1, TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 4, 1)}, // TIM8_CH4N
+  {PH_13,      TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 1)}, // TIM8_CH1N
+  {PH_14,      TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 1)}, // TIM8_CH2N
+  {PH_15,      TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 1)}, // TIM8_CH3N
+  {PI_0,       TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 4, 0)}, // TIM5_CH4
+  {PI_2,       TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 4, 0)}, // TIM8_CH4
+  {PI_5,       TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 0)}, // TIM8_CH1
+  {PI_6,       TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 0)}, // TIM8_CH2
+  {PI_7,       TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 0)}, // TIM8_CH3
+  {NC,         NP,    0}
+};
+#endif
+
+//*** UART ***
+
+#ifdef HAL_UART_MODULE_ENABLED
+WEAK const PinMap PinMap_UART_TX[] = {
+  {PA_0,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
+  {PA_2,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
+  {PA_2_ALT1,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PA_7,       USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PA_9,       USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {PB_6,       USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {PB_10,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PB_11,      LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
+  {PC_1,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
+  {PC_3,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {PC_4,       USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PC_9,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {PC_10,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
+  {PC_10_ALT1, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PC_12,      UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
+  {PD_5,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PD_8,       USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PE_1,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {PF_0,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {PF_3,       UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
+  {PG_7,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
+  {PG_9,       USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {NC,         NP,      0}
+};
+#endif
+
+#ifdef HAL_UART_MODULE_ENABLED
+WEAK const PinMap PinMap_UART_RX[] = {
+  {PA_1,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
+  {PA_3,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
+  {PA_3_ALT1,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PA_5,       USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PA_10,      USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {PA_15,      USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_USART2)},
+  {PB_7,       USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {PB_10,      LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
+  {PB_11,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PC_0,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
+  {PC_2,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {PC_5,       USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PC_8,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {PC_11,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
+  {PC_11_ALT1, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PD_2,       UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
+  {PD_6,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PD_9,       USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PE_0,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {PF_1,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {PF_4,       UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
+  {PG_8,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
+  {PG_10,      USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {NC,         NP,      0}
+};
+#endif
+
+#ifdef HAL_UART_MODULE_ENABLED
+WEAK const PinMap PinMap_UART_RTS[] = {
+  {PA_1,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PA_12,      USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {PA_15,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
+  {PA_15_ALT1, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PB_1,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
+  {PB_1_ALT1,  USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PB_3,       USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {PB_4,       UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
+  {PB_12,      LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
+  {PB_14,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PD_2,       USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PD_4,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PD_12,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PD_15,      USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {PE_4,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {PF_4,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {PG_6,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
+  {PG_12,      USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {NC,         NP,      0}
+};
+#endif
+
+#ifdef HAL_UART_MODULE_ENABLED
+WEAK const PinMap PinMap_UART_CTS[] = {
+  {PA_0,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PA_6,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
+  {PA_6_ALT1,  USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PA_11,      USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {PB_4,       USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {PB_5,       UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
+  {PB_7,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
+  {PB_13,      LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
+  {PB_13_ALT1, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PC_0,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {PD_3,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PD_11,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PD_13,      USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {PE_3,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {PF_3,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {PG_5,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
+  {PG_11,      USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {NC,         NP,      0}
+};
+#endif
+
+//*** SPI ***
+
+#ifdef HAL_SPI_MODULE_ENABLED
+WEAK const PinMap PinMap_SPI_MOSI[] = {
+  {PA_7,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PA_12,     SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PB_5,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PB_5_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PB_15,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PC_1,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_SPI2)},
+  {PC_3,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PC_12,     SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PD_4,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PD_6,      SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI3)},
+  {PE_15,     SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PG_4,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PG_11,     SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PI_3,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {NC,        NP,   0}
+};
+#endif
+
+#ifdef HAL_SPI_MODULE_ENABLED
+WEAK const PinMap PinMap_SPI_MISO[] = {
+  {PA_6,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PA_11,     SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PB_4,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PB_4_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PB_14,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PC_2,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PC_11,     SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PD_3,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PE_14,     SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PG_3,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PG_10,     SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PI_2,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {NC,        NP,   0}
+};
+#endif
+
+#ifdef HAL_SPI_MODULE_ENABLED
+WEAK const PinMap PinMap_SPI_SCLK[] = {
+  {PA_1,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PA_5,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PA_9,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_SPI2)},
+  {PB_3,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PB_3_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PB_10,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PB_13,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PC_10,     SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PD_1,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PD_3,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_SPI2)},
+  {PE_13,     SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PG_2,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PG_9,      SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PI_1,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {NC,        NP,   0}
+};
+#endif
+
+#ifdef HAL_SPI_MODULE_ENABLED
+WEAK const PinMap PinMap_SPI_SSEL[] = {
+  {PA_4,       SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PA_4_ALT1,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PA_15,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PA_15_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PB_0,       SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PB_9,       SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PB_12,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PD_0,       SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PE_12,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PG_5,       SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PG_12,      SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PI_0,       SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {NC,         NP,   0}
+};
+#endif
+
+//*** FDCAN ***
+
+#ifdef HAL_FDCAN_MODULE_ENABLED
+WEAK const PinMap PinMap_CAN_RD[] = {
+  {PA_11, FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
+  {PB_8,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
+  {PD_0,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
+  {PF_7,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
+  {PH_14, FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
+  {NC,    NP,     0}
+};
+#endif
+
+#ifdef HAL_FDCAN_MODULE_ENABLED
+WEAK const PinMap PinMap_CAN_TD[] = {
+  {PA_12, FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
+  {PB_9,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
+  {PD_1,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
+  {PF_8,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
+  {PH_13, FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
+  {NC,    NP,     0}
+};
+#endif
+
+//*** No ETHERNET ***
+
+//*** OCTOSPI ***
+
+#ifdef HAL_OSPI_MODULE_ENABLED
+WEAK const PinMap PinMap_OCTOSPI_DATA0[] = {
+  {PB_1,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO0
+  {PE_12, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO0
+  {PF_0,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P2_IO0
+  {PF_8,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO0
+  {PI_3,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_OCTOSPI1)}, // OCTOSPIM_P2_IO0
+  {NC,    NP,       0}
+};
+#endif
+
+#ifdef HAL_OSPI_MODULE_ENABLED
+WEAK const PinMap PinMap_OCTOSPI_DATA1[] = {
+  {PB_0,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO1
+  {PE_13, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO1
+  {PF_1,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P2_IO1
+  {PF_9,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO1
+  {PI_2,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_OCTOSPI1)}, // OCTOSPIM_P2_IO1
+  {NC,    NP,       0}
+};
+#endif
+
+#ifdef HAL_OSPI_MODULE_ENABLED
+WEAK const PinMap PinMap_OCTOSPI_DATA2[] = {
+  {PA_7,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO2
+  {PE_14, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO2
+  {PF_2,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P2_IO2
+  {PF_7,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO2
+  {PI_1,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_OCTOSPI1)}, // OCTOSPIM_P2_IO2
+  {NC,    NP,       0}
+};
+#endif
+
+#ifdef HAL_OSPI_MODULE_ENABLED
+WEAK const PinMap PinMap_OCTOSPI_DATA3[] = {
+  {PA_6,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO3
+  {PE_15, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO3
+  {PF_3,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P2_IO3
+  {PF_6,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO3
+  {PH_8,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P2_IO3
+  {NC,    NP,       0}
+};
+#endif
+
+#ifdef HAL_OSPI_MODULE_ENABLED
+WEAK const PinMap PinMap_OCTOSPI_DATA4[] = {
+  {PC_1, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO4
+  {PD_4, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO4
+  {PG_0, OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P2_IO4
+  {PH_2, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_OCTOSPI1)}, // OCTOSPIM_P1_IO4
+  {PH_9, OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P2_IO4
+  {NC,   NP,       0}
+};
+#endif
+
+#ifdef HAL_OSPI_MODULE_ENABLED
+WEAK const PinMap PinMap_OCTOSPI_DATA5[] = {
+  {PC_2,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO5
+  {PD_5,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO5
+  {PG_1,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P2_IO5
+  {PG_11, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_OCTOSPI1)}, // OCTOSPIM_P1_IO5
+  {PH_10, OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P2_IO5
+  {PI_0,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_OCTOSPI1)}, // OCTOSPIM_P1_IO5
+  {NC,    NP,       0}
+};
+#endif
+
+#ifdef HAL_OSPI_MODULE_ENABLED
+WEAK const PinMap PinMap_OCTOSPI_DATA6[] = {
+  {PC_3,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO6
+  {PD_6,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO6
+  {PG_9,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P2_IO6
+  {PH_11, OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P2_IO6
+  {PH_15, OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P2_IO6
+  {NC,    NP,       0}
+};
+#endif
+
+#ifdef HAL_OSPI_MODULE_ENABLED
+WEAK const PinMap PinMap_OCTOSPI_DATA7[] = {
+  {PC_0,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_OCTOSPI1)}, // OCTOSPIM_P1_IO7
+  {PC_4,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO7
+  {PD_7,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO7
+  {PG_10, OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P2_IO7
+  {PH_12, OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P2_IO7
+  {NC,    NP,       0}
+};
+#endif
+
+#ifdef HAL_OSPI_MODULE_ENABLED
+WEAK const PinMap PinMap_OCTOSPI_SCLK[] = {
+  {PA_3,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_CLK
+  {PB_10, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_CLK
+  {PE_10, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_CLK
+  {PF_4,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P2_CLK
+  {PF_10, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_OCTOSPI1)}, // OCTOSPIM_P1_CLK
+  {PH_6,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P2_CLK
+  {PI_6,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P2_CLK
+  {NC,    NP,       0}
+};
+#endif
+
+#ifdef HAL_OSPI_MODULE_ENABLED
+WEAK const PinMap PinMap_OCTOSPI_SSEL[] = {
+  {PA_0,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P2_NCS
+  {PA_2,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_NCS
+  {PA_4,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_OCTOSPI1)}, // OCTOSPIM_P1_NCS
+  {PA_12, OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_OCTOSPI1)}, // OCTOSPIM_P2_NCS
+  {PB_11, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_NCS
+  {PC_11, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P1_NCS
+  {PD_3,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P2_NCS
+  {PE_11, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_NCS
+  {PF_6,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P2_NCS
+  {PG_12, OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P2_NCS
+  {PI_5,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P2_NCS
+  {NC,    NP,       0}
+};
+#endif
+
+//*** USB ***
+
+#if defined(HAL_PCD_MODULE_ENABLED) || defined(HAL_HCD_MODULE_ENABLED)
+WEAK const PinMap PinMap_USB_OTG_HS[] = {
+#ifdef USE_USB_HS_IN_FS
+  {PA_8,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_USB_HS)}, // USB_OTG_HS_SOF
+  {PA_9,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
+  {PA_10, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_USB_HS)}, // USB_OTG_HS_ID
+  {PA_11, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)}, // USB_OTG_HS_DM
+  {PA_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)}, // USB_OTG_HS_DP
+  {PA_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_USB_HS)}, // USB_OTG_HS_SOF
+#endif /* USE_USB_HS_IN_FS */
+  {NC,    NP,         0}
+};
+#endif
+
+//*** SD ***
+
+#ifdef HAL_SD_MODULE_ENABLED
+WEAK const PinMap PinMap_SD[] = {
+  {PA_0,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDMMC2)}, // SDMMC2_CMD
+  {PB_3,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC2)}, // SDMMC2_D2
+  {PB_4,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC2)}, // SDMMC2_D3
+  {PB_8,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF8_SDMMC1)}, // SDMMC1_CKIN
+  {PB_8_ALT1, SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D4
+  {PB_8_ALT2, SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_SDMMC2)}, // SDMMC2_D4
+  {PB_9,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF8_SDMMC1)}, // SDMMC1_CDIR
+  {PB_9_ALT1, SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D5
+  {PB_9_ALT2, SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_SDMMC2)}, // SDMMC2_D5
+  {PB_14,     SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC2)}, // SDMMC2_D0
+  {PB_15,     SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC2)}, // SDMMC2_D1
+  {PC_0,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D5
+  {PC_1,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDMMC2)}, // SDMMC2_CK
+  {PC_6,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF8_SDMMC1)}, // SDMMC1_D0DIR
+  {PC_6_ALT1, SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D6
+  {PC_6_ALT2, SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_SDMMC2)}, // SDMMC2_D6
+  {PC_7,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF8_SDMMC1)}, // SDMMC1_D123DIR
+  {PC_7_ALT1, SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D7
+  {PC_7_ALT2, SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_SDMMC2)}, // SDMMC2_D7
+  {PC_8,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D0
+  {PC_9,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D1
+  {PC_10,     SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D2
+  {PC_11,     SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D3
+  {PC_12,     SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDMMC1)}, // SDMMC1_CK
+  {PD_2,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDMMC1)}, // SDMMC1_CMD
+  {PD_6,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF11_SDMMC2)}, // SDMMC2_CK
+  {PD_7,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF11_SDMMC2)}, // SDMMC2_CMD
+  {NC,        NP,     0}
+};
+#endif
+
+#endif /* !CUSTOM_PERIPHERAL_PINS */
diff --git a/variants/STM32U5xx/U599BJYxQ_U5A9BJYxQ/PinNamesVar.h b/variants/STM32U5xx/U599BJYxQ_U5A9BJYxQ/PinNamesVar.h
new file mode 100644
index 0000000000..4a2c243a7b
--- /dev/null
+++ b/variants/STM32U5xx/U599BJYxQ_U5A9BJYxQ/PinNamesVar.h
@@ -0,0 +1,153 @@
+/* Alternate pin name */
+PA_0_ALT1  = PA_0  | ALT1,
+PA_1_ALT1  = PA_1  | ALT1,
+PA_1_ALT2  = PA_1  | ALT2,
+PA_2_ALT1  = PA_2  | ALT1,
+PA_2_ALT2  = PA_2  | ALT2,
+PA_3_ALT1  = PA_3  | ALT1,
+PA_3_ALT2  = PA_3  | ALT2,
+PA_4_ALT1  = PA_4  | ALT1,
+PA_4_ALT2  = PA_4  | ALT2,
+PA_5_ALT1  = PA_5  | ALT1,
+PA_5_ALT2  = PA_5  | ALT2,
+PA_6_ALT1  = PA_6  | ALT1,
+PA_6_ALT2  = PA_6  | ALT2,
+PA_7_ALT1  = PA_7  | ALT1,
+PA_7_ALT2  = PA_7  | ALT2,
+PA_7_ALT3  = PA_7  | ALT3,
+PA_15_ALT1 = PA_15 | ALT1,
+PB_0_ALT1  = PB_0  | ALT1,
+PB_0_ALT2  = PB_0  | ALT2,
+PB_1_ALT1  = PB_1  | ALT1,
+PB_1_ALT2  = PB_1  | ALT2,
+PB_2_ALT1  = PB_2  | ALT1,
+PB_3_ALT1  = PB_3  | ALT1,
+PB_4_ALT1  = PB_4  | ALT1,
+PB_5_ALT1  = PB_5  | ALT1,
+PB_6_ALT1  = PB_6  | ALT1,
+PB_7_ALT1  = PB_7  | ALT1,
+PB_8_ALT1  = PB_8  | ALT1,
+PB_8_ALT2  = PB_8  | ALT2,
+PB_9_ALT1  = PB_9  | ALT1,
+PB_9_ALT2  = PB_9  | ALT2,
+PB_10_ALT1 = PB_10 | ALT1,
+PB_11_ALT1 = PB_11 | ALT1,
+PB_13_ALT1 = PB_13 | ALT1,
+PB_14_ALT1 = PB_14 | ALT1,
+PB_14_ALT2 = PB_14 | ALT2,
+PB_15_ALT1 = PB_15 | ALT1,
+PB_15_ALT2 = PB_15 | ALT2,
+PC_0_ALT1  = PC_0  | ALT1,
+PC_0_ALT2  = PC_0  | ALT2,
+PC_1_ALT1  = PC_1  | ALT1,
+PC_1_ALT2  = PC_1  | ALT2,
+PC_2_ALT1  = PC_2  | ALT1,
+PC_2_ALT2  = PC_2  | ALT2,
+PC_3_ALT1  = PC_3  | ALT1,
+PC_3_ALT2  = PC_3  | ALT2,
+PC_4_ALT1  = PC_4  | ALT1,
+PC_4_ALT2  = PC_4  | ALT2,
+PC_5_ALT1  = PC_5  | ALT1,
+PC_5_ALT2  = PC_5  | ALT2,
+PC_6_ALT1  = PC_6  | ALT1,
+PC_6_ALT2  = PC_6  | ALT2,
+PC_7_ALT1  = PC_7  | ALT1,
+PC_7_ALT2  = PC_7  | ALT2,
+PC_8_ALT1  = PC_8  | ALT1,
+PC_9_ALT1  = PC_9  | ALT1,
+PC_10_ALT1 = PC_10 | ALT1,
+PC_11_ALT1 = PC_11 | ALT1,
+PD_0_ALT1  = PD_0  | ALT1,
+PD_1_ALT1  = PD_1  | ALT1,
+PF_0_ALT1  = PF_0  | ALT1,
+PF_1_ALT1  = PF_1  | ALT1,
+PF_9_ALT1  = PF_9  | ALT1,
+PH_12_ALT1 = PH_12 | ALT1,
+
+/* SYS_WKUP */
+#ifdef PWR_WAKEUP_PIN1
+  SYS_WKUP1 = PE_4,
+#endif
+#ifdef PWR_WAKEUP_PIN1
+  SYS_WKUP1_1 = PB_2,
+#endif
+#ifdef PWR_WAKEUP_PIN1
+  SYS_WKUP1_2 = PA_0,
+#endif
+#ifdef PWR_WAKEUP_PIN2
+  SYS_WKUP2 = PC_13,
+#endif
+#ifdef PWR_WAKEUP_PIN2
+  SYS_WKUP2_1 = PE_5,
+#endif
+#ifdef PWR_WAKEUP_PIN2
+  SYS_WKUP2_2 = PA_4,
+#endif
+#ifdef PWR_WAKEUP_PIN3
+  SYS_WKUP3 = PB_6,
+#endif
+#ifdef PWR_WAKEUP_PIN3
+  SYS_WKUP3_1 = PE_6,
+#endif
+#ifdef PWR_WAKEUP_PIN3
+  SYS_WKUP3_2 = PA_1,
+#endif
+#ifdef PWR_WAKEUP_PIN4
+  SYS_WKUP4 = PB_7,
+#endif
+#ifdef PWR_WAKEUP_PIN4
+  SYS_WKUP4_1 = PB_1,
+#endif
+#ifdef PWR_WAKEUP_PIN4
+  SYS_WKUP4_2 = PA_2,
+#endif
+#ifdef PWR_WAKEUP_PIN5
+  SYS_WKUP5 = PB_8,
+#endif
+#ifdef PWR_WAKEUP_PIN5
+  SYS_WKUP5_1 = PC_5,
+#endif
+#ifdef PWR_WAKEUP_PIN5
+  SYS_WKUP5_2 = PA_3,
+#endif
+#ifdef PWR_WAKEUP_PIN6
+  SYS_WKUP6 = PB_5,
+#endif
+#ifdef PWR_WAKEUP_PIN6
+  SYS_WKUP6_1 = PE_7,
+#endif
+#ifdef PWR_WAKEUP_PIN6
+  SYS_WKUP6_2 = PA_5,
+#endif
+#ifdef PWR_WAKEUP_PIN7
+  SYS_WKUP7 = PE_8,
+#endif
+#ifdef PWR_WAKEUP_PIN7
+  SYS_WKUP7_1 = PA_6,
+#endif
+#ifdef PWR_WAKEUP_PIN7
+  SYS_WKUP7_2 = PB_15,
+#endif
+#ifdef PWR_WAKEUP_PIN8
+  SYS_WKUP8 = PF_2,
+#endif
+#ifdef PWR_WAKEUP_PIN8
+  SYS_WKUP8_1 = PA_7,
+#endif
+#ifdef PWR_WAKEUP_PIN8
+  SYS_WKUP8_2 = PB_10,
+#endif
+
+/* USB */
+#ifdef USBCON
+  USB_OTG_HS_DM   = PA_11,
+  USB_OTG_HS_DP   = PA_12,
+  USB_OTG_HS_ID   = PA_10,
+  #ifdef USB_OTG_HS_SOF_PA_8
+    USB_OTG_HS_SOF  = PA_8,
+  #endif
+  #ifdef USB_OTG_HS_SOF_PA_14
+    USB_OTG_HS_SOF  = PA_14,
+  #endif
+  USB_OTG_HS_VBUS = PA_9,
+#endif
diff --git a/variants/STM32U5xx/U599BJYxQ_U5A9BJYxQ/boards_entry.txt b/variants/STM32U5xx/U599BJYxQ_U5A9BJYxQ/boards_entry.txt
new file mode 100644
index 0000000000..4eafd6bf01
--- /dev/null
+++ b/variants/STM32U5xx/U599BJYxQ_U5A9BJYxQ/boards_entry.txt
@@ -0,0 +1,21 @@
+# This file help to add generic board entry.
+# upload.maximum_size and product_line have to be verified
+# and changed if needed.
+# See: https://github.com/stm32duino/wiki/wiki/Add-a-new-variant-%28board%29
+
+# Generic U599BJYxQ
+GenU5.menu.pnum.GENERIC_U599BJYXQ=Generic U599BJYxQ
+GenU5.menu.pnum.GENERIC_U599BJYXQ.upload.maximum_size=73728
+GenU5.menu.pnum.GENERIC_U599BJYXQ.upload.maximum_data_size=262144
+GenU5.menu.pnum.GENERIC_U599BJYXQ.build.board=GENERIC_U599BJYXQ
+GenU5.menu.pnum.GENERIC_U599BJYXQ.build.product_line=
+GenU5.menu.pnum.GENERIC_U599BJYXQ.build.variant=STM32U5xx/U599BJYxQ_U5A9BJYxQ
+
+# Generic U5A9BJYxQ
+GenU5.menu.pnum.GENERIC_U5A9BJYXQ=Generic U5A9BJYxQ
+GenU5.menu.pnum.GENERIC_U5A9BJYXQ.upload.maximum_size=73728
+GenU5.menu.pnum.GENERIC_U5A9BJYXQ.upload.maximum_data_size=262144
+GenU5.menu.pnum.GENERIC_U5A9BJYXQ.build.board=GENERIC_U5A9BJYXQ
+GenU5.menu.pnum.GENERIC_U5A9BJYXQ.build.product_line=
+GenU5.menu.pnum.GENERIC_U5A9BJYXQ.build.variant=STM32U5xx/U599BJYxQ_U5A9BJYxQ
+
diff --git a/variants/STM32H7xx/H730ABIxQ/generic_clock.c b/variants/STM32U5xx/U599BJYxQ_U5A9BJYxQ/generic_clock.c
similarity index 86%
rename from variants/STM32H7xx/H730ABIxQ/generic_clock.c
rename to variants/STM32U5xx/U599BJYxQ_U5A9BJYxQ/generic_clock.c
index a377e6d7fc..f6ed4e9da0 100644
--- a/variants/STM32H7xx/H730ABIxQ/generic_clock.c
+++ b/variants/STM32U5xx/U599BJYxQ_U5A9BJYxQ/generic_clock.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -10,7 +10,7 @@
  *
  *******************************************************************************
  */
-#if defined(ARDUINO_GENERIC_H730ABIXQ)
+#if defined(ARDUINO_GENERIC_U599BJYXQ) || defined(ARDUINO_GENERIC_U5A9BJYXQ)
 #include "pins_arduino.h"
 
 /**
diff --git a/variants/STM32H7xx/H730IBKxQ/variant_generic.cpp b/variants/STM32U5xx/U599BJYxQ_U5A9BJYxQ/variant_generic.cpp
similarity index 67%
rename from variants/STM32H7xx/H730IBKxQ/variant_generic.cpp
rename to variants/STM32U5xx/U599BJYxQ_U5A9BJYxQ/variant_generic.cpp
index 6066cb36f9..cc035d6f2b 100644
--- a/variants/STM32H7xx/H730IBKxQ/variant_generic.cpp
+++ b/variants/STM32U5xx/U599BJYxQ_U5A9BJYxQ/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -10,7 +10,7 @@
  *
  *******************************************************************************
  */
-#if defined(ARDUINO_GENERIC_H730IBKXQ)
+#if defined(ARDUINO_GENERIC_U599BJYXQ) || defined(ARDUINO_GENERIC_U5A9BJYXQ)
 #include "pins_arduino.h"
 
 // Digital PinName array
@@ -33,7 +33,7 @@ const PinName digitalPin[] = {
   PA_15,  // D15
   PB_0,   // D16/A8
   PB_1,   // D17/A9
-  PB_2,   // D18
+  PB_2,   // D18/A10
   PB_3,   // D19
   PB_4,   // D20
   PB_5,   // D21
@@ -47,12 +47,12 @@ const PinName digitalPin[] = {
   PB_13,  // D29
   PB_14,  // D30
   PB_15,  // D31
-  PC_0,   // D32/A10
-  PC_1,   // D33/A11
-  PC_2,   // D34/A12
-  PC_3,   // D35/A13
-  PC_4,   // D36/A14
-  PC_5,   // D37/A15
+  PC_0,   // D32/A11
+  PC_1,   // D33/A12
+  PC_2,   // D34/A13
+  PC_3,   // D35/A14
+  PC_4,   // D36/A15
+  PC_5,   // D37/A16
   PC_6,   // D38
   PC_7,   // D39
   PC_8,   // D40
@@ -74,9 +74,9 @@ const PinName digitalPin[] = {
   PD_8,   // D56
   PD_9,   // D57
   PD_10,  // D58
-  PD_11,  // D59
-  PD_12,  // D60
-  PD_13,  // D61
+  PD_11,  // D59/A17
+  PD_12,  // D60/A18
+  PD_13,  // D61/A19
   PD_14,  // D62
   PD_15,  // D63
   PE_0,   // D64
@@ -98,21 +98,21 @@ const PinName digitalPin[] = {
   PF_0,   // D80
   PF_1,   // D81
   PF_2,   // D82
-  PF_3,   // D83/A16
-  PF_4,   // D84/A17
-  PF_5,   // D85/A18
-  PF_6,   // D86/A19
-  PF_7,   // D87/A20
-  PF_8,   // D88/A21
-  PF_9,   // D89/A22
-  PF_10,  // D90/A23
-  PF_11,  // D91/A24
-  PF_12,  // D92/A25
-  PF_13,  // D93/A26
-  PF_14,  // D94/A27
-  PF_15,  // D95
-  PG_0,   // D96
-  PG_1,   // D97
+  PF_3,   // D83
+  PF_4,   // D84
+  PF_5,   // D85
+  PF_6,   // D86
+  PF_7,   // D87
+  PF_8,   // D88
+  PF_9,   // D89
+  PF_10,  // D90
+  PF_11,  // D91
+  PF_12,  // D92
+  PF_13,  // D93
+  PF_14,  // D94/A20
+  PF_15,  // D95/A21
+  PG_0,   // D96/A22
+  PG_1,   // D97/A23
   PG_2,   // D98
   PG_3,   // D99
   PG_4,   // D100
@@ -129,10 +129,10 @@ const PinName digitalPin[] = {
   PG_15,  // D111
   PH_0,   // D112
   PH_1,   // D113
-  PH_2,   // D114/A28
-  PH_3,   // D115/A29
-  PH_4,   // D116/A30
-  PH_5,   // D117/A31
+  PH_2,   // D114
+  PH_3,   // D115
+  PH_4,   // D116
+  PH_5,   // D117
   PH_6,   // D118
   PH_7,   // D119
   PH_8,   // D120
@@ -143,10 +143,23 @@ const PinName digitalPin[] = {
   PH_13,  // D125
   PH_14,  // D126
   PH_15,  // D127
-  PA_0_C, // D128/A32
-  PA_1_C, // D129/A33
-  PC_2_C, // D130/A34
-  PC_3_C  // D131/A35
+  PI_0,   // D128
+  PI_1,   // D129
+  PI_2,   // D130
+  PI_3,   // D131
+  PI_4,   // D132
+  PI_5,   // D133
+  PI_6,   // D134
+  PI_7,   // D135
+  PI_8,   // D136
+  PI_9,   // D137
+  PI_10,  // D138
+  PI_11,  // D139
+  PI_12,  // D140
+  PI_13,  // D141
+  PI_14,  // D142
+  PI_15,  // D143
+  PJ_0    // D144
 };
 
 // Analog (Ax) pin number array
@@ -161,32 +174,20 @@ const uint32_t analogInputPin[] = {
   7,  // A7,  PA7
   16, // A8,  PB0
   17, // A9,  PB1
-  32, // A10, PC0
-  33, // A11, PC1
-  34, // A12, PC2
-  35, // A13, PC3
-  36, // A14, PC4
-  37, // A15, PC5
-  83, // A16, PF3
-  84, // A17, PF4
-  85, // A18, PF5
-  86, // A19, PF6
-  87, // A20, PF7
-  88, // A21, PF8
-  89, // A22, PF9
-  90, // A23, PF10
-  91, // A24, PF11
-  92, // A25, PF12
-  93, // A26, PF13
-  94, // A27, PF14
-  114, // A28, PH2
-  115, // A29, PH3
-  116, // A30, PH4
-  117, // A31, PH5
-  128, // A32, PA0_C
-  129, // A33, PA1_C
-  130, // A34, PC2_C
-  131 // A35, PC3_C
+  18, // A10, PB2
+  32, // A11, PC0
+  33, // A12, PC1
+  34, // A13, PC2
+  35, // A14, PC3
+  36, // A15, PC4
+  37, // A16, PC5
+  59, // A17, PD11
+  60, // A18, PD12
+  61, // A19, PD13
+  94, // A20, PF14
+  95, // A21, PF15
+  96, // A22, PG0
+  97  // A23, PG1
 };
 
 #endif /* ARDUINO_GENERIC_* */
diff --git a/variants/STM32U5xx/U599BJYxQ_U5A9BJYxQ/variant_generic.h b/variants/STM32U5xx/U599BJYxQ_U5A9BJYxQ/variant_generic.h
new file mode 100644
index 0000000000..d92fb51127
--- /dev/null
+++ b/variants/STM32U5xx/U599BJYxQ_U5A9BJYxQ/variant_generic.h
@@ -0,0 +1,352 @@
+/*
+ *******************************************************************************
+ * Copyright (c) 2020, STMicroelectronics
+ * All rights reserved.
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ *******************************************************************************
+ */
+#pragma once
+
+/*----------------------------------------------------------------------------
+ *        STM32 pins number
+ *----------------------------------------------------------------------------*/
+#define PA0                     PIN_A0
+#define PA1                     PIN_A1
+#define PA2                     PIN_A2
+#define PA3                     PIN_A3
+#define PA4                     PIN_A4
+#define PA5                     PIN_A5
+#define PA6                     PIN_A6
+#define PA7                     PIN_A7
+#define PA8                     8
+#define PA9                     9
+#define PA10                    10
+#define PA11                    11
+#define PA12                    12
+#define PA13                    13
+#define PA14                    14
+#define PA15                    15
+#define PB0                     PIN_A8
+#define PB1                     PIN_A9
+#define PB2                     PIN_A10
+#define PB3                     19
+#define PB4                     20
+#define PB5                     21
+#define PB6                     22
+#define PB7                     23
+#define PB8                     24
+#define PB9                     25
+#define PB10                    26
+#define PB11                    27
+#define PB12                    28
+#define PB13                    29
+#define PB14                    30
+#define PB15                    31
+#define PC0                     PIN_A11
+#define PC1                     PIN_A12
+#define PC2                     PIN_A13
+#define PC3                     PIN_A14
+#define PC4                     PIN_A15
+#define PC5                     PIN_A16
+#define PC6                     38
+#define PC7                     39
+#define PC8                     40
+#define PC9                     41
+#define PC10                    42
+#define PC11                    43
+#define PC12                    44
+#define PC13                    45
+#define PC14                    46
+#define PC15                    47
+#define PD0                     48
+#define PD1                     49
+#define PD2                     50
+#define PD3                     51
+#define PD4                     52
+#define PD5                     53
+#define PD6                     54
+#define PD7                     55
+#define PD8                     56
+#define PD9                     57
+#define PD10                    58
+#define PD11                    PIN_A17
+#define PD12                    PIN_A18
+#define PD13                    PIN_A19
+#define PD14                    62
+#define PD15                    63
+#define PE0                     64
+#define PE1                     65
+#define PE2                     66
+#define PE3                     67
+#define PE4                     68
+#define PE5                     69
+#define PE6                     70
+#define PE7                     71
+#define PE8                     72
+#define PE9                     73
+#define PE10                    74
+#define PE11                    75
+#define PE12                    76
+#define PE13                    77
+#define PE14                    78
+#define PE15                    79
+#define PF0                     80
+#define PF1                     81
+#define PF2                     82
+#define PF3                     83
+#define PF4                     84
+#define PF5                     85
+#define PF6                     86
+#define PF7                     87
+#define PF8                     88
+#define PF9                     89
+#define PF10                    90
+#define PF11                    91
+#define PF12                    92
+#define PF13                    93
+#define PF14                    PIN_A20
+#define PF15                    PIN_A21
+#define PG0                     PIN_A22
+#define PG1                     PIN_A23
+#define PG2                     98
+#define PG3                     99
+#define PG4                     100
+#define PG5                     101
+#define PG6                     102
+#define PG7                     103
+#define PG8                     104
+#define PG9                     105
+#define PG10                    106
+#define PG11                    107
+#define PG12                    108
+#define PG13                    109
+#define PG14                    110
+#define PG15                    111
+#define PH0                     112
+#define PH1                     113
+#define PH2                     114
+#define PH3                     115
+#define PH4                     116
+#define PH5                     117
+#define PH6                     118
+#define PH7                     119
+#define PH8                     120
+#define PH9                     121
+#define PH10                    122
+#define PH11                    123
+#define PH12                    124
+#define PH13                    125
+#define PH14                    126
+#define PH15                    127
+#define PI0                     128
+#define PI1                     129
+#define PI2                     130
+#define PI3                     131
+#define PI4                     132
+#define PI5                     133
+#define PI6                     134
+#define PI7                     135
+#define PI8                     136
+#define PI9                     137
+#define PI10                    138
+#define PI11                    139
+#define PI12                    140
+#define PI13                    141
+#define PI14                    142
+#define PI15                    143
+#define PJ0                     144
+
+// Alternate pins number
+#define PA0_ALT1                (PA0  | ALT1)
+#define PA1_ALT1                (PA1  | ALT1)
+#define PA1_ALT2                (PA1  | ALT2)
+#define PA2_ALT1                (PA2  | ALT1)
+#define PA2_ALT2                (PA2  | ALT2)
+#define PA3_ALT1                (PA3  | ALT1)
+#define PA3_ALT2                (PA3  | ALT2)
+#define PA4_ALT1                (PA4  | ALT1)
+#define PA4_ALT2                (PA4  | ALT2)
+#define PA5_ALT1                (PA5  | ALT1)
+#define PA5_ALT2                (PA5  | ALT2)
+#define PA6_ALT1                (PA6  | ALT1)
+#define PA6_ALT2                (PA6  | ALT2)
+#define PA7_ALT1                (PA7  | ALT1)
+#define PA7_ALT2                (PA7  | ALT2)
+#define PA7_ALT3                (PA7  | ALT3)
+#define PA15_ALT1               (PA15 | ALT1)
+#define PB0_ALT1                (PB0  | ALT1)
+#define PB0_ALT2                (PB0  | ALT2)
+#define PB1_ALT1                (PB1  | ALT1)
+#define PB1_ALT2                (PB1  | ALT2)
+#define PB2_ALT1                (PB2  | ALT1)
+#define PB3_ALT1                (PB3  | ALT1)
+#define PB4_ALT1                (PB4  | ALT1)
+#define PB5_ALT1                (PB5  | ALT1)
+#define PB6_ALT1                (PB6  | ALT1)
+#define PB7_ALT1                (PB7  | ALT1)
+#define PB8_ALT1                (PB8  | ALT1)
+#define PB8_ALT2                (PB8  | ALT2)
+#define PB9_ALT1                (PB9  | ALT1)
+#define PB9_ALT2                (PB9  | ALT2)
+#define PB10_ALT1               (PB10 | ALT1)
+#define PB11_ALT1               (PB11 | ALT1)
+#define PB13_ALT1               (PB13 | ALT1)
+#define PB14_ALT1               (PB14 | ALT1)
+#define PB14_ALT2               (PB14 | ALT2)
+#define PB15_ALT1               (PB15 | ALT1)
+#define PB15_ALT2               (PB15 | ALT2)
+#define PC0_ALT1                (PC0  | ALT1)
+#define PC0_ALT2                (PC0  | ALT2)
+#define PC1_ALT1                (PC1  | ALT1)
+#define PC1_ALT2                (PC1  | ALT2)
+#define PC2_ALT1                (PC2  | ALT1)
+#define PC2_ALT2                (PC2  | ALT2)
+#define PC3_ALT1                (PC3  | ALT1)
+#define PC3_ALT2                (PC3  | ALT2)
+#define PC4_ALT1                (PC4  | ALT1)
+#define PC4_ALT2                (PC4  | ALT2)
+#define PC5_ALT1                (PC5  | ALT1)
+#define PC5_ALT2                (PC5  | ALT2)
+#define PC6_ALT1                (PC6  | ALT1)
+#define PC6_ALT2                (PC6  | ALT2)
+#define PC7_ALT1                (PC7  | ALT1)
+#define PC7_ALT2                (PC7  | ALT2)
+#define PC8_ALT1                (PC8  | ALT1)
+#define PC9_ALT1                (PC9  | ALT1)
+#define PC10_ALT1               (PC10 | ALT1)
+#define PC11_ALT1               (PC11 | ALT1)
+#define PD0_ALT1                (PD0  | ALT1)
+#define PD1_ALT1                (PD1  | ALT1)
+#define PF0_ALT1                (PF0  | ALT1)
+#define PF1_ALT1                (PF1  | ALT1)
+#define PF9_ALT1                (PF9  | ALT1)
+#define PH12_ALT1               (PH12 | ALT1)
+
+#define NUM_DIGITAL_PINS        145
+#define NUM_ANALOG_INPUTS       24
+
+// On-board LED pin number
+#ifndef LED_BUILTIN
+  #define LED_BUILTIN           PNUM_NOT_DEFINED
+#endif
+
+// On-board user button
+#ifndef USER_BTN
+  #define USER_BTN              PNUM_NOT_DEFINED
+#endif
+
+// SPI definitions
+#ifndef PIN_SPI_SS
+  #define PIN_SPI_SS            PA4
+#endif
+#ifndef PIN_SPI_SS1
+  #define PIN_SPI_SS1           PA15
+#endif
+#ifndef PIN_SPI_SS2
+  #define PIN_SPI_SS2           PB0
+#endif
+#ifndef PIN_SPI_SS3
+  #define PIN_SPI_SS3           PE12
+#endif
+#ifndef PIN_SPI_MOSI
+  #define PIN_SPI_MOSI          PA7
+#endif
+#ifndef PIN_SPI_MISO
+  #define PIN_SPI_MISO          PA6
+#endif
+#ifndef PIN_SPI_SCK
+  #define PIN_SPI_SCK           PA1
+#endif
+
+// I2C definitions
+#ifndef PIN_WIRE_SDA
+  #define PIN_WIRE_SDA          PB3
+#endif
+#ifndef PIN_WIRE_SCL
+  #define PIN_WIRE_SCL          PB6
+#endif
+
+// Timer Definitions
+// Use TIM6/TIM7 when possible as servo and tone don't need GPIO output pin
+#ifndef TIMER_TONE
+  #define TIMER_TONE            TIM6
+#endif
+#ifndef TIMER_SERVO
+  #define TIMER_SERVO           TIM7
+#endif
+
+// UART Definitions
+#ifndef SERIAL_UART_INSTANCE
+  #define SERIAL_UART_INSTANCE  4
+#endif
+
+// Default pin used for generic 'Serial' instance
+// Mandatory for Firmata
+#ifndef PIN_SERIAL_RX
+  #define PIN_SERIAL_RX         PA1
+#endif
+#ifndef PIN_SERIAL_TX
+  #define PIN_SERIAL_TX         PA0
+#endif
+
+// Extra HAL modules
+#if !defined(HAL_DAC_MODULE_DISABLED)
+  #define HAL_DAC_MODULE_ENABLED
+#endif
+#if !defined(HAL_OSPI_MODULE_DISABLED)
+  #define HAL_OSPI_MODULE_ENABLED
+#endif
+#if !defined(HAL_SD_MODULE_DISABLED)
+  #define HAL_SD_MODULE_ENABLED
+#endif
+
+// Alternate SYS_WKUP definition
+#define PWR_WAKEUP_PIN1_1
+#define PWR_WAKEUP_PIN1_2
+#define PWR_WAKEUP_PIN2_1
+#define PWR_WAKEUP_PIN2_2
+#define PWR_WAKEUP_PIN3_1
+#define PWR_WAKEUP_PIN3_2
+#define PWR_WAKEUP_PIN4_1
+#define PWR_WAKEUP_PIN4_2
+#define PWR_WAKEUP_PIN5_1
+#define PWR_WAKEUP_PIN5_2
+#define PWR_WAKEUP_PIN6_1
+#define PWR_WAKEUP_PIN6_2
+#define PWR_WAKEUP_PIN7_1
+#define PWR_WAKEUP_PIN7_2
+#define PWR_WAKEUP_PIN8_1
+#define PWR_WAKEUP_PIN8_2
+
+/*----------------------------------------------------------------------------
+ *        Arduino objects - C++ only
+ *----------------------------------------------------------------------------*/
+
+#ifdef __cplusplus
+  // These serial port names are intended to allow libraries and architecture-neutral
+  // sketches to automatically default to the correct port name for a particular type
+  // of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
+  // the first hardware serial port whose RX/TX pins are not dedicated to another use.
+  //
+  // SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
+  //
+  // SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
+  //
+  // SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
+  //
+  // SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
+  //
+  // SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
+  //                            pins are NOT connected to anything by default.
+  #ifndef SERIAL_PORT_MONITOR
+    #define SERIAL_PORT_MONITOR   Serial
+  #endif
+  #ifndef SERIAL_PORT_HARDWARE
+    #define SERIAL_PORT_HARDWARE  Serial
+  #endif
+#endif
diff --git a/variants/STM32U5xx/U599N(I-J)HxQ_U5A9NJHxQ/PeripheralPins.c b/variants/STM32U5xx/U599N(I-J)HxQ_U5A9NJHxQ/PeripheralPins.c
new file mode 100644
index 0000000000..61e97ec25e
--- /dev/null
+++ b/variants/STM32U5xx/U599N(I-J)HxQ_U5A9NJHxQ/PeripheralPins.c
@@ -0,0 +1,656 @@
+/*
+ *******************************************************************************
+ * Copyright (c) 2020, STMicroelectronics
+ * All rights reserved.
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ *******************************************************************************
+ */
+/*
+ * Automatically generated from STM32U599NIHxQ.xml, STM32U599NJHxQ.xml
+ * STM32U5A9NJHxQ.xml
+ * CubeMX DB release 6.0.50
+ */
+#if !defined(CUSTOM_PERIPHERAL_PINS)
+#include "Arduino.h"
+#include "PeripheralPins.h"
+
+/* =====
+ * Notes:
+ * - The pins mentioned Px_y_ALTz are alternative possibilities which use other
+ *   HW peripheral instances. You can use them the same way as any other "normal"
+ *   pin (i.e. analogWrite(PA7_ALT1, 128);).
+ *
+ * - Commented lines are alternative possibilities which are not used per default.
+ *   If you change them, you will have to know what you do
+ * =====
+ */
+
+//*** ADC ***
+
+#ifdef HAL_ADC_MODULE_ENABLED
+WEAK const PinMap PinMap_ADC[] = {
+  {PA_0,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC1_IN5
+  {PA_0_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC2_IN5
+  {PA_1,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC1_IN6
+  {PA_1_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC2_IN6
+  {PA_2,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC1_IN7
+  {PA_2_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC2_IN7
+  {PA_3,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC1_IN8
+  {PA_3_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC2_IN8
+  {PA_4,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC1_IN9
+  {PA_4_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC2_IN9
+  {PA_4_ALT2, ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC4_IN9
+  {PA_5,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC1_IN10
+  {PA_5_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC2_IN10
+  {PA_5_ALT2, ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC4_IN10
+  {PA_6,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC1_IN11
+  {PA_6_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC2_IN11
+  {PA_6_ALT2, ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC4_IN11
+  {PA_7,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 12, 0)}, // ADC1_IN12
+  {PA_7_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 12, 0)}, // ADC2_IN12
+  {PA_7_ALT2, ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 20, 0)}, // ADC4_IN20
+  {PB_0,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC1_IN15
+  {PB_0_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC2_IN15
+  {PB_0_ALT2, ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 18, 0)}, // ADC4_IN18
+  {PB_1,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 16, 0)}, // ADC1_IN16
+  {PB_1_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 16, 0)}, // ADC2_IN16
+  {PB_1_ALT2, ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 19, 0)}, // ADC4_IN19
+  {PB_2,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 17, 0)}, // ADC1_IN17
+  {PB_2_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 17, 0)}, // ADC2_IN17
+  {PC_0,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC1_IN1
+  {PC_0_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC2_IN1
+  {PC_0_ALT2, ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC4_IN1
+  {PC_1,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC1_IN2
+  {PC_1_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC2_IN2
+  {PC_1_ALT2, ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC4_IN2
+  {PC_2,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC1_IN3
+  {PC_2_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC2_IN3
+  {PC_2_ALT2, ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC4_IN3
+  {PC_3,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC1_IN4
+  {PC_3_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC2_IN4
+  {PC_3_ALT2, ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC4_IN4
+  {PC_4,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 13, 0)}, // ADC1_IN13
+  {PC_4_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 13, 0)}, // ADC2_IN13
+  {PC_4_ALT2, ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 22, 0)}, // ADC4_IN22
+  {PC_5,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC1_IN14
+  {PC_5_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC2_IN14
+  {PC_5_ALT2, ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 23, 0)}, // ADC4_IN23
+  {PD_11,     ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC4_IN15
+  {PD_12,     ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 16, 0)}, // ADC4_IN16
+  {PD_13,     ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 17, 0)}, // ADC4_IN17
+  {PF_14,     ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC4_IN5
+  {PF_15,     ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC4_IN6
+  {PG_0,      ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC4_IN7
+  {PG_1,      ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC4_IN8
+  {NC,        NP,   0}
+};
+#endif
+
+//*** DAC ***
+
+#ifdef HAL_DAC_MODULE_ENABLED
+WEAK const PinMap PinMap_DAC[] = {
+  {PA_4, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // DAC1_OUT1
+  {PA_5, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // DAC1_OUT2
+  {NC,   NP,   0}
+};
+#endif
+
+//*** I2C ***
+
+#ifdef HAL_I2C_MODULE_ENABLED
+WEAK const PinMap PinMap_I2C_SDA[] = {
+  {PB_3,       I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  {PB_4,       I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
+  {PB_7,       I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  {PB_7_ALT1,  I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF5_I2C4)},
+  {PB_9,       I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  {PB_11,      I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
+  {PB_11_ALT1, I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF3_I2C4)},
+  {PB_14,      I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
+  {PC_1,       I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
+  {PD_0,       I2C5, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C5)},
+  {PD_0_ALT1,  I2C6, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF2_I2C6)},
+  {PD_13,      I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C4)},
+  {PF_0,       I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
+  {PF_0_ALT1,  I2C6, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF2_I2C6)},
+  {PF_15,      I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C4)},
+  {PG_8,       I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
+  {PG_13,      I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  {PH_4,       I2C5, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF2_I2C5)},
+  {PH_5,       I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
+  {PH_8,       I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
+  {PJ_1,       I2C5, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C5)},
+  {PJ_9,       I2C6, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF2_I2C6)},
+  {NC,         NP,   0}
+};
+#endif
+
+#ifdef HAL_I2C_MODULE_ENABLED
+WEAK const PinMap PinMap_I2C_SCL[] = {
+  {PA_7,       I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
+  {PB_6,       I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  {PB_6_ALT1,  I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF5_I2C4)},
+  {PB_8,       I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  {PB_10,      I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
+  {PB_10_ALT1, I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF3_I2C4)},
+  {PB_13,      I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
+  {PC_0,       I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
+  {PD_1,       I2C5, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C5)},
+  {PD_1_ALT1,  I2C6, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF2_I2C6)},
+  {PD_12,      I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C4)},
+  {PF_1,       I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
+  {PF_1_ALT1,  I2C6, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF2_I2C6)},
+  {PF_14,      I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C4)},
+  {PG_7,       I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
+  {PG_14,      I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  {PH_4,       I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
+  {PH_5,       I2C5, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF2_I2C5)},
+  {PH_7,       I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
+  {PJ_2,       I2C5, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C5)},
+  {PJ_10,      I2C6, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF2_I2C6)},
+  {NC,         NP,   0}
+};
+#endif
+
+//*** TIM ***
+
+#ifdef HAL_TIM_MODULE_ENABLED
+WEAK const PinMap PinMap_TIM[] = {
+  {PA_0,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
+  {PA_0_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)}, // TIM5_CH1
+  {PA_1,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
+  {PA_1_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 2, 0)}, // TIM5_CH2
+  {PA_1_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM15, 1, 1)}, // TIM15_CH1N
+  {PA_2,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
+  {PA_2_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 3, 0)}, // TIM5_CH3
+  {PA_2_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM15, 1, 0)}, // TIM15_CH1
+  {PA_3,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4
+  {PA_3_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 4, 0)}, // TIM5_CH4
+  {PA_3_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM15, 2, 0)}, // TIM15_CH2
+  {PA_5,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
+  {PA_5_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 1)}, // TIM8_CH1N
+  {PA_6,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
+  {PA_6_ALT1,  TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM16, 1, 0)}, // TIM16_CH1
+  {PA_7,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
+  {PA_7_ALT1,  TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
+  {PA_7_ALT2,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 1)}, // TIM8_CH1N
+  {PA_7_ALT3,  TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM17, 1, 0)}, // TIM17_CH1
+  {PA_8,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)}, // TIM1_CH1
+  {PA_9,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 0)}, // TIM1_CH2
+  {PA_10,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 0)}, // TIM1_CH3
+  {PA_11,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 4, 0)}, // TIM1_CH4
+  {PA_15,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
+  {PB_0,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
+  {PB_0_ALT1,  TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)}, // TIM3_CH3
+  {PB_0_ALT2,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 1)}, // TIM8_CH2N
+  {PB_1,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
+  {PB_1_ALT1,  TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
+  {PB_1_ALT2,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 1)}, // TIM8_CH3N
+  {PB_2,       TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 4, 1)}, // TIM8_CH4N
+  {PB_3,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
+  {PB_4,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
+  {PB_5,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
+  {PB_6,       TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 1, 0)}, // TIM4_CH1
+  {PB_6_ALT1,  TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM16, 1, 1)}, // TIM16_CH1N
+  {PB_7,       TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 2, 0)}, // TIM4_CH2
+  {PB_7_ALT1,  TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM17, 1, 1)}, // TIM17_CH1N
+  {PB_8,       TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 3, 0)}, // TIM4_CH3
+  {PB_8_ALT1,  TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM16, 1, 0)}, // TIM16_CH1
+  {PB_9,       TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)}, // TIM4_CH4
+  {PB_9_ALT1,  TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM17, 1, 0)}, // TIM17_CH1
+  {PB_10,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
+  {PB_11,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4
+  {PB_13,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
+  {PB_13_ALT1, TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM15, 1, 1)}, // TIM15_CH1N
+  {PB_14,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
+  {PB_14_ALT1, TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 1)}, // TIM8_CH2N
+  {PB_14_ALT2, TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM15, 1, 0)}, // TIM15_CH1
+  {PB_15,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
+  {PB_15_ALT1, TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 1)}, // TIM8_CH3N
+  {PB_15_ALT2, TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM15, 2, 0)}, // TIM15_CH2
+  {PC_5,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 4, 1)}, // TIM1_CH4N
+  {PC_6,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
+  {PC_6_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 0)}, // TIM8_CH1
+  {PC_7,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
+  {PC_7_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 0)}, // TIM8_CH2
+  {PC_8,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)}, // TIM3_CH3
+  {PC_8_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 0)}, // TIM8_CH3
+  {PC_9,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
+  {PC_9_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 4, 0)}, // TIM8_CH4
+  {PD_0,       TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 4, 1)}, // TIM8_CH4N
+  {PD_12,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 1, 0)}, // TIM4_CH1
+  {PD_13,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 2, 0)}, // TIM4_CH2
+  {PD_14,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 3, 0)}, // TIM4_CH3
+  {PD_15,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)}, // TIM4_CH4
+  {PE_0,       TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM16, 1, 0)}, // TIM16_CH1
+  {PE_1,       TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM17, 1, 0)}, // TIM17_CH1
+  {PE_3,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
+  {PE_4,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
+  {PE_5,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)}, // TIM3_CH3
+  {PE_6,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
+  {PE_8,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
+  {PE_9,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)}, // TIM1_CH1
+  {PE_10,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
+  {PE_11,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 0)}, // TIM1_CH2
+  {PE_12,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
+  {PE_13,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 0)}, // TIM1_CH3
+  {PE_14,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 4, 0)}, // TIM1_CH4
+  {PE_15,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM1, 4, 1)}, // TIM1_CH4N
+  {PF_6,       TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)}, // TIM5_CH1
+  {PF_7,       TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 2, 0)}, // TIM5_CH2
+  {PF_8,       TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 3, 0)}, // TIM5_CH3
+  {PF_9,       TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 4, 0)}, // TIM5_CH4
+  {PF_9_ALT1,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM15, 1, 0)}, // TIM15_CH1
+  {PF_10,      TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM15, 2, 0)}, // TIM15_CH2
+  {PG_9,       TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM15, 1, 1)}, // TIM15_CH1N
+  {PG_10,      TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM15, 1, 0)}, // TIM15_CH1
+  {PG_11,      TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM15, 2, 0)}, // TIM15_CH2
+  {PH_10,      TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)}, // TIM5_CH1
+  {PH_11,      TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 2, 0)}, // TIM5_CH2
+  {PH_12,      TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 3, 0)}, // TIM5_CH3
+  {PH_12_ALT1, TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 4, 1)}, // TIM8_CH4N
+  {PH_13,      TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 1)}, // TIM8_CH1N
+  {PH_14,      TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 1)}, // TIM8_CH2N
+  {PH_15,      TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 1)}, // TIM8_CH3N
+  {PI_0,       TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 4, 0)}, // TIM5_CH4
+  {PI_2,       TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 4, 0)}, // TIM8_CH4
+  {PI_5,       TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 0)}, // TIM8_CH1
+  {PI_6,       TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 0)}, // TIM8_CH2
+  {PI_7,       TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 0)}, // TIM8_CH3
+  {NC,         NP,    0}
+};
+#endif
+
+//*** UART ***
+
+#ifdef HAL_UART_MODULE_ENABLED
+WEAK const PinMap PinMap_UART_TX[] = {
+  {PA_0,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
+  {PA_2,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
+  {PA_2_ALT1,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PA_7,       USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PA_9,       USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {PB_6,       USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {PB_10,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PB_11,      LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
+  {PC_1,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
+  {PC_3,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {PC_4,       USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PC_9,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {PC_10,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
+  {PC_10_ALT1, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PC_12,      UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
+  {PD_5,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PD_8,       USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PE_1,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {PF_0,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {PF_3,       UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
+  {PG_7,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
+  {PG_9,       USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {PJ_3,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {NC,         NP,      0}
+};
+#endif
+
+#ifdef HAL_UART_MODULE_ENABLED
+WEAK const PinMap PinMap_UART_RX[] = {
+  {PA_1,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
+  {PA_3,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
+  {PA_3_ALT1,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PA_5,       USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PA_10,      USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {PA_15,      USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_USART2)},
+  {PB_7,       USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {PB_10,      LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
+  {PB_11,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PC_0,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
+  {PC_2,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {PC_5,       USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PC_8,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {PC_11,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
+  {PC_11_ALT1, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PD_2,       UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
+  {PD_6,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PD_9,       USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PE_0,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {PF_1,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {PF_4,       UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
+  {PG_8,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
+  {PG_10,      USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {PJ_4,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {NC,         NP,      0}
+};
+#endif
+
+#ifdef HAL_UART_MODULE_ENABLED
+WEAK const PinMap PinMap_UART_RTS[] = {
+  {PA_1,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PA_12,      USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {PA_15,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
+  {PA_15_ALT1, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PB_1,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
+  {PB_1_ALT1,  USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PB_3,       USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {PB_4,       UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
+  {PB_12,      LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
+  {PB_14,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PD_2,       USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PD_4,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PD_12,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PD_15,      USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {PE_4,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {PF_4,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {PG_6,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
+  {PG_12,      USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {PJ_5,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {NC,         NP,      0}
+};
+#endif
+
+#ifdef HAL_UART_MODULE_ENABLED
+WEAK const PinMap PinMap_UART_CTS[] = {
+  {PA_0,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PA_6,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
+  {PA_6_ALT1,  USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PA_11,      USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {PB_4,       USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {PB_5,       UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
+  {PB_7,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
+  {PB_13,      LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
+  {PB_13_ALT1, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PC_0,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {PD_3,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PD_11,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PD_13,      USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {PE_3,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {PF_3,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {PG_5,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
+  {PG_11,      USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {PJ_7,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {NC,         NP,      0}
+};
+#endif
+
+//*** SPI ***
+
+#ifdef HAL_SPI_MODULE_ENABLED
+WEAK const PinMap PinMap_SPI_MOSI[] = {
+  {PA_7,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PA_12,     SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PB_5,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PB_5_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PB_15,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PC_1,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_SPI2)},
+  {PC_3,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PC_12,     SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PD_4,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PD_6,      SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI3)},
+  {PE_15,     SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PG_4,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PG_11,     SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PI_3,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {NC,        NP,   0}
+};
+#endif
+
+#ifdef HAL_SPI_MODULE_ENABLED
+WEAK const PinMap PinMap_SPI_MISO[] = {
+  {PA_6,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PA_11,     SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PB_4,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PB_4_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PB_14,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PC_2,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PC_11,     SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PD_3,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PE_14,     SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PG_3,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PG_10,     SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PI_2,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {NC,        NP,   0}
+};
+#endif
+
+#ifdef HAL_SPI_MODULE_ENABLED
+WEAK const PinMap PinMap_SPI_SCLK[] = {
+  {PA_1,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PA_5,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PA_9,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_SPI2)},
+  {PB_3,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PB_3_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PB_10,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PB_13,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PC_10,     SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PD_1,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PD_3,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_SPI2)},
+  {PE_13,     SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PG_2,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PG_9,      SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PI_1,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {NC,        NP,   0}
+};
+#endif
+
+#ifdef HAL_SPI_MODULE_ENABLED
+WEAK const PinMap PinMap_SPI_SSEL[] = {
+  {PA_4,       SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PA_4_ALT1,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PA_15,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PA_15_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PB_0,       SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PB_9,       SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PB_12,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PD_0,       SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PE_12,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PG_5,       SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PG_12,      SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PI_0,       SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {NC,         NP,   0}
+};
+#endif
+
+//*** FDCAN ***
+
+#ifdef HAL_FDCAN_MODULE_ENABLED
+WEAK const PinMap PinMap_CAN_RD[] = {
+  {PA_11, FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
+  {PB_8,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
+  {PD_0,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
+  {PF_7,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
+  {PH_14, FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
+  {NC,    NP,     0}
+};
+#endif
+
+#ifdef HAL_FDCAN_MODULE_ENABLED
+WEAK const PinMap PinMap_CAN_TD[] = {
+  {PA_12, FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
+  {PB_9,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
+  {PD_1,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
+  {PF_8,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
+  {PH_13, FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
+  {NC,    NP,     0}
+};
+#endif
+
+//*** No ETHERNET ***
+
+//*** OCTOSPI ***
+
+#ifdef HAL_OSPI_MODULE_ENABLED
+WEAK const PinMap PinMap_OCTOSPI_DATA0[] = {
+  {PB_1,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO0
+  {PE_12, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO0
+  {PF_0,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P2_IO0
+  {PF_8,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO0
+  {PI_3,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_OCTOSPI1)}, // OCTOSPIM_P2_IO0
+  {NC,    NP,       0}
+};
+#endif
+
+#ifdef HAL_OSPI_MODULE_ENABLED
+WEAK const PinMap PinMap_OCTOSPI_DATA1[] = {
+  {PB_0,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO1
+  {PE_13, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO1
+  {PF_1,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P2_IO1
+  {PF_9,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO1
+  {PI_2,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_OCTOSPI1)}, // OCTOSPIM_P2_IO1
+  {NC,    NP,       0}
+};
+#endif
+
+#ifdef HAL_OSPI_MODULE_ENABLED
+WEAK const PinMap PinMap_OCTOSPI_DATA2[] = {
+  {PA_7,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO2
+  {PE_14, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO2
+  {PF_2,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P2_IO2
+  {PF_7,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO2
+  {PI_1,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_OCTOSPI1)}, // OCTOSPIM_P2_IO2
+  {NC,    NP,       0}
+};
+#endif
+
+#ifdef HAL_OSPI_MODULE_ENABLED
+WEAK const PinMap PinMap_OCTOSPI_DATA3[] = {
+  {PA_6,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO3
+  {PE_15, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO3
+  {PF_3,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P2_IO3
+  {PF_6,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO3
+  {PH_8,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P2_IO3
+  {NC,    NP,       0}
+};
+#endif
+
+#ifdef HAL_OSPI_MODULE_ENABLED
+WEAK const PinMap PinMap_OCTOSPI_DATA4[] = {
+  {PC_1, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO4
+  {PD_4, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO4
+  {PG_0, OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P2_IO4
+  {PH_2, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_OCTOSPI1)}, // OCTOSPIM_P1_IO4
+  {PH_9, OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P2_IO4
+  {NC,   NP,       0}
+};
+#endif
+
+#ifdef HAL_OSPI_MODULE_ENABLED
+WEAK const PinMap PinMap_OCTOSPI_DATA5[] = {
+  {PC_2,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO5
+  {PD_5,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO5
+  {PG_1,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P2_IO5
+  {PG_11, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_OCTOSPI1)}, // OCTOSPIM_P1_IO5
+  {PH_10, OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P2_IO5
+  {PI_0,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_OCTOSPI1)}, // OCTOSPIM_P1_IO5
+  {NC,    NP,       0}
+};
+#endif
+
+#ifdef HAL_OSPI_MODULE_ENABLED
+WEAK const PinMap PinMap_OCTOSPI_DATA6[] = {
+  {PC_3,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO6
+  {PD_6,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO6
+  {PG_9,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P2_IO6
+  {PH_11, OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P2_IO6
+  {PH_15, OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P2_IO6
+  {NC,    NP,       0}
+};
+#endif
+
+#ifdef HAL_OSPI_MODULE_ENABLED
+WEAK const PinMap PinMap_OCTOSPI_DATA7[] = {
+  {PC_0,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_OCTOSPI1)}, // OCTOSPIM_P1_IO7
+  {PC_4,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO7
+  {PD_7,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_IO7
+  {PG_10, OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P2_IO7
+  {PH_12, OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P2_IO7
+  {NC,    NP,       0}
+};
+#endif
+
+#ifdef HAL_OSPI_MODULE_ENABLED
+WEAK const PinMap PinMap_OCTOSPI_SCLK[] = {
+  {PA_3,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_CLK
+  {PB_10, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_CLK
+  {PE_10, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_CLK
+  {PF_4,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P2_CLK
+  {PF_10, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_OCTOSPI1)}, // OCTOSPIM_P1_CLK
+  {PH_6,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P2_CLK
+  {PI_6,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P2_CLK
+  {NC,    NP,       0}
+};
+#endif
+
+#ifdef HAL_OSPI_MODULE_ENABLED
+WEAK const PinMap PinMap_OCTOSPI_SSEL[] = {
+  {PA_0,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P2_NCS
+  {PA_2,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_NCS
+  {PA_4,  OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_OCTOSPI1)}, // OCTOSPIM_P1_NCS
+  {PA_12, OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_OCTOSPI1)}, // OCTOSPIM_P2_NCS
+  {PB_11, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_NCS
+  {PC_11, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P1_NCS
+  {PD_3,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P2_NCS
+  {PE_11, OCTOSPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPI1)}, // OCTOSPIM_P1_NCS
+  {PF_6,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P2_NCS
+  {PG_12, OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P2_NCS
+  {PI_5,  OCTOSPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_OCTOSPI2)}, // OCTOSPIM_P2_NCS
+  {NC,    NP,       0}
+};
+#endif
+
+//*** USB ***
+
+#if defined(HAL_PCD_MODULE_ENABLED) || defined(HAL_HCD_MODULE_ENABLED)
+WEAK const PinMap PinMap_USB_OTG_HS[] = {
+#ifdef USE_USB_HS_IN_FS
+  {PA_8,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_USB_HS)}, // USB_OTG_HS_SOF
+  {PA_9,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
+  {PA_10, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_USB_HS)}, // USB_OTG_HS_ID
+  {PA_11, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)}, // USB_OTG_HS_DM
+  {PA_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)}, // USB_OTG_HS_DP
+  {PA_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_USB_HS)}, // USB_OTG_HS_SOF
+#endif /* USE_USB_HS_IN_FS */
+  {NC,    NP,         0}
+};
+#endif
+
+//*** SD ***
+
+#ifdef HAL_SD_MODULE_ENABLED
+WEAK const PinMap PinMap_SD[] = {
+  {PA_0,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDMMC2)}, // SDMMC2_CMD
+  {PB_3,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC2)}, // SDMMC2_D2
+  {PB_4,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC2)}, // SDMMC2_D3
+  {PB_8,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF8_SDMMC1)}, // SDMMC1_CKIN
+  {PB_8_ALT1, SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D4
+  {PB_8_ALT2, SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_SDMMC2)}, // SDMMC2_D4
+  {PB_9,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF8_SDMMC1)}, // SDMMC1_CDIR
+  {PB_9_ALT1, SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D5
+  {PB_9_ALT2, SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_SDMMC2)}, // SDMMC2_D5
+  {PB_14,     SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC2)}, // SDMMC2_D0
+  {PB_15,     SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC2)}, // SDMMC2_D1
+  {PC_0,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D5
+  {PC_1,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDMMC2)}, // SDMMC2_CK
+  {PC_6,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF8_SDMMC1)}, // SDMMC1_D0DIR
+  {PC_6_ALT1, SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D6
+  {PC_6_ALT2, SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_SDMMC2)}, // SDMMC2_D6
+  {PC_7,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF8_SDMMC1)}, // SDMMC1_D123DIR
+  {PC_7_ALT1, SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D7
+  {PC_7_ALT2, SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_SDMMC2)}, // SDMMC2_D7
+  {PC_8,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D0
+  {PC_9,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D1
+  {PC_10,     SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D2
+  {PC_11,     SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDMMC1)}, // SDMMC1_D3
+  {PC_12,     SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDMMC1)}, // SDMMC1_CK
+  {PD_2,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDMMC1)}, // SDMMC1_CMD
+  {PD_6,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF11_SDMMC2)}, // SDMMC2_CK
+  {PD_7,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF11_SDMMC2)}, // SDMMC2_CMD
+  {NC,        NP,     0}
+};
+#endif
+
+#endif /* !CUSTOM_PERIPHERAL_PINS */
diff --git a/variants/STM32U5xx/U599N(I-J)HxQ_U5A9NJHxQ/PinNamesVar.h b/variants/STM32U5xx/U599N(I-J)HxQ_U5A9NJHxQ/PinNamesVar.h
new file mode 100644
index 0000000000..b3c0067b29
--- /dev/null
+++ b/variants/STM32U5xx/U599N(I-J)HxQ_U5A9NJHxQ/PinNamesVar.h
@@ -0,0 +1,153 @@
+/* Alternate pin name */
+PA_0_ALT1  = PA_0  | ALT1,
+PA_1_ALT1  = PA_1  | ALT1,
+PA_1_ALT2  = PA_1  | ALT2,
+PA_2_ALT1  = PA_2  | ALT1,
+PA_2_ALT2  = PA_2  | ALT2,
+PA_3_ALT1  = PA_3  | ALT1,
+PA_3_ALT2  = PA_3  | ALT2,
+PA_4_ALT1  = PA_4  | ALT1,
+PA_4_ALT2  = PA_4  | ALT2,
+PA_5_ALT1  = PA_5  | ALT1,
+PA_5_ALT2  = PA_5  | ALT2,
+PA_6_ALT1  = PA_6  | ALT1,
+PA_6_ALT2  = PA_6  | ALT2,
+PA_7_ALT1  = PA_7  | ALT1,
+PA_7_ALT2  = PA_7  | ALT2,
+PA_7_ALT3  = PA_7  | ALT3,
+PA_15_ALT1 = PA_15 | ALT1,
+PB_0_ALT1  = PB_0  | ALT1,
+PB_0_ALT2  = PB_0  | ALT2,
+PB_1_ALT1  = PB_1  | ALT1,
+PB_1_ALT2  = PB_1  | ALT2,
+PB_2_ALT1  = PB_2  | ALT1,
+PB_3_ALT1  = PB_3  | ALT1,
+PB_4_ALT1  = PB_4  | ALT1,
+PB_5_ALT1  = PB_5  | ALT1,
+PB_6_ALT1  = PB_6  | ALT1,
+PB_7_ALT1  = PB_7  | ALT1,
+PB_8_ALT1  = PB_8  | ALT1,
+PB_8_ALT2  = PB_8  | ALT2,
+PB_9_ALT1  = PB_9  | ALT1,
+PB_9_ALT2  = PB_9  | ALT2,
+PB_10_ALT1 = PB_10 | ALT1,
+PB_11_ALT1 = PB_11 | ALT1,
+PB_13_ALT1 = PB_13 | ALT1,
+PB_14_ALT1 = PB_14 | ALT1,
+PB_14_ALT2 = PB_14 | ALT2,
+PB_15_ALT1 = PB_15 | ALT1,
+PB_15_ALT2 = PB_15 | ALT2,
+PC_0_ALT1  = PC_0  | ALT1,
+PC_0_ALT2  = PC_0  | ALT2,
+PC_1_ALT1  = PC_1  | ALT1,
+PC_1_ALT2  = PC_1  | ALT2,
+PC_2_ALT1  = PC_2  | ALT1,
+PC_2_ALT2  = PC_2  | ALT2,
+PC_3_ALT1  = PC_3  | ALT1,
+PC_3_ALT2  = PC_3  | ALT2,
+PC_4_ALT1  = PC_4  | ALT1,
+PC_4_ALT2  = PC_4  | ALT2,
+PC_5_ALT1  = PC_5  | ALT1,
+PC_5_ALT2  = PC_5  | ALT2,
+PC_6_ALT1  = PC_6  | ALT1,
+PC_6_ALT2  = PC_6  | ALT2,
+PC_7_ALT1  = PC_7  | ALT1,
+PC_7_ALT2  = PC_7  | ALT2,
+PC_8_ALT1  = PC_8  | ALT1,
+PC_9_ALT1  = PC_9  | ALT1,
+PC_10_ALT1 = PC_10 | ALT1,
+PC_11_ALT1 = PC_11 | ALT1,
+PD_0_ALT1  = PD_0  | ALT1,
+PD_1_ALT1  = PD_1  | ALT1,
+PF_0_ALT1  = PF_0  | ALT1,
+PF_1_ALT1  = PF_1  | ALT1,
+PF_9_ALT1  = PF_9  | ALT1,
+PH_12_ALT1 = PH_12 | ALT1,
+
+/* SYS_WKUP */
+#ifdef PWR_WAKEUP_PIN1
+  SYS_WKUP1 = PE_4,
+#endif
+#ifdef PWR_WAKEUP_PIN1
+  SYS_WKUP1_1 = PA_0,
+#endif
+#ifdef PWR_WAKEUP_PIN1
+  SYS_WKUP1_2 = PB_2,
+#endif
+#ifdef PWR_WAKEUP_PIN2
+  SYS_WKUP2 = PE_5,
+#endif
+#ifdef PWR_WAKEUP_PIN2
+  SYS_WKUP2_1 = PC_13,
+#endif
+#ifdef PWR_WAKEUP_PIN2
+  SYS_WKUP2_2 = PA_4,
+#endif
+#ifdef PWR_WAKEUP_PIN3
+  SYS_WKUP3 = PB_6,
+#endif
+#ifdef PWR_WAKEUP_PIN3
+  SYS_WKUP3_1 = PE_6,
+#endif
+#ifdef PWR_WAKEUP_PIN3
+  SYS_WKUP3_2 = PA_1,
+#endif
+#ifdef PWR_WAKEUP_PIN4
+  SYS_WKUP4 = PB_7,
+#endif
+#ifdef PWR_WAKEUP_PIN4
+  SYS_WKUP4_1 = PA_2,
+#endif
+#ifdef PWR_WAKEUP_PIN4
+  SYS_WKUP4_2 = PB_1,
+#endif
+#ifdef PWR_WAKEUP_PIN5
+  SYS_WKUP5 = PB_8,
+#endif
+#ifdef PWR_WAKEUP_PIN5
+  SYS_WKUP5_1 = PA_3,
+#endif
+#ifdef PWR_WAKEUP_PIN5
+  SYS_WKUP5_2 = PC_5,
+#endif
+#ifdef PWR_WAKEUP_PIN6
+  SYS_WKUP6 = PB_5,
+#endif
+#ifdef PWR_WAKEUP_PIN6
+  SYS_WKUP6_1 = PE_7,
+#endif
+#ifdef PWR_WAKEUP_PIN6
+  SYS_WKUP6_2 = PA_5,
+#endif
+#ifdef PWR_WAKEUP_PIN7
+  SYS_WKUP7 = PE_8,
+#endif
+#ifdef PWR_WAKEUP_PIN7
+  SYS_WKUP7_1 = PA_6,
+#endif
+#ifdef PWR_WAKEUP_PIN7
+  SYS_WKUP7_2 = PB_15,
+#endif
+#ifdef PWR_WAKEUP_PIN8
+  SYS_WKUP8 = PF_2,
+#endif
+#ifdef PWR_WAKEUP_PIN8
+  SYS_WKUP8_1 = PB_10,
+#endif
+#ifdef PWR_WAKEUP_PIN8
+  SYS_WKUP8_2 = PA_7,
+#endif
+
+/* USB */
+#ifdef USBCON
+  USB_OTG_HS_DM   = PA_11,
+  USB_OTG_HS_DP   = PA_12,
+  USB_OTG_HS_ID   = PA_10,
+  #ifdef USB_OTG_HS_SOF_PA_8
+    USB_OTG_HS_SOF  = PA_8,
+  #endif
+  #ifdef USB_OTG_HS_SOF_PA_14
+    USB_OTG_HS_SOF  = PA_14,
+  #endif
+  USB_OTG_HS_VBUS = PA_9,
+#endif
diff --git a/variants/STM32U5xx/U599N(I-J)HxQ_U5A9NJHxQ/boards_entry.txt b/variants/STM32U5xx/U599N(I-J)HxQ_U5A9NJHxQ/boards_entry.txt
new file mode 100644
index 0000000000..fc040f13a4
--- /dev/null
+++ b/variants/STM32U5xx/U599N(I-J)HxQ_U5A9NJHxQ/boards_entry.txt
@@ -0,0 +1,29 @@
+# This file help to add generic board entry.
+# upload.maximum_size and product_line have to be verified
+# and changed if needed.
+# See: https://github.com/stm32duino/wiki/wiki/Add-a-new-variant-%28board%29
+
+# Generic U599NIHxQ
+GenU5.menu.pnum.GENERIC_U599NIHXQ=Generic U599NIHxQ
+GenU5.menu.pnum.GENERIC_U599NIHXQ.upload.maximum_size=2097152
+GenU5.menu.pnum.GENERIC_U599NIHXQ.upload.maximum_data_size=262144
+GenU5.menu.pnum.GENERIC_U599NIHXQ.build.board=GENERIC_U599NIHXQ
+GenU5.menu.pnum.GENERIC_U599NIHXQ.build.product_line=
+GenU5.menu.pnum.GENERIC_U599NIHXQ.build.variant=STM32U5xx/U599N(I-J)HxQ_U5A9NJHxQ
+
+# Generic U599NJHxQ
+GenU5.menu.pnum.GENERIC_U599NJHXQ=Generic U599NJHxQ
+GenU5.menu.pnum.GENERIC_U599NJHXQ.upload.maximum_size=73728
+GenU5.menu.pnum.GENERIC_U599NJHXQ.upload.maximum_data_size=262144
+GenU5.menu.pnum.GENERIC_U599NJHXQ.build.board=GENERIC_U599NJHXQ
+GenU5.menu.pnum.GENERIC_U599NJHXQ.build.product_line=
+GenU5.menu.pnum.GENERIC_U599NJHXQ.build.variant=STM32U5xx/U599N(I-J)HxQ_U5A9NJHxQ
+
+# Generic U5A9NJHxQ
+GenU5.menu.pnum.GENERIC_U5A9NJHXQ=Generic U5A9NJHxQ
+GenU5.menu.pnum.GENERIC_U5A9NJHXQ.upload.maximum_size=73728
+GenU5.menu.pnum.GENERIC_U5A9NJHXQ.upload.maximum_data_size=262144
+GenU5.menu.pnum.GENERIC_U5A9NJHXQ.build.board=GENERIC_U5A9NJHXQ
+GenU5.menu.pnum.GENERIC_U5A9NJHXQ.build.product_line=
+GenU5.menu.pnum.GENERIC_U5A9NJHXQ.build.variant=STM32U5xx/U599N(I-J)HxQ_U5A9NJHxQ
+
diff --git a/variants/STM32G4xx/GBK1CBT/generic_clock.c b/variants/STM32U5xx/U599N(I-J)HxQ_U5A9NJHxQ/generic_clock.c
similarity index 82%
rename from variants/STM32G4xx/GBK1CBT/generic_clock.c
rename to variants/STM32U5xx/U599N(I-J)HxQ_U5A9NJHxQ/generic_clock.c
index 89ef968514..67d33cd81f 100644
--- a/variants/STM32G4xx/GBK1CBT/generic_clock.c
+++ b/variants/STM32U5xx/U599N(I-J)HxQ_U5A9NJHxQ/generic_clock.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -10,7 +10,8 @@
  *
  *******************************************************************************
  */
-#if defined(ARDUINO_GENERIC_GBK1CBTX)
+#if defined(ARDUINO_GENERIC_U599NIHXQ) || defined(ARDUINO_GENERIC_U599NJHXQ) ||\
+    defined(ARDUINO_GENERIC_U5A9NJHXQ)
 #include "pins_arduino.h"
 
 /**
diff --git a/variants/STM32U5xx/U599N(I-J)HxQ_U5A9NJHxQ/variant_generic.cpp b/variants/STM32U5xx/U599N(I-J)HxQ_U5A9NJHxQ/variant_generic.cpp
new file mode 100644
index 0000000000..1ef106ca3f
--- /dev/null
+++ b/variants/STM32U5xx/U599N(I-J)HxQ_U5A9NJHxQ/variant_generic.cpp
@@ -0,0 +1,205 @@
+/*
+ *******************************************************************************
+ * Copyright (c) 2020, STMicroelectronics
+ * All rights reserved.
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ *******************************************************************************
+ */
+#if defined(ARDUINO_GENERIC_U599NIHXQ) || defined(ARDUINO_GENERIC_U599NJHXQ) ||\
+    defined(ARDUINO_GENERIC_U5A9NJHXQ)
+#include "pins_arduino.h"
+
+// Digital PinName array
+const PinName digitalPin[] = {
+  PA_0,   // D0/A0
+  PA_1,   // D1/A1
+  PA_2,   // D2/A2
+  PA_3,   // D3/A3
+  PA_4,   // D4/A4
+  PA_5,   // D5/A5
+  PA_6,   // D6/A6
+  PA_7,   // D7/A7
+  PA_8,   // D8
+  PA_9,   // D9
+  PA_10,  // D10
+  PA_11,  // D11
+  PA_12,  // D12
+  PA_13,  // D13
+  PA_14,  // D14
+  PA_15,  // D15
+  PB_0,   // D16/A8
+  PB_1,   // D17/A9
+  PB_2,   // D18/A10
+  PB_3,   // D19
+  PB_4,   // D20
+  PB_5,   // D21
+  PB_6,   // D22
+  PB_7,   // D23
+  PB_8,   // D24
+  PB_9,   // D25
+  PB_10,  // D26
+  PB_11,  // D27
+  PB_12,  // D28
+  PB_13,  // D29
+  PB_14,  // D30
+  PB_15,  // D31
+  PC_0,   // D32/A11
+  PC_1,   // D33/A12
+  PC_2,   // D34/A13
+  PC_3,   // D35/A14
+  PC_4,   // D36/A15
+  PC_5,   // D37/A16
+  PC_6,   // D38
+  PC_7,   // D39
+  PC_8,   // D40
+  PC_9,   // D41
+  PC_10,  // D42
+  PC_11,  // D43
+  PC_12,  // D44
+  PC_13,  // D45
+  PC_14,  // D46
+  PC_15,  // D47
+  PD_0,   // D48
+  PD_1,   // D49
+  PD_2,   // D50
+  PD_3,   // D51
+  PD_4,   // D52
+  PD_5,   // D53
+  PD_6,   // D54
+  PD_7,   // D55
+  PD_8,   // D56
+  PD_9,   // D57
+  PD_10,  // D58
+  PD_11,  // D59/A17
+  PD_12,  // D60/A18
+  PD_13,  // D61/A19
+  PD_14,  // D62
+  PD_15,  // D63
+  PE_0,   // D64
+  PE_1,   // D65
+  PE_2,   // D66
+  PE_3,   // D67
+  PE_4,   // D68
+  PE_5,   // D69
+  PE_6,   // D70
+  PE_7,   // D71
+  PE_8,   // D72
+  PE_9,   // D73
+  PE_10,  // D74
+  PE_11,  // D75
+  PE_12,  // D76
+  PE_13,  // D77
+  PE_14,  // D78
+  PE_15,  // D79
+  PF_0,   // D80
+  PF_1,   // D81
+  PF_2,   // D82
+  PF_3,   // D83
+  PF_4,   // D84
+  PF_5,   // D85
+  PF_6,   // D86
+  PF_7,   // D87
+  PF_8,   // D88
+  PF_9,   // D89
+  PF_10,  // D90
+  PF_11,  // D91
+  PF_12,  // D92
+  PF_13,  // D93
+  PF_14,  // D94/A20
+  PF_15,  // D95/A21
+  PG_0,   // D96/A22
+  PG_1,   // D97/A23
+  PG_2,   // D98
+  PG_3,   // D99
+  PG_4,   // D100
+  PG_5,   // D101
+  PG_6,   // D102
+  PG_7,   // D103
+  PG_8,   // D104
+  PG_9,   // D105
+  PG_10,  // D106
+  PG_11,  // D107
+  PG_12,  // D108
+  PG_13,  // D109
+  PG_14,  // D110
+  PG_15,  // D111
+  PH_0,   // D112
+  PH_1,   // D113
+  PH_2,   // D114
+  PH_3,   // D115
+  PH_4,   // D116
+  PH_5,   // D117
+  PH_6,   // D118
+  PH_7,   // D119
+  PH_8,   // D120
+  PH_9,   // D121
+  PH_10,  // D122
+  PH_11,  // D123
+  PH_12,  // D124
+  PH_13,  // D125
+  PH_14,  // D126
+  PH_15,  // D127
+  PI_0,   // D128
+  PI_1,   // D129
+  PI_2,   // D130
+  PI_3,   // D131
+  PI_4,   // D132
+  PI_5,   // D133
+  PI_6,   // D134
+  PI_7,   // D135
+  PI_8,   // D136
+  PI_9,   // D137
+  PI_10,  // D138
+  PI_11,  // D139
+  PI_12,  // D140
+  PI_13,  // D141
+  PI_14,  // D142
+  PI_15,  // D143
+  PJ_0,   // D144
+  PJ_1,   // D145
+  PJ_2,   // D146
+  PJ_3,   // D147
+  PJ_4,   // D148
+  PJ_5,   // D149
+  PJ_6,   // D150
+  PJ_7,   // D151
+  PJ_8,   // D152
+  PJ_9,   // D153
+  PJ_10,  // D154
+  PJ_11   // D155
+};
+
+// Analog (Ax) pin number array
+const uint32_t analogInputPin[] = {
+  0,  // A0,  PA0
+  1,  // A1,  PA1
+  2,  // A2,  PA2
+  3,  // A3,  PA3
+  4,  // A4,  PA4
+  5,  // A5,  PA5
+  6,  // A6,  PA6
+  7,  // A7,  PA7
+  16, // A8,  PB0
+  17, // A9,  PB1
+  18, // A10, PB2
+  32, // A11, PC0
+  33, // A12, PC1
+  34, // A13, PC2
+  35, // A14, PC3
+  36, // A15, PC4
+  37, // A16, PC5
+  59, // A17, PD11
+  60, // A18, PD12
+  61, // A19, PD13
+  94, // A20, PF14
+  95, // A21, PF15
+  96, // A22, PG0
+  97  // A23, PG1
+};
+
+#endif /* ARDUINO_GENERIC_* */
diff --git a/variants/STM32U5xx/U599N(I-J)HxQ_U5A9NJHxQ/variant_generic.h b/variants/STM32U5xx/U599N(I-J)HxQ_U5A9NJHxQ/variant_generic.h
new file mode 100644
index 0000000000..695d9b72b2
--- /dev/null
+++ b/variants/STM32U5xx/U599N(I-J)HxQ_U5A9NJHxQ/variant_generic.h
@@ -0,0 +1,363 @@
+/*
+ *******************************************************************************
+ * Copyright (c) 2020, STMicroelectronics
+ * All rights reserved.
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ *******************************************************************************
+ */
+#pragma once
+
+/*----------------------------------------------------------------------------
+ *        STM32 pins number
+ *----------------------------------------------------------------------------*/
+#define PA0                     PIN_A0
+#define PA1                     PIN_A1
+#define PA2                     PIN_A2
+#define PA3                     PIN_A3
+#define PA4                     PIN_A4
+#define PA5                     PIN_A5
+#define PA6                     PIN_A6
+#define PA7                     PIN_A7
+#define PA8                     8
+#define PA9                     9
+#define PA10                    10
+#define PA11                    11
+#define PA12                    12
+#define PA13                    13
+#define PA14                    14
+#define PA15                    15
+#define PB0                     PIN_A8
+#define PB1                     PIN_A9
+#define PB2                     PIN_A10
+#define PB3                     19
+#define PB4                     20
+#define PB5                     21
+#define PB6                     22
+#define PB7                     23
+#define PB8                     24
+#define PB9                     25
+#define PB10                    26
+#define PB11                    27
+#define PB12                    28
+#define PB13                    29
+#define PB14                    30
+#define PB15                    31
+#define PC0                     PIN_A11
+#define PC1                     PIN_A12
+#define PC2                     PIN_A13
+#define PC3                     PIN_A14
+#define PC4                     PIN_A15
+#define PC5                     PIN_A16
+#define PC6                     38
+#define PC7                     39
+#define PC8                     40
+#define PC9                     41
+#define PC10                    42
+#define PC11                    43
+#define PC12                    44
+#define PC13                    45
+#define PC14                    46
+#define PC15                    47
+#define PD0                     48
+#define PD1                     49
+#define PD2                     50
+#define PD3                     51
+#define PD4                     52
+#define PD5                     53
+#define PD6                     54
+#define PD7                     55
+#define PD8                     56
+#define PD9                     57
+#define PD10                    58
+#define PD11                    PIN_A17
+#define PD12                    PIN_A18
+#define PD13                    PIN_A19
+#define PD14                    62
+#define PD15                    63
+#define PE0                     64
+#define PE1                     65
+#define PE2                     66
+#define PE3                     67
+#define PE4                     68
+#define PE5                     69
+#define PE6                     70
+#define PE7                     71
+#define PE8                     72
+#define PE9                     73
+#define PE10                    74
+#define PE11                    75
+#define PE12                    76
+#define PE13                    77
+#define PE14                    78
+#define PE15                    79
+#define PF0                     80
+#define PF1                     81
+#define PF2                     82
+#define PF3                     83
+#define PF4                     84
+#define PF5                     85
+#define PF6                     86
+#define PF7                     87
+#define PF8                     88
+#define PF9                     89
+#define PF10                    90
+#define PF11                    91
+#define PF12                    92
+#define PF13                    93
+#define PF14                    PIN_A20
+#define PF15                    PIN_A21
+#define PG0                     PIN_A22
+#define PG1                     PIN_A23
+#define PG2                     98
+#define PG3                     99
+#define PG4                     100
+#define PG5                     101
+#define PG6                     102
+#define PG7                     103
+#define PG8                     104
+#define PG9                     105
+#define PG10                    106
+#define PG11                    107
+#define PG12                    108
+#define PG13                    109
+#define PG14                    110
+#define PG15                    111
+#define PH0                     112
+#define PH1                     113
+#define PH2                     114
+#define PH3                     115
+#define PH4                     116
+#define PH5                     117
+#define PH6                     118
+#define PH7                     119
+#define PH8                     120
+#define PH9                     121
+#define PH10                    122
+#define PH11                    123
+#define PH12                    124
+#define PH13                    125
+#define PH14                    126
+#define PH15                    127
+#define PI0                     128
+#define PI1                     129
+#define PI2                     130
+#define PI3                     131
+#define PI4                     132
+#define PI5                     133
+#define PI6                     134
+#define PI7                     135
+#define PI8                     136
+#define PI9                     137
+#define PI10                    138
+#define PI11                    139
+#define PI12                    140
+#define PI13                    141
+#define PI14                    142
+#define PI15                    143
+#define PJ0                     144
+#define PJ1                     145
+#define PJ2                     146
+#define PJ3                     147
+#define PJ4                     148
+#define PJ5                     149
+#define PJ6                     150
+#define PJ7                     151
+#define PJ8                     152
+#define PJ9                     153
+#define PJ10                    154
+#define PJ11                    155
+
+// Alternate pins number
+#define PA0_ALT1                (PA0  | ALT1)
+#define PA1_ALT1                (PA1  | ALT1)
+#define PA1_ALT2                (PA1  | ALT2)
+#define PA2_ALT1                (PA2  | ALT1)
+#define PA2_ALT2                (PA2  | ALT2)
+#define PA3_ALT1                (PA3  | ALT1)
+#define PA3_ALT2                (PA3  | ALT2)
+#define PA4_ALT1                (PA4  | ALT1)
+#define PA4_ALT2                (PA4  | ALT2)
+#define PA5_ALT1                (PA5  | ALT1)
+#define PA5_ALT2                (PA5  | ALT2)
+#define PA6_ALT1                (PA6  | ALT1)
+#define PA6_ALT2                (PA6  | ALT2)
+#define PA7_ALT1                (PA7  | ALT1)
+#define PA7_ALT2                (PA7  | ALT2)
+#define PA7_ALT3                (PA7  | ALT3)
+#define PA15_ALT1               (PA15 | ALT1)
+#define PB0_ALT1                (PB0  | ALT1)
+#define PB0_ALT2                (PB0  | ALT2)
+#define PB1_ALT1                (PB1  | ALT1)
+#define PB1_ALT2                (PB1  | ALT2)
+#define PB2_ALT1                (PB2  | ALT1)
+#define PB3_ALT1                (PB3  | ALT1)
+#define PB4_ALT1                (PB4  | ALT1)
+#define PB5_ALT1                (PB5  | ALT1)
+#define PB6_ALT1                (PB6  | ALT1)
+#define PB7_ALT1                (PB7  | ALT1)
+#define PB8_ALT1                (PB8  | ALT1)
+#define PB8_ALT2                (PB8  | ALT2)
+#define PB9_ALT1                (PB9  | ALT1)
+#define PB9_ALT2                (PB9  | ALT2)
+#define PB10_ALT1               (PB10 | ALT1)
+#define PB11_ALT1               (PB11 | ALT1)
+#define PB13_ALT1               (PB13 | ALT1)
+#define PB14_ALT1               (PB14 | ALT1)
+#define PB14_ALT2               (PB14 | ALT2)
+#define PB15_ALT1               (PB15 | ALT1)
+#define PB15_ALT2               (PB15 | ALT2)
+#define PC0_ALT1                (PC0  | ALT1)
+#define PC0_ALT2                (PC0  | ALT2)
+#define PC1_ALT1                (PC1  | ALT1)
+#define PC1_ALT2                (PC1  | ALT2)
+#define PC2_ALT1                (PC2  | ALT1)
+#define PC2_ALT2                (PC2  | ALT2)
+#define PC3_ALT1                (PC3  | ALT1)
+#define PC3_ALT2                (PC3  | ALT2)
+#define PC4_ALT1                (PC4  | ALT1)
+#define PC4_ALT2                (PC4  | ALT2)
+#define PC5_ALT1                (PC5  | ALT1)
+#define PC5_ALT2                (PC5  | ALT2)
+#define PC6_ALT1                (PC6  | ALT1)
+#define PC6_ALT2                (PC6  | ALT2)
+#define PC7_ALT1                (PC7  | ALT1)
+#define PC7_ALT2                (PC7  | ALT2)
+#define PC8_ALT1                (PC8  | ALT1)
+#define PC9_ALT1                (PC9  | ALT1)
+#define PC10_ALT1               (PC10 | ALT1)
+#define PC11_ALT1               (PC11 | ALT1)
+#define PD0_ALT1                (PD0  | ALT1)
+#define PD1_ALT1                (PD1  | ALT1)
+#define PF0_ALT1                (PF0  | ALT1)
+#define PF1_ALT1                (PF1  | ALT1)
+#define PF9_ALT1                (PF9  | ALT1)
+#define PH12_ALT1               (PH12 | ALT1)
+
+#define NUM_DIGITAL_PINS        156
+#define NUM_ANALOG_INPUTS       24
+
+// On-board LED pin number
+#ifndef LED_BUILTIN
+  #define LED_BUILTIN           PNUM_NOT_DEFINED
+#endif
+
+// On-board user button
+#ifndef USER_BTN
+  #define USER_BTN              PNUM_NOT_DEFINED
+#endif
+
+// SPI definitions
+#ifndef PIN_SPI_SS
+  #define PIN_SPI_SS            PA4
+#endif
+#ifndef PIN_SPI_SS1
+  #define PIN_SPI_SS1           PA15
+#endif
+#ifndef PIN_SPI_SS2
+  #define PIN_SPI_SS2           PB0
+#endif
+#ifndef PIN_SPI_SS3
+  #define PIN_SPI_SS3           PE12
+#endif
+#ifndef PIN_SPI_MOSI
+  #define PIN_SPI_MOSI          PA7
+#endif
+#ifndef PIN_SPI_MISO
+  #define PIN_SPI_MISO          PA6
+#endif
+#ifndef PIN_SPI_SCK
+  #define PIN_SPI_SCK           PA1
+#endif
+
+// I2C definitions
+#ifndef PIN_WIRE_SDA
+  #define PIN_WIRE_SDA          PB3
+#endif
+#ifndef PIN_WIRE_SCL
+  #define PIN_WIRE_SCL          PB6
+#endif
+
+// Timer Definitions
+// Use TIM6/TIM7 when possible as servo and tone don't need GPIO output pin
+#ifndef TIMER_TONE
+  #define TIMER_TONE            TIM6
+#endif
+#ifndef TIMER_SERVO
+  #define TIMER_SERVO           TIM7
+#endif
+
+// UART Definitions
+#ifndef SERIAL_UART_INSTANCE
+  #define SERIAL_UART_INSTANCE  4
+#endif
+
+// Default pin used for generic 'Serial' instance
+// Mandatory for Firmata
+#ifndef PIN_SERIAL_RX
+  #define PIN_SERIAL_RX         PA1
+#endif
+#ifndef PIN_SERIAL_TX
+  #define PIN_SERIAL_TX         PA0
+#endif
+
+// Extra HAL modules
+#if !defined(HAL_DAC_MODULE_DISABLED)
+  #define HAL_DAC_MODULE_ENABLED
+#endif
+#if !defined(HAL_OSPI_MODULE_DISABLED)
+  #define HAL_OSPI_MODULE_ENABLED
+#endif
+#if !defined(HAL_SD_MODULE_DISABLED)
+  #define HAL_SD_MODULE_ENABLED
+#endif
+
+// Alternate SYS_WKUP definition
+#define PWR_WAKEUP_PIN1_1
+#define PWR_WAKEUP_PIN1_2
+#define PWR_WAKEUP_PIN2_1
+#define PWR_WAKEUP_PIN2_2
+#define PWR_WAKEUP_PIN3_1
+#define PWR_WAKEUP_PIN3_2
+#define PWR_WAKEUP_PIN4_1
+#define PWR_WAKEUP_PIN4_2
+#define PWR_WAKEUP_PIN5_1
+#define PWR_WAKEUP_PIN5_2
+#define PWR_WAKEUP_PIN6_1
+#define PWR_WAKEUP_PIN6_2
+#define PWR_WAKEUP_PIN7_1
+#define PWR_WAKEUP_PIN7_2
+#define PWR_WAKEUP_PIN8_1
+#define PWR_WAKEUP_PIN8_2
+
+/*----------------------------------------------------------------------------
+ *        Arduino objects - C++ only
+ *----------------------------------------------------------------------------*/
+
+#ifdef __cplusplus
+  // These serial port names are intended to allow libraries and architecture-neutral
+  // sketches to automatically default to the correct port name for a particular type
+  // of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
+  // the first hardware serial port whose RX/TX pins are not dedicated to another use.
+  //
+  // SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
+  //
+  // SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
+  //
+  // SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
+  //
+  // SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
+  //
+  // SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
+  //                            pins are NOT connected to anything by default.
+  #ifndef SERIAL_PORT_MONITOR
+    #define SERIAL_PORT_MONITOR   Serial
+  #endif
+  #ifndef SERIAL_PORT_HARDWARE
+    #define SERIAL_PORT_HARDWARE  Serial
+  #endif
+#endif
diff --git a/variants/STM32WBxx/WB10CCU/PeripheralPins.c b/variants/STM32WBxx/WB10CCU/PeripheralPins.c
index 310299f0c0..a29336e5ca 100644
--- a/variants/STM32WBxx/WB10CCU/PeripheralPins.c
+++ b/variants/STM32WBxx/WB10CCU/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32WB10CCUx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32WBxx/WB10CCU/variant_generic.cpp b/variants/STM32WBxx/WB10CCU/variant_generic.cpp
index 728b3208d7..4d493f3550 100644
--- a/variants/STM32WBxx/WB10CCU/variant_generic.cpp
+++ b/variants/STM32WBxx/WB10CCU/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32WBxx/WB10CCU/variant_generic.h b/variants/STM32WBxx/WB10CCU/variant_generic.h
index 037392fbdd..895cf609cb 100644
--- a/variants/STM32WBxx/WB10CCU/variant_generic.h
+++ b/variants/STM32WBxx/WB10CCU/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32WBxx/WB15CCU/PeripheralPins.c b/variants/STM32WBxx/WB15CCU/PeripheralPins.c
index 2a7b7a84f6..1037c26d59 100644
--- a/variants/STM32WBxx/WB15CCU/PeripheralPins.c
+++ b/variants/STM32WBxx/WB15CCU/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32WB15CCUx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32WBxx/WB15CCU/variant_generic.cpp b/variants/STM32WBxx/WB15CCU/variant_generic.cpp
index 1478da8c90..595df09f87 100644
--- a/variants/STM32WBxx/WB15CCU/variant_generic.cpp
+++ b/variants/STM32WBxx/WB15CCU/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32WBxx/WB15CCU/variant_generic.h b/variants/STM32WBxx/WB15CCU/variant_generic.h
index 92e5c4f057..d230cebc6c 100644
--- a/variants/STM32WBxx/WB15CCU/variant_generic.h
+++ b/variants/STM32WBxx/WB15CCU/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32WBxx/WB15CCUxE/PeripheralPins.c b/variants/STM32WBxx/WB15CCUxE/PeripheralPins.c
index 94b314e57e..8ebf42337e 100644
--- a/variants/STM32WBxx/WB15CCUxE/PeripheralPins.c
+++ b/variants/STM32WBxx/WB15CCUxE/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32WB15CCUxE.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32WBxx/WB15CCUxE/variant_generic.cpp b/variants/STM32WBxx/WB15CCUxE/variant_generic.cpp
index 12e636cf57..d9d0c868d7 100644
--- a/variants/STM32WBxx/WB15CCUxE/variant_generic.cpp
+++ b/variants/STM32WBxx/WB15CCUxE/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32WBxx/WB15CCUxE/variant_generic.h b/variants/STM32WBxx/WB15CCUxE/variant_generic.h
index e397ac9cff..0cd9664a03 100644
--- a/variants/STM32WBxx/WB15CCUxE/variant_generic.h
+++ b/variants/STM32WBxx/WB15CCUxE/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32WBxx/WB15CCY/PeripheralPins.c b/variants/STM32WBxx/WB15CCY/PeripheralPins.c
index e8a224811b..da22a2b5ab 100644
--- a/variants/STM32WBxx/WB15CCY/PeripheralPins.c
+++ b/variants/STM32WBxx/WB15CCY/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32WB15CCYx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32WBxx/WB15CCY/variant_generic.cpp b/variants/STM32WBxx/WB15CCY/variant_generic.cpp
index 19cd246106..924653c86b 100644
--- a/variants/STM32WBxx/WB15CCY/variant_generic.cpp
+++ b/variants/STM32WBxx/WB15CCY/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32WBxx/WB15CCY/variant_generic.h b/variants/STM32WBxx/WB15CCY/variant_generic.h
index 4ac92857e2..a387217aae 100644
--- a/variants/STM32WBxx/WB15CCY/variant_generic.h
+++ b/variants/STM32WBxx/WB15CCY/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32WBxx/WB30CEUxA/PeripheralPins.c b/variants/STM32WBxx/WB30CEUxA/PeripheralPins.c
deleted file mode 100644
index 1e666d2f41..0000000000
--- a/variants/STM32WBxx/WB30CEUxA/PeripheralPins.c
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
- * All rights reserved.
- *
- * This software component is licensed by ST under BSD 3-Clause license,
- * the "License"; You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *                        opensource.org/licenses/BSD-3-Clause
- *
- *******************************************************************************
- */
-/*
- * Automatically generated from STM32WB30CEUxA.xml
- * CubeMX DB release 6.0.30
- */
-#if !defined(CUSTOM_PERIPHERAL_PINS)
-#include "Arduino.h"
-#include "PeripheralPins.h"
-
-/* =====
- * Notes:
- * - The pins mentioned Px_y_ALTz are alternative possibilities which use other
- *   HW peripheral instances. You can use them the same way as any other "normal"
- *   pin (i.e. analogWrite(PA7_ALT1, 128);).
- *
- * - Commented lines are alternative possibilities which are not used per default.
- *   If you change them, you will have to know what you do
- * =====
- */
-
-//*** ADC ***
-
-#ifdef HAL_ADC_MODULE_ENABLED
-WEAK const PinMap PinMap_ADC[] = {
-  {PA_0, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC1_IN5
-  {PA_1, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC1_IN6
-  {PA_2, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC1_IN7
-  {PA_3, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC1_IN8
-  {PA_4, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC1_IN9
-  {PA_5, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC1_IN10
-  {PA_6, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC1_IN11
-  {PA_7, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 12, 0)}, // ADC1_IN12
-  {PA_8, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC1_IN15
-  {PA_9, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 16, 0)}, // ADC1_IN16
-  {NC,   NP,   0}
-};
-#endif
-
-//*** No DAC ***
-
-//*** I2C ***
-
-#ifdef HAL_I2C_MODULE_ENABLED
-WEAK const PinMap PinMap_I2C_SDA[] = {
-  {PA_10, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
-  {PB_7,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
-  {PB_9,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
-  {NC,    NP,   0}
-};
-#endif
-
-#ifdef HAL_I2C_MODULE_ENABLED
-WEAK const PinMap PinMap_I2C_SCL[] = {
-  {PA_9, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
-  {PB_6, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
-  {PB_8, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
-  {NC,   NP,   0}
-};
-#endif
-
-//*** TIM ***
-
-#ifdef HAL_TIM_MODULE_ENABLED
-WEAK const PinMap PinMap_TIM[] = {
-  {PA_0,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
-  {PA_1,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
-  {PA_2,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
-  {PA_3,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4
-  {PA_5,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
-  {PA_6,      TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE, 1, 0)}, // TIM16_CH1
-  {PA_7,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
-  {PA_7_ALT1, TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE, 1, 0)}, // TIM17_CH1
-  {PA_8,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)}, // TIM1_CH1
-  {PA_9,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 0)}, // TIM1_CH2
-  {PA_10,     TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 0)}, // TIM1_CH3
-  {PA_11,     TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 4, 0)}, // TIM1_CH4
-  {PA_15,     TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
-  {PB_3,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
-  {PB_6,      TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE, 1, 1)}, // TIM16_CH1N
-  {PB_7,      TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE, 1, 1)}, // TIM17_CH1N
-  {PB_8,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
-  {PB_8_ALT1, TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE, 1, 0)}, // TIM16_CH1
-  {PB_9,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
-  {PB_9_ALT1, TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE, 1, 0)}, // TIM17_CH1
-  {NC,        NP,    0}
-};
-#endif
-
-//*** UART ***
-
-#ifdef HAL_UART_MODULE_ENABLED
-WEAK const PinMap PinMap_UART_TX[] = {
-  {PA_9, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PB_6, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {NC,   NP,     0}
-};
-#endif
-
-#ifdef HAL_UART_MODULE_ENABLED
-WEAK const PinMap PinMap_UART_RX[] = {
-  {PA_10, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PB_7,  USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {NC,    NP,     0}
-};
-#endif
-
-#ifdef HAL_UART_MODULE_ENABLED
-WEAK const PinMap PinMap_UART_RTS[] = {
-  {PA_12, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PB_3,  USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {NC,    NP,     0}
-};
-#endif
-
-#ifdef HAL_UART_MODULE_ENABLED
-WEAK const PinMap PinMap_UART_CTS[] = {
-  {PA_11, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PB_4,  USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {NC,    NP,     0}
-};
-#endif
-
-//*** SPI ***
-
-#ifdef HAL_SPI_MODULE_ENABLED
-WEAK const PinMap PinMap_SPI_MOSI[] = {
-  {PA_7,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PA_12, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PB_5,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {NC,    NP,   0}
-};
-#endif
-
-#ifdef HAL_SPI_MODULE_ENABLED
-WEAK const PinMap PinMap_SPI_MISO[] = {
-  {PA_6,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PA_11, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PB_4,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {NC,    NP,   0}
-};
-#endif
-
-#ifdef HAL_SPI_MODULE_ENABLED
-WEAK const PinMap PinMap_SPI_SCLK[] = {
-  {PA_1, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PA_5, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PB_3, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {NC,   NP,   0}
-};
-#endif
-
-#ifdef HAL_SPI_MODULE_ENABLED
-WEAK const PinMap PinMap_SPI_SSEL[] = {
-  {PA_4,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PA_15, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PB_2,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {NC,    NP,   0}
-};
-#endif
-
-//*** No CAN ***
-
-//*** No ETHERNET ***
-
-//*** No QUADSPI ***
-
-//*** No USB ***
-
-//*** No SD ***
-
-#endif /* !CUSTOM_PERIPHERAL_PINS */
diff --git a/variants/STM32WBxx/WB30CEUxA/generic_clock.c b/variants/STM32WBxx/WB30CEUxA/generic_clock.c
deleted file mode 100644
index 5dd87c0844..0000000000
--- a/variants/STM32WBxx/WB30CEUxA/generic_clock.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
- * All rights reserved.
- *
- * This software component is licensed by ST under BSD 3-Clause license,
- * the "License"; You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *                        opensource.org/licenses/BSD-3-Clause
- *
- *******************************************************************************
- */
-#if defined(ARDUINO_GENERIC_WB30CEUXA)
-#include "pins_arduino.h"
-
-/**
-  * @brief  System Clock Configuration
-  * @param  None
-  * @retval None
-  */
-WEAK void SystemClock_Config(void)
-{
-  /* SystemClock_Config can be generated by STM32CubeMX */
-#warning "SystemClock_Config() is empty. Default clock at reset is used."
-}
-
-#endif /* ARDUINO_GENERIC_* */
diff --git a/variants/STM32WBxx/WB30CEUxA/variant_generic.cpp b/variants/STM32WBxx/WB30CEUxA/variant_generic.cpp
deleted file mode 100644
index 1b79b90d13..0000000000
--- a/variants/STM32WBxx/WB30CEUxA/variant_generic.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
- * All rights reserved.
- *
- * This software component is licensed by ST under BSD 3-Clause license,
- * the "License"; You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *                        opensource.org/licenses/BSD-3-Clause
- *
- *******************************************************************************
- */
-#if defined(ARDUINO_GENERIC_WB30CEUXA)
-#include "pins_arduino.h"
-
-// Digital PinName array
-const PinName digitalPin[] = {
-  PA_0,   // D0/A0
-  PA_1,   // D1/A1
-  PA_2,   // D2/A2
-  PA_3,   // D3/A3
-  PA_4,   // D4/A4
-  PA_5,   // D5/A5
-  PA_6,   // D6/A6
-  PA_7,   // D7/A7
-  PA_8,   // D8/A8
-  PA_9,   // D9/A9
-  PA_10,  // D10
-  PA_11,  // D11
-  PA_12,  // D12
-  PA_13,  // D13
-  PA_14,  // D14
-  PA_15,  // D15
-  PB_0,   // D16
-  PB_1,   // D17
-  PB_2,   // D18
-  PB_3,   // D19
-  PB_4,   // D20
-  PB_5,   // D21
-  PB_6,   // D22
-  PB_7,   // D23
-  PB_8,   // D24
-  PB_9,   // D25
-  PC_14,  // D26
-  PC_15,  // D27
-  PE_4,   // D28
-  PH_3    // D29
-};
-
-// Analog (Ax) pin number array
-const uint32_t analogInputPin[] = {
-  0,  // A0,  PA0
-  1,  // A1,  PA1
-  2,  // A2,  PA2
-  3,  // A3,  PA3
-  4,  // A4,  PA4
-  5,  // A5,  PA5
-  6,  // A6,  PA6
-  7,  // A7,  PA7
-  8,  // A8,  PA8
-  9   // A9,  PA9
-};
-
-#endif /* ARDUINO_GENERIC_* */
diff --git a/variants/STM32WBxx/WB50CGU/PeripheralPins.c b/variants/STM32WBxx/WB30CEUxA_WB50CGU/PeripheralPins.c
similarity index 98%
rename from variants/STM32WBxx/WB50CGU/PeripheralPins.c
rename to variants/STM32WBxx/WB30CEUxA_WB50CGU/PeripheralPins.c
index 000a48bc76..23d23938f7 100644
--- a/variants/STM32WBxx/WB50CGU/PeripheralPins.c
+++ b/variants/STM32WBxx/WB30CEUxA_WB50CGU/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -11,8 +11,8 @@
  *******************************************************************************
  */
 /*
- * Automatically generated from STM32WB50CGUx.xml
- * CubeMX DB release 6.0.30
+ * Automatically generated from STM32WB30CEUxA.xml, STM32WB50CGUx.xml
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32WBxx/WB30CEUxA/PinNamesVar.h b/variants/STM32WBxx/WB30CEUxA_WB50CGU/PinNamesVar.h
similarity index 100%
rename from variants/STM32WBxx/WB30CEUxA/PinNamesVar.h
rename to variants/STM32WBxx/WB30CEUxA_WB50CGU/PinNamesVar.h
diff --git a/variants/STM32WBxx/WB30CEUxA/boards_entry.txt b/variants/STM32WBxx/WB30CEUxA_WB50CGU/boards_entry.txt
similarity index 59%
rename from variants/STM32WBxx/WB30CEUxA/boards_entry.txt
rename to variants/STM32WBxx/WB30CEUxA_WB50CGU/boards_entry.txt
index 110d014f69..0c95ed24a8 100644
--- a/variants/STM32WBxx/WB30CEUxA/boards_entry.txt
+++ b/variants/STM32WBxx/WB30CEUxA_WB50CGU/boards_entry.txt
@@ -9,5 +9,13 @@ GenWB.menu.pnum.GENERIC_WB30CEUXA.upload.maximum_size=524288
 GenWB.menu.pnum.GENERIC_WB30CEUXA.upload.maximum_data_size=98304
 GenWB.menu.pnum.GENERIC_WB30CEUXA.build.board=GENERIC_WB30CEUXA
 GenWB.menu.pnum.GENERIC_WB30CEUXA.build.product_line=STM32WB30xx
-GenWB.menu.pnum.GENERIC_WB30CEUXA.build.variant=STM32WBxx/WB30CEUxA
+GenWB.menu.pnum.GENERIC_WB30CEUXA.build.variant=STM32WBxx/WB30CEUxA_WB50CGU
+
+# Generic WB50CGUx
+GenWB.menu.pnum.GENERIC_WB50CGUX=Generic WB50CGUx
+GenWB.menu.pnum.GENERIC_WB50CGUX.upload.maximum_size=1048576
+GenWB.menu.pnum.GENERIC_WB50CGUX.upload.maximum_data_size=131072
+GenWB.menu.pnum.GENERIC_WB50CGUX.build.board=GENERIC_WB50CGUX
+GenWB.menu.pnum.GENERIC_WB50CGUX.build.product_line=STM32WB50xx
+GenWB.menu.pnum.GENERIC_WB50CGUX.build.variant=STM32WBxx/WB30CEUxA_WB50CGU
 
diff --git a/variants/STM32H7xx/H730IBKxQ/generic_clock.c b/variants/STM32WBxx/WB30CEUxA_WB50CGU/generic_clock.c
similarity index 86%
rename from variants/STM32H7xx/H730IBKxQ/generic_clock.c
rename to variants/STM32WBxx/WB30CEUxA_WB50CGU/generic_clock.c
index b15121dbdb..cfb065384f 100644
--- a/variants/STM32H7xx/H730IBKxQ/generic_clock.c
+++ b/variants/STM32WBxx/WB30CEUxA_WB50CGU/generic_clock.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -10,7 +10,7 @@
  *
  *******************************************************************************
  */
-#if defined(ARDUINO_GENERIC_H730IBKXQ)
+#if defined(ARDUINO_GENERIC_WB30CEUXA) || defined(ARDUINO_GENERIC_WB50CGUX)
 #include "pins_arduino.h"
 
 /**
diff --git a/variants/STM32WBxx/WB50CGU/variant_generic.cpp b/variants/STM32WBxx/WB30CEUxA_WB50CGU/variant_generic.cpp
similarity index 92%
rename from variants/STM32WBxx/WB50CGU/variant_generic.cpp
rename to variants/STM32WBxx/WB30CEUxA_WB50CGU/variant_generic.cpp
index e82ab9b430..cc32502963 100644
--- a/variants/STM32WBxx/WB50CGU/variant_generic.cpp
+++ b/variants/STM32WBxx/WB30CEUxA_WB50CGU/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -10,7 +10,7 @@
  *
  *******************************************************************************
  */
-#if defined(ARDUINO_GENERIC_WB50CGUX)
+#if defined(ARDUINO_GENERIC_WB30CEUXA) || defined(ARDUINO_GENERIC_WB50CGUX)
 #include "pins_arduino.h"
 
 // Digital PinName array
diff --git a/variants/STM32WBxx/WB30CEUxA/variant_generic.h b/variants/STM32WBxx/WB30CEUxA_WB50CGU/variant_generic.h
similarity index 98%
rename from variants/STM32WBxx/WB30CEUxA/variant_generic.h
rename to variants/STM32WBxx/WB30CEUxA_WB50CGU/variant_generic.h
index 8ee9b18ab2..f451209d88 100644
--- a/variants/STM32WBxx/WB30CEUxA/variant_generic.h
+++ b/variants/STM32WBxx/WB30CEUxA_WB50CGU/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32WBxx/WB35C(C-E)UxA/PeripheralPins.c b/variants/STM32WBxx/WB35C(C-E)UxA/PeripheralPins.c
deleted file mode 100644
index f586f9c114..0000000000
--- a/variants/STM32WBxx/WB35C(C-E)UxA/PeripheralPins.c
+++ /dev/null
@@ -1,241 +0,0 @@
-/*
- *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
- * All rights reserved.
- *
- * This software component is licensed by ST under BSD 3-Clause license,
- * the "License"; You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *                        opensource.org/licenses/BSD-3-Clause
- *
- *******************************************************************************
- */
-/*
- * Automatically generated from STM32WB35C(C-E)UxA.xml
- * CubeMX DB release 6.0.30
- */
-#if !defined(CUSTOM_PERIPHERAL_PINS)
-#include "Arduino.h"
-#include "PeripheralPins.h"
-
-/* =====
- * Notes:
- * - The pins mentioned Px_y_ALTz are alternative possibilities which use other
- *   HW peripheral instances. You can use them the same way as any other "normal"
- *   pin (i.e. analogWrite(PA7_ALT1, 128);).
- *
- * - Commented lines are alternative possibilities which are not used per default.
- *   If you change them, you will have to know what you do
- * =====
- */
-
-//*** ADC ***
-
-#ifdef HAL_ADC_MODULE_ENABLED
-WEAK const PinMap PinMap_ADC[] = {
-  {PA_0, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC1_IN5
-  {PA_1, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC1_IN6
-  {PA_2, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC1_IN7
-  {PA_3, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC1_IN8
-  {PA_4, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC1_IN9
-  {PA_5, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC1_IN10
-  {PA_6, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC1_IN11
-  {PA_7, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 12, 0)}, // ADC1_IN12
-  {PA_8, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC1_IN15
-  {PA_9, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 16, 0)}, // ADC1_IN16
-  {NC,   NP,   0}
-};
-#endif
-
-//*** No DAC ***
-
-//*** I2C ***
-
-#ifdef HAL_I2C_MODULE_ENABLED
-WEAK const PinMap PinMap_I2C_SDA[] = {
-  {PA_10, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
-  {PB_4,  I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF_NONE)},
-  {PB_7,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
-  {PB_9,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
-  {NC,    NP,   0}
-};
-#endif
-
-#ifdef HAL_I2C_MODULE_ENABLED
-WEAK const PinMap PinMap_I2C_SCL[] = {
-  {PA_7, I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF_NONE)},
-  {PA_9, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
-  {PB_6, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
-  {PB_8, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
-  {NC,   NP,   0}
-};
-#endif
-
-//*** TIM ***
-
-#ifdef HAL_TIM_MODULE_ENABLED
-WEAK const PinMap PinMap_TIM[] = {
-  {PA_0,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
-  {PA_1,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
-  {PA_2,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
-  {PA_3,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4
-  {PA_5,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
-  {PA_6,      TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE, 1, 0)}, // TIM16_CH1
-  {PA_7,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
-  {PA_7_ALT1, TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE, 1, 0)}, // TIM17_CH1
-  {PA_8,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)}, // TIM1_CH1
-  {PA_9,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 0)}, // TIM1_CH2
-  {PA_10,     TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 0)}, // TIM1_CH3
-  {PA_11,     TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 4, 0)}, // TIM1_CH4
-  {PA_15,     TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
-  {PB_3,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
-  {PB_6,      TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE, 1, 1)}, // TIM16_CH1N
-  {PB_7,      TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE, 1, 1)}, // TIM17_CH1N
-  {PB_8,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
-  {PB_8_ALT1, TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE, 1, 0)}, // TIM16_CH1
-  {PB_9,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
-  {PB_9_ALT1, TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE, 1, 0)}, // TIM17_CH1
-  {NC,        NP,    0}
-};
-#endif
-
-//*** UART ***
-
-#ifdef HAL_UART_MODULE_ENABLED
-WEAK const PinMap PinMap_UART_TX[] = {
-  {PA_2, LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
-  {PA_9, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PB_5, LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
-  {PB_6, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {NC,   NP,      0}
-};
-#endif
-
-#ifdef HAL_UART_MODULE_ENABLED
-WEAK const PinMap PinMap_UART_RX[] = {
-  {PA_3,  LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
-  {PA_10, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PA_12, LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
-  {PB_7,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {NC,    NP,      0}
-};
-#endif
-
-#ifdef HAL_UART_MODULE_ENABLED
-WEAK const PinMap PinMap_UART_RTS[] = {
-  {PA_12, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PB_1,  LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
-  {PB_3,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {NC,    NP,      0}
-};
-#endif
-
-#ifdef HAL_UART_MODULE_ENABLED
-WEAK const PinMap PinMap_UART_CTS[] = {
-  {PA_6,  LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
-  {PA_11, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PB_4,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {NC,    NP,      0}
-};
-#endif
-
-//*** SPI ***
-
-#ifdef HAL_SPI_MODULE_ENABLED
-WEAK const PinMap PinMap_SPI_MOSI[] = {
-  {PA_7,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PA_12, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PB_5,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {NC,    NP,   0}
-};
-#endif
-
-#ifdef HAL_SPI_MODULE_ENABLED
-WEAK const PinMap PinMap_SPI_MISO[] = {
-  {PA_6,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PA_11, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PB_4,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {NC,    NP,   0}
-};
-#endif
-
-#ifdef HAL_SPI_MODULE_ENABLED
-WEAK const PinMap PinMap_SPI_SCLK[] = {
-  {PA_1, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PA_5, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PB_3, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {NC,   NP,   0}
-};
-#endif
-
-#ifdef HAL_SPI_MODULE_ENABLED
-WEAK const PinMap PinMap_SPI_SSEL[] = {
-  {PA_4,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PA_15, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PB_2,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {NC,    NP,   0}
-};
-#endif
-
-//*** No CAN ***
-
-//*** No ETHERNET ***
-
-//*** QUADSPI ***
-
-#ifdef HAL_QSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_QUADSPI_DATA0[] = {
-  {PB_9, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)}, // QUADSPI_BK1_IO0
-  {NC,   NP,      0}
-};
-#endif
-
-#ifdef HAL_QSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_QUADSPI_DATA1[] = {
-  {PB_8, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)}, // QUADSPI_BK1_IO1
-  {NC,   NP,      0}
-};
-#endif
-
-#ifdef HAL_QSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_QUADSPI_DATA2[] = {
-  {PA_7, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)}, // QUADSPI_BK1_IO2
-  {NC,   NP,      0}
-};
-#endif
-
-#ifdef HAL_QSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_QUADSPI_DATA3[] = {
-  {PA_6, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)}, // QUADSPI_BK1_IO3
-  {NC,   NP,      0}
-};
-#endif
-
-#ifdef HAL_QSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_QUADSPI_SCLK[] = {
-  {PA_3, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)}, // QUADSPI_CLK
-  {NC,   NP,      0}
-};
-#endif
-
-#ifdef HAL_QSPI_MODULE_ENABLED
-WEAK const PinMap PinMap_QUADSPI_SSEL[] = {
-  {PA_2, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)}, // QUADSPI_BK1_NCS
-  {NC,   NP,      0}
-};
-#endif
-
-//*** USB ***
-
-#if defined(HAL_PCD_MODULE_ENABLED) || defined(HAL_HCD_MODULE_ENABLED)
-WEAK const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_DP
-  {PA_13, USB, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)}, // USB_NOE
-  {NC,    NP,  0}
-};
-#endif
-
-//*** No SD ***
-
-#endif /* !CUSTOM_PERIPHERAL_PINS */
diff --git a/variants/STM32WBxx/WB35C(C-E)UxA/boards_entry.txt b/variants/STM32WBxx/WB35C(C-E)UxA/boards_entry.txt
deleted file mode 100644
index 272343254a..0000000000
--- a/variants/STM32WBxx/WB35C(C-E)UxA/boards_entry.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file help to add generic board entry.
-# upload.maximum_size and product_line have to be verified
-# and changed if needed.
-# See: https://github.com/stm32duino/wiki/wiki/Add-a-new-variant-%28board%29
-
-# Generic WB35CCUxA
-GenWB.menu.pnum.GENERIC_WB35CCUXA=Generic WB35CCUxA
-GenWB.menu.pnum.GENERIC_WB35CCUXA.upload.maximum_size=262144
-GenWB.menu.pnum.GENERIC_WB35CCUXA.upload.maximum_data_size=98304
-GenWB.menu.pnum.GENERIC_WB35CCUXA.build.board=GENERIC_WB35CCUXA
-GenWB.menu.pnum.GENERIC_WB35CCUXA.build.product_line=STM32WB35xx
-GenWB.menu.pnum.GENERIC_WB35CCUXA.build.variant=STM32WBxx/WB35C(C-E)UxA
-
-# Generic WB35CEUxA
-GenWB.menu.pnum.GENERIC_WB35CEUXA=Generic WB35CEUxA
-GenWB.menu.pnum.GENERIC_WB35CEUXA.upload.maximum_size=524288
-GenWB.menu.pnum.GENERIC_WB35CEUXA.upload.maximum_data_size=98304
-GenWB.menu.pnum.GENERIC_WB35CEUXA.build.board=GENERIC_WB35CEUXA
-GenWB.menu.pnum.GENERIC_WB35CEUXA.build.product_line=STM32WB35xx
-GenWB.menu.pnum.GENERIC_WB35CEUXA.build.variant=STM32WBxx/WB35C(C-E)UxA
-
diff --git a/variants/STM32WBxx/WB55C(C-E-G)U/PeripheralPins.c b/variants/STM32WBxx/WB35C(C-E)UxA_WB55C(C-E-G)U/PeripheralPins.c
similarity index 98%
rename from variants/STM32WBxx/WB55C(C-E-G)U/PeripheralPins.c
rename to variants/STM32WBxx/WB35C(C-E)UxA_WB55C(C-E-G)U/PeripheralPins.c
index 796c1f541e..990c5289dc 100644
--- a/variants/STM32WBxx/WB55C(C-E-G)U/PeripheralPins.c
+++ b/variants/STM32WBxx/WB35C(C-E)UxA_WB55C(C-E-G)U/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -11,9 +11,9 @@
  *******************************************************************************
  */
 /*
- * Automatically generated from STM32WB55CCUx.xml, STM32WB55CEUx.xml
- * STM32WB55CGUx.xml
- * CubeMX DB release 6.0.30
+ * Automatically generated from STM32WB35C(C-E)UxA.xml, STM32WB55CCUx.xml
+ * STM32WB55CEUx.xml, STM32WB55CGUx.xml
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32WBxx/WB35C(C-E)UxA/PinNamesVar.h b/variants/STM32WBxx/WB35C(C-E)UxA_WB55C(C-E-G)U/PinNamesVar.h
similarity index 100%
rename from variants/STM32WBxx/WB35C(C-E)UxA/PinNamesVar.h
rename to variants/STM32WBxx/WB35C(C-E)UxA_WB55C(C-E-G)U/PinNamesVar.h
diff --git a/variants/STM32WBxx/WB55C(C-E-G)U/boards_entry.txt b/variants/STM32WBxx/WB35C(C-E)UxA_WB55C(C-E-G)U/boards_entry.txt
similarity index 51%
rename from variants/STM32WBxx/WB55C(C-E-G)U/boards_entry.txt
rename to variants/STM32WBxx/WB35C(C-E)UxA_WB55C(C-E-G)U/boards_entry.txt
index c83ecfc673..3c8f670311 100644
--- a/variants/STM32WBxx/WB55C(C-E-G)U/boards_entry.txt
+++ b/variants/STM32WBxx/WB35C(C-E)UxA_WB55C(C-E-G)U/boards_entry.txt
@@ -3,13 +3,29 @@
 # and changed if needed.
 # See: https://github.com/stm32duino/wiki/wiki/Add-a-new-variant-%28board%29
 
+# Generic WB35CCUxA
+GenWB.menu.pnum.GENERIC_WB35CCUXA=Generic WB35CCUxA
+GenWB.menu.pnum.GENERIC_WB35CCUXA.upload.maximum_size=262144
+GenWB.menu.pnum.GENERIC_WB35CCUXA.upload.maximum_data_size=98304
+GenWB.menu.pnum.GENERIC_WB35CCUXA.build.board=GENERIC_WB35CCUXA
+GenWB.menu.pnum.GENERIC_WB35CCUXA.build.product_line=STM32WB35xx
+GenWB.menu.pnum.GENERIC_WB35CCUXA.build.variant=STM32WBxx/WB35C(C-E)UxA_WB55C(C-E-G)U
+
+# Generic WB35CEUxA
+GenWB.menu.pnum.GENERIC_WB35CEUXA=Generic WB35CEUxA
+GenWB.menu.pnum.GENERIC_WB35CEUXA.upload.maximum_size=524288
+GenWB.menu.pnum.GENERIC_WB35CEUXA.upload.maximum_data_size=98304
+GenWB.menu.pnum.GENERIC_WB35CEUXA.build.board=GENERIC_WB35CEUXA
+GenWB.menu.pnum.GENERIC_WB35CEUXA.build.product_line=STM32WB35xx
+GenWB.menu.pnum.GENERIC_WB35CEUXA.build.variant=STM32WBxx/WB35C(C-E)UxA_WB55C(C-E-G)U
+
 # Generic WB55CCUx
 GenWB.menu.pnum.GENERIC_WB55CCUX=Generic WB55CCUx
 GenWB.menu.pnum.GENERIC_WB55CCUX.upload.maximum_size=262144
 GenWB.menu.pnum.GENERIC_WB55CCUX.upload.maximum_data_size=131072
 GenWB.menu.pnum.GENERIC_WB55CCUX.build.board=GENERIC_WB55CCUX
 GenWB.menu.pnum.GENERIC_WB55CCUX.build.product_line=STM32WB55xx
-GenWB.menu.pnum.GENERIC_WB55CCUX.build.variant=STM32WBxx/WB55C(C-E-G)U
+GenWB.menu.pnum.GENERIC_WB55CCUX.build.variant=STM32WBxx/WB35C(C-E)UxA_WB55C(C-E-G)U
 
 # Generic WB55CEUx
 GenWB.menu.pnum.GENERIC_WB55CEUX=Generic WB55CEUx
@@ -17,7 +33,7 @@ GenWB.menu.pnum.GENERIC_WB55CEUX.upload.maximum_size=524288
 GenWB.menu.pnum.GENERIC_WB55CEUX.upload.maximum_data_size=262144
 GenWB.menu.pnum.GENERIC_WB55CEUX.build.board=GENERIC_WB55CEUX
 GenWB.menu.pnum.GENERIC_WB55CEUX.build.product_line=STM32WB55xx
-GenWB.menu.pnum.GENERIC_WB55CEUX.build.variant=STM32WBxx/WB55C(C-E-G)U
+GenWB.menu.pnum.GENERIC_WB55CEUX.build.variant=STM32WBxx/WB35C(C-E)UxA_WB55C(C-E-G)U
 
 # Generic WB55CGUx
 GenWB.menu.pnum.GENERIC_WB55CGUX=Generic WB55CGUx
@@ -25,5 +41,5 @@ GenWB.menu.pnum.GENERIC_WB55CGUX.upload.maximum_size=1048576
 GenWB.menu.pnum.GENERIC_WB55CGUX.upload.maximum_data_size=262144
 GenWB.menu.pnum.GENERIC_WB55CGUX.build.board=GENERIC_WB55CGUX
 GenWB.menu.pnum.GENERIC_WB55CGUX.build.product_line=STM32WB55xx
-GenWB.menu.pnum.GENERIC_WB55CGUX.build.variant=STM32WBxx/WB55C(C-E-G)U
+GenWB.menu.pnum.GENERIC_WB55CGUX.build.variant=STM32WBxx/WB35C(C-E)UxA_WB55C(C-E-G)U
 
diff --git a/variants/STM32WBxx/WB35C(C-E)UxA/generic_clock.c b/variants/STM32WBxx/WB35C(C-E)UxA_WB55C(C-E-G)U/generic_clock.c
similarity index 80%
rename from variants/STM32WBxx/WB35C(C-E)UxA/generic_clock.c
rename to variants/STM32WBxx/WB35C(C-E)UxA_WB55C(C-E-G)U/generic_clock.c
index 8850f8e904..f9fad5c979 100644
--- a/variants/STM32WBxx/WB35C(C-E)UxA/generic_clock.c
+++ b/variants/STM32WBxx/WB35C(C-E)UxA_WB55C(C-E-G)U/generic_clock.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -10,8 +10,11 @@
  *
  *******************************************************************************
  */
-#if defined(ARDUINO_GENERIC_WB35CCUXA) || defined(ARDUINO_GENERIC_WB35CEUXA)
+#if defined(ARDUINO_GENERIC_WB35CCUXA) || defined(ARDUINO_GENERIC_WB35CEUXA) ||\
+    defined(ARDUINO_GENERIC_WB55CCUX) || defined(ARDUINO_GENERIC_WB55CEUX) ||\
+    defined(ARDUINO_GENERIC_WB55CGUX)
 #include "pins_arduino.h"
+#include "lock_resource.h"
 
 /**
   * @brief  System Clock Configuration
diff --git a/variants/STM32WBxx/WB55C(C-E-G)U/ldscript.ld b/variants/STM32WBxx/WB35C(C-E)UxA_WB55C(C-E-G)U/ldscript.ld
similarity index 100%
rename from variants/STM32WBxx/WB55C(C-E-G)U/ldscript.ld
rename to variants/STM32WBxx/WB35C(C-E)UxA_WB55C(C-E-G)U/ldscript.ld
diff --git a/variants/STM32WBxx/WB55C(C-E-G)U/variant_MKR_SHARKY.cpp b/variants/STM32WBxx/WB35C(C-E)UxA_WB55C(C-E-G)U/variant_MKR_SHARKY.cpp
similarity index 100%
rename from variants/STM32WBxx/WB55C(C-E-G)U/variant_MKR_SHARKY.cpp
rename to variants/STM32WBxx/WB35C(C-E)UxA_WB55C(C-E-G)U/variant_MKR_SHARKY.cpp
diff --git a/variants/STM32WBxx/WB55C(C-E-G)U/variant_MKR_SHARKY.h b/variants/STM32WBxx/WB35C(C-E)UxA_WB55C(C-E-G)U/variant_MKR_SHARKY.h
similarity index 100%
rename from variants/STM32WBxx/WB55C(C-E-G)U/variant_MKR_SHARKY.h
rename to variants/STM32WBxx/WB35C(C-E)UxA_WB55C(C-E-G)U/variant_MKR_SHARKY.h
diff --git a/variants/STM32WBxx/WB35C(C-E)UxA/variant_generic.cpp b/variants/STM32WBxx/WB35C(C-E)UxA_WB55C(C-E-G)U/variant_generic.cpp
similarity index 89%
rename from variants/STM32WBxx/WB35C(C-E)UxA/variant_generic.cpp
rename to variants/STM32WBxx/WB35C(C-E)UxA_WB55C(C-E-G)U/variant_generic.cpp
index 778aa4fda1..6f2b2ab0d1 100644
--- a/variants/STM32WBxx/WB35C(C-E)UxA/variant_generic.cpp
+++ b/variants/STM32WBxx/WB35C(C-E)UxA_WB55C(C-E-G)U/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -10,7 +10,9 @@
  *
  *******************************************************************************
  */
-#if defined(ARDUINO_GENERIC_WB35CCUXA) || defined(ARDUINO_GENERIC_WB35CEUXA)
+#if defined(ARDUINO_GENERIC_WB35CCUXA) || defined(ARDUINO_GENERIC_WB35CEUXA) ||\
+    defined(ARDUINO_GENERIC_WB55CCUX) || defined(ARDUINO_GENERIC_WB55CEUX) ||\
+    defined(ARDUINO_GENERIC_WB55CGUX)
 #include "pins_arduino.h"
 
 // Digital PinName array
diff --git a/variants/STM32WBxx/WB35C(C-E)UxA/variant_generic.h b/variants/STM32WBxx/WB35C(C-E)UxA_WB55C(C-E-G)U/variant_generic.h
similarity index 99%
rename from variants/STM32WBxx/WB35C(C-E)UxA/variant_generic.h
rename to variants/STM32WBxx/WB35C(C-E)UxA_WB55C(C-E-G)U/variant_generic.h
index 0751e5b0f8..1f18e49fcd 100644
--- a/variants/STM32WBxx/WB35C(C-E)UxA/variant_generic.h
+++ b/variants/STM32WBxx/WB35C(C-E)UxA_WB55C(C-E-G)U/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32WBxx/WB50CGU/PinNamesVar.h b/variants/STM32WBxx/WB50CGU/PinNamesVar.h
deleted file mode 100644
index cb0eb9240d..0000000000
--- a/variants/STM32WBxx/WB50CGU/PinNamesVar.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Alternate pin name */
-PA_7_ALT1 = PA_7 | ALT1,
-PB_8_ALT1 = PB_8 | ALT1,
-PB_9_ALT1 = PB_9 | ALT1,
-
-/* SYS_WKUP */
-#ifdef PWR_WAKEUP_PIN1
-  SYS_WKUP1 = PA_0,
-#endif
-#ifdef PWR_WAKEUP_PIN2
-  SYS_WKUP2 = NC,
-#endif
-#ifdef PWR_WAKEUP_PIN3
-  SYS_WKUP3 = NC,
-#endif
-#ifdef PWR_WAKEUP_PIN4
-  SYS_WKUP4 = PA_2,
-#endif
-#ifdef PWR_WAKEUP_PIN5
-  SYS_WKUP5 = NC,
-#endif
-#ifdef PWR_WAKEUP_PIN6
-  SYS_WKUP6 = NC,
-#endif
-#ifdef PWR_WAKEUP_PIN7
-  SYS_WKUP7 = NC,
-#endif
-#ifdef PWR_WAKEUP_PIN8
-  SYS_WKUP8 = NC,
-#endif
-
-/* No USB */
diff --git a/variants/STM32WBxx/WB50CGU/boards_entry.txt b/variants/STM32WBxx/WB50CGU/boards_entry.txt
deleted file mode 100644
index 690eda0b69..0000000000
--- a/variants/STM32WBxx/WB50CGU/boards_entry.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-# This file help to add generic board entry.
-# upload.maximum_size and product_line have to be verified
-# and changed if needed.
-# See: https://github.com/stm32duino/wiki/wiki/Add-a-new-variant-%28board%29
-
-# Generic WB50CGUx
-GenWB.menu.pnum.GENERIC_WB50CGUX=Generic WB50CGUx
-GenWB.menu.pnum.GENERIC_WB50CGUX.upload.maximum_size=1048576
-GenWB.menu.pnum.GENERIC_WB50CGUX.upload.maximum_data_size=131072
-GenWB.menu.pnum.GENERIC_WB50CGUX.build.board=GENERIC_WB50CGUX
-GenWB.menu.pnum.GENERIC_WB50CGUX.build.product_line=STM32WB50xx
-GenWB.menu.pnum.GENERIC_WB50CGUX.build.variant=STM32WBxx/WB50CGU
-
diff --git a/variants/STM32WBxx/WB50CGU/generic_clock.c b/variants/STM32WBxx/WB50CGU/generic_clock.c
deleted file mode 100644
index a5b832bd95..0000000000
--- a/variants/STM32WBxx/WB50CGU/generic_clock.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
- * All rights reserved.
- *
- * This software component is licensed by ST under BSD 3-Clause license,
- * the "License"; You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *                        opensource.org/licenses/BSD-3-Clause
- *
- *******************************************************************************
- */
-#if defined(ARDUINO_GENERIC_WB50CGUX)
-#include "pins_arduino.h"
-
-/**
-  * @brief  System Clock Configuration
-  * @param  None
-  * @retval None
-  */
-WEAK void SystemClock_Config(void)
-{
-  /* SystemClock_Config can be generated by STM32CubeMX */
-#warning "SystemClock_Config() is empty. Default clock at reset is used."
-}
-
-#endif /* ARDUINO_GENERIC_* */
diff --git a/variants/STM32WBxx/WB50CGU/variant_generic.h b/variants/STM32WBxx/WB50CGU/variant_generic.h
deleted file mode 100644
index 8ee9b18ab2..0000000000
--- a/variants/STM32WBxx/WB50CGU/variant_generic.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
- * All rights reserved.
- *
- * This software component is licensed by ST under BSD 3-Clause license,
- * the "License"; You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *                        opensource.org/licenses/BSD-3-Clause
- *
- *******************************************************************************
- */
-#pragma once
-
-/*----------------------------------------------------------------------------
- *        STM32 pins number
- *----------------------------------------------------------------------------*/
-#define PA0                     PIN_A0
-#define PA1                     PIN_A1
-#define PA2                     PIN_A2
-#define PA3                     PIN_A3
-#define PA4                     PIN_A4
-#define PA5                     PIN_A5
-#define PA6                     PIN_A6
-#define PA7                     PIN_A7
-#define PA8                     PIN_A8
-#define PA9                     PIN_A9
-#define PA10                    10
-#define PA11                    11
-#define PA12                    12
-#define PA13                    13
-#define PA14                    14
-#define PA15                    15
-#define PB0                     16
-#define PB1                     17
-#define PB2                     18
-#define PB3                     19
-#define PB4                     20
-#define PB5                     21
-#define PB6                     22
-#define PB7                     23
-#define PB8                     24
-#define PB9                     25
-#define PC14                    26
-#define PC15                    27
-#define PE4                     28
-#define PH3                     29
-
-// Alternate pins number
-#define PA7_ALT1                (PA7 | ALT1)
-#define PB8_ALT1                (PB8 | ALT1)
-#define PB9_ALT1                (PB9 | ALT1)
-
-#define NUM_DIGITAL_PINS        30
-#define NUM_ANALOG_INPUTS       10
-
-// On-board LED pin number
-#ifndef LED_BUILTIN
-  #define LED_BUILTIN           PNUM_NOT_DEFINED
-#endif
-
-// On-board user button
-#ifndef USER_BTN
-  #define USER_BTN              PNUM_NOT_DEFINED
-#endif
-
-// SPI definitions
-#ifndef PIN_SPI_SS
-  #define PIN_SPI_SS            PA4
-#endif
-#ifndef PIN_SPI_SS1
-  #define PIN_SPI_SS1           PA15
-#endif
-#ifndef PIN_SPI_SS2
-  #define PIN_SPI_SS2           PB2
-#endif
-#ifndef PIN_SPI_SS3
-  #define PIN_SPI_SS3           PNUM_NOT_DEFINED
-#endif
-#ifndef PIN_SPI_MOSI
-  #define PIN_SPI_MOSI          PA7
-#endif
-#ifndef PIN_SPI_MISO
-  #define PIN_SPI_MISO          PA6
-#endif
-#ifndef PIN_SPI_SCK
-  #define PIN_SPI_SCK           PA1
-#endif
-
-// I2C definitions
-#ifndef PIN_WIRE_SDA
-  #define PIN_WIRE_SDA          PA10
-#endif
-#ifndef PIN_WIRE_SCL
-  #define PIN_WIRE_SCL          PA9
-#endif
-
-// Timer Definitions
-// Use TIM6/TIM7 when possible as servo and tone don't need GPIO output pin
-#ifndef TIMER_TONE
-  #define TIMER_TONE            TIM16
-#endif
-#ifndef TIMER_SERVO
-  #define TIMER_SERVO           TIM17
-#endif
-
-// UART Definitions
-#ifndef SERIAL_UART_INSTANCE
-  #define SERIAL_UART_INSTANCE  1
-#endif
-
-// Default pin used for generic 'Serial' instance
-// Mandatory for Firmata
-#ifndef PIN_SERIAL_RX
-  #define PIN_SERIAL_RX         PA10
-#endif
-#ifndef PIN_SERIAL_TX
-  #define PIN_SERIAL_TX         PA9
-#endif
-
-/*----------------------------------------------------------------------------
- *        Arduino objects - C++ only
- *----------------------------------------------------------------------------*/
-
-#ifdef __cplusplus
-  // These serial port names are intended to allow libraries and architecture-neutral
-  // sketches to automatically default to the correct port name for a particular type
-  // of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
-  // the first hardware serial port whose RX/TX pins are not dedicated to another use.
-  //
-  // SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
-  //
-  // SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
-  //
-  // SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
-  //
-  // SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
-  //
-  // SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
-  //                            pins are NOT connected to anything by default.
-  #ifndef SERIAL_PORT_MONITOR
-    #define SERIAL_PORT_MONITOR   Serial
-  #endif
-  #ifndef SERIAL_PORT_HARDWARE
-    #define SERIAL_PORT_HARDWARE  Serial
-  #endif
-#endif
diff --git a/variants/STM32WBxx/WB55C(C-E-G)U/PinNamesVar.h b/variants/STM32WBxx/WB55C(C-E-G)U/PinNamesVar.h
deleted file mode 100644
index 456b373ea4..0000000000
--- a/variants/STM32WBxx/WB55C(C-E-G)U/PinNamesVar.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Alternate pin name */
-PA_7_ALT1 = PA_7 | ALT1,
-PB_8_ALT1 = PB_8 | ALT1,
-PB_9_ALT1 = PB_9 | ALT1,
-
-/* SYS_WKUP */
-#ifdef PWR_WAKEUP_PIN1
-  SYS_WKUP1 = PA_0,
-#endif
-#ifdef PWR_WAKEUP_PIN2
-  SYS_WKUP2 = NC,
-#endif
-#ifdef PWR_WAKEUP_PIN3
-  SYS_WKUP3 = NC,
-#endif
-#ifdef PWR_WAKEUP_PIN4
-  SYS_WKUP4 = PA_2,
-#endif
-#ifdef PWR_WAKEUP_PIN5
-  SYS_WKUP5 = NC,
-#endif
-#ifdef PWR_WAKEUP_PIN6
-  SYS_WKUP6 = NC,
-#endif
-#ifdef PWR_WAKEUP_PIN7
-  SYS_WKUP7 = NC,
-#endif
-#ifdef PWR_WAKEUP_PIN8
-  SYS_WKUP8 = NC,
-#endif
-
-/* USB */
-#ifdef USBCON
-  USB_DM  = PA_11,
-  USB_DP  = PA_12,
-  USB_NOE = PA_13,
-#endif
diff --git a/variants/STM32WBxx/WB55C(C-E-G)U/generic_clock.c b/variants/STM32WBxx/WB55C(C-E-G)U/generic_clock.c
deleted file mode 100644
index 8365b45934..0000000000
--- a/variants/STM32WBxx/WB55C(C-E-G)U/generic_clock.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
- * All rights reserved.
- *
- * This software component is licensed by ST under BSD 3-Clause license,
- * the "License"; You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *                        opensource.org/licenses/BSD-3-Clause
- *
- *******************************************************************************
- */
-#if defined(ARDUINO_GENERIC_WB55CCUX) || defined(ARDUINO_GENERIC_WB55CEUX) ||\
-    defined(ARDUINO_GENERIC_WB55CGUX)
-#include "pins_arduino.h"
-#include "lock_resource.h"
-
-/**
-  * @brief  System Clock Configuration
-  * @param  None
-  * @retval None
-  */
-WEAK void SystemClock_Config(void)
-{
-  RCC_OscInitTypeDef RCC_OscInitStruct = {};
-  RCC_ClkInitTypeDef RCC_ClkInitStruct = {};
-  RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {};
-
-  /* This prevents concurrent access to RCC registers by CPU2 (M0+) */
-  hsem_lock(CFG_HW_RCC_SEMID, HSEM_LOCK_DEFAULT_RETRY);
-
-  /** Configure the main internal regulator output voltage
-  */
-  __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1);
-
-  /* This prevents the CPU2 (M0+) to disable the HSI48 oscillator */
-  hsem_lock(CFG_HW_CLK48_CONFIG_SEMID, HSEM_LOCK_DEFAULT_RETRY);
-
-  /** Initializes the RCC Oscillators according to the specified parameters
-  * in the RCC_OscInitTypeDef structure.
-  */
-  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI48 | RCC_OSCILLATORTYPE_HSI;
-  RCC_OscInitStruct.HSIState = RCC_HSI_ON;
-  RCC_OscInitStruct.HSI48State = RCC_HSI48_ON;
-  RCC_OscInitStruct.HSICalibrationValue = RCC_HSICALIBRATION_DEFAULT;
-  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
-  RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSI;
-  RCC_OscInitStruct.PLL.PLLM = RCC_PLLM_DIV1;
-  RCC_OscInitStruct.PLL.PLLN = 8;
-  RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV2;
-  RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2;
-  RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV2;
-  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {
-    Error_Handler();
-  }
-  /** Configure the SYSCLKSource, HCLK, PCLK1 and PCLK2 clocks dividers
-  */
-  RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK4 | RCC_CLOCKTYPE_HCLK2
-                                | RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_SYSCLK
-                                | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2;
-  RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
-  RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
-  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1;
-  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
-  RCC_ClkInitStruct.AHBCLK2Divider = RCC_SYSCLK_DIV2;
-  RCC_ClkInitStruct.AHBCLK4Divider = RCC_SYSCLK_DIV1;
-
-  if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_3) != HAL_OK) {
-    Error_Handler();
-  }
-  /** Initializes the peripherals clocks
-  */
-  PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS | RCC_PERIPHCLK_USB;
-  PeriphClkInitStruct.UsbClockSelection = RCC_USBCLKSOURCE_HSI48;
-  PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI;
-  PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1;
-  if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) {
-    Error_Handler();
-  }
-
-  LL_PWR_SMPS_SetStartupCurrent(LL_PWR_SMPS_STARTUP_CURRENT_80MA);
-  LL_PWR_SMPS_SetOutputVoltageLevel(LL_PWR_SMPS_OUTPUT_VOLTAGE_1V40);
-  LL_PWR_SMPS_Enable();
-
-  /* Select HSI as system clock source after Wake Up from Stop mode */
-  LL_RCC_SetClkAfterWakeFromStop(LL_RCC_STOP_WAKEUPCLOCK_HSI);
-
-  hsem_unlock(CFG_HW_RCC_SEMID);
-}
-
-#endif /* ARDUINO_GENERIC_* */
diff --git a/variants/STM32WBxx/WB55C(C-E-G)U/variant_generic.cpp b/variants/STM32WBxx/WB55C(C-E-G)U/variant_generic.cpp
deleted file mode 100644
index 528b522756..0000000000
--- a/variants/STM32WBxx/WB55C(C-E-G)U/variant_generic.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
- * All rights reserved.
- *
- * This software component is licensed by ST under BSD 3-Clause license,
- * the "License"; You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *                        opensource.org/licenses/BSD-3-Clause
- *
- *******************************************************************************
- */
-#if defined(ARDUINO_GENERIC_WB55CCUX) || defined(ARDUINO_GENERIC_WB55CEUX) ||\
-    defined(ARDUINO_GENERIC_WB55CGUX)
-#include "pins_arduino.h"
-
-// Digital PinName array
-const PinName digitalPin[] = {
-  PA_0,   // D0/A0
-  PA_1,   // D1/A1
-  PA_2,   // D2/A2
-  PA_3,   // D3/A3
-  PA_4,   // D4/A4
-  PA_5,   // D5/A5
-  PA_6,   // D6/A6
-  PA_7,   // D7/A7
-  PA_8,   // D8/A8
-  PA_9,   // D9/A9
-  PA_10,  // D10
-  PA_11,  // D11
-  PA_12,  // D12
-  PA_13,  // D13
-  PA_14,  // D14
-  PA_15,  // D15
-  PB_0,   // D16
-  PB_1,   // D17
-  PB_2,   // D18
-  PB_3,   // D19
-  PB_4,   // D20
-  PB_5,   // D21
-  PB_6,   // D22
-  PB_7,   // D23
-  PB_8,   // D24
-  PB_9,   // D25
-  PC_14,  // D26
-  PC_15,  // D27
-  PE_4,   // D28
-  PH_3    // D29
-};
-
-// Analog (Ax) pin number array
-const uint32_t analogInputPin[] = {
-  0,  // A0,  PA0
-  1,  // A1,  PA1
-  2,  // A2,  PA2
-  3,  // A3,  PA3
-  4,  // A4,  PA4
-  5,  // A5,  PA5
-  6,  // A6,  PA6
-  7,  // A7,  PA7
-  8,  // A8,  PA8
-  9   // A9,  PA9
-};
-
-#endif /* ARDUINO_GENERIC_* */
diff --git a/variants/STM32WBxx/WB55C(C-E-G)U/variant_generic.h b/variants/STM32WBxx/WB55C(C-E-G)U/variant_generic.h
deleted file mode 100644
index 0751e5b0f8..0000000000
--- a/variants/STM32WBxx/WB55C(C-E-G)U/variant_generic.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
- * All rights reserved.
- *
- * This software component is licensed by ST under BSD 3-Clause license,
- * the "License"; You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *                        opensource.org/licenses/BSD-3-Clause
- *
- *******************************************************************************
- */
-#pragma once
-
-/*----------------------------------------------------------------------------
- *        STM32 pins number
- *----------------------------------------------------------------------------*/
-#define PA0                     PIN_A0
-#define PA1                     PIN_A1
-#define PA2                     PIN_A2
-#define PA3                     PIN_A3
-#define PA4                     PIN_A4
-#define PA5                     PIN_A5
-#define PA6                     PIN_A6
-#define PA7                     PIN_A7
-#define PA8                     PIN_A8
-#define PA9                     PIN_A9
-#define PA10                    10
-#define PA11                    11
-#define PA12                    12
-#define PA13                    13
-#define PA14                    14
-#define PA15                    15
-#define PB0                     16
-#define PB1                     17
-#define PB2                     18
-#define PB3                     19
-#define PB4                     20
-#define PB5                     21
-#define PB6                     22
-#define PB7                     23
-#define PB8                     24
-#define PB9                     25
-#define PC14                    26
-#define PC15                    27
-#define PE4                     28
-#define PH3                     29
-
-// Alternate pins number
-#define PA7_ALT1                (PA7 | ALT1)
-#define PB8_ALT1                (PB8 | ALT1)
-#define PB9_ALT1                (PB9 | ALT1)
-
-#define NUM_DIGITAL_PINS        30
-#define NUM_ANALOG_INPUTS       10
-
-// On-board LED pin number
-#ifndef LED_BUILTIN
-  #define LED_BUILTIN           PNUM_NOT_DEFINED
-#endif
-
-// On-board user button
-#ifndef USER_BTN
-  #define USER_BTN              PNUM_NOT_DEFINED
-#endif
-
-// SPI definitions
-#ifndef PIN_SPI_SS
-  #define PIN_SPI_SS            PA4
-#endif
-#ifndef PIN_SPI_SS1
-  #define PIN_SPI_SS1           PA15
-#endif
-#ifndef PIN_SPI_SS2
-  #define PIN_SPI_SS2           PB2
-#endif
-#ifndef PIN_SPI_SS3
-  #define PIN_SPI_SS3           PNUM_NOT_DEFINED
-#endif
-#ifndef PIN_SPI_MOSI
-  #define PIN_SPI_MOSI          PA7
-#endif
-#ifndef PIN_SPI_MISO
-  #define PIN_SPI_MISO          PA6
-#endif
-#ifndef PIN_SPI_SCK
-  #define PIN_SPI_SCK           PA1
-#endif
-
-// I2C definitions
-#ifndef PIN_WIRE_SDA
-  #define PIN_WIRE_SDA          PA10
-#endif
-#ifndef PIN_WIRE_SCL
-  #define PIN_WIRE_SCL          PA9
-#endif
-
-// Timer Definitions
-// Use TIM6/TIM7 when possible as servo and tone don't need GPIO output pin
-#ifndef TIMER_TONE
-  #define TIMER_TONE            TIM16
-#endif
-#ifndef TIMER_SERVO
-  #define TIMER_SERVO           TIM17
-#endif
-
-// UART Definitions
-#ifndef SERIAL_UART_INSTANCE
-  #define SERIAL_UART_INSTANCE  101
-#endif
-
-// Default pin used for generic 'Serial' instance
-// Mandatory for Firmata
-#ifndef PIN_SERIAL_RX
-  #define PIN_SERIAL_RX         PA3
-#endif
-#ifndef PIN_SERIAL_TX
-  #define PIN_SERIAL_TX         PA2
-#endif
-
-// Extra HAL modules
-#if !defined(HAL_QSPI_MODULE_DISABLED)
-  #define HAL_QSPI_MODULE_ENABLED
-#endif
-
-/*----------------------------------------------------------------------------
- *        Arduino objects - C++ only
- *----------------------------------------------------------------------------*/
-
-#ifdef __cplusplus
-  // These serial port names are intended to allow libraries and architecture-neutral
-  // sketches to automatically default to the correct port name for a particular type
-  // of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
-  // the first hardware serial port whose RX/TX pins are not dedicated to another use.
-  //
-  // SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
-  //
-  // SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
-  //
-  // SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
-  //
-  // SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
-  //
-  // SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
-  //                            pins are NOT connected to anything by default.
-  #ifndef SERIAL_PORT_MONITOR
-    #define SERIAL_PORT_MONITOR   Serial
-  #endif
-  #ifndef SERIAL_PORT_HARDWARE
-    #define SERIAL_PORT_HARDWARE  Serial
-  #endif
-#endif
diff --git a/variants/STM32WBxx/WB55R(C-E-G)V/PeripheralPins.c b/variants/STM32WBxx/WB55R(C-E-G)V/PeripheralPins.c
index d593aeca68..14ae57c006 100644
--- a/variants/STM32WBxx/WB55R(C-E-G)V/PeripheralPins.c
+++ b/variants/STM32WBxx/WB55R(C-E-G)V/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -13,7 +13,7 @@
 /*
  * Automatically generated from STM32WB55RCVx.xml, STM32WB55REVx.xml
  * STM32WB55RGVx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32WBxx/WB55R(C-E-G)V/variant_generic.cpp b/variants/STM32WBxx/WB55R(C-E-G)V/variant_generic.cpp
index 0a1d8062fe..71e81e68a4 100644
--- a/variants/STM32WBxx/WB55R(C-E-G)V/variant_generic.cpp
+++ b/variants/STM32WBxx/WB55R(C-E-G)V/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32WBxx/WB55R(C-E-G)V/variant_generic.h b/variants/STM32WBxx/WB55R(C-E-G)V/variant_generic.h
index 34995df24a..681ee5ff9a 100644
--- a/variants/STM32WBxx/WB55R(C-E-G)V/variant_generic.h
+++ b/variants/STM32WBxx/WB55R(C-E-G)V/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32WBxx/WB55V(C-E-G)(Q-Y)_WB55VYY/PeripheralPins.c b/variants/STM32WBxx/WB55V(C-E-G)(Q-Y)_WB55VYY/PeripheralPins.c
index 016bf6bd82..4cc42489f2 100644
--- a/variants/STM32WBxx/WB55V(C-E-G)(Q-Y)_WB55VYY/PeripheralPins.c
+++ b/variants/STM32WBxx/WB55V(C-E-G)(Q-Y)_WB55VYY/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -15,7 +15,7 @@
  * STM32WB55VEQx.xml, STM32WB55VEYx.xml
  * STM32WB55VGQx.xml, STM32WB55VGYx.xml
  * STM32WB55VYYx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32WBxx/WB55V(C-E-G)(Q-Y)_WB55VYY/variant_generic.cpp b/variants/STM32WBxx/WB55V(C-E-G)(Q-Y)_WB55VYY/variant_generic.cpp
index f585d7ff17..fc7643da90 100644
--- a/variants/STM32WBxx/WB55V(C-E-G)(Q-Y)_WB55VYY/variant_generic.cpp
+++ b/variants/STM32WBxx/WB55V(C-E-G)(Q-Y)_WB55VYY/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32WBxx/WB55V(C-E-G)(Q-Y)_WB55VYY/variant_generic.h b/variants/STM32WBxx/WB55V(C-E-G)(Q-Y)_WB55VYY/variant_generic.h
index fc5b70ede6..d6970ac9a9 100644
--- a/variants/STM32WBxx/WB55V(C-E-G)(Q-Y)_WB55VYY/variant_generic.h
+++ b/variants/STM32WBxx/WB55V(C-E-G)(Q-Y)_WB55VYY/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32WBxx/WB5MMGH/PeripheralPins.c b/variants/STM32WBxx/WB5MMGH/PeripheralPins.c
index 9615cf9b90..28480e0bd3 100644
--- a/variants/STM32WBxx/WB5MMGH/PeripheralPins.c
+++ b/variants/STM32WBxx/WB5MMGH/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,7 +12,7 @@
  */
 /*
  * Automatically generated from STM32WB5MMGHx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32WBxx/WB5MMGH/variant_generic.cpp b/variants/STM32WBxx/WB5MMGH/variant_generic.cpp
index 2b169d78eb..2f84ea71b6 100644
--- a/variants/STM32WBxx/WB5MMGH/variant_generic.cpp
+++ b/variants/STM32WBxx/WB5MMGH/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32WBxx/WB5MMGH/variant_generic.h b/variants/STM32WBxx/WB5MMGH/variant_generic.h
index fe909a8633..0807299f41 100644
--- a/variants/STM32WBxx/WB5MMGH/variant_generic.h
+++ b/variants/STM32WBxx/WB5MMGH/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32WLxx/WL54CCU_WL55CCU_WLE4C(8-B-C)U_WLE5C(8-B-C)U/PeripheralPins.c b/variants/STM32WLxx/WL54CCU_WL55CCU_WLE4C(8-B-C)U_WLE5C(8-B-C)U/PeripheralPins.c
index 5225cd2b41..4aa660fbb6 100644
--- a/variants/STM32WLxx/WL54CCU_WL55CCU_WLE4C(8-B-C)U_WLE5C(8-B-C)U/PeripheralPins.c
+++ b/variants/STM32WLxx/WL54CCU_WL55CCU_WLE4C(8-B-C)U_WLE5C(8-B-C)U/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -15,7 +15,7 @@
  * STM32WLE4C8Ux.xml, STM32WLE4CBUx.xml
  * STM32WLE4CCUx.xml, STM32WLE5C8Ux.xml
  * STM32WLE5CBUx.xml, STM32WLE5CCUx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32WLxx/WL54CCU_WL55CCU_WLE4C(8-B-C)U_WLE5C(8-B-C)U/variant_generic.cpp b/variants/STM32WLxx/WL54CCU_WL55CCU_WLE4C(8-B-C)U_WLE5C(8-B-C)U/variant_generic.cpp
index 6b5cf7d67a..cefeeb0225 100644
--- a/variants/STM32WLxx/WL54CCU_WL55CCU_WLE4C(8-B-C)U_WLE5C(8-B-C)U/variant_generic.cpp
+++ b/variants/STM32WLxx/WL54CCU_WL55CCU_WLE4C(8-B-C)U_WLE5C(8-B-C)U/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32WLxx/WL54CCU_WL55CCU_WLE4C(8-B-C)U_WLE5C(8-B-C)U/variant_generic.h b/variants/STM32WLxx/WL54CCU_WL55CCU_WLE4C(8-B-C)U_WLE5C(8-B-C)U/variant_generic.h
index 4afc7a8201..6038da8435 100644
--- a/variants/STM32WLxx/WL54CCU_WL55CCU_WLE4C(8-B-C)U_WLE5C(8-B-C)U/variant_generic.h
+++ b/variants/STM32WLxx/WL54CCU_WL55CCU_WLE4C(8-B-C)U_WLE5C(8-B-C)U/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32WLxx/WL54JCI_WL55JCI_WLE4J(8-B-C)I_WLE5J(8-B-C)I/PeripheralPins.c b/variants/STM32WLxx/WL54JCI_WL55JCI_WLE4J(8-B-C)I_WLE5J(8-B-C)I/PeripheralPins.c
index dc7aeaecdb..48892de444 100644
--- a/variants/STM32WLxx/WL54JCI_WL55JCI_WLE4J(8-B-C)I_WLE5J(8-B-C)I/PeripheralPins.c
+++ b/variants/STM32WLxx/WL54JCI_WL55JCI_WLE4J(8-B-C)I_WLE5J(8-B-C)I/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -15,7 +15,7 @@
  * STM32WLE4J8Ix.xml, STM32WLE4JBIx.xml
  * STM32WLE4JCIx.xml, STM32WLE5J8Ix.xml
  * STM32WLE5JBIx.xml, STM32WLE5JCIx.xml
- * CubeMX DB release 6.0.30
+ * CubeMX DB release 6.0.50
  */
 #if !defined(CUSTOM_PERIPHERAL_PINS)
 #include "Arduino.h"
diff --git a/variants/STM32WLxx/WL54JCI_WL55JCI_WLE4J(8-B-C)I_WLE5J(8-B-C)I/variant_generic.cpp b/variants/STM32WLxx/WL54JCI_WL55JCI_WLE4J(8-B-C)I_WLE5J(8-B-C)I/variant_generic.cpp
index a986c08b3f..92256dcf02 100644
--- a/variants/STM32WLxx/WL54JCI_WL55JCI_WLE4J(8-B-C)I_WLE5J(8-B-C)I/variant_generic.cpp
+++ b/variants/STM32WLxx/WL54JCI_WL55JCI_WLE4J(8-B-C)I_WLE5J(8-B-C)I/variant_generic.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32WLxx/WL54JCI_WL55JCI_WLE4J(8-B-C)I_WLE5J(8-B-C)I/variant_generic.h b/variants/STM32WLxx/WL54JCI_WL55JCI_WLE4J(8-B-C)I_WLE5J(8-B-C)I/variant_generic.h
index 99d5484697..10fd4af5e5 100644
--- a/variants/STM32WLxx/WL54JCI_WL55JCI_WLE4J(8-B-C)I_WLE5J(8-B-C)I/variant_generic.h
+++ b/variants/STM32WLxx/WL54JCI_WL55JCI_WLE4J(8-B-C)I_WLE5J(8-B-C)I/variant_generic.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/variants/STM32WLxx/WL55UCY_WLE5U(8-B)Y/PeripheralPins.c b/variants/STM32WLxx/WL55UCY_WLE5U(8-B)Y/PeripheralPins.c
deleted file mode 100644
index 63ca40be3a..0000000000
--- a/variants/STM32WLxx/WL55UCY_WLE5U(8-B)Y/PeripheralPins.c
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
- * All rights reserved.
- *
- * This software component is licensed by ST under BSD 3-Clause license,
- * the "License"; You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *                        opensource.org/licenses/BSD-3-Clause
- *
- *******************************************************************************
- */
-/*
- * Automatically generated from STM32WL55UCYx.xml, STM32WLE5U8Yx.xml
- * STM32WLE5UBYx.xml
- * CubeMX DB release 6.0.30
- */
-#if !defined(CUSTOM_PERIPHERAL_PINS)
-#include "Arduino.h"
-#include "PeripheralPins.h"
-
-/* =====
- * Notes:
- * - The pins mentioned Px_y_ALTz are alternative possibilities which use other
- *   HW peripheral instances. You can use them the same way as any other "normal"
- *   pin (i.e. analogWrite(PA7_ALT1, 128);).
- *
- * - Commented lines are alternative possibilities which are not used per default.
- *   If you change them, you will have to know what you do
- * =====
- */
-
-//*** ADC ***
-
-#ifdef HAL_ADC_MODULE_ENABLED
-WEAK const PinMap PinMap_ADC[] = {
-  {PA_10, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC_IN6
-  {PA_11, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC_IN7
-  {PA_12, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC_IN8
-  {PA_13, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC_IN9
-  {PA_14, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC_IN10
-  {PA_15, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC_IN11
-  {PB_3,  ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC_IN2
-  {PB_4,  ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC_IN3
-  {NC,    NP,   0}
-};
-#endif
-
-//*** DAC ***
-
-#ifdef HAL_DAC_MODULE_ENABLED
-WEAK const PinMap PinMap_DAC[] = {
-  {PA_10, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // DAC_OUT1
-  {NC,    NP,   0}
-};
-#endif
-
-//*** I2C ***
-
-#ifdef HAL_I2C_MODULE_ENABLED
-WEAK const PinMap PinMap_I2C_SDA[] = {
-  {PA_10, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
-  {PA_11, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
-  {PA_15, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
-  {PB_4,  I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
-  {NC,    NP,   0}
-};
-#endif
-
-#ifdef HAL_I2C_MODULE_ENABLED
-WEAK const PinMap PinMap_I2C_SCL[] = {
-  {PA_7,  I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
-  {PA_9,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
-  {PA_12, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
-  {NC,    NP,   0}
-};
-#endif
-
-//*** TIM ***
-
-#ifdef HAL_TIM_MODULE_ENABLED
-WEAK const PinMap PinMap_TIM[] = {
-  {PA_0,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
-  {PA_1,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
-  {PA_2,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
-  {PA_3,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4
-  {PA_5,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
-  {PA_6,      TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM16, 1, 0)}, // TIM16_CH1
-  {PA_7,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
-  {PA_7_ALT1, TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_TIM17, 1, 0)}, // TIM17_CH1
-  {PA_8,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)}, // TIM1_CH1
-  {PA_9,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 0)}, // TIM1_CH2
-  {PA_10,     TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 0)}, // TIM1_CH3
-  {PA_11,     TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 4, 0)}, // TIM1_CH4
-  {PA_15,     TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
-  {PB_3,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
-  {NC,        NP,    0}
-};
-#endif
-
-//*** UART ***
-
-#ifdef HAL_UART_MODULE_ENABLED
-WEAK const PinMap PinMap_UART_TX[] = {
-  {PA_2,      LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
-  {PA_2_ALT1, USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PA_9,      USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {NC,        NP,      0}
-};
-#endif
-
-#ifdef HAL_UART_MODULE_ENABLED
-WEAK const PinMap PinMap_UART_RX[] = {
-  {PA_3,      LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
-  {PA_3_ALT1, USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PA_10,     USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {NC,        NP,      0}
-};
-#endif
-
-#ifdef HAL_UART_MODULE_ENABLED
-WEAK const PinMap PinMap_UART_RTS[] = {
-  {PA_1,      LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
-  {PA_1_ALT1, USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PA_12,     USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PB_3,      USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {NC,        NP,      0}
-};
-#endif
-
-#ifdef HAL_UART_MODULE_ENABLED
-WEAK const PinMap PinMap_UART_CTS[] = {
-  {PA_0,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PA_6,  LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
-  {PA_11, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PB_4,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {NC,    NP,      0}
-};
-#endif
-
-//*** SPI ***
-
-#ifdef HAL_SPI_MODULE_ENABLED
-WEAK const PinMap PinMap_SPI_MOSI[] = {
-  {PA_7,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PA_10, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PA_12, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {NC,    NP,   0}
-};
-#endif
-
-#ifdef HAL_SPI_MODULE_ENABLED
-WEAK const PinMap PinMap_SPI_MISO[] = {
-  {PA_5,  SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_SPI2)},
-  {PA_6,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PA_11, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PB_4,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {NC,    NP,   0}
-};
-#endif
-
-#ifdef HAL_SPI_MODULE_ENABLED
-WEAK const PinMap PinMap_SPI_SCLK[] = {
-  {PA_1, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PA_5, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PA_8, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PA_9, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PB_3, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {NC,   NP,   0}
-};
-#endif
-
-#ifdef HAL_SPI_MODULE_ENABLED
-WEAK const PinMap PinMap_SPI_SSEL[] = {
-  {PA_4,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {PA_9,  SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_SPI2)},
-  {PA_15, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  {NC,    NP,   0}
-};
-#endif
-
-//*** No CAN ***
-
-//*** No ETHERNET ***
-
-//*** No QUADSPI ***
-
-//*** No USB ***
-
-//*** No SD ***
-
-#endif /* !CUSTOM_PERIPHERAL_PINS */
diff --git a/variants/STM32WLxx/WL55UCY_WLE5U(8-B)Y/PinNamesVar.h b/variants/STM32WLxx/WL55UCY_WLE5U(8-B)Y/PinNamesVar.h
deleted file mode 100644
index 989dc18c63..0000000000
--- a/variants/STM32WLxx/WL55UCY_WLE5U(8-B)Y/PinNamesVar.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Alternate pin name */
-PA_1_ALT1 = PA_1 | ALT1,
-PA_2_ALT1 = PA_2 | ALT1,
-PA_3_ALT1 = PA_3 | ALT1,
-PA_7_ALT1 = PA_7 | ALT1,
-
-/* SYS_WKUP */
-#ifdef PWR_WAKEUP_PIN1
-  SYS_WKUP1 = PA_0,
-#endif
-#ifdef PWR_WAKEUP_PIN2
-  SYS_WKUP2 = NC,
-#endif
-#ifdef PWR_WAKEUP_PIN3
-  SYS_WKUP3 = PB_3,
-#endif
-#ifdef PWR_WAKEUP_PIN4
-  SYS_WKUP4 = NC,
-#endif
-#ifdef PWR_WAKEUP_PIN5
-  SYS_WKUP5 = NC,
-#endif
-#ifdef PWR_WAKEUP_PIN6
-  SYS_WKUP6 = NC,
-#endif
-#ifdef PWR_WAKEUP_PIN7
-  SYS_WKUP7 = NC,
-#endif
-#ifdef PWR_WAKEUP_PIN8
-  SYS_WKUP8 = NC,
-#endif
-
-/* No USB */
diff --git a/variants/STM32WLxx/WL55UCY_WLE5U(8-B)Y/boards_entry.txt b/variants/STM32WLxx/WL55UCY_WLE5U(8-B)Y/boards_entry.txt
deleted file mode 100644
index 7b70eac63a..0000000000
--- a/variants/STM32WLxx/WL55UCY_WLE5U(8-B)Y/boards_entry.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-# This file help to add generic board entry.
-# upload.maximum_size and product_line have to be verified
-# and changed if needed.
-# See: https://github.com/stm32duino/wiki/wiki/Add-a-new-variant-%28board%29
-
-# Generic WL55UCYx
-GenWL.menu.pnum.GENERIC_WL55UCYX=Generic WL55UCYx
-GenWL.menu.pnum.GENERIC_WL55UCYX.upload.maximum_size=262144
-GenWL.menu.pnum.GENERIC_WL55UCYX.upload.maximum_data_size=65536
-GenWL.menu.pnum.GENERIC_WL55UCYX.build.board=GENERIC_WL55UCYX
-GenWL.menu.pnum.GENERIC_WL55UCYX.build.product_line=STM32WL55xx
-GenWL.menu.pnum.GENERIC_WL55UCYX.build.variant=STM32WLxx/WL55UCY_WLE5U(8-B)Y
-
-# Generic WLE5U8Yx
-GenWL.menu.pnum.GENERIC_WLE5U8YX=Generic WLE5U8Yx
-GenWL.menu.pnum.GENERIC_WLE5U8YX.upload.maximum_size=65536
-GenWL.menu.pnum.GENERIC_WLE5U8YX.upload.maximum_data_size=20480
-GenWL.menu.pnum.GENERIC_WLE5U8YX.build.board=GENERIC_WLE5U8YX
-GenWL.menu.pnum.GENERIC_WLE5U8YX.build.product_line=STM32WLE5xx
-GenWL.menu.pnum.GENERIC_WLE5U8YX.build.variant=STM32WLxx/WL55UCY_WLE5U(8-B)Y
-
-# Generic WLE5UBYx
-GenWL.menu.pnum.GENERIC_WLE5UBYX=Generic WLE5UBYx
-GenWL.menu.pnum.GENERIC_WLE5UBYX.upload.maximum_size=131072
-GenWL.menu.pnum.GENERIC_WLE5UBYX.upload.maximum_data_size=49152
-GenWL.menu.pnum.GENERIC_WLE5UBYX.build.board=GENERIC_WLE5UBYX
-GenWL.menu.pnum.GENERIC_WLE5UBYX.build.product_line=STM32WLE5xx
-GenWL.menu.pnum.GENERIC_WLE5UBYX.build.variant=STM32WLxx/WL55UCY_WLE5U(8-B)Y
-
diff --git a/variants/STM32WLxx/WL55UCY_WLE5U(8-B)Y/generic_clock.c b/variants/STM32WLxx/WL55UCY_WLE5U(8-B)Y/generic_clock.c
deleted file mode 100644
index a8343accc7..0000000000
--- a/variants/STM32WLxx/WL55UCY_WLE5U(8-B)Y/generic_clock.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
- * All rights reserved.
- *
- * This software component is licensed by ST under BSD 3-Clause license,
- * the "License"; You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *                        opensource.org/licenses/BSD-3-Clause
- *
- *******************************************************************************
- */
-#if defined(ARDUINO_GENERIC_WL55UCYX) || defined(ARDUINO_GENERIC_WLE5U8YX) ||\
-    defined(ARDUINO_GENERIC_WLE5UBYX)
-#include "pins_arduino.h"
-
-/**
-  * @brief  System Clock Configuration
-  * @param  None
-  * @retval None
-  */
-WEAK void SystemClock_Config(void)
-{
-  /* SystemClock_Config can be generated by STM32CubeMX */
-#warning "SystemClock_Config() is empty. Default clock at reset is used."
-}
-
-#endif /* ARDUINO_GENERIC_* */
diff --git a/variants/STM32WLxx/WL55UCY_WLE5U(8-B)Y/variant_generic.cpp b/variants/STM32WLxx/WL55UCY_WLE5U(8-B)Y/variant_generic.cpp
deleted file mode 100644
index 736d722d34..0000000000
--- a/variants/STM32WLxx/WL55UCY_WLE5U(8-B)Y/variant_generic.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
- * All rights reserved.
- *
- * This software component is licensed by ST under BSD 3-Clause license,
- * the "License"; You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *                        opensource.org/licenses/BSD-3-Clause
- *
- *******************************************************************************
- */
-#if defined(ARDUINO_GENERIC_WL55UCYX) || defined(ARDUINO_GENERIC_WLE5U8YX) ||\
-    defined(ARDUINO_GENERIC_WLE5UBYX)
-#include "pins_arduino.h"
-
-// Digital PinName array
-const PinName digitalPin[] = {
-  PA_0,   // D0
-  PA_1,   // D1
-  PA_2,   // D2
-  PA_3,   // D3
-  PA_4,   // D4
-  PA_5,   // D5
-  PA_6,   // D6
-  PA_7,   // D7
-  PA_8,   // D8
-  PA_9,   // D9
-  PA_10,  // D10/A0
-  PA_11,  // D11/A1
-  PA_12,  // D12/A2
-  PA_13,  // D13/A3
-  PA_14,  // D14/A4
-  PA_15,  // D15/A5
-  PB_0,   // D16
-  PB_3,   // D17/A6
-  PB_4,   // D18/A7
-  PC_14,  // D19
-  PC_15,  // D20
-  PH_3    // D21
-};
-
-// Analog (Ax) pin number array
-const uint32_t analogInputPin[] = {
-  10, // A0,  PA10
-  11, // A1,  PA11
-  12, // A2,  PA12
-  13, // A3,  PA13
-  14, // A4,  PA14
-  15, // A5,  PA15
-  17, // A6,  PB3
-  18  // A7,  PB4
-};
-
-#endif /* ARDUINO_GENERIC_* */
diff --git a/variants/STM32WLxx/WL55UCY_WLE5U(8-B)Y/variant_generic.h b/variants/STM32WLxx/WL55UCY_WLE5U(8-B)Y/variant_generic.h
deleted file mode 100644
index f31f6272a0..0000000000
--- a/variants/STM32WLxx/WL55UCY_WLE5U(8-B)Y/variant_generic.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- *******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
- * All rights reserved.
- *
- * This software component is licensed by ST under BSD 3-Clause license,
- * the "License"; You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *                        opensource.org/licenses/BSD-3-Clause
- *
- *******************************************************************************
- */
-#pragma once
-
-/*----------------------------------------------------------------------------
- *        STM32 pins number
- *----------------------------------------------------------------------------*/
-#define PA0                     0
-#define PA1                     1
-#define PA2                     2
-#define PA3                     3
-#define PA4                     4
-#define PA5                     5
-#define PA6                     6
-#define PA7                     7
-#define PA8                     8
-#define PA9                     9
-#define PA10                    PIN_A0
-#define PA11                    PIN_A1
-#define PA12                    PIN_A2
-#define PA13                    PIN_A3
-#define PA14                    PIN_A4
-#define PA15                    PIN_A5
-#define PB0                     16
-#define PB3                     PIN_A6
-#define PB4                     PIN_A7
-#define PC14                    19
-#define PC15                    20
-#define PH3                     21
-
-// Alternate pins number
-#define PA1_ALT1                (PA1 | ALT1)
-#define PA2_ALT1                (PA2 | ALT1)
-#define PA3_ALT1                (PA3 | ALT1)
-#define PA7_ALT1                (PA7 | ALT1)
-
-#define NUM_DIGITAL_PINS        22
-#define NUM_ANALOG_INPUTS       8
-
-// On-board LED pin number
-#ifndef LED_BUILTIN
-  #define LED_BUILTIN           PNUM_NOT_DEFINED
-#endif
-
-// On-board user button
-#ifndef USER_BTN
-  #define USER_BTN              PNUM_NOT_DEFINED
-#endif
-
-// SPI definitions
-#ifndef PIN_SPI_SS
-  #define PIN_SPI_SS            PA4
-#endif
-#ifndef PIN_SPI_SS1
-  #define PIN_SPI_SS1           PA15
-#endif
-#ifndef PIN_SPI_SS2
-  #define PIN_SPI_SS2           PNUM_NOT_DEFINED
-#endif
-#ifndef PIN_SPI_SS3
-  #define PIN_SPI_SS3           PNUM_NOT_DEFINED
-#endif
-#ifndef PIN_SPI_MOSI
-  #define PIN_SPI_MOSI          PA7
-#endif
-#ifndef PIN_SPI_MISO
-  #define PIN_SPI_MISO          PA6
-#endif
-#ifndef PIN_SPI_SCK
-  #define PIN_SPI_SCK           PA1
-#endif
-
-// I2C definitions
-#ifndef PIN_WIRE_SDA
-  #define PIN_WIRE_SDA          PA10
-#endif
-#ifndef PIN_WIRE_SCL
-  #define PIN_WIRE_SCL          PA9
-#endif
-
-// Timer Definitions
-// Use TIM6/TIM7 when possible as servo and tone don't need GPIO output pin
-#ifndef TIMER_TONE
-  #define TIMER_TONE            TIM16
-#endif
-#ifndef TIMER_SERVO
-  #define TIMER_SERVO           TIM17
-#endif
-
-// UART Definitions
-#ifndef SERIAL_UART_INSTANCE
-  #define SERIAL_UART_INSTANCE  101
-#endif
-
-// Default pin used for generic 'Serial' instance
-// Mandatory for Firmata
-#ifndef PIN_SERIAL_RX
-  #define PIN_SERIAL_RX         PA3
-#endif
-#ifndef PIN_SERIAL_TX
-  #define PIN_SERIAL_TX         PA2
-#endif
-
-// Extra HAL modules
-#if !defined(HAL_DAC_MODULE_DISABLED)
-  #define HAL_DAC_MODULE_ENABLED
-#endif
-
-/*----------------------------------------------------------------------------
- *        Arduino objects - C++ only
- *----------------------------------------------------------------------------*/
-
-#ifdef __cplusplus
-  // These serial port names are intended to allow libraries and architecture-neutral
-  // sketches to automatically default to the correct port name for a particular type
-  // of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
-  // the first hardware serial port whose RX/TX pins are not dedicated to another use.
-  //
-  // SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
-  //
-  // SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
-  //
-  // SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
-  //
-  // SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
-  //
-  // SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
-  //                            pins are NOT connected to anything by default.
-  #ifndef SERIAL_PORT_MONITOR
-    #define SERIAL_PORT_MONITOR   Serial
-  #endif
-  #ifndef SERIAL_PORT_HARDWARE
-    #define SERIAL_PORT_HARDWARE  Serial
-  #endif
-#endif