Scope: removed dubious code that could cause trigger bugs

This commit is contained in:
f4exb 2018-10-26 18:35:18 +02:00
parent 5889567267
commit e923ac571b
2 changed files with 8 additions and 6 deletions

View File

@ -297,10 +297,11 @@ void ScopeVis::processTrace(const SampleVector::const_iterator& cbegin, const Sa
m_traceDiscreteMemory.current().write(cbegin, end);
if (m_traceDiscreteMemory.current().absoluteFill() < m_traceSize)
{
return; // not enough samples in memory
}
// Removed in 4.2.4 may cause trigger bug
// if (m_traceDiscreteMemory.current().absoluteFill() < m_traceSize)
// {
// return; // not enough samples in memory
// }
// trigger process

View File

@ -727,8 +727,9 @@ private:
{
uint32_t nextMemIndex = m_currentMemIndex < (m_memSize-1) ? m_currentMemIndex+1 : 0;
m_traceBackBuffers[nextMemIndex].reset();
m_traceBackBuffers[nextMemIndex].write(m_traceBackBuffers[m_currentMemIndex].m_endPoint - m_traceSize,
m_traceBackBuffers[m_currentMemIndex].m_endPoint);
// Removed in 4.2.4 may cause trigger bug
// m_traceBackBuffers[nextMemIndex].write(m_traceBackBuffers[m_currentMemIndex].m_endPoint - m_traceSize,
// m_traceBackBuffers[m_currentMemIndex].m_endPoint);
m_currentMemIndex = nextMemIndex;
return m_traceBackBuffers[m_currentMemIndex]; // new trace
}