From 2ad2b82d448645cc81409aa4765288da95931cb8 Mon Sep 17 00:00:00 2001
From: guanjiao <sqrgj@163.com>
Date: 星期六, 15 九月 2018 17:20:16 +0800
Subject: [PATCH] 1. 增加了“收不到信息1s后，停止报警”的功能 2. 将判断喇叭是否响的功能，在systick中断中实现
---
源码/核心板/Src/OnChipDevices/Rcc_Nvic_Systick.c | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/Rcc_Nvic_Systick.c" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/Rcc_Nvic_Systick.c"
index cd517b6..38d4add 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/Rcc_Nvic_Systick.c"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/Rcc_Nvic_Systick.c"
@@ -48,7 +48,7 @@
NVIC_PriorityGroupConfig(NVIC_PriorityGroup_4);
/* Enable and set EXTI Interrupt to the lowest priority */
- NVIC_InitStructure.NVIC_IRQChannel = EXTI2_IRQn;
+ NVIC_InitStructure.NVIC_IRQChannel = DECAIRQ_EXTI_IRQn;
NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority = 15;
NVIC_InitStructure.NVIC_IRQChannelSubPriority = 0;
NVIC_InitStructure.NVIC_IRQChannelCmd = ENABLE;
@@ -59,14 +59,34 @@
int Systick_Init(void)
{
int time_retry = 500;
- if (SysTick_Config(64000))
+ if (SysTick_Config(72000))
{
/* Capture error */
while (time_retry--);
return 1;
}
- NVIC_SetPriority (SysTick_IRQn, 5);
+ NVIC_SetPriority(SysTick_IRQn, 5);
return 0;
}
+
+void delay_us(uint32_t nTimer)
+{
+ uint32_t i=0;
+ for(i=0;i<nTimer;i++){
+ __NOP();__NOP();__NOP();__NOP();__NOP();__NOP();__NOP();__NOP();__NOP();__NOP();
+ __NOP();__NOP();__NOP();__NOP();__NOP();__NOP();__NOP();__NOP();__NOP();__NOP();
+ __NOP();__NOP();__NOP();__NOP();__NOP();__NOP();__NOP();__NOP();__NOP();__NOP();
+ __NOP();__NOP();__NOP();__NOP();__NOP();__NOP();__NOP();__NOP();__NOP();__NOP();
+ __NOP();__NOP();__NOP();__NOP();__NOP();__NOP();__NOP();__NOP();__NOP();__NOP();
+ __NOP();__NOP();__NOP();__NOP();__NOP();__NOP();__NOP();__NOP();__NOP();__NOP();
+ __NOP();__NOP();__NOP();__NOP();
+ }
+}
+
+void delay_ms(uint32_t nTimer)
+{
+ uint32_t i=1000*nTimer;
+ delay_us(i);
+}
--
Gitblit v1.9.3