VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-12-25 04:03:30 -05:00
Code Issues Projects Releases Wiki Activity

New scope: fix trigger (1)

Browse Source
This commit is contained in:
f4exb 2017-02-07 07:45:42 +01:00
parent e17ecf0328
commit ba67483b48
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sdrbase/dsp/scopevisng.cpp
View File

@ -242,6 +242,7 @@ void ScopeVisNG::feed(const SampleVector::const_iterator& cbegin, const SampleVe
m_traceDiscreteMemory.current().m_endPoint = nbegin; m_traceDiscreteMemory.current().m_endPoint = nbegin;
m_traceDiscreteMemory.store(); // next memory trace m_traceDiscreteMemory.store(); // next memory trace
m_traceCompleteCount = 0; m_traceCompleteCount = 0;
m_triggerState = TriggerUntriggered;
} }
} }
@ -271,17 +272,19 @@ bool ScopeVisNG::nextTrigger()
} }
} }
if (m_currentTriggerIndex < m_triggerConditions.size()) if (m_currentTriggerIndex < m_triggerConditions.size() - 1)
{ {
m_currentTriggerIndex++; m_currentTriggerIndex++;
m_triggerState = TriggerUntriggered; // repeat operations for next trigger m_triggerState = TriggerUntriggered; // repeat operations for next trigger
return true; // not final keep going return true; // not final keep going
} }
else
// now this is really finished {
m_triggerState == TriggerTriggered; // now this is really finished
m_currentTriggerIndex = 0; m_triggerState = TriggerTriggered;
return false; // final m_currentTriggerIndex = 0;
return false; // final
}
} }
int ScopeVisNG::processTraces(int beginPointDelta, int endPointDelta, TraceBackBuffer& traceBuffer, bool traceBack) int ScopeVisNG::processTraces(int beginPointDelta, int endPointDelta, TraceBackBuffer& traceBuffer, bool traceBack)