From 0e91bca2aaebc14a6ea8ef97433d4a7953876ffa Mon Sep 17 00:00:00 2001 From: yincheng.zhong <634916154@qq.com> Date: 星期三, 29 三月 2023 15:08:23 +0800 Subject: [PATCH] Merge branch '防撞' of http://47.108.70.204:60062/r/XRange_Tag into 防撞 --- Src/ExternalDevices/led.h | 28 +++++++++++++++++++++------- 1 files changed, 21 insertions(+), 7 deletions(-) diff --git a/Src/ExternalDevices/led.h b/Src/ExternalDevices/led.h index 5ed3ea4..c243d71 100644 --- a/Src/ExternalDevices/led.h +++ b/Src/ExternalDevices/led.h @@ -5,20 +5,34 @@ #include "main.h" #include "dw_app.h" +#define MOTOR_Pin GPIO_PIN_10 -#if defined(NEWBOARD) && defined(WORK_MODE_TAG) -#define LED0_PIN GPIO_Pin_12 -#define LED0_GPIO GPIOB -#else #define LED0_PIN LED2_G_Pin #define LED0_GPIO GPIOA -#endif + #define LED_BLINK(...) GPIO_Toggle(__VA_ARGS__) #define LED0_BLINK LED_BLINK(LED0_GPIO, LED0_PIN) -#define LED0_OFF GPIO_WriteBit(LED0_GPIO, LED0_PIN, Bit_RESET) -#define LED0_ON GPIO_WriteBit(LED0_GPIO, LED0_PIN, Bit_SET) +#define LED0_OFF HAL_GPIO_WritePin(LED0_GPIO, LED0_PIN, GPIO_PIN_RESET) +#define LED0_ON HAL_GPIO_WritePin(LED0_GPIO, LED0_PIN, GPIO_PIN_SET) +#define LED_LG_OFF HAL_GPIO_WritePin(LED0_GPIO, LED0_PIN, GPIO_PIN_RESET) +#define LED_LG_ON HAL_GPIO_WritePin(LED0_GPIO, LED0_PIN, GPIO_PIN_SET) +#define LED_LR_ON HAL_GPIO_WritePin(LED2_R_GPIO_Port, LED2_R_Pin, GPIO_PIN_SET) +#define LED_LR_OFF HAL_GPIO_WritePin(LED2_R_GPIO_Port, LED2_R_Pin, GPIO_PIN_RESET) +#define LED_LR_BLINK LED_BLINK(LED2_R_GPIO_Port, LED2_R_Pin) + +#define LED_TR_ON HAL_GPIO_WritePin(LED1_R_GPIO_Port, LED1_R_Pin, GPIO_PIN_SET) +#define LED_TR_OFF HAL_GPIO_WritePin(LED1_R_GPIO_Port, LED1_R_Pin, GPIO_PIN_RESET) +#define LED_TR_BLINK LED_BLINK(LED1_R_GPIO_Port, LED1_R_Pin) + +#define LED_TB_ON HAL_GPIO_WritePin(LED1_G_GPIO_Port, LED1_G_Pin, GPIO_PIN_SET) +#define LED_TB_OFF HAL_GPIO_WritePin(LED1_G_GPIO_Port, LED1_G_Pin, GPIO_PIN_RESET) + +#define MOTOR_ON HAL_GPIO_WritePin(GPIOB, MOTOR_Pin, GPIO_PIN_RESET); +#define MOTOR_OFF HAL_GPIO_WritePin(GPIOB, MOTOR_Pin, GPIO_PIN_SET); +#define WARNING_MOTORONTIME 500 +#define WARNING_MOTOROFFTIME 500 void Led_Init(void); void GPIO_Toggle(GPIO_TypeDef *GPIOx, uint16_t GPIO_Pin); -- Gitblit v1.9.3