From 8770b97111b845632246b08696f4362f6e88a5ee Mon Sep 17 00:00:00 2001
From: guanjiao <sqrgj@163.com>
Date: 星期六, 15 九月 2018 20:31:25 +0800
Subject: [PATCH] Merge branch 'dev_zyc' into Merge_anchor_and_tag

---
 源码/核心板/Src/OnChipDevices/Rcc_Nvic_Systick.h |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/Rcc_Nvic_Systick.h" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/Rcc_Nvic_Systick.h"
index 435b318..fcd4f82 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/Rcc_Nvic_Systick.h"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/Rcc_Nvic_Systick.h"
@@ -4,8 +4,12 @@
 
 #include "stm32f10x.h"
 
+#define DECAIRQ_EXTI_IRQn			EXTI2_IRQn
+
 void Rcc_Init(void);
 void Nvic_Init(void);
 int Systick_Init(void);
-
+void delay_us(uint32_t nTimer);
+void delay_ms(uint32_t nTimer);
+void RTC_Configuration(void);
 #endif

--
Gitblit v1.9.3