From 812f8c1cfc7a5dadca5a904fc808e51a2d5af50f Mon Sep 17 00:00:00 2001
From: QuakeGod <QuakeGod@sina.com>
Date: 星期一, 17 十月 2022 23:53:28 +0800
Subject: [PATCH] merge from master and fix files

---
 .gitignore |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index bd0008a..1b5dba2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,20 @@
 Thumbs.db
 *.TMP
-MDK-ARM/F030C8T6_Test2/*
-MDK-ARM/*.uvguix.*
-MDK-ARM/*.uvoptx
-MDK-ARM/JLinkLog.txt
+*.lst
+*.o
+*.d
+*.crf
+*.lnp
+*.axf
+*.htm
+*.build_log.htm
+*.dep
+*.iex
+*.iex
+*.bin
 
+MDK-ARM/F030C8T6_Test2/*
+*.uvguix.*
+*.uvgui.*
+*.uvoptx
+JLinkLog.txt

--
Gitblit v1.9.1