diff --git a/test.gif b/test.gif
new file mode 100644
index 0000000..fdb9299
Binary files /dev/null and b/test.gif differ
diff --git a/不同颜色LED/APP/Run_Led.c b/不同颜色LED/APP/Run_Led.c
index 16b1e4d..802e20f 100644
--- a/不同颜色LED/APP/Run_Led.c
+++ b/不同颜色LED/APP/Run_Led.c
@@ -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);
}
}
diff --git a/不同颜色LED/OUTPUT/STM32_Project_DEMO.hex b/不同颜色LED/OUTPUT/STM32_Project_DEMO.hex
index e5a8c2d..1a7a7d6 100644
--- a/不同颜色LED/OUTPUT/STM32_Project_DEMO.hex
+++ b/不同颜色LED/OUTPUT/STM32_Project_DEMO.hex
@@ -55,9 +55,15 @@
:1003500000080140000C0140FEE7704770470000B4
:10036000054A002903D09169014391617047916961
:10037000814391617047000000100240FFF7CAFFFF
+<<<<<<< HEAD
:10038000084D40F6C41401212846FFF7BFFF204660
:10039000FFF74BFF01212846FFF7B6FF2046FFF786
:1003A00044FFF0E7000C0140704700F001B8000086
+=======
+:10038000084D4FF47A7440212846FFF7BFFF2046FE
+:10039000FFF74BFF40212846FFF7B6FF2046FFF747
+:1003A00044FFF0E700080140704700F001B800008A
+>>>>>>> origin/BLU_LED
:1003B0000CB50022019200922748016841F4803177
:1003C00001604FF4A063016801F4003100910199CC
:1003D000491C0191009911B901999942F3D1016821
diff --git a/不同颜色LED/OUTPUT/STM32_Project_DEMO.htm b/不同颜色LED/OUTPUT/STM32_Project_DEMO.htm
index 1ba6cb8..276af2a 100644
--- a/不同颜色LED/OUTPUT/STM32_Project_DEMO.htm
+++ b/不同颜色LED/OUTPUT/STM32_Project_DEMO.htm
@@ -3,7 +3,11 @@
Static Call Graph - [..\OUTPUT\STM32_Project_DEMO.axf]
Static Call Graph for image ..\OUTPUT\STM32_Project_DEMO.axf
+<<<<<<< HEAD
#<CALLGRAPH># ARM Linker, 5060750: Last Updated: Wed Sep 10 12:35:58 2025
+=======
+
#<CALLGRAPH># ARM Linker, 5060750: Last Updated: Wed Sep 10 12:35:14 2025
+>>>>>>> origin/BLU_LED
Maximum Stack Usage = 40 bytes + Unknown(Functions without stacksize, Cycles, Untraceable Function Pointers)
Call chain for Maximum Stack Depth:
diff --git a/不同颜色LED/OUTPUT/STM32_Project_DEMO_Target 1.dep b/不同颜色LED/OUTPUT/STM32_Project_DEMO_Target 1.dep
index 0f4eac2..83660e3 100644
--- a/不同颜色LED/OUTPUT/STM32_Project_DEMO_Target 1.dep
+++ b/不同颜色LED/OUTPUT/STM32_Project_DEMO_Target 1.dep
@@ -795,7 +795,11 @@ I (..\FWLIB\inc\stm32f10x_tim.h)(0x688E6595)
I (..\FWLIB\inc\stm32f10x_usart.h)(0x688E6595)
I (..\FWLIB\inc\stm32f10x_wwdg.h)(0x688E6595)
I (..\FWLIB\inc\misc.h)(0x688E6595)
+<<<<<<< HEAD
F (..\APP\Run_Led.c)(0x68C1002D)(--gnu -c --cpu Cortex-M3 -g -O1 --apcs=interwork --split_sections -I ..\CMSIS_Support -I ..\FWLIB\inc -I ..\APP -I ..\DEVICE
-ID:\soft\Keil_v5\Packs\Keil\STM32F1xx_DFP\2.4.1\Device\Include
-D__UVISION_VERSION="543" -DSTM32F10X_MD -DUSE_STDPERIPH_DRIVER
-o ..\output\run_led.o --omf_browse ..\output\run_led.crf --depend ..\output\run_led.d)
+=======
+F (..\APP\Run_Led.c)(0x68C10001)(--gnu -c --cpu Cortex-M3 -g -O1 --apcs=interwork --split_sections -I ..\CMSIS_Support -I ..\FWLIB\inc -I ..\APP -I ..\DEVICE
-ID:\soft\Keil_v5\Packs\Keil\STM32F1xx_DFP\2.4.1\Device\Include
-D__UVISION_VERSION="543" -DSTM32F10X_MD -DUSE_STDPERIPH_DRIVER
-o ..\output\run_led.o --omf_browse ..\output\run_led.crf --depend ..\output\run_led.d)
+>>>>>>> origin/BLU_LED
I (..\CMSIS_Support\stm32f10x.h)(0x688E6595)
I (..\CMSIS_Support\core_cm3.h)(0x688E6595)
I (d:\soft\Keil_v5\ARM\ARMCC\include\stdint.h)(0x5CEB79E2)
diff --git a/不同颜色LED/OUTPUT/core_cm3.o b/不同颜色LED/OUTPUT/core_cm3.o
index a439475..8d7fd6e 100644
Binary files a/不同颜色LED/OUTPUT/core_cm3.o and b/不同颜色LED/OUTPUT/core_cm3.o differ
diff --git a/不同颜色LED/OUTPUT/delay.o b/不同颜色LED/OUTPUT/delay.o
index 71d8f64..686b799 100644
Binary files a/不同颜色LED/OUTPUT/delay.o and b/不同颜色LED/OUTPUT/delay.o differ
diff --git a/不同颜色LED/OUTPUT/led_init.o b/不同颜色LED/OUTPUT/led_init.o
index 67017e8..4eb5261 100644
Binary files a/不同颜色LED/OUTPUT/led_init.o and b/不同颜色LED/OUTPUT/led_init.o differ
diff --git a/不同颜色LED/OUTPUT/main.o b/不同颜色LED/OUTPUT/main.o
index 378fceb..7a869de 100644
Binary files a/不同颜色LED/OUTPUT/main.o and b/不同颜色LED/OUTPUT/main.o differ
diff --git a/不同颜色LED/OUTPUT/misc.o b/不同颜色LED/OUTPUT/misc.o
index e812c02..3c16d8c 100644
Binary files a/不同颜色LED/OUTPUT/misc.o and b/不同颜色LED/OUTPUT/misc.o differ
diff --git a/不同颜色LED/OUTPUT/stm32f10x_adc.o b/不同颜色LED/OUTPUT/stm32f10x_adc.o
index 3412bab..dafe3d3 100644
Binary files a/不同颜色LED/OUTPUT/stm32f10x_adc.o and b/不同颜色LED/OUTPUT/stm32f10x_adc.o differ
diff --git a/不同颜色LED/OUTPUT/stm32f10x_bkp.o b/不同颜色LED/OUTPUT/stm32f10x_bkp.o
index 16764eb..7bda022 100644
Binary files a/不同颜色LED/OUTPUT/stm32f10x_bkp.o and b/不同颜色LED/OUTPUT/stm32f10x_bkp.o differ
diff --git a/不同颜色LED/OUTPUT/stm32f10x_can.o b/不同颜色LED/OUTPUT/stm32f10x_can.o
index 741da8c..73a515c 100644
Binary files a/不同颜色LED/OUTPUT/stm32f10x_can.o and b/不同颜色LED/OUTPUT/stm32f10x_can.o differ
diff --git a/不同颜色LED/OUTPUT/stm32f10x_cec.o b/不同颜色LED/OUTPUT/stm32f10x_cec.o
index d647297..fbfcded 100644
Binary files a/不同颜色LED/OUTPUT/stm32f10x_cec.o and b/不同颜色LED/OUTPUT/stm32f10x_cec.o differ
diff --git a/不同颜色LED/OUTPUT/stm32f10x_crc.o b/不同颜色LED/OUTPUT/stm32f10x_crc.o
index 1a3ff78..c780a92 100644
Binary files a/不同颜色LED/OUTPUT/stm32f10x_crc.o and b/不同颜色LED/OUTPUT/stm32f10x_crc.o differ
diff --git a/不同颜色LED/OUTPUT/stm32f10x_dac.o b/不同颜色LED/OUTPUT/stm32f10x_dac.o
index 597d3a2..9a7b198 100644
Binary files a/不同颜色LED/OUTPUT/stm32f10x_dac.o and b/不同颜色LED/OUTPUT/stm32f10x_dac.o differ
diff --git a/不同颜色LED/OUTPUT/stm32f10x_dbgmcu.o b/不同颜色LED/OUTPUT/stm32f10x_dbgmcu.o
index b8ecd77..681dd3d 100644
Binary files a/不同颜色LED/OUTPUT/stm32f10x_dbgmcu.o and b/不同颜色LED/OUTPUT/stm32f10x_dbgmcu.o differ
diff --git a/不同颜色LED/OUTPUT/stm32f10x_dma.o b/不同颜色LED/OUTPUT/stm32f10x_dma.o
index b37ba6d..b86f503 100644
Binary files a/不同颜色LED/OUTPUT/stm32f10x_dma.o and b/不同颜色LED/OUTPUT/stm32f10x_dma.o differ
diff --git a/不同颜色LED/OUTPUT/stm32f10x_exti.o b/不同颜色LED/OUTPUT/stm32f10x_exti.o
index 9462378..75989fe 100644
Binary files a/不同颜色LED/OUTPUT/stm32f10x_exti.o and b/不同颜色LED/OUTPUT/stm32f10x_exti.o differ
diff --git a/不同颜色LED/OUTPUT/stm32f10x_flash.o b/不同颜色LED/OUTPUT/stm32f10x_flash.o
index 5def114..7899aca 100644
Binary files a/不同颜色LED/OUTPUT/stm32f10x_flash.o and b/不同颜色LED/OUTPUT/stm32f10x_flash.o differ
diff --git a/不同颜色LED/OUTPUT/stm32f10x_fsmc.o b/不同颜色LED/OUTPUT/stm32f10x_fsmc.o
index 00a5d3c..9c146ff 100644
Binary files a/不同颜色LED/OUTPUT/stm32f10x_fsmc.o and b/不同颜色LED/OUTPUT/stm32f10x_fsmc.o differ
diff --git a/不同颜色LED/OUTPUT/stm32f10x_gpio.o b/不同颜色LED/OUTPUT/stm32f10x_gpio.o
index 608938e..2ab4859 100644
Binary files a/不同颜色LED/OUTPUT/stm32f10x_gpio.o and b/不同颜色LED/OUTPUT/stm32f10x_gpio.o differ
diff --git a/不同颜色LED/OUTPUT/stm32f10x_i2c.o b/不同颜色LED/OUTPUT/stm32f10x_i2c.o
index d1787e9..a578077 100644
Binary files a/不同颜色LED/OUTPUT/stm32f10x_i2c.o and b/不同颜色LED/OUTPUT/stm32f10x_i2c.o differ
diff --git a/不同颜色LED/OUTPUT/stm32f10x_it.o b/不同颜色LED/OUTPUT/stm32f10x_it.o
index 421dcad..2cf006b 100644
Binary files a/不同颜色LED/OUTPUT/stm32f10x_it.o and b/不同颜色LED/OUTPUT/stm32f10x_it.o differ
diff --git a/不同颜色LED/OUTPUT/stm32f10x_iwdg.o b/不同颜色LED/OUTPUT/stm32f10x_iwdg.o
index 7d4d6f1..d73e581 100644
Binary files a/不同颜色LED/OUTPUT/stm32f10x_iwdg.o and b/不同颜色LED/OUTPUT/stm32f10x_iwdg.o differ
diff --git a/不同颜色LED/OUTPUT/stm32f10x_pwr.o b/不同颜色LED/OUTPUT/stm32f10x_pwr.o
index c77a6bb..612405b 100644
Binary files a/不同颜色LED/OUTPUT/stm32f10x_pwr.o and b/不同颜色LED/OUTPUT/stm32f10x_pwr.o differ
diff --git a/不同颜色LED/OUTPUT/stm32f10x_rcc.o b/不同颜色LED/OUTPUT/stm32f10x_rcc.o
index c2de50e..6a66540 100644
Binary files a/不同颜色LED/OUTPUT/stm32f10x_rcc.o and b/不同颜色LED/OUTPUT/stm32f10x_rcc.o differ
diff --git a/不同颜色LED/OUTPUT/stm32f10x_rtc.o b/不同颜色LED/OUTPUT/stm32f10x_rtc.o
index 8d6df54..ead03f7 100644
Binary files a/不同颜色LED/OUTPUT/stm32f10x_rtc.o and b/不同颜色LED/OUTPUT/stm32f10x_rtc.o differ
diff --git a/不同颜色LED/OUTPUT/stm32f10x_sdio.o b/不同颜色LED/OUTPUT/stm32f10x_sdio.o
index c18f345..bd31193 100644
Binary files a/不同颜色LED/OUTPUT/stm32f10x_sdio.o and b/不同颜色LED/OUTPUT/stm32f10x_sdio.o differ
diff --git a/不同颜色LED/OUTPUT/stm32f10x_spi.o b/不同颜色LED/OUTPUT/stm32f10x_spi.o
index 0156577..fc1434e 100644
Binary files a/不同颜色LED/OUTPUT/stm32f10x_spi.o and b/不同颜色LED/OUTPUT/stm32f10x_spi.o differ
diff --git a/不同颜色LED/OUTPUT/stm32f10x_tim.o b/不同颜色LED/OUTPUT/stm32f10x_tim.o
index 88c7494..b6ec493 100644
Binary files a/不同颜色LED/OUTPUT/stm32f10x_tim.o and b/不同颜色LED/OUTPUT/stm32f10x_tim.o differ
diff --git a/不同颜色LED/OUTPUT/stm32f10x_usart.o b/不同颜色LED/OUTPUT/stm32f10x_usart.o
index 76558ca..c35af6f 100644
Binary files a/不同颜色LED/OUTPUT/stm32f10x_usart.o and b/不同颜色LED/OUTPUT/stm32f10x_usart.o differ
diff --git a/不同颜色LED/OUTPUT/stm32f10x_wwdg.o b/不同颜色LED/OUTPUT/stm32f10x_wwdg.o
index e809808..fd77294 100644
Binary files a/不同颜色LED/OUTPUT/stm32f10x_wwdg.o and b/不同颜色LED/OUTPUT/stm32f10x_wwdg.o differ
diff --git a/不同颜色LED/OUTPUT/system_stm32f10x.o b/不同颜色LED/OUTPUT/system_stm32f10x.o
index 7aed116..7d6f2c7 100644
Binary files a/不同颜色LED/OUTPUT/system_stm32f10x.o and b/不同颜色LED/OUTPUT/system_stm32f10x.o differ
diff --git a/不同颜色LED/Project/STM32_Project_DEMO.uvguix.bd7iw b/不同颜色LED/Project/STM32_Project_DEMO.uvguix.bd7iw
index 811018c..95ea7de 100644
--- a/不同颜色LED/Project/STM32_Project_DEMO.uvguix.bd7iw
+++ b/不同颜色LED/Project/STM32_Project_DEMO.uvguix.bd7iw
@@ -1822,7 +1822,7 @@
Build
976
- 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA000000000000000000000000000000000000000000000000010000000100000096000000030020500000000008546172676574203196000000000000000100085461726765742031000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000
+ 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000002001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA000000000000000000000000000000000000000000000000010000000100000096000000030020500000000008546172676574203196000000000000000100085461726765742031000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000
583
@@ -1865,9 +1865,15 @@
0
..\APP\Run_Led.c
+<<<<<<< HEAD
0
1
18
+=======
+ 29
+ 1
+ 13
+>>>>>>> origin/BLU_LED
1
0