VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-05-29 13:32:26 -04:00
Code Issues Projects Releases Wiki Activity

Corrected intempestive trigger on pre-trigger delay condition

Browse Source
This commit is contained in:
f4exb 2015-07-22 01:45:57 +02:00
parent 71cb2c22d4
commit e8708d00fd
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
sdrbase/dsp/scopevis.cpp
View File

@ -82,25 +82,28 @@ void ScopeVis::feed(SampleVector::const_iterator begin, SampleVector::const_iter
while(begin < end) while(begin < end)
{ {
bool trigger = triggerCondition(begin); bool trigger = triggerCondition(begin);
if ((trigger ^ !m_triggerPositiveEdge) && (m_tracebackCount > m_triggerPre)) if (m_tracebackCount > m_triggerPre)
{ {
if (m_armed) if (trigger ^ !m_triggerPositiveEdge)
{ {
m_triggerState = Triggered; if (m_armed)
m_armed = false; {
m_triggerPoint = begin; m_triggerState = Triggered;
// fill beginning of m_trace with delayed samples from the trace memory FIFO. Increment m_fill accordingly. m_armed = false;
if (m_triggerPre) { // do this process only if there is a pre-trigger delay m_triggerPoint = begin;
std::copy(m_traceback.end() - m_triggerPre - 1, m_traceback.end() - 1, m_trace.begin()); // fill beginning of m_trace with delayed samples from the trace memory FIFO. Increment m_fill accordingly.
m_fill = m_triggerPre; // Increment m_fill accordingly (from 0). if (m_triggerPre) { // do this process only if there is a pre-trigger delay
} std::copy(m_traceback.end() - m_triggerPre - 1, m_traceback.end() - 1, m_trace.begin());
break; m_fill = m_triggerPre; // Increment m_fill accordingly (from 0).
}
break;
}
} }
} else
else {
{ m_armed = true;
m_armed = true; }
} }
++begin; ++begin;
} }
} }