wuqiyang312
/
u8g2-copy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

button detection simplification

This commit is contained in:
olikraus 2017-04-17 09:27:40 +02:00
parent 406ea042aa
commit 5eabca4028
1 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
sys/arm/stm32l031x6/u8g2_rtc/main.c
View File

@ -36,15 +36,15 @@ u8g2_t u8g2;
void enableRCCRTCWrite(void) U8G2_NOINLINE; void enableRCCRTCWrite(void) U8G2_NOINLINE;
void enableRCCRTCWrite(void) void enableRCCRTCWrite(void)
{ {
RCC->APB1ENR |= RCC_APB1ENR_PWREN; /* enable power interface */ //RCC->APB1ENR |= RCC_APB1ENR_PWREN; /* enable power interface */
PWR->CR |= PWR_CR_DBP; /* activate write access to RCC->CSR and RTC */ //PWR->CR |= PWR_CR_DBP; /* activate write access to RCC->CSR and RTC */
} }
void disableRCCRTCWrite(void) U8G2_NOINLINE; void disableRCCRTCWrite(void) U8G2_NOINLINE;
void disableRCCRTCWrite(void) void disableRCCRTCWrite(void)
{ {
PWR->CR &= ~PWR_CR_DBP; /* disable write access to RCC->CSR and RTC */ //PWR->CR &= ~PWR_CR_DBP; /* disable write access to RCC->CSR and RTC */
RCC->APB1ENR &= ~RCC_APB1ENR_PWREN; /* disable power interface */ //RCC->APB1ENR &= ~RCC_APB1ENR_PWREN; /* disable power interface */
} }
/*=======================================================================*/ /*=======================================================================*/
@ -58,9 +58,9 @@ void __attribute__ ((interrupt, used)) SysTick_Handler(void)
Tamper3Count--; Tamper3Count--;
if ( Tamper3Count == 0 ) if ( Tamper3Count == 0 )
{ {
enableRCCRTCWrite(); //enableRCCRTCWrite();
RTC->ISR &= ~RTC_ISR_TAMP3F; /* clear tamper flag, allow new tamper event */ RTC->ISR &= ~RTC_ISR_TAMP3F; /* clear tamper flag, allow new tamper event */
disableRCCRTCWrite(); //disableRCCRTCWrite();
} }
} }
@ -69,9 +69,9 @@ void __attribute__ ((interrupt, used)) SysTick_Handler(void)
Tamper2Count--; Tamper2Count--;
if ( Tamper2Count == 0 ) if ( Tamper2Count == 0 )
{ {
enableRCCRTCWrite(); //enableRCCRTCWrite();
RTC->ISR &= ~RTC_ISR_TAMP2F; /* clear tamper flag, allow new tamper event */ RTC->ISR &= ~RTC_ISR_TAMP2F; /* clear tamper flag, allow new tamper event */
disableRCCRTCWrite(); //disableRCCRTCWrite();
} }
} }
@ -79,7 +79,7 @@ void __attribute__ ((interrupt, used)) SysTick_Handler(void)
void __attribute__ ((interrupt, used)) RTC_IRQHandler(void) void __attribute__ ((interrupt, used)) RTC_IRQHandler(void)
{ {
enableRCCRTCWrite(); //enableRCCRTCWrite();
if ( (EXTI->PR & EXTI_PR_PIF20) != 0 ) /* interrupt caused by wake up */ if ( (EXTI->PR & EXTI_PR_PIF20) != 0 ) /* interrupt caused by wake up */
{ {
@ -108,10 +108,23 @@ void __attribute__ ((interrupt, used)) RTC_IRQHandler(void)
} }
disableRCCRTCWrite(); //disableRCCRTCWrite();
RTCIRQCount++; RTCIRQCount++;
} }
/*=======================================================================*/
/*
Enable several power regions: PWR, GPIOA
Enable write access to RTC
This must be executed after each reset.
*/
void startUp(void)
{
RCC->IOPENR |= RCC_IOPENR_IOPAEN; /* Enable clock for GPIO Port A */
RCC->APB1ENR |= RCC_APB1ENR_PWREN; /* enable power interface */
PWR->CR |= PWR_CR_DBP; /* activate write access to RCC->CSR and RTC */
}
/*=======================================================================*/ /*=======================================================================*/
/* /*
@ -217,7 +230,7 @@ void initDisplay(void)
void initRTC(void) void initRTC(void)
{ {
/* real time clock enable */ /* real time clock enable */
enableRCCRTCWrite(); //enableRCCRTCWrite();
RTC->WPR = 0x0ca; /* disable RTC write protection */ RTC->WPR = 0x0ca; /* disable RTC write protection */
RTC->WPR = 0x053; RTC->WPR = 0x053;
@ -252,7 +265,7 @@ void initRTC(void)
RTC->WPR = 0; /* enable RTC write protection */ RTC->WPR = 0; /* enable RTC write protection */
RTC->WPR = 0; RTC->WPR = 0;
disableRCCRTCWrite(); //disableRCCRTCWrite();
} }
/*=======================================================================*/ /*=======================================================================*/
@ -264,7 +277,7 @@ void initRTC(void)
void startRTCWakeUp(void) void startRTCWakeUp(void)
{ {
/* wake up time setup & start */ /* wake up time setup & start */
enableRCCRTCWrite(); //enableRCCRTCWrite();
RTC->WPR = 0x0ca; /* disable RTC write protection */ RTC->WPR = 0x0ca; /* disable RTC write protection */
RTC->WPR = 0x053; RTC->WPR = 0x053;
@ -298,7 +311,7 @@ void startRTCWakeUp(void)
RTC->WPR = 0; /* enable RTC write protection */ RTC->WPR = 0; /* enable RTC write protection */
RTC->WPR = 0; RTC->WPR = 0;
disableRCCRTCWrite(); //disableRCCRTCWrite();
} }
@ -308,6 +321,7 @@ int main()
{ {
startHSIClock(); startHSIClock();
SystemCoreClockUpdate(); /* Update SystemCoreClock() */ SystemCoreClockUpdate(); /* Update SystemCoreClock() */
startUp();
//SystemCoreClock = 32000000UL; //SystemCoreClock = 32000000UL;
startSysTick(); startSysTick();