diff --git a/src/genpinmap/Arduino/STM32F030C6Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F030C6Tx/PeripheralPins.c
index f8100562..b5082083 100644
--- a/src/genpinmap/Arduino/STM32F030C6Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F030C6Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -65,6 +65,7 @@ const PinMap PinMap_I2C_SDA[] = {
   {PB_7,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_9,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_11, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
+  {PF_7,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF_NONE)},
   {NC,    NP,    0}
 };
 #endif
@@ -75,6 +76,7 @@ const PinMap PinMap_I2C_SCL[] = {
   {PB_6,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_8,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_10, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
+  {PF_6,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF_NONE)},
   {NC,    NP,    0}
 };
 #endif
diff --git a/src/genpinmap/Arduino/STM32F030C8Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F030C8Tx/PeripheralPins.c
index ac1b3be9..defeef37 100644
--- a/src/genpinmap/Arduino/STM32F030C8Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F030C8Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -64,6 +64,7 @@ const PinMap PinMap_I2C_SDA[] = {
   {PB_7,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_9,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_11, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C2)},
+  {PF_7,  I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF_NONE)},
   {NC,    NP,    0}
 };
 #endif
@@ -73,6 +74,7 @@ const PinMap PinMap_I2C_SCL[] = {
   {PB_6,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_8,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_10, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C2)},
+  {PF_6,  I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF_NONE)},
   {NC,    NP,    0}
 };
 #endif
diff --git a/src/genpinmap/Arduino/STM32F030CCTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F030CCTx/PeripheralPins.c
index 5b6caa7b..f4b71bf4 100644
--- a/src/genpinmap/Arduino/STM32F030CCTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F030CCTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F030F4Px/PeripheralPins.c b/src/genpinmap/Arduino/STM32F030F4Px/PeripheralPins.c
index bb22322d..6fa5e7e1 100644
--- a/src/genpinmap/Arduino/STM32F030F4Px/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F030F4Px/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F030K6Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F030K6Tx/PeripheralPins.c
index 1be79d6a..0ca0adb6 100644
--- a/src/genpinmap/Arduino/STM32F030K6Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F030K6Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F030R8Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F030R8Tx/PeripheralPins.c
index f1fc1270..1d65755c 100644
--- a/src/genpinmap/Arduino/STM32F030R8Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F030R8Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -70,6 +70,7 @@ const PinMap PinMap_I2C_SDA[] = {
   {PB_7,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_9,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_11, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C2)},
+  {PF_7,  I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF_NONE)},
   {NC,    NP,    0}
 };
 #endif
@@ -79,6 +80,7 @@ const PinMap PinMap_I2C_SCL[] = {
   {PB_6,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_8,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_10, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C2)},
+  {PF_6,  I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF_NONE)},
   {NC,    NP,    0}
 };
 #endif
diff --git a/src/genpinmap/Arduino/STM32F030RCTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F030RCTx/PeripheralPins.c
index 1718a2b3..14a0140e 100644
--- a/src/genpinmap/Arduino/STM32F030RCTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F030RCTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F031C(4-6)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F031C(4-6)Tx/PeripheralPins.c
index 9c898afc..aa413532 100644
--- a/src/genpinmap/Arduino/STM32F031C(4-6)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F031C(4-6)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -65,6 +65,7 @@ const PinMap PinMap_I2C_SDA[] = {
   {PB_7,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_9,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_11, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
+  {PF_7,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF_NONE)},
   {NC,    NP,    0}
 };
 #endif
@@ -75,6 +76,7 @@ const PinMap PinMap_I2C_SCL[] = {
   {PB_6,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_8,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_10, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
+  {PF_6,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF_NONE)},
   {NC,    NP,    0}
 };
 #endif
diff --git a/src/genpinmap/Arduino/STM32F031E6Yx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F031E6Yx/PeripheralPins.c
index ee427741..6814f141 100644
--- a/src/genpinmap/Arduino/STM32F031E6Yx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F031E6Yx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F031F(4-6)Px/PeripheralPins.c b/src/genpinmap/Arduino/STM32F031F(4-6)Px/PeripheralPins.c
index 132fdfb3..d669a561 100644
--- a/src/genpinmap/Arduino/STM32F031F(4-6)Px/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F031F(4-6)Px/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F031G(4-6)Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32F031G(4-6)Ux/PeripheralPins.c
index bf7b8804..1a802918 100644
--- a/src/genpinmap/Arduino/STM32F031G(4-6)Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F031G(4-6)Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F031K(4-6)Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32F031K(4-6)Ux/PeripheralPins.c
index ab924a0b..76fab137 100644
--- a/src/genpinmap/Arduino/STM32F031K(4-6)Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F031K(4-6)Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F031K6Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F031K6Tx/PeripheralPins.c
index 4ff0402d..4ef50740 100644
--- a/src/genpinmap/Arduino/STM32F031K6Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F031K6Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F038C6Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F038C6Tx/PeripheralPins.c
index ecdc2ba1..f0287d48 100644
--- a/src/genpinmap/Arduino/STM32F038C6Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F038C6Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -65,6 +65,7 @@ const PinMap PinMap_I2C_SDA[] = {
   {PB_7,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_9,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_11, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
+  {PF_7,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF_NONE)},
   {NC,    NP,    0}
 };
 #endif
@@ -75,6 +76,7 @@ const PinMap PinMap_I2C_SCL[] = {
   {PB_6,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_8,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_10, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
+  {PF_6,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF_NONE)},
   {NC,    NP,    0}
 };
 #endif
diff --git a/src/genpinmap/Arduino/STM32F038E6Yx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F038E6Yx/PeripheralPins.c
index 7a89d10a..eb472e84 100644
--- a/src/genpinmap/Arduino/STM32F038E6Yx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F038E6Yx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F038F6Px/PeripheralPins.c b/src/genpinmap/Arduino/STM32F038F6Px/PeripheralPins.c
index d5c029ea..94e8f81c 100644
--- a/src/genpinmap/Arduino/STM32F038F6Px/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F038F6Px/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F038G6Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32F038G6Ux/PeripheralPins.c
index 50eae08d..d9b22a1c 100644
--- a/src/genpinmap/Arduino/STM32F038G6Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F038G6Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F038K6Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32F038K6Ux/PeripheralPins.c
index bfab2378..27c61300 100644
--- a/src/genpinmap/Arduino/STM32F038K6Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F038K6Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F042C(4-6)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F042C(4-6)Tx/PeripheralPins.c
index dcadb2a1..ba6db557 100644
--- a/src/genpinmap/Arduino/STM32F042C(4-6)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F042C(4-6)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -66,6 +66,7 @@ const PinMap PinMap_I2C_SDA[] = {
   {PB_7,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_9,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_11, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
+  {PB_14, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF_NONE)},
   {PF_0,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {NC,    NP,    0}
 };
@@ -78,6 +79,7 @@ const PinMap PinMap_I2C_SCL[] = {
   {PB_6,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_8,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_10, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
+  {PB_13, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF_NONE)},
   {PF_1,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {NC,    NP,    0}
 };
@@ -230,8 +232,8 @@ const PinMap PinMap_CAN_TD[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
   {PA_4,  USB, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_USB)}, // USB_NOE
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {PA_15, USB, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_USB)}, // USB_NOE
   {NC,    NP,    0}
diff --git a/src/genpinmap/Arduino/STM32F042C(4-6)Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32F042C(4-6)Ux/PeripheralPins.c
index 4fc9950a..2c99eb0a 100644
--- a/src/genpinmap/Arduino/STM32F042C(4-6)Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F042C(4-6)Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -66,6 +66,7 @@ const PinMap PinMap_I2C_SDA[] = {
   {PB_7,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_9,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_11, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
+  {PB_14, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF_NONE)},
   {PF_0,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {NC,    NP,    0}
 };
@@ -78,6 +79,7 @@ const PinMap PinMap_I2C_SCL[] = {
   {PB_6,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_8,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_10, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
+  {PB_13, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF_NONE)},
   {PF_1,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {NC,    NP,    0}
 };
@@ -230,8 +232,8 @@ const PinMap PinMap_CAN_TD[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
   {PA_4,  USB, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_USB)}, // USB_NOE
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {PA_15, USB, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_USB)}, // USB_NOE
   {NC,    NP,    0}
diff --git a/src/genpinmap/Arduino/STM32F042F4Px/PeripheralPins.c b/src/genpinmap/Arduino/STM32F042F4Px/PeripheralPins.c
index 5ea12c48..be73afde 100644
--- a/src/genpinmap/Arduino/STM32F042F4Px/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F042F4Px/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -192,8 +192,8 @@ const PinMap PinMap_CAN_TD[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
   {PA_4,  USB, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_USB)}, // USB_NOE
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
 };
diff --git a/src/genpinmap/Arduino/STM32F042F6Px/PeripheralPins.c b/src/genpinmap/Arduino/STM32F042F6Px/PeripheralPins.c
index 351c9755..9ab64704 100644
--- a/src/genpinmap/Arduino/STM32F042F6Px/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F042F6Px/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -192,8 +192,8 @@ const PinMap PinMap_CAN_TD[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
   {PA_4,  USB, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_USB)}, // USB_NOE
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
 };
diff --git a/src/genpinmap/Arduino/STM32F042G(4-6)Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32F042G(4-6)Ux/PeripheralPins.c
index 19e2745c..1ad1f896 100644
--- a/src/genpinmap/Arduino/STM32F042G(4-6)Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F042G(4-6)Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -212,8 +212,8 @@ const PinMap PinMap_CAN_TD[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
   {PA_4,  USB, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_USB)}, // USB_NOE
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {PA_15, USB, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_USB)}, // USB_NOE
   {NC,    NP,    0}
diff --git a/src/genpinmap/Arduino/STM32F042K(4-6)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F042K(4-6)Tx/PeripheralPins.c
index a479ff45..806dc956 100644
--- a/src/genpinmap/Arduino/STM32F042K(4-6)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F042K(4-6)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -214,8 +214,8 @@ const PinMap PinMap_CAN_TD[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
   {PA_4,  USB, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_USB)}, // USB_NOE
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {PA_15, USB, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_USB)}, // USB_NOE
   {NC,    NP,    0}
diff --git a/src/genpinmap/Arduino/STM32F042K(4-6)Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32F042K(4-6)Ux/PeripheralPins.c
index 6e1357f9..887b4bac 100644
--- a/src/genpinmap/Arduino/STM32F042K(4-6)Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F042K(4-6)Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -214,8 +214,8 @@ const PinMap PinMap_CAN_TD[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
   {PA_4,  USB, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_USB)}, // USB_NOE
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {PA_15, USB, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_USB)}, // USB_NOE
   {NC,    NP,    0}
diff --git a/src/genpinmap/Arduino/STM32F042T6Yx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F042T6Yx/PeripheralPins.c
index 87590fd4..b5ab2388 100644
--- a/src/genpinmap/Arduino/STM32F042T6Yx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F042T6Yx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -214,8 +214,8 @@ const PinMap PinMap_CAN_TD[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
   {PA_4,  USB, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_USB)}, // USB_NOE
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {PA_15, USB, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_USB)}, // USB_NOE
   {NC,    NP,    0}
diff --git a/src/genpinmap/Arduino/STM32F048C6Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32F048C6Ux/PeripheralPins.c
index da59e163..8c31023e 100644
--- a/src/genpinmap/Arduino/STM32F048C6Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F048C6Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -66,6 +66,7 @@ const PinMap PinMap_I2C_SDA[] = {
   {PB_7,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_9,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_11, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
+  {PB_14, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF_NONE)},
   {PF_0,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {NC,    NP,    0}
 };
@@ -78,6 +79,7 @@ const PinMap PinMap_I2C_SCL[] = {
   {PB_6,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_8,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_10, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
+  {PB_13, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF_NONE)},
   {PF_1,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {NC,    NP,    0}
 };
@@ -214,8 +216,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
   {PA_4,  USB, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_USB)}, // USB_NOE
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {PA_15, USB, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_USB)}, // USB_NOE
   {NC,    NP,    0}
diff --git a/src/genpinmap/Arduino/STM32F048G6Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32F048G6Ux/PeripheralPins.c
index bb326557..714782a5 100644
--- a/src/genpinmap/Arduino/STM32F048G6Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F048G6Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -193,8 +193,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
   {PA_4,  USB, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_USB)}, // USB_NOE
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {PA_15, USB, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_USB)}, // USB_NOE
   {NC,    NP,    0}
diff --git a/src/genpinmap/Arduino/STM32F048T6Yx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F048T6Yx/PeripheralPins.c
index 2c4df082..acb3b6de 100644
--- a/src/genpinmap/Arduino/STM32F048T6Yx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F048T6Yx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -199,8 +199,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
   {PA_4,  USB, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_USB)}, // USB_NOE
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {PA_15, USB, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_USB)}, // USB_NOE
   {NC,    NP,    0}
diff --git a/src/genpinmap/Arduino/STM32F051C4Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F051C4Tx/PeripheralPins.c
index af958a66..681037dc 100644
--- a/src/genpinmap/Arduino/STM32F051C4Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F051C4Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F051C4Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32F051C4Ux/PeripheralPins.c
index 21627913..f1911880 100644
--- a/src/genpinmap/Arduino/STM32F051C4Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F051C4Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F051C6Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F051C6Tx/PeripheralPins.c
index fa060dfd..14bfa0b5 100644
--- a/src/genpinmap/Arduino/STM32F051C6Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F051C6Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F051C6Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32F051C6Ux/PeripheralPins.c
index a5fb66d3..9f4f8f46 100644
--- a/src/genpinmap/Arduino/STM32F051C6Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F051C6Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F051C8Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F051C8Tx/PeripheralPins.c
index 2eb36e6d..30efff27 100644
--- a/src/genpinmap/Arduino/STM32F051C8Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F051C8Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -71,6 +71,7 @@ const PinMap PinMap_I2C_SDA[] = {
   {PB_7,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_9,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_11, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C2)},
+  {PF_7,  I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF_NONE)},
   {NC,    NP,    0}
 };
 #endif
@@ -80,6 +81,7 @@ const PinMap PinMap_I2C_SCL[] = {
   {PB_6,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_8,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_10, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C2)},
+  {PF_6,  I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF_NONE)},
   {NC,    NP,    0}
 };
 #endif
diff --git a/src/genpinmap/Arduino/STM32F051C8Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32F051C8Ux/PeripheralPins.c
index 7c69e0e4..4bc78986 100644
--- a/src/genpinmap/Arduino/STM32F051C8Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F051C8Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -71,6 +71,7 @@ const PinMap PinMap_I2C_SDA[] = {
   {PB_7,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_9,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_11, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C2)},
+  {PF_7,  I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF_NONE)},
   {NC,    NP,    0}
 };
 #endif
@@ -80,6 +81,7 @@ const PinMap PinMap_I2C_SCL[] = {
   {PB_6,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_8,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_10, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C2)},
+  {PF_6,  I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF_NONE)},
   {NC,    NP,    0}
 };
 #endif
diff --git a/src/genpinmap/Arduino/STM32F051K4Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F051K4Tx/PeripheralPins.c
index 0cb91d90..e515430b 100644
--- a/src/genpinmap/Arduino/STM32F051K4Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F051K4Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F051K4Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32F051K4Ux/PeripheralPins.c
index 445e2940..bad13718 100644
--- a/src/genpinmap/Arduino/STM32F051K4Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F051K4Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F051K6Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F051K6Tx/PeripheralPins.c
index bb4fd30c..de5a9c4f 100644
--- a/src/genpinmap/Arduino/STM32F051K6Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F051K6Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F051K6Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32F051K6Ux/PeripheralPins.c
index 165ee5f1..cd7c6cb0 100644
--- a/src/genpinmap/Arduino/STM32F051K6Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F051K6Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F051K8Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F051K8Tx/PeripheralPins.c
index 0787c9ea..7c057d61 100644
--- a/src/genpinmap/Arduino/STM32F051K8Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F051K8Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F051K8Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32F051K8Ux/PeripheralPins.c
index ea124e44..f69de813 100644
--- a/src/genpinmap/Arduino/STM32F051K8Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F051K8Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F051R4Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F051R4Tx/PeripheralPins.c
index 5b483d8c..3edefc44 100644
--- a/src/genpinmap/Arduino/STM32F051R4Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F051R4Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F051R6Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F051R6Tx/PeripheralPins.c
index ef2a55ae..8c74c985 100644
--- a/src/genpinmap/Arduino/STM32F051R6Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F051R6Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F051R8Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F051R8Hx/PeripheralPins.c
index 2f507c6d..619f2c94 100644
--- a/src/genpinmap/Arduino/STM32F051R8Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F051R8Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -77,6 +77,7 @@ const PinMap PinMap_I2C_SDA[] = {
   {PB_7,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_9,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_11, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C2)},
+  {PF_7,  I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF_NONE)},
   {NC,    NP,    0}
 };
 #endif
@@ -86,6 +87,7 @@ const PinMap PinMap_I2C_SCL[] = {
   {PB_6,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_8,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_10, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C2)},
+  {PF_6,  I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF_NONE)},
   {NC,    NP,    0}
 };
 #endif
diff --git a/src/genpinmap/Arduino/STM32F051R8Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F051R8Tx/PeripheralPins.c
index 2ea59445..6e15613b 100644
--- a/src/genpinmap/Arduino/STM32F051R8Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F051R8Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -77,6 +77,7 @@ const PinMap PinMap_I2C_SDA[] = {
   {PB_7,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_9,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_11, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C2)},
+  {PF_7,  I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF_NONE)},
   {NC,    NP,    0}
 };
 #endif
@@ -86,6 +87,7 @@ const PinMap PinMap_I2C_SCL[] = {
   {PB_6,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_8,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_10, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C2)},
+  {PF_6,  I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF_NONE)},
   {NC,    NP,    0}
 };
 #endif
diff --git a/src/genpinmap/Arduino/STM32F051T8Yx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F051T8Yx/PeripheralPins.c
index adfe56df..dbd57020 100644
--- a/src/genpinmap/Arduino/STM32F051T8Yx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F051T8Yx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F058C8Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32F058C8Ux/PeripheralPins.c
index fb58ca9f..89d89c7f 100644
--- a/src/genpinmap/Arduino/STM32F058C8Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F058C8Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -71,6 +71,7 @@ const PinMap PinMap_I2C_SDA[] = {
   {PB_7,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_9,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_11, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C2)},
+  {PF_7,  I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF_NONE)},
   {NC,    NP,    0}
 };
 #endif
@@ -80,6 +81,7 @@ const PinMap PinMap_I2C_SCL[] = {
   {PB_6,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_8,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_10, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C2)},
+  {PF_6,  I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF_NONE)},
   {NC,    NP,    0}
 };
 #endif
diff --git a/src/genpinmap/Arduino/STM32F058R8Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F058R8Hx/PeripheralPins.c
index 29db2cae..cc1697c9 100644
--- a/src/genpinmap/Arduino/STM32F058R8Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F058R8Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -77,6 +77,7 @@ const PinMap PinMap_I2C_SDA[] = {
   {PB_7,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_9,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_11, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C2)},
+  {PF_7,  I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF_NONE)},
   {NC,    NP,    0}
 };
 #endif
@@ -86,6 +87,7 @@ const PinMap PinMap_I2C_SCL[] = {
   {PB_6,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_8,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_10, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C2)},
+  {PF_6,  I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF_NONE)},
   {NC,    NP,    0}
 };
 #endif
diff --git a/src/genpinmap/Arduino/STM32F058R8Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F058R8Tx/PeripheralPins.c
index ef8f4a82..b44a2ff1 100644
--- a/src/genpinmap/Arduino/STM32F058R8Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F058R8Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -77,6 +77,7 @@ const PinMap PinMap_I2C_SDA[] = {
   {PB_7,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_9,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_11, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C2)},
+  {PF_7,  I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF_NONE)},
   {NC,    NP,    0}
 };
 #endif
@@ -86,6 +87,7 @@ const PinMap PinMap_I2C_SCL[] = {
   {PB_6,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_8,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
   {PB_10, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C2)},
+  {PF_6,  I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF_NONE)},
   {NC,    NP,    0}
 };
 #endif
diff --git a/src/genpinmap/Arduino/STM32F058T8Yx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F058T8Yx/PeripheralPins.c
index 6f45fdf9..87d53a5e 100644
--- a/src/genpinmap/Arduino/STM32F058T8Yx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F058T8Yx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F070C6Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F070C6Tx/PeripheralPins.c
index f868cf01..801e648a 100644
--- a/src/genpinmap/Arduino/STM32F070C6Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F070C6Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -195,8 +195,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
   {PA_4,  USB, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_USB)}, // USB_NOE
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
 };
diff --git a/src/genpinmap/Arduino/STM32F070CBTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F070CBTx/PeripheralPins.c
index 27216c85..86cf9e65 100644
--- a/src/genpinmap/Arduino/STM32F070CBTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F070CBTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -216,8 +216,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
 };
diff --git a/src/genpinmap/Arduino/STM32F070F6Px/PeripheralPins.c b/src/genpinmap/Arduino/STM32F070F6Px/PeripheralPins.c
index 49b40b5e..8abdbb10 100644
--- a/src/genpinmap/Arduino/STM32F070F6Px/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F070F6Px/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -172,8 +172,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
   {PA_4,  USB, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_USB)}, // USB_NOE
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
 };
diff --git a/src/genpinmap/Arduino/STM32F070RBTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F070RBTx/PeripheralPins.c
index cbc80444..6e28a2a3 100644
--- a/src/genpinmap/Arduino/STM32F070RBTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F070RBTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -235,8 +235,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
 };
diff --git a/src/genpinmap/Arduino/STM32F071C(8-B)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F071C(8-B)Tx/PeripheralPins.c
index 5b2dc6ec..db629c9d 100644
--- a/src/genpinmap/Arduino/STM32F071C(8-B)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F071C(8-B)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F071C(8-B)Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32F071C(8-B)Ux/PeripheralPins.c
index 059894ec..5326b56d 100644
--- a/src/genpinmap/Arduino/STM32F071C(8-B)Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F071C(8-B)Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F071CBYx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F071CBYx/PeripheralPins.c
index a51c89fc..270275e5 100644
--- a/src/genpinmap/Arduino/STM32F071CBYx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F071CBYx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F071RBTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F071RBTx/PeripheralPins.c
index 5b901264..6b592077 100644
--- a/src/genpinmap/Arduino/STM32F071RBTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F071RBTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F071V(8-B)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F071V(8-B)Hx/PeripheralPins.c
index ef021333..8b1a2249 100644
--- a/src/genpinmap/Arduino/STM32F071V(8-B)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F071V(8-B)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F071V(8-B)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F071V(8-B)Tx/PeripheralPins.c
index 49305a38..43de324f 100644
--- a/src/genpinmap/Arduino/STM32F071V(8-B)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F071V(8-B)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F072C(8-B)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F072C(8-B)Tx/PeripheralPins.c
index f7784d2a..90fb2190 100644
--- a/src/genpinmap/Arduino/STM32F072C(8-B)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F072C(8-B)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -249,8 +249,8 @@ const PinMap PinMap_CAN_TD[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
 };
diff --git a/src/genpinmap/Arduino/STM32F072C(8-B)Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32F072C(8-B)Ux/PeripheralPins.c
index db6ca898..4b74e3f7 100644
--- a/src/genpinmap/Arduino/STM32F072C(8-B)Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F072C(8-B)Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -249,8 +249,8 @@ const PinMap PinMap_CAN_TD[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
 };
diff --git a/src/genpinmap/Arduino/STM32F072CBYx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F072CBYx/PeripheralPins.c
index 5bb7e247..748a0d2f 100644
--- a/src/genpinmap/Arduino/STM32F072CBYx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F072CBYx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -249,8 +249,8 @@ const PinMap PinMap_CAN_TD[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
 };
diff --git a/src/genpinmap/Arduino/STM32F072R(8-B)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F072R(8-B)Tx/PeripheralPins.c
index 8e284b20..451d0c48 100644
--- a/src/genpinmap/Arduino/STM32F072R(8-B)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F072R(8-B)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -268,8 +268,8 @@ const PinMap PinMap_CAN_TD[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
 };
diff --git a/src/genpinmap/Arduino/STM32F072RBHx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F072RBHx/PeripheralPins.c
index 0f70c935..ff3be3ea 100644
--- a/src/genpinmap/Arduino/STM32F072RBHx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F072RBHx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -268,8 +268,8 @@ const PinMap PinMap_CAN_TD[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
 };
diff --git a/src/genpinmap/Arduino/STM32F072RBIx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F072RBIx/PeripheralPins.c
index 7f1c0b09..d91745fe 100644
--- a/src/genpinmap/Arduino/STM32F072RBIx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F072RBIx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -268,8 +268,8 @@ const PinMap PinMap_CAN_TD[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
 };
diff --git a/src/genpinmap/Arduino/STM32F072V(8-B)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F072V(8-B)Hx/PeripheralPins.c
index 8d9b37e5..e2fea972 100644
--- a/src/genpinmap/Arduino/STM32F072V(8-B)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F072V(8-B)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -301,8 +301,8 @@ const PinMap PinMap_CAN_TD[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
 };
diff --git a/src/genpinmap/Arduino/STM32F072V(8-B)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F072V(8-B)Tx/PeripheralPins.c
index 2a74eafb..92e0a4d1 100644
--- a/src/genpinmap/Arduino/STM32F072V(8-B)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F072V(8-B)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -301,8 +301,8 @@ const PinMap PinMap_CAN_TD[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
 };
diff --git a/src/genpinmap/Arduino/STM32F078CBTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F078CBTx/PeripheralPins.c
index 0cf722cc..468f0dc6 100644
--- a/src/genpinmap/Arduino/STM32F078CBTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F078CBTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -233,8 +233,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
 };
diff --git a/src/genpinmap/Arduino/STM32F078CBUx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F078CBUx/PeripheralPins.c
index 70bc275c..e663737f 100644
--- a/src/genpinmap/Arduino/STM32F078CBUx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F078CBUx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -233,8 +233,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
 };
diff --git a/src/genpinmap/Arduino/STM32F078CBYx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F078CBYx/PeripheralPins.c
index c52dc91f..66768550 100644
--- a/src/genpinmap/Arduino/STM32F078CBYx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F078CBYx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -233,8 +233,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
 };
diff --git a/src/genpinmap/Arduino/STM32F078RBHx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F078RBHx/PeripheralPins.c
index a18ccc49..6f9a0442 100644
--- a/src/genpinmap/Arduino/STM32F078RBHx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F078RBHx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -252,8 +252,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
 };
diff --git a/src/genpinmap/Arduino/STM32F078RBTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F078RBTx/PeripheralPins.c
index 6cdd20c9..79cd982e 100644
--- a/src/genpinmap/Arduino/STM32F078RBTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F078RBTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -252,8 +252,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
 };
diff --git a/src/genpinmap/Arduino/STM32F078VBHx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F078VBHx/PeripheralPins.c
index d787e5cc..d30719b8 100644
--- a/src/genpinmap/Arduino/STM32F078VBHx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F078VBHx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -283,8 +283,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
 };
diff --git a/src/genpinmap/Arduino/STM32F078VBTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F078VBTx/PeripheralPins.c
index cd40b885..6ca3bd2f 100644
--- a/src/genpinmap/Arduino/STM32F078VBTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F078VBTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -283,8 +283,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
 };
