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: ab2ae908aa68
Choose a base ref
...
head repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1d252f0b61fb
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Jun 22, 2020

  1. Reenabled SiglentSCPI driver on Win32

    nshcat committed Jun 22, 2020
    Copy the full SHA
    7316f5c View commit details
  2. Copy the full SHA
    cc74cec View commit details
  3. Merge pull request #162 from nshcat/win32-reenable-drivers

    Win32 reenable drivers
    azonenberg authored Jun 22, 2020
    Copy the full SHA
    1d252f0 View commit details
Showing with 0 additions and 11 deletions.
  1. +0 −4 scopehal/SiglentSCPIOscilloscope.cpp
  2. +0 −4 scopehal/SiglentSCPIOscilloscope.h
  3. +0 −3 scopehal/scopehal.cpp
4 changes: 0 additions & 4 deletions scopehal/SiglentSCPIOscilloscope.cpp
Original file line number Diff line number Diff line change
@@ -27,8 +27,6 @@
* *
***********************************************************************************************************************/

#ifndef _WIN32

#include "scopehal.h"
#include "SiglentSCPIOscilloscope.h"
#include "ProtocolDecoder.h"
@@ -400,5 +398,3 @@ bool SiglentSCPIOscilloscope::AcquireData(bool toQueue)

return true;
}

#endif
4 changes: 0 additions & 4 deletions scopehal/SiglentSCPIOscilloscope.h
Original file line number Diff line number Diff line change
@@ -27,8 +27,6 @@
* *
***********************************************************************************************************************/

#ifndef _WIN32

#ifndef SiglentSCPIOscilloscope_h
#define SiglentSCPIOscilloscope_h

@@ -206,5 +204,3 @@ struct SiglentWaveformDesc_t
};

#endif

#endif
3 changes: 0 additions & 3 deletions scopehal/scopehal.cpp
Original file line number Diff line number Diff line change
@@ -77,11 +77,8 @@ void DriverStaticInit()
AddDriverClass(AntikernelLogicAnalyzer);
AddDriverClass(RigolOscilloscope);
AddDriverClass(RohdeSchwarzOscilloscope);

#ifndef _WIN32
AddDriverClass(LeCroyOscilloscope);
AddDriverClass(SiglentSCPIOscilloscope);
#endif
}

string GetDefaultChannelColor(int i)