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
2025-09-15 14:36:18 +08:00
parent 33baee5223 c9bbdb607d
commit 79a095eb5e
35 changed files with 27 additions and 3 deletions
--- a/test.gif
+++ b/test.gif
--- 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);
 	}
 }
--- 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
--- a/不同颜色LED/OUTPUT/STM32_Project_DEMO.htm
+++ b/不同颜色LED/OUTPUT/STM32_Project_DEMO.htm
@@ -3,7 +3,11 @@
 <title>Static Call Graph - [..\OUTPUT\STM32_Project_DEMO.axf]</title></head>
 <body><HR>
 <H1>Static Call Graph for image ..\OUTPUT\STM32_Project_DEMO.axf</H1><HR>
+<<<<<<< HEAD
 <BR><P>#&#060CALLGRAPH&#062# ARM Linker, 5060750: Last Updated: Wed Sep 10 12:35:58 2025
+=======
+<BR><P>#&#060CALLGRAPH&#062# ARM Linker, 5060750: Last Updated: Wed Sep 10 12:35:14 2025
+>>>>>>> origin/BLU_LED
 <BR><P>
 <H3>Maximum Stack Usage =         40 bytes + Unknown(Functions without stacksize, Cycles, Untraceable Function Pointers)</H3><H3>
 Call chain for Maximum Stack Depth:</H3>
--- a/不同颜色LED/OUTPUT/STM32_Project_DEMO_Target
+++ b/不同颜色LED/OUTPUT/STM32_Project_DEMO_Target
@@ -795,7 +795,11 @@ I (..\FWLIB\inc\stm32f10x_tim.h)(0x688E6595)
 I (..\FWLIB\inc\misc.h)(0x688E6595)
 F (..\FWLIB\src\stm32f10x_tim.c)(0x688E6595)(--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\stm32f10x_tim.o --omf_browse ..\output\stm32f10x_tim.crf --depend ..\output\stm32f10x_tim.d)
 I (..\FWLIB\inc\stm32f10x_tim.h)(0x688E6595)
 I (..\CMSIS_Support\stm32f10x.h)(0x688E6595)
 I (..\CMSIS_Support\core_cm3.h)(0x688E6595)
