VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-02-03 09:44:01 -05:00
Code Issues Projects Releases Wiki Activity

Scope: some code refactoring to make it more elegant. Updated Debian changelog

Browse Source
This commit is contained in:
f4exb 2018-10-25 13:12:49 +02:00
parent 02d0a46f31
commit acbaa14dbd
2 changed files with 44 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -2,6 +2,7 @@ sdrangel (4.2.4-1) unstable; urgency=medium
* LimeSDR: use LimeSuite 18.10.0 for builds
* DSD demod: use 1 dB steps for squelch
* Scope: fixed some trigger issues. Fixes issue #233
-- Edouard Griffiths, F4EXB <f4exb06@gmail.com> Wed, 24 Oct 2018 21:14:18 +0200

10
sdrgui/dsp/scopevis.cpp
View File

@ -313,15 +313,13 @@ void ScopeVis::processTrace(const SampleVector::const_iterator& cbegin, const Sa
m_triggerState = TriggerTriggered;
}
}
else
{
if ((m_triggerState == TriggerUntriggered) || (m_triggerState == TriggerDelay))
else if ((m_triggerState == TriggerUntriggered) || (m_triggerState == TriggerDelay)) // look for trigger or past trigger in delay mode
{
TriggerCondition* triggerCondition = m_triggerConditions[m_currentTriggerIndex]; // current trigger condition
while (begin < end)
{
if (m_triggerState == TriggerDelay)
if (m_triggerState == TriggerDelay) // delayed trigger
{
if (triggerCondition->m_triggerDelayCount > 0) // skip samples during delay period
{
@ -350,8 +348,7 @@ void ScopeVis::processTrace(const SampleVector::const_iterator& cbegin, const Sa
}
}
// look for trigger
if (m_triggerComparator.triggered(*begin, *triggerCondition))
if (m_triggerComparator.triggered(*begin, *triggerCondition)) // matched the current trigger
{
if (triggerCondition->m_triggerData.m_triggerDelay > 0)
{
@ -380,7 +377,6 @@ void ScopeVis::processTrace(const SampleVector::const_iterator& cbegin, const Sa
++begin;
} // look for trigger
} // untriggered or delayed
} // triggering active
// trace process