From 40f3f7e27c419770fa1ab5db9024639dba908d00 Mon Sep 17 00:00:00 2001 From: bcostm Date: Thu, 13 Nov 2014 16:44:50 +0100 Subject: [PATCH] [NUCLEO_F401RE] Typo corrections (astyle) --- .../TARGET_NUCLEO_F401RE/analogin_api.c | 12 ++-- .../TARGET_NUCLEO_F401RE/gpio_api.c | 12 ++-- .../TARGET_NUCLEO_F401RE/gpio_irq_api.c | 49 +++++++++------- .../TARGET_NUCLEO_F401RE/gpio_object.h | 6 +- .../TARGET_STM/TARGET_NUCLEO_F401RE/i2c_api.c | 56 +++++++++++------- .../TARGET_NUCLEO_F401RE/mbed_overrides.c | 3 +- .../TARGET_STM/TARGET_NUCLEO_F401RE/pinmap.c | 9 ++- .../TARGET_NUCLEO_F401RE/port_api.c | 18 ++++-- .../TARGET_NUCLEO_F401RE/pwmout_api.c | 30 ++++++---- .../TARGET_STM/TARGET_NUCLEO_F401RE/rtc_api.c | 15 +++-- .../TARGET_NUCLEO_F401RE/serial_api.c | 57 ++++++++++++------- .../TARGET_STM/TARGET_NUCLEO_F401RE/sleep.c | 6 +- .../TARGET_STM/TARGET_NUCLEO_F401RE/spi_api.c | 45 ++++++++++----- .../TARGET_NUCLEO_F401RE/us_ticker.c | 17 ++++-- 14 files changed, 218 insertions(+), 117 deletions(-) diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/analogin_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/analogin_api.c index 8c3dfb114e..b358d2dc99 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/analogin_api.c @@ -58,7 +58,8 @@ ADC_HandleTypeDef AdcHandle; int adc_inited = 0; -void analogin_init(analogin_t *obj, PinName pin) { +void analogin_init(analogin_t *obj, PinName pin) +{ // Get the peripheral name from the pin and assign it to the object obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); MBED_ASSERT(obj->adc != (ADCName)NC); @@ -94,7 +95,8 @@ void analogin_init(analogin_t *obj, PinName pin) { } } -static inline uint16_t adc_read(analogin_t *obj) { +static inline uint16_t adc_read(analogin_t *obj) +{ ADC_ChannelConfTypeDef sConfig; AdcHandle.Instance = (ADC_TypeDef *)(obj->adc); @@ -169,14 +171,16 @@ static inline uint16_t adc_read(analogin_t *obj) { } } -uint16_t analogin_read_u16(analogin_t *obj) { +uint16_t analogin_read_u16(analogin_t *obj) +{ uint16_t value = adc_read(obj); // 12-bit to 16-bit conversion value = ((value << 4) & (uint16_t)0xFFF0) | ((value >> 8) & (uint16_t)0x000F); return value; } -float analogin_read(analogin_t *obj) { +float analogin_read(analogin_t *obj) +{ uint16_t value = adc_read(obj); return (float)value * (1.0f / (float)0xFFF); // 12 bits range } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_api.c index bcaa1f861c..df6fd9c1f7 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_api.c @@ -34,14 +34,16 @@ extern uint32_t Set_GPIO_Clock(uint32_t port_idx); -uint32_t gpio_set(PinName pin) { +uint32_t gpio_set(PinName pin) +{ MBED_ASSERT(pin != (PinName)NC); pin_function(pin, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)); return (uint32_t)(1 << ((uint32_t)pin & 0xF)); // Return the pin mask } -void gpio_init(gpio_t *obj, PinName pin) { +void gpio_init(gpio_t *obj, PinName pin) +{ obj->pin = pin; if (pin == (PinName)NC) return; @@ -59,11 +61,13 @@ void gpio_init(gpio_t *obj, PinName pin) { obj->reg_clr = &gpio->BSRRH; } -void gpio_mode(gpio_t *obj, PinMode mode) { +void gpio_mode(gpio_t *obj, PinMode mode) +{ pin_mode(obj->pin, mode); } -void gpio_dir(gpio_t *obj, PinDirection direction) { +void gpio_dir(gpio_t *obj, PinDirection direction) +{ MBED_ASSERT(obj->pin != (PinName)NC); if (direction == PIN_OUTPUT) { pin_function(obj->pin, STM_PIN_DATA(STM_MODE_OUTPUT_PP, GPIO_NOPULL, 0)); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_irq_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_irq_api.c index 2db6b33642..27c31972c1 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_irq_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_irq_api.c @@ -46,7 +46,8 @@ static uint32_t channel_pin[CHANNEL_NUM] = {0, 0, 0, 0, 0, 0, 0}; static gpio_irq_handler irq_handler; -static void handle_interrupt_in(uint32_t irq_index) { +static void handle_interrupt_in(uint32_t irq_index) +{ // Retrieve the gpio and pin that generate the irq GPIO_TypeDef *gpio = (GPIO_TypeDef *)(channel_gpio[irq_index]); uint32_t pin = (uint32_t)(1 << channel_pin[irq_index]); @@ -68,37 +69,45 @@ static void handle_interrupt_in(uint32_t irq_index) { // The irq_index is passed to the function // EXTI line 0 -static void gpio_irq0(void) { +static void gpio_irq0(void) +{ handle_interrupt_in(0); } // EXTI line 1 -static void gpio_irq1(void) { +static void gpio_irq1(void) +{ handle_interrupt_in(1); } // EXTI line 2 -static void gpio_irq2(void) { +static void gpio_irq2(void) +{ handle_interrupt_in(2); } // EXTI line 3 -static void gpio_irq3(void) { +static void gpio_irq3(void) +{ handle_interrupt_in(3); } // EXTI line 4 -static void gpio_irq4(void) { +static void gpio_irq4(void) +{ handle_interrupt_in(4); } // EXTI lines 5 to 9 -static void gpio_irq5(void) { +static void gpio_irq5(void) +{ handle_interrupt_in(5); } // EXTI lines 10 to 15 -static void gpio_irq6(void) { +static void gpio_irq6(void) +{ handle_interrupt_in(6); } extern uint32_t Set_GPIO_Clock(uint32_t port_idx); -int gpio_irq_init(gpio_irq_t *obj, PinName pin, gpio_irq_handler handler, uint32_t id) { +int gpio_irq_init(gpio_irq_t *obj, PinName pin, gpio_irq_handler handler, uint32_t id) +{ IRQn_Type irq_n = (IRQn_Type)0; uint32_t vector = 0; uint32_t irq_index; @@ -183,7 +192,8 @@ int gpio_irq_init(gpio_irq_t *obj, PinName pin, gpio_irq_handler handler, uint32 return 0; } -void gpio_irq_free(gpio_irq_t *obj) { +void gpio_irq_free(gpio_irq_t *obj) +{ channel_ids[obj->irq_index] = 0; channel_gpio[obj->irq_index] = 0; channel_pin[obj->irq_index] = 0; @@ -192,7 +202,8 @@ void gpio_irq_free(gpio_irq_t *obj) { obj->event = EDGE_NONE; } -void gpio_irq_set(gpio_irq_t *obj, gpio_irq_event event, uint32_t enable) { +void gpio_irq_set(gpio_irq_t *obj, gpio_irq_event event, uint32_t enable) +{ uint32_t mode = STM_MODE_INPUT; uint32_t pull = GPIO_NOPULL; @@ -230,8 +241,7 @@ void gpio_irq_set(gpio_irq_t *obj, gpio_irq_event event, uint32_t enable) { mode = STM_MODE_IT_EVT_RESET; obj->event = EDGE_NONE; } - } - else if (event == IRQ_FALL) { + } else if (event == IRQ_FALL) { if ((obj->event == EDGE_RISE) || (obj->event == EDGE_BOTH)) { mode = STM_MODE_IT_RISING; obj->event = EDGE_RISE; @@ -239,22 +249,23 @@ void gpio_irq_set(gpio_irq_t *obj, gpio_irq_event event, uint32_t enable) { mode = STM_MODE_IT_EVT_RESET; obj->event = EDGE_NONE; } - } - else { - mode = STM_MODE_IT_EVT_RESET; + } else { + mode = STM_MODE_IT_EVT_RESET; obj->event = EDGE_NONE; } - + } pin_function(obj->pin, STM_PIN_DATA(mode, pull, 0)); } -void gpio_irq_enable(gpio_irq_t *obj) { +void gpio_irq_enable(gpio_irq_t *obj) +{ NVIC_EnableIRQ(obj->irq_n); } -void gpio_irq_disable(gpio_irq_t *obj) { +void gpio_irq_disable(gpio_irq_t *obj) +{ NVIC_DisableIRQ(obj->irq_n); obj->event = EDGE_NONE; } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_object.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_object.h index a8c99da3b6..5569efc465 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_object.h @@ -48,7 +48,8 @@ typedef struct { __IO uint16_t *reg_clr; } gpio_t; -static inline void gpio_write(gpio_t *obj, int value) { +static inline void gpio_write(gpio_t *obj, int value) +{ MBED_ASSERT(obj->pin != (PinName)NC); if (value) { *obj->reg_set = obj->mask; @@ -57,7 +58,8 @@ static inline void gpio_write(gpio_t *obj, int value) { } } -static inline int gpio_read(gpio_t *obj) { +static inline int gpio_read(gpio_t *obj) +{ MBED_ASSERT(obj->pin != (PinName)NC); return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/i2c_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/i2c_api.c index 4dad096f10..31151dff6e 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/i2c_api.c @@ -64,7 +64,8 @@ int i2c1_inited = 0; int i2c2_inited = 0; int i2c3_inited = 0; -void i2c_init(i2c_t *obj, PinName sda, PinName scl) { +void i2c_init(i2c_t *obj, PinName sda, PinName scl) +{ // Determine the I2C to use I2CName i2c_sda = (I2CName)pinmap_peripheral(sda, PinMap_I2C_SDA); I2CName i2c_scl = (I2CName)pinmap_peripheral(scl, PinMap_I2C_SCL); @@ -73,7 +74,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { MBED_ASSERT(obj->i2c != (I2CName)NC); // Enable I2C1 clock and pinout if not done - if ((obj->i2c == I2C_1)&& !i2c1_inited) { + if ((obj->i2c == I2C_1) && !i2c1_inited) { i2c1_inited = 1; __I2C1_CLK_ENABLE(); // Configure I2C pins @@ -83,7 +84,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { pin_mode(scl, OpenDrain); } // Enable I2C2 clock and pinout if not done - if ((obj->i2c == I2C_2)&& !i2c2_inited) { + if ((obj->i2c == I2C_2) && !i2c2_inited) { i2c2_inited = 1; __I2C2_CLK_ENABLE(); // Configure I2C pins @@ -93,7 +94,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { pin_mode(scl, OpenDrain); } // Enable I2C3 clock and pinout if not done - if ((obj->i2c == I2C_3)&& !i2c3_inited) { + if ((obj->i2c == I2C_3) && !i2c3_inited) { i2c3_inited = 1; __I2C3_CLK_ENABLE(); // Configure I2C pins @@ -113,14 +114,15 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { obj->slave = 0; } -void i2c_frequency(i2c_t *obj, int hz) { +void i2c_frequency(i2c_t *obj, int hz) +{ MBED_ASSERT((hz != 0) && (hz <= 400000)); I2cHandle.Instance = (I2C_TypeDef *)(obj->i2c); int timeout; - + // wait before init timeout = LONG_TIMEOUT; - while((__HAL_I2C_GET_FLAG(&I2cHandle, I2C_FLAG_BUSY)) && (timeout-- != 0)); + while ((__HAL_I2C_GET_FLAG(&I2cHandle, I2C_FLAG_BUSY)) && (timeout-- != 0)); // I2C configuration I2cHandle.Init.AddressingMode = I2C_ADDRESSINGMODE_7BIT; @@ -139,7 +141,8 @@ void i2c_frequency(i2c_t *obj, int hz) { } -inline int i2c_start(i2c_t *obj) { +inline int i2c_start(i2c_t *obj) +{ I2C_TypeDef *i2c = (I2C_TypeDef *)(obj->i2c); int timeout; @@ -162,7 +165,8 @@ inline int i2c_start(i2c_t *obj) { return 0; } -inline int i2c_stop(i2c_t *obj) { +inline int i2c_stop(i2c_t *obj) +{ I2C_TypeDef *i2c = (I2C_TypeDef *)(obj->i2c); // Generate the STOP condition @@ -171,7 +175,8 @@ inline int i2c_stop(i2c_t *obj) { return 0; } -int i2c_read(i2c_t *obj, int address, char *data, int length, int stop) { +int i2c_read(i2c_t *obj, int address, char *data, int length, int stop) +{ I2C_TypeDef *i2c = (I2C_TypeDef *)(obj->i2c); I2cHandle.Instance = (I2C_TypeDef *)(obj->i2c); int timeout; @@ -221,7 +226,8 @@ int i2c_read(i2c_t *obj, int address, char *data, int length, int stop) { return length; } -int i2c_write(i2c_t *obj, int address, const char *data, int length, int stop) { +int i2c_write(i2c_t *obj, int address, const char *data, int length, int stop) +{ I2C_TypeDef *i2c = (I2C_TypeDef *)(obj->i2c); I2cHandle.Instance = (I2C_TypeDef *)(obj->i2c); int timeout; @@ -266,7 +272,8 @@ int i2c_write(i2c_t *obj, int address, const char *data, int length, int stop) { return count; } -int i2c_byte_read(i2c_t *obj, int last) { +int i2c_byte_read(i2c_t *obj, int last) +{ I2C_TypeDef *i2c = (I2C_TypeDef *)(obj->i2c); int timeout; @@ -289,7 +296,8 @@ int i2c_byte_read(i2c_t *obj, int last) { return (int)i2c->DR; } -int i2c_byte_write(i2c_t *obj, int data) { +int i2c_byte_write(i2c_t *obj, int data) +{ I2C_TypeDef *i2c = (I2C_TypeDef *)(obj->i2c); int timeout; @@ -307,12 +315,13 @@ int i2c_byte_write(i2c_t *obj, int data) { return 1; } -void i2c_reset(i2c_t *obj) { +void i2c_reset(i2c_t *obj) +{ int timeout; - + // wait before reset timeout = LONG_TIMEOUT; - while((__HAL_I2C_GET_FLAG(&I2cHandle, I2C_FLAG_BUSY)) && (timeout-- != 0)); + while ((__HAL_I2C_GET_FLAG(&I2cHandle, I2C_FLAG_BUSY)) && (timeout-- != 0)); if (obj->i2c == I2C_1) { __I2C1_FORCE_RESET(); @@ -330,7 +339,8 @@ void i2c_reset(i2c_t *obj) { #if DEVICE_I2CSLAVE -void i2c_slave_address(i2c_t *obj, int idx, uint32_t address, uint32_t mask) { +void i2c_slave_address(i2c_t *obj, int idx, uint32_t address, uint32_t mask) +{ I2C_TypeDef *i2c = (I2C_TypeDef *)(obj->i2c); uint16_t tmpreg = 0; @@ -344,7 +354,8 @@ void i2c_slave_address(i2c_t *obj, int idx, uint32_t address, uint32_t mask) { i2c->OAR1 = tmpreg; } -void i2c_slave_mode(i2c_t *obj, int enable_slave) { +void i2c_slave_mode(i2c_t *obj, int enable_slave) +{ I2cHandle.Instance = (I2C_TypeDef *)(obj->i2c); if (enable_slave) { obj->slave = 1; @@ -359,7 +370,8 @@ void i2c_slave_mode(i2c_t *obj, int enable_slave) { #define WriteGeneral 2 // the master is writing to all slave #define WriteAddressed 3 // the master is writing to this slave (slave = receiver) -int i2c_slave_receive(i2c_t *obj) { +int i2c_slave_receive(i2c_t *obj) +{ int retValue = NoData; if (__HAL_I2C_GET_FLAG(&I2cHandle, I2C_FLAG_BUSY) == 1) { @@ -376,7 +388,8 @@ int i2c_slave_receive(i2c_t *obj) { return (retValue); } -int i2c_slave_read(i2c_t *obj, char *data, int length) { +int i2c_slave_read(i2c_t *obj, char *data, int length) +{ uint32_t Timeout; int size = 0; @@ -430,7 +443,8 @@ int i2c_slave_read(i2c_t *obj, char *data, int length) { return size; } -int i2c_slave_write(i2c_t *obj, const char *data, int length) { +int i2c_slave_write(i2c_t *obj, const char *data, int length) +{ uint32_t Timeout; int size = 0; diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/mbed_overrides.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/mbed_overrides.c index a9352cc902..9783dd90a5 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/mbed_overrides.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/mbed_overrides.c @@ -28,7 +28,8 @@ #include "cmsis.h" // This function is called after RAM initialization and before main. -void mbed_sdk_init() { +void mbed_sdk_init() +{ // Update the SystemCoreClock variable. SystemCoreClockUpdate(); // Need to restart HAL driver after the RAM is initialized 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 4036119f21..a0ea2f2ef7 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 @@ -50,7 +50,8 @@ static const uint32_t gpio_mode[13] = { }; // Enable GPIO clock and return GPIO base address -uint32_t Set_GPIO_Clock(uint32_t port_idx) { +uint32_t Set_GPIO_Clock(uint32_t port_idx) +{ uint32_t gpio_add = 0; switch (port_idx) { case PortA: @@ -83,7 +84,8 @@ uint32_t Set_GPIO_Clock(uint32_t port_idx) { /** * Configure pin (mode, speed, output type and pull-up/pull-down) */ -void pin_function(PinName pin, int data) { +void pin_function(PinName pin, int data) +{ MBED_ASSERT(pin != (PinName)NC); // Get the pin informations uint32_t mode = STM_PIN_MODE(data); @@ -119,7 +121,8 @@ void pin_function(PinName pin, int data) { /** * Configure pin pull-up/pull-down */ -void pin_mode(PinName pin, PinMode mode) { +void pin_mode(PinName pin, PinMode mode) +{ MBED_ASSERT(pin != (PinName)NC); uint32_t port_index = STM_PORT(pin); uint32_t pin_index = STM_PIN(pin); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/port_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/port_api.c index 337a3af226..e982858665 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/port_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/port_api.c @@ -38,11 +38,13 @@ extern uint32_t Set_GPIO_Clock(uint32_t port_idx); // high nibble = port number (0=A, 1=B, 2=C, 3=D, 4=E, 5=F, ...) // low nibble = pin number -PinName port_pin(PortName port, int pin_n) { +PinName port_pin(PortName port, int pin_n) +{ return (PinName)(pin_n + (port << 4)); } -void port_init(port_t *obj, PortName port, int mask, PinDirection dir) { +void port_init(port_t *obj, PortName port, int mask, PinDirection dir) +{ uint32_t port_index = (uint32_t)port; // Enable GPIO clock @@ -59,7 +61,8 @@ void port_init(port_t *obj, PortName port, int mask, PinDirection dir) { port_dir(obj, dir); } -void port_dir(port_t *obj, PinDirection dir) { +void port_dir(port_t *obj, PinDirection dir) +{ uint32_t i; obj->direction = dir; for (i = 0; i < 16; i++) { // Process all pins @@ -73,7 +76,8 @@ void port_dir(port_t *obj, PinDirection dir) { } } -void port_mode(port_t *obj, PinMode mode) { +void port_mode(port_t *obj, PinMode mode) +{ uint32_t i; for (i = 0; i < 16; i++) { // Process all pins if (obj->mask & (1 << i)) { // If the pin is used @@ -82,11 +86,13 @@ void port_mode(port_t *obj, PinMode mode) { } } -void port_write(port_t *obj, int value) { +void port_write(port_t *obj, int value) +{ *obj->reg_out = (*obj->reg_out & ~obj->mask) | (value & obj->mask); } -int port_read(port_t *obj) { +int port_read(port_t *obj) +{ if (obj->direction == PIN_OUTPUT) { return (*obj->reg_out & obj->mask); } else { // PIN_INPUT 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 69c87706dd..49095abaf7 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 @@ -85,7 +85,8 @@ static const PinMap PinMap_PWM[] = { static TIM_HandleTypeDef TimHandle; -void pwmout_init(pwmout_t* obj, PinName pin) { +void pwmout_init(pwmout_t* obj, PinName pin) +{ // Get the peripheral name from the pin and assign it to the object obj->pwm = (PWMName)pinmap_peripheral(pin, PinMap_PWM); @@ -112,12 +113,14 @@ void pwmout_init(pwmout_t* obj, PinName pin) { pwmout_period_us(obj, 20000); // 20 ms per default } -void pwmout_free(pwmout_t* obj) { +void pwmout_free(pwmout_t* obj) +{ // Configure GPIO pin_function(obj->pin, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)); } -void pwmout_write(pwmout_t* obj, float value) { +void pwmout_write(pwmout_t* obj, float value) +{ TIM_OC_InitTypeDef sConfig; int channel = 0; int complementary_channel = 0; @@ -215,7 +218,8 @@ void pwmout_write(pwmout_t* obj, float value) { } } -float pwmout_read(pwmout_t* obj) { +float pwmout_read(pwmout_t* obj) +{ float value = 0; if (obj->period > 0) { value = (float)(obj->pulse) / (float)(obj->period); @@ -223,15 +227,18 @@ float pwmout_read(pwmout_t* obj) { return ((value > (float)1.0) ? (float)(1.0) : (value)); } -void pwmout_period(pwmout_t* obj, float seconds) { +void pwmout_period(pwmout_t* obj, float seconds) +{ pwmout_period_us(obj, seconds * 1000000.0f); } -void pwmout_period_ms(pwmout_t* obj, int ms) { +void pwmout_period_ms(pwmout_t* obj, int ms) +{ pwmout_period_us(obj, ms * 1000); } -void pwmout_period_us(pwmout_t* obj, int us) { +void pwmout_period_us(pwmout_t* obj, int us) +{ TimHandle.Instance = (TIM_TypeDef *)(obj->pwm); float dc = pwmout_read(obj); @@ -256,15 +263,18 @@ void pwmout_period_us(pwmout_t* obj, int us) { __HAL_TIM_ENABLE(&TimHandle); } -void pwmout_pulsewidth(pwmout_t* obj, float seconds) { +void pwmout_pulsewidth(pwmout_t* obj, float seconds) +{ pwmout_pulsewidth_us(obj, seconds * 1000000.0f); } -void pwmout_pulsewidth_ms(pwmout_t* obj, int ms) { +void pwmout_pulsewidth_ms(pwmout_t* obj, int ms) +{ pwmout_pulsewidth_us(obj, ms * 1000); } -void pwmout_pulsewidth_us(pwmout_t* obj, int us) { +void pwmout_pulsewidth_us(pwmout_t* obj, int us) +{ float value = (float)us / (float)obj->period; pwmout_write(obj, value); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/rtc_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/rtc_api.c index 1c0bde768d..e1f8d2763f 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/rtc_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/rtc_api.c @@ -37,7 +37,8 @@ static int rtc_inited = 0; static RTC_HandleTypeDef RtcHandle; -void rtc_init(void) { +void rtc_init(void) +{ RCC_OscInitTypeDef RCC_OscInitStruct; uint32_t rtc_freq = 0; @@ -96,7 +97,8 @@ void rtc_init(void) { } } -void rtc_free(void) { +void rtc_free(void) +{ // Enable Power clock __PWR_CLK_ENABLE(); @@ -121,7 +123,8 @@ void rtc_free(void) { rtc_inited = 0; } -int rtc_isenabled(void) { +int rtc_isenabled(void) +{ return rtc_inited; } @@ -142,7 +145,8 @@ int rtc_isenabled(void) { tm_yday days since January 1 0-365 tm_isdst Daylight Saving Time flag */ -time_t rtc_read(void) { +time_t rtc_read(void) +{ RTC_DateTypeDef dateStruct; RTC_TimeTypeDef timeStruct; struct tm timeinfo; @@ -169,7 +173,8 @@ time_t rtc_read(void) { return t; } -void rtc_write(time_t t) { +void rtc_write(time_t t) +{ RTC_DateTypeDef dateStruct; RTC_TimeTypeDef timeStruct; diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/serial_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/serial_api.c index ef7f07b279..9008631f3a 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/serial_api.c @@ -65,7 +65,8 @@ UART_HandleTypeDef UartHandle; int stdio_uart_inited = 0; serial_t stdio_uart; -static void init_uart(serial_t *obj) { +static void init_uart(serial_t *obj) +{ UartHandle.Instance = (USART_TypeDef *)(obj->uart); UartHandle.Init.BaudRate = obj->baudrate; @@ -85,7 +86,8 @@ static void init_uart(serial_t *obj) { HAL_UART_Init(&UartHandle); } -void serial_init(serial_t *obj, PinName tx, PinName rx) { +void serial_init(serial_t *obj, PinName tx, PinName rx) +{ // Determine the UART to use (UART_1, UART_2, ...) UARTName uart_tx = (UARTName)pinmap_peripheral(tx, PinMap_UART_TX); UARTName uart_rx = (UARTName)pinmap_peripheral(rx, PinMap_UART_RX); @@ -137,7 +139,8 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) { } -void serial_free(serial_t *obj) { +void serial_free(serial_t *obj) +{ // Reset UART and disable clock if (obj->uart == UART_1) { __USART1_FORCE_RESET(); @@ -162,12 +165,14 @@ void serial_free(serial_t *obj) { serial_irq_ids[obj->index] = 0; } -void serial_baud(serial_t *obj, int baudrate) { +void serial_baud(serial_t *obj, int baudrate) +{ obj->baudrate = baudrate; init_uart(obj); } -void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) { +void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) +{ if (data_bits == 9) { obj->databits = UART_WORDLENGTH_9B; } else { @@ -201,7 +206,8 @@ void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_b * INTERRUPTS HANDLING ******************************************************************************/ -static void uart_irq(UARTName name, int id) { +static void uart_irq(UARTName name, int id) +{ UartHandle.Instance = (USART_TypeDef *)name; if (serial_irq_ids[id] != 0) { if (__HAL_UART_GET_FLAG(&UartHandle, UART_FLAG_TC) != RESET) { @@ -215,22 +221,27 @@ static void uart_irq(UARTName name, int id) { } } -static void uart1_irq(void) { +static void uart1_irq(void) +{ uart_irq(UART_1, 0); } -static void uart2_irq(void) { +static void uart2_irq(void) +{ uart_irq(UART_2, 1); } -static void uart6_irq(void) { +static void uart6_irq(void) +{ uart_irq(UART_6, 2); } -void serial_irq_handler(serial_t *obj, uart_irq_handler handler, uint32_t id) { +void serial_irq_handler(serial_t *obj, uart_irq_handler handler, uint32_t id) +{ irq_handler = handler; serial_irq_ids[obj->index] = id; } -void serial_irq_set(serial_t *obj, SerialIrq irq, uint32_t enable) { +void serial_irq_set(serial_t *obj, SerialIrq irq, uint32_t enable) +{ IRQn_Type irq_n = (IRQn_Type)0; uint32_t vector = 0; @@ -285,19 +296,22 @@ void serial_irq_set(serial_t *obj, SerialIrq irq, uint32_t enable) { * READ/WRITE ******************************************************************************/ -int serial_getc(serial_t *obj) { +int serial_getc(serial_t *obj) +{ USART_TypeDef *uart = (USART_TypeDef *)(obj->uart); while (!serial_readable(obj)); return (int)(uart->DR & 0x1FF); } -void serial_putc(serial_t *obj, int c) { +void serial_putc(serial_t *obj, int c) +{ USART_TypeDef *uart = (USART_TypeDef *)(obj->uart); while (!serial_writable(obj)); uart->DR = (uint32_t)(c & 0x1FF); } -int serial_readable(serial_t *obj) { +int serial_readable(serial_t *obj) +{ int status; UartHandle.Instance = (USART_TypeDef *)(obj->uart); // Check if data is received @@ -305,7 +319,8 @@ int serial_readable(serial_t *obj) { return status; } -int serial_writable(serial_t *obj) { +int serial_writable(serial_t *obj) +{ int status; UartHandle.Instance = (USART_TypeDef *)(obj->uart); // Check if data is transmitted @@ -313,22 +328,26 @@ int serial_writable(serial_t *obj) { return status; } -void serial_clear(serial_t *obj) { +void serial_clear(serial_t *obj) +{ UartHandle.Instance = (USART_TypeDef *)(obj->uart); __HAL_UART_CLEAR_FLAG(&UartHandle, UART_FLAG_TXE); __HAL_UART_CLEAR_FLAG(&UartHandle, UART_FLAG_RXNE); } -void serial_pinout_tx(PinName tx) { +void serial_pinout_tx(PinName tx) +{ pinmap_pinout(tx, PinMap_UART_TX); } -void serial_break_set(serial_t *obj) { +void serial_break_set(serial_t *obj) +{ UartHandle.Instance = (USART_TypeDef *)(obj->uart); HAL_LIN_SendBreak(&UartHandle); } -void serial_break_clear(serial_t *obj) { +void serial_break_clear(serial_t *obj) +{ } #endif diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/sleep.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/sleep.c index 83c60de04e..f448837aef 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/sleep.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/sleep.c @@ -35,7 +35,8 @@ static TIM_HandleTypeDef TimMasterHandle; -void sleep(void) { +void sleep(void) +{ TimMasterHandle.Instance = TIM5; // Disable HAL tick interrupt @@ -48,7 +49,8 @@ void sleep(void) { __HAL_TIM_ENABLE_IT(&TimMasterHandle, TIM_IT_CC2); } -void deepsleep(void) { +void deepsleep(void) +{ // Request to enter STOP mode with regulator in low power mode HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/spi_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/spi_api.c index 066d283259..7e029311a1 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/spi_api.c @@ -78,7 +78,8 @@ static const PinMap PinMap_SPI_SSEL[] = { static SPI_HandleTypeDef SpiHandle; -static void init_spi(spi_t *obj) { +static void init_spi(spi_t *obj) +{ SpiHandle.Instance = (SPI_TypeDef *)(obj->spi); __HAL_SPI_DISABLE(&SpiHandle); @@ -100,7 +101,8 @@ static void init_spi(spi_t *obj) { __HAL_SPI_ENABLE(&SpiHandle); } -void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel) { +void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel) +{ // Determine the SPI to use SPIName spi_mosi = (SPIName)pinmap_peripheral(mosi, PinMap_SPI_MOSI); SPIName spi_miso = (SPIName)pinmap_peripheral(miso, PinMap_SPI_MISO); @@ -152,7 +154,8 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel init_spi(obj); } -void spi_free(spi_t *obj) { +void spi_free(spi_t *obj) +{ // Reset SPI and disable clock if (obj->spi == SPI_1) { __SPI1_FORCE_RESET(); @@ -179,7 +182,8 @@ void spi_free(spi_t *obj) { pin_function(obj->pin_ssel, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)); } -void spi_format(spi_t *obj, int bits, int mode, int slave) { +void spi_format(spi_t *obj, int bits, int mode, int slave) +{ // Save new values if (bits == 16) { obj->bits = SPI_DATASIZE_16BIT; @@ -217,7 +221,8 @@ void spi_format(spi_t *obj, int bits, int mode, int slave) { init_spi(obj); } -void spi_frequency(spi_t *obj, int hz) { +void spi_frequency(spi_t *obj, int hz) +{ // Note: The frequencies are obtained with SPI1 clock = 84 MHz (APB2 clock) if (hz < 600000) { obj->br_presc = SPI_BAUDRATEPRESCALER_256; // 330 kHz @@ -239,7 +244,8 @@ void spi_frequency(spi_t *obj, int hz) { init_spi(obj); } -static inline int ssp_readable(spi_t *obj) { +static inline int ssp_readable(spi_t *obj) +{ int status; SpiHandle.Instance = (SPI_TypeDef *)(obj->spi); // Check if data is received @@ -247,7 +253,8 @@ static inline int ssp_readable(spi_t *obj) { return status; } -static inline int ssp_writeable(spi_t *obj) { +static inline int ssp_writeable(spi_t *obj) +{ int status; SpiHandle.Instance = (SPI_TypeDef *)(obj->spi); // Check if data is transmitted @@ -255,47 +262,55 @@ static inline int ssp_writeable(spi_t *obj) { return status; } -static inline void ssp_write(spi_t *obj, int value) { +static inline void ssp_write(spi_t *obj, int value) +{ SPI_TypeDef *spi = (SPI_TypeDef *)(obj->spi); while (!ssp_writeable(obj)); spi->DR = (uint16_t)value; } -static inline int ssp_read(spi_t *obj) { +static inline int ssp_read(spi_t *obj) +{ SPI_TypeDef *spi = (SPI_TypeDef *)(obj->spi); while (!ssp_readable(obj)); return (int)spi->DR; } -static inline int ssp_busy(spi_t *obj) { +static inline int ssp_busy(spi_t *obj) +{ int status; SpiHandle.Instance = (SPI_TypeDef *)(obj->spi); status = ((__HAL_SPI_GET_FLAG(&SpiHandle, SPI_FLAG_BSY) != RESET) ? 1 : 0); return status; } -int spi_master_write(spi_t *obj, int value) { +int spi_master_write(spi_t *obj, int value) +{ ssp_write(obj, value); return ssp_read(obj); } -int spi_slave_receive(spi_t *obj) { +int spi_slave_receive(spi_t *obj) +{ return ((ssp_readable(obj) && !ssp_busy(obj)) ? 1 : 0); }; -int spi_slave_read(spi_t *obj) { +int spi_slave_read(spi_t *obj) +{ SPI_TypeDef *spi = (SPI_TypeDef *)(obj->spi); while (!ssp_readable(obj)); return (int)spi->DR; } -void spi_slave_write(spi_t *obj, int value) { +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; } -int spi_busy(spi_t *obj) { +int spi_busy(spi_t *obj) +{ return ssp_busy(obj); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/us_ticker.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/us_ticker.c index 3a80ddcede..be44198992 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/us_ticker.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/us_ticker.c @@ -34,31 +34,36 @@ static TIM_HandleTypeDef TimMasterHandle; static int us_ticker_inited = 0; -void us_ticker_init(void) { +void us_ticker_init(void) +{ if (us_ticker_inited) return; us_ticker_inited = 1; TimMasterHandle.Instance = TIM_MST; - HAL_InitTick(0); // The passed value is not used + HAL_InitTick(0); // The passed value is not used } -uint32_t us_ticker_read() { +uint32_t us_ticker_read() +{ if (!us_ticker_inited) us_ticker_init(); return TIM_MST->CNT; } -void us_ticker_set_interrupt(timestamp_t timestamp) { +void us_ticker_set_interrupt(timestamp_t timestamp) +{ // Set new output compare value __HAL_TIM_SetCompare(&TimMasterHandle, TIM_CHANNEL_1, (uint32_t)timestamp); // Enable IT __HAL_TIM_ENABLE_IT(&TimMasterHandle, TIM_IT_CC1); } -void us_ticker_disable_interrupt(void) { +void us_ticker_disable_interrupt(void) +{ __HAL_TIM_DISABLE_IT(&TimMasterHandle, TIM_IT_CC1); } -void us_ticker_clear_interrupt(void) { +void us_ticker_clear_interrupt(void) +{ __HAL_TIM_CLEAR_IT(&TimMasterHandle, TIM_IT_CC1); }