Merge branch 'master' into wk

This commit is contained in:
ahu_gq 2025-02-06 15:25:49 +08:00
commit 9b00c89697
3 changed files with 39 additions and 1 deletions

3
.gitignore vendored
View File

@ -12,10 +12,13 @@
*.o
*.s19
*.dbgconf
*.uvprojx
# 忽略编译器输出目录(如果您有自定义的输出目录)
Objects/
Listings/
Exe/
prj/
# 忽略用户设置文件,通常包含调试和布局等信息

35
app/stm32fxxx_app/.gitignore vendored Normal file
View File

@ -0,0 +1,35 @@
# 忽略 Keil5 生成的中间文件和备份文件
*.obj
*.lst
*.bak
*.rpt
*.plg
*.uvgui.*
*.crf
*.map
*.hex
*.axf
*.o
*.s19
*.dbgconf
*.uvprojx
# 忽略编译器输出目录(如果您有自定义的输出目录)
Objects/
Listings/
Exe/
prj/
# 忽略用户设置文件,通常包含调试和布局等信息
*.uvoptx
*.Administrator
# 如果使用 Visual Studio Code可以忽略以下目录和文件
.vscode/
*.code-workspace
# 忽略操作系统生成的文件
.DS_Store
Thumbs.db
# 如果使用其他外部工具例如IDE 生成的临时文件)
*.log

View File

@ -11,7 +11,7 @@
<ToolsetNumber>0x4</ToolsetNumber>
<ToolsetName>ARM-ADS</ToolsetName>
<pArmCC>5060960::V5.06 update 7 (build 960)::.\ARM_Compiler_5.06u7</pArmCC>
<pCCUsed>5060960::V5.06 update 7 (build 960)::.\ARM_Compiler_5.06u7</pCCUsed>
<pCCUsed>5060960::V5.06 update 7 (build 960)::.\ARMCC</pCCUsed>
<uAC6>0</uAC6>
<TargetOption>
<TargetCommonOption>