diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..a0ab172
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,47 @@
+# Keil MDK - Build artifacts
+*.o
+*.d
+*.crf
+*.axf
+*.hex
+*.map
+*.lnp
+*.sct
+*.dep
+*.build_log.htm
+*.htm
+*.log
+*.lst
+*.dep
+
+# Keil MDK - IDE settings (user-specific)
+*.uvoptx
+*.uvguix.*
+
+# Keil MDK - Debug config
+*.dbgconf
+
+# Keil MDK - RTE auto-generated
+MDK-ARM/RTE/
+
+# STM32CubeMX (keep .ioc, it's the project source)
+# *.ioc
+
+# Visual Studio / IDE
+.vs/
+*.suo
+*.njsproj
+*.sln
+*.suo
+*.user
+*.opensdf
+*.cache
+
+# Windows
+Thumbs.db
+ehthumbs.db
+*.tmp
+*.temp
+
+# Linux / Mac
+.DS_Store
\ No newline at end of file
diff --git a/Core/Src/main.c b/Core/Src/main.c
index 61d9222..4a2db78 100644
--- a/Core/Src/main.c
+++ b/Core/Src/main.c
@@ -65,11 +65,11 @@ void delay_us(uint32_t nus)
{
uint32_t ticks;
uint32_t told, tnow, tcnt = 0;
- uint32_t reload = SysTick->LOAD; /* LOADµÄÖµ */
- ticks = nus * g_fac_us; /* ÐèÒªµÄ½ÚÅÄÊý */
+ uint32_t reload = SysTick->LOAD;
+ ticks = nus * g_fac_us;
- told = SysTick->VAL; /* ¸Õ½øÈëʱµÄ¼ÆÊýÆ÷Öµ */
+ told = SysTick->VAL;
while (1)
{
tnow = SysTick->VAL;
@@ -77,7 +77,7 @@ void delay_us(uint32_t nus)
{
if (tnow < told)
{
- tcnt += told - tnow; /* ÕâÀï×¢ÒâÒ»ÏÂSYSTICKÊÇÒ»¸öµÝ¼õµÄ¼ÆÊýÆ÷¾Í¿ÉÒÔÁË */
+ tcnt += told - tnow;
}
else
{
@@ -86,7 +86,7 @@ void delay_us(uint32_t nus)
told = tnow;
if (tcnt >= ticks)
{
- break; /* ʱ¼ä³¬¹ý/µÈÓÚÒªÑÓ³ÙµÄʱ¼ä,ÔòÍ˳ö */
+ break;
}
}
}
@@ -125,7 +125,7 @@ int main(void)
/* Initialize all configured peripherals */
MX_GPIO_Init();
/* USER CODE BEGIN 2 */
- delay_init(84);
+ delay_init(84);
/* USER CODE END 2 */
/* Infinite loop */
@@ -133,8 +133,8 @@ int main(void)
while (1)
{
/* USER CODE END WHILE */
- HAL_GPIO_TogglePin(GPIOB, GPIO_PIN_4);
- HAL_GPIO_TogglePin(GPIOB, GPIO_PIN_5);
+ HAL_GPIO_TogglePin(GPIOC, GPIO_PIN_4);
+ HAL_GPIO_TogglePin(GPIOC, GPIO_PIN_5);
delay_ms(500);
/* USER CODE BEGIN 3 */
}
diff --git a/MDK-ARM/MyF4.uvoptx b/MDK-ARM/MyF4.uvoptx
index 7e6eee9..1af1d36 100644
--- a/MDK-ARM/MyF4.uvoptx
+++ b/MDK-ARM/MyF4.uvoptx
@@ -125,7 +125,7 @@
0
ST-LINKIII-KEIL_SWO
- -U-O142 -O2254 -S0 -C0 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC800 -FN1 -FF0STM32F4xx_1024.FLM -FS08000000 -FL0100000 -FP0($$Device:STM32F407ZGTx$CMSIS\Flash\STM32F4xx_1024.FLM)
+ -U12029401190032524B413836 -O18668 -SF10000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("") -D00(00000000) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8000 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO31 -FD20000000 -FC800 -FN1 -FF0STM32F4xx_1024 -FS08000000 -FL0100000 -FP0($$Device:STM32F407ZGTx$CMSIS\Flash\STM32F4xx_1024.FLM)
@@ -173,7 +173,7 @@
1
- 1
+ 0
0
2
10000000
@@ -247,7 +247,7 @@
Drivers/STM32F4xx_HAL_Driver
- 0
+ 1
0
0
0
@@ -411,7 +411,7 @@
Drivers/CMSIS
- 0
+ 1
0
0
0
diff --git a/MDK-ARM/MyF4.uvprojx b/MDK-ARM/MyF4.uvprojx
index 68bff8e..32a7de7 100644
--- a/MDK-ARM/MyF4.uvprojx
+++ b/MDK-ARM/MyF4.uvprojx
@@ -16,7 +16,7 @@
STM32F407ZGTx
STMicroelectronics
- Keil.STM32F4xx_DFP.3.0.0
+ Keil.STM32F4xx_DFP.3.1.0
https://www.keil.com/pack/
IRAM(0x20000000-0x2001BFFF) IRAM2(0x2001C000-0x2001FFFF) IROM(0x8000000-0x80FFFFF) CLOCK(25000000) FPU2 CPUTYPE("Cortex-M4") TZ
@@ -81,7 +81,7 @@
0
- 1
+ 0
0
@@ -138,7 +138,7 @@
1
BIN\UL2V8M.DLL
-
+ "" ()
@@ -207,7 +207,7 @@
0
0
1
- 1
+ 0
0
0
0
diff --git a/MDK-ARM/MyF4/MyF4.axf b/MDK-ARM/MyF4/MyF4.axf
index 18f7c08..54eeb1b 100644
Binary files a/MDK-ARM/MyF4/MyF4.axf and b/MDK-ARM/MyF4/MyF4.axf differ
diff --git a/MDK-ARM/MyF4/MyF4.build_log.htm b/MDK-ARM/MyF4/MyF4.build_log.htm
index bb92912..00034fe 100644
--- a/MDK-ARM/MyF4/MyF4.build_log.htm
+++ b/MDK-ARM/MyF4/MyF4.build_log.htm
@@ -5,46 +5,46 @@
Tool Versions:
IDE-Version: Vision V5.38.0.0
Copyright (C) 2022 ARM Ltd and ARM Germany GmbH. All rights reserved.
-License Information: wader Administrator, wader, LIC=ZB4EI-TPLGT-NNNAF-69R37-GC9L6-CVJQF
+License Information: eeqwrq 1624155937@qq.com, afsa, LIC=GMZI6-D93CI-01BP1-CJM5B-NN00U-01A4V
Tool Versions:
-Toolchain: MDK-ARM Plus Version: 5.42.0.0
+Toolchain: MDK-ARM Plus Version: 5.36.0.0
Toolchain Path: C:\Keil_v5\ARM\ARMCC\Bin
C Compiler: Armcc.exe V5.06 update 7 (build 960)
Assembler: Armasm.exe V5.06 update 7 (build 960)
Linker/Locator: ArmLink.exe V5.06 update 7 (build 960)
Library Manager: ArmAr.exe V5.06 update 7 (build 960)
Hex Converter: FromElf.exe V5.06 update 7 (build 960)
-CPU DLL: SARMCM3.DLL V5.42.0.0
-Dialog DLL: DCM.DLL V1.17.5.0
+CPU DLL: SARMCM3.DLL V5.36.0.0
+Dialog DLL: DCM.DLL V1.17.3.0
Target DLL: STLink\ST-LINKIII-KEIL_SWO.dll V3.0.9.0
-Dialog DLL: TCM.DLL V1.56.6.0
+Dialog DLL: TCM.DLL V1.53.0.0
Project:
-D:\Code\STM32\CUBE\MyF4\MDK-ARM\MyF4.uvprojx
+D:\Code\DTU \STM32F4-Base\MDK-ARM\MyF4.uvprojx
Project File Date: 06/04/2026
Output:
*** Using Compiler 'V5.06 update 7 (build 960)', folder: 'C:\Keil_v5\ARM\ARMCC\Bin'
Rebuild target 'MyF4'
assembling startup_stm32f407xx.s...
+compiling stm32f4xx_hal_flash_ramfunc.c...
+compiling stm32f4xx_it.c...
compiling stm32f4xx_hal_gpio.c...
+compiling stm32f4xx_hal_msp.c...
+compiling stm32f4xx_hal_rcc_ex.c...
compiling main.c...
compiling stm32f4xx_hal_pwr_ex.c...
-compiling stm32f4xx_hal_flash.c...
-compiling stm32f4xx_hal_msp.c...
-compiling stm32f4xx_hal_flash_ex.c...
-compiling stm32f4xx_hal_pwr.c...
-compiling system_stm32f4xx.c...
-compiling stm32f4xx_it.c...
-compiling stm32f4xx_hal_cortex.c...
-compiling stm32f4xx_hal.c...
compiling stm32f4xx_hal_exti.c...
-compiling stm32f4xx_hal_dma.c...
+compiling system_stm32f4xx.c...
+compiling stm32f4xx_hal_flash_ex.c...
+compiling stm32f4xx_hal_flash.c...
+compiling stm32f4xx_hal_cortex.c...
+compiling stm32f4xx_hal_pwr.c...
compiling stm32f4xx_hal_rcc.c...
-compiling stm32f4xx_hal_flash_ramfunc.c...
+compiling stm32f4xx_hal.c...
+compiling stm32f4xx_hal_dma.c...
compiling stm32f4xx_hal_dma_ex.c...
-compiling stm32f4xx_hal_rcc_ex.c...
linking...
Program Size: Code=3266 RO-data=442 RW-data=20 ZI-data=1636
FromELF: creating hex file...
@@ -53,25 +53,25 @@ FromELF: creating hex file...
Software Packages used:
Package Vendor: ARM
- https://www.keil.com/pack/ARM.CMSIS.6.0.0.pack
- ARM.CMSIS.6.0.0
+ http://www.keil.com/pack/ARM.CMSIS.5.8.0.pack
+ ARM.CMSIS.5.8.0
CMSIS (Common Microcontroller Software Interface Standard)
- * Component: CORE Version: 6.0.0
+ * Component: CORE Version: 5.5.0
Package Vendor: Keil
- https://www.keil.com/pack/Keil.STM32F4xx_DFP.3.0.0.pack
- Keil.STM32F4xx_DFP.3.0.0
+ https://www.keil.com/pack/Keil.STM32F4xx_DFP.3.1.0.pack
+ Keil.STM32F4xx_DFP.3.1.0
STMicroelectronics STM32F4 Series Device Support
Collection of Component include folders:
./RTE/_MyF4
- C:/Users/Administrator/AppData/Local/Arm/Packs/ARM/CMSIS/6.0.0/CMSIS/Core/Include
+ C:/Users/16241/AppData/Local/Arm/Packs/ARM/CMSIS/5.8.0/CMSIS/Core/Include
Collection of Component Files used:
- * Component: ARM::CMSIS:CORE:6.0.0
+ * Component: ARM::CMSIS:CORE:5.5.0
Include file: CMSIS/Core/Include/tz_context.h
-Build Time Elapsed: 00:00:02
+Build Time Elapsed: 00:00:08