From df3db0b978b1cab3555d6878a274b0f382bf707c Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期一, 01 十月 2018 15:42:49 +0800
Subject: [PATCH] 标签开机死机bug改好，基站增加软件超时复位
---
源码/核心板/Src/OnChipDevices/RTC.c | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/RTC.c" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/RTC.c"
index 6b53987..d1ac0de 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/RTC.c"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/RTC.c"
@@ -1,15 +1,20 @@
#include "RTC.h"
+
+
void RTC_SET_ALARM(u32 sec)
{
-//DEBUG_COM_STREAM("-??-",NULL);
-RTC_SetAlarm(RTC_GetCounter()+sec);
-//DEBUG_COM_STREAM("-??1-",NULL);
-RTC_WaitForLastTask();
-//DEBUG_COM_STREAM("-??2-",NULL);
-RTC_ITConfig(RTC_FLAG_ALR,ENABLE);
+ //DEBUG_COM_STREAM("-??-",NULL);
+ RTC_SetAlarm(RTC_GetCounter()+sec);
+ //DEBUG_COM_STREAM("-??1-",NULL);
+ RTC_WaitForLastTask();
+ //DEBUG_COM_STREAM("-??2-",NULL);
+ RTC_ITConfig(RTC_FLAG_ALR,ENABLE);
}
+
void RTC_Configuration(void)
{
+ EXTI_InitTypeDef EXTI_InitStructure;
+
/* Enable PWR and BKP clocks */
RCC_APB1PeriphClockCmd(RCC_APB1Periph_PWR | RCC_APB1Periph_BKP, ENABLE);
@@ -46,9 +51,18 @@
RTC_ITConfig(RTC_IT_ALR,ENABLE); //?? RTC ???
RTC_WaitForLastTask();
/* Set RTC prescaler: set RTC period to 1sec */
- RTC_SetPrescaler(40000); /* RTC period = RTCCLK/RTC_PR = (32.768 KHz)/(32767+1) */
+ RTC_SetPrescaler(2000); /* RTC period = RTCCLK/RTC_PR = (32.768 KHz)/(32767+1) */
/* Wait until last write operation on RTC registers has finished */
RTC_WaitForLastTask();
RTC_SET_ALARM(1);
-}
\ No newline at end of file
+
+ //RTC外部中断使能
+ EXTI_InitStructure.EXTI_Line = EXTI_Line17;
+ EXTI_InitStructure.EXTI_Mode = EXTI_Mode_Interrupt;
+ EXTI_InitStructure.EXTI_Trigger = EXTI_Trigger_Rising;
+ EXTI_InitStructure.EXTI_LineCmd = ENABLE;
+ EXTI_Init(&EXTI_InitStructure);
+
+}
+
--
Gitblit v1.9.3