Merge branch 'main' into driver-refactor

gsora · Nov 2, 2022 · 6332bf1 · 6332bf1
2 parents 2cf4622 + ebc0739
commit 6332bf1
Show file tree

Hide file tree

Showing 132 changed files with 5,902 additions and 9,153 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -36,3 +36,6 @@ LICENSE text eol=lf
 
 # System description files
 *.svd eol=lf
+
+# JSON
+*.json eol=lf
diff --git a/.gitignore b/.gitignore
@@ -47,8 +47,12 @@ tools/ct_data/v2p.txt
 /emulation/linux-server-rootfs.jffs2
 
 # don't record weirdnesses dealing with vscode
-/.vscode/
-/.vs/
+.vscode
+.vs
+settings.json
+
+# Emacs backup files
+*~
 
 # don't commit local modifications to the Renode filesystem template
 emulation/linux-server-rootfs.jffs2
@@ -74,4 +78,5 @@ share/python-wheels/
 *.egg-info/
 .installed.cfg
 *.egg
+*.pyc
 MANIFEST