Cached channel digital threshold value.

fredzo · fredzo · commit ae4e328877cf · 2024-10-08T00:42:20.000+02:00
diff --git a/scopehal/LeCroyOscilloscope.cpp b/scopehal/LeCroyOscilloscope.cpp
@@ -1054,6 +1054,7 @@ void LeCroyOscilloscope::FlushConfigCache()
 
 	m_channelVoltageRanges.clear();
 	m_channelOffsets.clear();
+	m_channelDigitalThresholds.clear();
 	m_channelsEnabled.clear();
 	m_channelDeskew.clear();
 	m_probeIsActive.clear();
@@ -4054,13 +4055,24 @@ float LeCroyOscilloscope::GetDigitalThreshold(size_t channel)
 	if( (channel < m_digitalChannelBase) || (m_digitalChannelCount == 0) )
 		return 0;
 
+	{
+		lock_guard<recursive_mutex> lock(m_cacheMutex);
+
+		if(m_channelDigitalThresholds.find(channel) != m_channelDigitalThresholds.end())
+			return m_channelDigitalThresholds[channel];
+	}
+
 	string reply;
 	if(channel <= m_digitalChannels[7]->GetIndex() )
 		reply = m_transport->SendCommandQueuedWithReply("VBS? 'return = app.LogicAnalyzer.MSxxThreshold0'");
 	else
 		reply = m_transport->SendCommandQueuedWithReply("VBS? 'return = app.LogicAnalyzer.MSxxThreshold1'");
 
-	return atof(reply.c_str());
+	float result = atof(reply.c_str());
+
+	lock_guard<recursive_mutex> lock(m_cacheMutex);
+	m_channelDigitalThresholds[channel] = result;
+	return result;
 }
 
 void LeCroyOscilloscope::SetDigitalHysteresis(size_t channel, float level)
diff --git a/scopehal/LeCroyOscilloscope.h b/scopehal/LeCroyOscilloscope.h
@@ -352,6 +352,7 @@ class LeCroyOscilloscope
 	//Cached configuration
 	std::map<size_t, float> m_channelVoltageRanges;
 	std::map<size_t, float> m_channelOffsets;
+	std::map<size_t, float> m_channelDigitalThresholds;
 	std::map<size_t, size_t> m_channelNavg;
 	std::map<int, bool> m_channelsEnabled;
 	bool m_sampleRateValid;
diff --git a/scopehal/RSRTO6Oscilloscope.cpp b/scopehal/RSRTO6Oscilloscope.cpp
@@ -243,6 +243,7 @@ void RSRTO6Oscilloscope::FlushConfigCache()
 	m_channelOffsets.clear();
 	m_channelVoltageRanges.clear();
 	m_channelsEnabled.clear();
+	m_channelDigitalThresholds.clear();
 	m_channelCouplings.clear();
 	m_channelAttenuations.clear();
 
@@ -656,8 +657,21 @@ bool RSRTO6Oscilloscope::IsDigitalThresholdConfigurable()
 
 float RSRTO6Oscilloscope::GetDigitalThreshold(size_t channel)
 {
-	// Cache?
-	return stof(m_transport->SendCommandQueuedWithReply("DIG" + to_string(HWDigitalNumber(channel)) + ":THR?"));
+	if( (channel < m_digitalChannelBase) || (m_digitalChannelCount == 0) )
+		return 0;
+
+	{
+		lock_guard<recursive_mutex> lock(m_cacheMutex);
+
+		if(m_channelDigitalThresholds.find(channel) != m_channelDigitalThresholds.end())
+			return m_channelDigitalThresholds[channel];
+	}
+
+	float result = stof(m_transport->SendCommandQueuedWithReply("DIG" + to_string(HWDigitalNumber(channel)) + ":THR?"));
+
+	lock_guard<recursive_mutex> lock(m_cacheMutex);
+	m_channelDigitalThresholds[channel] = result;
+	return result;
 }
 
 void RSRTO6Oscilloscope::SetDigitalThreshold(size_t channel, float level)