--- a/不同颜色LED/OUTPUT/core_cm3.o
+++ b/不同颜色LED/OUTPUT/core_cm3.o
--- a/不同颜色LED/OUTPUT/delay.o
+++ b/不同颜色LED/OUTPUT/delay.o
--- a/不同颜色LED/OUTPUT/led_init.o
+++ b/不同颜色LED/OUTPUT/led_init.o
--- a/不同颜色LED/OUTPUT/main.o
+++ b/不同颜色LED/OUTPUT/main.o
--- a/不同颜色LED/OUTPUT/misc.o
+++ b/不同颜色LED/OUTPUT/misc.o
--- a/不同颜色LED/OUTPUT/stm32f10x_adc.o
+++ b/不同颜色LED/OUTPUT/stm32f10x_adc.o
--- a/不同颜色LED/OUTPUT/stm32f10x_bkp.o
+++ b/不同颜色LED/OUTPUT/stm32f10x_bkp.o
--- a/不同颜色LED/OUTPUT/stm32f10x_can.o
+++ b/不同颜色LED/OUTPUT/stm32f10x_can.o
--- a/不同颜色LED/OUTPUT/stm32f10x_cec.o
+++ b/不同颜色LED/OUTPUT/stm32f10x_cec.o
--- a/不同颜色LED/OUTPUT/stm32f10x_crc.o
+++ b/不同颜色LED/OUTPUT/stm32f10x_crc.o
--- a/不同颜色LED/OUTPUT/stm32f10x_dac.o
+++ b/不同颜色LED/OUTPUT/stm32f10x_dac.o
--- a/不同颜色LED/OUTPUT/stm32f10x_dbgmcu.o
+++ b/不同颜色LED/OUTPUT/stm32f10x_dbgmcu.o
--- a/不同颜色LED/OUTPUT/stm32f10x_dma.o
+++ b/不同颜色LED/OUTPUT/stm32f10x_dma.o
--- a/不同颜色LED/OUTPUT/stm32f10x_exti.o
+++ b/不同颜色LED/OUTPUT/stm32f10x_exti.o
--- a/不同颜色LED/OUTPUT/stm32f10x_flash.o
+++ b/不同颜色LED/OUTPUT/stm32f10x_flash.o
--- a/不同颜色LED/OUTPUT/stm32f10x_fsmc.o
+++ b/不同颜色LED/OUTPUT/stm32f10x_fsmc.o
--- a/不同颜色LED/OUTPUT/stm32f10x_gpio.o
+++ b/不同颜色LED/OUTPUT/stm32f10x_gpio.o
--- a/不同颜色LED/OUTPUT/stm32f10x_i2c.o
+++ b/不同颜色LED/OUTPUT/stm32f10x_i2c.o
--- a/不同颜色LED/OUTPUT/stm32f10x_it.o
+++ b/不同颜色LED/OUTPUT/stm32f10x_it.o
--- a/不同颜色LED/OUTPUT/stm32f10x_iwdg.o
+++ b/不同颜色LED/OUTPUT/stm32f10x_iwdg.o
--- a/不同颜色LED/OUTPUT/stm32f10x_pwr.o
+++ b/不同颜色LED/OUTPUT/stm32f10x_pwr.o
--- a/不同颜色LED/OUTPUT/stm32f10x_rcc.o
+++ b/不同颜色LED/OUTPUT/stm32f10x_rcc.o
--- a/不同颜色LED/OUTPUT/stm32f10x_rtc.o
+++ b/不同颜色LED/OUTPUT/stm32f10x_rtc.o
--- a/不同颜色LED/OUTPUT/stm32f10x_sdio.o
+++ b/不同颜色LED/OUTPUT/stm32f10x_sdio.o
--- a/不同颜色LED/OUTPUT/stm32f10x_spi.o
+++ b/不同颜色LED/OUTPUT/stm32f10x_spi.o
--- a/不同颜色LED/OUTPUT/stm32f10x_tim.o
+++ b/不同颜色LED/OUTPUT/stm32f10x_tim.o
--- a/不同颜色LED/OUTPUT/stm32f10x_usart.o
+++ b/不同颜色LED/OUTPUT/stm32f10x_usart.o
--- a/不同颜色LED/OUTPUT/stm32f10x_wwdg.o
+++ b/不同颜色LED/OUTPUT/stm32f10x_wwdg.o
--- a/不同颜色LED/OUTPUT/system_stm32f10x.o
+++ b/不同颜色LED/OUTPUT/system_stm32f10x.o
--- a/不同颜色LED/Project/STM32_Project_DEMO.uvguix.bd7iw
+++ b/不同颜色LED/Project/STM32_Project_DEMO.uvguix.bd7iw
@@ -1822,7 +1822,7 @@
        <Name>Build</Name>
        <Buttons>
          <Len>976</Len>
-          <Data>00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA000000000000000000000000000000000000000000000000010000000100000096000000030020500000000008546172676574203196000000000000000100085461726765742031000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000</Data>
+          <Data>00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000002001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA000000000000000000000000000000000000000000000000010000000100000096000000030020500000000008546172676574203196000000000000000100085461726765742031000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000</Data>
        </Buttons>
        <OriginalItems>
          <Len>583</Len>
@@ -1865,9 +1865,15 @@
      <ActiveTab>0</ActiveTab>
      <Doc>
        <Name>..\APP\Run_Led.c</Name>
+<<<<<<< HEAD
        <ColumnNumber>0</ColumnNumber>
        <TopLine>1</TopLine>
        <CurrentLine>18</CurrentLine>
+=======
+        <ColumnNumber>29</ColumnNumber>
+        <TopLine>1</TopLine>
+        <CurrentLine>13</CurrentLine>
+>>>>>>> origin/BLU_LED
        <Folding>1</Folding>
        <ContractedFolders></ContractedFolders>
        <PaneID>0</PaneID>