From 5ab92d7ff87870ce55ecb46c86d25ae79aa834e1 Mon Sep 17 00:00:00 2001 From: zhyinch <zhyinch@gmail.com> Date: 星期日, 31 五月 2020 19:18:26 +0800 Subject: [PATCH] V1.28 修改MIS_NUM标志位错误 --- 源码/核心板/Src/ExternalDevices/beep.h | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 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 29c2d60..a9aa2cb 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,34 @@ #include "stm32f10x.h" -#define BEEP_PIN GPIO_Pin_0 -#define BEEP2_PIN GPIO_Pin_11 +#define KEY0_PIN GPIO_Pin_14 +#define KEY0_GPIO GPIOB +#define READ_KEY0 GPIO_ReadInputDataBit(KEY0_GPIO,KEY0_PIN) + +#define BEEP_PIN GPIO_Pin_12 #define BEEP_GPIO GPIOA #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) + +#define RELAY1_GPIO GPIOB +#define RELAY1_PIN GPIO_Pin_0 +#define RELAY1_ON GPIO_WriteBit(RELAY1_GPIO, RELAY1_PIN, Bit_SET) +#define RELAY1_OFF GPIO_WriteBit(RELAY1_GPIO, RELAY1_PIN, Bit_RESET) + +#define RELAY2_GPIO GPIOB +#define RELAY2_PIN GPIO_Pin_1 +#define RELAY2_ON GPIO_WriteBit(RELAY2_GPIO, RELAY2_PIN, Bit_SET) +#define RELAY2_OFF GPIO_WriteBit(RELAY2_GPIO, RELAY2_PIN, Bit_RESET) void Beep_Init(void); -- Gitblit v1.9.3