forked from Git_test/Git_TEST
Merge remote-tracking branch 'origin/BLU_LED'
# Conflicts: # 不同颜色LED/APP/Run_Led.c # 不同颜色LED/OUTPUT/STM32_Project_DEMO.axf # 不同颜色LED/OUTPUT/STM32_Project_DEMO.hex # 不同颜色LED/OUTPUT/STM32_Project_DEMO.htm # 不同颜色LED/OUTPUT/STM32_Project_DEMO_Target 1.dep # 不同颜色LED/OUTPUT/run_led.crf # 不同颜色LED/OUTPUT/run_led.o # 不同颜色LED/Project/STM32_Project_DEMO.uvguix.bd7iw
This commit is contained in:
@@ -2,16 +2,20 @@
|
||||
#include "Delay.h"
|
||||
#include "Led_Init.h"
|
||||
|
||||
<<<<<<< HEAD
|
||||
#define Delay_Time 2500
|
||||
=======
|
||||
#define Delay_Time 1000
|
||||
>>>>>>> origin/BLU_LED
|
||||
|
||||
void Run_Led()
|
||||
{
|
||||
Led_Init();
|
||||
while(1)
|
||||
{
|
||||
GPIO_SetBits(GPIOB,RED_Led);
|
||||
GPIO_SetBits(GPIOA,BLU_Led);
|
||||
Delay_ms(Delay_Time);
|
||||
GPIO_ResetBits(GPIOB,RED_Led);
|
||||
GPIO_ResetBits(GPIOA,BLU_Led);
|
||||
Delay_ms(Delay_Time);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user