From ac6b5cb06b8bbf61ac9ff3ab1de92373b3177e44 Mon Sep 17 00:00:00 2001 From: bcostm Date: Fri, 14 Nov 2014 11:01:47 +0100 Subject: [PATCH] [NUCLEO_F0] Align hal files --- .../TARGET_NUCLEO_F030R8/PinNames.h | 3 +- .../TARGET_STM/TARGET_NUCLEO_F030R8/device.h | 2 +- .../TARGET_STM/TARGET_NUCLEO_F030R8/i2c_api.c | 21 +++++------- .../TARGET_NUCLEO_F030R8/pwmout_api.c | 6 ---- .../TARGET_STM/TARGET_NUCLEO_F030R8/rtc_api.c | 8 ++--- .../TARGET_NUCLEO_F030R8/serial_api.c | 10 ++++-- .../TARGET_STM/TARGET_NUCLEO_F030R8/spi_api.c | 33 +++++++++++++------ .../TARGET_STM/TARGET_NUCLEO_F072RB/i2c_api.c | 21 +++++------- .../TARGET_STM/TARGET_NUCLEO_F072RB/rtc_api.c | 8 ++--- .../TARGET_NUCLEO_F072RB/serial_api.c | 5 +++ .../TARGET_STM/TARGET_NUCLEO_F072RB/spi_api.c | 3 +- .../TARGET_NUCLEO_F072RB/us_ticker.c | 2 +- .../TARGET_NUCLEO_F091RC/PinNames.h | 3 +- 13 files changed, 68 insertions(+), 57 deletions(-) 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 c9d6b94ba6..51eb019939 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 @@ -36,12 +36,11 @@ extern "C" { #endif +// See stm32f0xx_hal_gpio.h and stm32f0xx_hal_gpio_ex.h for values of MODE, PUPD and AFNUM #define STM_PIN_DATA(MODE, PUPD, AFNUM) ((int)(((AFNUM) << 7) | ((PUPD) << 4) | ((MODE) << 0))) - #define STM_PIN_MODE(X) (((X) >> 0) & 0x0F) #define STM_PIN_PUPD(X) (((X) >> 4) & 0x07) #define STM_PIN_AFNUM(X) (((X) >> 7) & 0x0F) - #define STM_MODE_INPUT (0) #define STM_MODE_OUTPUT_PP (1) #define STM_MODE_OUTPUT_OD (2) diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/device.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/device.h index 4f4c8fdfd6..57a7aa227d 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/device.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/device.h @@ -63,7 +63,7 @@ #define DEVICE_STDIO_MESSAGES 1 -//#define DEVICE_ERROR_RED 0 +#define DEVICE_ERROR_RED 0 #include "objects.h" diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/i2c_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/i2c_api.c index 5b49563207..490afa0cca 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/i2c_api.c @@ -80,6 +80,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) pin_mode(sda, OpenDrain); pin_mode(scl, OpenDrain); } + // Enable I2C2 clock and pinout if not done if ((obj->i2c == I2C_2) && !i2c2_inited) { i2c2_inited = 1; @@ -176,7 +177,7 @@ int i2c_read(i2c_t *obj, int address, char *data, int length, int stop) int count; int value; - /* update CR2 register */ + // Update CR2 register i2c->CR2 = (i2c->CR2 & (uint32_t)~((uint32_t)(I2C_CR2_SADD | I2C_CR2_NBYTES | I2C_CR2_RELOAD | I2C_CR2_AUTOEND | I2C_CR2_RD_WRN | I2C_CR2_START | I2C_CR2_STOP))) | (uint32_t)(((uint32_t)address & I2C_CR2_SADD) | (((uint32_t)length << 16) & I2C_CR2_NBYTES) | (uint32_t)I2C_SOFTEND_MODE | (uint32_t)I2C_GENERATE_START_READ); @@ -199,7 +200,7 @@ int i2c_read(i2c_t *obj, int address, char *data, int length, int stop) // If not repeated start, send stop. if (stop) { i2c_stop(obj); - /* Wait until STOPF flag is set */ + // Wait until STOPF flag is set timeout = FLAG_TIMEOUT; while (__HAL_I2C_GET_FLAG(&I2cHandle, I2C_FLAG_STOPF) == RESET) { timeout--; @@ -207,7 +208,7 @@ int i2c_read(i2c_t *obj, int address, char *data, int length, int stop) return -1; } } - /* Clear STOP Flag */ + // Clear STOP Flag __HAL_I2C_CLEAR_FLAG(&I2cHandle, I2C_FLAG_STOPF); } @@ -221,12 +222,10 @@ int i2c_write(i2c_t *obj, int address, const char *data, int length, int stop) int timeout; int count; - /* update CR2 register */ + // Update CR2 register i2c->CR2 = (i2c->CR2 & (uint32_t)~((uint32_t)(I2C_CR2_SADD | I2C_CR2_NBYTES | I2C_CR2_RELOAD | I2C_CR2_AUTOEND | I2C_CR2_RD_WRN | I2C_CR2_START | I2C_CR2_STOP))) | (uint32_t)(((uint32_t)address & I2C_CR2_SADD) | (((uint32_t)length << 16) & I2C_CR2_NBYTES) | (uint32_t)I2C_SOFTEND_MODE | (uint32_t)I2C_GENERATE_START_WRITE); - - for (count = 0; count < length; count++) { i2c_byte_write(obj, data[count]); } @@ -241,10 +240,10 @@ int i2c_write(i2c_t *obj, int address, const char *data, int length, int stop) } __HAL_I2C_CLEAR_FLAG(&I2cHandle, I2C_FLAG_TC); - // If not repeated start, send stop. + // If not repeated start, send stop if (stop) { i2c_stop(obj); - /* Wait until STOPF flag is set */ + // Wait until STOPF flag is set timeout = FLAG_TIMEOUT; while (__HAL_I2C_GET_FLAG(&I2cHandle, I2C_FLAG_STOPF) == RESET) { timeout--; @@ -252,7 +251,7 @@ int i2c_write(i2c_t *obj, int address, const char *data, int length, int stop) return -1; } } - /* Clear STOP Flag */ + // Clear STOP Flag __HAL_I2C_CLEAR_FLAG(&I2cHandle, I2C_FLAG_STOPF); } @@ -297,7 +296,7 @@ void i2c_reset(i2c_t *obj) { int timeout; - // wait before reset + // Wait before reset timeout = LONG_TIMEOUT; while ((__HAL_I2C_GET_FLAG(&I2cHandle, I2C_FLAG_BUSY)) && (timeout-- != 0)); @@ -334,7 +333,6 @@ void i2c_slave_address(i2c_t *obj, int idx, uint32_t address, uint32_t mask) void i2c_slave_mode(i2c_t *obj, int enable_slave) { - I2C_TypeDef *i2c = (I2C_TypeDef *)(obj->i2c); uint16_t tmpreg; @@ -350,7 +348,6 @@ void i2c_slave_mode(i2c_t *obj, int enable_slave) // Set new mode i2c->OAR1 = tmpreg; - } // See I2CSlave.h diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/pwmout_api.c index 59f67662f0..1828d1b3b2 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/pwmout_api.c @@ -36,9 +36,6 @@ #include "mbed_error.h" // TIM1 cannot be used because already used by the us_ticker -// Uncomment/comment line above to use an alternate timer, -// If the channel is not the same, -// Please don't forget to uncomment/comment in the pwmout_write() function also static const PinMap PinMap_PWM[] = { {PA_4, PWM_14, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_TIM14)}, // TIM14_CH1 {PA_6, PWM_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF1_TIM3)}, // TIM3_CH1 @@ -128,7 +125,6 @@ void pwmout_write(pwmout_t* obj, float value) // Channels 1 case PA_4: case PA_6: -// case PA_7: case PB_1: case PB_4: case PB_8: @@ -140,7 +136,6 @@ void pwmout_write(pwmout_t* obj, float value) // Channels 1N case PB_6: case PB_7: -// case PB_15: channel = TIM_CHANNEL_1; complementary_channel = 1; break; @@ -157,7 +152,6 @@ void pwmout_write(pwmout_t* obj, float value) channel = TIM_CHANNEL_3; break; // Channels 4 -// case PB_1: case PC_9: channel = TIM_CHANNEL_4; break; diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/rtc_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/rtc_api.c index 0bb2b10e4b..09372b9c32 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/rtc_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/rtc_api.c @@ -59,8 +59,8 @@ void rtc_init(void) // Enable LSE Oscillator RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSE; - RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE; /* Mandatory, otherwise the PLL is reconfigured! */ - RCC_OscInitStruct.LSEState = RCC_LSE_ON; /* External 32.768 kHz clock on OSC_IN/OSC_OUT */ + RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE; // Mandatory, otherwise the PLL is reconfigured! + RCC_OscInitStruct.LSEState = RCC_LSE_ON; // External 32.768 kHz clock on OSC_IN/OSC_OUT if (HAL_RCC_OscConfig(&RCC_OscInitStruct) == HAL_OK) { // Connect LSE to RTC __HAL_RCC_RTC_CONFIG(RCC_RTCCLKSOURCE_LSE); @@ -76,8 +76,8 @@ void rtc_init(void) } // Connect LSI to RTC __HAL_RCC_RTC_CONFIG(RCC_RTCCLKSOURCE_LSI); - // [TODO] This value is LSI typical value. To be measured precisely using a timer input capture. - rtc_freq = 32000; + // This value is LSI typical value. To be measured precisely using a timer input capture for example. + rtc_freq = LSI_VALUE; } // Enable RTC diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/serial_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/serial_api.c index 021e73d97c..5933568a8f 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/serial_api.c @@ -102,6 +102,7 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) __USART1_CLK_ENABLE(); obj->index = 0; } + if (obj->uart == UART_2) { __USART2_CLK_ENABLE(); obj->index = 1; @@ -110,8 +111,12 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) // Configure the UART pins pinmap_pinout(tx, PinMap_UART_TX); pinmap_pinout(rx, PinMap_UART_RX); - pin_mode(tx, PullUp); - pin_mode(rx, PullUp); + if (tx != NC) { + pin_mode(tx, PullUp); + } + if (rx != NC) { + pin_mode(rx, PullUp); + } // Configure UART obj->baudrate = 9600; @@ -139,6 +144,7 @@ void serial_free(serial_t *obj) __USART1_RELEASE_RESET(); __USART1_CLK_DISABLE(); } + if (obj->uart == UART_2) { __USART2_FORCE_RESET(); __USART2_RELEASE_RESET(); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/spi_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/spi_api.c index 5b689b9752..e66e3548d1 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/spi_api.c @@ -154,7 +154,7 @@ void spi_free(spi_t *obj) __SPI2_CLK_DISABLE(); } - // Configure GPIO + // Configure GPIOs pin_function(obj->pin_miso, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)); pin_function(obj->pin_mosi, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)); pin_function(obj->pin_sclk, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)); @@ -220,6 +220,7 @@ void spi_frequency(spi_t *obj, int hz) } else { // >= 24000000 obj->br_presc = SPI_BAUDRATEPRESCALER_2; // 24 MHz } + init_spi(obj); } @@ -245,13 +246,12 @@ static inline void ssp_write(spi_t *obj, int value) { SPI_TypeDef *spi = (SPI_TypeDef *)(obj->spi); while (!ssp_writeable(obj)); - - if (obj->bits <= SPI_DATASIZE_8BIT) { - // force 8-bit access the data register due to SPI data buffer in this device + if (obj->bits == SPI_DATASIZE_8BIT) { + // Force 8-bit access to the data register uint8_t *p_spi_dr = 0; p_spi_dr = (uint8_t *) & (spi->DR); *p_spi_dr = (uint8_t)value; - } else { + } else { // SPI_DATASIZE_16BIT spi->DR = (uint16_t)value; } } @@ -260,9 +260,8 @@ static inline int ssp_read(spi_t *obj) { SPI_TypeDef *spi = (SPI_TypeDef *)(obj->spi); while (!ssp_readable(obj)); - - if (obj->bits <= SPI_DATASIZE_8BIT) { - // force 8-bit access the data register due to SPI data buffer in this device + if (obj->bits == SPI_DATASIZE_8BIT) { + // Force 8-bit access to the data register uint8_t *p_spi_dr = 0; p_spi_dr = (uint8_t *) & (spi->DR); return (int)(*p_spi_dr); @@ -294,14 +293,28 @@ int spi_slave_read(spi_t *obj) { SPI_TypeDef *spi = (SPI_TypeDef *)(obj->spi); while (!ssp_readable(obj)); - return (int)spi->DR; + if (obj->bits == SPI_DATASIZE_8BIT) { + // Force 8-bit access to the data register + uint8_t *p_spi_dr = 0; + p_spi_dr = (uint8_t *) & (spi->DR); + return (int)(*p_spi_dr); + } else { + return (int)spi->DR; + } } void spi_slave_write(spi_t *obj, int value) { SPI_TypeDef *spi = (SPI_TypeDef *)(obj->spi); while (!ssp_writeable(obj)); - spi->DR = (uint16_t)value; + if (obj->bits == SPI_DATASIZE_8BIT) { + // Force 8-bit access to the data register + uint8_t *p_spi_dr = 0; + p_spi_dr = (uint8_t *) & (spi->DR); + *p_spi_dr = (uint8_t)value; + } else { // SPI_DATASIZE_16BIT + spi->DR = (uint16_t)value; + } } int spi_busy(spi_t *obj) diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/i2c_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/i2c_api.c index 741e3157cf..044e460046 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/i2c_api.c @@ -82,6 +82,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) pin_mode(sda, OpenDrain); pin_mode(scl, OpenDrain); } + // Enable I2C2 clock and pinout if not done if ((obj->i2c == I2C_2) && !i2c2_inited) { i2c2_inited = 1; @@ -178,7 +179,7 @@ int i2c_read(i2c_t *obj, int address, char *data, int length, int stop) int count; int value; - /* update CR2 register */ + // Update CR2 register i2c->CR2 = (i2c->CR2 & (uint32_t)~((uint32_t)(I2C_CR2_SADD | I2C_CR2_NBYTES | I2C_CR2_RELOAD | I2C_CR2_AUTOEND | I2C_CR2_RD_WRN | I2C_CR2_START | I2C_CR2_STOP))) | (uint32_t)(((uint32_t)address & I2C_CR2_SADD) | (((uint32_t)length << 16) & I2C_CR2_NBYTES) | (uint32_t)I2C_SOFTEND_MODE | (uint32_t)I2C_GENERATE_START_READ); @@ -201,7 +202,7 @@ int i2c_read(i2c_t *obj, int address, char *data, int length, int stop) // If not repeated start, send stop. if (stop) { i2c_stop(obj); - /* Wait until STOPF flag is set */ + // Wait until STOPF flag is set timeout = FLAG_TIMEOUT; while (__HAL_I2C_GET_FLAG(&I2cHandle, I2C_FLAG_STOPF) == RESET) { timeout--; @@ -209,7 +210,7 @@ int i2c_read(i2c_t *obj, int address, char *data, int length, int stop) return -1; } } - /* Clear STOP Flag */ + // Clear STOP Flag __HAL_I2C_CLEAR_FLAG(&I2cHandle, I2C_FLAG_STOPF); } @@ -223,12 +224,10 @@ int i2c_write(i2c_t *obj, int address, const char *data, int length, int stop) int timeout; int count; - /* update CR2 register */ + // Update CR2 register i2c->CR2 = (i2c->CR2 & (uint32_t)~((uint32_t)(I2C_CR2_SADD | I2C_CR2_NBYTES | I2C_CR2_RELOAD | I2C_CR2_AUTOEND | I2C_CR2_RD_WRN | I2C_CR2_START | I2C_CR2_STOP))) | (uint32_t)(((uint32_t)address & I2C_CR2_SADD) | (((uint32_t)length << 16) & I2C_CR2_NBYTES) | (uint32_t)I2C_SOFTEND_MODE | (uint32_t)I2C_GENERATE_START_WRITE); - - for (count = 0; count < length; count++) { i2c_byte_write(obj, data[count]); } @@ -243,10 +242,10 @@ int i2c_write(i2c_t *obj, int address, const char *data, int length, int stop) } __HAL_I2C_CLEAR_FLAG(&I2cHandle, I2C_FLAG_TC); - // If not repeated start, send stop. + // If not repeated start, send stop if (stop) { i2c_stop(obj); - /* Wait until STOPF flag is set */ + // Wait until STOPF flag is set timeout = FLAG_TIMEOUT; while (__HAL_I2C_GET_FLAG(&I2cHandle, I2C_FLAG_STOPF) == RESET) { timeout--; @@ -254,7 +253,7 @@ int i2c_write(i2c_t *obj, int address, const char *data, int length, int stop) return -1; } } - /* Clear STOP Flag */ + // Clear STOP Flag __HAL_I2C_CLEAR_FLAG(&I2cHandle, I2C_FLAG_STOPF); } @@ -299,7 +298,7 @@ void i2c_reset(i2c_t *obj) { int timeout; - // wait before reset + // Wait before reset timeout = LONG_TIMEOUT; while ((__HAL_I2C_GET_FLAG(&I2cHandle, I2C_FLAG_BUSY)) && (timeout-- != 0)); @@ -336,7 +335,6 @@ void i2c_slave_address(i2c_t *obj, int idx, uint32_t address, uint32_t mask) void i2c_slave_mode(i2c_t *obj, int enable_slave) { - I2C_TypeDef *i2c = (I2C_TypeDef *)(obj->i2c); uint16_t tmpreg; @@ -352,7 +350,6 @@ void i2c_slave_mode(i2c_t *obj, int enable_slave) // Set new mode i2c->OAR1 = tmpreg; - } // See I2CSlave.h diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/rtc_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/rtc_api.c index 0bb2b10e4b..09372b9c32 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/rtc_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/rtc_api.c @@ -59,8 +59,8 @@ void rtc_init(void) // Enable LSE Oscillator RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSE; - RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE; /* Mandatory, otherwise the PLL is reconfigured! */ - RCC_OscInitStruct.LSEState = RCC_LSE_ON; /* External 32.768 kHz clock on OSC_IN/OSC_OUT */ + RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE; // Mandatory, otherwise the PLL is reconfigured! + RCC_OscInitStruct.LSEState = RCC_LSE_ON; // External 32.768 kHz clock on OSC_IN/OSC_OUT if (HAL_RCC_OscConfig(&RCC_OscInitStruct) == HAL_OK) { // Connect LSE to RTC __HAL_RCC_RTC_CONFIG(RCC_RTCCLKSOURCE_LSE); @@ -76,8 +76,8 @@ void rtc_init(void) } // Connect LSI to RTC __HAL_RCC_RTC_CONFIG(RCC_RTCCLKSOURCE_LSI); - // [TODO] This value is LSI typical value. To be measured precisely using a timer input capture. - rtc_freq = 32000; + // This value is LSI typical value. To be measured precisely using a timer input capture for example. + rtc_freq = LSI_VALUE; } // Enable RTC diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/serial_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/serial_api.c index 5269ae2b71..4e83387496 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/serial_api.c @@ -113,6 +113,7 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) __USART1_CLK_ENABLE(); obj->index = 0; } + if (obj->uart == UART_2) { __USART2_CLK_ENABLE(); obj->index = 1; @@ -122,6 +123,7 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) __USART3_CLK_ENABLE(); obj->index = 2; } + if (obj->uart == UART_4) { __USART4_CLK_ENABLE(); obj->index = 3; @@ -163,16 +165,19 @@ void serial_free(serial_t *obj) __USART1_RELEASE_RESET(); __USART1_CLK_DISABLE(); } + if (obj->uart == UART_2) { __USART2_FORCE_RESET(); __USART2_RELEASE_RESET(); __USART2_CLK_DISABLE(); } + if (obj->uart == UART_3) { __USART3_FORCE_RESET(); __USART3_RELEASE_RESET(); __USART3_CLK_DISABLE(); } + if (obj->uart == UART_4) { __USART4_FORCE_RESET(); __USART4_RELEASE_RESET(); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/spi_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/spi_api.c index 8763830f8f..b0d4a8e471 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/spi_api.c @@ -158,7 +158,7 @@ void spi_free(spi_t *obj) __SPI2_CLK_DISABLE(); } - // Configure GPIO + // Configure GPIOs pin_function(obj->pin_miso, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)); pin_function(obj->pin_mosi, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)); pin_function(obj->pin_sclk, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)); @@ -224,6 +224,7 @@ void spi_frequency(spi_t *obj, int hz) } else { // >= 24000000 obj->br_presc = SPI_BAUDRATEPRESCALER_2; // 24 MHz } + init_spi(obj); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/us_ticker.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/us_ticker.c index 5188176cf9..be70c80dc1 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/us_ticker.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/us_ticker.c @@ -51,7 +51,7 @@ void us_ticker_init(void) // Configure time base TimMasterHandle.Instance = TIM_MST; TimMasterHandle.Init.Period = 0xFFFFFFFF; - TimMasterHandle.Init.Prescaler = (uint32_t)(SystemCoreClock / 1000000) - 1; // 1 �s tick + TimMasterHandle.Init.Prescaler = (uint32_t)(SystemCoreClock / 1000000) - 1; // 1 us tick TimMasterHandle.Init.ClockDivision = 0; TimMasterHandle.Init.CounterMode = TIM_COUNTERMODE_UP; TimMasterHandle.Init.RepetitionCounter = 0; diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F091RC/PinNames.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F091RC/PinNames.h index d5a4068baa..489d461e3c 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F091RC/PinNames.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F091RC/PinNames.h @@ -36,12 +36,11 @@ extern "C" { #endif +// See stm32f0xx_hal_gpio.h and stm32f0xx_hal_gpio_ex.h for values of MODE, PUPD and AFNUM #define STM_PIN_DATA(MODE, PUPD, AFNUM) ((int)(((AFNUM) << 7) | ((PUPD) << 4) | ((MODE) << 0))) - #define STM_PIN_MODE(X) (((X) >> 0) & 0x0F) #define STM_PIN_PUPD(X) (((X) >> 4) & 0x07) #define STM_PIN_AFNUM(X) (((X) >> 7) & 0x0F) - #define STM_MODE_INPUT (0) #define STM_MODE_OUTPUT_PP (1) #define STM_MODE_OUTPUT_OD (2)