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: 7e0415db3b4c
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: 3e460aaee149
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Feb 26, 2020

  1. add siglent driver option to glscopeglient

    @four0four
    four0four committed Feb 26, 2020
    Copy the full SHA
    3e460aa View commit details
Showing with 12 additions and 0 deletions.
  1. +12 −0 glscopeclient/main.cpp
12 changes: 12 additions & 0 deletions glscopeclient/main.cpp
View file
Original file line number Diff line number Diff line change
@@ -37,6 +37,7 @@
#include "OscilloscopeWindow.h"
#include "../scopeprotocols/scopeprotocols.h"
#include "../scopemeasurements/scopemeasurements.h"
#include "../scopehal/SiglentSCPIOscilloscope.h"
#include "../scopehal/AgilentOscilloscope.h"
#include "../scopehal/LeCroyVICPOscilloscope.h"
#include "../scopehal/RigolOscilloscope.h"
@@ -289,6 +290,17 @@ int main(int argc, char* argv[])
scope->m_nickname = nick;
app->m_scopes.push_back(scope);
}
else if(sapi == "siglent_lan" || sapi == "lecroy_lan")
{
//default port if not specified
if(port == 0)
port = 5025;

// TODO: update to proper transport convention
auto scope = new SiglentSCPIOscilloscope(host, port);
scope->m_nickname = nick;
app->m_scopes.push_back(scope);
}
else
{
LogError("Unrecognized API \"%s\", use --help\n", api);