Fix missing pin declaration

fpr · fpistm · commit 29bdd7c8885b · 2017-10-06T12:03:36.000+02:00
Signed-off-by: fpr &lt;fabien.perroquin@wi6labs.com&gt;
Signed-off-by: Frederic.Pillon &lt;frederic.pillon@st.com&gt;
diff --git a/variants/DISCO_L475VG_IOT/variant.cpp b/variants/DISCO_L475VG_IOT/variant.cpp
@@ -45,76 +45,79 @@ const PinName digitalPin[] = {
 // Not on connector
   PB_14, //D16 - LED2
   PC_13, //D17 - USER_BTN
+// ST-LINK
+  PB_6,  //D18 - ST-LINK-UART1_TX
+  PB_7,  //D19 - ST-LINK-UART1_RX
 // CN9 USB OTG FS connector
-  PA_9,  //D18 - USB_OTG_FS_VBUS
-  PA_10, //D19 - USB_OTG_FS_ID
-  PA_11, //D20 - USB_OTG_FS_DM
-  PA_12, //D21 - USB_OTG_FS_DP
-  PD_12, //D22 - USB_OTG_FS_PWR_EN
-  PE_3,  //D23 - USB_OTG_OVRCR_EXTI3
+  PA_9,  //D20 - USB_OTG_FS_VBUS
+  PA_10, //D21 - USB_OTG_FS_ID
+  PA_11, //D22 - USB_OTG_FS_DM
+  PA_12, //D23 - USB_OTG_FS_DP
+  PD_12, //D24 - USB_OTG_FS_PWR_EN
+  PE_3,  //D25 - USB_OTG_OVRCR_EXTI3
 // CN10 PMOD connector
-  PD_0,  //D24 - PMOD-RESET
-  PD_1,  //D25 - PMOD-SPI2_SCK
-  PD_2,  //D26 - PMOD-IRQ_EXTI2
-  PD_3,  //D27 - PMOD-UART2_CTS/SPI2_MISO
-  PD_4,  //D28 - PMOD-UART2_RTS/SPI2_MOSI
-  PD_5,  //D29 - PMOD-UART2_TX/SPI2_CSN
-  PD_6,  //D30 - PMOD-UART2_RX
+  PD_0,  //D26 - PMOD-RESET
+  PD_1,  //D27 - PMOD-SPI2_SCK
+  PD_2,  //D28 - PMOD-IRQ_EXTI2
+  PD_3,  //D29 - PMOD-UART2_CTS/SPI2_MISO
+  PD_4,  //D30 - PMOD-UART2_RTS/SPI2_MOSI
+  PD_5,  //D31 - PMOD-UART2_TX/SPI2_CSN
+  PD_6,  //D32 - PMOD-UART2_RX
 // Sensors / modules pins
-  PA_8,  //D31 - SPBTLE-RF-RST
-  PB_5,  //D32 - SPSGRF-915-SPI3_CSN
-  PB_10, //D33 - INTERNAL-I2C2_SCL
-  PB_11, //D34 - INTERNAL-I2C2_SDA
-  PB_12, //D35 - ISM43362-BOOT0
-  PB_13, //D36 - ISM43362-WAKEUP
-  PB_15, //D37 - SPSGRF-915-SDN
-  PC_6,  //D38 - VL53L0X_XSHUT
-  PC_7,  //D39 - VL53L0X_GPIO1_EXTI7
-  PC_8,  //D40 - LIS3MDL_DRDY_EXTI8
-  PC_9,  //D41 - LED3 (WIFI) & LED4 (BLE)
-  PC_10, //D42 - INTERNAL-SPI3_SCK
-  PC_11, //D43 - INTERNAL-SPI3_MISO
-  PC_12, //D44 - INTERNAL-SPI3_MOSI
-  PD_7,  //D45 - STSAFE-A100-RESET
-  PD_8,  //D46 - INTERNAL-UART3_TX
-  PD_9,  //D47 - INTERNAL-UART3_RX
-  PD_10, //D48 - LPS22HB_INT_DRDY_EXTI10
-  PD_11, //D49 - LSM6DSL_INT1_EXTI11
-  PD_13, //D50 - SPBTLE-RF-SPI3_CSN
-  PD_15, //D51 - HTS221_DRDY_EXTI15
-  PE_0,  //D52 - ISM43362-SPI3_CSN
-  PE_1,  //D53 - ISM43362-DRDY_EXTI1
-  PE_2,  //D54 - M24SR64-Y-RF_DISABLE
-  PE_4,  //D55 - M24SR64-Y-GPO
-  PE_5,  //D56 - SPSGRF-915-GPIO3_EXTI5
-  PE_6,  //D57 - SPBTLE-RF-IRQ_EXTI6
-  PE_7,  //D58 - DFSDM1_DATIN2
-  PE_8,  //D59 - ISM43362-RST
-  PE_9,  //D60 - DFSDM1_CKOUT
-  PE_10, //D61 - QUADSPI_CLK
-  PE_11, //D62 - QUADSPI_NCS
-  PE_12, //D63 - QUADSPI_BK1_IO0
-  PE_13, //D64 - QUADSPI_BK1_IO1
-  PE_14, //D65 - QUADSPI_BK1_IO2
-  PE_15, //D66 - QUADSPI_BK1_IO3
+  PA_8,  //D33 - SPBTLE-RF-RST
+  PB_5,  //D34 - SPSGRF-915-SPI3_CSN
+  PB_10, //D35 - INTERNAL-I2C2_SCL
+  PB_11, //D36 - INTERNAL-I2C2_SDA
+  PB_12, //D37 - ISM43362-BOOT0
+  PB_13, //D38 - ISM43362-WAKEUP
+  PB_15, //D39 - SPSGRF-915-SDN
+  PC_6,  //D40 - VL53L0X_XSHUT
+  PC_7,  //D41 - VL53L0X_GPIO1_EXTI7
+  PC_8,  //D42 - LIS3MDL_DRDY_EXTI8
+  PC_9,  //D43 - LED3 (WIFI) & LED4 (BLE)
+  PC_10, //D44 - INTERNAL-SPI3_SCK
+  PC_11, //D45 - INTERNAL-SPI3_MISO
+  PC_12, //D46 - INTERNAL-SPI3_MOSI
+  PD_7,  //D47 - STSAFE-A100-RESET
+  PD_8,  //D48 - INTERNAL-UART3_TX
+  PD_9,  //D49 - INTERNAL-UART3_RX
+  PD_10, //D50 - LPS22HB_INT_DRDY_EXTI10
+  PD_11, //D51 - LSM6DSL_INT1_EXTI11
+  PD_13, //D52 - SPBTLE-RF-SPI3_CSN
+  PD_15, //D53 - HTS221_DRDY_EXTI15
+  PE_0,  //D54 - ISM43362-SPI3_CSN
+  PE_1,  //D55 - ISM43362-DRDY_EXTI1
+  PE_2,  //D56 - M24SR64-Y-RF_DISABLE
+  PE_4,  //D57 - M24SR64-Y-GPO
+  PE_5,  //D58 - SPSGRF-915-GPIO3_EXTI5
+  PE_6,  //D59 - SPBTLE-RF-IRQ_EXTI6
+  PE_7,  //D60 - DFSDM1_DATIN2
+  PE_8,  //D61 - ISM43362-RST
+  PE_9,  //D62 - DFSDM1_CKOUT
+  PE_10, //D63 - QUADSPI_CLK
+  PE_11, //D64 - QUADSPI_NCS
+  PE_12, //D65 - QUADSPI_BK1_IO0
+  PE_13, //D66 - QUADSPI_BK1_IO1
+  PE_14, //D67 - QUADSPI_BK1_IO2
+  PE_15, //D68 - QUADSPI_BK1_IO3
 // CN4 connector
-  PC_5,  //D67/A0
-  PC_4,  //D68/A1
-  PC_3,  //D69/A2
-  PC_2,  //D70/A3
-  PC_1,  //D71/A4
-  PC_0,  //D72/A5
+  PC_5,  //D69/A0
+  PC_4,  //D70/A1
+  PC_3,  //D71/A2
+  PC_2,  //D72/A3
+  PC_1,  //D73/A4
+  PC_0,  //D74/A5
 // Duplicated pins in order to be aligned with PinMap_ADC
-  PA_1,  //D73/A6
-  PA_0,  //D74/A7
-  PB_0,  //D75/A8
-  PA_3,  //D76/A9
-  PB_1,  //D77/A10
-  PA_4,  //D78/A11
-  PA_2,  //D79/A12
-  PA_7,  //D80/A13
-  PA_6,  //D81/A14
-  PA_5  //D82/A15
+  PA_1,  //D75/A6
+  PA_0,  //D76/A7
+  PB_0,  //D77/A8
+  PA_3,  //D78/A9
+  PB_1,  //D79/A10
+  PA_4,  //D80/A11
+  PA_2,  //D81/A12
+  PA_7,  //D82/A13
+  PA_6,  //D83/A14
+  PA_5   //D84/A15
 };
 
 #ifdef __cplusplus
