mirror
/
micropython
kopia lustrzana https://github.com/micropython/micropython
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

stm32/rtc: Get rtc.wakeup working on F0 MCUs. 

The problem was that the EXTI line for the RTC wakeup event is line 20 on
the F0, so the interrupt was not firing.
pull/3989/merge
Damien George 2018-07-31 17:24:10 +10:00
rodzic 1e3a7f561f
commit 9dfbb6cc16
3 zmienionych plików z 29 dodań i 21 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

7
ports/stm32/extint.h
Wyświetl plik

@ -26,6 +26,8 @@
#ifndef MICROPY_INCLUDED_STM32_EXTINT_H
#define MICROPY_INCLUDED_STM32_EXTINT_H
#include "py/mphal.h"
// Vectors 0-15 are for regular pins
// Vectors 16-22 are for internal sources.
//
@ -36,8 +38,13 @@
#define EXTI_USB_OTG_FS_WAKEUP (18)
#define EXTI_ETH_WAKEUP (19)
#define EXTI_USB_OTG_HS_WAKEUP (20)
#if defined(STM32F0)
#define EXTI_RTC_TIMESTAMP (19)
#define EXTI_RTC_WAKEUP (20)
#else
#define EXTI_RTC_TIMESTAMP (21)
#define EXTI_RTC_WAKEUP (22)
#endif
#if defined(STM32F7)
#define EXTI_LPTIM1_ASYNC_EVENT (23)
#endif

39
ports/stm32/rtc.c
Wyświetl plik

@ -27,6 +27,7 @@
#include <stdio.h>
#include "py/runtime.h"
#include "extint.h"
#include "rtc.h"
#include "irq.h"
@ -612,17 +613,17 @@ mp_obj_t pyb_rtc_wakeup(size_t n_args, const mp_obj_t *args) {
}
// set the callback
MP_STATE_PORT(pyb_extint_callback)[22] = callback;
MP_STATE_PORT(pyb_extint_callback)[EXTI_RTC_WAKEUP] = callback;
// disable register write protection
RTC->WPR = 0xca;
RTC->WPR = 0x53;
// clear WUTE
RTC->CR &= ~(1 << 10);
RTC->CR &= ~RTC_CR_WUTE;
// wait until WUTWF is set
while (!(RTC->ISR & (1 << 2))) {
while (!(RTC->ISR & RTC_ISR_WUTWF)) {
}
if (enable) {
@ -637,26 +638,26 @@ mp_obj_t pyb_rtc_wakeup(size_t n_args, const mp_obj_t *args) {
// enable register write protection
RTC->WPR = 0xff;
// enable external interrupts on line 22
// enable external interrupts on line EXTI_RTC_WAKEUP
#if defined(STM32L4)
EXTI->IMR1 |= 1 << 22;
EXTI->RTSR1 |= 1 << 22;
EXTI->IMR1 |= 1 << EXTI_RTC_WAKEUP;
EXTI->RTSR1 |= 1 << EXTI_RTC_WAKEUP;
#elif defined(STM32H7)
EXTI_D1->IMR1 |= 1 << 22;
EXTI->RTSR1 |= 1 << 22;
EXTI_D1->IMR1 |= 1 << EXTI_RTC_WAKEUP;
EXTI->RTSR1 |= 1 << EXTI_RTC_WAKEUP;
#else
EXTI->IMR |= 1 << 22;
EXTI->RTSR |= 1 << 22;
EXTI->IMR |= 1 << EXTI_RTC_WAKEUP;
EXTI->RTSR |= 1 << EXTI_RTC_WAKEUP;
#endif
// clear interrupt flags
RTC->ISR &= ~(1 << 10);
RTC->ISR &= ~RTC_ISR_WUTF;
#if defined(STM32L4)
EXTI->PR1 = 1 << 22;
EXTI->PR1 = 1 << EXTI_RTC_WAKEUP;
#elif defined(STM32H7)
EXTI_D1->PR1 = 1 << 22;
EXTI_D1->PR1 = 1 << EXTI_RTC_WAKEUP;
#else
EXTI->PR = 1 << 22;
EXTI->PR = 1 << EXTI_RTC_WAKEUP;
#endif
NVIC_SetPriority(RTC_WKUP_IRQn, IRQ_PRI_RTC_WKUP);
@ -665,18 +666,18 @@ mp_obj_t pyb_rtc_wakeup(size_t n_args, const mp_obj_t *args) {
//printf("wut=%d wucksel=%d\n", wut, wucksel);
} else {
// clear WUTIE to disable interrupts
RTC->CR &= ~(1 << 14);
RTC->CR &= ~RTC_CR_WUTIE;
// enable register write protection
RTC->WPR = 0xff;
// disable external interrupts on line 22
// disable external interrupts on line EXTI_RTC_WAKEUP
#if defined(STM32L4)
EXTI->IMR1 &= ~(1 << 22);
EXTI->IMR1 &= ~(1 << EXTI_RTC_WAKEUP);
#elif defined(STM32H7)
EXTI_D1->IMR1 |= 1 << 22;
EXTI_D1->IMR1 |= 1 << EXTI_RTC_WAKEUP;
#else
EXTI->IMR &= ~(1 << 22);
EXTI->IMR &= ~(1 << EXTI_RTC_WAKEUP);
#endif
}

4
ports/stm32/stm32_it.c
Wyświetl plik

@ -574,7 +574,7 @@ void TAMP_STAMP_IRQHandler(void) {
void RTC_WKUP_IRQHandler(void) {
IRQ_ENTER(RTC_WKUP_IRQn);
RTC->ISR &= ~(1 << 10); // clear wakeup interrupt flag
RTC->ISR &= ~RTC_ISR_WUTF; // clear wakeup interrupt flag
Handle_EXTI_Irq(EXTI_RTC_WAKEUP); // clear EXTI flag and execute optional callback
IRQ_EXIT(RTC_WKUP_IRQn);
}
@ -583,7 +583,7 @@ void RTC_WKUP_IRQHandler(void) {
void RTC_IRQHandler(void) {
IRQ_ENTER(RTC_IRQn);
RTC->ISR &= ~(1 << 10); // clear wakeup interrupt flag
RTC->ISR &= ~RTC_ISR_WUTF; // clear wakeup interrupt flag
Handle_EXTI_Irq(EXTI_RTC_WAKEUP); // clear EXTI flag and execute optional callback
IRQ_EXIT(RTC_IRQn);
}