ThunderScope: converted to queued command API, refresh reported sample rate when enabling a channel in case we had to lower it server side. Fixes #990.

Author: azonenberg

scopehal/ThunderScopeOscilloscope.cpp

@@ -91,10 +91,6 @@ ThunderScopeOscilloscope::ThunderScopeOscilloscope(SCPITransport* transport)
 		SetChannelVoltageRange(i, 0, 5);
 	}
 
-	//Set initial memory configuration.
-	SetSampleRate(1000000000L);
-	SetSampleDepth(10000);
-
 	//Set up the data plane socket
 	auto csock = dynamic_cast<SCPITwinLanTransport*>(m_transport);
 	if(!csock)
@@ -118,6 +114,10 @@ ThunderScopeOscilloscope::ThunderScopeOscilloscope(SCPITransport* transport)
 	PushTrigger();
 	SetTriggerOffset(1000000000); //1us to allow trigphase interpolation
 
+	//Set initial memory configuration.
+	SetSampleRate(1000000000L);
+	SetSampleDepth(10000);
+
 	m_diagnosticValues["Hardware WFM/s"] = &m_diag_hardwareWFMHz;
 	m_diagnosticValues["Received WFM/s"] = &m_diag_receivedWFMHz;
 	m_diagnosticValues["Total Waveforms Received"] = &m_diag_totalWFMs;
@@ -233,7 +233,20 @@ string ThunderScopeOscilloscope::GetDriverNameInternal()
 
 void ThunderScopeOscilloscope::FlushConfigCache()
 {
-	lock_guard<recursive_mutex> lock(m_cacheMutex);
+	//Refresh sample rate from hardware
+	RefreshSampleRate();
+}
+
+void ThunderScopeOscilloscope::RefreshSampleRate()
+{
+	auto reply = m_transport->SendCommandQueuedWithReply("RATE?");
+	m_srate = stoi(reply);
+}
+
+void ThunderScopeOscilloscope::EnableChannel(size_t i)
+{
+	RemoteBridgeOscilloscope::EnableChannel(i);
+	RefreshSampleRate();
 }
 
 double ThunderScopeOscilloscope::GetChannelAttenuation(size_t i)

scopehal/ThunderScopeOscilloscope.h

@@ -72,6 +72,7 @@ class ThunderScopeOscilloscope : public RemoteBridgeOscilloscope
 	virtual bool CanEnableChannel(size_t i) override;
 	virtual uint32_t GetInstrumentTypesForChannel(size_t i) const override;
 	virtual void SetChannelCoupling(size_t i, OscilloscopeChannel::CouplingType type) override;
+	virtual void EnableChannel(size_t i) override;
 
 	//Triggering
 	virtual Oscilloscope::TriggerMode PollTrigger() override;
@@ -94,6 +95,7 @@ class ThunderScopeOscilloscope : public RemoteBridgeOscilloscope
 
 protected:
 	void ResetPerCaptureDiagnostics();
+	void RefreshSampleRate();
 
 	std::string GetChannelColor(size_t i);