VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-09-02 13:17:48 -04:00
Code Issues Projects Releases Wiki Activity

New scope: review freerun / trigger processing

Browse Source
This commit is contained in:
f4exb 2017-02-09 00:00:21 +01:00
parent f2b04539cf
commit e3b933350c
1 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sdrbase/dsp/scopevisng.cpp
View File

@ -174,7 +174,14 @@ void ScopeVisNG::processTrace(const SampleVector::const_iterator& cbegin, const
// trigger process
if (!m_freeRun && (m_triggerConditions.size() > 0) && ((m_triggerState == TriggerUntriggered) || (m_triggerState == TriggerDelay)))
if ((m_freeRun) || (m_triggerConditions.size() == 0)) // immediate re-trigger
{
m_traceStart = true; // start trace processing
m_triggerState = TriggerTriggered;
}
else
{
if ((m_triggerState == TriggerUntriggered) || (m_triggerState == TriggerDelay))
{
TriggerCondition& triggerCondition = m_triggerConditions[m_currentTriggerIndex]; // current trigger condition
@ -193,9 +200,6 @@ void ScopeVisNG::processTrace(const SampleVector::const_iterator& cbegin, const
++begin;
}
}
else
{
m_traceStart = true;
}
int remainder = -1;
@ -204,7 +208,7 @@ void ScopeVisNG::processTrace(const SampleVector::const_iterator& cbegin, const
SampleVector::iterator nbegin = nend - count;
// trace process
if ((m_freeRun) || (m_triggerConditions.size() == 0) || (m_triggerState == TriggerTriggered))
if (m_triggerState == TriggerTriggered)
{
// trace back