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: 6a16c637cca4
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: dbdc01c8585b
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Feb 10, 2020

  1. Initial Antikernel LA support

    @azonenberg
    azonenberg committed Feb 10, 2020
    Copy the full SHA
    dbdc01c View commit details
Showing with 11 additions and 0 deletions.
  1. +11 −0 glscopeclient/main.cpp
11 changes: 11 additions & 0 deletions glscopeclient/main.cpp
View file
Original file line number Diff line number Diff line change
@@ -40,6 +40,7 @@
#include "../scopehal/LeCroyVICPOscilloscope.h"
#include "../scopehal/RigolOscilloscope.h"
#include "../scopehal/RohdeSchwarzOscilloscope.h"
#include "../scopehal/AntikernelLogicAnalyzer.h"
#include <thread>

using namespace std;
@@ -227,6 +228,16 @@ int main(int argc, char* argv[])
scope->m_nickname = nick;
app->m_scopes.push_back(scope);
}
else if(sapi == "akila_lan")
{
//default port if not specified
if(port == 0)
port = 5555;

auto scope = new AntikernelLogicAnalyzer(new SCPISocketTransport(host, port));
scope->m_nickname = nick;
app->m_scopes.push_back(scope);
}
else
{
LogError("Unrecognized API \"%s\", use --help\n", api);