Merge pull request #3742 from jeromecoutant/PR_SLEEP

STM32 : minor update in sleep HAL file
pull/3724/head
Sam Grove 2017-02-22 13:35:01 -06:00 committed by GitHub
commit 5c28715fbd
1 changed files with 16 additions and 7 deletions

View File

@ -27,28 +27,33 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************* *******************************************************************************
*/ */
#include "sleep_api.h"
#include "rtc_api_hal.h"
#if DEVICE_SLEEP #if DEVICE_SLEEP
#include "cmsis.h" #include "cmsis.h"
#include "us_ticker_api.h"
#include "sleep_api.h"
#include "rtc_api_hal.h"
#include "hal_tick.h"
extern void HAL_SuspendTick(void);
extern void HAL_ResumeTick(void);
void hal_sleep(void) void hal_sleep(void)
{ {
// Stop HAL systick // Stop HAL tick to avoid to exit sleep in 1ms
HAL_SuspendTick(); HAL_SuspendTick();
// Request to enter SLEEP mode // Request to enter SLEEP mode
HAL_PWR_EnterSLEEPMode(PWR_MAINREGULATOR_ON, PWR_SLEEPENTRY_WFI); HAL_PWR_EnterSLEEPMode(PWR_MAINREGULATOR_ON, PWR_SLEEPENTRY_WFI);
// Restart HAL systick
// Restart HAL tick
HAL_ResumeTick(); HAL_ResumeTick();
} }
void hal_deepsleep(void) void hal_deepsleep(void)
{ {
// Stop HAL systick // Stop HAL tick
HAL_SuspendTick(); HAL_SuspendTick();
uint32_t EnterTimeUS = us_ticker_read();
// 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
@ -74,12 +79,16 @@ void hal_deepsleep(void)
HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI); HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);
#endif /* TARGET_STM32L4 */ #endif /* TARGET_STM32L4 */
// Restart HAL systick // Restart HAL tick
HAL_ResumeTick(); HAL_ResumeTick();
// After wake-up from STOP reconfigure the PLL // After wake-up from STOP reconfigure the PLL
SetSysClock(); SetSysClock();
TIM_HandleTypeDef TimMasterHandle;
TimMasterHandle.Instance = TIM_MST;
__HAL_TIM_SET_COUNTER(&TimMasterHandle, EnterTimeUS);
#if DEVICE_LOWPOWERTIMER #if DEVICE_LOWPOWERTIMER
rtc_synchronize(); rtc_synchronize();
#endif #endif