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-apps
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1ed3bb1bdea0
Choose a base ref
...
head repository: ngscopeclient/scopehal-apps
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b4afb2a0a907
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 11, 2020

  1. glscopeclient: now create LeCroy / Siglent drivers via SCPITransport

    @azonenberg
    azonenberg committed Mar 11, 2020
    Copy the full SHA
    b4afb2a View commit details
Showing with 3 additions and 4 deletions.
  1. +3 −4 glscopeclient/main.cpp
7 changes: 3 additions & 4 deletions glscopeclient/main.cpp
View file
Original file line number Diff line number Diff line change
@@ -39,7 +39,7 @@
#include "../scopemeasurements/scopemeasurements.h"
#include "../scopehal/SiglentSCPIOscilloscope.h"
#include "../scopehal/AgilentOscilloscope.h"
#include "../scopehal/LeCroyVICPOscilloscope.h"
#include "../scopehal/LeCroyOscilloscope.h"
#include "../scopehal/RigolOscilloscope.h"
#include "../scopehal/RohdeSchwarzOscilloscope.h"
#include "../scopehal/AntikernelLogicAnalyzer.h"
@@ -245,7 +245,7 @@ int main(int argc, char* argv[])
if(port == 0)
port = 1861;

auto scope = new LeCroyVICPOscilloscope(host, port);
auto scope = new LeCroyOscilloscope(new VICPSocketTransport(host, port));
scope->m_nickname = nick;
app->m_scopes.push_back(scope);
}
@@ -295,8 +295,7 @@ int main(int argc, char* argv[])
if(port == 0)
port = 5025;

// TODO: update to proper transport convention
auto scope = new SiglentSCPIOscilloscope(host, port);
auto scope = new SiglentSCPIOscilloscope(new SCPISocketTransport(host, port));
scope->m_nickname = nick;
app->m_scopes.push_back(scope);
}