Skip to content

Commit 3e89687

Browse files
dbestm0xc0170
dbestm
authored and
0xc0170
committed
[xx_L476xx] update LSI timeout defines
move hal_conf.h in device folder clean define related to LSI timeout
1 parent c8a5833 commit 3e89687

File tree

3 files changed

+374
-2
lines changed

3 files changed

+374
-2
lines changed

‎libraries/mbed/targets/cmsis/TARGET_STM/TARGET_STM32L4/stm32l4xx_hal_conf.h renamed to ‎libraries/mbed/targets/cmsis/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L476VG/stm32l4xx_hal_conf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@
142142
#endif /* LSE_VALUE */
143143

144144
#if !defined (LSE_STARTUP_TIMEOUT)
145-
#define LSE_STARTUP_TIMEOUT ((uint32_t)100) /*!< Time out for LSE start up, in ms */
145+
#define LSE_STARTUP_TIMEOUT ((uint32_t)5000) /*!< Time out for LSE start up, in ms */
146146
#endif /* HSE_STARTUP_TIMEOUT */
147147

148148
/**

‎libraries/mbed/targets/cmsis/TARGET_STM/TARGET_STM32L4/TARGET_NUCLEO_L476RG/stm32l4xx_hal_conf.h

Lines changed: 372 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,372 @@
1+
/**
2+
******************************************************************************
3+
* @file stm32l4xx_hal_conf.h
4+
* @author MCD Application Team
5+
* @version V1.0.0
6+
* @date 26-June-2015
7+
* @brief HAL configuration template file.
8+
* This file should be copied to the application folder and renamed
9+
* to stm32l4xx_hal_conf.h.
10+
******************************************************************************
11+
* @attention
12+
*
13+
* <h2><center>&copy; COPYRIGHT(c) 2015 STMicroelectronics</center></h2>
14+
*
15+
* Redistribution and use in source and binary forms, with or without modification,
16+
* are permitted provided that the following conditions are met:
17+
* 1. Redistributions of source code must retain the above copyright notice,
18+
* this list of conditions and the following disclaimer.
19+
* 2. Redistributions in binary form must reproduce the above copyright notice,
20+
* this list of conditions and the following disclaimer in the documentation
21+
* and/or other materials provided with the distribution.
22+
* 3. Neither the name of STMicroelectronics nor the names of its contributors
23+
* may be used to endorse or promote products derived from this software
24+
* without specific prior written permission.
25+
*
26+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
27+
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
28+
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
29+
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
30+
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
31+
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
32+
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
33+
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
34+
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
35+
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36+
*
37+
******************************************************************************
38+
*/
39+
40+
/* Define to prevent recursive inclusion -------------------------------------*/
41+
#ifndef __STM32L4xx_HAL_CONF_H
42+
#define __STM32L4xx_HAL_CONF_H
43+
44+
#ifdef __cplusplus
45+
extern "C" {
46+
#endif
47+
48+
/* Exported types ------------------------------------------------------------*/
49+
/* Exported constants --------------------------------------------------------*/
50+
51+
/* ########################## Module Selection ############################## */
52+
/**
53+
* @brief This is the list of modules to be used in the HAL driver
54+
*/
55+
#define HAL_MODULE_ENABLED
56+
#define HAL_ADC_MODULE_ENABLED
57+
#define HAL_CAN_MODULE_ENABLED
58+
#define HAL_COMP_MODULE_ENABLED
59+
#define HAL_CORTEX_MODULE_ENABLED
60+
#define HAL_CRC_MODULE_ENABLED
61+
#define HAL_CRYP_MODULE_ENABLED
62+
#define HAL_DAC_MODULE_ENABLED
63+
#define HAL_DFSDM_MODULE_ENABLED
64+
#define HAL_DMA_MODULE_ENABLED
65+
#define HAL_FIREWALL_MODULE_ENABLED
66+
#define HAL_FLASH_MODULE_ENABLED
67+
#define HAL_HCD_MODULE_ENABLED
68+
#define HAL_NAND_MODULE_ENABLED
69+
#define HAL_NOR_MODULE_ENABLED
70+
#define HAL_SRAM_MODULE_ENABLED
71+
#define HAL_GPIO_MODULE_ENABLED
72+
#define HAL_I2C_MODULE_ENABLED
73+
#define HAL_IRDA_MODULE_ENABLED
74+
#define HAL_IWDG_MODULE_ENABLED
75+
#define HAL_LCD_MODULE_ENABLED
76+
#define HAL_LPTIM_MODULE_ENABLED
77+
#define HAL_OPAMP_MODULE_ENABLED
78+
#define HAL_PCD_MODULE_ENABLED
79+
#define HAL_PWR_MODULE_ENABLED
80+
#define HAL_QSPI_MODULE_ENABLED
81+
#define HAL_RCC_MODULE_ENABLED
82+
#define HAL_RNG_MODULE_ENABLED
83+
#define HAL_RTC_MODULE_ENABLED
84+
#define HAL_SAI_MODULE_ENABLED
85+
#define HAL_SD_MODULE_ENABLED
86+
#define HAL_SMARTCARD_MODULE_ENABLED
87+
#define HAL_SMBUS_MODULE_ENABLED
88+
#define HAL_SPI_MODULE_ENABLED
89+
#define HAL_SWPMI_MODULE_ENABLED
90+
#define HAL_TIM_MODULE_ENABLED
91+
#define HAL_TSC_MODULE_ENABLED
92+
#define HAL_UART_MODULE_ENABLED
93+
#define HAL_USART_MODULE_ENABLED
94+
#define HAL_WWDG_MODULE_ENABLED
95+
96+
97+
/* ########################## Oscillator Values adaptation ####################*/
98+
/**
99+
* @brief Adjust the value of External High Speed oscillator (HSE) used in your application.
100+
* This value is used by the RCC HAL module to compute the system frequency
101+
* (when HSE is used as system clock source, directly or through the PLL).
102+
*/
103+
#if !defined (HSE_VALUE)
104+
#define HSE_VALUE ((uint32_t)8000000) /*!< Value of the External oscillator in Hz */
105+
#endif /* HSE_VALUE */
106+
107+
#if !defined (HSE_STARTUP_TIMEOUT)
108+
#define HSE_STARTUP_TIMEOUT ((uint32_t)200) /*!< Time out for HSE start up, in ms */
109+
#endif /* HSE_STARTUP_TIMEOUT */
110+
111+
/**
112+
* @brief Internal Multiple Speed oscillator (MSI) default value.
113+
* This value is the default MSI range value after Reset.
114+
*/
115+
#if !defined (MSI_VALUE)
116+
#define MSI_VALUE ((uint32_t)4000000) /*!< Value of the Internal oscillator in Hz*/
117+
#endif /* MSI_VALUE */
118+
119+
/**
120+
* @brief Internal High Speed oscillator (HSI) value.
121+
* This value is used by the RCC HAL module to compute the system frequency
122+
* (when HSI is used as system clock source, directly or through the PLL).
123+
*/
124+
#if !defined (HSI_VALUE)
125+
#define HSI_VALUE ((uint32_t)16000000) /*!< Value of the Internal oscillator in Hz*/
126+
#endif /* HSI_VALUE */
127+
128+
/**
129+
* @brief Internal Low Speed oscillator (LSI) value.
130+
*/
131+
#if !defined (LSI_VALUE)
132+
#define LSI_VALUE ((uint32_t)32000) /*!< LSI Typical Value in Hz*/
133+
#endif /* LSI_VALUE */ /*!< Value of the Internal Low Speed oscillator in Hz
134+
The real value may vary depending on the variations
135+
in voltage and temperature.*/
136+
/**
137+
* @brief External Low Speed oscillator (LSE) value.
138+
* This value is used by the UART, RTC HAL module to compute the system frequency
139+
*/
140+
#if !defined (LSE_VALUE)
141+
#define LSE_VALUE ((uint32_t)32768) /*!< Value of the External oscillator in Hz*/
142+
#endif /* LSE_VALUE */
143+
144+
#if !defined (LSE_STARTUP_TIMEOUT)
145+
#define LSE_STARTUP_TIMEOUT ((uint32_t)5000) /*!< Time out for LSE start up, in ms */
146+
#endif /* HSE_STARTUP_TIMEOUT */
147+
148+
/**
149+
* @brief External clock source for SAI1 peripheral
150+
* This value is used by the RCC HAL module to compute the SAI1 & SAI2 clock source
151+
* frequency.
152+
*/
153+
#if !defined (EXTERNAL_SAI1_CLOCK_VALUE)
154+
#define EXTERNAL_SAI1_CLOCK_VALUE ((uint32_t)48000) /*!< Value of the SAI1 External clock source in Hz*/
155+
#endif /* EXTERNAL_SAI1_CLOCK_VALUE */
156+
157+
/**
158+
* @brief External clock source for SAI2 peripheral
159+
* This value is used by the RCC HAL module to compute the SAI1 & SAI2 clock source
160+
* frequency.
161+
*/
162+
#if !defined (EXTERNAL_SAI2_CLOCK_VALUE)
163+
#define EXTERNAL_SAI2_CLOCK_VALUE ((uint32_t)48000) /*!< Value of the SAI2 External clock source in Hz*/
164+
#endif /* EXTERNAL_SAI2_CLOCK_VALUE */
165+
166+
/* Tip: To avoid modifying this file each time you need to use different HSE,
167+
=== you can define the HSE value in your toolchain compiler preprocessor. */
168+
169+
/* ########################### System Configuration ######################### */
170+
/**
171+
* @brief This is the HAL system configuration section
172+
*/
173+
#define VDD_VALUE ((uint32_t)3300) /*!< Value of VDD in mv */
174+
#define TICK_INT_PRIORITY ((uint32_t)0x0F) /*!< tick interrupt priority */
175+
#define USE_RTOS 0
176+
#define PREFETCH_ENABLE 1
177+
#define INSTRUCTION_CACHE_ENABLE 1
178+
#define DATA_CACHE_ENABLE 1
179+
180+
/* ########################## Assert Selection ############################## */
181+
/**
182+
* @brief Uncomment the line below to expanse the "assert_param" macro in the
183+
* HAL drivers code
184+
*/
185+
/* #define USE_FULL_ASSERT 1 */
186+
187+
/* Includes ------------------------------------------------------------------*/
188+
/**
189+
* @brief Include module's header file
190+
*/
191+
192+
#ifdef HAL_RCC_MODULE_ENABLED
193+
#include "stm32l4xx_hal_rcc.h"
194+
#endif /* HAL_RCC_MODULE_ENABLED */
195+
196+
#ifdef HAL_GPIO_MODULE_ENABLED
197+
#include "stm32l4xx_hal_gpio.h"
198+
#endif /* HAL_GPIO_MODULE_ENABLED */
199+
200+
#ifdef HAL_DMA_MODULE_ENABLED
201+
#include "stm32l4xx_hal_dma.h"
202+
#endif /* HAL_DMA_MODULE_ENABLED */
203+
204+
#ifdef HAL_DFSDM_MODULE_ENABLED
205+
#include "stm32l4xx_hal_dfsdm.h"
206+
#endif /* HAL_DFSDM_MODULE_ENABLED */
207+
208+
#ifdef HAL_CORTEX_MODULE_ENABLED
209+
#include "stm32l4xx_hal_cortex.h"
210+
#endif /* HAL_CORTEX_MODULE_ENABLED */
211+
212+
#ifdef HAL_ADC_MODULE_ENABLED
213+
#include "stm32l4xx_hal_adc.h"
214+
#endif /* HAL_ADC_MODULE_ENABLED */
215+
216+
#ifdef HAL_CAN_MODULE_ENABLED
217+
#include "stm32l4xx_hal_can.h"
218+
#endif /* HAL_CAN_MODULE_ENABLED */
219+
220+
#ifdef HAL_COMP_MODULE_ENABLED
221+
#include "stm32l4xx_hal_comp.h"
222+
#endif /* HAL_COMP_MODULE_ENABLED */
223+
224+
#ifdef HAL_CRC_MODULE_ENABLED
225+
#include "stm32l4xx_hal_crc.h"
226+
#endif /* HAL_CRC_MODULE_ENABLED */
227+
228+
#ifdef HAL_CRYP_MODULE_ENABLED
229+
#include "stm32l4xx_hal_cryp.h"
230+
#endif /* HAL_CRYP_MODULE_ENABLED */
231+
232+
#ifdef HAL_DAC_MODULE_ENABLED
233+
#include "stm32l4xx_hal_dac.h"
234+
#endif /* HAL_DAC_MODULE_ENABLED */
235+
236+
#ifdef HAL_FIREWALL_MODULE_ENABLED
237+
#include "stm32l4xx_hal_firewall.h"
238+
#endif /* HAL_FIREWALL_MODULE_ENABLED */
239+
240+
#ifdef HAL_FLASH_MODULE_ENABLED
241+
#include "stm32l4xx_hal_flash.h"
242+
#endif /* HAL_FLASH_MODULE_ENABLED */
243+
244+
#ifdef HAL_SRAM_MODULE_ENABLED
245+
#include "stm32l4xx_hal_sram.h"
246+
#endif /* HAL_SRAM_MODULE_ENABLED */
247+
248+
#ifdef HAL_NOR_MODULE_ENABLED
249+
#include "stm32l4xx_hal_nor.h"
250+
#endif /* HAL_NOR_MODULE_ENABLED */
251+
252+
#ifdef HAL_NAND_MODULE_ENABLED
253+
#include "stm32l4xx_hal_nand.h"
254+
#endif /* HAL_NAND_MODULE_ENABLED */
255+
256+
#ifdef HAL_I2C_MODULE_ENABLED
257+
#include "stm32l4xx_hal_i2c.h"
258+
#endif /* HAL_I2C_MODULE_ENABLED */
259+
260+
#ifdef HAL_IWDG_MODULE_ENABLED
261+
#include "stm32l4xx_hal_iwdg.h"
262+
#endif /* HAL_IWDG_MODULE_ENABLED */
263+
264+
#ifdef HAL_LCD_MODULE_ENABLED
265+
#include "stm32l4xx_hal_lcd.h"
266+
#endif /* HAL_LCD_MODULE_ENABLED */
267+
268+
#ifdef HAL_LPTIM_MODULE_ENABLED
269+
#include "stm32l4xx_hal_lptim.h"
270+
#endif /* HAL_LPTIM_MODULE_ENABLED */
271+
272+
#ifdef HAL_OPAMP_MODULE_ENABLED
273+
#include "stm32l4xx_hal_opamp.h"
274+
#endif /* HAL_OPAMP_MODULE_ENABLED */
275+
276+
#ifdef HAL_PWR_MODULE_ENABLED
277+
#include "stm32l4xx_hal_pwr.h"
278+
#endif /* HAL_PWR_MODULE_ENABLED */
279+
280+
#ifdef HAL_QSPI_MODULE_ENABLED
281+
#include "stm32l4xx_hal_qspi.h"
282+
#endif /* HAL_QSPI_MODULE_ENABLED */
283+
284+
#ifdef HAL_RNG_MODULE_ENABLED
285+
#include "stm32l4xx_hal_rng.h"
286+
#endif /* HAL_RNG_MODULE_ENABLED */
287+
288+
#ifdef HAL_RTC_MODULE_ENABLED
289+
#include "stm32l4xx_hal_rtc.h"
290+
#endif /* HAL_RTC_MODULE_ENABLED */
291+
292+
#ifdef HAL_SAI_MODULE_ENABLED
293+
#include "stm32l4xx_hal_sai.h"
294+
#endif /* HAL_SAI_MODULE_ENABLED */
295+
296+
#ifdef HAL_SD_MODULE_ENABLED
297+
#include "stm32l4xx_hal_sd.h"
298+
#endif /* HAL_SD_MODULE_ENABLED */
299+
300+
#ifdef HAL_SMBUS_MODULE_ENABLED
301+
#include "stm32l4xx_hal_smbus.h"
302+
#endif /* HAL_SMBUS_MODULE_ENABLED */
303+
304+
#ifdef HAL_SPI_MODULE_ENABLED
305+
#include "stm32l4xx_hal_spi.h"
306+
#endif /* HAL_SPI_MODULE_ENABLED */
307+
308+
#ifdef HAL_SWPMI_MODULE_ENABLED
309+
#include "stm32l4xx_hal_swpmi.h"
310+
#endif /* HAL_SWPMI_MODULE_ENABLED */
311+
312+
#ifdef HAL_TIM_MODULE_ENABLED
313+
#include "stm32l4xx_hal_tim.h"
314+
#endif /* HAL_TIM_MODULE_ENABLED */
315+
316+
#ifdef HAL_TSC_MODULE_ENABLED
317+
#include "stm32l4xx_hal_tsc.h"
318+
#endif /* HAL_TSC_MODULE_ENABLED */
319+
320+
#ifdef HAL_UART_MODULE_ENABLED
321+
#include "stm32l4xx_hal_uart.h"
322+
#endif /* HAL_UART_MODULE_ENABLED */
323+
324+
#ifdef HAL_USART_MODULE_ENABLED
325+
#include "stm32l4xx_hal_usart.h"
326+
#endif /* HAL_USART_MODULE_ENABLED */
327+
328+
#ifdef HAL_IRDA_MODULE_ENABLED
329+
#include "stm32l4xx_hal_irda.h"
330+
#endif /* HAL_IRDA_MODULE_ENABLED */
331+
332+
#ifdef HAL_SMARTCARD_MODULE_ENABLED
333+
#include "stm32l4xx_hal_smartcard.h"
334+
#endif /* HAL_SMARTCARD_MODULE_ENABLED */
335+
336+
#ifdef HAL_WWDG_MODULE_ENABLED
337+
#include "stm32l4xx_hal_wwdg.h"
338+
#endif /* HAL_WWDG_MODULE_ENABLED */
339+
340+
#ifdef HAL_PCD_MODULE_ENABLED
341+
#include "stm32l4xx_hal_pcd.h"
342+
#endif /* HAL_PCD_MODULE_ENABLED */
343+
344+
#ifdef HAL_HCD_MODULE_ENABLED
345+
#include "stm32l4xx_hal_hcd.h"
346+
#endif /* HAL_HCD_MODULE_ENABLED */
347+
348+
/* Exported macro ------------------------------------------------------------*/
349+
#ifdef USE_FULL_ASSERT
350+
/**
351+
* @brief The assert_param macro is used for function's parameters check.
352+
* @param expr: If expr is false, it calls assert_failed function
353+
* which reports the name of the source file and the source
354+
* line number of the call that failed.
355+
* If expr is true, it returns no value.
356+
* @retval None
357+
*/
358+
#define assert_param(expr) ((expr) ? (void)0 : assert_failed((uint8_t *)__FILE__, __LINE__))
359+
/* Exported functions ------------------------------------------------------- */
360+
void assert_failed(uint8_t* file, uint32_t line);
361+
#else
362+
#define assert_param(expr) ((void)0)
363+
#endif /* USE_FULL_ASSERT */
364+
365+
#ifdef __cplusplus
366+
}
367+
#endif
368+
369+
#endif /* __STM32L4xx_HAL_CONF_H */
370+
371+
372+
/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

‎libraries/mbed/targets/cmsis/TARGET_STM/TARGET_STM32L4/stm32l4xx_hal_rcc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ typedef struct
159159
* @{
160160
*/
161161
#define RCC_DBP_TIMEOUT_VALUE ((uint32_t)100)
162-
#define RCC_LSE_TIMEOUT_VALUE ((uint32_t)5000)
162+
#define RCC_LSE_TIMEOUT_VALUE LSE_STARTUP_TIMEOUT
163163
/**
164164
* @}
165165
*/

0 commit comments

Comments
 (0)