From 149e536fe8b98937c09455656c63c032ede81d49 Mon Sep 17 00:00:00 2001 From: ahu_gq Date: Thu, 6 Feb 2025 15:22:58 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BF=BD=E7=95=A5?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + app/stm32fxxx_app/.gitignore | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 app/stm32fxxx_app/.gitignore diff --git a/.gitignore b/.gitignore index ff9d367..06e7ee2 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,7 @@ Objects/ Listings/ Exe/ +prj/ # 忽略用户设置文件,通常包含调试和布局等信息 diff --git a/app/stm32fxxx_app/.gitignore b/app/stm32fxxx_app/.gitignore new file mode 100644 index 0000000..3f7efd5 --- /dev/null +++ b/app/stm32fxxx_app/.gitignore @@ -0,0 +1,34 @@ +# 忽略 Keil5 生成的中间文件和备份文件 +*.obj +*.lst +*.bak +*.rpt +*.plg +*.uvgui.* +*.crf +*.map +*.hex +*.axf +*.o +*.s19 +*.dbgconf +# 忽略编译器输出目录(如果您有自定义的输出目录) +Objects/ +Listings/ +Exe/ +prj/ + +# 忽略用户设置文件,通常包含调试和布局等信息 +*.uvoptx +*.Administrator + +# 如果使用 Visual Studio Code,可以忽略以下目录和文件 +.vscode/ +*.code-workspace + +# 忽略操作系统生成的文件 +.DS_Store +Thumbs.db + +# 如果使用其他外部工具(例如,IDE 生成的临时文件) +*.log From b4498ae4d0962c2c00171d85b27b43b773792ea3 Mon Sep 17 00:00:00 2001 From: ahu_gq Date: Thu, 6 Feb 2025 15:24:17 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=BF=BD=E7=95=A5?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 ++ app/stm32fxxx_app/.gitignore | 1 + app/stm32fxxx_app/prj/BCU_APP.uvprojx | 2 -- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 06e7ee2..7bc8d22 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,8 @@ *.o *.s19 *.dbgconf +*.uvprojx + # 忽略编译器输出目录(如果您有自定义的输出目录) Objects/ Listings/ diff --git a/app/stm32fxxx_app/.gitignore b/app/stm32fxxx_app/.gitignore index 3f7efd5..437af95 100644 --- a/app/stm32fxxx_app/.gitignore +++ b/app/stm32fxxx_app/.gitignore @@ -12,6 +12,7 @@ *.o *.s19 *.dbgconf +*.uvprojx # 忽略编译器输出目录(如果您有自定义的输出目录) Objects/ Listings/ diff --git a/app/stm32fxxx_app/prj/BCU_APP.uvprojx b/app/stm32fxxx_app/prj/BCU_APP.uvprojx index 3844933..0d4436d 100644 --- a/app/stm32fxxx_app/prj/BCU_APP.uvprojx +++ b/app/stm32fxxx_app/prj/BCU_APP.uvprojx @@ -187,7 +187,6 @@ 2 0 0 - 0 1 0 8 @@ -1315,7 +1314,6 @@ 2 0 0 - 0 1 0 8 From b21c5fadd48bdca72c1d0d413578ab766267599e Mon Sep 17 00:00:00 2001 From: ahu_gq Date: Thu, 6 Feb 2025 15:25:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/stm32fxxx_app/prj/BCU_APP.uvprojx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/stm32fxxx_app/prj/BCU_APP.uvprojx b/app/stm32fxxx_app/prj/BCU_APP.uvprojx index 0d4436d..8f8d7b6 100644 --- a/app/stm32fxxx_app/prj/BCU_APP.uvprojx +++ b/app/stm32fxxx_app/prj/BCU_APP.uvprojx @@ -11,7 +11,7 @@ 0x4 ARM-ADS 5060960::V5.06 update 7 (build 960)::.\ARM_Compiler_5.06u7 - 5060960::V5.06 update 7 (build 960)::.\ARM_Compiler_5.06u7 + 5060960::V5.06 update 7 (build 960)::.\ARMCC 0