diff --git a/src/genpinmap/genpinmap_arduino.bat b/src/genpinmap/genpinmap_arduino.bat
index 786bca43..ec7e3102 100644
--- a/src/genpinmap/genpinmap_arduino.bat
+++ b/src/genpinmap/genpinmap_arduino.bat
@@ -5,7 +5,11 @@
 
 python genpinmap_arduino.py NUCLEO_F030R8 "STM32F030R8Tx.xml"
 python genpinmap_arduino.py NUCLEO_F091RC "STM32F091R(B-C)Tx.xml"
+python genpinmap_arduino.py NUCLEO_F103RB "STM32F103R(8-B)Tx.xml"
+python genpinmap_arduino.py NUCLEO_F207ZG "STM32F207Z(C-E-F-G)Tx.xml"
 python genpinmap_arduino.py NUCLEO_F303RE "STM32F303R(D-E)Tx.xml"
+python genpinmap_arduino.py NUCLEO_F401RE "STM32F401R(D-E)Tx.xml"
+python genpinmap_arduino.py NUCLEO_F411RE "STM32F411R(C-E)Tx.xml"
 python genpinmap_arduino.py NUCLEO_F429ZI "STM32F429Z(E-G-I)Tx.xml"
 python genpinmap_arduino.py DISCO_F407G   "STM32F407V(E-G)Tx.xml"
 python genpinmap_arduino.py DISCO_F746NG  "STM32F746N(E-G)Hx.xml"
@@ -27,17 +31,12 @@ pause
 ::python genpinmap_arduino.py NUCLEO_F042K6 "STM32F042K6Tx.xml"
 ::python genpinmap_arduino.py NUCLEO_F070RB "STM32F070RBTx.xml"
 ::python genpinmap_arduino.py NUCLEO_F072RB "STM32F072R(8-B)Tx.xml"
-::python genpinmap_arduino.py NUCLEO_F091RC "STM32F091R(B-C)Tx.xml"
 ::pause
-::python genpinmap_arduino.py NUCLEO_F103RB "STM32F103R(8-B)Tx.xml"
 ::python genpinmap_arduino.py NUCLEO_F302R8 "STM32F302R(6-8)Tx.xml"
 ::python genpinmap_arduino.py NUCLEO_F303K8 "STM32F303R(6-8)Tx.xml"
-::python genpinmap_arduino.py NUCLEO_F303RE "STM32F303R(D-E)Tx.xml"
 ::python genpinmap_arduino.py NUCLEO_F334R8 "STM32F334R(6-8)Tx.xml"
 ::pause
-::python genpinmap_arduino.py NUCLEO_F401RE "STM32F401R(D-E)Tx.xml"
 ::python genpinmap_arduino.py NUCLEO_F410RB "STM32F410R(8-B)Tx.xml"
-::python genpinmap_arduino.py NUCLEO_F411RE "STM32F411R(C-E)Tx.xml"
 ::python genpinmap_arduino.py NUCLEO_F446RE "STM32F446R(C-E)Tx.xml"
 ::python genpinmap_arduino.py NUCLEO_F446ZE "STM32F446Z(C-E)Tx.xml"
 ::pause
@@ -46,9 +45,7 @@ pause
 ::pause
 ::python genpinmap_arduino.py NUCLEO_L011K4 "STM32L011K(3-4)Tx.xml"
 ::python genpinmap_arduino.py NUCLEO_L031K6 "STM32L031K(4-6)Tx.xml"
-::python genpinmap_arduino.py NUCLEO_L053R8 "STM32L053R(6-8)Tx.xml"
 ::python genpinmap_arduino.py NUCLEO_L073RZ "STM32L073R(B-Z)Tx.xml"
 ::pause
 ::python genpinmap_arduino.py NUCLEO_L152RE "STM32L152RETx.xml"
-::python genpinmap_arduino.py NUCLEO_L476RG "STM32L475R(C-E-G)Tx.xml"
 ::pause
diff --git a/src/genpinmap/genpinmap_arduino.sh b/src/genpinmap/genpinmap_arduino.sh
index 12ce4300..63871ada 100755
--- a/src/genpinmap/genpinmap_arduino.sh
+++ b/src/genpinmap/genpinmap_arduino.sh
@@ -25,7 +25,11 @@ set -o nounset                              # Treat unset variables as an error
 #
 python genpinmap_arduino.py NUCLEO_F030R8 "STM32F030R8Tx.xml"
 python genpinmap_arduino.py NUCLEO_F091RC "STM32F091R(B-C)Tx.xml"
+python genpinmap_arduino.py NUCLEO_F103RB "STM32F103R(8-B)Tx.xml"
+python genpinmap_arduino.py NUCLEO_F207ZG "STM32F207Z(C-E-F-G)Tx.xml"
 python genpinmap_arduino.py NUCLEO_F303RE "STM32F303R(D-E)Tx.xml"
+python genpinmap_arduino.py NUCLEO_F401RE "STM32F401R(D-E)Tx.xml"
+python genpinmap_arduino.py NUCLEO_F411RE "STM32F411R(C-E)Tx.xml"
 python genpinmap_arduino.py NUCLEO_F429ZI "STM32F429Z(E-G-I)Tx.xml"
 python genpinmap_arduino.py DISCO_F407G   "STM32F407V(E-G)Tx.xml"
 python genpinmap_arduino.py DISCO_F746NG  "STM32F746N(E-G)Hx.xml"