Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d6df8533b3b7
Choose a base ref
...
head repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 783e9bfa95a5
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Feb 13, 2020

  1. Made error checking not panic if a channel is disabled

    @azonenberg
    azonenberg committed Feb 13, 2020
    Copy the full SHA
    783e9bf View commit details
Showing with 6 additions and 3 deletions.
  1. +6 −3 scopehal/LeCroyOscilloscope.cpp
9 changes: 6 additions & 3 deletions scopehal/LeCroyOscilloscope.cpp
View file
Original file line number Diff line number Diff line change
@@ -920,11 +920,14 @@ bool LeCroyOscilloscope::AcquireData(bool toQueue)

//Check length, complain if a wavedesc comes back too short
size_t expected_wavedesc_size = 346;
for(auto& w : wavedescs)
for(unsigned int i=0; i<m_analogChannelCount; i++)
{
if(w.size() < expected_wavedesc_size)
if(!enabled[i])
continue;

if(wavedescs[i].size() < expected_wavedesc_size)
{
LogError("Got wavedesc of %zu bytes (expected %zu)\n", w.size(), expected_wavedesc_size);
LogError("Got wavedesc of %zu bytes (expected %zu)\n", wavedescs[i].size(), expected_wavedesc_size);
m_mutex.unlock();
return false;
}