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

Merge pull request #1548 from dbestm/dev_F446_rtc 

[NUCLEO_F446RE] RTC+LSE+init
pull/1603/head
Martin Kojtal 2016-03-09 17:55:20 +00:00
parent 2c6c939564 81f3abc770
commit 6501de9044
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/mbed/targets/cmsis/TARGET_STM/TARGET_STM32F4/stm32f4xx_hal_rcc.h
View File

@ -1217,7 +1217,7 @@ void HAL_RCC_CSSCallback(void);
#define RCC_BDCR_BYTE0_ADDRESS (PERIPH_BASE + RCC_BDCR_OFFSET)
#define RCC_DBP_TIMEOUT_VALUE ((uint32_t)100)
#define RCC_LSE_TIMEOUT_VALUE ((uint32_t)100) /* 100 ms */
#define RCC_LSE_TIMEOUT_VALUE ((uint32_t)5000) /* 5000 ms */
#define HSE_TIMEOUT_VALUE HSE_STARTUP_TIMEOUT
#define HSI_TIMEOUT_VALUE ((uint32_t)100) /* 100 ms */

1
libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4/TARGET_NUCLEO_F446RE/device.h
View File

@ -48,6 +48,7 @@
#define DEVICE_SPISLAVE 1
#define DEVICE_RTC 1
#define DEVICE_RTC_LSI 0
#define DEVICE_PWMOUT 1

25
libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4/rtc_api.c
View File

@ -33,7 +33,9 @@
#include "mbed_error.h"
#if DEVICE_RTC_LSI
static int rtc_inited = 0;
#endif
static RTC_HandleTypeDef RtcHandle;
@ -42,8 +44,9 @@ void rtc_init(void)
RCC_OscInitTypeDef RCC_OscInitStruct;
uint32_t rtc_freq = 0;
if (rtc_inited) return;
#if DEVICE_RTC_LSI
rtc_inited = 1;
#endif
RtcHandle.Instance = RTC;
@ -57,6 +60,7 @@ void rtc_init(void)
__HAL_RCC_BACKUPRESET_FORCE();
__HAL_RCC_BACKUPRESET_RELEASE();
#if !DEVICE_RTC_LSI
// Enable LSE Oscillator
RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSE;
RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE; /* Mandatory, otherwise the PLL is reconfigured! */
@ -66,7 +70,11 @@ void rtc_init(void)
__HAL_RCC_RTC_CLKPRESCALER(RCC_RTCCLKSOURCE_LSE);
__HAL_RCC_RTC_CONFIG(RCC_RTCCLKSOURCE_LSE);
rtc_freq = LSE_VALUE;
} else {
}
else {
error("RTC error: LSE clock initialization failed.");
}
#else
// Enable LSI clock
RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSI | RCC_OSCILLATORTYPE_LSE;
RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE; // Mandatory, otherwise the PLL is reconfigured!
@ -80,10 +88,7 @@ void rtc_init(void)
__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 = LSI_VALUE;
}
// Check if RTC is already initialized
if ((RTC->ISR & RTC_ISR_INITS) == RTC_ISR_INITS) return;
#endif
// Enable RTC
__HAL_RCC_RTC_ENABLE();
@ -122,13 +127,19 @@ void rtc_free(void)
RCC_OscInitStruct.LSIState = RCC_LSI_OFF;
RCC_OscInitStruct.LSEState = RCC_LSE_OFF;
HAL_RCC_OscConfig(&RCC_OscInitStruct);
#if DEVICE_RTC_LSI
rtc_inited = 0;
#endif
}
int rtc_isenabled(void)
{
#if DEVICE_RTC_LSI
return rtc_inited;
#else
if ((RTC->ISR & RTC_ISR_INITS) == RTC_ISR_INITS) return 1;
else return 0;
#endif
}
/*