1
0
forked from Git_test/Git_TEST

9 Commits

Author SHA1 Message Date
f137219b2d 111111 2025-09-22 16:44:11 +08:00
BD7IWD-CMP\bd7iw
ceaf5231fa 合并冲突测试 2025-09-15 15:58:40 +08:00
BD7IWD-CMP\bd7iw
79a095eb5e 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
BD7IWD-CMP\bd7iw
33baee5223 验证SSH秘钥 2025-09-10 16:31:31 +08:00
BD7IWD-CMP\bd7iw
d04ea19bc9 keil的临时文件,不重要,懒得清理了,推上去没影响 2025-09-10 13:47:20 +08:00
BD7IWD-CMP\bd7iw
5028a991de 红灯也要2500mS 2025-09-10 12:36:10 +08:00
BD7IWD-CMP\bd7iw
c9bbdb607d 蓝灯间隔2000mS太大了,改为1000mS 2025-09-10 12:35:31 +08:00
BD7IWD-CMP\bd7iw
eedd3484fa 突然想要蓝灯,闪烁间隔2000mS 2025-09-10 12:35:01 +08:00
BD7IWD-CMP\bd7iw
b7b3ce0e44 红灯闪烁间隔也改为5000mS 2025-09-10 12:04:03 +08:00
43 changed files with 2080 additions and 216 deletions

BIN
test.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 MiB

View File

@@ -2,16 +2,20 @@
#include "Delay.h"
#include "Led_Init.h"
#define Delay_Time 500
<<<<<<< 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);
}
}

View File

@@ -0,0 +1 @@
随便改了点啥东西验证SSH秘钥

View File

@@ -26,38 +26,8 @@ Project File Date: 09/10/2025
<h2>Output:</h2>
*** Using Compiler 'V5.06 update 6 (build 750)', folder: 'd:\soft\Keil_v5\ARM\ARMCC\Bin'
Rebuild target 'Target 1'
assembling startup_stm32f10x_md.s...
compiling stm32f10x_cec.c...
compiling stm32f10x_it.c...
compiling stm32f10x_dac.c...
compiling core_cm3.c...
compiling stm32f10x_bkp.c...
compiling stm32f10x_dbgmcu.c...
compiling stm32f10x_exti.c...
compiling stm32f10x_flash.c...
compiling system_stm32f10x.c...
compiling misc.c...
compiling stm32f10x_dma.c...
compiling stm32f10x_crc.c...
compiling stm32f10x_adc.c...
compiling stm32f10x_fsmc.c...
compiling stm32f10x_can.c...
compiling stm32f10x_gpio.c...
compiling stm32f10x_i2c.c...
compiling stm32f10x_iwdg.c...
compiling stm32f10x_pwr.c...
compiling stm32f10x_rtc.c...
compiling stm32f10x_rcc.c...
compiling stm32f10x_sdio.c...
compiling stm32f10x_spi.c...
compiling Led_Init.c...
compiling stm32f10x_wwdg.c...
compiling Delay.c...
Build target 'Target 1'
compiling Run_Led.c...
compiling stm32f10x_usart.c...
compiling main.c...
compiling stm32f10x_tim.c...
linking...
Program Size: Code=976 RO-data=252 RW-data=0 ZI-data=1632
FromELF: creating hex file...
@@ -74,7 +44,7 @@ Package Vendor: Keil
D:/soft/Keil_v5/Packs/Keil/STM32F1xx_DFP/2.4.1/Device/Include
<h2>Collection of Component Files used:</h2>
Build Time Elapsed: 00:00:02
Build Time Elapsed: 00:00:00
</pre>
</body>
</html>

View File

@@ -55,9 +55,15 @@
:1003500000080140000C0140FEE7704770470000B4
:10036000054A002903D09169014391617047916961
:10037000814391617047000000100240FFF7CAFFFF
:10038000084D4FF4FA7401212846FFF7BFFF2046BD
<<<<<<< HEAD
:10038000084D40F6C41401212846FFF7BFFF204660
:10039000FFF74BFF01212846FFF7B6FF2046FFF786
:1003A00044FFF0E7000C0140704700F001B8000086
=======
:10038000084D4FF47A7440212846FFF7BFFF2046FE
:10039000FFF74BFF40212846FFF7B6FF2046FFF747
:1003A00044FFF0E700080140704700F001B800008A
>>>>>>> origin/BLU_LED
:1003B0000CB50022019200922748016841F4803177
:1003C00001604FF4A063016801F4003100910199CC
:1003D000491C0191009911B901999942F3D1016821

View File

@@ -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>
<BR><P>#&#060CALLGRAPH&#062# ARM Linker, 5060750: Last Updated: Wed Sep 10 12:01:23 2025
<<<<<<< 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>

View File

@@ -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
-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)

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -187,7 +187,6 @@
<RvdsVP>0</RvdsVP>
<RvdsMve>0</RvdsMve>
<RvdsCdeCp>0</RvdsCdeCp>
<nBranchProt>0</nBranchProt>
<hadIRAM2>0</hadIRAM2>
<hadIROM2>0</hadIROM2>
<StupSel>8</StupSel>
@@ -619,6 +618,12 @@
<Layers>
<Layer>
<LayName>JX_STM32_Project_DEMO</LayName>
<LayDesc></LayDesc>
<LayUrl></LayUrl>
<LayKeys></LayKeys>
<LayCat></LayCat>
<LayLic></LayLic>
<LayTarg>0</LayTarg>
<LayPrjMark>1</LayPrjMark>
</Layer>
</Layers>

View File

@@ -1,6 +1,7 @@
#include "stm32f10x.h"
#include "Run_Led.h"
//111111111111111111
int main(void)
{