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: 940a2b2a2c06
Choose a base ref
...
head repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 30da263141ac
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on May 23, 2020

  1. LeCroyOscilloscope: fixed bug where disabling early digital channels … 

    …would result in later channels being falsely turned off
    @azonenberg
    azonenberg committed May 23, 2020
    Copy the full SHA
    30da263 View commit details
Showing with 1 addition and 2 deletions.
  1. +1 −2 scopehal/LeCroyOscilloscope.cpp
3 changes: 1 addition & 2 deletions scopehal/LeCroyOscilloscope.cpp
View file
Original file line number Diff line number Diff line change
@@ -1294,7 +1294,7 @@ map<int, DigitalWaveform*> LeCroyOscilloscope::ProcessDigitalWaveform(
unsigned int icapchan = 0;
for(unsigned int i=0; i<m_digitalChannelCount; i++)
{
if(enabledChannels[icapchan])
if(enabledChannels[i])
{
DigitalWaveform* cap = new DigitalWaveform;
cap->m_timescale = interval;
@@ -1479,7 +1479,6 @@ bool LeCroyOscilloscope::AcquireData(bool toQueue)

//TODO: proper support for sequenced capture when digital channels are active
//(seems like this doesn't work right on at least wavesurfer 3000 series)

if(denabled)
{
//This is a weird XML-y format but I can't find any other way to get it :(