Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5bf1fe156728
Choose a base ref
...
head repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3626e336d366
Choose a head ref
  • 4 commits
  • 4 files changed
  • 2 contributors

Commits on Jul 6, 2020

  1. Copy the full SHA
    381ccfe View commit details
  2. Fix indenting.

    tomverbeure committed Jul 6, 2020
    Copy the full SHA
    8a75241 View commit details
  3. Fix tabs.

    tomverbeure committed Jul 6, 2020
    Copy the full SHA
    764ad41 View commit details
  4. Merge pull request #171 from tomverbeure/tektronix

    Initial skeleton Tektronix support
    azonenberg authored Jul 6, 2020
    Copy the full SHA
    3626e33 View commit details
Showing with 924 additions and 0 deletions.
  1. +1 −0 scopehal/CMakeLists.txt
  2. +802 −0 scopehal/TektronixOscilloscope.cpp
  3. +119 −0 scopehal/TektronixOscilloscope.h
  4. +2 −0 scopehal/scopehal.cpp
1 change: 1 addition & 0 deletions scopehal/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -41,6 +41,7 @@ set(SCOPEHAL_SOURCES
MockOscilloscope.cpp
SiglentSCPIOscilloscope.cpp
RigolOscilloscope.cpp
TektronixOscilloscope.cpp
RohdeSchwarzOscilloscope.cpp
RohdeSchwarzHMC8012Multimeter.cpp
RohdeSchwarzHMC804xPowerSupply.cpp
Loading