diff --git a/variants/DISCO_L475VG_IOT/variant.h b/variants/DISCO_L475VG_IOT/variant.h
@@ -36,101 +36,104 @@ extern const PinName digitalPin[];
 
 enum {
 // CN3 connector
-  PA1,  //D0
-  PA0,  //D1
+  PA1,  //D0 - UART4_RX
+  PA0,  //D1 - UART4_TX
   PD14, //D2
-  PB0,  //D3
+  PB0,  //D3 - PWM
   PA3,  //D4
-  PB4,  //D5
-  PB1,  //D6
+  PB4,  //D5 - PWM
+  PB1,  //D6 - PWM
   PA4,  //D7
 // CN1 connector
   PB2,  //D8
-  PA15, //D9
-  PA2,  //D10
-  PA7,  //D11
-  PA6,  //D12
-  PA5,  //D13
-  PB9,  //D14
-  PB8,  //D15
+  PA15, //D9 - PWM
+  PA2,  //D10 - SPI_SSN/PWM
+  PA7,  //D11 - SPI1_MOSI/PWM
+  PA6,  //D12 - SPI1_MISO
+  PA5,  //D13 - SPI1_SCK/LED1
+  PB9,  //D14 - I2C1_SDA
+  PB8,  //D15 - I2C1_SCL
 // Not on connector
-  PB14, //D16
-  PC13, //D17
+  PB14, //D16 - LED2
+  PC13, //D17 - USER_BTN
+// ST-LINK
+  PB6,  //D18 - ST-LINK-UART1_TX
+  PB7,  //D19 - ST-LINK-UART1_RX
 // CN9 USB OTG FS connector
-  PA9,  //D18
-  PA10, //D19
-  PA11, //D20
-  PA12, //D21
-  PD12, //D22
-  PE3,  //D23
+  PA9,  //D20 - USB_OTG_FS_VBUS
+  PA10, //D21 - USB_OTG_FS_ID
+  PA11, //D22 - USB_OTG_FS_DM
+  PA12, //D23 - USB_OTG_FS_DP
+  PD12, //D24 - USB_OTG_FS_PWR_EN
+  PE3,  //D25 - USB_OTG_OVRCR_EXTI3
 // CN10 PMOD connector
-  PD0,  //D24
-  PD1,  //D25
-  PD2,  //D26
-  PD3,  //D27
-  PD4,  //D28
-  PD5,  //D29
-  PD6,  //D30
+  PD0,  //D26 - PMOD-RESET
+  PD1,  //D27 - PMOD-SPI2_SCK
+  PD2,  //D28 - PMOD-IRQ_EXTI2
+  PD3,  //D29 - PMOD-UART2_CTS/SPI2_MISO
+  PD4,  //D30 - PMOD-UART2_RTS/SPI2_MOSI
+  PD5,  //D31 - PMOD-UART2_TX/SPI2_CSN
+  PD6,  //D32 - PMOD-UART2_RX
 // Sensors / modules pins
-  PA8,  //D31
-  PB5,  //D32
-  PB10, //D33
-  PB11, //D34
-  PB12, //D35
-  PB13, //D36
-  PB15, //D37
-  PC6,  //D38
-  PC7,  //D39
-  PC8,  //D40
-  PC9,  //D41
-  PC10, //D42
-  PC11, //D43
-  PC12, //D44
-  PD7,  //D45
-  PD8,  //D46
-  PD9,  //D47
-  PD10, //D48
-  PD11, //D49
-  PD13, //D50
-  PD15, //D51
-  PE0,  //D52
-  PE1,  //D53
-  PE2,  //D54
-  PE4,  //D55
-  PE5,  //D56
-  PE6,  //D57
-  PE7,  //D58
-  PE8,  //D59
-  PE9,  //D60
-  PE10, //D61
-  PE11, //D62
-  PE12, //D63
-  PE13, //D64
-  PE14, //D65
-  PE15, //D66
+  PA8,  //D33 - SPBTLE-RF-RST
+  PB5,  //D34 - SPSGRF-915-SPI3_CSN
+  PB10, //D35 - INTERNAL-I2C2_SCL
+  PB11, //D36 - INTERNAL-I2C2_SDA
+  PB12, //D37 - ISM43362-BOOT0
+  PB13, //D38 - ISM43362-WAKEUP
+  PB15, //D39 - SPSGRF-915-SDN
+  PC6,  //D40 - VL53L0X_XSHUT
+  PC7,  //D41 - VL53L0X_GPIO1_EXTI7
+  PC8,  //D42 - LIS3MDL_DRDY_EXTI8
+  PC9,  //D43 - LED3 (WIFI) & LED4 (BLE)
+  PC10, //D44 - INTERNAL-SPI3_SCK
+  PC11, //D45 - INTERNAL-SPI3_MISO
+  PC12, //D46 - INTERNAL-SPI3_MOSI
+  PD7,  //D47 - STSAFE-A100-RESET
+  PD8,  //D48 - INTERNAL-UART3_TX
+  PD9,  //D49 - INTERNAL-UART3_RX
+  PD10, //D50 - LPS22HB_INT_DRDY_EXTI10
+  PD11, //D51 - LSM6DSL_INT1_EXTI11
+  PD13, //D52 - SPBTLE-RF-SPI3_CSN
+  PD15, //D53 - HTS221_DRDY_EXTI15
+  PE0,  //D54 - ISM43362-SPI3_CSN
+  PE1,  //D55 - ISM43362-DRDY_EXTI1
+  PE2,  //D56 - M24SR64-Y-RF_DISABLE
+  PE4,  //D57 - M24SR64-Y-GPO
+  PE5,  //D58 - SPSGRF-915-GPIO3_EXTI5
+  PE6,  //D59 - SPBTLE-RF-IRQ_EXTI6
+  PE7,  //D60 - DFSDM1_DATIN2
+  PE8,  //D61 - ISM43362-RST
+  PE9,  //D62 - DFSDM1_CKOUT
+  PE10, //D63 - QUADSPI_CLK
+  PE11, //D64 - QUADSPI_NCS
+  PE12, //D65 - QUADSPI_BK1_IO0
+  PE13, //D66 - QUADSPI_BK1_IO1
+  PE14, //D67 - QUADSPI_BK1_IO2
+  PE15, //D68 - QUADSPI_BK1_IO3
 // CN4 connector
-  PC5,  //D67/A0
-  PC4,  //D68/A1
-  PC3,  //D69/A2
-  PC2,  //D70/A3
-  PC1,  //D71/A4
-  PC0,  //D72/A5
+  PC5,  //D69/A0
+  PC4,  //D70/A1
+  PC3,  //D71/A2
+  PC2,  //D72/A3
+  PC1,  //D73/A4
+  PC0,  //D74/A5
 // Duplicated pins in order to be aligned with PinMap_ADC
-  PA1_2,  //D73/A6
-  PA0_2,  //D74/A7
-  PB0_2,  //D75/A8
-  PA3_2,  //D76/A9
-  PB1_2,  //D77/A10
-  PA4_2,  //D78/A11
-  PA2_2,  //D79/A12
-  PA7_2,  //D80/A13
-  PA6_2,  //D81/A14
-  PA5_2,  //D82/A15
+  PA1_2, //D75/A6
+  PA0_2, //D76/A7
+  PB0_2, //D77/A8
+  PA3_2, //D78/A9
+  PB1_2, //D79/A10
+  PA4_2, //D80/A11
+  PA2_2, //D81/A12
+  PA7_2, //D82/A13
+  PA6_2, //D83/A14
+  PA5_2, //D84/A15
   PEND
 };
 
 enum {
-  A_START_AFTER = D66,
+  A_START_AFTER = D68,
   A0,  A1,  A2,  A3,  A4,  A5,  A6,  A7,  A8,  A9,
   A10, A11, A12, A13, A14, A15,
   AEND
@@ -148,12 +151,12 @@ enum {
 //On-board LED pin number
 #define LED_BUILTIN             13
 #define LED1                    LED_BUILTIN
-#define LED2                    16
-#define LED3                    41
+#define LED2                    PB14
+#define LED3                    PC9
 #define LED4                    LED3
 
 //On-board user button
-#define USER_BTN                17
+#define USER_BTN                PC13
 
 
 //SPI definitions
@@ -181,8 +184,8 @@ enum {
 #define SERIAL_UART_INSTANCE    1 //Connected to ST-Link
 // Default pin used for 'Serial' instance (ex: ST-Link)
 // Mandatory for Firmata
-#define PIN_SERIAL_RX           0
-#define PIN_SERIAL_TX           1
+#define PIN_SERIAL_RX           PB7
+#define PIN_SERIAL_TX           PB6
 
 #ifdef __cplusplus
 } // extern "C"
