ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

TARGET_STM32L0 astyle

pull/7351/head
jeromecoutant 2018-06-27 14:43:59 +02:00
parent e9d7128485
commit baf97d78aa
24 changed files with 239 additions and 229 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L072xZ/TARGET_DISCO_L072CZ_LRWAN1/system_clock.c
View File

@ -200,8 +200,7 @@ uint8_t SetSysClock_PLL_HSE(uint8_t bypass)
// Output clock on MCO1 pin(PA8) for debugging purpose // Output clock on MCO1 pin(PA8) for debugging purpose
if (bypass == 0) { // Xtal used if (bypass == 0) { // Xtal used
HAL_RCC_MCOConfig(RCC_MCO1, RCC_MCO1SOURCE_SYSCLK, RCC_MCODIV_2); // 16 MHz HAL_RCC_MCOConfig(RCC_MCO1, RCC_MCO1SOURCE_SYSCLK, RCC_MCODIV_2); // 16 MHz
} } else { // External clock used
else { // External clock used
HAL_RCC_MCOConfig(RCC_MCO1, RCC_MCO1SOURCE_SYSCLK, RCC_MCODIV_4); // 8 MHz HAL_RCC_MCOConfig(RCC_MCO1, RCC_MCO1SOURCE_SYSCLK, RCC_MCODIV_4); // 8 MHz
} }
#endif #endif

3
targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L0x2xZ/TARGET_MTB_MURATA_ABZ/system_clock.c
View File

@ -84,8 +84,7 @@ void SystemInit (void)
*/ */
void SetSysClock(void) void SetSysClock(void)
{ {
if (SetSysClock_PLL_HSI() == 0) if (SetSysClock_PLL_HSI() == 0) {
{
while (1) { while (1) {
MBED_ASSERT(1); MBED_ASSERT(1);
} }

14
targets/TARGET_STM/TARGET_STM32L0/analogout_device.c
View File

@ -39,7 +39,8 @@
static int channel1_used = 0; static int channel1_used = 0;
static int channel2_used = 0; static int channel2_used = 0;
void analogout_init(dac_t *obj, PinName pin) { void analogout_init(dac_t *obj, PinName pin)
{
DAC_ChannelConfTypeDef sConfig = {0}; DAC_ChannelConfTypeDef sConfig = {0};
// Get the peripheral name from the pin and assign it to the object // Get the peripheral name from the pin and assign it to the object
@ -96,11 +97,16 @@ void analogout_init(dac_t *obj, PinName pin) {
analogout_write_u16(obj, 0); analogout_write_u16(obj, 0);
} }
void analogout_free(dac_t *obj) { void analogout_free(dac_t *obj)
{
// Reset DAC and disable clock // Reset DAC and disable clock
if (obj->channel == DAC_CHANNEL_1) channel1_used = 0; if (obj->channel == DAC_CHANNEL_1) {
channel1_used = 0;
}
#if defined(DAC_CHANNEL_2) #if defined(DAC_CHANNEL_2)
if (obj->channel == DAC_CHANNEL_2) channel2_used = 0; if (obj->channel == DAC_CHANNEL_2) {
channel2_used = 0;
}
#endif #endif
if ((channel1_used == 0) && (channel2_used == 0)) { if ((channel1_used == 0) && (channel2_used == 0)) {
__DAC_FORCE_RESET(); __DAC_FORCE_RESET();

12
targets/TARGET_STM/TARGET_STM32L0/flash_api.c
View File

@ -148,7 +148,8 @@ int32_t flash_program_page(flash_t *obj, uint32_t address,
return status; return status;
} }
uint32_t flash_get_sector_size(const flash_t *obj, uint32_t address) { uint32_t flash_get_sector_size(const flash_t *obj, uint32_t address)
{
if ((address >= (FLASH_BASE + FLASH_SIZE)) || (address < FLASH_BASE)) { if ((address >= (FLASH_BASE + FLASH_SIZE)) || (address < FLASH_BASE)) {
return MBED_FLASH_INVALID_SIZE; return MBED_FLASH_INVALID_SIZE;
} else { } else {
@ -157,16 +158,19 @@ uint32_t flash_get_sector_size(const flash_t *obj, uint32_t address) {
} }
} }
uint32_t flash_get_page_size(const flash_t *obj) { uint32_t flash_get_page_size(const flash_t *obj)
{
/* Page size is the minimum programable size, which 4 bytes */ /* Page size is the minimum programable size, which 4 bytes */
return 4; return 4;
} }
uint32_t flash_get_start_address(const flash_t *obj) { uint32_t flash_get_start_address(const flash_t *obj)
{
return FLASH_BASE; return FLASH_BASE;
} }
uint32_t flash_get_size(const flash_t *obj) { uint32_t flash_get_size(const flash_t *obj)
{
return FLASH_SIZE; return FLASH_SIZE;
} }

5
targets/TARGET_STM/TARGET_STM32L0/pin_device.h
View File

@ -60,10 +60,11 @@ static inline void stm_pin_SetAFPin( GPIO_TypeDef *gpio, PinName pin, uint32_t a
{ {
uint32_t ll_pin = ll_pin_defines[STM_PIN(pin)]; uint32_t ll_pin = ll_pin_defines[STM_PIN(pin)];
if (STM_PIN(pin) > 7) if (STM_PIN(pin) > 7) {
LL_GPIO_SetAFPin_8_15(gpio, ll_pin, afnum); LL_GPIO_SetAFPin_8_15(gpio, ll_pin, afnum);
else } else {
LL_GPIO_SetAFPin_0_7(gpio, ll_pin, afnum); LL_GPIO_SetAFPin_0_7(gpio, ll_pin, afnum);
} }
}
#endif #endif

3
targets/TARGET_STM/TARGET_STM32L0/pwmout_device.c
View File

@ -33,8 +33,7 @@
#ifdef DEVICE_PWMOUT #ifdef DEVICE_PWMOUT
const pwm_apb_map_t pwm_apb_map_table[] = const pwm_apb_map_t pwm_apb_map_table[] = {
{
#if defined(TIM2_BASE) #if defined(TIM2_BASE)
{PWM_2, PWMOUT_ON_APB1}, {PWM_2, PWMOUT_ON_APB1},
#endif #endif

3
targets/TARGET_STM/TARGET_STM32L0/serial_device.c
View File

@ -480,7 +480,8 @@ uint8_t serial_rx_active(serial_t *obj)
return ((HAL_UART_GetState(huart) == HAL_UART_STATE_BUSY_RX) ? 1 : 0); return ((HAL_UART_GetState(huart) == HAL_UART_STATE_BUSY_RX) ? 1 : 0);
} }
void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) { void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart)
{
if (__HAL_UART_GET_FLAG(huart, UART_FLAG_TC) != RESET) { if (__HAL_UART_GET_FLAG(huart, UART_FLAG_TC) != RESET) {
__HAL_UART_CLEAR_FLAG(huart, UART_CLEAR_TCF); __HAL_UART_CLEAR_FLAG(huart, UART_CLEAR_TCF);
} }

3
targets/TARGET_STM/TARGET_STM32L0/spi_api.c
View File

@ -49,7 +49,8 @@
* Only the frequency is managed in the family specific part * Only the frequency is managed in the family specific part
* the rest of SPI management is common to all STM32 families * the rest of SPI management is common to all STM32 families
*/ */
int spi_get_clock_freq(spi_t *obj) { int spi_get_clock_freq(spi_t *obj)
{
struct spi_s *spiobj = SPI_S(obj); struct spi_s *spiobj = SPI_S(obj);
int spi_hz = 0; int spi_hz = 0;