diff --git a/src/genpinmap/Arduino/STM32F091C(B-C)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F091C(B-C)Tx/PeripheralPins.c
index 7e9299d9..ad5dffc3 100644
--- a/src/genpinmap/Arduino/STM32F091C(B-C)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F091C(B-C)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F091C(B-C)Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32F091C(B-C)Ux/PeripheralPins.c
index e5c9be8c..6ae1460e 100644
--- a/src/genpinmap/Arduino/STM32F091C(B-C)Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F091C(B-C)Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F091R(B-C)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F091R(B-C)Tx/PeripheralPins.c
index 92cc6fb9..f88d29ba 100644
--- a/src/genpinmap/Arduino/STM32F091R(B-C)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F091R(B-C)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F091RCHx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F091RCHx/PeripheralPins.c
index efc8cab4..9d7219bc 100644
--- a/src/genpinmap/Arduino/STM32F091RCHx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F091RCHx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F091RCYx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F091RCYx/PeripheralPins.c
index 32932caf..609ecb03 100644
--- a/src/genpinmap/Arduino/STM32F091RCYx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F091RCYx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F091V(B-C)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F091V(B-C)Tx/PeripheralPins.c
index 80e08a9c..bffa1abc 100644
--- a/src/genpinmap/Arduino/STM32F091V(B-C)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F091V(B-C)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F091VCHx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F091VCHx/PeripheralPins.c
index 361f368b..059059a9 100644
--- a/src/genpinmap/Arduino/STM32F091VCHx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F091VCHx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F098CCTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F098CCTx/PeripheralPins.c
index 970689f4..c1eeb8c6 100644
--- a/src/genpinmap/Arduino/STM32F098CCTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F098CCTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F098CCUx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F098CCUx/PeripheralPins.c
index fe2e2fec..4f5da87f 100644
--- a/src/genpinmap/Arduino/STM32F098CCUx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F098CCUx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F098RCHx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F098RCHx/PeripheralPins.c
index 8c1c7494..7e92e56c 100644
--- a/src/genpinmap/Arduino/STM32F098RCHx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F098RCHx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F098RCTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F098RCTx/PeripheralPins.c
index f875cea5..6a3a1b08 100644
--- a/src/genpinmap/Arduino/STM32F098RCTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F098RCTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F098RCYx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F098RCYx/PeripheralPins.c
index 0ee90341..61db5664 100644
--- a/src/genpinmap/Arduino/STM32F098RCYx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F098RCYx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F098VCHx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F098VCHx/PeripheralPins.c
index 55d6fbae..b5c0163a 100644
--- a/src/genpinmap/Arduino/STM32F098VCHx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F098VCHx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F098VCTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F098VCTx/PeripheralPins.c
index d21359e0..ec5a0b65 100644
--- a/src/genpinmap/Arduino/STM32F098VCTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F098VCTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F100C(4-6)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F100C(4-6)Tx/PeripheralPins.c
index aa411c5d..2ae4817a 100644
--- a/src/genpinmap/Arduino/STM32F100C(4-6)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F100C(4-6)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F100C(8-B)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F100C(8-B)Tx/PeripheralPins.c
index 16dc3932..19dcc937 100644
--- a/src/genpinmap/Arduino/STM32F100C(8-B)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F100C(8-B)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F100R(4-6)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F100R(4-6)Hx/PeripheralPins.c
index 8ca0a6c1..3fbbc46a 100644
--- a/src/genpinmap/Arduino/STM32F100R(4-6)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F100R(4-6)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F100R(4-6)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F100R(4-6)Tx/PeripheralPins.c
index 0eb8f0b8..20c2fc4c 100644
--- a/src/genpinmap/Arduino/STM32F100R(4-6)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F100R(4-6)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F100R(8-B)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F100R(8-B)Hx/PeripheralPins.c
index 08af5fa8..bfd2a1bc 100644
--- a/src/genpinmap/Arduino/STM32F100R(8-B)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F100R(8-B)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F100R(8-B)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F100R(8-B)Tx/PeripheralPins.c
index 843eb4e8..c7f89d07 100644
--- a/src/genpinmap/Arduino/STM32F100R(8-B)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F100R(8-B)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F100R(C-D-E)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F100R(C-D-E)Tx/PeripheralPins.c
index bd40e6e2..20570e56 100644
--- a/src/genpinmap/Arduino/STM32F100R(C-D-E)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F100R(C-D-E)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F100V(8-B)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F100V(8-B)Tx/PeripheralPins.c
index 3030e774..a0be020b 100644
--- a/src/genpinmap/Arduino/STM32F100V(8-B)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F100V(8-B)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F100V(C-D-E)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F100V(C-D-E)Tx/PeripheralPins.c
index 1347a5af..60ee6c4d 100644
--- a/src/genpinmap/Arduino/STM32F100V(C-D-E)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F100V(C-D-E)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F100Z(C-D-E)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F100Z(C-D-E)Tx/PeripheralPins.c
index 662c2490..30e0f884 100644
--- a/src/genpinmap/Arduino/STM32F100Z(C-D-E)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F100Z(C-D-E)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F101C(4-6)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F101C(4-6)Tx/PeripheralPins.c
index 00abd1b5..da2ab93d 100644
--- a/src/genpinmap/Arduino/STM32F101C(4-6)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F101C(4-6)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F101C(8-B)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F101C(8-B)Tx/PeripheralPins.c
index 7784a500..e46ecfe1 100644
--- a/src/genpinmap/Arduino/STM32F101C(8-B)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F101C(8-B)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F101C(8-B)Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32F101C(8-B)Ux/PeripheralPins.c
index 9f074a92..045bd166 100644
--- a/src/genpinmap/Arduino/STM32F101C(8-B)Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F101C(8-B)Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F101R(4-6)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F101R(4-6)Tx/PeripheralPins.c
index 32e2e52e..79289915 100644
--- a/src/genpinmap/Arduino/STM32F101R(4-6)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F101R(4-6)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F101R(8-B)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F101R(8-B)Tx/PeripheralPins.c
index 30e06b10..2d2091a0 100644
--- a/src/genpinmap/Arduino/STM32F101R(8-B)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F101R(8-B)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F101R(C-D-E)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F101R(C-D-E)Tx/PeripheralPins.c
index 0107f37b..07854071 100644
--- a/src/genpinmap/Arduino/STM32F101R(C-D-E)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F101R(C-D-E)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F101R(F-G)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F101R(F-G)Tx/PeripheralPins.c
index d5168572..49a9d893 100644
--- a/src/genpinmap/Arduino/STM32F101R(F-G)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F101R(F-G)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F101RBHx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F101RBHx/PeripheralPins.c
index ada42ea5..faf1b69b 100644
--- a/src/genpinmap/Arduino/STM32F101RBHx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F101RBHx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F101T(4-6)Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32F101T(4-6)Ux/PeripheralPins.c
index 4f6b3a47..94ba97aa 100644
--- a/src/genpinmap/Arduino/STM32F101T(4-6)Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F101T(4-6)Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F101T(8-B)Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32F101T(8-B)Ux/PeripheralPins.c
index fbef0b71..b1babea4 100644
--- a/src/genpinmap/Arduino/STM32F101T(8-B)Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F101T(8-B)Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F101V(8-B)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F101V(8-B)Tx/PeripheralPins.c
index 602bc46a..d0a9312b 100644
--- a/src/genpinmap/Arduino/STM32F101V(8-B)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F101V(8-B)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F101V(C-D-E)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F101V(C-D-E)Tx/PeripheralPins.c
index da938c41..9690dd5d 100644
--- a/src/genpinmap/Arduino/STM32F101V(C-D-E)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F101V(C-D-E)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F101V(F-G)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F101V(F-G)Tx/PeripheralPins.c
index 9b55eaff..40792c78 100644
--- a/src/genpinmap/Arduino/STM32F101V(F-G)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F101V(F-G)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F101Z(C-D-E)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F101Z(C-D-E)Tx/PeripheralPins.c
index 13b652a2..867c2af5 100644
--- a/src/genpinmap/Arduino/STM32F101Z(C-D-E)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F101Z(C-D-E)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F101Z(F-G)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F101Z(F-G)Tx/PeripheralPins.c
index 258c346f..92f7d617 100644
--- a/src/genpinmap/Arduino/STM32F101Z(F-G)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F101Z(F-G)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F102C(4-6)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F102C(4-6)Tx/PeripheralPins.c
index 892e5886..f8b1a32b 100644
--- a/src/genpinmap/Arduino/STM32F102C(4-6)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F102C(4-6)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F102C(8-B)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F102C(8-B)Tx/PeripheralPins.c
index c509fc23..1d72fef1 100644
--- a/src/genpinmap/Arduino/STM32F102C(8-B)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F102C(8-B)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F102R(4-6)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F102R(4-6)Tx/PeripheralPins.c
index f7a50d8a..210b1404 100644
--- a/src/genpinmap/Arduino/STM32F102R(4-6)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F102R(4-6)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F102R(8-B)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F102R(8-B)Tx/PeripheralPins.c
index 013c0e47..36eba6c2 100644
--- a/src/genpinmap/Arduino/STM32F102R(8-B)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F102R(8-B)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F103C(4-6)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F103C(4-6)Tx/PeripheralPins.c
index f5411478..2a21bd10 100644
--- a/src/genpinmap/Arduino/STM32F103C(4-6)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F103C(4-6)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F103C(8-B)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F103C(8-B)Tx/PeripheralPins.c
index 752861ff..3fe568fb 100644
--- a/src/genpinmap/Arduino/STM32F103C(8-B)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F103C(8-B)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F103C6Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32F103C6Ux/PeripheralPins.c
index cc6de607..72e49617 100644
--- a/src/genpinmap/Arduino/STM32F103C6Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F103C6Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F103CBUx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F103CBUx/PeripheralPins.c
index 2c0cb04a..3c7002f6 100644
--- a/src/genpinmap/Arduino/STM32F103CBUx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F103CBUx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F103R(4-6)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F103R(4-6)Hx/PeripheralPins.c
index c73c7482..6fc19fca 100644
--- a/src/genpinmap/Arduino/STM32F103R(4-6)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F103R(4-6)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F103R(4-6)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F103R(4-6)Tx/PeripheralPins.c
index 89b79675..a298cc4b 100644
--- a/src/genpinmap/Arduino/STM32F103R(4-6)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F103R(4-6)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F103R(8-B)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F103R(8-B)Hx/PeripheralPins.c
index 77988463..a7bd0bf6 100644
--- a/src/genpinmap/Arduino/STM32F103R(8-B)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F103R(8-B)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F103R(8-B)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F103R(8-B)Tx/PeripheralPins.c
index a04f81bd..078f8add 100644
--- a/src/genpinmap/Arduino/STM32F103R(8-B)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F103R(8-B)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F103R(C-D-E)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F103R(C-D-E)Tx/PeripheralPins.c
index 6407cbca..ec1c8768 100644
--- a/src/genpinmap/Arduino/STM32F103R(C-D-E)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F103R(C-D-E)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F103R(C-D-E)Yx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F103R(C-D-E)Yx/PeripheralPins.c
index c144a299..e049f974 100644
--- a/src/genpinmap/Arduino/STM32F103R(C-D-E)Yx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F103R(C-D-E)Yx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F103R(F-G)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F103R(F-G)Tx/PeripheralPins.c
index 9eb558f1..7d67aee5 100644
--- a/src/genpinmap/Arduino/STM32F103R(F-G)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F103R(F-G)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F103T(4-6)Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32F103T(4-6)Ux/PeripheralPins.c
index 743db28b..734747cc 100644
--- a/src/genpinmap/Arduino/STM32F103T(4-6)Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F103T(4-6)Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F103T(8-B)Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32F103T(8-B)Ux/PeripheralPins.c
index f95f48e2..97a36995 100644
--- a/src/genpinmap/Arduino/STM32F103T(8-B)Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F103T(8-B)Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F103V(8-B)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F103V(8-B)Hx/PeripheralPins.c
index 6dafae01..dbd6485a 100644
--- a/src/genpinmap/Arduino/STM32F103V(8-B)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F103V(8-B)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F103V(8-B)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F103V(8-B)Tx/PeripheralPins.c
index 1db21c81..bc272fae 100644
--- a/src/genpinmap/Arduino/STM32F103V(8-B)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F103V(8-B)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F103V(C-D-E)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F103V(C-D-E)Hx/PeripheralPins.c
index cc84d512..dd7552b5 100644
--- a/src/genpinmap/Arduino/STM32F103V(C-D-E)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F103V(C-D-E)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F103V(C-D-E)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F103V(C-D-E)Tx/PeripheralPins.c
index c71bddfd..744742cb 100644
--- a/src/genpinmap/Arduino/STM32F103V(C-D-E)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F103V(C-D-E)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F103V(F-G)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F103V(F-G)Tx/PeripheralPins.c
index 42e1c1db..5d7a7a62 100644
--- a/src/genpinmap/Arduino/STM32F103V(F-G)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F103V(F-G)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F103VBIx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F103VBIx/PeripheralPins.c
index a59f8a44..38faf928 100644
--- a/src/genpinmap/Arduino/STM32F103VBIx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F103VBIx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F103Z(C-D-E)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F103Z(C-D-E)Hx/PeripheralPins.c
index a4e66199..7cf9c6e4 100644
--- a/src/genpinmap/Arduino/STM32F103Z(C-D-E)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F103Z(C-D-E)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F103Z(C-D-E)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F103Z(C-D-E)Tx/PeripheralPins.c
index b12fadb5..cc3239cc 100644
--- a/src/genpinmap/Arduino/STM32F103Z(C-D-E)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F103Z(C-D-E)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F103Z(F-G)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F103Z(F-G)Hx/PeripheralPins.c
index a0996f6f..93948c91 100644
--- a/src/genpinmap/Arduino/STM32F103Z(F-G)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F103Z(F-G)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F103Z(F-G)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F103Z(F-G)Tx/PeripheralPins.c
index da8284cc..814e1709 100644
--- a/src/genpinmap/Arduino/STM32F103Z(F-G)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F103Z(F-G)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F105R(8-B-C)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F105R(8-B-C)Tx/PeripheralPins.c
index 451cd488..f33399a5 100644
--- a/src/genpinmap/Arduino/STM32F105R(8-B-C)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F105R(8-B-C)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F105V(8-B)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F105V(8-B)Hx/PeripheralPins.c
index 1b4ee0d6..4ebed917 100644
--- a/src/genpinmap/Arduino/STM32F105V(8-B)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F105V(8-B)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F105V(8-B-C)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F105V(8-B-C)Tx/PeripheralPins.c
index c0a8be42..8645482b 100644
--- a/src/genpinmap/Arduino/STM32F105V(8-B-C)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F105V(8-B-C)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F107R(B-C)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F107R(B-C)Tx/PeripheralPins.c
index b3079984..0447ee22 100644
--- a/src/genpinmap/Arduino/STM32F107R(B-C)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F107R(B-C)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F107V(B-C)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F107V(B-C)Tx/PeripheralPins.c
index 230f13c8..92f7e748 100644
--- a/src/genpinmap/Arduino/STM32F107V(B-C)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F107V(B-C)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F107VCHx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F107VCHx/PeripheralPins.c
index 10a57e3f..687ff446 100644
--- a/src/genpinmap/Arduino/STM32F107VCHx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F107VCHx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F205R(B-C-E-F-G)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F205R(B-C-E-F-G)Tx/PeripheralPins.c
index 6bb554db..d9a7bd20 100644
--- a/src/genpinmap/Arduino/STM32F205R(B-C-E-F-G)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F205R(B-C-E-F-G)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -311,7 +311,7 @@ const PinMap PinMap_CAN_TD[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32F205R(E-G)Yx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F205R(E-G)Yx/PeripheralPins.c
index e7f1d444..f7bc6642 100644
--- a/src/genpinmap/Arduino/STM32F205R(E-G)Yx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F205R(E-G)Yx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -311,7 +311,7 @@ const PinMap PinMap_CAN_TD[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32F205RGEx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F205RGEx/PeripheralPins.c
index ba776c0b..64d4a7d3 100644
--- a/src/genpinmap/Arduino/STM32F205RGEx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F205RGEx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -311,7 +311,7 @@ const PinMap PinMap_CAN_TD[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32F205V(B-C-E-F-G)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F205V(B-C-E-F-G)Tx/PeripheralPins.c
index f92348eb..0c1d1291 100644
--- a/src/genpinmap/Arduino/STM32F205V(B-C-E-F-G)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F205V(B-C-E-F-G)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -334,7 +334,7 @@ const PinMap PinMap_CAN_TD[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32F205Z(C-E-F-G)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F205Z(C-E-F-G)Tx/PeripheralPins.c
index 856eb554..5c1d57c0 100644
--- a/src/genpinmap/Arduino/STM32F205Z(C-E-F-G)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F205Z(C-E-F-G)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -354,7 +354,7 @@ const PinMap PinMap_CAN_TD[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32F207I(C-E-F-G)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F207I(C-E-F-G)Hx/PeripheralPins.c
index 29528198..9912e20c 100644
--- a/src/genpinmap/Arduino/STM32F207I(C-E-F-G)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F207I(C-E-F-G)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -411,7 +411,7 @@ const PinMap PinMap_Ethernet[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32F207I(C-E-F-G)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F207I(C-E-F-G)Tx/PeripheralPins.c
index fd9d0cc6..1ccdcd3f 100644
--- a/src/genpinmap/Arduino/STM32F207I(C-E-F-G)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F207I(C-E-F-G)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -411,7 +411,7 @@ const PinMap PinMap_Ethernet[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32F207V(C-E-F-G)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F207V(C-E-F-G)Tx/PeripheralPins.c
index 0d6a23cb..2fbcd45e 100644
--- a/src/genpinmap/Arduino/STM32F207V(C-E-F-G)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F207V(C-E-F-G)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -359,7 +359,7 @@ const PinMap PinMap_Ethernet[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32F207Z(C-E-F-G)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F207Z(C-E-F-G)Tx/PeripheralPins.c
index 72bb39e3..d9667a60 100644
--- a/src/genpinmap/Arduino/STM32F207Z(C-E-F-G)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F207Z(C-E-F-G)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -383,7 +383,7 @@ const PinMap PinMap_Ethernet[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32F215R(E-G)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F215R(E-G)Tx/PeripheralPins.c
index a4efe6e0..69a0a6da 100644
--- a/src/genpinmap/Arduino/STM32F215R(E-G)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F215R(E-G)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -311,7 +311,7 @@ const PinMap PinMap_CAN_TD[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32F215V(E-G)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F215V(E-G)Tx/PeripheralPins.c
index bb43383a..bfcddbe9 100644
--- a/src/genpinmap/Arduino/STM32F215V(E-G)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F215V(E-G)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -334,7 +334,7 @@ const PinMap PinMap_CAN_TD[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32F215Z(E-G)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F215Z(E-G)Tx/PeripheralPins.c
index 8318ec65..66becb61 100644
--- a/src/genpinmap/Arduino/STM32F215Z(E-G)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F215Z(E-G)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -354,7 +354,7 @@ const PinMap PinMap_CAN_TD[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32F217I(E-G)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F217I(E-G)Hx/PeripheralPins.c
index 751c74fe..3d2d5f90 100644
--- a/src/genpinmap/Arduino/STM32F217I(E-G)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F217I(E-G)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -411,7 +411,7 @@ const PinMap PinMap_Ethernet[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32F217I(E-G)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F217I(E-G)Tx/PeripheralPins.c
index 6dc5f7c8..5c12162b 100644
--- a/src/genpinmap/Arduino/STM32F217I(E-G)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F217I(E-G)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -411,7 +411,7 @@ const PinMap PinMap_Ethernet[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32F217V(E-G)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F217V(E-G)Tx/PeripheralPins.c
index 81d1979f..50431b60 100644
--- a/src/genpinmap/Arduino/STM32F217V(E-G)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F217V(E-G)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -359,7 +359,7 @@ const PinMap PinMap_Ethernet[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32F217Z(E-G)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F217Z(E-G)Tx/PeripheralPins.c
index 47be1bc4..d0434e22 100644
--- a/src/genpinmap/Arduino/STM32F217Z(E-G)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F217Z(E-G)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -383,7 +383,7 @@ const PinMap PinMap_Ethernet[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32F301C(6-8)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F301C(6-8)Tx/PeripheralPins.c
index 73eef34b..4f291c00 100644
--- a/src/genpinmap/Arduino/STM32F301C(6-8)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F301C(6-8)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F301C8Yx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F301C8Yx/PeripheralPins.c
index 916d8688..87997ebd 100644
--- a/src/genpinmap/Arduino/STM32F301C8Yx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F301C8Yx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F301K(6-8)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F301K(6-8)Tx/PeripheralPins.c
index c656da9c..40dfc9d6 100644
--- a/src/genpinmap/Arduino/STM32F301K(6-8)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F301K(6-8)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F301K(6-8)Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32F301K(6-8)Ux/PeripheralPins.c
index 69273ae9..93313672 100644
--- a/src/genpinmap/Arduino/STM32F301K(6-8)Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F301K(6-8)Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F301R(6-8)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F301R(6-8)Tx/PeripheralPins.c
index 042e8896..96dbc289 100644
--- a/src/genpinmap/Arduino/STM32F301R(6-8)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F301R(6-8)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F302C(6-8)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F302C(6-8)Tx/PeripheralPins.c
index e8ca5e88..47010e75 100644
--- a/src/genpinmap/Arduino/STM32F302C(6-8)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F302C(6-8)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -252,8 +252,8 @@ const PinMap PinMap_CAN_TD[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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
diff --git a/src/genpinmap/Arduino/STM32F302C(B-C)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F302C(B-C)Tx/PeripheralPins.c
index bb94bcca..200a8eb6 100644
--- a/src/genpinmap/Arduino/STM32F302C(B-C)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F302C(B-C)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F302C8Yx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F302C8Yx/PeripheralPins.c
index 4d1b54ac..92bdf049 100644
--- a/src/genpinmap/Arduino/STM32F302C8Yx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F302C8Yx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -252,8 +252,8 @@ const PinMap PinMap_CAN_TD[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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
diff --git a/src/genpinmap/Arduino/STM32F302K(6-8)Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32F302K(6-8)Ux/PeripheralPins.c
index efd7b719..7d169b91 100644
--- a/src/genpinmap/Arduino/STM32F302K(6-8)Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F302K(6-8)Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -222,8 +222,8 @@ const PinMap PinMap_CAN_TD[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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
diff --git a/src/genpinmap/Arduino/STM32F302R(6-8)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F302R(6-8)Tx/PeripheralPins.c
index e3ae10e2..bda8c0c8 100644
--- a/src/genpinmap/Arduino/STM32F302R(6-8)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F302R(6-8)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -268,8 +268,8 @@ const PinMap PinMap_CAN_TD[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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
diff --git a/src/genpinmap/Arduino/STM32F302R(B-C)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F302R(B-C)Tx/PeripheralPins.c
index dc37d056..ecae2400 100644
--- a/src/genpinmap/Arduino/STM32F302R(B-C)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F302R(B-C)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F302R(D-E)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F302R(D-E)Tx/PeripheralPins.c
index 0754539b..28241927 100644
--- a/src/genpinmap/Arduino/STM32F302R(D-E)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F302R(D-E)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -305,8 +305,8 @@ const PinMap PinMap_CAN_TD[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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
diff --git a/src/genpinmap/Arduino/STM32F302V(B-C)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F302V(B-C)Tx/PeripheralPins.c
index 9a2ce37c..813c86cd 100644
--- a/src/genpinmap/Arduino/STM32F302V(B-C)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F302V(B-C)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F302V(D-E)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F302V(D-E)Hx/PeripheralPins.c
index 95dc1f8d..da5bcf30 100644
--- a/src/genpinmap/Arduino/STM32F302V(D-E)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F302V(D-E)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -358,8 +358,8 @@ const PinMap PinMap_CAN_TD[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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
diff --git a/src/genpinmap/Arduino/STM32F302V(D-E)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F302V(D-E)Tx/PeripheralPins.c
index dfeede7e..2935c4dc 100644
--- a/src/genpinmap/Arduino/STM32F302V(D-E)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F302V(D-E)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -358,8 +358,8 @@ const PinMap PinMap_CAN_TD[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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
diff --git a/src/genpinmap/Arduino/STM32F302VCYx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F302VCYx/PeripheralPins.c
index 88cd2dfa..4fe516bd 100644
--- a/src/genpinmap/Arduino/STM32F302VCYx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F302VCYx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F302Z(D-E)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F302Z(D-E)Tx/PeripheralPins.c
index fbe7db50..d2691360 100644
--- a/src/genpinmap/Arduino/STM32F302Z(D-E)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F302Z(D-E)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -359,8 +359,8 @@ const PinMap PinMap_CAN_TD[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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
diff --git a/src/genpinmap/Arduino/STM32F303C(6-8)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F303C(6-8)Tx/PeripheralPins.c
index f181af24..8a920ead 100644
--- a/src/genpinmap/Arduino/STM32F303C(6-8)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F303C(6-8)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F303C(B-C)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F303C(B-C)Tx/PeripheralPins.c
index 88e73885..508df9a9 100644
--- a/src/genpinmap/Arduino/STM32F303C(B-C)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F303C(B-C)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F303C8Yx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F303C8Yx/PeripheralPins.c
index 491d2e10..5737b02f 100644
--- a/src/genpinmap/Arduino/STM32F303C8Yx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F303C8Yx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F303K(6-8)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F303K(6-8)Tx/PeripheralPins.c
index 9d22a7e2..7475bddf 100644
--- a/src/genpinmap/Arduino/STM32F303K(6-8)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F303K(6-8)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F303K(6-8)Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32F303K(6-8)Ux/PeripheralPins.c
index e581a798..a87ab993 100644
--- a/src/genpinmap/Arduino/STM32F303K(6-8)Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F303K(6-8)Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F303R(6-8)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F303R(6-8)Tx/PeripheralPins.c
index 6f3d11f0..724273e0 100644
--- a/src/genpinmap/Arduino/STM32F303R(6-8)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F303R(6-8)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F303R(B-C)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F303R(B-C)Tx/PeripheralPins.c
index 82f3508e..e0f39204 100644
--- a/src/genpinmap/Arduino/STM32F303R(B-C)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F303R(B-C)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F303R(D-E)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F303R(D-E)Tx/PeripheralPins.c
index 5c485e58..46d76fad 100644
--- a/src/genpinmap/Arduino/STM32F303R(D-E)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F303R(D-E)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -330,8 +330,8 @@ const PinMap PinMap_CAN_TD[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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
diff --git a/src/genpinmap/Arduino/STM32F303V(B-C)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F303V(B-C)Tx/PeripheralPins.c
index 05f673b4..dff0e8c3 100644
--- a/src/genpinmap/Arduino/STM32F303V(B-C)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F303V(B-C)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F303V(D-E)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F303V(D-E)Hx/PeripheralPins.c
index cdacee8e..9a7e39dd 100644
--- a/src/genpinmap/Arduino/STM32F303V(D-E)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F303V(D-E)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -413,8 +413,8 @@ const PinMap PinMap_CAN_TD[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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
diff --git a/src/genpinmap/Arduino/STM32F303V(D-E)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F303V(D-E)Tx/PeripheralPins.c
index d2fa3f97..85dffbd8 100644
--- a/src/genpinmap/Arduino/STM32F303V(D-E)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F303V(D-E)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -413,8 +413,8 @@ const PinMap PinMap_CAN_TD[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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
diff --git a/src/genpinmap/Arduino/STM32F303VCYx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F303VCYx/PeripheralPins.c
index 2c8fd04b..45497ad5 100644
--- a/src/genpinmap/Arduino/STM32F303VCYx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F303VCYx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F303VEYx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F303VEYx/PeripheralPins.c
index 22227011..222194be 100644
--- a/src/genpinmap/Arduino/STM32F303VEYx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F303VEYx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -396,8 +396,8 @@ const PinMap PinMap_CAN_TD[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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
diff --git a/src/genpinmap/Arduino/STM32F303Z(D-E)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F303Z(D-E)Tx/PeripheralPins.c
index 8b0dae55..3d4c0251 100644
--- a/src/genpinmap/Arduino/STM32F303Z(D-E)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F303Z(D-E)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -426,8 +426,8 @@ const PinMap PinMap_CAN_TD[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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
diff --git a/src/genpinmap/Arduino/STM32F318C8Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F318C8Tx/PeripheralPins.c
index 6777ca3b..6a3ffeaf 100644
--- a/src/genpinmap/Arduino/STM32F318C8Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F318C8Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F318C8Yx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F318C8Yx/PeripheralPins.c
index 6acbcc8d..5457ccdd 100644
--- a/src/genpinmap/Arduino/STM32F318C8Yx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F318C8Yx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F318K8Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32F318K8Ux/PeripheralPins.c
index dbcc4817..0c033cfa 100644
--- a/src/genpinmap/Arduino/STM32F318K8Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F318K8Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F328C8Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F328C8Tx/PeripheralPins.c
index e5ba8906..bf29e4df 100644
--- a/src/genpinmap/Arduino/STM32F328C8Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F328C8Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F334C(4-6-8)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F334C(4-6-8)Tx/PeripheralPins.c
index a0ae61f9..bb7aeae5 100644
--- a/src/genpinmap/Arduino/STM32F334C(4-6-8)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F334C(4-6-8)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F334C8Yx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F334C8Yx/PeripheralPins.c
index 47a0eeab..63e1e204 100644
--- a/src/genpinmap/Arduino/STM32F334C8Yx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F334C8Yx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F334K(4-6-8)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F334K(4-6-8)Tx/PeripheralPins.c
index f2e0422f..3aec5310 100644
--- a/src/genpinmap/Arduino/STM32F334K(4-6-8)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F334K(4-6-8)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F334K(4-6-8)Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32F334K(4-6-8)Ux/PeripheralPins.c
index 94b0b4a9..3a4c02c5 100644
--- a/src/genpinmap/Arduino/STM32F334K(4-6-8)Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F334K(4-6-8)Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F334R(6-8)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F334R(6-8)Tx/PeripheralPins.c
index 1bee64e0..64a28781 100644
--- a/src/genpinmap/Arduino/STM32F334R(6-8)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F334R(6-8)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F358CCTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F358CCTx/PeripheralPins.c
index e14b4acd..65df8c66 100644
--- a/src/genpinmap/Arduino/STM32F358CCTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F358CCTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F358RCTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F358RCTx/PeripheralPins.c
index a0e702f9..28e66e78 100644
--- a/src/genpinmap/Arduino/STM32F358RCTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F358RCTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F358VCTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F358VCTx/PeripheralPins.c
index a1296acc..7221438b 100644
--- a/src/genpinmap/Arduino/STM32F358VCTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F358VCTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F373C(8-B-C)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F373C(8-B-C)Tx/PeripheralPins.c
index e7f47d9b..95b6479f 100644
--- a/src/genpinmap/Arduino/STM32F373C(8-B-C)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F373C(8-B-C)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F373R(8-B-C)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F373R(8-B-C)Tx/PeripheralPins.c
index ee9c810d..f3684964 100644
--- a/src/genpinmap/Arduino/STM32F373R(8-B-C)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F373R(8-B-C)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F373V(8-B-C)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F373V(8-B-C)Hx/PeripheralPins.c
index 471fd7f2..313fb106 100644
--- a/src/genpinmap/Arduino/STM32F373V(8-B-C)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F373V(8-B-C)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F373V(8-B-C)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F373V(8-B-C)Tx/PeripheralPins.c
index b37c9cb0..5514624c 100644
--- a/src/genpinmap/Arduino/STM32F373V(8-B-C)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F373V(8-B-C)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F378CCTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F378CCTx/PeripheralPins.c
index 1adebdca..4d21a3e2 100644
--- a/src/genpinmap/Arduino/STM32F378CCTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F378CCTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F378RCTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F378RCTx/PeripheralPins.c
index 95a1d890..cc74aaa9 100644
--- a/src/genpinmap/Arduino/STM32F378RCTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F378RCTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F378RCYx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F378RCYx/PeripheralPins.c
index d07bcacc..0dac8b3e 100644
--- a/src/genpinmap/Arduino/STM32F378RCYx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F378RCYx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F378VCHx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F378VCHx/PeripheralPins.c
index 469a4b0d..6041ecc9 100644
--- a/src/genpinmap/Arduino/STM32F378VCHx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F378VCHx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F378VCTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F378VCTx/PeripheralPins.c
index b6881ef8..8116ce2c 100644
--- a/src/genpinmap/Arduino/STM32F378VCTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F378VCTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F398VETx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F398VETx/PeripheralPins.c
index 1e9467b2..a4d39392 100644
--- a/src/genpinmap/Arduino/STM32F398VETx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F398VETx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F401C(B-C)Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32F401C(B-C)Ux/PeripheralPins.c
index 28b11f4d..0a05dd76 100644
--- a/src/genpinmap/Arduino/STM32F401C(B-C)Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F401C(B-C)Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -217,7 +217,7 @@ const PinMap PinMap_SPI_SSEL[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32F401C(B-C)Yx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F401C(B-C)Yx/PeripheralPins.c
index 383f0990..18949437 100644
--- a/src/genpinmap/Arduino/STM32F401C(B-C)Yx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F401C(B-C)Yx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -217,7 +217,7 @@ const PinMap PinMap_SPI_SSEL[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32F401C(D-E)Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32F401C(D-E)Ux/PeripheralPins.c
index c0d9bdde..29f26a58 100644
--- a/src/genpinmap/Arduino/STM32F401C(D-E)Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F401C(D-E)Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -217,7 +217,7 @@ const PinMap PinMap_SPI_SSEL[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32F401C(D-E)Yx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F401C(D-E)Yx/PeripheralPins.c
index 67675a05..9892217f 100644
--- a/src/genpinmap/Arduino/STM32F401C(D-E)Yx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F401C(D-E)Yx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -217,7 +217,7 @@ const PinMap PinMap_SPI_SSEL[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32F401CCFx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F401CCFx/PeripheralPins.c
index 1c770c2c..1dc00d3e 100644
--- a/src/genpinmap/Arduino/STM32F401CCFx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F401CCFx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -217,7 +217,7 @@ const PinMap PinMap_SPI_SSEL[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32F401R(B-C)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F401R(B-C)Tx/PeripheralPins.c
index 0c9d04a0..32252c8a 100644
--- a/src/genpinmap/Arduino/STM32F401R(B-C)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F401R(B-C)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -235,7 +235,7 @@ const PinMap PinMap_SPI_SSEL[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32F401R(D-E)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F401R(D-E)Tx/PeripheralPins.c
index 8b8f2bbd..f294fb4a 100644
--- a/src/genpinmap/Arduino/STM32F401R(D-E)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F401R(D-E)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -235,7 +235,7 @@ const PinMap PinMap_SPI_SSEL[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32F401V(B-C)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F401V(B-C)Hx/PeripheralPins.c
index 69641cfb..f89a252e 100644
--- a/src/genpinmap/Arduino/STM32F401V(B-C)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F401V(B-C)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -264,7 +264,7 @@ const PinMap PinMap_SPI_SSEL[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32F401V(B-C)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F401V(B-C)Tx/PeripheralPins.c
index dfccadbe..76d56199 100644
--- a/src/genpinmap/Arduino/STM32F401V(B-C)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F401V(B-C)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -262,7 +262,7 @@ const PinMap PinMap_SPI_SSEL[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32F401V(D-E)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F401V(D-E)Hx/PeripheralPins.c
index 69a16e77..251559de 100644
--- a/src/genpinmap/Arduino/STM32F401V(D-E)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F401V(D-E)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -264,7 +264,7 @@ const PinMap PinMap_SPI_SSEL[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32F401V(D-E)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F401V(D-E)Tx/PeripheralPins.c
index e337e0fa..a85ac560 100644
--- a/src/genpinmap/Arduino/STM32F401V(D-E)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F401V(D-E)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -262,7 +262,7 @@ const PinMap PinMap_SPI_SSEL[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32F405O(E-G)Yx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F405O(E-G)Yx/PeripheralPins.c
index 32f3b924..e2739100 100644
--- a/src/genpinmap/Arduino/STM32F405O(E-G)Yx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F405O(E-G)Yx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -326,7 +326,7 @@ const PinMap PinMap_CAN_TD[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -352,7 +352,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F405RGTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F405RGTx/PeripheralPins.c
index 31ace778..7b979c33 100644
--- a/src/genpinmap/Arduino/STM32F405RGTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F405RGTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -311,7 +311,7 @@ const PinMap PinMap_CAN_TD[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -337,7 +337,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F405VGTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F405VGTx/PeripheralPins.c
index f2458306..cb1f76e2 100644
--- a/src/genpinmap/Arduino/STM32F405VGTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F405VGTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -334,7 +334,7 @@ const PinMap PinMap_CAN_TD[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -360,7 +360,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F405ZGTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F405ZGTx/PeripheralPins.c
index 96191b36..b86d95bc 100644
--- a/src/genpinmap/Arduino/STM32F405ZGTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F405ZGTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -354,7 +354,7 @@ const PinMap PinMap_CAN_TD[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -380,7 +380,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F407I(E-G)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F407I(E-G)Hx/PeripheralPins.c
index ecc0f043..a1880a96 100644
--- a/src/genpinmap/Arduino/STM32F407I(E-G)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F407I(E-G)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -411,7 +411,7 @@ const PinMap PinMap_Ethernet[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -437,7 +437,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F407I(E-G)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F407I(E-G)Tx/PeripheralPins.c
index 18448013..b62e8eca 100644
--- a/src/genpinmap/Arduino/STM32F407I(E-G)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F407I(E-G)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -411,7 +411,7 @@ const PinMap PinMap_Ethernet[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -437,7 +437,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F407V(E-G)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F407V(E-G)Tx/PeripheralPins.c
index 39f6cc2a..71fefc22 100644
--- a/src/genpinmap/Arduino/STM32F407V(E-G)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F407V(E-G)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -359,7 +359,7 @@ const PinMap PinMap_Ethernet[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -385,7 +385,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F407Z(E-G)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F407Z(E-G)Tx/PeripheralPins.c
index d712d6cd..548431ed 100644
--- a/src/genpinmap/Arduino/STM32F407Z(E-G)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F407Z(E-G)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -383,7 +383,7 @@ const PinMap PinMap_Ethernet[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -409,7 +409,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F410C(8-B)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F410C(8-B)Tx/PeripheralPins.c
index 373a8273..82730e90 100644
--- a/src/genpinmap/Arduino/STM32F410C(8-B)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F410C(8-B)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F410C(8-B)Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32F410C(8-B)Ux/PeripheralPins.c
index cd74aad6..de878daa 100644
--- a/src/genpinmap/Arduino/STM32F410C(8-B)Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F410C(8-B)Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F410R(8-B)Ix/PeripheralPins.c b/src/genpinmap/Arduino/STM32F410R(8-B)Ix/PeripheralPins.c
index a745f556..c946224c 100644
--- a/src/genpinmap/Arduino/STM32F410R(8-B)Ix/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F410R(8-B)Ix/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F410R(8-B)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F410R(8-B)Tx/PeripheralPins.c
index e3233569..578c97b5 100644
--- a/src/genpinmap/Arduino/STM32F410R(8-B)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F410R(8-B)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F410T(8-B)Yx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F410T(8-B)Yx/PeripheralPins.c
index c519392e..4e60720b 100644
--- a/src/genpinmap/Arduino/STM32F410T(8-B)Yx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F410T(8-B)Yx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F411C(C-E)Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32F411C(C-E)Ux/PeripheralPins.c
index 2a7d8254..ed8d21f9 100644
--- a/src/genpinmap/Arduino/STM32F411C(C-E)Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F411C(C-E)Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F411C(C-E)Yx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F411C(C-E)Yx/PeripheralPins.c
index 48b276c1..3ec85a6f 100644
--- a/src/genpinmap/Arduino/STM32F411C(C-E)Yx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F411C(C-E)Yx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F411R(C-E)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F411R(C-E)Tx/PeripheralPins.c
index da2567e7..8f5e30db 100644
--- a/src/genpinmap/Arduino/STM32F411R(C-E)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F411R(C-E)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F411V(C-E)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F411V(C-E)Hx/PeripheralPins.c
index 0e1306b9..3685cc04 100644
--- a/src/genpinmap/Arduino/STM32F411V(C-E)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F411V(C-E)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F411V(C-E)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F411V(C-E)Tx/PeripheralPins.c
index d855b9b8..465b2ead 100644
--- a/src/genpinmap/Arduino/STM32F411V(C-E)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F411V(C-E)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F412C(E-G)Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32F412C(E-G)Ux/PeripheralPins.c
index 895133d8..1346ade4 100644
--- a/src/genpinmap/Arduino/STM32F412C(E-G)Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F412C(E-G)Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F412R(E-G)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F412R(E-G)Tx/PeripheralPins.c
index 59484fcb..b7e78003 100644
--- a/src/genpinmap/Arduino/STM32F412R(E-G)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F412R(E-G)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F412R(E-G)Yx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F412R(E-G)Yx/PeripheralPins.c
index 534c1a8b..6d5c5c7d 100644
--- a/src/genpinmap/Arduino/STM32F412R(E-G)Yx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F412R(E-G)Yx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F412R(E-G)YxP/PeripheralPins.c b/src/genpinmap/Arduino/STM32F412R(E-G)YxP/PeripheralPins.c
index 02bdc14e..055e16b6 100644
--- a/src/genpinmap/Arduino/STM32F412R(E-G)YxP/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F412R(E-G)YxP/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F412V(E-G)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F412V(E-G)Hx/PeripheralPins.c
index f6d1b326..d2b963b5 100644
--- a/src/genpinmap/Arduino/STM32F412V(E-G)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F412V(E-G)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F412V(E-G)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F412V(E-G)Tx/PeripheralPins.c
index 419a6ed3..eb99fd42 100644
--- a/src/genpinmap/Arduino/STM32F412V(E-G)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F412V(E-G)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F412Z(E-G)Jx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F412Z(E-G)Jx/PeripheralPins.c
index 7324b588..d58c2771 100644
--- a/src/genpinmap/Arduino/STM32F412Z(E-G)Jx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F412Z(E-G)Jx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F412Z(E-G)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F412Z(E-G)Tx/PeripheralPins.c
index ee98a803..f03c734f 100644
--- a/src/genpinmap/Arduino/STM32F412Z(E-G)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F412Z(E-G)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F413C(G-H)Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32F413C(G-H)Ux/PeripheralPins.c
index 90d2e8a9..f3231492 100644
--- a/src/genpinmap/Arduino/STM32F413C(G-H)Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F413C(G-H)Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F413M(G-H)Yx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F413M(G-H)Yx/PeripheralPins.c
index cf31f516..98f5b62e 100644
--- a/src/genpinmap/Arduino/STM32F413M(G-H)Yx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F413M(G-H)Yx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F413R(G-H)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F413R(G-H)Tx/PeripheralPins.c
index c3fbe80b..50d49fee 100644
--- a/src/genpinmap/Arduino/STM32F413R(G-H)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F413R(G-H)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F413V(G-H)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F413V(G-H)Hx/PeripheralPins.c
index f4a7ceba..1c941ae5 100644
--- a/src/genpinmap/Arduino/STM32F413V(G-H)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F413V(G-H)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F413V(G-H)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F413V(G-H)Tx/PeripheralPins.c
index 40e49b8a..6a6277fb 100644
--- a/src/genpinmap/Arduino/STM32F413V(G-H)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F413V(G-H)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F413Z(G-H)Jx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F413Z(G-H)Jx/PeripheralPins.c
index a781aae1..2145066d 100644
--- a/src/genpinmap/Arduino/STM32F413Z(G-H)Jx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F413Z(G-H)Jx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F413Z(G-H)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F413Z(G-H)Tx/PeripheralPins.c
index c255a2ec..62f34621 100644
--- a/src/genpinmap/Arduino/STM32F413Z(G-H)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F413Z(G-H)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F415OGYx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F415OGYx/PeripheralPins.c
index ee14f2f9..99601bb4 100644
--- a/src/genpinmap/Arduino/STM32F415OGYx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F415OGYx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -326,7 +326,7 @@ const PinMap PinMap_CAN_TD[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -352,7 +352,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F415RGTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F415RGTx/PeripheralPins.c
index 1a13e563..b8d92993 100644
--- a/src/genpinmap/Arduino/STM32F415RGTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F415RGTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -311,7 +311,7 @@ const PinMap PinMap_CAN_TD[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -337,7 +337,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F415VGTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F415VGTx/PeripheralPins.c
index 99197612..d7adb515 100644
--- a/src/genpinmap/Arduino/STM32F415VGTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F415VGTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -334,7 +334,7 @@ const PinMap PinMap_CAN_TD[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -360,7 +360,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F415ZGTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F415ZGTx/PeripheralPins.c
index 5c15d058..de4bb83c 100644
--- a/src/genpinmap/Arduino/STM32F415ZGTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F415ZGTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -354,7 +354,7 @@ const PinMap PinMap_CAN_TD[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -380,7 +380,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F417I(E-G)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F417I(E-G)Hx/PeripheralPins.c
index 1045aac9..3dd4c692 100644
--- a/src/genpinmap/Arduino/STM32F417I(E-G)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F417I(E-G)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -411,7 +411,7 @@ const PinMap PinMap_Ethernet[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -437,7 +437,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F417I(E-G)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F417I(E-G)Tx/PeripheralPins.c
index 8bcca83c..1514dbcc 100644
--- a/src/genpinmap/Arduino/STM32F417I(E-G)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F417I(E-G)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -411,7 +411,7 @@ const PinMap PinMap_Ethernet[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -437,7 +437,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F417V(E-G)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F417V(E-G)Tx/PeripheralPins.c
index 5eb68d57..4cc2c16b 100644
--- a/src/genpinmap/Arduino/STM32F417V(E-G)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F417V(E-G)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -359,7 +359,7 @@ const PinMap PinMap_Ethernet[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -385,7 +385,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F417Z(E-G)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F417Z(E-G)Tx/PeripheralPins.c
index 1dd08ebe..cb17d3b4 100644
--- a/src/genpinmap/Arduino/STM32F417Z(E-G)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F417Z(E-G)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -383,7 +383,7 @@ const PinMap PinMap_Ethernet[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -409,7 +409,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F423CHUx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F423CHUx/PeripheralPins.c
index e9e80d43..dca8896a 100644
--- a/src/genpinmap/Arduino/STM32F423CHUx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F423CHUx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F423MHYx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F423MHYx/PeripheralPins.c
index d595a816..a5839f72 100644
--- a/src/genpinmap/Arduino/STM32F423MHYx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F423MHYx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F423RHTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F423RHTx/PeripheralPins.c
index 3b636016..f60429ae 100644
--- a/src/genpinmap/Arduino/STM32F423RHTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F423RHTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F423VHHx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F423VHHx/PeripheralPins.c
index 9928d6a4..1473f8dd 100644
--- a/src/genpinmap/Arduino/STM32F423VHHx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F423VHHx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F423VHTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F423VHTx/PeripheralPins.c
index fa6424c6..1bab713b 100644
--- a/src/genpinmap/Arduino/STM32F423VHTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F423VHTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F423ZHJx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F423ZHJx/PeripheralPins.c
index 3a53d74b..3cc930e8 100644
--- a/src/genpinmap/Arduino/STM32F423ZHJx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F423ZHJx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F423ZHTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F423ZHTx/PeripheralPins.c
index 25bcb903..575fa7b7 100644
--- a/src/genpinmap/Arduino/STM32F423ZHTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F423ZHTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32F427A(G-I)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F427A(G-I)Hx/PeripheralPins.c
index f1d9c64d..26a19d7e 100644
--- a/src/genpinmap/Arduino/STM32F427A(G-I)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F427A(G-I)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -416,7 +416,7 @@ const PinMap PinMap_Ethernet[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -442,7 +442,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F427I(G-I)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F427I(G-I)Hx/PeripheralPins.c
index 611f7342..14b34c31 100644
--- a/src/genpinmap/Arduino/STM32F427I(G-I)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F427I(G-I)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -439,7 +439,7 @@ const PinMap PinMap_Ethernet[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -465,7 +465,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F427I(G-I)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F427I(G-I)Tx/PeripheralPins.c
index 42bfa398..278b7b4d 100644
--- a/src/genpinmap/Arduino/STM32F427I(G-I)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F427I(G-I)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -439,7 +439,7 @@ const PinMap PinMap_Ethernet[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -465,7 +465,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F427V(G-I)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F427V(G-I)Tx/PeripheralPins.c
index 70ec4b91..be0f1ad1 100644
--- a/src/genpinmap/Arduino/STM32F427V(G-I)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F427V(G-I)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -373,7 +373,7 @@ const PinMap PinMap_Ethernet[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -399,7 +399,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F427Z(G-I)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F427Z(G-I)Tx/PeripheralPins.c
index 5a896304..d5b20c84 100644
--- a/src/genpinmap/Arduino/STM32F427Z(G-I)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F427Z(G-I)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -408,7 +408,7 @@ const PinMap PinMap_Ethernet[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -434,7 +434,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F429A(G-I)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F429A(G-I)Hx/PeripheralPins.c
index 0b558268..77a52d28 100644
--- a/src/genpinmap/Arduino/STM32F429A(G-I)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F429A(G-I)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -416,7 +416,7 @@ const PinMap PinMap_Ethernet[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -442,7 +442,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F429B(E-G-I)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F429B(E-G-I)Tx/PeripheralPins.c
index 745e0cbe..d601bf3c 100644
--- a/src/genpinmap/Arduino/STM32F429B(E-G-I)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F429B(E-G-I)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -439,7 +439,7 @@ const PinMap PinMap_Ethernet[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -465,7 +465,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F429I(E-G)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F429I(E-G)Tx/PeripheralPins.c
index 59db930e..1d0454cd 100644
--- a/src/genpinmap/Arduino/STM32F429I(E-G)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F429I(E-G)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -439,7 +439,7 @@ const PinMap PinMap_Ethernet[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -465,7 +465,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F429I(E-G-I)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F429I(E-G-I)Hx/PeripheralPins.c
index 6bf397c9..f72c670b 100644
--- a/src/genpinmap/Arduino/STM32F429I(E-G-I)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F429I(E-G-I)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -439,7 +439,7 @@ const PinMap PinMap_Ethernet[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -465,7 +465,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F429IITx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F429IITx/PeripheralPins.c
index c2d8c85c..7d1b59f4 100644
--- a/src/genpinmap/Arduino/STM32F429IITx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F429IITx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -439,7 +439,7 @@ const PinMap PinMap_Ethernet[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -465,7 +465,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F429N(E-G)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F429N(E-G)Hx/PeripheralPins.c
index 9b4ca44d..675a485d 100644
--- a/src/genpinmap/Arduino/STM32F429N(E-G)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F429N(E-G)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -439,7 +439,7 @@ const PinMap PinMap_Ethernet[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -465,7 +465,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F429NIHx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F429NIHx/PeripheralPins.c
index 5cac774e..4b3135c0 100644
--- a/src/genpinmap/Arduino/STM32F429NIHx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F429NIHx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -439,7 +439,7 @@ const PinMap PinMap_Ethernet[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -465,7 +465,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F429V(E-G)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F429V(E-G)Tx/PeripheralPins.c
index 7166b383..92a676d2 100644
--- a/src/genpinmap/Arduino/STM32F429V(E-G)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F429V(E-G)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -373,7 +373,7 @@ const PinMap PinMap_Ethernet[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -399,7 +399,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F429VITx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F429VITx/PeripheralPins.c
index 9e33018a..3d820d63 100644
--- a/src/genpinmap/Arduino/STM32F429VITx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F429VITx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -373,7 +373,7 @@ const PinMap PinMap_Ethernet[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -399,7 +399,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F429Z(E-G)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F429Z(E-G)Tx/PeripheralPins.c
index 3c37f511..e904c5b6 100644
--- a/src/genpinmap/Arduino/STM32F429Z(E-G)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F429Z(E-G)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -408,7 +408,7 @@ const PinMap PinMap_Ethernet[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -434,7 +434,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F429ZGYx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F429ZGYx/PeripheralPins.c
index c4e1f348..24597b62 100644
--- a/src/genpinmap/Arduino/STM32F429ZGYx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F429ZGYx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -408,7 +408,7 @@ const PinMap PinMap_Ethernet[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -434,7 +434,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F429ZITx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F429ZITx/PeripheralPins.c
index bad72d6f..ba2133c3 100644
--- a/src/genpinmap/Arduino/STM32F429ZITx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F429ZITx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -408,7 +408,7 @@ const PinMap PinMap_Ethernet[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -434,7 +434,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F429ZIYx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F429ZIYx/PeripheralPins.c
index 9885471f..4f3c17b5 100644
--- a/src/genpinmap/Arduino/STM32F429ZIYx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F429ZIYx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -408,7 +408,7 @@ const PinMap PinMap_Ethernet[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -434,7 +434,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F437AIHx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F437AIHx/PeripheralPins.c
index 29541a1b..aa549336 100644
--- a/src/genpinmap/Arduino/STM32F437AIHx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F437AIHx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -416,7 +416,7 @@ const PinMap PinMap_Ethernet[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -442,7 +442,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F437I(G-I)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F437I(G-I)Hx/PeripheralPins.c
index 3f7db04d..3bce551c 100644
--- a/src/genpinmap/Arduino/STM32F437I(G-I)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F437I(G-I)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -439,7 +439,7 @@ const PinMap PinMap_Ethernet[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -465,7 +465,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F437I(G-I)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F437I(G-I)Tx/PeripheralPins.c
index 47624aa7..63bdf75a 100644
--- a/src/genpinmap/Arduino/STM32F437I(G-I)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F437I(G-I)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -439,7 +439,7 @@ const PinMap PinMap_Ethernet[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -465,7 +465,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F437V(G-I)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F437V(G-I)Tx/PeripheralPins.c
index ceabb765..2d5327b0 100644
--- a/src/genpinmap/Arduino/STM32F437V(G-I)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F437V(G-I)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -373,7 +373,7 @@ const PinMap PinMap_Ethernet[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -399,7 +399,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F437Z(G-I)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F437Z(G-I)Tx/PeripheralPins.c
index 7710f9f8..6f000ec5 100644
--- a/src/genpinmap/Arduino/STM32F437Z(G-I)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F437Z(G-I)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -408,7 +408,7 @@ const PinMap PinMap_Ethernet[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -434,7 +434,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F439AIHx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F439AIHx/PeripheralPins.c
index 29a2ba9f..93d40837 100644
--- a/src/genpinmap/Arduino/STM32F439AIHx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F439AIHx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -416,7 +416,7 @@ const PinMap PinMap_Ethernet[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -442,7 +442,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F439B(G-I)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F439B(G-I)Tx/PeripheralPins.c
index d8cb4a16..c6f3aae8 100644
--- a/src/genpinmap/Arduino/STM32F439B(G-I)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F439B(G-I)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -439,7 +439,7 @@ const PinMap PinMap_Ethernet[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -465,7 +465,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F439I(G-I)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F439I(G-I)Hx/PeripheralPins.c
index 7b67b6a6..33629718 100644
--- a/src/genpinmap/Arduino/STM32F439I(G-I)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F439I(G-I)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -439,7 +439,7 @@ const PinMap PinMap_Ethernet[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -465,7 +465,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F439I(G-I)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F439I(G-I)Tx/PeripheralPins.c
index e114b7ec..3446e905 100644
--- a/src/genpinmap/Arduino/STM32F439I(G-I)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F439I(G-I)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -439,7 +439,7 @@ const PinMap PinMap_Ethernet[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -465,7 +465,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F439N(G-I)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F439N(G-I)Hx/PeripheralPins.c
index 317a7522..cbea8855 100644
--- a/src/genpinmap/Arduino/STM32F439N(G-I)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F439N(G-I)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -439,7 +439,7 @@ const PinMap PinMap_Ethernet[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -465,7 +465,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F439V(G-I)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F439V(G-I)Tx/PeripheralPins.c
index c1fc6b27..960c9596 100644
--- a/src/genpinmap/Arduino/STM32F439V(G-I)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F439V(G-I)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -373,7 +373,7 @@ const PinMap PinMap_Ethernet[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -399,7 +399,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F439Z(G-I)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F439Z(G-I)Tx/PeripheralPins.c
index 44118daf..c8327d4f 100644
--- a/src/genpinmap/Arduino/STM32F439Z(G-I)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F439Z(G-I)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -408,7 +408,7 @@ const PinMap PinMap_Ethernet[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -434,7 +434,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F439Z(G-I)Yx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F439Z(G-I)Yx/PeripheralPins.c
index 09f88726..706a67f1 100644
--- a/src/genpinmap/Arduino/STM32F439Z(G-I)Yx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F439Z(G-I)Yx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -408,7 +408,7 @@ const PinMap PinMap_Ethernet[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -434,7 +434,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F446M(C-E)Yx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F446M(C-E)Yx/PeripheralPins.c
index b5f992dc..eafa570c 100644
--- a/src/genpinmap/Arduino/STM32F446M(C-E)Yx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F446M(C-E)Yx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -361,7 +361,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -387,7 +387,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F446R(C-E)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F446R(C-E)Tx/PeripheralPins.c
index ed582b98..c8e668ec 100644
--- a/src/genpinmap/Arduino/STM32F446R(C-E)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F446R(C-E)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -340,7 +340,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -366,7 +366,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F446V(C-E)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F446V(C-E)Tx/PeripheralPins.c
index 3378b3b6..4e173c56 100644
--- a/src/genpinmap/Arduino/STM32F446V(C-E)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F446V(C-E)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -391,7 +391,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -417,7 +417,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F446Z(C-E)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F446Z(C-E)Hx/PeripheralPins.c
index 956d83de..f170b8ee 100644
--- a/src/genpinmap/Arduino/STM32F446Z(C-E)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F446Z(C-E)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -427,7 +427,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -453,7 +453,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F446Z(C-E)Jx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F446Z(C-E)Jx/PeripheralPins.c
index e0e0ae81..b70d5737 100644
--- a/src/genpinmap/Arduino/STM32F446Z(C-E)Jx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F446Z(C-E)Jx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -427,7 +427,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -453,7 +453,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F446Z(C-E)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F446Z(C-E)Tx/PeripheralPins.c
index b501d19e..f7919135 100644
--- a/src/genpinmap/Arduino/STM32F446Z(C-E)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F446Z(C-E)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -427,7 +427,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -453,7 +453,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F469A(E-G-I)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F469A(E-G-I)Hx/PeripheralPins.c
index 45ce2403..7e752618 100644
--- a/src/genpinmap/Arduino/STM32F469A(E-G-I)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F469A(E-G-I)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -398,7 +398,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -424,7 +424,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F469A(E-G-I)Yx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F469A(E-G-I)Yx/PeripheralPins.c
index b0a4689f..a353086c 100644
--- a/src/genpinmap/Arduino/STM32F469A(E-G-I)Yx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F469A(E-G-I)Yx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -398,7 +398,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -424,7 +424,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F469B(E-G-I)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F469B(E-G-I)Tx/PeripheralPins.c
index de1916a2..ea432647 100644
--- a/src/genpinmap/Arduino/STM32F469B(E-G-I)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F469B(E-G-I)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -471,7 +471,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -497,7 +497,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F469I(E-G)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F469I(E-G)Tx/PeripheralPins.c
index 42442a58..858874d5 100644
--- a/src/genpinmap/Arduino/STM32F469I(E-G)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F469I(E-G)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -460,7 +460,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -486,7 +486,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F469I(E-G-I)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F469I(E-G-I)Hx/PeripheralPins.c
index dea3865c..6db3c794 100644
--- a/src/genpinmap/Arduino/STM32F469I(E-G-I)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F469I(E-G-I)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -460,7 +460,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -486,7 +486,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F469IITx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F469IITx/PeripheralPins.c
index f196b336..8021bd02 100644
--- a/src/genpinmap/Arduino/STM32F469IITx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F469IITx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -460,7 +460,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -486,7 +486,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F469N(E-G)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F469N(E-G)Hx/PeripheralPins.c
index 2d0332f8..8c96161d 100644
--- a/src/genpinmap/Arduino/STM32F469N(E-G)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F469N(E-G)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -471,7 +471,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -497,7 +497,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F469NIHx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F469NIHx/PeripheralPins.c
index 6fc2988a..f0ccf566 100644
--- a/src/genpinmap/Arduino/STM32F469NIHx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F469NIHx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -471,7 +471,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -497,7 +497,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F469V(E-G)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F469V(E-G)Tx/PeripheralPins.c
index 7e2deb4f..0bb20426 100644
--- a/src/genpinmap/Arduino/STM32F469V(E-G)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F469V(E-G)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -353,7 +353,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -379,7 +379,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F469VITx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F469VITx/PeripheralPins.c
index b264bca4..5341155d 100644
--- a/src/genpinmap/Arduino/STM32F469VITx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F469VITx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -353,7 +353,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -379,7 +379,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F469Z(E-G)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F469Z(E-G)Tx/PeripheralPins.c
index 8ec2af4d..01079eeb 100644
--- a/src/genpinmap/Arduino/STM32F469Z(E-G)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F469Z(E-G)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -381,7 +381,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -407,7 +407,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F469ZITx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F469ZITx/PeripheralPins.c
index 8b12d081..7d40a220 100644
--- a/src/genpinmap/Arduino/STM32F469ZITx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F469ZITx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -381,7 +381,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -407,7 +407,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F479A(G-I)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F479A(G-I)Hx/PeripheralPins.c
index 36a94b77..ccdc6d5f 100644
--- a/src/genpinmap/Arduino/STM32F479A(G-I)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F479A(G-I)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -398,7 +398,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -424,7 +424,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F479A(G-I)Yx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F479A(G-I)Yx/PeripheralPins.c
index 71409657..a3f0c265 100644
--- a/src/genpinmap/Arduino/STM32F479A(G-I)Yx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F479A(G-I)Yx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -398,7 +398,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -424,7 +424,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F479B(G-I)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F479B(G-I)Tx/PeripheralPins.c
index 097383fa..5e4a8f6c 100644
--- a/src/genpinmap/Arduino/STM32F479B(G-I)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F479B(G-I)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -471,7 +471,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -497,7 +497,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F479I(G-I)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F479I(G-I)Hx/PeripheralPins.c
index 51c2f630..d1cc5b6a 100644
--- a/src/genpinmap/Arduino/STM32F479I(G-I)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F479I(G-I)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -460,7 +460,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -486,7 +486,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F479I(G-I)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F479I(G-I)Tx/PeripheralPins.c
index c4556949..124b829f 100644
--- a/src/genpinmap/Arduino/STM32F479I(G-I)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F479I(G-I)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -460,7 +460,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -486,7 +486,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F479N(G-I)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F479N(G-I)Hx/PeripheralPins.c
index 242211a3..f2af99d3 100644
--- a/src/genpinmap/Arduino/STM32F479N(G-I)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F479N(G-I)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -471,7 +471,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -497,7 +497,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F479V(G-I)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F479V(G-I)Tx/PeripheralPins.c
index 910f02ea..52e345eb 100644
--- a/src/genpinmap/Arduino/STM32F479V(G-I)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F479V(G-I)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -353,7 +353,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -379,7 +379,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F479Z(G-I)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F479Z(G-I)Tx/PeripheralPins.c
index c1ba2b06..0d2efab6 100644
--- a/src/genpinmap/Arduino/STM32F479Z(G-I)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F479Z(G-I)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -381,7 +381,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -407,7 +407,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F722I(C-E)Kx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F722I(C-E)Kx/PeripheralPins.c
index c36aa048..c600d1b8 100644
--- a/src/genpinmap/Arduino/STM32F722I(C-E)Kx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F722I(C-E)Kx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -443,7 +443,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -469,7 +469,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F722I(C-E)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F722I(C-E)Tx/PeripheralPins.c
index 4597aa1b..bdf6f2d9 100644
--- a/src/genpinmap/Arduino/STM32F722I(C-E)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F722I(C-E)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -443,7 +443,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -469,7 +469,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F722R(C-E)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F722R(C-E)Tx/PeripheralPins.c
index 1c9c3e95..3e0ce2bb 100644
--- a/src/genpinmap/Arduino/STM32F722R(C-E)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F722R(C-E)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -325,7 +325,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -351,7 +351,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F722V(C-E)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F722V(C-E)Tx/PeripheralPins.c
index 88f92642..87266db3 100644
--- a/src/genpinmap/Arduino/STM32F722V(C-E)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F722V(C-E)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -376,7 +376,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -402,7 +402,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F722Z(C-E)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F722Z(C-E)Tx/PeripheralPins.c
index 57023129..142a4824 100644
--- a/src/genpinmap/Arduino/STM32F722Z(C-E)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F722Z(C-E)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -411,7 +411,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -437,7 +437,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F723I(C-E)Kx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F723I(C-E)Kx/PeripheralPins.c
index 2cb56c10..e7fffaab 100644
--- a/src/genpinmap/Arduino/STM32F723I(C-E)Kx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F723I(C-E)Kx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -434,7 +434,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -447,7 +447,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
 #ifdef USE_USB_HS_IN_FS
   {PA_4,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_SOF
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_ID
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F723I(C-E)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F723I(C-E)Tx/PeripheralPins.c
index e20dd4d8..f7082cc7 100644
--- a/src/genpinmap/Arduino/STM32F723I(C-E)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F723I(C-E)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -434,7 +434,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -447,7 +447,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
 #ifdef USE_USB_HS_IN_FS
   {PA_4,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_SOF
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_ID
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F723V(C-E)Yx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F723V(C-E)Yx/PeripheralPins.c
index b3f7ab25..051f786f 100644
--- a/src/genpinmap/Arduino/STM32F723V(C-E)Yx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F723V(C-E)Yx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -365,7 +365,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -378,7 +378,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
 #ifdef USE_USB_HS_IN_FS
   {PA_4,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_SOF
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_ID
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F723Z(C-E)Ix/PeripheralPins.c b/src/genpinmap/Arduino/STM32F723Z(C-E)Ix/PeripheralPins.c
index d5a7dde8..d55a4233 100644
--- a/src/genpinmap/Arduino/STM32F723Z(C-E)Ix/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F723Z(C-E)Ix/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -402,7 +402,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -415,7 +415,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
 #ifdef USE_USB_HS_IN_FS
   {PA_4,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_SOF
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_ID
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F723Z(C-E)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F723Z(C-E)Tx/PeripheralPins.c
index 4c3b936f..347fea5b 100644
--- a/src/genpinmap/Arduino/STM32F723Z(C-E)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F723Z(C-E)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -402,7 +402,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -415,7 +415,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
 #ifdef USE_USB_HS_IN_FS
   {PA_4,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_SOF
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_ID
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F730I8Kx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F730I8Kx/PeripheralPins.c
index 53a35c65..807e4ca5 100644
--- a/src/genpinmap/Arduino/STM32F730I8Kx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F730I8Kx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -434,7 +434,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -447,7 +447,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
 #ifdef USE_USB_HS_IN_FS
   {PA_4,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_SOF
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_ID
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F730R8Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F730R8Tx/PeripheralPins.c
index 9daf2198..e296e144 100644
--- a/src/genpinmap/Arduino/STM32F730R8Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F730R8Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -325,7 +325,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -351,7 +351,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F730V8Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F730V8Tx/PeripheralPins.c
index ba7939f1..a4a88a56 100644
--- a/src/genpinmap/Arduino/STM32F730V8Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F730V8Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -376,7 +376,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -402,7 +402,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F730Z8Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F730Z8Tx/PeripheralPins.c
index 5179f09d..a3dc23ea 100644
--- a/src/genpinmap/Arduino/STM32F730Z8Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F730Z8Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -402,7 +402,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -415,7 +415,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
 #ifdef USE_USB_HS_IN_FS
   {PA_4,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_SOF
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_ID
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F732IEKx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F732IEKx/PeripheralPins.c
index b05d5a1e..bd192917 100644
--- a/src/genpinmap/Arduino/STM32F732IEKx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F732IEKx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -443,7 +443,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -469,7 +469,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F732IETx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F732IETx/PeripheralPins.c
index dca200c0..365c56f4 100644
--- a/src/genpinmap/Arduino/STM32F732IETx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F732IETx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -443,7 +443,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -469,7 +469,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F732RETx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F732RETx/PeripheralPins.c
index 7619a72f..996a6907 100644
--- a/src/genpinmap/Arduino/STM32F732RETx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F732RETx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -325,7 +325,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -351,7 +351,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F732VETx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F732VETx/PeripheralPins.c
index 4ca98b55..6507349d 100644
--- a/src/genpinmap/Arduino/STM32F732VETx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F732VETx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -376,7 +376,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -402,7 +402,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F732ZETx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F732ZETx/PeripheralPins.c
index 9d52e255..0253951a 100644
--- a/src/genpinmap/Arduino/STM32F732ZETx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F732ZETx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -411,7 +411,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -437,7 +437,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F733IEKx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F733IEKx/PeripheralPins.c
index 3e33ad83..4288e142 100644
--- a/src/genpinmap/Arduino/STM32F733IEKx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F733IEKx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -434,7 +434,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -447,7 +447,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
 #ifdef USE_USB_HS_IN_FS
   {PA_4,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_SOF
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_ID
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F733IETx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F733IETx/PeripheralPins.c
index 420dbc78..3c745431 100644
--- a/src/genpinmap/Arduino/STM32F733IETx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F733IETx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -434,7 +434,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -447,7 +447,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
 #ifdef USE_USB_HS_IN_FS
   {PA_4,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_SOF
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_ID
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F733VEYx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F733VEYx/PeripheralPins.c
index ac0aa832..043d3a61 100644
--- a/src/genpinmap/Arduino/STM32F733VEYx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F733VEYx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -365,7 +365,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -378,7 +378,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
 #ifdef USE_USB_HS_IN_FS
   {PA_4,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_SOF
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_ID
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F733ZEIx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F733ZEIx/PeripheralPins.c
index db1c3884..4c7b6d10 100644
--- a/src/genpinmap/Arduino/STM32F733ZEIx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F733ZEIx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -402,7 +402,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -415,7 +415,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
 #ifdef USE_USB_HS_IN_FS
   {PA_4,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_SOF
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_ID
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F733ZETx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F733ZETx/PeripheralPins.c
index 00325e03..d4699450 100644
--- a/src/genpinmap/Arduino/STM32F733ZETx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F733ZETx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -402,7 +402,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -415,7 +415,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
 #ifdef USE_USB_HS_IN_FS
   {PA_4,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_SOF
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_ID
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F745I(E-G)Kx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F745I(E-G)Kx/PeripheralPins.c
index abf68460..3f6a19fc 100644
--- a/src/genpinmap/Arduino/STM32F745I(E-G)Kx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F745I(E-G)Kx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -487,7 +487,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -513,7 +513,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F745I(E-G)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F745I(E-G)Tx/PeripheralPins.c
index b4412ee0..4e7f49bb 100644
--- a/src/genpinmap/Arduino/STM32F745I(E-G)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F745I(E-G)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -487,7 +487,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -513,7 +513,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F745V(E-G)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F745V(E-G)Hx/PeripheralPins.c
index 776e3fef..c689052c 100644
--- a/src/genpinmap/Arduino/STM32F745V(E-G)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F745V(E-G)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -407,7 +407,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -433,7 +433,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F745V(E-G)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F745V(E-G)Tx/PeripheralPins.c
index e40f5e6c..cd648a37 100644
--- a/src/genpinmap/Arduino/STM32F745V(E-G)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F745V(E-G)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -407,7 +407,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -433,7 +433,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F745Z(E-G)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F745Z(E-G)Tx/PeripheralPins.c
index 7613a32c..7be39dd8 100644
--- a/src/genpinmap/Arduino/STM32F745Z(E-G)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F745Z(E-G)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -452,7 +452,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -478,7 +478,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F746B(E-G)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F746B(E-G)Tx/PeripheralPins.c
index 7d82f1a2..308a31cb 100644
--- a/src/genpinmap/Arduino/STM32F746B(E-G)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F746B(E-G)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -487,7 +487,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -513,7 +513,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F746I(E-G)Kx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F746I(E-G)Kx/PeripheralPins.c
index 48d6ccf3..1f8d0a7e 100644
--- a/src/genpinmap/Arduino/STM32F746I(E-G)Kx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F746I(E-G)Kx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -487,7 +487,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -513,7 +513,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F746IETx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F746IETx/PeripheralPins.c
index e9812a61..5439d745 100644
--- a/src/genpinmap/Arduino/STM32F746IETx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F746IETx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -487,7 +487,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -513,7 +513,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F746IGTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F746IGTx/PeripheralPins.c
index 9b33b6fe..5b59c719 100644
--- a/src/genpinmap/Arduino/STM32F746IGTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F746IGTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -487,7 +487,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -513,7 +513,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F746NEHx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F746NEHx/PeripheralPins.c
index 1b76b283..22875edb 100644
--- a/src/genpinmap/Arduino/STM32F746NEHx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F746NEHx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -487,7 +487,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -513,7 +513,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F746NGHx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F746NGHx/PeripheralPins.c
index c969a4d9..ce3488b3 100644
--- a/src/genpinmap/Arduino/STM32F746NGHx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F746NGHx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -487,7 +487,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -513,7 +513,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F746V(E-G)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F746V(E-G)Hx/PeripheralPins.c
index bc327a17..166836dd 100644
--- a/src/genpinmap/Arduino/STM32F746V(E-G)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F746V(E-G)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -407,7 +407,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -433,7 +433,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F746VETx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F746VETx/PeripheralPins.c
index 144f4731..5ff62e9a 100644
--- a/src/genpinmap/Arduino/STM32F746VETx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F746VETx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -407,7 +407,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -433,7 +433,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F746VGTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F746VGTx/PeripheralPins.c
index bfc1b040..6be694b3 100644
--- a/src/genpinmap/Arduino/STM32F746VGTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F746VGTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -407,7 +407,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -433,7 +433,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F746Z(E-G)Yx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F746Z(E-G)Yx/PeripheralPins.c
index 2757ca6e..5e4afebb 100644
--- a/src/genpinmap/Arduino/STM32F746Z(E-G)Yx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F746Z(E-G)Yx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -452,7 +452,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -478,7 +478,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F746ZETx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F746ZETx/PeripheralPins.c
index 9c508544..b265c1d5 100644
--- a/src/genpinmap/Arduino/STM32F746ZETx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F746ZETx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -452,7 +452,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -478,7 +478,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F746ZGTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F746ZGTx/PeripheralPins.c
index f11eecc9..58ee3059 100644
--- a/src/genpinmap/Arduino/STM32F746ZGTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F746ZGTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -452,7 +452,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -478,7 +478,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F750N8Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F750N8Hx/PeripheralPins.c
index 490695dd..8d08999f 100644
--- a/src/genpinmap/Arduino/STM32F750N8Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F750N8Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -487,7 +487,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -513,7 +513,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F750V8Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F750V8Tx/PeripheralPins.c
index da916157..c111e7a2 100644
--- a/src/genpinmap/Arduino/STM32F750V8Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F750V8Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -407,7 +407,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -433,7 +433,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F750Z8Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F750Z8Tx/PeripheralPins.c
index 5bd29d1b..767e869b 100644
--- a/src/genpinmap/Arduino/STM32F750Z8Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F750Z8Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -452,7 +452,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -478,7 +478,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F756BGTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F756BGTx/PeripheralPins.c
index 30ab3273..4623658f 100644
--- a/src/genpinmap/Arduino/STM32F756BGTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F756BGTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -487,7 +487,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -513,7 +513,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F756IGKx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F756IGKx/PeripheralPins.c
index e63711cb..10c0e1b2 100644
--- a/src/genpinmap/Arduino/STM32F756IGKx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F756IGKx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -487,7 +487,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -513,7 +513,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F756IGTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F756IGTx/PeripheralPins.c
index db755e62..32ae513d 100644
--- a/src/genpinmap/Arduino/STM32F756IGTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F756IGTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -487,7 +487,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -513,7 +513,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F756NGHx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F756NGHx/PeripheralPins.c
index d6c0556f..9303f7f3 100644
--- a/src/genpinmap/Arduino/STM32F756NGHx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F756NGHx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -487,7 +487,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -513,7 +513,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F756VGHx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F756VGHx/PeripheralPins.c
index 1f9fade9..cafc3f2d 100644
--- a/src/genpinmap/Arduino/STM32F756VGHx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F756VGHx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -407,7 +407,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -433,7 +433,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F756VGTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F756VGTx/PeripheralPins.c
index 51c54ae0..4fb06fca 100644
--- a/src/genpinmap/Arduino/STM32F756VGTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F756VGTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -407,7 +407,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -433,7 +433,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F756ZGTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F756ZGTx/PeripheralPins.c
index 9ace2481..622f78f0 100644
--- a/src/genpinmap/Arduino/STM32F756ZGTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F756ZGTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -452,7 +452,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -478,7 +478,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F756ZGYx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F756ZGYx/PeripheralPins.c
index 3ec0cfb0..7f7aa2ef 100644
--- a/src/genpinmap/Arduino/STM32F756ZGYx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F756ZGYx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -452,7 +452,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -478,7 +478,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F765B(G-I)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F765B(G-I)Tx/PeripheralPins.c
index a3749808..5e94b84b 100644
--- a/src/genpinmap/Arduino/STM32F765B(G-I)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F765B(G-I)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -533,7 +533,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -559,7 +559,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F765I(G-I)Kx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F765I(G-I)Kx/PeripheralPins.c
index e4bb0020..1468a0f5 100644
--- a/src/genpinmap/Arduino/STM32F765I(G-I)Kx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F765I(G-I)Kx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -533,7 +533,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -559,7 +559,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F765I(G-I)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F765I(G-I)Tx/PeripheralPins.c
index ae7723f3..81799d81 100644
--- a/src/genpinmap/Arduino/STM32F765I(G-I)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F765I(G-I)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -533,7 +533,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -559,7 +559,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F765N(G-I)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F765N(G-I)Hx/PeripheralPins.c
index b354acc4..ccb0e4ca 100644
--- a/src/genpinmap/Arduino/STM32F765N(G-I)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F765N(G-I)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -533,7 +533,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -559,7 +559,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F765V(G-I)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F765V(G-I)Hx/PeripheralPins.c
index 044ec587..65b05e1e 100644
--- a/src/genpinmap/Arduino/STM32F765V(G-I)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F765V(G-I)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -445,7 +445,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -471,7 +471,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F765V(G-I)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F765V(G-I)Tx/PeripheralPins.c
index 08748c69..430784a5 100644
--- a/src/genpinmap/Arduino/STM32F765V(G-I)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F765V(G-I)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -445,7 +445,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -471,7 +471,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F765Z(G-I)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F765Z(G-I)Tx/PeripheralPins.c
index 603c9e43..60db2bc6 100644
--- a/src/genpinmap/Arduino/STM32F765Z(G-I)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F765Z(G-I)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -494,7 +494,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -520,7 +520,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F767B(G-I)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F767B(G-I)Tx/PeripheralPins.c
index 6ccee86a..ca85960d 100644
--- a/src/genpinmap/Arduino/STM32F767B(G-I)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F767B(G-I)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -533,7 +533,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -559,7 +559,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F767I(G-I)Kx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F767I(G-I)Kx/PeripheralPins.c
index 76a7b782..00efbc25 100644
--- a/src/genpinmap/Arduino/STM32F767I(G-I)Kx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F767I(G-I)Kx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -533,7 +533,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -559,7 +559,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F767I(G-I)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F767I(G-I)Tx/PeripheralPins.c
index 5095621e..8a4a0693 100644
--- a/src/genpinmap/Arduino/STM32F767I(G-I)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F767I(G-I)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -533,7 +533,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -559,7 +559,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F767N(G-I)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F767N(G-I)Hx/PeripheralPins.c
index dbd4cd08..41663201 100644
--- a/src/genpinmap/Arduino/STM32F767N(G-I)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F767N(G-I)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -533,7 +533,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -559,7 +559,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F767VGHx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F767VGHx/PeripheralPins.c
index 8222ea3f..e9b12d33 100644
--- a/src/genpinmap/Arduino/STM32F767VGHx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F767VGHx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -445,7 +445,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -471,7 +471,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F767VGTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F767VGTx/PeripheralPins.c
index 518701b3..148dcf90 100644
--- a/src/genpinmap/Arduino/STM32F767VGTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F767VGTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -445,7 +445,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -471,7 +471,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F767VIHx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F767VIHx/PeripheralPins.c
index 363d7388..b2ce1d76 100644
--- a/src/genpinmap/Arduino/STM32F767VIHx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F767VIHx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -445,7 +445,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -471,7 +471,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F767VITx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F767VITx/PeripheralPins.c
index 877a2ef2..1c797bbd 100644
--- a/src/genpinmap/Arduino/STM32F767VITx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F767VITx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -445,7 +445,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -471,7 +471,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F767ZGTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F767ZGTx/PeripheralPins.c
index 18d6a9ee..2bce308d 100644
--- a/src/genpinmap/Arduino/STM32F767ZGTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F767ZGTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -494,7 +494,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -520,7 +520,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F767ZITx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F767ZITx/PeripheralPins.c
index 44c26de5..741471ed 100644
--- a/src/genpinmap/Arduino/STM32F767ZITx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F767ZITx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -494,7 +494,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -520,7 +520,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F768AIYx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F768AIYx/PeripheralPins.c
index eb04a930..d244ca2c 100644
--- a/src/genpinmap/Arduino/STM32F768AIYx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F768AIYx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -458,7 +458,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -484,7 +484,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F769A(G-I)Yx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F769A(G-I)Yx/PeripheralPins.c
index 4c692662..b3d971af 100644
--- a/src/genpinmap/Arduino/STM32F769A(G-I)Yx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F769A(G-I)Yx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -458,7 +458,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -484,7 +484,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F769B(G-I)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F769B(G-I)Tx/PeripheralPins.c
index 76f125bf..ea7cc2e4 100644
--- a/src/genpinmap/Arduino/STM32F769B(G-I)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F769B(G-I)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -533,7 +533,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -559,7 +559,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F769IGTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F769IGTx/PeripheralPins.c
index 8cd2f466..2bb2a554 100644
--- a/src/genpinmap/Arduino/STM32F769IGTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F769IGTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -517,7 +517,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -543,7 +543,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F769IITx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F769IITx/PeripheralPins.c
index b558db0b..4d654a6c 100644
--- a/src/genpinmap/Arduino/STM32F769IITx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F769IITx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -517,7 +517,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -543,7 +543,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F769NGHx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F769NGHx/PeripheralPins.c
index cc1f5a38..4ee1e7b5 100644
--- a/src/genpinmap/Arduino/STM32F769NGHx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F769NGHx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -533,7 +533,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -559,7 +559,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F769NIHx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F769NIHx/PeripheralPins.c
index 74d70fc4..c716db07 100644
--- a/src/genpinmap/Arduino/STM32F769NIHx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F769NIHx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -533,7 +533,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -559,7 +559,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F777BITx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F777BITx/PeripheralPins.c
index 57d7dcc2..8ef3e48c 100644
--- a/src/genpinmap/Arduino/STM32F777BITx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F777BITx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -533,7 +533,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -559,7 +559,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F777IIKx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F777IIKx/PeripheralPins.c
index 2bc0ccd7..04bd8a3a 100644
--- a/src/genpinmap/Arduino/STM32F777IIKx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F777IIKx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -533,7 +533,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -559,7 +559,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F777IITx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F777IITx/PeripheralPins.c
index 2b848c91..585f6ef4 100644
--- a/src/genpinmap/Arduino/STM32F777IITx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F777IITx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -533,7 +533,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -559,7 +559,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F777NIHx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F777NIHx/PeripheralPins.c
index aa8d485f..7e2e4eda 100644
--- a/src/genpinmap/Arduino/STM32F777NIHx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F777NIHx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -533,7 +533,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -559,7 +559,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F777VIHx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F777VIHx/PeripheralPins.c
index 30b67ddd..e67970a8 100644
--- a/src/genpinmap/Arduino/STM32F777VIHx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F777VIHx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -445,7 +445,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -471,7 +471,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F777VITx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F777VITx/PeripheralPins.c
index 67187309..c4aa1df1 100644
--- a/src/genpinmap/Arduino/STM32F777VITx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F777VITx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -445,7 +445,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -471,7 +471,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F777ZITx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F777ZITx/PeripheralPins.c
index 2741e13a..6fd42c24 100644
--- a/src/genpinmap/Arduino/STM32F777ZITx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F777ZITx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -494,7 +494,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -520,7 +520,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F778AIYx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F778AIYx/PeripheralPins.c
index 4c1b6fa8..76b3e529 100644
--- a/src/genpinmap/Arduino/STM32F778AIYx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F778AIYx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -458,7 +458,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -484,7 +484,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F779AIYx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F779AIYx/PeripheralPins.c
index fdbe66c7..285fe127 100644
--- a/src/genpinmap/Arduino/STM32F779AIYx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F779AIYx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -458,7 +458,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -484,7 +484,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F779BITx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F779BITx/PeripheralPins.c
index 20f0d092..8a93ace4 100644
--- a/src/genpinmap/Arduino/STM32F779BITx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F779BITx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -533,7 +533,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -559,7 +559,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F779IITx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F779IITx/PeripheralPins.c
index ee25e442..70ab56d1 100644
--- a/src/genpinmap/Arduino/STM32F779IITx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F779IITx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -517,7 +517,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -543,7 +543,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32F779NIHx/PeripheralPins.c b/src/genpinmap/Arduino/STM32F779NIHx/PeripheralPins.c
index cf45c672..f6ab779b 100644
--- a/src/genpinmap/Arduino/STM32F779NIHx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32F779NIHx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -533,7 +533,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
@@ -559,7 +559,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32G070CBTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32G070CBTx/PeripheralPins.c
index 8b6153bf..785e0b78 100644
--- a/src/genpinmap/Arduino/STM32G070CBTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32G070CBTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32G070KBTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32G070KBTx/PeripheralPins.c
index 4bdb3458..6eac1cdd 100644
--- a/src/genpinmap/Arduino/STM32G070KBTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32G070KBTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32G070RBTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32G070RBTx/PeripheralPins.c
index 2cf50310..d9595f91 100644
--- a/src/genpinmap/Arduino/STM32G070RBTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32G070RBTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32G071C(6-8-B)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32G071C(6-8-B)Tx/PeripheralPins.c
index 58f9bfb9..b3badeee 100644
--- a/src/genpinmap/Arduino/STM32G071C(6-8-B)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32G071C(6-8-B)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32G071C(6-8-B)Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32G071C(6-8-B)Ux/PeripheralPins.c
index 39321118..7dbf514b 100644
--- a/src/genpinmap/Arduino/STM32G071C(6-8-B)Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32G071C(6-8-B)Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32G071EBYx/PeripheralPins.c b/src/genpinmap/Arduino/STM32G071EBYx/PeripheralPins.c
index dfa90e0c..9bb439df 100644
--- a/src/genpinmap/Arduino/STM32G071EBYx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32G071EBYx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32G071G(6-8-B)Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32G071G(6-8-B)Ux/PeripheralPins.c
index d551e384..1555a652 100644
--- a/src/genpinmap/Arduino/STM32G071G(6-8-B)Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32G071G(6-8-B)Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32G071G(8-B)UxN/PeripheralPins.c b/src/genpinmap/Arduino/STM32G071G(8-B)UxN/PeripheralPins.c
index 42f277e7..e8da69f5 100644
--- a/src/genpinmap/Arduino/STM32G071G(8-B)UxN/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32G071G(8-B)UxN/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32G071K(6-8-B)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32G071K(6-8-B)Tx/PeripheralPins.c
index b071bf48..bfa5ad05 100644
--- a/src/genpinmap/Arduino/STM32G071K(6-8-B)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32G071K(6-8-B)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32G071K(6-8-B)Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32G071K(6-8-B)Ux/PeripheralPins.c
index f756717a..e1eef1fc 100644
--- a/src/genpinmap/Arduino/STM32G071K(6-8-B)Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32G071K(6-8-B)Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32G071K(8-B)TxN/PeripheralPins.c b/src/genpinmap/Arduino/STM32G071K(8-B)TxN/PeripheralPins.c
index 1f82c382..1f2305b9 100644
--- a/src/genpinmap/Arduino/STM32G071K(8-B)TxN/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32G071K(8-B)TxN/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32G071K(8-B)UxN/PeripheralPins.c b/src/genpinmap/Arduino/STM32G071K(8-B)UxN/PeripheralPins.c
index 447f0b05..44822c25 100644
--- a/src/genpinmap/Arduino/STM32G071K(8-B)UxN/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32G071K(8-B)UxN/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32G071R(6-8-B)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32G071R(6-8-B)Tx/PeripheralPins.c
index 90251976..d0e84977 100644
--- a/src/genpinmap/Arduino/STM32G071R(6-8-B)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32G071R(6-8-B)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32G071RBIx/PeripheralPins.c b/src/genpinmap/Arduino/STM32G071RBIx/PeripheralPins.c
index 6ba260c5..8d816b79 100644
--- a/src/genpinmap/Arduino/STM32G071RBIx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32G071RBIx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32G081CBTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32G081CBTx/PeripheralPins.c
index 3b0951ba..02161d99 100644
--- a/src/genpinmap/Arduino/STM32G081CBTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32G081CBTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32G081CBUx/PeripheralPins.c b/src/genpinmap/Arduino/STM32G081CBUx/PeripheralPins.c
index bebb27b3..bd2e07ac 100644
--- a/src/genpinmap/Arduino/STM32G081CBUx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32G081CBUx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32G081EBYx/PeripheralPins.c b/src/genpinmap/Arduino/STM32G081EBYx/PeripheralPins.c
index a16df24c..e6a40da2 100644
--- a/src/genpinmap/Arduino/STM32G081EBYx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32G081EBYx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32G081GBUx/PeripheralPins.c b/src/genpinmap/Arduino/STM32G081GBUx/PeripheralPins.c
index de948c8d..168cb19a 100644
--- a/src/genpinmap/Arduino/STM32G081GBUx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32G081GBUx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32G081GBUxN/PeripheralPins.c b/src/genpinmap/Arduino/STM32G081GBUxN/PeripheralPins.c
index c737bcb0..fb7ebc49 100644
--- a/src/genpinmap/Arduino/STM32G081GBUxN/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32G081GBUxN/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32G081KBTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32G081KBTx/PeripheralPins.c
index e2d50097..166189a3 100644
--- a/src/genpinmap/Arduino/STM32G081KBTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32G081KBTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32G081KBTxN/PeripheralPins.c b/src/genpinmap/Arduino/STM32G081KBTxN/PeripheralPins.c
index aff96da8..f0554cbd 100644
--- a/src/genpinmap/Arduino/STM32G081KBTxN/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32G081KBTxN/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32G081KBUx/PeripheralPins.c b/src/genpinmap/Arduino/STM32G081KBUx/PeripheralPins.c
index 6358a295..2cda834f 100644
--- a/src/genpinmap/Arduino/STM32G081KBUx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32G081KBUx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32G081KBUxN/PeripheralPins.c b/src/genpinmap/Arduino/STM32G081KBUxN/PeripheralPins.c
index 9d2333cd..90b20a4d 100644
--- a/src/genpinmap/Arduino/STM32G081KBUxN/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32G081KBUxN/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32G081RBIx/PeripheralPins.c b/src/genpinmap/Arduino/STM32G081RBIx/PeripheralPins.c
index d9bc23dc..a725c64e 100644
--- a/src/genpinmap/Arduino/STM32G081RBIx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32G081RBIx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32G081RBTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32G081RBTx/PeripheralPins.c
index 73f88c09..7758c97c 100644
--- a/src/genpinmap/Arduino/STM32G081RBTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32G081RBTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32H743A(G-I)Ix/PeripheralPins.c b/src/genpinmap/Arduino/STM32H743A(G-I)Ix/PeripheralPins.c
index 8481e672..6ea7e6a7 100644
--- a/src/genpinmap/Arduino/STM32H743A(G-I)Ix/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32H743A(G-I)Ix/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -544,7 +544,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_DP
@@ -570,7 +570,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG2_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG2_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG2_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG2_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32H743BITx/PeripheralPins.c b/src/genpinmap/Arduino/STM32H743BITx/PeripheralPins.c
index da780069..c0999f12 100644
--- a/src/genpinmap/Arduino/STM32H743BITx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32H743BITx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -583,7 +583,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_DP
@@ -609,7 +609,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG2_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG2_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG2_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG2_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32H743IIKx/PeripheralPins.c b/src/genpinmap/Arduino/STM32H743IIKx/PeripheralPins.c
index fcd48f7e..bd69ae35 100644
--- a/src/genpinmap/Arduino/STM32H743IIKx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32H743IIKx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -563,7 +563,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_DP
@@ -589,7 +589,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG2_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG2_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG2_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG2_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32H743IITx/PeripheralPins.c b/src/genpinmap/Arduino/STM32H743IITx/PeripheralPins.c
index a3e5a8e7..450da4b9 100644
--- a/src/genpinmap/Arduino/STM32H743IITx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32H743IITx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -563,7 +563,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_DP
@@ -589,7 +589,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG2_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG2_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG2_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG2_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32H743V(G-I)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32H743V(G-I)Hx/PeripheralPins.c
index 2d86544f..2e87ee8d 100644
--- a/src/genpinmap/Arduino/STM32H743V(G-I)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32H743V(G-I)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -454,7 +454,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_DP
@@ -480,7 +480,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG2_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG2_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG2_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG2_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32H743VITx/PeripheralPins.c b/src/genpinmap/Arduino/STM32H743VITx/PeripheralPins.c
index 9b007d07..3c2c7a69 100644
--- a/src/genpinmap/Arduino/STM32H743VITx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32H743VITx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -454,7 +454,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_DP
@@ -480,7 +480,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG2_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG2_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG2_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG2_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32H743XIHx/PeripheralPins.c b/src/genpinmap/Arduino/STM32H743XIHx/PeripheralPins.c
index eed49821..f4632292 100644
--- a/src/genpinmap/Arduino/STM32H743XIHx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32H743XIHx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -599,7 +599,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_DP
@@ -625,7 +625,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG2_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG2_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG2_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG2_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32H743ZITx/PeripheralPins.c b/src/genpinmap/Arduino/STM32H743ZITx/PeripheralPins.c
index 407fe9f0..f5bd89ae 100644
--- a/src/genpinmap/Arduino/STM32H743ZITx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32H743ZITx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -517,7 +517,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_DP
@@ -543,7 +543,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG2_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG2_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG2_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG2_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32H750IBKx/PeripheralPins.c b/src/genpinmap/Arduino/STM32H750IBKx/PeripheralPins.c
index b054293b..83c6e308 100644
--- a/src/genpinmap/Arduino/STM32H750IBKx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32H750IBKx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -559,7 +559,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_DP
@@ -585,7 +585,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG2_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG2_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG2_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG2_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32H750VBTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32H750VBTx/PeripheralPins.c
index 1071bc51..c84498c5 100644
--- a/src/genpinmap/Arduino/STM32H750VBTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32H750VBTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -454,7 +454,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_DP
@@ -480,7 +480,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG2_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG2_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG2_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG2_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32H750XBHx/PeripheralPins.c b/src/genpinmap/Arduino/STM32H750XBHx/PeripheralPins.c
index 9c711c51..48d8d8e4 100644
--- a/src/genpinmap/Arduino/STM32H750XBHx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32H750XBHx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -599,7 +599,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_DP
@@ -625,7 +625,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG2_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG2_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG2_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG2_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32H753A(G-I)Ix/PeripheralPins.c b/src/genpinmap/Arduino/STM32H753A(G-I)Ix/PeripheralPins.c
index bdadc0b4..7c70aa74 100644
--- a/src/genpinmap/Arduino/STM32H753A(G-I)Ix/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32H753A(G-I)Ix/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -544,7 +544,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_DP
@@ -570,7 +570,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG2_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG2_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG2_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG2_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32H753BITx/PeripheralPins.c b/src/genpinmap/Arduino/STM32H753BITx/PeripheralPins.c
index f5b69560..236c68a8 100644
--- a/src/genpinmap/Arduino/STM32H753BITx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32H753BITx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -583,7 +583,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_DP
@@ -609,7 +609,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG2_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG2_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG2_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG2_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32H753IIKx/PeripheralPins.c b/src/genpinmap/Arduino/STM32H753IIKx/PeripheralPins.c
index 53d30997..b2289ae6 100644
--- a/src/genpinmap/Arduino/STM32H753IIKx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32H753IIKx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -563,7 +563,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_DP
@@ -589,7 +589,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG2_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG2_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG2_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG2_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32H753IITx/PeripheralPins.c b/src/genpinmap/Arduino/STM32H753IITx/PeripheralPins.c
index 1624bcdb..4ef6dc49 100644
--- a/src/genpinmap/Arduino/STM32H753IITx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32H753IITx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -563,7 +563,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_DP
@@ -589,7 +589,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG2_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG2_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG2_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG2_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32H753V(G-I)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32H753V(G-I)Hx/PeripheralPins.c
index 4ffd0f0d..a0d858af 100644
--- a/src/genpinmap/Arduino/STM32H753V(G-I)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32H753V(G-I)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -454,7 +454,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_DP
@@ -480,7 +480,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG2_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG2_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG2_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG2_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32H753VITx/PeripheralPins.c b/src/genpinmap/Arduino/STM32H753VITx/PeripheralPins.c
index 1216303e..77e5cf8a 100644
--- a/src/genpinmap/Arduino/STM32H753VITx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32H753VITx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -454,7 +454,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_DP
@@ -480,7 +480,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG2_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG2_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG2_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG2_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32H753XIHx/PeripheralPins.c b/src/genpinmap/Arduino/STM32H753XIHx/PeripheralPins.c
index c6b67b47..377fb988 100644
--- a/src/genpinmap/Arduino/STM32H753XIHx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32H753XIHx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -599,7 +599,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_DP
@@ -625,7 +625,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG2_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG2_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG2_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG2_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32H753ZITx/PeripheralPins.c b/src/genpinmap/Arduino/STM32H753ZITx/PeripheralPins.c
index 630d0353..b8ae9302 100644
--- a/src/genpinmap/Arduino/STM32H753ZITx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32H753ZITx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -517,7 +517,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_DP
@@ -543,7 +543,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG2_HS)}, // USB_OTG_HS_ULPI_D5
   {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG2_HS)}, // USB_OTG_HS_ULPI_D6
 #ifdef USE_USB_HS_IN_FS
-  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_HS_VBUS
+  {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
   {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG2_FS)}, // USB_OTG_HS_DM
   {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG2_FS)}, // USB_OTG_HS_DP
 #endif /* USE_USB_HS_IN_FS */
diff --git a/src/genpinmap/Arduino/STM32L010C6Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L010C6Tx/PeripheralPins.c
index 7cb8835a..3c20faac 100644
--- a/src/genpinmap/Arduino/STM32L010C6Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L010C6Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -81,6 +81,7 @@ const PinMap PinMap_I2C_SCL[] = {
 
 #ifdef HAL_TIM_MODULE_ENABLED
 const PinMap PinMap_PWM[] = {
+  {PA_0,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE, 1, 0)}, // TIM2_CH1
   {PA_1,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM2, 2, 0)}, // TIM2_CH2
   {PA_2,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM2, 3, 0)}, // TIM2_CH3
   {PA_2,  TIM21,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_TIM21, 1, 0)}, // TIM21_CH1
@@ -144,6 +145,7 @@ const PinMap PinMap_UART_RTS[] = {
 
 #ifdef HAL_UART_MODULE_ENABLED
 const PinMap PinMap_UART_CTS[] = {
+  {PA_0,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)},
   {PA_6,  LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_LPUART1)},
   {PA_7,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART2)},
   {PA_11, USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART2)},
diff --git a/src/genpinmap/Arduino/STM32L010F4Px/PeripheralPins.c b/src/genpinmap/Arduino/STM32L010F4Px/PeripheralPins.c
index 19610deb..ee40bd07 100644
--- a/src/genpinmap/Arduino/STM32L010F4Px/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L010F4Px/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L010K4Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L010K4Tx/PeripheralPins.c
index 6e8d2c76..8ddfef4a 100644
--- a/src/genpinmap/Arduino/STM32L010K4Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L010K4Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L010K8Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L010K8Tx/PeripheralPins.c
index c24a073f..191f3700 100644
--- a/src/genpinmap/Arduino/STM32L010K8Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L010K8Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L010R8Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L010R8Tx/PeripheralPins.c
index e9986bb6..32c9c7d1 100644
--- a/src/genpinmap/Arduino/STM32L010R8Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L010R8Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L010RBTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L010RBTx/PeripheralPins.c
index e55407fb..2b015a32 100644
--- a/src/genpinmap/Arduino/STM32L010RBTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L010RBTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L011D(3-4)Px/PeripheralPins.c b/src/genpinmap/Arduino/STM32L011D(3-4)Px/PeripheralPins.c
index 8c1a0fa6..3e4d3a35 100644
--- a/src/genpinmap/Arduino/STM32L011D(3-4)Px/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L011D(3-4)Px/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L011E(3-4)Yx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L011E(3-4)Yx/PeripheralPins.c
index 7115e531..959f47d2 100644
--- a/src/genpinmap/Arduino/STM32L011E(3-4)Yx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L011E(3-4)Yx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L011F(3-4)Px/PeripheralPins.c b/src/genpinmap/Arduino/STM32L011F(3-4)Px/PeripheralPins.c
index 14472362..94025b5c 100644
--- a/src/genpinmap/Arduino/STM32L011F(3-4)Px/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L011F(3-4)Px/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L011F(3-4)Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32L011F(3-4)Ux/PeripheralPins.c
index 766c353f..d3736815 100644
--- a/src/genpinmap/Arduino/STM32L011F(3-4)Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L011F(3-4)Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L011G(3-4)Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32L011G(3-4)Ux/PeripheralPins.c
index 605c0564..7d997330 100644
--- a/src/genpinmap/Arduino/STM32L011G(3-4)Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L011G(3-4)Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L011K(3-4)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L011K(3-4)Tx/PeripheralPins.c
index da962b77..6bc329cd 100644
--- a/src/genpinmap/Arduino/STM32L011K(3-4)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L011K(3-4)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L011K(3-4)Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32L011K(3-4)Ux/PeripheralPins.c
index 003e5590..da9637a5 100644
--- a/src/genpinmap/Arduino/STM32L011K(3-4)Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L011K(3-4)Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L021D4Px/PeripheralPins.c b/src/genpinmap/Arduino/STM32L021D4Px/PeripheralPins.c
index 9018cb93..e62691e5 100644
--- a/src/genpinmap/Arduino/STM32L021D4Px/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L021D4Px/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L021F4Px/PeripheralPins.c b/src/genpinmap/Arduino/STM32L021F4Px/PeripheralPins.c
index aee732e4..cb7f94f8 100644
--- a/src/genpinmap/Arduino/STM32L021F4Px/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L021F4Px/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L021F4Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32L021F4Ux/PeripheralPins.c
index 9a5f6165..2fa6de05 100644
--- a/src/genpinmap/Arduino/STM32L021F4Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L021F4Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L021G4Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32L021G4Ux/PeripheralPins.c
index 0a6578c7..4d9f69d7 100644
--- a/src/genpinmap/Arduino/STM32L021G4Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L021G4Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L021K4Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L021K4Tx/PeripheralPins.c
index 2a6222f0..d133b062 100644
--- a/src/genpinmap/Arduino/STM32L021K4Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L021K4Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L021K4Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32L021K4Ux/PeripheralPins.c
index faa1b2e2..f42f18d0 100644
--- a/src/genpinmap/Arduino/STM32L021K4Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L021K4Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L031C(4-6)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L031C(4-6)Tx/PeripheralPins.c
index b5af3af4..d93cace1 100644
--- a/src/genpinmap/Arduino/STM32L031C(4-6)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L031C(4-6)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -81,6 +81,7 @@ const PinMap PinMap_I2C_SCL[] = {
 
 #ifdef HAL_TIM_MODULE_ENABLED
 const PinMap PinMap_PWM[] = {
+  {PA_0,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE, 1, 0)}, // TIM2_CH1
   {PA_1,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM2, 2, 0)}, // TIM2_CH2
   {PA_2,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM2, 3, 0)}, // TIM2_CH3
   {PA_2,  TIM21,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_TIM21, 1, 0)}, // TIM21_CH1
@@ -150,6 +151,7 @@ const PinMap PinMap_UART_RTS[] = {
 
 #ifdef HAL_UART_MODULE_ENABLED
 const PinMap PinMap_UART_CTS[] = {
+  {PA_0,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)},
   {PA_6,  LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_LPUART1)},
   {PA_7,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART2)},
   {PA_11, USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART2)},
diff --git a/src/genpinmap/Arduino/STM32L031C6Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32L031C6Ux/PeripheralPins.c
index a2776cbc..945746cd 100644
--- a/src/genpinmap/Arduino/STM32L031C6Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L031C6Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -81,6 +81,7 @@ const PinMap PinMap_I2C_SCL[] = {
 
 #ifdef HAL_TIM_MODULE_ENABLED
 const PinMap PinMap_PWM[] = {
+  {PA_0,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE, 1, 0)}, // TIM2_CH1
   {PA_1,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM2, 2, 0)}, // TIM2_CH2
   {PA_2,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM2, 3, 0)}, // TIM2_CH3
   {PA_2,  TIM21,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_TIM21, 1, 0)}, // TIM21_CH1
@@ -150,6 +151,7 @@ const PinMap PinMap_UART_RTS[] = {
 
 #ifdef HAL_UART_MODULE_ENABLED
 const PinMap PinMap_UART_CTS[] = {
+  {PA_0,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)},
   {PA_6,  LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_LPUART1)},
   {PA_7,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART2)},
   {PA_11, USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART2)},
diff --git a/src/genpinmap/Arduino/STM32L031E(4-6)Yx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L031E(4-6)Yx/PeripheralPins.c
index 4701759c..9e43587f 100644
--- a/src/genpinmap/Arduino/STM32L031E(4-6)Yx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L031E(4-6)Yx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L031F(4-6)Px/PeripheralPins.c b/src/genpinmap/Arduino/STM32L031F(4-6)Px/PeripheralPins.c
index c6b8951e..95c6f5c7 100644
--- a/src/genpinmap/Arduino/STM32L031F(4-6)Px/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L031F(4-6)Px/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L031G(4-6)Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32L031G(4-6)Ux/PeripheralPins.c
index d0300b62..71af02cf 100644
--- a/src/genpinmap/Arduino/STM32L031G(4-6)Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L031G(4-6)Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L031G6UxS/PeripheralPins.c b/src/genpinmap/Arduino/STM32L031G6UxS/PeripheralPins.c
index 90cb309b..336e2418 100644
--- a/src/genpinmap/Arduino/STM32L031G6UxS/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L031G6UxS/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L031K(4-6)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L031K(4-6)Tx/PeripheralPins.c
index 2b849ded..8a39e525 100644
--- a/src/genpinmap/Arduino/STM32L031K(4-6)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L031K(4-6)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L031K(4-6)Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32L031K(4-6)Ux/PeripheralPins.c
index ed4625e1..b01a7eb2 100644
--- a/src/genpinmap/Arduino/STM32L031K(4-6)Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L031K(4-6)Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L041C(4-6)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L041C(4-6)Tx/PeripheralPins.c
index dc390968..f5c46a9f 100644
--- a/src/genpinmap/Arduino/STM32L041C(4-6)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L041C(4-6)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -81,6 +81,7 @@ const PinMap PinMap_I2C_SCL[] = {
 
 #ifdef HAL_TIM_MODULE_ENABLED
 const PinMap PinMap_PWM[] = {
+  {PA_0,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE, 1, 0)}, // TIM2_CH1
   {PA_1,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM2, 2, 0)}, // TIM2_CH2
   {PA_2,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM2, 3, 0)}, // TIM2_CH3
   {PA_2,  TIM21,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_TIM21, 1, 0)}, // TIM21_CH1
@@ -150,6 +151,7 @@ const PinMap PinMap_UART_RTS[] = {
 
 #ifdef HAL_UART_MODULE_ENABLED
 const PinMap PinMap_UART_CTS[] = {
+  {PA_0,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)},
   {PA_6,  LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_LPUART1)},
   {PA_7,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART2)},
   {PA_11, USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART2)},
diff --git a/src/genpinmap/Arduino/STM32L041E6Yx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L041E6Yx/PeripheralPins.c
index 3be4c265..027cf6fc 100644
--- a/src/genpinmap/Arduino/STM32L041E6Yx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L041E6Yx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L041F6Px/PeripheralPins.c b/src/genpinmap/Arduino/STM32L041F6Px/PeripheralPins.c
index 78013f35..b1d65a17 100644
--- a/src/genpinmap/Arduino/STM32L041F6Px/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L041F6Px/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L041G6Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32L041G6Ux/PeripheralPins.c
index 7e48d091..0f33f028 100644
--- a/src/genpinmap/Arduino/STM32L041G6Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L041G6Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L041G6UxS/PeripheralPins.c b/src/genpinmap/Arduino/STM32L041G6UxS/PeripheralPins.c
index d28d8041..b0763f73 100644
--- a/src/genpinmap/Arduino/STM32L041G6UxS/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L041G6UxS/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L041K6Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L041K6Tx/PeripheralPins.c
index 55108c08..abdeac5e 100644
--- a/src/genpinmap/Arduino/STM32L041K6Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L041K6Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L041K6Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32L041K6Ux/PeripheralPins.c
index 6e507d9b..cfd117af 100644
--- a/src/genpinmap/Arduino/STM32L041K6Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L041K6Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L051C(6-8)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L051C(6-8)Tx/PeripheralPins.c
index 4e33d1b1..fca92cc8 100644
--- a/src/genpinmap/Arduino/STM32L051C(6-8)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L051C(6-8)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L051K(6-8)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L051K(6-8)Tx/PeripheralPins.c
index 9ea5327d..3f242d9a 100644
--- a/src/genpinmap/Arduino/STM32L051K(6-8)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L051K(6-8)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L051K(6-8)Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32L051K(6-8)Ux/PeripheralPins.c
index a535e547..e0e08e56 100644
--- a/src/genpinmap/Arduino/STM32L051K(6-8)Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L051K(6-8)Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L051R(6-8)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L051R(6-8)Hx/PeripheralPins.c
index cffa55d7..66accbf4 100644
--- a/src/genpinmap/Arduino/STM32L051R(6-8)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L051R(6-8)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L051R(6-8)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L051R(6-8)Tx/PeripheralPins.c
index 1840f259..e0cb6b1a 100644
--- a/src/genpinmap/Arduino/STM32L051R(6-8)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L051R(6-8)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L051T(6-8)Yx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L051T(6-8)Yx/PeripheralPins.c
index b3e943d3..f608bafd 100644
--- a/src/genpinmap/Arduino/STM32L051T(6-8)Yx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L051T(6-8)Yx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L052C(6-8)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L052C(6-8)Tx/PeripheralPins.c
index 0fc549e4..fe79756d 100644
--- a/src/genpinmap/Arduino/STM32L052C(6-8)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L052C(6-8)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -208,8 +208,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
 };
diff --git a/src/genpinmap/Arduino/STM32L052K(6-8)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L052K(6-8)Tx/PeripheralPins.c
index 54e3d154..d9e4951c 100644
--- a/src/genpinmap/Arduino/STM32L052K(6-8)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L052K(6-8)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -185,8 +185,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
 };
diff --git a/src/genpinmap/Arduino/STM32L052K(6-8)Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32L052K(6-8)Ux/PeripheralPins.c
index f0d977bb..a4e2508d 100644
--- a/src/genpinmap/Arduino/STM32L052K(6-8)Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L052K(6-8)Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -186,8 +186,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
 };
diff --git a/src/genpinmap/Arduino/STM32L052R(6-8)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L052R(6-8)Hx/PeripheralPins.c
index 154140ed..e9579a96 100644
--- a/src/genpinmap/Arduino/STM32L052R(6-8)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L052R(6-8)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -221,8 +221,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {PC_9,  USB, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
diff --git a/src/genpinmap/Arduino/STM32L052R(6-8)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L052R(6-8)Tx/PeripheralPins.c
index e5c0ccca..1c63cabd 100644
--- a/src/genpinmap/Arduino/STM32L052R(6-8)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L052R(6-8)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -223,8 +223,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {PC_9,  USB, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
diff --git a/src/genpinmap/Arduino/STM32L052T(6-8)Yx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L052T(6-8)Yx/PeripheralPins.c
index 813bfc2f..2ad49741 100644
--- a/src/genpinmap/Arduino/STM32L052T(6-8)Yx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L052T(6-8)Yx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -194,8 +194,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
 };
diff --git a/src/genpinmap/Arduino/STM32L052T8Fx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L052T8Fx/PeripheralPins.c
index cb5d0423..058333f4 100644
--- a/src/genpinmap/Arduino/STM32L052T8Fx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L052T8Fx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -194,8 +194,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
 };
diff --git a/src/genpinmap/Arduino/STM32L053C(6-8)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L053C(6-8)Tx/PeripheralPins.c
index 81a19cf1..a2fc07a7 100644
--- a/src/genpinmap/Arduino/STM32L053C(6-8)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L053C(6-8)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -208,8 +208,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
 };
diff --git a/src/genpinmap/Arduino/STM32L053R(6-8)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L053R(6-8)Hx/PeripheralPins.c
index 38450ec5..ba18dada 100644
--- a/src/genpinmap/Arduino/STM32L053R(6-8)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L053R(6-8)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -221,8 +221,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {PC_9,  USB, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
diff --git a/src/genpinmap/Arduino/STM32L053R(6-8)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L053R(6-8)Tx/PeripheralPins.c
index b718479d..da34d6d3 100644
--- a/src/genpinmap/Arduino/STM32L053R(6-8)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L053R(6-8)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -223,8 +223,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {PC_9,  USB, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
diff --git a/src/genpinmap/Arduino/STM32L062K8Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L062K8Tx/PeripheralPins.c
index 01304e0c..ff984ec0 100644
--- a/src/genpinmap/Arduino/STM32L062K8Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L062K8Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -185,8 +185,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
 };
diff --git a/src/genpinmap/Arduino/STM32L062K8Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32L062K8Ux/PeripheralPins.c
index 64bb6859..62ed3b1a 100644
--- a/src/genpinmap/Arduino/STM32L062K8Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L062K8Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -186,8 +186,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
 };
diff --git a/src/genpinmap/Arduino/STM32L063C8Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L063C8Tx/PeripheralPins.c
index f42ccf5b..5591f716 100644
--- a/src/genpinmap/Arduino/STM32L063C8Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L063C8Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -208,8 +208,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
 };
diff --git a/src/genpinmap/Arduino/STM32L063R8Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L063R8Tx/PeripheralPins.c
index e8c790e5..a2d44450 100644
--- a/src/genpinmap/Arduino/STM32L063R8Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L063R8Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -223,8 +223,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {PC_9,  USB, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
diff --git a/src/genpinmap/Arduino/STM32L071C(B-Z)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L071C(B-Z)Tx/PeripheralPins.c
index 1975eafe..257b7b2a 100644
--- a/src/genpinmap/Arduino/STM32L071C(B-Z)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L071C(B-Z)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L071C(B-Z)Yx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L071C(B-Z)Yx/PeripheralPins.c
index b19a15d4..829935a9 100644
--- a/src/genpinmap/Arduino/STM32L071C(B-Z)Yx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L071C(B-Z)Yx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L071C8Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L071C8Tx/PeripheralPins.c
index 26916858..42d336ad 100644
--- a/src/genpinmap/Arduino/STM32L071C8Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L071C8Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L071K(B-Z)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L071K(B-Z)Tx/PeripheralPins.c
index ab6b3e61..663b1229 100644
--- a/src/genpinmap/Arduino/STM32L071K(B-Z)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L071K(B-Z)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L071K(B-Z)Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32L071K(B-Z)Ux/PeripheralPins.c
index 6a1107ef..28ebe624 100644
--- a/src/genpinmap/Arduino/STM32L071K(B-Z)Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L071K(B-Z)Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L071K8Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32L071K8Ux/PeripheralPins.c
index 09c2a37d..9b570f4e 100644
--- a/src/genpinmap/Arduino/STM32L071K8Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L071K8Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L071R(B-Z)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L071R(B-Z)Hx/PeripheralPins.c
index d979e2a7..40dbe9fb 100644
--- a/src/genpinmap/Arduino/STM32L071R(B-Z)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L071R(B-Z)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L071R(B-Z)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L071R(B-Z)Tx/PeripheralPins.c
index 380d6e6d..42ca747b 100644
--- a/src/genpinmap/Arduino/STM32L071R(B-Z)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L071R(B-Z)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L071V(B-Z)Ix/PeripheralPins.c b/src/genpinmap/Arduino/STM32L071V(B-Z)Ix/PeripheralPins.c
index 2c5dbcaf..38ff300c 100644
--- a/src/genpinmap/Arduino/STM32L071V(B-Z)Ix/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L071V(B-Z)Ix/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L071V(B-Z)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L071V(B-Z)Tx/PeripheralPins.c
index 136bcde8..4dcf43bb 100644
--- a/src/genpinmap/Arduino/STM32L071V(B-Z)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L071V(B-Z)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L071V8Ix/PeripheralPins.c b/src/genpinmap/Arduino/STM32L071V8Ix/PeripheralPins.c
index 97c669e8..b807ef0e 100644
--- a/src/genpinmap/Arduino/STM32L071V8Ix/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L071V8Ix/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L071V8Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L071V8Tx/PeripheralPins.c
index fecb0ae6..6137f604 100644
--- a/src/genpinmap/Arduino/STM32L071V8Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L071V8Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L072C(B-Z)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L072C(B-Z)Tx/PeripheralPins.c
index 00e1a0e4..fd67b5f1 100644
--- a/src/genpinmap/Arduino/STM32L072C(B-Z)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L072C(B-Z)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -234,8 +234,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
 };
diff --git a/src/genpinmap/Arduino/STM32L072C(B-Z)Yx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L072C(B-Z)Yx/PeripheralPins.c
index 6cf5368d..09e41879 100644
--- a/src/genpinmap/Arduino/STM32L072C(B-Z)Yx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L072C(B-Z)Yx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -242,8 +242,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
 };
diff --git a/src/genpinmap/Arduino/STM32L072CZEx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L072CZEx/PeripheralPins.c
index 08c93614..bf54617c 100644
--- a/src/genpinmap/Arduino/STM32L072CZEx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L072CZEx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -242,8 +242,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
 };
diff --git a/src/genpinmap/Arduino/STM32L072K(B-Z)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L072K(B-Z)Tx/PeripheralPins.c
index 0589ad2e..e784b97e 100644
--- a/src/genpinmap/Arduino/STM32L072K(B-Z)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L072K(B-Z)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -211,8 +211,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
 };
diff --git a/src/genpinmap/Arduino/STM32L072K(B-Z)Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32L072K(B-Z)Ux/PeripheralPins.c
index 5d790e0c..2b93315a 100644
--- a/src/genpinmap/Arduino/STM32L072K(B-Z)Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L072K(B-Z)Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -201,8 +201,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
 };
diff --git a/src/genpinmap/Arduino/STM32L072R(B-Z)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L072R(B-Z)Hx/PeripheralPins.c
index b818f0dc..07584b1e 100644
--- a/src/genpinmap/Arduino/STM32L072R(B-Z)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L072R(B-Z)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -260,8 +260,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {PC_9,  USB, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
diff --git a/src/genpinmap/Arduino/STM32L072R(B-Z)Ix/PeripheralPins.c b/src/genpinmap/Arduino/STM32L072R(B-Z)Ix/PeripheralPins.c
index 15e97617..272fa3c6 100644
--- a/src/genpinmap/Arduino/STM32L072R(B-Z)Ix/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L072R(B-Z)Ix/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -260,8 +260,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {PC_9,  USB, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
diff --git a/src/genpinmap/Arduino/STM32L072R(B-Z)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L072R(B-Z)Tx/PeripheralPins.c
index 7129adf1..7b274ca6 100644
--- a/src/genpinmap/Arduino/STM32L072R(B-Z)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L072R(B-Z)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -262,8 +262,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {PC_9,  USB, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
diff --git a/src/genpinmap/Arduino/STM32L072V(B-Z)Ix/PeripheralPins.c b/src/genpinmap/Arduino/STM32L072V(B-Z)Ix/PeripheralPins.c
index f157234a..28e34940 100644
--- a/src/genpinmap/Arduino/STM32L072V(B-Z)Ix/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L072V(B-Z)Ix/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -297,8 +297,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {PC_9,  USB, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
diff --git a/src/genpinmap/Arduino/STM32L072V(B-Z)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L072V(B-Z)Tx/PeripheralPins.c
index fe7532e8..c45a68cb 100644
--- a/src/genpinmap/Arduino/STM32L072V(B-Z)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L072V(B-Z)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -297,8 +297,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {PC_9,  USB, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
diff --git a/src/genpinmap/Arduino/STM32L072V8Ix/PeripheralPins.c b/src/genpinmap/Arduino/STM32L072V8Ix/PeripheralPins.c
index 499726e0..f7f05e1e 100644
--- a/src/genpinmap/Arduino/STM32L072V8Ix/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L072V8Ix/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -297,8 +297,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {PC_9,  USB, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
diff --git a/src/genpinmap/Arduino/STM32L072V8Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L072V8Tx/PeripheralPins.c
index e869055e..d89f0af4 100644
--- a/src/genpinmap/Arduino/STM32L072V8Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L072V8Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -297,8 +297,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {PC_9,  USB, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
diff --git a/src/genpinmap/Arduino/STM32L073C(B-Z)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L073C(B-Z)Tx/PeripheralPins.c
index 81dc6b4f..8194aed5 100644
--- a/src/genpinmap/Arduino/STM32L073C(B-Z)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L073C(B-Z)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -234,8 +234,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
 };
diff --git a/src/genpinmap/Arduino/STM32L073R(B-Z)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L073R(B-Z)Hx/PeripheralPins.c
index 3cf8f4d8..62cac50e 100644
--- a/src/genpinmap/Arduino/STM32L073R(B-Z)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L073R(B-Z)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -260,8 +260,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {PC_9,  USB, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
diff --git a/src/genpinmap/Arduino/STM32L073R(B-Z)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L073R(B-Z)Tx/PeripheralPins.c
index ae8331aa..57310f0d 100644
--- a/src/genpinmap/Arduino/STM32L073R(B-Z)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L073R(B-Z)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -262,8 +262,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {PC_9,  USB, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
diff --git a/src/genpinmap/Arduino/STM32L073RZIx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L073RZIx/PeripheralPins.c
index 3a79a560..83458da1 100644
--- a/src/genpinmap/Arduino/STM32L073RZIx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L073RZIx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -260,8 +260,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {PC_9,  USB, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
diff --git a/src/genpinmap/Arduino/STM32L073V(B-Z)Ix/PeripheralPins.c b/src/genpinmap/Arduino/STM32L073V(B-Z)Ix/PeripheralPins.c
index 387d3d09..34167aca 100644
--- a/src/genpinmap/Arduino/STM32L073V(B-Z)Ix/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L073V(B-Z)Ix/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -297,8 +297,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {PC_9,  USB, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
diff --git a/src/genpinmap/Arduino/STM32L073V(B-Z)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L073V(B-Z)Tx/PeripheralPins.c
index 0071d0cf..f8f81fa6 100644
--- a/src/genpinmap/Arduino/STM32L073V(B-Z)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L073V(B-Z)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -297,8 +297,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {PC_9,  USB, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
diff --git a/src/genpinmap/Arduino/STM32L073V8Ix/PeripheralPins.c b/src/genpinmap/Arduino/STM32L073V8Ix/PeripheralPins.c
index e69afcd4..66e00c67 100644
--- a/src/genpinmap/Arduino/STM32L073V8Ix/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L073V8Ix/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -297,8 +297,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {PC_9,  USB, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
diff --git a/src/genpinmap/Arduino/STM32L073V8Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L073V8Tx/PeripheralPins.c
index 99722994..63dd1b65 100644
--- a/src/genpinmap/Arduino/STM32L073V8Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L073V8Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -297,8 +297,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {PC_9,  USB, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
diff --git a/src/genpinmap/Arduino/STM32L081C(B-Z)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L081C(B-Z)Tx/PeripheralPins.c
index fd135bd5..94f9514a 100644
--- a/src/genpinmap/Arduino/STM32L081C(B-Z)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L081C(B-Z)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L081KZTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L081KZTx/PeripheralPins.c
index 5c06b25e..9d622e26 100644
--- a/src/genpinmap/Arduino/STM32L081KZTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L081KZTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L081KZUx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L081KZUx/PeripheralPins.c
index 615d9d9a..63769dde 100644
--- a/src/genpinmap/Arduino/STM32L081KZUx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L081KZUx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L082CZYx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L082CZYx/PeripheralPins.c
index cfe6438e..43df82ac 100644
--- a/src/genpinmap/Arduino/STM32L082CZYx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L082CZYx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -242,8 +242,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
 };
diff --git a/src/genpinmap/Arduino/STM32L082K(B-Z)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L082K(B-Z)Tx/PeripheralPins.c
index 410a22c3..24eb242a 100644
--- a/src/genpinmap/Arduino/STM32L082K(B-Z)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L082K(B-Z)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -211,8 +211,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
 };
diff --git a/src/genpinmap/Arduino/STM32L082K(B-Z)Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32L082K(B-Z)Ux/PeripheralPins.c
index 08d2f71d..935fa416 100644
--- a/src/genpinmap/Arduino/STM32L082K(B-Z)Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L082K(B-Z)Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -201,8 +201,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
 };
diff --git a/src/genpinmap/Arduino/STM32L083C(B-Z)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L083C(B-Z)Tx/PeripheralPins.c
index 6b386cf1..2cdedab8 100644
--- a/src/genpinmap/Arduino/STM32L083C(B-Z)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L083C(B-Z)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -234,8 +234,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
 };
diff --git a/src/genpinmap/Arduino/STM32L083R(B-Z)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L083R(B-Z)Hx/PeripheralPins.c
index d616a743..913d9394 100644
--- a/src/genpinmap/Arduino/STM32L083R(B-Z)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L083R(B-Z)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -260,8 +260,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {PC_9,  USB, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
diff --git a/src/genpinmap/Arduino/STM32L083R(B-Z)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L083R(B-Z)Tx/PeripheralPins.c
index 0b9d0b47..4c404402 100644
--- a/src/genpinmap/Arduino/STM32L083R(B-Z)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L083R(B-Z)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -262,8 +262,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {PC_9,  USB, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
diff --git a/src/genpinmap/Arduino/STM32L083V(B-Z)Ix/PeripheralPins.c b/src/genpinmap/Arduino/STM32L083V(B-Z)Ix/PeripheralPins.c
index a53d8e37..aa5f73ec 100644
--- a/src/genpinmap/Arduino/STM32L083V(B-Z)Ix/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L083V(B-Z)Ix/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -297,8 +297,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {PC_9,  USB, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
diff --git a/src/genpinmap/Arduino/STM32L083V(B-Z)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L083V(B-Z)Tx/PeripheralPins.c
index 577d7b59..09a7c6ce 100644
--- a/src/genpinmap/Arduino/STM32L083V(B-Z)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L083V(B-Z)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -297,8 +297,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {PC_9,  USB, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
diff --git a/src/genpinmap/Arduino/STM32L083V8Ix/PeripheralPins.c b/src/genpinmap/Arduino/STM32L083V8Ix/PeripheralPins.c
index 208802b4..827aa90f 100644
--- a/src/genpinmap/Arduino/STM32L083V8Ix/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L083V8Ix/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -297,8 +297,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {PC_9,  USB, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
diff --git a/src/genpinmap/Arduino/STM32L083V8Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L083V8Tx/PeripheralPins.c
index 2378477a..7e5e4def 100644
--- a/src/genpinmap/Arduino/STM32L083V8Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L083V8Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -297,8 +297,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {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_AF2_USB)}, // USB_NOE
   {PC_9,  USB, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_USB)}, // USB_NOE
   {NC,    NP,    0}
diff --git a/src/genpinmap/Arduino/STM32L100C6Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32L100C6Ux/PeripheralPins.c
index 0ab41c9f..683d7e8b 100644
--- a/src/genpinmap/Arduino/STM32L100C6Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L100C6Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L100C6UxA/PeripheralPins.c b/src/genpinmap/Arduino/STM32L100C6UxA/PeripheralPins.c
index ad5df772..cc150530 100644
--- a/src/genpinmap/Arduino/STM32L100C6UxA/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L100C6UxA/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L100R(8-B)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L100R(8-B)Tx/PeripheralPins.c
index 1d2e6339..22cd3ed9 100644
--- a/src/genpinmap/Arduino/STM32L100R(8-B)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L100R(8-B)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L100R(8-B)TxA/PeripheralPins.c b/src/genpinmap/Arduino/STM32L100R(8-B)TxA/PeripheralPins.c
index a595450c..8d46731c 100644
--- a/src/genpinmap/Arduino/STM32L100R(8-B)TxA/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L100R(8-B)TxA/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L100RCTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L100RCTx/PeripheralPins.c
index 70bc502a..d93b840a 100644
--- a/src/genpinmap/Arduino/STM32L100RCTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L100RCTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L151C(6-8-B)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L151C(6-8-B)Tx/PeripheralPins.c
index a38c0c5a..aa5d83a6 100644
--- a/src/genpinmap/Arduino/STM32L151C(6-8-B)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L151C(6-8-B)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L151C(6-8-B)TxA/PeripheralPins.c b/src/genpinmap/Arduino/STM32L151C(6-8-B)TxA/PeripheralPins.c
index ec063b71..7ef7f17a 100644
--- a/src/genpinmap/Arduino/STM32L151C(6-8-B)TxA/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L151C(6-8-B)TxA/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L151C(6-8-B)Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32L151C(6-8-B)Ux/PeripheralPins.c
index 449dda9b..46ac974c 100644
--- a/src/genpinmap/Arduino/STM32L151C(6-8-B)Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L151C(6-8-B)Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L151C(6-8-B)UxA/PeripheralPins.c b/src/genpinmap/Arduino/STM32L151C(6-8-B)UxA/PeripheralPins.c
index fb19b3a9..481b6280 100644
--- a/src/genpinmap/Arduino/STM32L151C(6-8-B)UxA/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L151C(6-8-B)UxA/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L151CCTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L151CCTx/PeripheralPins.c
index 7fe38f1b..d991c1f3 100644
--- a/src/genpinmap/Arduino/STM32L151CCTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L151CCTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L151CCUx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L151CCUx/PeripheralPins.c
index 9951248e..c8d4361c 100644
--- a/src/genpinmap/Arduino/STM32L151CCUx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L151CCUx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L151QCHx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L151QCHx/PeripheralPins.c
index 9de5bc9f..2d30b269 100644
--- a/src/genpinmap/Arduino/STM32L151QCHx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L151QCHx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -166,6 +166,7 @@ const PinMap PinMap_PWM[] = {
   {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,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 1, 0)}, // TIM9_CH1
+  {PE_6,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE, 2, 0)}, // TIM9_CH2
   {PE_9,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
   {PE_10, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
   {PE_11, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
diff --git a/src/genpinmap/Arduino/STM32L151QDHx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L151QDHx/PeripheralPins.c
index 51fe7248..c9fcf564 100644
--- a/src/genpinmap/Arduino/STM32L151QDHx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L151QDHx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -166,6 +166,7 @@ const PinMap PinMap_PWM[] = {
   {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,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 1, 0)}, // TIM9_CH1
+  {PE_6,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE, 2, 0)}, // TIM9_CH2
   {PE_9,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
   {PE_10, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
   {PE_11, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
diff --git a/src/genpinmap/Arduino/STM32L151QEHx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L151QEHx/PeripheralPins.c
index 7fa92021..047ebf62 100644
--- a/src/genpinmap/Arduino/STM32L151QEHx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L151QEHx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L151R(6-8-B)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L151R(6-8-B)Hx/PeripheralPins.c
index b080df5d..73abe492 100644
--- a/src/genpinmap/Arduino/STM32L151R(6-8-B)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L151R(6-8-B)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L151R(6-8-B)HxA/PeripheralPins.c b/src/genpinmap/Arduino/STM32L151R(6-8-B)HxA/PeripheralPins.c
index 77189df7..ad4f8474 100644
--- a/src/genpinmap/Arduino/STM32L151R(6-8-B)HxA/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L151R(6-8-B)HxA/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L151R(6-8-B)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L151R(6-8-B)Tx/PeripheralPins.c
index e294d3ba..038078f5 100644
--- a/src/genpinmap/Arduino/STM32L151R(6-8-B)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L151R(6-8-B)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L151R(6-8-B)TxA/PeripheralPins.c b/src/genpinmap/Arduino/STM32L151R(6-8-B)TxA/PeripheralPins.c
index f4f29d13..cf2cbc41 100644
--- a/src/genpinmap/Arduino/STM32L151R(6-8-B)TxA/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L151R(6-8-B)TxA/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L151RCTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L151RCTx/PeripheralPins.c
index 27cdb256..4c3f826f 100644
--- a/src/genpinmap/Arduino/STM32L151RCTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L151RCTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L151RCTxA/PeripheralPins.c b/src/genpinmap/Arduino/STM32L151RCTxA/PeripheralPins.c
index 15d6889d..8bd30578 100644
--- a/src/genpinmap/Arduino/STM32L151RCTxA/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L151RCTxA/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L151RCYx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L151RCYx/PeripheralPins.c
index 047476c0..56d48c64 100644
--- a/src/genpinmap/Arduino/STM32L151RCYx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L151RCYx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L151RDTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L151RDTx/PeripheralPins.c
index c1ecac0c..5667117f 100644
--- a/src/genpinmap/Arduino/STM32L151RDTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L151RDTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L151RDYx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L151RDYx/PeripheralPins.c
index 1f008924..cf32b83f 100644
--- a/src/genpinmap/Arduino/STM32L151RDYx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L151RDYx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L151RETx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L151RETx/PeripheralPins.c
index fdab9fd7..c916ff09 100644
--- a/src/genpinmap/Arduino/STM32L151RETx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L151RETx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L151UCYx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L151UCYx/PeripheralPins.c
index 18155a53..39990944 100644
--- a/src/genpinmap/Arduino/STM32L151UCYx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L151UCYx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L151V(8-B)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L151V(8-B)Hx/PeripheralPins.c
index 0761a805..e3f808f8 100644
--- a/src/genpinmap/Arduino/STM32L151V(8-B)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L151V(8-B)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L151V(8-B)HxA/PeripheralPins.c b/src/genpinmap/Arduino/STM32L151V(8-B)HxA/PeripheralPins.c
index caf32da5..69115779 100644
--- a/src/genpinmap/Arduino/STM32L151V(8-B)HxA/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L151V(8-B)HxA/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L151V(8-B)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L151V(8-B)Tx/PeripheralPins.c
index 399053e0..a3a08789 100644
--- a/src/genpinmap/Arduino/STM32L151V(8-B)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L151V(8-B)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L151V(8-B)TxA/PeripheralPins.c b/src/genpinmap/Arduino/STM32L151V(8-B)TxA/PeripheralPins.c
index 401df3b6..3b5ee563 100644
--- a/src/genpinmap/Arduino/STM32L151V(8-B)TxA/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L151V(8-B)TxA/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L151VCHx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L151VCHx/PeripheralPins.c
index f4b5c7a0..0cb816d3 100644
--- a/src/genpinmap/Arduino/STM32L151VCHx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L151VCHx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L151VCTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L151VCTx/PeripheralPins.c
index 36f15252..afed4f51 100644
--- a/src/genpinmap/Arduino/STM32L151VCTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L151VCTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L151VCTxA/PeripheralPins.c b/src/genpinmap/Arduino/STM32L151VCTxA/PeripheralPins.c
index bfcbd245..cde3a296 100644
--- a/src/genpinmap/Arduino/STM32L151VCTxA/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L151VCTxA/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -151,6 +151,7 @@ const PinMap PinMap_PWM[] = {
   {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,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 1, 0)}, // TIM9_CH1
+  {PE_6,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE, 2, 0)}, // TIM9_CH2
   {PE_9,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
   {PE_10, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
   {PE_11, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
diff --git a/src/genpinmap/Arduino/STM32L151VDTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L151VDTx/PeripheralPins.c
index 034e0520..95848240 100644
--- a/src/genpinmap/Arduino/STM32L151VDTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L151VDTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -151,6 +151,7 @@ const PinMap PinMap_PWM[] = {
   {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,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 1, 0)}, // TIM9_CH1
+  {PE_6,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE, 2, 0)}, // TIM9_CH2
   {PE_9,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
   {PE_10, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
   {PE_11, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
diff --git a/src/genpinmap/Arduino/STM32L151VDTxX/PeripheralPins.c b/src/genpinmap/Arduino/STM32L151VDTxX/PeripheralPins.c
index da8669a4..2eaa59f7 100644
--- a/src/genpinmap/Arduino/STM32L151VDTxX/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L151VDTxX/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L151VDYxX/PeripheralPins.c b/src/genpinmap/Arduino/STM32L151VDYxX/PeripheralPins.c
index 5551fc1c..d3c53b54 100644
--- a/src/genpinmap/Arduino/STM32L151VDYxX/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L151VDYxX/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L151VETx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L151VETx/PeripheralPins.c
index 0b482a3e..088c044c 100644
--- a/src/genpinmap/Arduino/STM32L151VETx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L151VETx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L151VEYx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L151VEYx/PeripheralPins.c
index 590e143d..cd74025b 100644
--- a/src/genpinmap/Arduino/STM32L151VEYx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L151VEYx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L151ZCTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L151ZCTx/PeripheralPins.c
index a04163f0..2d53c9c4 100644
--- a/src/genpinmap/Arduino/STM32L151ZCTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L151ZCTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -167,6 +167,7 @@ const PinMap PinMap_PWM[] = {
   {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,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 1, 0)}, // TIM9_CH1
+  {PE_6,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE, 2, 0)}, // TIM9_CH2
   {PE_9,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
   {PE_10, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
   {PE_11, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
diff --git a/src/genpinmap/Arduino/STM32L151ZDTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L151ZDTx/PeripheralPins.c
index 6e0fc73c..b80f9ca0 100644
--- a/src/genpinmap/Arduino/STM32L151ZDTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L151ZDTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -167,6 +167,7 @@ const PinMap PinMap_PWM[] = {
   {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,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 1, 0)}, // TIM9_CH1
+  {PE_6,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE, 2, 0)}, // TIM9_CH2
   {PE_9,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
   {PE_10, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
   {PE_11, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
diff --git a/src/genpinmap/Arduino/STM32L151ZETx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L151ZETx/PeripheralPins.c
index a99772ab..ed4239fe 100644
--- a/src/genpinmap/Arduino/STM32L151ZETx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L151ZETx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L152C(6-8-B)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L152C(6-8-B)Tx/PeripheralPins.c
index 1cb13211..46463fe6 100644
--- a/src/genpinmap/Arduino/STM32L152C(6-8-B)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L152C(6-8-B)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L152C(6-8-B)TxA/PeripheralPins.c b/src/genpinmap/Arduino/STM32L152C(6-8-B)TxA/PeripheralPins.c
index d94b445b..c099d494 100644
--- a/src/genpinmap/Arduino/STM32L152C(6-8-B)TxA/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L152C(6-8-B)TxA/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L152C(6-8-B)Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32L152C(6-8-B)Ux/PeripheralPins.c
index 1ac14c42..09cd4bc3 100644
--- a/src/genpinmap/Arduino/STM32L152C(6-8-B)Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L152C(6-8-B)Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L152C(6-8-B)UxA/PeripheralPins.c b/src/genpinmap/Arduino/STM32L152C(6-8-B)UxA/PeripheralPins.c
index 86ab7d6f..95b3226f 100644
--- a/src/genpinmap/Arduino/STM32L152C(6-8-B)UxA/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L152C(6-8-B)UxA/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L152CCTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L152CCTx/PeripheralPins.c
index 7cfffb32..1b24c496 100644
--- a/src/genpinmap/Arduino/STM32L152CCTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L152CCTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L152CCUx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L152CCUx/PeripheralPins.c
index d9d15c7d..00e2c36b 100644
--- a/src/genpinmap/Arduino/STM32L152CCUx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L152CCUx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L152QCHx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L152QCHx/PeripheralPins.c
index 7052fc8c..4bf44ff8 100644
--- a/src/genpinmap/Arduino/STM32L152QCHx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L152QCHx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -166,6 +166,7 @@ const PinMap PinMap_PWM[] = {
   {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,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 1, 0)}, // TIM9_CH1
+  {PE_6,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE, 2, 0)}, // TIM9_CH2
   {PE_9,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
   {PE_10, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
   {PE_11, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
diff --git a/src/genpinmap/Arduino/STM32L152QDHx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L152QDHx/PeripheralPins.c
index de7bdd91..7156bbce 100644
--- a/src/genpinmap/Arduino/STM32L152QDHx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L152QDHx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -166,6 +166,7 @@ const PinMap PinMap_PWM[] = {
   {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,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 1, 0)}, // TIM9_CH1
+  {PE_6,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE, 2, 0)}, // TIM9_CH2
   {PE_9,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
   {PE_10, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
   {PE_11, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
diff --git a/src/genpinmap/Arduino/STM32L152QEHx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L152QEHx/PeripheralPins.c
index 7f1f71ac..f4a7948b 100644
--- a/src/genpinmap/Arduino/STM32L152QEHx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L152QEHx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L152R(6-8-B)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L152R(6-8-B)Hx/PeripheralPins.c
index 6dd6fe21..0246263e 100644
--- a/src/genpinmap/Arduino/STM32L152R(6-8-B)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L152R(6-8-B)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L152R(6-8-B)HxA/PeripheralPins.c b/src/genpinmap/Arduino/STM32L152R(6-8-B)HxA/PeripheralPins.c
index 1bf8cb1a..8fb498c6 100644
--- a/src/genpinmap/Arduino/STM32L152R(6-8-B)HxA/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L152R(6-8-B)HxA/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L152R(6-8-B)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L152R(6-8-B)Tx/PeripheralPins.c
index 28253426..f86974bb 100644
--- a/src/genpinmap/Arduino/STM32L152R(6-8-B)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L152R(6-8-B)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L152R(6-8-B)TxA/PeripheralPins.c b/src/genpinmap/Arduino/STM32L152R(6-8-B)TxA/PeripheralPins.c
index 36f1f52d..51dc3e76 100644
--- a/src/genpinmap/Arduino/STM32L152R(6-8-B)TxA/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L152R(6-8-B)TxA/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L152RCTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L152RCTx/PeripheralPins.c
index b7d4c6f9..8d735d83 100644
--- a/src/genpinmap/Arduino/STM32L152RCTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L152RCTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L152RCTxA/PeripheralPins.c b/src/genpinmap/Arduino/STM32L152RCTxA/PeripheralPins.c
index e9c7b712..12e968a4 100644
--- a/src/genpinmap/Arduino/STM32L152RCTxA/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L152RCTxA/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L152RDTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L152RDTx/PeripheralPins.c
index 55899997..21245f87 100644
--- a/src/genpinmap/Arduino/STM32L152RDTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L152RDTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L152RDYx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L152RDYx/PeripheralPins.c
index 35eb7826..a41d9239 100644
--- a/src/genpinmap/Arduino/STM32L152RDYx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L152RDYx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L152RETx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L152RETx/PeripheralPins.c
index aec2a886..f4010134 100644
--- a/src/genpinmap/Arduino/STM32L152RETx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L152RETx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -245,8 +245,8 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB[] = {
-  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DM
-  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_DP
+  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF10_USB)}, // USB_DM
+  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF10_USB)}, // USB_DP
   {NC,    NP,    0}
 };
 #endif
diff --git a/src/genpinmap/Arduino/STM32L152UCYx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L152UCYx/PeripheralPins.c
index c918e5d8..a346d0c1 100644
--- a/src/genpinmap/Arduino/STM32L152UCYx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L152UCYx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L152V(8-B)Hx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L152V(8-B)Hx/PeripheralPins.c
index 1f1c11b4..06e03853 100644
--- a/src/genpinmap/Arduino/STM32L152V(8-B)Hx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L152V(8-B)Hx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L152V(8-B)HxA/PeripheralPins.c b/src/genpinmap/Arduino/STM32L152V(8-B)HxA/PeripheralPins.c
index 90b5e0fa..691a403f 100644
--- a/src/genpinmap/Arduino/STM32L152V(8-B)HxA/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L152V(8-B)HxA/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L152V(8-B)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L152V(8-B)Tx/PeripheralPins.c
index adbe3dec..50b7dc1b 100644
--- a/src/genpinmap/Arduino/STM32L152V(8-B)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L152V(8-B)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L152V(8-B)TxA/PeripheralPins.c b/src/genpinmap/Arduino/STM32L152V(8-B)TxA/PeripheralPins.c
index 00ff102c..135ed33e 100644
--- a/src/genpinmap/Arduino/STM32L152V(8-B)TxA/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L152V(8-B)TxA/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L152VCHx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L152VCHx/PeripheralPins.c
index 8cc2cb03..31bfc475 100644
--- a/src/genpinmap/Arduino/STM32L152VCHx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L152VCHx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L152VCTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L152VCTx/PeripheralPins.c
index d0d8b448..7537b4fa 100644
--- a/src/genpinmap/Arduino/STM32L152VCTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L152VCTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L152VCTxA/PeripheralPins.c b/src/genpinmap/Arduino/STM32L152VCTxA/PeripheralPins.c
index c9f3ab92..f20f744f 100644
--- a/src/genpinmap/Arduino/STM32L152VCTxA/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L152VCTxA/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -151,6 +151,7 @@ const PinMap PinMap_PWM[] = {
   {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,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 1, 0)}, // TIM9_CH1
+  {PE_6,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE, 2, 0)}, // TIM9_CH2
   {PE_9,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
   {PE_10, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
   {PE_11, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
diff --git a/src/genpinmap/Arduino/STM32L152VDTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L152VDTx/PeripheralPins.c
index 10e1970c..e04da7bd 100644
--- a/src/genpinmap/Arduino/STM32L152VDTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L152VDTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -151,6 +151,7 @@ const PinMap PinMap_PWM[] = {
   {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,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 1, 0)}, // TIM9_CH1
+  {PE_6,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE, 2, 0)}, // TIM9_CH2
   {PE_9,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
   {PE_10, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
   {PE_11, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
diff --git a/src/genpinmap/Arduino/STM32L152VDTxX/PeripheralPins.c b/src/genpinmap/Arduino/STM32L152VDTxX/PeripheralPins.c
index be2e86fc..138f4d80 100644
--- a/src/genpinmap/Arduino/STM32L152VDTxX/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L152VDTxX/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L152VETx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L152VETx/PeripheralPins.c
index 9ad34063..865a3b4c 100644
--- a/src/genpinmap/Arduino/STM32L152VETx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L152VETx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L152VEYx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L152VEYx/PeripheralPins.c
index 0cc42ed0..89a3f9e4 100644
--- a/src/genpinmap/Arduino/STM32L152VEYx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L152VEYx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L152ZCTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L152ZCTx/PeripheralPins.c
index e167b815..57668a9d 100644
--- a/src/genpinmap/Arduino/STM32L152ZCTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L152ZCTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -167,6 +167,7 @@ const PinMap PinMap_PWM[] = {
   {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,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 1, 0)}, // TIM9_CH1
+  {PE_6,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE, 2, 0)}, // TIM9_CH2
   {PE_9,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
   {PE_10, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
   {PE_11, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
diff --git a/src/genpinmap/Arduino/STM32L152ZDTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L152ZDTx/PeripheralPins.c
index 8064452c..f298ceae 100644
--- a/src/genpinmap/Arduino/STM32L152ZDTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L152ZDTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -167,6 +167,7 @@ const PinMap PinMap_PWM[] = {
   {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,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 1, 0)}, // TIM9_CH1
+  {PE_6,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE, 2, 0)}, // TIM9_CH2
   {PE_9,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
   {PE_10, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
   {PE_11, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
diff --git a/src/genpinmap/Arduino/STM32L152ZETx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L152ZETx/PeripheralPins.c
index de3a4e07..2d081fde 100644
--- a/src/genpinmap/Arduino/STM32L152ZETx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L152ZETx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L162QDHx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L162QDHx/PeripheralPins.c
index 44bbfd06..e9e0ba3c 100644
--- a/src/genpinmap/Arduino/STM32L162QDHx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L162QDHx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -166,6 +166,7 @@ const PinMap PinMap_PWM[] = {
   {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,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 1, 0)}, // TIM9_CH1
+  {PE_6,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE, 2, 0)}, // TIM9_CH2
   {PE_9,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
   {PE_10, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
   {PE_11, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
diff --git a/src/genpinmap/Arduino/STM32L162RCTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L162RCTx/PeripheralPins.c
index bf9b000e..8fdac53a 100644
--- a/src/genpinmap/Arduino/STM32L162RCTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L162RCTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L162RCTxA/PeripheralPins.c b/src/genpinmap/Arduino/STM32L162RCTxA/PeripheralPins.c
index 0c19ac69..c7145ac2 100644
--- a/src/genpinmap/Arduino/STM32L162RCTxA/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L162RCTxA/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L162RDTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L162RDTx/PeripheralPins.c
index 34911ee7..528b570f 100644
--- a/src/genpinmap/Arduino/STM32L162RDTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L162RDTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L162RDYx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L162RDYx/PeripheralPins.c
index 6ec6579b..c2523376 100644
--- a/src/genpinmap/Arduino/STM32L162RDYx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L162RDYx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L162RETx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L162RETx/PeripheralPins.c
index 3dbba3b5..f3e43a8c 100644
--- a/src/genpinmap/Arduino/STM32L162RETx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L162RETx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L162VCHx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L162VCHx/PeripheralPins.c
index dc060371..c1891cfa 100644
--- a/src/genpinmap/Arduino/STM32L162VCHx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L162VCHx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L162VCTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L162VCTx/PeripheralPins.c
index 10ee9a87..3007eb8b 100644
--- a/src/genpinmap/Arduino/STM32L162VCTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L162VCTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L162VCTxA/PeripheralPins.c b/src/genpinmap/Arduino/STM32L162VCTxA/PeripheralPins.c
index fe9b7875..123bca0c 100644
--- a/src/genpinmap/Arduino/STM32L162VCTxA/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L162VCTxA/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -151,6 +151,7 @@ const PinMap PinMap_PWM[] = {
   {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,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 1, 0)}, // TIM9_CH1
+  {PE_6,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE, 2, 0)}, // TIM9_CH2
   {PE_9,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
   {PE_10, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
   {PE_11, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
diff --git a/src/genpinmap/Arduino/STM32L162VDTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L162VDTx/PeripheralPins.c
index 9057a29e..aab1a80d 100644
--- a/src/genpinmap/Arduino/STM32L162VDTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L162VDTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -151,6 +151,7 @@ const PinMap PinMap_PWM[] = {
   {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,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 1, 0)}, // TIM9_CH1
+  {PE_6,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE, 2, 0)}, // TIM9_CH2
   {PE_9,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
   {PE_10, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
   {PE_11, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
diff --git a/src/genpinmap/Arduino/STM32L162VDYxX/PeripheralPins.c b/src/genpinmap/Arduino/STM32L162VDYxX/PeripheralPins.c
index cb8bf95d..c78ba11d 100644
--- a/src/genpinmap/Arduino/STM32L162VDYxX/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L162VDYxX/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L162VETx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L162VETx/PeripheralPins.c
index 17974591..96f4af6e 100644
--- a/src/genpinmap/Arduino/STM32L162VETx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L162VETx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L162VEYx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L162VEYx/PeripheralPins.c
index 8d8617f3..fc2340fc 100644
--- a/src/genpinmap/Arduino/STM32L162VEYx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L162VEYx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L162ZDTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L162ZDTx/PeripheralPins.c
index 1e1fb48b..3ff5b8d4 100644
--- a/src/genpinmap/Arduino/STM32L162ZDTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L162ZDTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -167,6 +167,7 @@ const PinMap PinMap_PWM[] = {
   {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,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 1, 0)}, // TIM9_CH1
+  {PE_6,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE, 2, 0)}, // TIM9_CH2
   {PE_9,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
   {PE_10, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
   {PE_11, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
diff --git a/src/genpinmap/Arduino/STM32L162ZETx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L162ZETx/PeripheralPins.c
index d0ea2b80..7ff54d7f 100644
--- a/src/genpinmap/Arduino/STM32L162ZETx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L162ZETx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L412C8Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L412C8Tx/PeripheralPins.c
index 96568e43..f65f31ca 100644
--- a/src/genpinmap/Arduino/STM32L412C8Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L412C8Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -95,6 +95,7 @@ const PinMap PinMap_I2C_SCL[] = {
 
 #ifdef HAL_TIM_MODULE_ENABLED
 const PinMap PinMap_PWM[] = {
+  {PA_0,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE, 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,  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
@@ -169,6 +170,7 @@ const PinMap PinMap_UART_RTS[] = {
 
 #ifdef HAL_UART_MODULE_ENABLED
 const PinMap PinMap_UART_CTS[] = {
+  {PA_0,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)},
   {PA_6,  LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
   {PA_6,  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)},
diff --git a/src/genpinmap/Arduino/STM32L412C8Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32L412C8Ux/PeripheralPins.c
index 15e91d5b..bf5a8095 100644
--- a/src/genpinmap/Arduino/STM32L412C8Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L412C8Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -95,6 +95,7 @@ const PinMap PinMap_I2C_SCL[] = {
 
 #ifdef HAL_TIM_MODULE_ENABLED
 const PinMap PinMap_PWM[] = {
+  {PA_0,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE, 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,  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
@@ -169,6 +170,7 @@ const PinMap PinMap_UART_RTS[] = {
 
 #ifdef HAL_UART_MODULE_ENABLED
 const PinMap PinMap_UART_CTS[] = {
+  {PA_0,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)},
   {PA_6,  LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
   {PA_6,  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)},
diff --git a/src/genpinmap/Arduino/STM32L412CBTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L412CBTx/PeripheralPins.c
index c79d27a1..55104e5f 100644
--- a/src/genpinmap/Arduino/STM32L412CBTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L412CBTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -95,6 +95,7 @@ const PinMap PinMap_I2C_SCL[] = {
 
 #ifdef HAL_TIM_MODULE_ENABLED
 const PinMap PinMap_PWM[] = {
+  {PA_0,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE, 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,  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
@@ -169,6 +170,7 @@ const PinMap PinMap_UART_RTS[] = {
 
 #ifdef HAL_UART_MODULE_ENABLED
 const PinMap PinMap_UART_CTS[] = {
+  {PA_0,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)},
   {PA_6,  LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
   {PA_6,  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)},
diff --git a/src/genpinmap/Arduino/STM32L412CBTxP/PeripheralPins.c b/src/genpinmap/Arduino/STM32L412CBTxP/PeripheralPins.c
index e6c2c671..904ae74f 100644
--- a/src/genpinmap/Arduino/STM32L412CBTxP/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L412CBTxP/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -93,6 +93,7 @@ const PinMap PinMap_I2C_SCL[] = {
 
 #ifdef HAL_TIM_MODULE_ENABLED
 const PinMap PinMap_PWM[] = {
+  {PA_0,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE, 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,  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
@@ -163,6 +164,7 @@ const PinMap PinMap_UART_RTS[] = {
 
 #ifdef HAL_UART_MODULE_ENABLED
 const PinMap PinMap_UART_CTS[] = {
+  {PA_0,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)},
   {PA_6,  LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
   {PA_6,  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)},
diff --git a/src/genpinmap/Arduino/STM32L412CBUx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L412CBUx/PeripheralPins.c
index 2d7a2bc8..99fe5104 100644
--- a/src/genpinmap/Arduino/STM32L412CBUx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L412CBUx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -95,6 +95,7 @@ const PinMap PinMap_I2C_SCL[] = {
 
 #ifdef HAL_TIM_MODULE_ENABLED
 const PinMap PinMap_PWM[] = {
+  {PA_0,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE, 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,  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
@@ -169,6 +170,7 @@ const PinMap PinMap_UART_RTS[] = {
 
 #ifdef HAL_UART_MODULE_ENABLED
 const PinMap PinMap_UART_CTS[] = {
+  {PA_0,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)},
   {PA_6,  LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
   {PA_6,  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)},
diff --git a/src/genpinmap/Arduino/STM32L412CBUxP/PeripheralPins.c b/src/genpinmap/Arduino/STM32L412CBUxP/PeripheralPins.c
index 42c38176..32258cd5 100644
--- a/src/genpinmap/Arduino/STM32L412CBUxP/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L412CBUxP/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -93,6 +93,7 @@ const PinMap PinMap_I2C_SCL[] = {
 
 #ifdef HAL_TIM_MODULE_ENABLED
 const PinMap PinMap_PWM[] = {
+  {PA_0,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE, 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,  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
@@ -163,6 +164,7 @@ const PinMap PinMap_UART_RTS[] = {
 
 #ifdef HAL_UART_MODULE_ENABLED
 const PinMap PinMap_UART_CTS[] = {
+  {PA_0,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)},
   {PA_6,  LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
   {PA_6,  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)},
diff --git a/src/genpinmap/Arduino/STM32L412K8Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L412K8Tx/PeripheralPins.c
index b4d14433..3ff08283 100644
--- a/src/genpinmap/Arduino/STM32L412K8Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L412K8Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L412K8Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32L412K8Ux/PeripheralPins.c
index d88bdbd6..4d4ca110 100644
--- a/src/genpinmap/Arduino/STM32L412K8Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L412K8Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L412KBTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L412KBTx/PeripheralPins.c
index 81ac50e3..9cedd349 100644
--- a/src/genpinmap/Arduino/STM32L412KBTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L412KBTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L412KBUx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L412KBUx/PeripheralPins.c
index e9b37b63..08d29c45 100644
--- a/src/genpinmap/Arduino/STM32L412KBUx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L412KBUx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L412R8Ix/PeripheralPins.c b/src/genpinmap/Arduino/STM32L412R8Ix/PeripheralPins.c
index 23614175..a311286b 100644
--- a/src/genpinmap/Arduino/STM32L412R8Ix/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L412R8Ix/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -109,6 +109,7 @@ const PinMap PinMap_I2C_SCL[] = {
 
 #ifdef HAL_TIM_MODULE_ENABLED
 const PinMap PinMap_PWM[] = {
+  {PA_0,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE, 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,  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
@@ -190,6 +191,7 @@ const PinMap PinMap_UART_RTS[] = {
 
 #ifdef HAL_UART_MODULE_ENABLED
 const PinMap PinMap_UART_CTS[] = {
+  {PA_0,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)},
   {PA_6,  LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
   {PA_6,  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)},
diff --git a/src/genpinmap/Arduino/STM32L412R8Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L412R8Tx/PeripheralPins.c
index 4d105465..56704b2a 100644
--- a/src/genpinmap/Arduino/STM32L412R8Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L412R8Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -109,6 +109,7 @@ const PinMap PinMap_I2C_SCL[] = {
 
 #ifdef HAL_TIM_MODULE_ENABLED
 const PinMap PinMap_PWM[] = {
+  {PA_0,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE, 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,  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
@@ -190,6 +191,7 @@ const PinMap PinMap_UART_RTS[] = {
 
 #ifdef HAL_UART_MODULE_ENABLED
 const PinMap PinMap_UART_CTS[] = {
+  {PA_0,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)},
   {PA_6,  LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
   {PA_6,  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)},
diff --git a/src/genpinmap/Arduino/STM32L412RBIx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L412RBIx/PeripheralPins.c
index a87698af..23dd8fb4 100644
--- a/src/genpinmap/Arduino/STM32L412RBIx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L412RBIx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -109,6 +109,7 @@ const PinMap PinMap_I2C_SCL[] = {
 
 #ifdef HAL_TIM_MODULE_ENABLED
 const PinMap PinMap_PWM[] = {
+  {PA_0,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE, 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,  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
@@ -190,6 +191,7 @@ const PinMap PinMap_UART_RTS[] = {
 
 #ifdef HAL_UART_MODULE_ENABLED
 const PinMap PinMap_UART_CTS[] = {
+  {PA_0,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)},
   {PA_6,  LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
   {PA_6,  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)},
diff --git a/src/genpinmap/Arduino/STM32L412RBIxP/PeripheralPins.c b/src/genpinmap/Arduino/STM32L412RBIxP/PeripheralPins.c
index 1ed07ed0..dfa29f19 100644
--- a/src/genpinmap/Arduino/STM32L412RBIxP/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L412RBIxP/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -107,6 +107,7 @@ const PinMap PinMap_I2C_SCL[] = {
 
 #ifdef HAL_TIM_MODULE_ENABLED
 const PinMap PinMap_PWM[] = {
+  {PA_0,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE, 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,  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
@@ -186,6 +187,7 @@ const PinMap PinMap_UART_RTS[] = {
 
 #ifdef HAL_UART_MODULE_ENABLED
 const PinMap PinMap_UART_CTS[] = {
+  {PA_0,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)},
   {PA_6,  LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
   {PA_6,  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)},
diff --git a/src/genpinmap/Arduino/STM32L412RBTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L412RBTx/PeripheralPins.c
index 4e3a2c2f..c22e23bf 100644
--- a/src/genpinmap/Arduino/STM32L412RBTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L412RBTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -109,6 +109,7 @@ const PinMap PinMap_I2C_SCL[] = {
 
 #ifdef HAL_TIM_MODULE_ENABLED
 const PinMap PinMap_PWM[] = {
+  {PA_0,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE, 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,  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
@@ -190,6 +191,7 @@ const PinMap PinMap_UART_RTS[] = {
 
 #ifdef HAL_UART_MODULE_ENABLED
 const PinMap PinMap_UART_CTS[] = {
+  {PA_0,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)},
   {PA_6,  LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
   {PA_6,  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)},
diff --git a/src/genpinmap/Arduino/STM32L412RBTxP/PeripheralPins.c b/src/genpinmap/Arduino/STM32L412RBTxP/PeripheralPins.c
index 6a581909..861d71f6 100644
--- a/src/genpinmap/Arduino/STM32L412RBTxP/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L412RBTxP/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -107,6 +107,7 @@ const PinMap PinMap_I2C_SCL[] = {
 
 #ifdef HAL_TIM_MODULE_ENABLED
 const PinMap PinMap_PWM[] = {
+  {PA_0,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE, 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,  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
@@ -186,6 +187,7 @@ const PinMap PinMap_UART_RTS[] = {
 
 #ifdef HAL_UART_MODULE_ENABLED
 const PinMap PinMap_UART_CTS[] = {
+  {PA_0,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)},
   {PA_6,  LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
   {PA_6,  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)},
diff --git a/src/genpinmap/Arduino/STM32L412T8Yx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L412T8Yx/PeripheralPins.c
index aef68913..9c01ffec 100644
--- a/src/genpinmap/Arduino/STM32L412T8Yx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L412T8Yx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L412TBYx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L412TBYx/PeripheralPins.c
index feaa0a54..ed463c8e 100644
--- a/src/genpinmap/Arduino/STM32L412TBYx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L412TBYx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L412TBYxP/PeripheralPins.c b/src/genpinmap/Arduino/STM32L412TBYxP/PeripheralPins.c
index 01e9dea3..4aee2cb9 100644
--- a/src/genpinmap/Arduino/STM32L412TBYxP/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L412TBYxP/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L422CBTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L422CBTx/PeripheralPins.c
index a5a1a3bb..bf99ad72 100644
--- a/src/genpinmap/Arduino/STM32L422CBTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L422CBTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -95,6 +95,7 @@ const PinMap PinMap_I2C_SCL[] = {
 
 #ifdef HAL_TIM_MODULE_ENABLED
 const PinMap PinMap_PWM[] = {
+  {PA_0,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE, 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,  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
@@ -169,6 +170,7 @@ const PinMap PinMap_UART_RTS[] = {
 
 #ifdef HAL_UART_MODULE_ENABLED
 const PinMap PinMap_UART_CTS[] = {
+  {PA_0,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)},
   {PA_6,  LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
   {PA_6,  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)},
diff --git a/src/genpinmap/Arduino/STM32L422CBUx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L422CBUx/PeripheralPins.c
index fddf03a8..819e3d8d 100644
--- a/src/genpinmap/Arduino/STM32L422CBUx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L422CBUx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -95,6 +95,7 @@ const PinMap PinMap_I2C_SCL[] = {
 
 #ifdef HAL_TIM_MODULE_ENABLED
 const PinMap PinMap_PWM[] = {
+  {PA_0,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE, 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,  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
@@ -169,6 +170,7 @@ const PinMap PinMap_UART_RTS[] = {
 
 #ifdef HAL_UART_MODULE_ENABLED
 const PinMap PinMap_UART_CTS[] = {
+  {PA_0,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)},
   {PA_6,  LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
   {PA_6,  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)},
diff --git a/src/genpinmap/Arduino/STM32L422KBTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L422KBTx/PeripheralPins.c
index 050b2ca7..d4f2312a 100644
--- a/src/genpinmap/Arduino/STM32L422KBTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L422KBTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L422KBUx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L422KBUx/PeripheralPins.c
index 2737f9e1..a9e35eeb 100644
--- a/src/genpinmap/Arduino/STM32L422KBUx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L422KBUx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L422RBIx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L422RBIx/PeripheralPins.c
index bbffb0fe..b011d22d 100644
--- a/src/genpinmap/Arduino/STM32L422RBIx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L422RBIx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -109,6 +109,7 @@ const PinMap PinMap_I2C_SCL[] = {
 
 #ifdef HAL_TIM_MODULE_ENABLED
 const PinMap PinMap_PWM[] = {
+  {PA_0,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE, 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,  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
@@ -190,6 +191,7 @@ const PinMap PinMap_UART_RTS[] = {
 
 #ifdef HAL_UART_MODULE_ENABLED
 const PinMap PinMap_UART_CTS[] = {
+  {PA_0,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)},
   {PA_6,  LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
   {PA_6,  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)},
diff --git a/src/genpinmap/Arduino/STM32L422RBTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L422RBTx/PeripheralPins.c
index 1f1a2f93..d48c47e7 100644
--- a/src/genpinmap/Arduino/STM32L422RBTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L422RBTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -109,6 +109,7 @@ const PinMap PinMap_I2C_SCL[] = {
 
 #ifdef HAL_TIM_MODULE_ENABLED
 const PinMap PinMap_PWM[] = {
+  {PA_0,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE, 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,  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
@@ -190,6 +191,7 @@ const PinMap PinMap_UART_RTS[] = {
 
 #ifdef HAL_UART_MODULE_ENABLED
 const PinMap PinMap_UART_CTS[] = {
+  {PA_0,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF_NONE)},
   {PA_6,  LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
   {PA_6,  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)},
diff --git a/src/genpinmap/Arduino/STM32L422TBYx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L422TBYx/PeripheralPins.c
index 9a75d3d4..b9aa4d68 100644
--- a/src/genpinmap/Arduino/STM32L422TBYx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L422TBYx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L431C(B-C)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L431C(B-C)Tx/PeripheralPins.c
index e8a3af1e..142f2c46 100644
--- a/src/genpinmap/Arduino/STM32L431C(B-C)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L431C(B-C)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L431C(B-C)Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32L431C(B-C)Ux/PeripheralPins.c
index aba4497e..230d4401 100644
--- a/src/genpinmap/Arduino/STM32L431C(B-C)Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L431C(B-C)Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L431C(B-C)Yx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L431C(B-C)Yx/PeripheralPins.c
index 683da2ab..42eec138 100644
--- a/src/genpinmap/Arduino/STM32L431C(B-C)Yx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L431C(B-C)Yx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L431K(B-C)Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32L431K(B-C)Ux/PeripheralPins.c
index e2356e3b..a1aee5e5 100644
--- a/src/genpinmap/Arduino/STM32L431K(B-C)Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L431K(B-C)Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L431R(B-C)Ix/PeripheralPins.c b/src/genpinmap/Arduino/STM32L431R(B-C)Ix/PeripheralPins.c
index 3d1d02f7..ab7aa2da 100644
--- a/src/genpinmap/Arduino/STM32L431R(B-C)Ix/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L431R(B-C)Ix/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L431R(B-C)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L431R(B-C)Tx/PeripheralPins.c
index 4a755ab6..295a90ac 100644
--- a/src/genpinmap/Arduino/STM32L431R(B-C)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L431R(B-C)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L431R(B-C)Yx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L431R(B-C)Yx/PeripheralPins.c
index dfdd36b8..02309c90 100644
--- a/src/genpinmap/Arduino/STM32L431R(B-C)Yx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L431R(B-C)Yx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L431VCIx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L431VCIx/PeripheralPins.c
index d0693484..ffdd01ee 100644
--- a/src/genpinmap/Arduino/STM32L431VCIx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L431VCIx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L431VCTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L431VCTx/PeripheralPins.c
index dcba6f84..e08c77a5 100644
--- a/src/genpinmap/Arduino/STM32L431VCTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L431VCTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L432K(B-C)Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32L432K(B-C)Ux/PeripheralPins.c
index fdc7ab06..dbb2cab8 100644
--- a/src/genpinmap/Arduino/STM32L432K(B-C)Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L432K(B-C)Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L433C(B-C)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L433C(B-C)Tx/PeripheralPins.c
index 67571a53..02d69af1 100644
--- a/src/genpinmap/Arduino/STM32L433C(B-C)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L433C(B-C)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L433C(B-C)Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32L433C(B-C)Ux/PeripheralPins.c
index 298a496d..eca20ce1 100644
--- a/src/genpinmap/Arduino/STM32L433C(B-C)Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L433C(B-C)Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L433C(B-C)Yx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L433C(B-C)Yx/PeripheralPins.c
index 94db4ccd..49351106 100644
--- a/src/genpinmap/Arduino/STM32L433C(B-C)Yx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L433C(B-C)Yx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L433R(B-C)Ix/PeripheralPins.c b/src/genpinmap/Arduino/STM32L433R(B-C)Ix/PeripheralPins.c
index 049e6b6c..44c56718 100644
--- a/src/genpinmap/Arduino/STM32L433R(B-C)Ix/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L433R(B-C)Ix/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L433R(B-C)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L433R(B-C)Tx/PeripheralPins.c
index 767b0482..569b67e2 100644
--- a/src/genpinmap/Arduino/STM32L433R(B-C)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L433R(B-C)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L433R(B-C)Yx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L433R(B-C)Yx/PeripheralPins.c
index 572002e0..405961b4 100644
--- a/src/genpinmap/Arduino/STM32L433R(B-C)Yx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L433R(B-C)Yx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L433RCTxP/PeripheralPins.c b/src/genpinmap/Arduino/STM32L433RCTxP/PeripheralPins.c
index 3c0a02ab..bf2338de 100644
--- a/src/genpinmap/Arduino/STM32L433RCTxP/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L433RCTxP/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L433VCIx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L433VCIx/PeripheralPins.c
index 5ba2a614..56fe098f 100644
--- a/src/genpinmap/Arduino/STM32L433VCIx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L433VCIx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L433VCTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L433VCTx/PeripheralPins.c
index 06bfe15d..f26b84fb 100644
--- a/src/genpinmap/Arduino/STM32L433VCTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L433VCTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L442KCUx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L442KCUx/PeripheralPins.c
index 3dc9039a..bc91eb07 100644
--- a/src/genpinmap/Arduino/STM32L442KCUx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L442KCUx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L443CCTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L443CCTx/PeripheralPins.c
index 703dbab1..51d1ce5a 100644
--- a/src/genpinmap/Arduino/STM32L443CCTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L443CCTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L443CCUx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L443CCUx/PeripheralPins.c
index 2cfaf069..ca0984da 100644
--- a/src/genpinmap/Arduino/STM32L443CCUx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L443CCUx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L443CCYx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L443CCYx/PeripheralPins.c
index 6473855e..b481a22e 100644
--- a/src/genpinmap/Arduino/STM32L443CCYx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L443CCYx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L443RCIx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L443RCIx/PeripheralPins.c
index f691bf63..fe1c023d 100644
--- a/src/genpinmap/Arduino/STM32L443RCIx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L443RCIx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L443RCTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L443RCTx/PeripheralPins.c
index 70c633e3..76eccb01 100644
--- a/src/genpinmap/Arduino/STM32L443RCTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L443RCTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L443RCYx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L443RCYx/PeripheralPins.c
index 04fad0b2..08fccae6 100644
--- a/src/genpinmap/Arduino/STM32L443RCYx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L443RCYx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L443VCIx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L443VCIx/PeripheralPins.c
index 554e329e..85b695f7 100644
--- a/src/genpinmap/Arduino/STM32L443VCIx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L443VCIx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L443VCTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L443VCTx/PeripheralPins.c
index 89368130..755db231 100644
--- a/src/genpinmap/Arduino/STM32L443VCTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L443VCTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L451C(C-E)Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32L451C(C-E)Ux/PeripheralPins.c
index a743d300..d245d9d1 100644
--- a/src/genpinmap/Arduino/STM32L451C(C-E)Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L451C(C-E)Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L451R(C-E)Ix/PeripheralPins.c b/src/genpinmap/Arduino/STM32L451R(C-E)Ix/PeripheralPins.c
index fadb5429..2243c030 100644
--- a/src/genpinmap/Arduino/STM32L451R(C-E)Ix/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L451R(C-E)Ix/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L451R(C-E)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L451R(C-E)Tx/PeripheralPins.c
index 9adaaa13..8c27c6f8 100644
--- a/src/genpinmap/Arduino/STM32L451R(C-E)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L451R(C-E)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L451R(C-E)Yx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L451R(C-E)Yx/PeripheralPins.c
index 65106aae..e299285b 100644
--- a/src/genpinmap/Arduino/STM32L451R(C-E)Yx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L451R(C-E)Yx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L451V(C-E)Ix/PeripheralPins.c b/src/genpinmap/Arduino/STM32L451V(C-E)Ix/PeripheralPins.c
index 7d02da03..725a0f0d 100644
--- a/src/genpinmap/Arduino/STM32L451V(C-E)Ix/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L451V(C-E)Ix/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L451V(C-E)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L451V(C-E)Tx/PeripheralPins.c
index 8844cd1d..2db21d54 100644
--- a/src/genpinmap/Arduino/STM32L451V(C-E)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L451V(C-E)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L452C(C-E)Ux/PeripheralPins.c b/src/genpinmap/Arduino/STM32L452C(C-E)Ux/PeripheralPins.c
index ae4c8ccc..482e3c08 100644
--- a/src/genpinmap/Arduino/STM32L452C(C-E)Ux/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L452C(C-E)Ux/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L452R(C-E)Ix/PeripheralPins.c b/src/genpinmap/Arduino/STM32L452R(C-E)Ix/PeripheralPins.c
index ca84d9c4..868eb10b 100644
--- a/src/genpinmap/Arduino/STM32L452R(C-E)Ix/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L452R(C-E)Ix/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L452R(C-E)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L452R(C-E)Tx/PeripheralPins.c
index 25edf8f1..cf61854a 100644
--- a/src/genpinmap/Arduino/STM32L452R(C-E)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L452R(C-E)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L452R(C-E)Yx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L452R(C-E)Yx/PeripheralPins.c
index e6a08577..06683a1c 100644
--- a/src/genpinmap/Arduino/STM32L452R(C-E)Yx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L452R(C-E)Yx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L452RETxP/PeripheralPins.c b/src/genpinmap/Arduino/STM32L452RETxP/PeripheralPins.c
index bbd2f1fe..e1af3a54 100644
--- a/src/genpinmap/Arduino/STM32L452RETxP/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L452RETxP/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L452V(C-E)Ix/PeripheralPins.c b/src/genpinmap/Arduino/STM32L452V(C-E)Ix/PeripheralPins.c
index e1d57a48..56bc7242 100644
--- a/src/genpinmap/Arduino/STM32L452V(C-E)Ix/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L452V(C-E)Ix/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L452V(C-E)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L452V(C-E)Tx/PeripheralPins.c
index 1c3f855e..b6f5b636 100644
--- a/src/genpinmap/Arduino/STM32L452V(C-E)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L452V(C-E)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L462CEUx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L462CEUx/PeripheralPins.c
index af53c332..a79f3a85 100644
--- a/src/genpinmap/Arduino/STM32L462CEUx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L462CEUx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L462REIx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L462REIx/PeripheralPins.c
index 6148856f..02b2bd22 100644
--- a/src/genpinmap/Arduino/STM32L462REIx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L462REIx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L462RETx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L462RETx/PeripheralPins.c
index 83438eae..4adfafe4 100644
--- a/src/genpinmap/Arduino/STM32L462RETx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L462RETx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L462REYx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L462REYx/PeripheralPins.c
index f699260a..3962f4c0 100644
--- a/src/genpinmap/Arduino/STM32L462REYx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L462REYx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L462VEIx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L462VEIx/PeripheralPins.c
index 338dc95f..435046dc 100644
--- a/src/genpinmap/Arduino/STM32L462VEIx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L462VEIx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L462VETx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L462VETx/PeripheralPins.c
index cd3634bc..ad8815bd 100644
--- a/src/genpinmap/Arduino/STM32L462VETx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L462VETx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L471Q(E-G)Ix/PeripheralPins.c b/src/genpinmap/Arduino/STM32L471Q(E-G)Ix/PeripheralPins.c
index c84006f6..22c3a9ca 100644
--- a/src/genpinmap/Arduino/STM32L471Q(E-G)Ix/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L471Q(E-G)Ix/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L471R(E-G)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L471R(E-G)Tx/PeripheralPins.c
index f9c60dc7..566a4f11 100644
--- a/src/genpinmap/Arduino/STM32L471R(E-G)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L471R(E-G)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L471V(E-G)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L471V(E-G)Tx/PeripheralPins.c
index 2e4d22eb..a25755d7 100644
--- a/src/genpinmap/Arduino/STM32L471V(E-G)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L471V(E-G)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L471Z(E-G)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L471Z(E-G)Tx/PeripheralPins.c
index c1b8ca9d..fbde4406 100644
--- a/src/genpinmap/Arduino/STM32L471Z(E-G)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L471Z(E-G)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/genpinmap/Arduino/STM32L475R(C-E-G)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L475R(C-E-G)Tx/PeripheralPins.c
index 8614a96a..148b1a82 100644
--- a/src/genpinmap/Arduino/STM32L475R(C-E-G)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L475R(C-E-G)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -336,7 +336,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L475V(C-E-G)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L475V(C-E-G)Tx/PeripheralPins.c
index 527d070b..2560db1f 100644
--- a/src/genpinmap/Arduino/STM32L475V(C-E-G)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L475V(C-E-G)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -377,7 +377,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L476J(E-G)Yx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L476J(E-G)Yx/PeripheralPins.c
index 856b2878..9da53370 100644
--- a/src/genpinmap/Arduino/STM32L476J(E-G)Yx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L476J(E-G)Yx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -349,7 +349,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L476JGYxP/PeripheralPins.c b/src/genpinmap/Arduino/STM32L476JGYxP/PeripheralPins.c
index 916c64af..3e5a17db 100644
--- a/src/genpinmap/Arduino/STM32L476JGYxP/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L476JGYxP/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -343,7 +343,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L476M(E-G)Yx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L476M(E-G)Yx/PeripheralPins.c
index 27d5f6b1..1c6aad7d 100644
--- a/src/genpinmap/Arduino/STM32L476M(E-G)Yx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L476M(E-G)Yx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -356,7 +356,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L476Q(E-G)Ix/PeripheralPins.c b/src/genpinmap/Arduino/STM32L476Q(E-G)Ix/PeripheralPins.c
index d083d1d6..44aece7f 100644
--- a/src/genpinmap/Arduino/STM32L476Q(E-G)Ix/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L476Q(E-G)Ix/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -405,7 +405,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L476R(C-E-G)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L476R(C-E-G)Tx/PeripheralPins.c
index 15603dce..75111aa5 100644
--- a/src/genpinmap/Arduino/STM32L476R(C-E-G)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L476R(C-E-G)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -336,7 +336,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L476V(C-E-G)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L476V(C-E-G)Tx/PeripheralPins.c
index ff1e7c64..19137755 100644
--- a/src/genpinmap/Arduino/STM32L476V(C-E-G)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L476V(C-E-G)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -377,7 +377,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L476Z(E-G)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L476Z(E-G)Tx/PeripheralPins.c
index aa7794e7..17186175 100644
--- a/src/genpinmap/Arduino/STM32L476Z(E-G)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L476Z(E-G)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -416,7 +416,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L476ZGTxP/PeripheralPins.c b/src/genpinmap/Arduino/STM32L476ZGTxP/PeripheralPins.c
index 50d862e2..e1707a44 100644
--- a/src/genpinmap/Arduino/STM32L476ZGTxP/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L476ZGTxP/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -411,7 +411,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L485J(C-E)Yx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L485J(C-E)Yx/PeripheralPins.c
index f52280aa..5bcebffd 100644
--- a/src/genpinmap/Arduino/STM32L485J(C-E)Yx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L485J(C-E)Yx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -349,7 +349,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L486JGYx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L486JGYx/PeripheralPins.c
index a7f843c6..32f357f9 100644
--- a/src/genpinmap/Arduino/STM32L486JGYx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L486JGYx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -349,7 +349,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L486QGIx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L486QGIx/PeripheralPins.c
index 7e93ef31..9dcab25f 100644
--- a/src/genpinmap/Arduino/STM32L486QGIx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L486QGIx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -405,7 +405,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L486RGTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L486RGTx/PeripheralPins.c
index 5c648538..9836d1d8 100644
--- a/src/genpinmap/Arduino/STM32L486RGTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L486RGTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -336,7 +336,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L486VGTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L486VGTx/PeripheralPins.c
index 79d57a10..1b05400f 100644
--- a/src/genpinmap/Arduino/STM32L486VGTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L486VGTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -377,7 +377,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L486ZGTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L486ZGTx/PeripheralPins.c
index 817a9c3c..39c3df18 100644
--- a/src/genpinmap/Arduino/STM32L486ZGTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L486ZGTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -416,7 +416,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L496A(E-G)Ix/PeripheralPins.c b/src/genpinmap/Arduino/STM32L496A(E-G)Ix/PeripheralPins.c
index ef3c4717..b43d464d 100644
--- a/src/genpinmap/Arduino/STM32L496A(E-G)Ix/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L496A(E-G)Ix/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -473,7 +473,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L496AGIxP/PeripheralPins.c b/src/genpinmap/Arduino/STM32L496AGIxP/PeripheralPins.c
index 8e0f0bf2..26385126 100644
--- a/src/genpinmap/Arduino/STM32L496AGIxP/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L496AGIxP/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -472,7 +472,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L496Q(E-G)Ix/PeripheralPins.c b/src/genpinmap/Arduino/STM32L496Q(E-G)Ix/PeripheralPins.c
index c8812b5a..599d8ebb 100644
--- a/src/genpinmap/Arduino/STM32L496Q(E-G)Ix/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L496Q(E-G)Ix/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -448,7 +448,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L496R(E-G)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L496R(E-G)Tx/PeripheralPins.c
index ff9a0193..93e4d318 100644
--- a/src/genpinmap/Arduino/STM32L496R(E-G)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L496R(E-G)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -368,7 +368,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L496RGTxP/PeripheralPins.c b/src/genpinmap/Arduino/STM32L496RGTxP/PeripheralPins.c
index 36727947..729c61fb 100644
--- a/src/genpinmap/Arduino/STM32L496RGTxP/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L496RGTxP/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -363,7 +363,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L496V(E-G)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L496V(E-G)Tx/PeripheralPins.c
index 7a3e0661..921ff801 100644
--- a/src/genpinmap/Arduino/STM32L496V(E-G)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L496V(E-G)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -418,7 +418,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L496V(E-G)Yx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L496V(E-G)Yx/PeripheralPins.c
index 34de0bcc..4446f11f 100644
--- a/src/genpinmap/Arduino/STM32L496V(E-G)Yx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L496V(E-G)Yx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -417,7 +417,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L496VGYxP/PeripheralPins.c b/src/genpinmap/Arduino/STM32L496VGYxP/PeripheralPins.c
index 5be2385f..797030bc 100644
--- a/src/genpinmap/Arduino/STM32L496VGYxP/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L496VGYxP/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -414,7 +414,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L496Z(E-G)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L496Z(E-G)Tx/PeripheralPins.c
index 6cc204a2..858c1ba9 100644
--- a/src/genpinmap/Arduino/STM32L496Z(E-G)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L496Z(E-G)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -464,7 +464,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L496ZGTxP/PeripheralPins.c b/src/genpinmap/Arduino/STM32L496ZGTxP/PeripheralPins.c
index 69438b50..ce198393 100644
--- a/src/genpinmap/Arduino/STM32L496ZGTxP/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L496ZGTxP/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -458,7 +458,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L4A6AGIx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L4A6AGIx/PeripheralPins.c
index 0d614928..960cbea8 100644
--- a/src/genpinmap/Arduino/STM32L4A6AGIx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L4A6AGIx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -473,7 +473,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L4A6QGIx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L4A6QGIx/PeripheralPins.c
index b9127bcb..e18b08d8 100644
--- a/src/genpinmap/Arduino/STM32L4A6QGIx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L4A6QGIx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -448,7 +448,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L4A6RGTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L4A6RGTx/PeripheralPins.c
index d076559f..8a4f55da 100644
--- a/src/genpinmap/Arduino/STM32L4A6RGTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L4A6RGTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -368,7 +368,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L4A6VGTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L4A6VGTx/PeripheralPins.c
index e4b44d15..c880bf3b 100644
--- a/src/genpinmap/Arduino/STM32L4A6VGTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L4A6VGTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -418,7 +418,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L4A6VGYx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L4A6VGYx/PeripheralPins.c
index 2f0534bd..1c6f8990 100644
--- a/src/genpinmap/Arduino/STM32L4A6VGYx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L4A6VGYx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -417,7 +417,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L4A6ZGTx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L4A6ZGTx/PeripheralPins.c
index 47447ee0..ead28af5 100644
--- a/src/genpinmap/Arduino/STM32L4A6ZGTx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L4A6ZGTx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -464,7 +464,7 @@ const PinMap PinMap_QUADSPI[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L4R5A(G-I)Ix/PeripheralPins.c b/src/genpinmap/Arduino/STM32L4R5A(G-I)Ix/PeripheralPins.c
index a3046617..3b73a468 100644
--- a/src/genpinmap/Arduino/STM32L4R5A(G-I)Ix/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L4R5A(G-I)Ix/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -411,7 +411,7 @@ const PinMap PinMap_CAN_TD[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L4R5Q(G-I)Ix/PeripheralPins.c b/src/genpinmap/Arduino/STM32L4R5Q(G-I)Ix/PeripheralPins.c
index 59d28f05..ca9e3e9a 100644
--- a/src/genpinmap/Arduino/STM32L4R5Q(G-I)Ix/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L4R5Q(G-I)Ix/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -389,7 +389,7 @@ const PinMap PinMap_CAN_TD[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L4R5V(G-I)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L4R5V(G-I)Tx/PeripheralPins.c
index 80d72026..a55d5f06 100644
--- a/src/genpinmap/Arduino/STM32L4R5V(G-I)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L4R5V(G-I)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -362,7 +362,7 @@ const PinMap PinMap_CAN_TD[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L4R5Z(G-I)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L4R5Z(G-I)Tx/PeripheralPins.c
index 68964a97..ee234875 100644
--- a/src/genpinmap/Arduino/STM32L4R5Z(G-I)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L4R5Z(G-I)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -395,7 +395,7 @@ const PinMap PinMap_CAN_TD[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L4R5Z(G-I)Yx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L4R5Z(G-I)Yx/PeripheralPins.c
index a5f052c7..51aa0a80 100644
--- a/src/genpinmap/Arduino/STM32L4R5Z(G-I)Yx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L4R5Z(G-I)Yx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -388,7 +388,7 @@ const PinMap PinMap_CAN_TD[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L4R5ZITxP/PeripheralPins.c b/src/genpinmap/Arduino/STM32L4R5ZITxP/PeripheralPins.c
index 334c7563..d6930305 100644
--- a/src/genpinmap/Arduino/STM32L4R5ZITxP/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L4R5ZITxP/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -390,7 +390,7 @@ const PinMap PinMap_CAN_TD[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L4R7AIIx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L4R7AIIx/PeripheralPins.c
index 1daf1200..84791d10 100644
--- a/src/genpinmap/Arduino/STM32L4R7AIIx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L4R7AIIx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -411,7 +411,7 @@ const PinMap PinMap_CAN_TD[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L4R7VITx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L4R7VITx/PeripheralPins.c
index 5359c0c2..7a1cd208 100644
--- a/src/genpinmap/Arduino/STM32L4R7VITx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L4R7VITx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -362,7 +362,7 @@ const PinMap PinMap_CAN_TD[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L4R7ZITx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L4R7ZITx/PeripheralPins.c
index 2a78827b..3fa9621f 100644
--- a/src/genpinmap/Arduino/STM32L4R7ZITx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L4R7ZITx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -395,7 +395,7 @@ const PinMap PinMap_CAN_TD[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L4R9A(G-I)Ix/PeripheralPins.c b/src/genpinmap/Arduino/STM32L4R9A(G-I)Ix/PeripheralPins.c
index 75560bbb..2cb6531c 100644
--- a/src/genpinmap/Arduino/STM32L4R9A(G-I)Ix/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L4R9A(G-I)Ix/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -407,7 +407,7 @@ const PinMap PinMap_CAN_TD[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L4R9V(G-I)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L4R9V(G-I)Tx/PeripheralPins.c
index 9a039d22..0c11b48d 100644
--- a/src/genpinmap/Arduino/STM32L4R9V(G-I)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L4R9V(G-I)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -352,7 +352,7 @@ const PinMap PinMap_CAN_TD[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L4R9Z(G-I)Jx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L4R9Z(G-I)Jx/PeripheralPins.c
index aae3a63f..ff9af2a4 100644
--- a/src/genpinmap/Arduino/STM32L4R9Z(G-I)Jx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L4R9Z(G-I)Jx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -391,7 +391,7 @@ const PinMap PinMap_CAN_TD[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L4R9Z(G-I)Tx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L4R9Z(G-I)Tx/PeripheralPins.c
index ec462cfa..c3849025 100644
--- a/src/genpinmap/Arduino/STM32L4R9Z(G-I)Tx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L4R9Z(G-I)Tx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -388,7 +388,7 @@ const PinMap PinMap_CAN_TD[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L4R9Z(G-I)Yx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L4R9Z(G-I)Yx/PeripheralPins.c
index 653952d5..c12e866b 100644
--- a/src/genpinmap/Arduino/STM32L4R9Z(G-I)Yx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L4R9Z(G-I)Yx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -388,7 +388,7 @@ const PinMap PinMap_CAN_TD[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L4S5AIIx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L4S5AIIx/PeripheralPins.c
index 4de9728b..82821a31 100644
--- a/src/genpinmap/Arduino/STM32L4S5AIIx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L4S5AIIx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -411,7 +411,7 @@ const PinMap PinMap_CAN_TD[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L4S5QIIx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L4S5QIIx/PeripheralPins.c
index 679911b7..aa638023 100644
--- a/src/genpinmap/Arduino/STM32L4S5QIIx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L4S5QIIx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -389,7 +389,7 @@ const PinMap PinMap_CAN_TD[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L4S5VITx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L4S5VITx/PeripheralPins.c
index 9bf4038e..1cc186bf 100644
--- a/src/genpinmap/Arduino/STM32L4S5VITx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L4S5VITx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -362,7 +362,7 @@ const PinMap PinMap_CAN_TD[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L4S5ZITx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L4S5ZITx/PeripheralPins.c
index a801984d..4077ed1a 100644
--- a/src/genpinmap/Arduino/STM32L4S5ZITx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L4S5ZITx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -395,7 +395,7 @@ const PinMap PinMap_CAN_TD[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L4S5ZIYx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L4S5ZIYx/PeripheralPins.c
index d5a6c61d..8d7be5ac 100644
--- a/src/genpinmap/Arduino/STM32L4S5ZIYx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L4S5ZIYx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -388,7 +388,7 @@ const PinMap PinMap_CAN_TD[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L4S7AIIx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L4S7AIIx/PeripheralPins.c
index 8d2274ab..b95db51c 100644
--- a/src/genpinmap/Arduino/STM32L4S7AIIx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L4S7AIIx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -411,7 +411,7 @@ const PinMap PinMap_CAN_TD[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L4S7VITx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L4S7VITx/PeripheralPins.c
index a68fb4ca..b563245f 100644
--- a/src/genpinmap/Arduino/STM32L4S7VITx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L4S7VITx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -362,7 +362,7 @@ const PinMap PinMap_CAN_TD[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L4S7ZITx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L4S7ZITx/PeripheralPins.c
index 1f93c437..0b627c1b 100644
--- a/src/genpinmap/Arduino/STM32L4S7ZITx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L4S7ZITx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -395,7 +395,7 @@ const PinMap PinMap_CAN_TD[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L4S9AIIx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L4S9AIIx/PeripheralPins.c
index 9f2d553d..4575a6dc 100644
--- a/src/genpinmap/Arduino/STM32L4S9AIIx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L4S9AIIx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -407,7 +407,7 @@ const PinMap PinMap_CAN_TD[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L4S9VITx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L4S9VITx/PeripheralPins.c
index 138745fd..b55b7e43 100644
--- a/src/genpinmap/Arduino/STM32L4S9VITx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L4S9VITx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -352,7 +352,7 @@ const PinMap PinMap_CAN_TD[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L4S9ZIJx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L4S9ZIJx/PeripheralPins.c
index f83b4ae9..619eb2fc 100644
--- a/src/genpinmap/Arduino/STM32L4S9ZIJx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L4S9ZIJx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -391,7 +391,7 @@ const PinMap PinMap_CAN_TD[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L4S9ZITx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L4S9ZITx/PeripheralPins.c
index 31b5c791..b8677a56 100644
--- a/src/genpinmap/Arduino/STM32L4S9ZITx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L4S9ZITx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -388,7 +388,7 @@ const PinMap PinMap_CAN_TD[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/Arduino/STM32L4S9ZIYx/PeripheralPins.c b/src/genpinmap/Arduino/STM32L4S9ZIYx/PeripheralPins.c
index 61ea4fe9..6909103d 100644
--- a/src/genpinmap/Arduino/STM32L4S9ZIYx/PeripheralPins.c
+++ b/src/genpinmap/Arduino/STM32L4S9ZIYx/PeripheralPins.c
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2018, STMicroelectronics
+ * Copyright (c) 2019, STMicroelectronics
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -388,7 +388,7 @@ const PinMap PinMap_CAN_TD[] = {
 #ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_FS[] = {
   {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
   {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
diff --git a/src/genpinmap/genpinmap_arduino.py b/src/genpinmap/genpinmap_arduino.py
index 290db828..a34825af 100644
--- a/src/genpinmap/genpinmap_arduino.py
+++ b/src/genpinmap/genpinmap_arduino.py
@@ -50,13 +50,13 @@ def get_gpio_af_num(pintofind, iptofind):
         return get_gpio_af_numF1(pintofind, iptofind)
     # DBG print ('pin to find ' + pintofind)
     i = 0
-    mygpioaf = "NOTFOUND"
+    mygpioaf = ""
     for n in xml_gpio.documentElement.childNodes:
         i += 1
         j = 0
         if n.nodeType == Node.ELEMENT_NODE:
             for firstlevel in n.attributes.items():
-                #                if 'PB7' in firstlevel:
+                # if 'PB7' in firstlevel:
                 if pintofind == firstlevel[1]:
                     # DBG print (i , firstlevel)
                     # n = pin node found
@@ -79,27 +79,20 @@ def get_gpio_af_num(pintofind, iptofind):
                                                 if myc.nodeType == Node.ELEMENT_NODE:
                                                     # myc = node of ALTERNATE
                                                     for mygpioaflist in myc.childNodes:
-                                                        mygpioaf += (
-                                                            " " + mygpioaflist.data
-                                                        )
+                                                        if mygpioaflist.data not in mygpioaf:
+                                                            if mygpioaf != "":
+                                                                mygpioaf += " "
+                                                            mygpioaf += mygpioaflist.data
                                                         # print (mygpioaf)
-    if mygpioaf == "NOTFOUND":
-        print(
-            "GPIO AF not found in "
-            + gpiofile
-            + " for "
-            + pintofind
-            + " and the IP "
-            + iptofind
-        )
-        # quit()
-    return mygpioaf.replace("NOTFOUND ", "")
+    if mygpioaf == "":
+        mygpioaf = "GPIO_AF_NONE"
+    return mygpioaf
 
 
 def get_gpio_af_numF1(pintofind, iptofind):
     # print ('pin to find ' + pintofind + ' ip to find ' + iptofind)
     i = 0
-    mygpioaf = "NOTFOUND"
+    mygpioaf = ""
     for n in xml_gpio.documentElement.childNodes:
         i += 1
         j = 0
@@ -127,7 +120,9 @@ def get_gpio_af_numF1(pintofind, iptofind):
                                             p.nodeType == Node.ELEMENT_NODE
                                             and p.hasChildNodes() is False
                                         ):
-                                            mygpioaf += " AFIO_NONE"
+                                            if mygpioaf != "":
+                                                mygpioaf += " "
+                                            mygpioaf += "AFIO_NONE"
                                         else:
                                             for s in p.childNodes:
                                                 if s.nodeType == Node.ELEMENT_NODE:
@@ -143,24 +138,17 @@ def get_gpio_af_numF1(pintofind, iptofind):
                                                             for (
                                                                 mygpioaflist
                                                             ) in myc.childNodes:
-                                                                mygpioaf += " " + mygpioaflist.data.replace(
+                                                                if mygpioaf != "":
+                                                                    mygpioaf += " "
+                                                                mygpioaf += mygpioaflist.data.replace(
                                                                     "__HAL_", ""
                                                                 ).replace(
                                                                     "_REMAP", ""
                                                                 )
                                                                 # print mygpioaf
-    if mygpioaf == "NOTFOUND":
-        print(
-            "GPIO AF not found in "
-            + gpiofile
-            + " for "
-            + pintofind
-            + " and the IP "
-            + iptofind
-            + " set as AFIO_NONE"
-        )
+    if mygpioaf == "":
         mygpioaf = "AFIO_NONE"
-    return mygpioaf.replace("NOTFOUND ", "")
+    return mygpioaf
 
 
 def store_pin(pin, name):
@@ -462,19 +450,18 @@ def print_dac():
 def print_i2c(lst):
     for p in lst:
         result = get_gpio_af_num(p[1], p[2])
-        if result != "NOTFOUND":
-            s1 = "%-10s" % ("  {" + p[0] + ",")
-            # 2nd element is the I2C XXX signal
-            b = p[2].split("_")[0]
-            s1 += (
-                b[: len(b) - 1]
-                + b[len(b) - 1]
-                + ", STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, "
-            )
-            r = result.split(" ")
-            for af in r:
-                s2 = s1 + af + ")},\n"
-                out_c_file.write(s2)
+        s1 = "%-10s" % ("  {" + p[0] + ",")
+        # 2nd element is the I2C XXX signal
+        b = p[2].split("_")[0]
+        s1 += (
+            b[: len(b) - 1]
+            + b[len(b) - 1]
+            + ", STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, "
+        )
+        r = result.split(" ")
+        for af in r:
+            s2 = s1 + af + ")},\n"
+            out_c_file.write(s2)
     out_c_file.write(
         """  {NC,    NP,    0}
 };
@@ -486,25 +473,24 @@ def print_i2c(lst):
 def print_pwm():
     for p in pwm_list:
         result = get_gpio_af_num(p[1], p[2])
-        if result != "NOTFOUND":
-            s1 = "%-10s" % ("  {" + p[0] + ",")
-            # 2nd element is the PWM signal
-            a = p[2].split("_")
-            inst = a[0]
-            if len(inst) == 3:
-                inst += "1"
-            s1 += "%-8s" % (inst + ",")
-            chan = a[1].replace("CH", "")
-            if chan.endswith("N"):
-                neg = ", 1"
-                chan = chan.strip("N")
-            else:
-                neg = ", 0"
-            s1 += "STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, "
-            r = result.split(" ")
-            for af in r:
-                s2 = s1 + af + ", " + chan + neg + ")}, // " + p[2] + "\n"
-                out_c_file.write(s2)
+        s1 = "%-10s" % ("  {" + p[0] + ",")
+        # 2nd element is the PWM signal
+        a = p[2].split("_")
+        inst = a[0]
+        if len(inst) == 3:
+            inst += "1"
+        s1 += "%-8s" % (inst + ",")
+        chan = a[1].replace("CH", "")
+        if chan.endswith("N"):
+            neg = ", 1"
+            chan = chan.strip("N")
+        else:
+            neg = ", 0"
+        s1 += "STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, "
+        r = result.split(" ")
+        for af in r:
+            s2 = s1 + af + ", " + chan + neg + ")}, // " + p[2] + "\n"
+            out_c_file.write(s2)
     out_c_file.write(
         """  {NC,    NP,    0}
 };
@@ -516,19 +502,18 @@ def print_pwm():
 def print_uart(lst):
     for p in lst:
         result = get_gpio_af_num(p[1], p[2])
-        if result != "NOTFOUND":
-            s1 = "%-10s" % ("  {" + p[0] + ",")
-            # 2nd element is the UART_XX signal
-            b = p[2].split("_")[0]
-            s1 += "%-9s" % (b[: len(b) - 1] + b[len(b) - 1 :] + ",")
-            if "STM32F10" in mcu_file and lst == uartrx_list:
-                s1 += "STM_PIN_DATA(STM_MODE_INPUT, GPIO_PULLUP, "
-            else:
-                s1 += "STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, "
-            r = result.split(" ")
-            for af in r:
-                s2 = s1 + af + ")},\n"
-                out_c_file.write(s2)
+        s1 = "%-10s" % ("  {" + p[0] + ",")
+        # 2nd element is the UART_XX signal
+        b = p[2].split("_")[0]
+        s1 += "%-9s" % (b[: len(b) - 1] + b[len(b) - 1 :] + ",")
+        if "STM32F10" in mcu_file and lst == uartrx_list:
+            s1 += "STM_PIN_DATA(STM_MODE_INPUT, GPIO_PULLUP, "
+        else:
+            s1 += "STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, "
+        r = result.split(" ")
+        for af in r:
+            s2 = s1 + af + ")},\n"
+            out_c_file.write(s2)
     out_c_file.write(
         """  {NC,    NP,    0}
 };
@@ -540,15 +525,14 @@ def print_uart(lst):
 def print_spi(lst):
     for p in lst:
         result = get_gpio_af_num(p[1], p[2])
-        if result != "NOTFOUND":
-            s1 = "%-10s" % ("  {" + p[0] + ",")
-            # 2nd element is the SPI_XXXX signal
-            instance = p[2].split("_")[0].replace("SPI", "")
-            s1 += "SPI" + instance + ", STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, "
-            r = result.split(" ")
-            for af in r:
-                s2 = s1 + af + ")},\n"
-                out_c_file.write(s2)
+        s1 = "%-10s" % ("  {" + p[0] + ",")
+        # 2nd element is the SPI_XXXX signal
+        instance = p[2].split("_")[0].replace("SPI", "")
+        s1 += "SPI" + instance + ", STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, "
+        r = result.split(" ")
+        for af in r:
+            s2 = s1 + af + ")},\n"
+            out_c_file.write(s2)
     out_c_file.write(
         """  {NC,    NP,    0}
 };
@@ -560,20 +544,19 @@ def print_spi(lst):
 def print_can(lst):
     for p in lst:
         result = get_gpio_af_num(p[1], p[2])
-        if result != "NOTFOUND":
-            s1 = "%-10s" % ("  {" + p[0] + ",")
-            # 2nd element is the CAN_XX signal
-            instance = p[2].split("_")[0].replace("CAN", "")
-            if len(instance) == 0:
-                instance = "1"
-            if "STM32F10" in mcu_file and lst == canrd_list:
-                s1 += "CAN" + instance + ", STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, "
-            else:
-                s1 += "CAN" + instance + ", STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, "
-            r = result.split(" ")
-            for af in r:
-                s2 = s1 + af + ")},\n"
-                out_c_file.write(s2)
+        s1 = "%-10s" % ("  {" + p[0] + ",")
+        # 2nd element is the CAN_XX signal
+        instance = p[2].split("_")[0].replace("CAN", "")
+        if len(instance) == 0:
+            instance = "1"
+        if "STM32F10" in mcu_file and lst == canrd_list:
+            s1 += "CAN" + instance + ", STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, "
+        else:
+            s1 += "CAN" + instance + ", STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, "
+        r = result.split(" ")
+        for af in r:
+            s2 = s1 + af + ")},\n"
+            out_c_file.write(s2)
     out_c_file.write(
         """  {NC,    NP,    0}
 };
@@ -586,19 +569,18 @@ def print_eth():
     prev_s = ""
     for p in eth_list:
         result = get_gpio_af_num(p[1], p[2])
-        if result != "NOTFOUND":
-            s1 = "%-10s" % ("  {" + p[0] + ",")
-            # 2nd element is the ETH_XXXX signal
-            s1 += "ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, " + result + ")},"
-            # check duplicated lines, only signal differs
-            if prev_s == s1:
-                s1 = "|" + p[2]
-            else:
-                if len(prev_s) > 0:
-                    out_c_file.write("\n")
-                prev_s = s1
-                s1 += " // " + p[2]
-            out_c_file.write(s1)
+        s1 = "%-10s" % ("  {" + p[0] + ",")
+        # 2nd element is the ETH_XXXX signal
+        s1 += "ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, " + result + ")},"
+        # check duplicated lines, only signal differs
+        if prev_s == s1:
+            s1 = "|" + p[2]
+        else:
+            if len(prev_s) > 0:
+                out_c_file.write("\n")
+            prev_s = s1
+            s1 += " // " + p[2]
+        out_c_file.write(s1)
     out_c_file.write(
         """\n  {NC,    NP,    0}
 };
@@ -611,19 +593,18 @@ def print_qspi():
     prev_s = ""
     for p in qspi_list:
         result = get_gpio_af_num(p[1], p[2])
-        if result != "NOTFOUND":
-            s1 = "%-10s" % ("  {" + p[0] + ",")
-            # 2nd element is the QUADSPI_XXXX signal
-            s1 += "QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, " + result + ")},"
-            # check duplicated lines, only signal differs
-            if prev_s == s1:
-                s1 = "|" + p[2]
-            else:
-                if len(prev_s) > 0:
-                    out_c_file.write("\n")
-                prev_s = s1
-                s1 += " // " + p[2]
-            out_c_file.write(s1)
+        s1 = "%-10s" % ("  {" + p[0] + ",")
+        # 2nd element is the QUADSPI_XXXX signal
+        s1 += "QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, " + result + ")},"
+        # check duplicated lines, only signal differs
+        if prev_s == s1:
+            s1 = "|" + p[2]
+        else:
+            if len(prev_s) > 0:
+                out_c_file.write("\n")
+            prev_s = s1
+            s1 += " // " + p[2]
+        out_c_file.write(s1)
     out_c_file.write(
         """\n  {NC,    NP,    0}
 };