diff --git a/scopehal/RSRTO6Oscilloscope.h b/scopehal/RSRTO6Oscilloscope.h
@@ -161,6 +161,7 @@ class RSRTO6Oscilloscope
 	std::map<size_t, float> m_channelOffsets;
 	std::map<size_t, float> m_channelVoltageRanges;
 	std::map<int, bool> m_channelsEnabled;
+	std::map<size_t, float> m_channelDigitalThresholds;
 	std::map<size_t, OscilloscopeChannel::CouplingType> m_channelCouplings;
 	std::map<size_t, int> m_channelBandwidthLimits;
 	std::map<size_t, double> m_channelAttenuations;
diff --git a/scopehal/SiglentSCPIOscilloscope.cpp b/scopehal/SiglentSCPIOscilloscope.cpp
@@ -650,6 +650,7 @@ void SiglentSCPIOscilloscope::FlushConfigCache()
 	m_channelOffsets.clear();
 	m_channelsEnabled.clear();
 	m_channelDeskew.clear();
+	m_channelDigitalThresholds.clear();
 	m_probeIsActive.clear();
 	m_sampleRateValid = false;
 	m_memoryDepthValid = false;
@@ -3726,7 +3727,18 @@ float SiglentSCPIOscilloscope::GetDigitalHysteresis(size_t /*channel*/)
 
 float SiglentSCPIOscilloscope::GetDigitalThreshold(size_t channel)
 {
+	if( (channel < m_digitalChannelBase) || (m_digitalChannelCount == 0) )
+		return 0;
+
 	channel -= m_analogChannelCount;
+	{
+		lock_guard<recursive_mutex> lock(m_cacheMutex);
+
+		if(m_channelDigitalThresholds.find(channel) != m_channelDigitalThresholds.end())
+			return m_channelDigitalThresholds[channel];
+	}
+
+	float result = 0.0f;
 
 	string r = converse(":DIGITAL:THRESHOLD%d?", (channel / 8) + 1).c_str();
 
@@ -3737,14 +3749,21 @@ float SiglentSCPIOscilloscope::GetDigitalThreshold(size_t channel)
 		i++;
 
 	if(c_sds2000xp_threshold_table[i].name)
-		return c_sds2000xp_threshold_table[i].val;
-
-	// Didn't match a standard, check for custom
-	if(!strncmp(r.c_str(), c_custom_thresh, strlen(c_custom_thresh)))
-		return strtof(&(r.c_str()[strlen(c_custom_thresh)]), NULL);
+	{
+		result =  c_sds2000xp_threshold_table[i].val;
+	}
+	else if(!strncmp(r.c_str(), c_custom_thresh, strlen(c_custom_thresh)))
+	{	// Didn't match a standard, check for custom
+		result =  strtof(&(r.c_str()[strlen(c_custom_thresh)]), NULL);
+	}
+	else 
+	{
+		LogWarning("GetDigitalThreshold unrecognised value [%s]\n", r.c_str());
+	}
 
-	LogWarning("GetDigitalThreshold unrecognised value [%s]\n", r.c_str());
-	return 0.0f;
+	lock_guard<recursive_mutex> lock(m_cacheMutex);
+	m_channelDigitalThresholds[channel] = result;
+	return result;
 }
 
 void SiglentSCPIOscilloscope::SetDigitalHysteresis(size_t /*channel*/, float /*level*/)
diff --git a/scopehal/SiglentSCPIOscilloscope.h b/scopehal/SiglentSCPIOscilloscope.h
@@ -347,6 +347,7 @@ class SiglentSCPIOscilloscope 	: public virtual SCPIOscilloscope
 	//Cached configuration
 	std::map<size_t, float> m_channelVoltageRanges;
 	std::map<size_t, float> m_channelOffsets;
