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

Commits on May 24, 2020

  1. LeCroyOscilloscope: disable channel interleaving on startup until we … 

    …can properly detect/handle interleaved channels. Fixes #76.
    @azonenberg
    azonenberg committed May 24, 2020
    Copy the full SHA
    5b91e7c View commit details
Showing with 3 additions and 0 deletions.
  1. +3 −0 scopehal/LeCroyOscilloscope.cpp
3 changes: 3 additions & 0 deletions scopehal/LeCroyOscilloscope.cpp
View file
Original file line number Diff line number Diff line change
@@ -84,6 +84,9 @@ void LeCroyOscilloscope::SharedCtorInit()
//Always use "max memory" config for setting sample depth
m_transport->SendCommand("VBS? 'app.Acquisition.Horizontal.Maximize=\"SetMaximumMemory\"'");

//Disable channel interleaving until we support this properly
m_transport->SendCommand("COMBINE_CHANNELS 1");

//Clear the state-change register to we get rid of any history we don't care about
PollTrigger();
}