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

Commits on May 26, 2020

  1. LeCroyOscilloscope: fixed DisableChannel() not properly disabling ana… 

    …log channels
    @azonenberg
    azonenberg committed May 26, 2020

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: CEF2BBFE18BD0E67
    Learn about vigilant mode
    Copy the full SHA
    d67ff57 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 scopehal/LeCroyOscilloscope.cpp
4 changes: 2 additions & 2 deletions scopehal/LeCroyOscilloscope.cpp
View file
Original file line number Diff line number Diff line change
@@ -129,7 +129,7 @@ void LeCroyOscilloscope::IdentifyHardware()
else if (m_vendor.compare("SIGLENT") == 0)
{
// TODO: if LeCroy and Siglent classes get split, then this should obviously
// move to the Siglent class.
// move to the Siglent class.
if (m_model.compare(0, 4, "SDS2") == 0 && m_model.back() == 'X')
m_modelid = MODEL_SIGLENT_SDS2000X;
}
@@ -511,7 +511,7 @@ void LeCroyOscilloscope::DisableChannel(size_t i)

//If this is an analog channel, just toggle it
if(i < m_analogChannelCount)
m_transport->SendCommand(m_channels[i]->GetHwname() + ":TRACE ON");
m_transport->SendCommand(m_channels[i]->GetHwname() + ":TRACE OFF");

//Trigger can't be enabled
else if(i == m_extTrigChannel->GetIndex())