+	std::map<size_t, float> m_channelDigitalThresholds;
 	std::map<int, bool> m_channelsEnabled;
 	bool m_sampleRateValid;
 	int64_t m_sampleRate;
diff --git a/scopehal/TektronixOscilloscope.cpp b/scopehal/TektronixOscilloscope.cpp
@@ -72,6 +72,7 @@ TektronixOscilloscope::TektronixOscilloscope(SCPITransport* transport)
 	, m_dmmModeValid(false)
 	, m_dmmMode(Multimeter::DC_VOLTAGE)
 	, m_digitalChannelBase(0)
+	, m_digitalChannelCount(0)
 	, m_triggerArmed(false)
 	, m_triggerOneShot(false)
 	, m_maxBandwidth(1000)
@@ -225,6 +226,7 @@ TektronixOscilloscope::TektronixOscilloscope(SCPITransport* transport)
 					m_flexChannelParents[chan] = i;
 					m_flexChannelLanes[chan] = j;
 					m_channels.push_back(chan);
+					m_digitalChannelCount++;
 				}
 			}
 			break;
@@ -428,6 +430,7 @@ void TektronixOscilloscope::FlushConfigCache()
 
 	m_channelOffsets.clear();
 	m_channelVoltageRanges.clear();
+	m_channelDigitalThresholds.clear();
 	m_channelCouplings.clear();
 	m_channelsEnabled.clear();
 	m_probeTypes.clear();
@@ -3598,7 +3601,17 @@ float TektronixOscilloscope::GetDigitalHysteresis(size_t /*channel*/)
 
 float TektronixOscilloscope::GetDigitalThreshold(size_t channel)
 {
-	//TODO: caching?
+	if( (channel < m_digitalChannelBase) || (m_digitalChannelCount == 0) )
+		return 0;
+
+	{
+		lock_guard<recursive_mutex> lock(m_cacheMutex);
+
+		if(m_channelDigitalThresholds.find(channel) != m_channelDigitalThresholds.end())
+			return m_channelDigitalThresholds[channel];
+	}
+
+	float result = -1;
 
 	auto chan = GetOscilloscopeChannel(channel);
 
@@ -3607,14 +3620,17 @@ float TektronixOscilloscope::GetDigitalThreshold(size_t channel)
 		case FAMILY_MSO5:
 		case FAMILY_MSO6:
 			//note, group IDs are one based but lane IDs are zero based!
-			return stof(m_transport->SendCommandQueuedWithReply(
+			result = stof(m_transport->SendCommandQueuedWithReply(
 				string("DIGGRP") + to_string(m_flexChannelParents[chan]+1) +
 				":D" + to_string(m_flexChannelLanes[chan]) + ":THR?"));
 
 		default:
 			break;
 	}
-	return -1;
+
+	lock_guard<recursive_mutex> lock(m_cacheMutex);
+	m_channelDigitalThresholds[channel] = result;
+	return result;
 }
 
 void TektronixOscilloscope::SetDigitalHysteresis(size_t /*channel*/, float /*level*/)
diff --git a/scopehal/TektronixOscilloscope.h b/scopehal/TektronixOscilloscope.h
@@ -300,6 +300,9 @@ class TektronixOscilloscope
 	///@brief Cached map of <channel ID, full scale range>
 	std::map<size_t, float> m_channelVoltageRanges;
 
+	///@brief Cached map of <channel ID, digital threshold>
+	std::map<size_t, float> m_channelDigitalThresholds;
+
 	///@brief Cached map of <channel ID, coupling>
 	std::map<size_t, OscilloscopeChannel::CouplingType> m_channelCouplings;
 
@@ -358,6 +361,9 @@ class TektronixOscilloscope
 	///@brief Starting index for digital channels
 	size_t m_digitalChannelBase;
 
+	///@brief Nuber of digital channels
+	size_t m_digitalChannelCount;
+
 	///@brief Starting index for spectrum channels
 	size_t m_spectrumChannelBase;
 
