Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9b2c636970c0
Choose a base ref
...
head repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3d77e65c1e91
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Aug 10, 2020

  1. DeEmbedDecoder: fixed bug causing frequency bins to not be recomputed…

    … if waveform depth changed
    azonenberg committed Aug 10, 2020
    Copy the full SHA
    3d77e65 View commit details
Showing with 3 additions and 1 deletion.
  1. +3 −1 scopeprotocols/DeEmbedDecoder.cpp
4 changes: 3 additions & 1 deletion scopeprotocols/DeEmbedDecoder.cpp
Original file line number Diff line number Diff line change
@@ -229,6 +229,7 @@ void DeEmbedDecoder::DoRefresh(bool invert)
size_t nouts = npoints/2 + 1;

//Set up the FFT and allocate buffers if we change point count
bool sizechange = false;
if( (m_cachedNumPoints != npoints) || (m_cachedRawSize != npoints_raw) )
{
if(m_forwardPlan)
@@ -251,6 +252,7 @@ void DeEmbedDecoder::DoRefresh(bool invert)

m_cachedNumPoints = npoints;
m_cachedRawSize = npoints_raw;
sizechange = true;
}

//Copy the input, then fill any extra space with zeroes
@@ -268,7 +270,7 @@ void DeEmbedDecoder::DoRefresh(bool invert)

//Resample S21 to our FFT bin size if needed.
//Cache trig function output because there's no AVX instructions for this.
if(fabs(m_cachedBinSize - bin_hz) > FLT_EPSILON)
if( (fabs(m_cachedBinSize - bin_hz) > FLT_EPSILON) || sizechange )
{
m_cachedBinSize = bin_hz;