ngscopeclient · Mar 11, 2020 · Mar 11, 2020
diff --git a/scopehal/AgilentOscilloscope.cpp b/scopehal/AgilentOscilloscope.cpp
@@ -148,6 +148,11 @@ AgilentOscilloscope::~AgilentOscilloscope()
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Accessors
 
+string AgilentOscilloscope::GetDriverName()
+{
+	return "agilent";
+}
+
 unsigned int AgilentOscilloscope::GetInstrumentTypes()
 {
 	return Instrument::INST_OSCILLOSCOPE;

diff --git a/scopehal/AgilentOscilloscope.h b/scopehal/AgilentOscilloscope.h
@@ -37,6 +37,8 @@ class AgilentOscilloscope : public SCPIOscilloscope
 	virtual ~AgilentOscilloscope();
 
 public:
+	virtual std::string GetDriverName();
+
 	//Device information
 	virtual unsigned int GetInstrumentTypes();
 

diff --git a/scopehal/AntikernelLogicAnalyzer.cpp b/scopehal/AntikernelLogicAnalyzer.cpp
@@ -93,6 +93,16 @@ AntikernelLogicAnalyzer::~AntikernelLogicAnalyzer()
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Information queries
 
+string AntikernelLogicAnalyzer::GetTransportConnectionString()
+{
+	return m_transport->GetConnectionString();
+}
+
+string AntikernelLogicAnalyzer::GetDriverName()
+{
+	return "akila";
+}
+
 void AntikernelLogicAnalyzer::SendCommand(uint8_t opcode)
 {
 	m_transport->SendRawData(1, &opcode);

diff --git a/scopehal/AntikernelLogicAnalyzer.h b/scopehal/AntikernelLogicAnalyzer.h
@@ -44,6 +44,9 @@ class AntikernelLogicAnalyzer
 	AntikernelLogicAnalyzer(SCPITransport* transport);
 	virtual ~AntikernelLogicAnalyzer();
 
+	virtual std::string GetTransportConnectionString();
+	virtual std::string GetDriverName();
+
 	virtual std::string GetName();
 	virtual std::string GetVendor();
 	virtual std::string GetSerial();

diff --git a/scopehal/CMakeLists.txt b/scopehal/CMakeLists.txt
@@ -27,7 +27,6 @@ set(SCOPEHAL_SOURCES
 	AntikernelLogicAnalyzer.cpp
 	LeCroyOscilloscope.cpp
 	SiglentSCPIOscilloscope.cpp
-	RedTinLogicAnalyzer.cpp
 	RigolOscilloscope.cpp
 	RohdeSchwarzOscilloscope.cpp
 	RohdeSchwarzHMC8012Multimeter.cpp

diff --git a/scopehal/LeCroyOscilloscope.cpp b/scopehal/LeCroyOscilloscope.cpp
@@ -320,6 +320,11 @@ LeCroyOscilloscope::~LeCroyOscilloscope()
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Device information
 
+string LeCroyOscilloscope::GetDriverName()
+{
+	return "lecroy";
+}
+
 OscilloscopeChannel* LeCroyOscilloscope::GetExternalTrigger()
 {
 	return m_extTrigChannel;

diff --git a/scopehal/LeCroyOscilloscope.h b/scopehal/LeCroyOscilloscope.h
@@ -55,6 +55,7 @@ class LeCroyOscilloscope
 	void DetectOptions();
 
 public:
+	virtual std::string GetDriverName();
 
 	//Device information
 	virtual std::string GetName();

diff --git a/scopehal/Oscilloscope.cpp b/scopehal/Oscilloscope.cpp
@@ -172,7 +172,9 @@ string Oscilloscope::SerializeConfiguration(map<void*, int>& idmap, int& nextID)
 	config += tmp;
 	snprintf(tmp, sizeof(tmp), "        serial:         \"%s\"\n", GetSerial().c_str());
 	config += tmp;
-	snprintf(tmp, sizeof(tmp), "        path:           \"%s\"\n", "connection_string_not_yet_implemented");
+	snprintf(tmp, sizeof(tmp), "        transport:      \"%s\"\n", GetTransportConnectionString().c_str());
+	config += tmp;
+	snprintf(tmp, sizeof(tmp), "        driver:         \"%s\"\n", GetDriverName().c_str());
 	config += tmp;
 
 	//Save channels

diff --git a/scopehal/Oscilloscope.h b/scopehal/Oscilloscope.h
@@ -347,6 +347,16 @@ class Oscilloscope : public virtual Instrument
 	 */
 	virtual bool IsTriggerArmed() =0;
 
+	/**
+		@brief Gets the connection string for our transport
+	 */
+	virtual std::string GetTransportConnectionString() =0;
+
+	/**
+		@brief Gets the registered name of this driver
+	 */
+	virtual std::string GetDriverName() =0;
+
 public:
 	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	// Memory depth / sample rate control.