mirror of
https://github.com/f4exb/sdrangel.git
synced 2024-09-27 15:26:33 -04:00
Scope: some code refactoring to make it more elegant. Updated Debian changelog
This commit is contained in:
parent
02d0a46f31
commit
acbaa14dbd
1
debian/changelog
vendored
1
debian/changelog
vendored
@ -2,6 +2,7 @@ sdrangel (4.2.4-1) unstable; urgency=medium
|
|||||||
|
|
||||||
* LimeSDR: use LimeSuite 18.10.0 for builds
|
* LimeSDR: use LimeSuite 18.10.0 for builds
|
||||||
* DSD demod: use 1 dB steps for squelch
|
* 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
|
-- Edouard Griffiths, F4EXB <f4exb06@gmail.com> Wed, 24 Oct 2018 21:14:18 +0200
|
||||||
|
|
||||||
|
@ -313,15 +313,13 @@ void ScopeVis::processTrace(const SampleVector::const_iterator& cbegin, const Sa
|
|||||||
m_triggerState = TriggerTriggered;
|
m_triggerState = TriggerTriggered;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else if ((m_triggerState == TriggerUntriggered) || (m_triggerState == TriggerDelay)) // look for trigger or past trigger in delay mode
|
||||||
{
|
|
||||||
if ((m_triggerState == TriggerUntriggered) || (m_triggerState == TriggerDelay))
|
|
||||||
{
|
{
|
||||||
TriggerCondition* triggerCondition = m_triggerConditions[m_currentTriggerIndex]; // current trigger condition
|
TriggerCondition* triggerCondition = m_triggerConditions[m_currentTriggerIndex]; // current trigger condition
|
||||||
|
|
||||||
while (begin < end)
|
while (begin < end)
|
||||||
{
|
{
|
||||||
if (m_triggerState == TriggerDelay)
|
if (m_triggerState == TriggerDelay) // delayed trigger
|
||||||
{
|
{
|
||||||
if (triggerCondition->m_triggerDelayCount > 0) // skip samples during delay period
|
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)) // matched the current trigger
|
||||||
if (m_triggerComparator.triggered(*begin, *triggerCondition))
|
|
||||||
{
|
{
|
||||||
if (triggerCondition->m_triggerData.m_triggerDelay > 0)
|
if (triggerCondition->m_triggerData.m_triggerDelay > 0)
|
||||||
{
|
{
|
||||||
@ -380,7 +377,6 @@ void ScopeVis::processTrace(const SampleVector::const_iterator& cbegin, const Sa
|
|||||||
++begin;
|
++begin;
|
||||||
} // look for trigger
|
} // look for trigger
|
||||||
} // untriggered or delayed
|
} // untriggered or delayed
|
||||||
} // triggering active
|
|
||||||
|
|
||||||
// trace process
|
// trace process
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user