Review pins numbering and signals pins numbering

Signed-off-by: Frederic Pillon <frederic.pillon@st.com>

Author: fpistm

variants/NUCLEO_F207ZG/variant.cpp

@@ -35,107 +35,113 @@ extern "C" {
 #endif
 
 // Pin number
-// This array allows to wrap Arduino pin number(Dx or x)
-// to STM32 PinName (PYx)
+// Match Table Table 16. NUCLEO-F207ZG pin assignments
+// from UM1974 STM32 Nucleo-144 board
 const PinName digitalPin[] = {
-//PYx, //Dx
-  P, //D0
-  P, //D1
-  P, //D2
-  P, //D3
-  P, //D4
-  P, //D5
-  P, //D6
-  P, //D7
-  P, //D8
-  P, //D9
-  P, //D10
-  P, //D11
-  P, //D12
-  P, //D13
-  P, //D14
-  P, //D15
-  P, //D16
-  P, //D17
-  P, //D18
-  P, //D19
-  P, //D20
-  P, //D21
-  P, //D22
-  P, //D23
-  P, //D24
-  P, //D25
-  P, //D26
-  P, //D27
-  P, //D28
-  P, //D29
-  P, //D30
-  P, //D31
-  P, //D32
-  P, //D33
-  P, //D34
-  P, //D35
-  P, //D36
-  P, //D37
-  P, //D38
-  P, //D39
-  P, //D40
-  P, //D41
-  P, //D42
-  P, //D43
-  P, //D44
-  P, //D45
-  P, //D46
-  P, //D47
-  P, //D48
-  P, //D49
-  P, //D50
-  P, //D51
-  P, //D52
-  P, //D53
-  P, //D54
-  P, //D55
-  P, //D56
-  P, //D57
-  P, //D58
-  P, //D59
-  P, //D60
-  P, //D61
-  P, //D62
-  P, //D63
-  P, //D64
-  P, //D65
-  P, //D66
-  P, //D67
-  P, //D68
-  P, //D69
-  P, //D70
-  P, //D71
-  P, //D72
-  P, //D73
-  P, //D74
-  P, //D75
-  P, //D76
-  P, //D77
-  P, //D78/A0
-  P, //D79/A1
-  P, //D80/A2
-  P, //D81/A3
-  P, //D82/A4
-  P, //D83/A5
-  P, //D84/A6
-  P, //D85/A7
-  P, //D86/A8
-  P, //D87/A9
+  PG9,  //D0
+  PG14, //D1
+  PF15, //D2
+  PE13, //D3
+  PF14, //D4
+  PE11, //D5
+  PE9,  //D6
+  PF13, //D7
+  PF12, //D8
+  PD15, //D9
+  PD14, //D10
+  PA7,  //D11 - If SB121, SB122 (ON,OFF) connected to PA7 (default, see D71)
+        //      else SB121, SB122 (OFF,ON) connected to PB5 (D22)
+  PA6,  //D12
+  PA5,  //D13
+  PB9,  //D14
+  PB8,  //D15
+  PC6,  //D16
+  PB15, //D17
+  PB13, //D18 - used as I2S_A_CK and connected to CN7 pin 5 by default, if JP7 is ON, 
+        //      it is also connected to Ethernet PHY as RMII_TXD1. In this case only 
+		//      one function of Ethernet or I2S_A must be used.
+  PB12, //D19
+  PA15, //D20
+  PC7,  //D21
+  PB5,  //D22 - D11 if SB121 off, SB122 on
+  PB3,  //D23
+  PA4,  //D24
+  PB4,  //D25
+  PB6,  //D26
+  PB2,  //D27
+  PD13, //D28
+  PD12, //D29
+  PD11, //D30
+  PE2,  //D31 - PE2 is connected to both CN9 pin 14 (I/O) and CN10 pin 25 (I/O).
+        //      Only one connector pin must be used at one time. 
+  PA0,  //D32
+  PB0,  //D33 - LED1
+  PE0,  //D34
+  PB11, //D35
+  PB10, //D36
+  PE15, //D37
+  PE14, //D38
+  PE12, //D39
+  PE10, //D40
+  PE7,  //D41
+  PE8,  //D42
+  PC8,  //D43
+  PC9,  //D44
+  PC10, //D45
+  PC11, //D46
+  PC12, //D47
+  PD2,  //D48
+  PG2,  //D49
+  PG3,  //D50
+  PD7,  //D51
+  PD6,  //D52
+  PD5,  //D53
+  PD4,  //D54
+  PD3,  //D55
+  PE2,  //D56 - connected to both CN9 pin 14 (I/O) and CN10 pin 25 (I/O). 
+        //      Only one connector pin must be used at one time
+  PE4,  //D57
+  PE5,  //D58
+  PE6,  //D59
+  PE3,  //D60
+  PF8,  //D61
+  PF7,  //D62
+  PF9,  //D63
+  PG1,  //D64
+  PG0,  //D65
+  PD1,  //D66
+  PD0,  //D67
+  PF0,  //D68
+  PF1,  //D69
+  PF2,  //D70
+  PA7,  //D71 - used as D11 and connected to CN7 pin 14 by default, if JP6 is ON,
+        //     it is also connected to both Ethernet PHY as RMII_DV and CN9 pin 15.
+        //     In this case only one function of the Ethernet or D11 must be used. 
+  NC,   //D72
+  PB7,  //D73 - LED_BLUE
+  PB14, //D74 - LED_RED
+  PC13, //D75 - USER_BTN
+  PD9,  //D76 - Serial Rx
+  PD8,  //D77 - Serial Tx
+  PA3,  //D78/A0
+  PC0,  //D79/A1
+  PC3,  //D80/A2
+  PF3,  //D81/A3
+  PF5,  //D82/A4
+  PF10, //D83/A5
+  PB1,  //D84/A6
+  PC2,  //D85/A7
+  PF4,  //D86/A8
+  PF6,  //D87/A9
   // Duplicated pins in order to be aligned with PinMap_ADC
-  P, //D88/A10 = D
-  P, //D89/A11 = D
-  P, //D90/A12 = D
-  P, //D91/A13 = D
-  P, //D92/A14 = D
-  P, //D93/A15 = D
-  P, //D94/A16 = D
-  P  //D95/A17 = D
+  PA7,  //D88/A10 = D11/D71
+  PA6,  //D89/A11 = D12
+  PA5,  //D90/A12 = D13
+  PA4,  //D91/A13 = D24
+  PA0,  //D92/A14 = D32
+  PF8,  //D93/A15 = D61
+  PF7,  //D94/A16 = D62
+  PF9   //D95/A17 = D63
 };
 
 #ifdef __cplusplus
@@ -145,29 +151,34 @@ const PinName digitalPin[] = {
 /*
  * UART objects
  */
-// Replace PYx_Rx and PYx_Tx by UART_RX and UART_TX pin names
-HardwareSerial  Serial(PYx_Rx, PYx_Tx); // Connected to ST-Link
+HardwareSerial  Serial(PD9, PD8); // Connected to ST-Link
 
 void serialEvent() __attribute__((weak));
 void serialEvent() { }
 
-// Define as many Serial instance as desired
-// Replace 'SerialX' by the desired name
-//#ifdef ENABLE_SERIALX
-//HardwareSerial  SerialX(PYx_Rx, PYx_Tx);
-//
-//void serialEventx() __attribute__((weak));
-//void serialEventx() { }
-//#endif
+#ifdef ENABLE_SERIAL1
+HardwareSerial  Serial1(PG9, PG14);
+
+void serialEvent1() __attribute__((weak));
+void serialEvent1() { }
+#endif
+#ifdef ENABLE_SERIAL2
+HardwareSerial  Serial2(PD6, PD5);
+
+void serialEvent2() __attribute__((weak));
+void serialEvent2() { }
+#endif
 
 void serialEventRun(void)
 {
   if (Serial.available()) serialEvent();
-//#ifdef ENABLE_SERIALX
-//  if (SerialX.available()) serialEventX();
-//#endif
+#ifdef ENABLE_SERIAL1
+  if (Serial1.available()) serialEvent1();
+#endif
+#ifdef ENABLE_SERIAL2
+  if (Serial2.available()) serialEvent2();
+#endif
 }
-
 // ----------------------------------------------------------------------------
 
 #ifdef __cplusplus

variants/NUCLEO_F207ZG/variant.h

@@ -49,10 +49,6 @@ extern "C"{
 extern const PinName digitalPin[];
 
 // Enum defining Arduino style alias for digital pin number --> Dx
-// !!!
-// !!! It must be aligned with the number of PinName
-// !!! defined in digitalPin[] array in variant.cpp
-// !!!
 enum {
   D0,  D1,  D2,  D3,  D4,  D5,  D6,  D7,  D8,  D9,
   D10, D11, D12, D13, D14, D15, D16, D17, D18, D19,
@@ -67,10 +63,6 @@ enum {
   DEND
 };
 // Enum defining Arduino style alias for analog pin number --> Ax
-// !!!
-// !!! It must be aligned with the number of analog PinName
-// !!! defined in digitalPin[] array in variant.cpp
-// !!!
 enum {
   A_START_AFTER = D77, // pin number preceding A0
   A0,  A1,  A2,  A3,  A4,  A5,  A6,  A7,  A8,  A9,
@@ -88,54 +80,56 @@ enum {
 #define PWM_MAX_DUTY_CYCLE      255
 
 //On-board LED pin number
-#define LED_BUILTIN             Dx
+#define LED_BUILTIN             33
 #define LED_GREEN               LED_BUILTIN
+#define LED_BLUE                73
+#define LED_RED                 74
 
 //On-board user button
-#define USER_BTN                Dx
+#define USER_BTN                75
 
 
 //SPI definitions
 //define 16 channels. As many channel as digital IOs
 #define SPI_CHANNELS_NUM        16
 
 //default chip salect pin
-#define BOARD_SPI_DEFAULT_SS    10 // Default for Arduino connector compatibility
+#define BOARD_SPI_DEFAULT_SS    10
 
 //In case SPI CS channel is not used we define a default one
 #define BOARD_SPI_OWN_SS        SPI_CHANNELS_NUM
 
 #define SS                      BOARD_SPI_DEFAULT_SS
-#define MOSI                    11 // Default for Arduino connector compatibility
-#define MISO                    12 // Default for Arduino connector compatibility
-#define SCLK                    13 // Default for Arduino connector compatibility
+#define MOSI                    11
+#define MISO                    12
+#define SCLK                    13
 #define SCK                     SCLK
 
 //I2C Definitions
-#define SDA                     14 // Default for Arduino connector compatibility
-#define SCL                     15 // Default for Arduino connector compatibility
+#define SDA                     14
+#define SCL                     15
 
 //Timer Definitions
 //Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
-#define TIMER_TONE              TIMx
-#define TIMER_UART_EMULATED     TIMx
+#define TIMER_TONE              TIM6
+#define TIMER_UART_EMULATED     TIM7
 
 //Do not use basic timer: OC is required
-#define TIMER_SERVO             TIMx  //TODO: advanced-control timers don't work
+#define TIMER_SERVO             TIM2  //TODO: advanced-control timers don't work
 
-#define DEBUG_UART              ((USART_TypeDef *) U(S)ARTX) // ex: USART3
+#define DEBUG_UART              ((USART_TypeDef *) USART3)
 
 // UART Emulation (uncomment if needed, required TIM1)
 //#define UART_EMUL_RX            PYxx // PinName used for RX
 //#define UART_EMUL_TX            PYxx // PinName used for TX
 
 // Serial Pin Firmata
-#define PIN_SERIAL_RX           Dx
-#define PIN_SERIAL_TX           Dx
-// Define as many PIN_SERIALX than desired
-//#define PIN_SERIAL1_RX          Dx
-//#define PIN_SERIAL1_TX          Dx
-//...
+#define PIN_SERIAL_RX           76
+#define PIN_SERIAL_TX           77
+#define PIN_SERIAL1_RX          0
+#define PIN_SERIAL1_TX          1
+#define PIN_SERIAL2_RX          52
+#define PIN_SERIAL2_TX          53
 
 #ifdef __cplusplus
 } // extern "C"
@@ -147,8 +141,8 @@ enum {
 #ifdef __cplusplus
 // declare here as many UART objects than defined in variant.cpp
 extern HardwareSerial Serial;
-//extern HardwareSerial SerialX;
-//...
+extern HardwareSerial Serial1;
+extern HardwareSerial Serial2;
 
 // These serial port names are intended to allow libraries and architecture-neutral
 // sketches to automatically default to the correct port name for a particular type