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: c53ef0cacaf4
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: 4552291ef12e
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 12, 2020

  1. glscopeclient: use dynamic creation for oscilloscopes based on driver… 

    … name
    @azonenberg
    azonenberg committed Mar 12, 2020
    Copy the full SHA
    4552291 View commit details
Showing with 3 additions and 19 deletions.
  1. +3 −19 glscopeclient/main.cpp
22 changes: 3 additions & 19 deletions glscopeclient/main.cpp
View file
Original file line number Diff line number Diff line change
@@ -217,6 +217,7 @@ int main(int argc, char* argv[])

//Initialize object creation tables
TransportStaticInit();
DriverStaticInit();
ScopeProtocolStaticInit();
ScopeMeasurementStaticInit();

@@ -240,26 +241,9 @@ int main(int argc, char* argv[])
continue;

//Create the scope
Oscilloscope* scope = NULL;
string sdriver(driver);
if(sdriver == "akila")
scope = new AntikernelLogicAnalyzer(transport);
else if(sdriver == "agilent")
scope = new AgilentOscilloscope(transport);
else if(sdriver == "lecroy")
scope = new LeCroyOscilloscope(transport);
else if(sdriver == "rigol")
scope = new RigolOscilloscope(transport);
else if(sdriver == "rs")
scope = new RohdeSchwarzOscilloscope(transport);
else if(sdriver == "siglent")
scope = new SiglentSCPIOscilloscope(transport);
else
{
LogError("Unrecognized driver \"%s\"\n", driver);
delete transport;
Oscilloscope* scope = Oscilloscope::CreateOscilloscope(driver, transport);
if(scope == NULL)
continue;
}

//All good, hook it up
scope->m_nickname = nick;