ngscopeclient · Aug 17, 2020
Showing with 20 additions and 1 deletion.

+2 −1 scopehal/LeCroyOscilloscope.cpp

+17 −0 scopehal/ProtocolDecoder.cpp

+1 −0 scopehal/ProtocolDecoder.h
diff --git a/scopehal/LeCroyOscilloscope.cpp b/scopehal/LeCroyOscilloscope.cpp
@@ -1560,7 +1560,8 @@ map<int, DigitalWaveform*> LeCroyOscilloscope::ProcessDigitalWaveform(
 			cap->m_startTimestamp = ttime;
 			cap->m_startPicoseconds = static_cast<int64_t>(basetime * 1e12f);
 			cap->Resize(num_samples);
-			#pragma omp parallel for
+
+			//TODO: AVX this
 			for(int j=0; j<num_samples; j++)
 			{
 				cap->m_offsets[j] = j;

diff --git a/scopehal/ProtocolDecoder.cpp b/scopehal/ProtocolDecoder.cpp
@@ -879,6 +879,23 @@ float ProtocolDecoder::InterpolateTime(AnalogWaveform* cap, size_t a, float volt
 	return delta / slope;
 }
 
+/**
+	@brief Interpolates the actual value of a point between two samples
+
+	@param cap			Waveform to work with
+	@param index		Starting position
+	@param frac_ticks	Fractional position of the sample.
+						Note that this is in timebase ticks, so if some samples are >1 tick apart it's possible for
+						this value to be outside [0, 1].
+ */
+float ProtocolDecoder::InterpolateValue(AnalogWaveform* cap, size_t index, float frac_ticks)
+{
+	float frac = frac_ticks / (cap->m_offsets[index+1] - cap->m_offsets[index]);
+	float v1 = cap->m_samples[index];
+	float v2 = cap->m_samples[index+1];
+	return v1 + (v2-v1)*frac;
+}
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Measurement helpers
 

diff --git a/scopehal/ProtocolDecoder.h b/scopehal/ProtocolDecoder.h
@@ -225,6 +225,7 @@ class ProtocolDecoder : public OscilloscopeChannel
 
 	//Helpers for superresolution
 	static float InterpolateTime(AnalogWaveform* cap, size_t a, float voltage);
+	static float InterpolateValue(AnalogWaveform* cap, size_t index, float frac_ticks);
 
 	//Helpers for more complex measurements
 	//TODO: create some process for caching this so we don't waste CPU time