From 20ef2d42f15f2763a5079929fc7c375e9c94b697 Mon Sep 17 00:00:00 2001 From: zhyinch <zhyinch@gmail.com> Date: 星期六, 09 十一月 2019 14:16:39 +0800 Subject: [PATCH] V1.5 修改数据溢出bug --- 源码/核心板/Src/ExternalDevices/beep.h | 13 +++++++++++-- 1 files changed, 11 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 cdbcd2e..b862d84 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" @@ -8,8 +8,8 @@ #define KEY0_GPIO GPIOB #define READ_KEY0 GPIO_ReadInputDataBit(KEY0_GPIO,KEY0_PIN) -#define BEEP_PIN GPIO_Pin_6 -#define BEEP_GPIO GPIOB +#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) @@ -23,6 +23,15 @@ #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_1 +#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_2 +#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