Merge pull request #3663 from helmut64/STM32L4_deepsleep_fix

Fixed a problem that the STOP2 was falling back to STOP1
pull/3761/head
Sam Grove 2017-02-13 10:12:30 -06:00 committed by GitHub
commit e22f26ffa4
1 changed files with 14 additions and 7 deletions

View File

@ -52,15 +52,22 @@ void hal_deepsleep(void)
// Request to enter STOP mode with regulator in low power mode // Request to enter STOP mode with regulator in low power mode
#if TARGET_STM32L4 #if TARGET_STM32L4
if (__HAL_RCC_PWR_IS_CLK_ENABLED()) { int pwrClockEnabled = __HAL_RCC_PWR_IS_CLK_ENABLED();
HAL_PWREx_EnableLowPowerRunMode(); int lowPowerModeEnabled = PWR->CR1 & PWR_CR1_LPR;
HAL_PWREx_EnterSTOP2Mode(PWR_STOPENTRY_WFI);
HAL_PWREx_DisableLowPowerRunMode(); if (!pwrClockEnabled) {
} else {
__HAL_RCC_PWR_CLK_ENABLE(); __HAL_RCC_PWR_CLK_ENABLE();
HAL_PWREx_EnableLowPowerRunMode(); }
HAL_PWREx_EnterSTOP2Mode(PWR_STOPENTRY_WFI); if (lowPowerModeEnabled) {
HAL_PWREx_DisableLowPowerRunMode(); HAL_PWREx_DisableLowPowerRunMode();
}
HAL_PWREx_EnterSTOP2Mode(PWR_STOPENTRY_WFI);
if (lowPowerModeEnabled) {
HAL_PWREx_EnableLowPowerRunMode();
}
if (!pwrClockEnabled) {
__HAL_RCC_PWR_CLK_DISABLE(); __HAL_RCC_PWR_CLK_DISABLE();
} }
#else /* TARGET_STM32L4 */ #else /* TARGET_STM32L4 */