ngscopeclient · Jun 1, 2019 · Jun 1, 2019
Showing with 27 additions and 16 deletions.

+15 −15 examples/curvetrace/main.cpp

+1 −1 examples/fgtest/main.cpp

+11 −0 glscopeclient/main.cpp
diff --git a/examples/curvetrace/main.cpp b/examples/curvetrace/main.cpp
@@ -43,16 +43,16 @@ using namespace std;
 int main(int argc, char* argv[])
 {
 	Severity console_verbosity = Severity::NOTICE;
-	
+
 	string spsu = "";
 	string sdmm = "";
-	
+
 	//Test configuration
 	int channel = 0;
 	double voltageMax = 4.0;
 	double currentMax = 0.02;
 	double voltageStep = 0.001;
-	
+
 	//Parse command-line arguments
 	for(int i=1; i<argc; i++)
 	{
@@ -80,45 +80,45 @@ int main(int argc, char* argv[])
 
 	//Set up logging
 	g_log_sinks.emplace(g_log_sinks.begin(), new ColoredSTDLogSink(console_verbosity));
-	
-	RohdeSchwarzHMC804xPowerSupply psu(spsu, 5025);
-	RohdeSchwarzHMC8012Multimeter dmm(sdmm, 5025);
-	
+
+	RohdeSchwarzHMC804xPowerSupply psu(new SCPISocketTransport(spsu, 5025));
+	RohdeSchwarzHMC8012Multimeter dmm(new SCPISocketTransport(sdmm, 5025));
+
 	//Initial configuration
 	LogDebug("Initial output configuration\n");
 	psu.SetPowerOvercurrentShutdownEnabled(channel, false);
 	psu.SetPowerVoltage(channel, 0);
 	psu.SetPowerCurrent(channel, currentMax);
 	psu.SetPowerChannelActive(channel, true);
 	psu.SetMasterPowerEnable(true);
-		
+
 	if(dmm.GetMeterMode() != Multimeter::DC_CURRENT)
 		dmm.SetMeterMode(Multimeter::DC_CURRENT);
-		
+
 	//The actual curve tracing
 	LogNotice("Step,V,I\n");
 	for(int i=0;i*voltageStep < voltageMax; i++)
 	{
 		double v = i*voltageStep;
 		psu.SetPowerVoltage(channel, v);
 		LogNotice("%5d,%5.3f,",i,v);
-		
+
 		//wait 25ms to stabilize
 		usleep(25 * 1000);
-		
+
 		LogNotice("%5.7f\n", dmm.GetCurrent());
-		
+
 		if(psu.IsPowerConstantCurrent(channel))
 			break;
 	}
-	
+
 	//Clean up
 	psu.SetPowerVoltage(channel, 0);
 	psu.SetPowerChannelActive(channel, false);
-	
+
 	//Make sure all writes have committed before we close the socket
 	psu.GetSerial();
 	usleep(50 * 1000);
-		
+
 	return 0;
 }
diff --git a/examples/fgtest/main.cpp b/examples/fgtest/main.cpp
@@ -71,7 +71,7 @@ int main(int argc, char* argv[])
 	//Set up logging
 	g_log_sinks.emplace(g_log_sinks.begin(), new ColoredSTDLogSink(console_verbosity));
 
-	LeCroyVICPOscilloscope scope(hostname, 1861);
+	LeCroyVICPOscilloscope scope(new SCPISocketTransport(hostname, 1861));
 	if(0 == (scope.GetInstrumentTypes() & Instrument::INST_FUNCTION))
 	{
 		LogError("not a function generator\n");

diff --git a/glscopeclient/main.cpp b/glscopeclient/main.cpp
@@ -39,6 +39,7 @@
 #include "../scopemeasurements/scopemeasurements.h"
 #include "../scopehal/LeCroyVICPOscilloscope.h"
 #include "../scopehal/RigolOscilloscope.h"
+#include "../scopehal/RohdeSchwarzOscilloscope.h"
 #include <thread>
 
 using namespace std;
@@ -216,6 +217,16 @@ int main(int argc, char* argv[])
 			scope->m_nickname = nick;
 			app->m_scopes.push_back(scope);
 		}
+		else if(sapi == "rs_lan")
+		{
+			//default port if not specified
+			if(port == 0)
+				port = 5025;
+
+			auto scope = new RohdeSchwarzOscilloscope(new SCPISocketTransport(host, port));
+			scope->m_nickname = nick;
+			app->m_scopes.push_back(scope);
+		}
 		else
 		{
 			LogError("Unrecognized API \"%s\", use --help\n", api);