en 129 / mbed-src

[11U68]fix P0_11 to use GPIO

Fork of mbed-src by mbed official

Files at this revision

API Documentation at this revision

Revision 578:dd2bc6eabbef, committed 2015-07-01

Comitter:
mbed_official
Date:
Wed Jul 01 08:45:08 2015 +0100
Parent:
577:15494b56c2f3
Child:
579:53297373a894
Commit message:
Synchronized with git revision 2f385f32b21bf73d1efd19b9e6f9c81843e3f26a

Full URL: https://github.com/mbedmicro/mbed/commit/2f385f32b21bf73d1efd19b9e6f9c81843e3f26a/

MTS_DRAGONFLY_F411RE - add additional pin names for SPI and I2C?

Changed in this revision

targets/hal/TARGET_STM/TARGET_STM32F4/TARGET_MTS_DRAGONFLY_F411RE/PeripheralPins.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_STM32F4/TARGET_MTS_DRAGONFLY_F411RE/PinNames.h Show annotated file Show diff for this revision Revisions of this file 
--- a/targets/hal/TARGET_STM/TARGET_STM32F4/TARGET_MTS_DRAGONFLY_F411RE/PeripheralPins.c	Wed Jul 01 08:15:11 2015 +0100
+++ b/targets/hal/TARGET_STM/TARGET_STM32F4/TARGET_MTS_DRAGONFLY_F411RE/PeripheralPins.c	Wed Jul 01 08:45:08 2015 +0100
@@ -157,8 +157,8 @@
     {PA_1,  SPI_4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
     {PA_7,  SPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)}, // ARDUINO
     {PA_10, SPI_5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI5)},
-//  {PB_5,  SPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-    {PB_5,  SPI_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+    {PB_5,  SPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+//  {PB_5,  SPI_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
     {PB_8,  SPI_5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI5)},
     {PB_15, SPI_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
     {PC_3,  SPI_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
@@ -170,8 +170,8 @@
     {PA_6,  SPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)}, // ARDUINO
     {PA_11, SPI_4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI4)},
     {PA_12, SPI_5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI5)},
-//  {PB_4,  SPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-    {PB_4,  SPI_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+    {PB_4,  SPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+//  {PB_4,  SPI_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
     {PB_14, SPI_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
     {PC_2,  SPI_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
     {PC_11, SPI_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},

--- a/targets/hal/TARGET_STM/TARGET_STM32F4/TARGET_MTS_DRAGONFLY_F411RE/PinNames.h	Wed Jul 01 08:15:11 2015 +0100
+++ b/targets/hal/TARGET_STM/TARGET_STM32F4/TARGET_MTS_DRAGONFLY_F411RE/PinNames.h	Wed Jul 01 08:45:08 2015 +0100
@@ -125,22 +125,22 @@
     PH_1  = 0x71,
 
     // Arduino connector namings
-    A0          = PA_0,
-    A1          = PA_1,
+    A0          = PC_2,
+    A1          = PC_0,
     A2          = PC_4,
     A3          = PB_0,
     A4          = PC_1,
-    A5          = PC_0,
+    A5          = PC_9,
     D0          = PA_3,
     D1          = PA_2,
-    D2          = PC_9,
-    D3          = PB_15,
-    D4          = PA_8,
-    D5          = PA_7,
-    D6          = PB_13,
-    D7          = PC_2,
-    D8          = PA_9,
-    D9          = PB_1,
+    D2          = PB_15,
+    D3          = PA_0,
+    D4          = PA_7,
+    D5          = PA_9,
+    D6          = PA_1,
+    D7          = PA_8,
+    D8          = PB_1,
+    D9          = PB_13,
     D10         = PC_8,
     D11         = PB_5,
     D12         = PA_6,
@@ -171,11 +171,34 @@
     RADIO_DSR   = D8,
     RADIO_DTR   = D4,
     RADIO_RI    = D9,
-    I2C_SCL     = D15,
-    I2C_SDA     = D14,
-    SPI_MOSI    = PC_12,
-    SPI_MISO    = PC_11,
-    SPI_SCK     = PC_10,
+
+    // I2C1 and I2C3 are available on Arduino pins
+    I2C1_SCL    = D15,
+    I2C1_SDA    = D14,     
+    I2C3_SCL    = D7,
+    I2C3_SDA    = A5,
+
+    // legacy definitions
+    I2C_SCL     = I2C1_SCL,
+    I2C_SDA     = I2C1_SDA,
+
+    // SPI1 and SPI2 are available on Arduino pins
+    SPI1_MOSI   = D11,
+    SPI1_MISO   = D12,
+    SPI1_SCK    = D13,
+    SPI2_MOSI   = D2,
+    SPI2_MISO   = A0,
+    SPI2_SCK    = D9,
+
+    // SPI3 connects to flash part
+    SPI3_MOSI   = PC_12,
+    SPI3_MISO   = PC_11,
+    SPI3_SCK    = PC_10,
+
+    // legacy definitions
+    SPI_MOSI    = SPI3_MOSI,
+    SPI_MISO    = SPI3_MISO,
+    SPI_SCK     = SPI3_SCK,
     SPI_CS1     = PA_4,
     SPI_CS2     = PB_14,