Merge upstream changes from Marlin 2.1.2.2

buildroot/share/PlatformIO/variants/MARLIN_F407ZE/PeripheralPins.c

@@ -413,7 +413,7 @@ const PinMap PinMap_USB_OTG_HS[] = {
     */
   {NC,    NP,    0}
 };
-
+#endif
 
 #ifdef HAL_SD_MODULE_ENABLED
 WEAK const PinMap PinMap_SD[] = {
@@ -430,4 +430,3 @@ WEAK const PinMap PinMap_SD[] = {
   {NC,    NP,    0}
 };
 #endif
-#endif

buildroot/share/PlatformIO/variants/MARLIN_F407ZE/variant.h

@@ -27,118 +27,118 @@ extern "C" {
  *        Pins
  *----------------------------------------------------------------------------*/
 
-#define PA0   0  //D0
-#define PA1   1  //D1
-#define PA2   2  //D2
-#define PA3   3  //D3
-#define PA4   4  //D4
-#define PA5   5  //D5
-#define PA6   6  //D6
-#define PA7   7  //D7
-#define PA8   8  //D8
-#define PA9   9  //D9
-#define PA10  10 //D10
-#define PA11  11 //D11
-#define PA12  12 //D12
-#define PA13  13 //D13
-#define PA14  14 //D14
-#define PA15  15 //D15
-#define PB0   16 //D16
-#define PB1   17 //D17
-#define PB2   18 //D18
-#define PB3   19 //D19
-#define PB4   20 //D20
-#define PB5   21 //D21
-#define PB6   22 //D22
-#define PB7   23 //D23
-#define PB8   24 //D24
-#define PB9   25 //D25
-#define PB10  26 //D26
-#define PB11  27 //D27
-#define PB12  28 //D28
-#define PB13  29 //D29
-#define PB14  30 //D30
-#define PB15  31 //D31
-#define PC0   32 //D32
-#define PC1   33 //D33
-#define PC2   34 //D34
-#define PC3   35 //D35
-#define PC4   36 //D36
-#define PC5   37 //D37
-#define PC6   38 //D38
-#define PC7   39 //D39
-#define PC8   40 //D40
-#define PC9   41 //D41
-#define PC10  42 //D42
-#define PC11  43 //D43
-#define PC12  44 //D44
-#define PC13  45 //D45
-#define PC14  46 //D46
-#define PC15  47 //D47
-#define PD0   48 //D48
-#define PD1   49 //D49
-#define PD2   50 //D50
-#define PD3   51 //D51
-#define PD4   52 //D52
-#define PD5   53 //D53
-#define PD6   54 //D54
-#define PD7   55 //D55
-#define PD8   56 //D56
-#define PD9   57 //D57
-#define PD10  58 //D58
-#define PD11  59 //D59
-#define PD12  60 //D60
-#define PD13  61 //D61
-#define PD14  62 //D62
-#define PD15  63 //D63
-#define PE0   64 //D64
-#define PE1   65 //D65
-#define PE2   66 //D66
-#define PE3   67 //D67
-#define PE4   68 //D68
-#define PE5   69 //D69
-#define PE6   70 //D70
-#define PE7   71 //D71
-#define PE8   72 //D72
-#define PE9   73 //D73
-#define PE10  74 //D74
-#define PE11  75 //D75
-#define PE12  76 //D76
-#define PE13  77 //D77
-#define PE14  78 //D78
-#define PE15  79 //D79
-#define PF0   80 //D64
-#define PF1   81 //D65
-#define PF2   82 //D66
-#define PF3   83 //D67
-#define PF4   84 //D68
-#define PF5   85 //D69
-#define PF6   86 //D70
-#define PF7   87 //D71
-#define PF8   88 //D72
-#define PF9   89 //D73
-#define PF10  90 //D74
-#define PF11  91 //D75
-#define PF12  92 //D76
-#define PF13  93 //D77
-#define PF14  94 //D78
-#define PF15  95 //D79
-#define PG0   96 //D64
-#define PG1   97 //D65
-#define PG2   98 //D66
-#define PG3   99 //D67
-#define PG4   100 //D68
-#define PG5   101 //D69
-#define PG6   102 //D70
-#define PG7   103 //D71
-#define PG8   104 //D72
-#define PG9   105 //D73
-#define PG10  106 //D74
-#define PG11  107 //D75
-#define PG12  108 //D76
-#define PG13  109 //D77
-#define PG14  110 //D78
-#define PG15  111 //D79
+#define PA0    0
+#define PA1    1
+#define PA2    2
+#define PA3    3
+#define PA4    4
+#define PA5    5
+#define PA6    6
+#define PA7    7
+#define PA8    8
+#define PA9    9
+#define PA10  10
+#define PA11  11
+#define PA12  12
+#define PA13  13
+#define PA14  14
+#define PA15  15
+#define PB0   16
+#define PB1   17
+#define PB2   18
+#define PB3   19
+#define PB4   20
+#define PB5   21
+#define PB6   22
+#define PB7   23
+#define PB8   24
+#define PB9   25
+#define PB10  26
+#define PB11  27
+#define PB12  28
+#define PB13  29
+#define PB14  30
+#define PB15  31
+#define PC0   32
+#define PC1   33
+#define PC2   34
+#define PC3   35
+#define PC4   36
+#define PC5   37
+#define PC6   38
+#define PC7   39
+#define PC8   40
+#define PC9   41
+#define PC10  42
+#define PC11  43
+#define PC12  44
+#define PC13  45
+#define PC14  46
+#define PC15  47
+#define PD0   48
+#define PD1   49
+#define PD2   50
+#define PD3   51
+#define PD4   52
+#define PD5   53
+#define PD6   54
+#define PD7   55
+#define PD8   56
+#define PD9   57
+#define PD10  58
+#define PD11  59
+#define PD12  60
+#define PD13  61
+#define PD14  62
+#define PD15  63
+#define PE0   64
+#define PE1   65
+#define PE2   66
+#define PE3   67
+#define PE4   68
+#define PE5   69
+#define PE6   70
+#define PE7   71
+#define PE8   72
+#define PE9   73
+#define PE10  74
+#define PE11  75
+#define PE12  76
+#define PE13  77
+#define PE14  78
+#define PE15  79
+#define PF0   80
+#define PF1   81
+#define PF2   82
+#define PF3   83
+#define PF4   84
+#define PF5   85
+#define PF6   86
+#define PF7   87
+#define PF8   88
+#define PF9   89
+#define PF10  90
+#define PF11  91
+#define PF12  92
+#define PF13  93
+#define PF14  94
+#define PF15  95
+#define PG0   96
+#define PG1   97
+#define PG2   98
+#define PG3   99
+#define PG4  100
+#define PG5  101
+#define PG6  102
+#define PG7  103
+#define PG8  104
+#define PG9  105
+#define PG10 106
+#define PG11 107
+#define PG12 108
+#define PG13 109
+#define PG14 110
+#define PG15 111
 
 // This must be a literal with the same value as PEND
 #define NUM_DIGITAL_PINS        112