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/ExternalDevices/beep.h | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/ExternalDevices/beep.h" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/ExternalDevices/beep.h" index dfb11cc..814b487 100644 --- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/ExternalDevices/beep.h" +++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/ExternalDevices/beep.h" @@ -4,14 +4,21 @@ #include "stm32f10x.h" -#define BEEP_PIN GPIO_Pin_2 -#define BEEP2_PIN GPIO_Pin_5 -#define BEEP_GPIO GPIOA +#define BEEP_PIN GPIO_Pin_6 +#define BEEP_GPIO GPIOB #define BEEP_ON GPIO_WriteBit(BEEP_GPIO, BEEP_PIN, Bit_SET) #define BEEP_OFF GPIO_WriteBit(BEEP_GPIO, BEEP_PIN, Bit_RESET) + +#define BEEP2_PIN GPIO_Pin_5 +#define BEEP2_GPIO GPIOB #define BEEP2_ON GPIO_WriteBit(BEEP_GPIO, BEEP2_PIN, Bit_SET) #define BEEP2_OFF GPIO_WriteBit(BEEP_GPIO, BEEP2_PIN, Bit_RESET) +#define OUT2_PIN GPIO_Pin_7 +#define OUT2_GPIO GPIOB +#define OUT2_ON GPIO_WriteBit(OUT2_GPIO, OUT2_PIN, Bit_SET) +#define OUT2_OFF GPIO_WriteBit(OUT2_GPIO, OUT2_PIN, Bit_RESET) + void Beep_Init(void); -- Gitblit v1.9.3