Merge pull request #68 from pcdshub/run22

Merge run22 into master
pcdshub · Aug 26, 2024 · 187edbc · 187edbc
2 parents 6030f19 + 12dd7a6
commit 187edbc
Show file tree

Hide file tree

Showing 39 changed files with 2,987 additions and 551 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,9 @@ logs
 # Ignore generated database file
 mfx/db.txt
 
+# Ignore changed presets
+presets/
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]

diff --git a/dev/devpath/nabs b/dev/devpath/nabs
diff --git a/dev/pcdsdevices b/dev/pcdsdevices