Skip to content

Commit

Permalink
Merge branch 'ngscopeclient:master' into specans-fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@fredzo
fredzo authored Nov 4, 2024
2 parents 27aa7a5 + 2d15f09 commit 756c727
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion doc
Submodule doc updated 1 files
+18 −0 section-scope-drivers.tex
2 changes: 1 addition & 1 deletion lib
Submodule lib updated 14 files
+2 −1 scopehal/CMakeLists.txt
+4 −4 scopehal/OwonXDGFunctionGenerator.cpp
+2 −2 scopehal/OwonXDGFunctionGenerator.h
+311 −0 scopehal/SCPISA.cpp
+133 −0 scopehal/SCPISA.h
+26 −3 scopehal/SCPIUARTTransport.cpp
+0 −41 scopehal/ScopehalUtil.h
+52 −13 scopehal/TektronixOscilloscope.cpp
+9 −0 scopehal/TektronixOscilloscope.h
+541 −0 scopehal/TinySA.cpp
+93 −28 scopehal/TinySA.h
+2 −0 scopehal/scopehal.cpp
+2 −1 scopehal/scopehal.h
+1 −1 xptools

0 comments on commit 756c727

Please sign in to comment.