From f102fdaf0f33cc5c3191c4300f518b719b838caa Mon Sep 17 00:00:00 2001 From: bcostm Date: Fri, 28 Mar 2014 18:16:10 +0100 Subject: [PATCH 1/5] Add missing pin labels used in examples. --- .../mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/PinNames.h | 2 ++ .../mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/PinNames.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/PinNames.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/PinNames.h index 756d94a6ca..36bc140742 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/PinNames.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/PinNames.h @@ -148,6 +148,8 @@ typedef enum { LED3 = PA_5, LED4 = PA_5, USER_BUTTON = PC_13, + SERIAL_TX = PA_2, + SERIAL_RX = PA_3, USBTX = PA_2, USBRX = PA_3, I2C_SCL = PB_8, diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/PinNames.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/PinNames.h index 0a048d021e..1fd8048cb1 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/PinNames.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/PinNames.h @@ -138,6 +138,8 @@ typedef enum { LED3 = PA_5, LED4 = PA_5, USER_BUTTON = PC_13, + SERIAL_TX = PA_2, + SERIAL_RX = PA_3, USBTX = PA_2, USBRX = PA_3, I2C_SCL = PB_8, From d0c1c2003fd4647fcaaf3ed2ef197e2faaaa5451 Mon Sep 17 00:00:00 2001 From: bcostm Date: Wed, 2 Apr 2014 13:59:17 +0200 Subject: [PATCH 2/5] [NUCLEO_xxx] Fix compilation error with missing Port names This error was due to the last changed in the error.h file. --- .../mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/pinmap.c | 1 + .../mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/pinmap.c | 1 + .../mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/pinmap.c | 1 + .../mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/pinmap.c | 1 + 4 files changed, 4 insertions(+) diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/pinmap.c index 5d712cc319..844157b482 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/pinmap.c @@ -28,6 +28,7 @@ ******************************************************************************* */ #include "pinmap.h" +#include "PortNames.h" #include "error.h" // Alternate-function mapping diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/pinmap.c index 889ee7321a..3cd9a2103a 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/pinmap.c @@ -28,6 +28,7 @@ ******************************************************************************* */ #include "pinmap.h" +#include "PortNames.h" #include "error.h" // Enable GPIO clock and return GPIO base address diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/pinmap.c index 0c25fca917..7844af4f44 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/pinmap.c @@ -28,6 +28,7 @@ ******************************************************************************* */ #include "pinmap.h" +#include "PortNames.h" #include "error.h" #include "stm32f4xx_hal.h" diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/pinmap.c index c73f374765..bfc70fdbbe 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/pinmap.c @@ -28,6 +28,7 @@ ******************************************************************************* */ #include "pinmap.h" +#include "PortNames.h" #include "error.h" // Enable GPIO clock and return GPIO base address From c2bfc1217b13f75388eb7dcad1d3d3ced3cfe6ba Mon Sep 17 00:00:00 2001 From: bcostm Date: Wed, 2 Apr 2014 14:02:56 +0200 Subject: [PATCH 3/5] [NUCLEO_F401RE] Fix issue with PWM on PC_9 The correct channel is 4 and not 3. --- .../hal/TARGET_STM/TARGET_NUCLEO_F401RE/pwmout_api.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/pwmout_api.c index e547c88e70..b77546eb0f 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/pwmout_api.c @@ -77,7 +77,7 @@ static const PinMap PinMap_PWM[] = { {PC_6, PWM_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3)}, // TIM3_CH1 {PC_7, PWM_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3)}, // TIM3_CH2 {PC_8, PWM_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3)}, // TIM3_CH3 - {PC_9, PWM_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3)}, // TIM3_CH3 + {PC_9, PWM_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3)}, // TIM3_CH4 {NC, NC, 0} }; @@ -189,7 +189,6 @@ void pwmout_write(pwmout_t* obj, float value) { case PB_8: case PB_10: case PC_8: - case PC_9: channel = TIM_CHANNEL_3; break; // Channels 3N @@ -202,7 +201,8 @@ void pwmout_write(pwmout_t* obj, float value) { //case PA_3: case PA_11: //case PB_1: - case PB_9: + case PB_9: + case PC_9: channel = TIM_CHANNEL_4; break; default: From 76afd011cd7f439896f84fcd11a9ca2a6a4eaecf Mon Sep 17 00:00:00 2001 From: bcostm Date: Wed, 2 Apr 2014 14:05:42 +0200 Subject: [PATCH 4/5] [NUCLEO_F302R8] Correct D11-D13 pin names --- .../targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/PinNames.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/PinNames.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/PinNames.h index 3c7918739e..1227a5e849 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/PinNames.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/PinNames.h @@ -131,9 +131,9 @@ typedef enum { D8 = PA_9, D9 = PC_7, D10 = PB_6, - D11 = PA_7, - D12 = PA_6, - D13 = PA_5, + D11 = PB_15, + D12 = PB_14, + D13 = PB_13, D14 = PB_9, D15 = PB_8, From b7035550f7c430d26e065109f96c5eb139c9c8b5 Mon Sep 17 00:00:00 2001 From: bcostm Date: Wed, 2 Apr 2014 14:13:50 +0200 Subject: [PATCH 5/5] [NUCLEO_F030R8] Fix issue with last changes in error.h --- .../mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/pinmap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/pinmap.c index 16f55fe88f..c4f21316b1 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/pinmap.c @@ -28,6 +28,7 @@ ******************************************************************************* */ #include "pinmap.h" +#include "PortNames.h" #include "error.h" // Enable GPIO clock and return GPIO base address