Skip to content

Commit 4524c5f

Browse files
authored
Merge pull request #3411 from jeromecoutant/PR_ST_L0_ASSERT
STM32L0 : map ST HAL assert into MBED assert
2 parents 4c2b84a + e1f4d69 commit 4524c5f

File tree

13 files changed

+36
-1282
lines changed

13 files changed

+36
-1282
lines changed

targets/TARGET_STM/TARGET_STM32L0/TARGET_DISCO_L053C8/device/stm32l0xx_hal_conf.h

Lines changed: 0 additions & 314 deletions
This file was deleted.

targets/TARGET_STM/TARGET_STM32L0/TARGET_DISCO_L053C8/device/system_stm32l0xx.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ uint8_t SetSysClock_PLL_HSE(uint8_t bypass)
367367
__HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1);
368368

369369
/* Enable HSE and HSI48 oscillators and activate PLL with HSE as source */
370-
RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE | RCC_OSCILLATORTYPE_HSI | RCC_OSCILLATORTYPE_HSI48;
370+
RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE | RCC_OSCILLATORTYPE_HSI48;
371371
if (bypass == 0)
372372
{
373373
RCC_OscInitStruct.HSEState = RCC_HSE_ON; /* External 8 MHz xtal on OSC_IN/OSC_OUT */
@@ -427,7 +427,7 @@ uint8_t SetSysClock_PLL_HSI(void)
427427
__HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1);
428428

429429
/* Enable HSI and HSI48 oscillators and activate PLL with HSI as source */
430-
RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI | RCC_OSCILLATORTYPE_HSE | RCC_OSCILLATORTYPE_HSI48;
430+
RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI | RCC_OSCILLATORTYPE_HSI48;
431431
RCC_OscInitStruct.HSEState = RCC_HSE_OFF;
432432
RCC_OscInitStruct.HSIState = RCC_HSI_ON;
433433
#if !defined (STM32L031xx) && !defined (STM32L041xx) && !defined(STM32L051xx) && !defined(STM32L061xx) && !defined(STM32L071xx) && !defined(STM32L081xx) && \

targets/TARGET_STM/TARGET_STM32L0/TARGET_NUCLEO_L011K4/device/system_stm32l0xx.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ uint8_t SetSysClock_PLL_HSE(uint8_t bypass)
367367
__HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1);
368368

369369
/* Enable HSE and HSI48 oscillators and activate PLL with HSE as source */
370-
RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE | RCC_OSCILLATORTYPE_HSI | RCC_OSCILLATORTYPE_HSI48;
370+
RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE | RCC_OSCILLATORTYPE_HSI48;
371371
if (bypass == 0)
372372
{
373373
RCC_OscInitStruct.HSEState = RCC_HSE_ON; /* External 8 MHz xtal on OSC_IN/OSC_OUT */
@@ -427,7 +427,7 @@ uint8_t SetSysClock_PLL_HSI(void)
427427
__HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1);
428428

429429
/* Enable HSI and HSI48 oscillators and activate PLL with HSI as source */
430-
RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI | RCC_OSCILLATORTYPE_HSE | RCC_OSCILLATORTYPE_HSI48;
430+
RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI | RCC_OSCILLATORTYPE_HSI48;
431431
RCC_OscInitStruct.HSEState = RCC_HSE_OFF;
432432
RCC_OscInitStruct.HSIState = RCC_HSI_ON;
433433
RCC_OscInitStruct.HSICalibrationValue = RCC_HSICALIBRATION_DEFAULT;

0 commit comments

Comments
 (0)