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

Commits on Apr 12, 2021

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    ccc0981 View commit details
Showing with 0 additions and 15 deletions.
  1. +0 −13 scopehal/LeCroyOscilloscope.cpp
  2. +0 −2 scopehal/LeCroyOscilloscope.h
13 changes: 0 additions & 13 deletions scopehal/LeCroyOscilloscope.cpp
Original file line number Diff line number Diff line change
@@ -224,17 +224,6 @@ void LeCroyOscilloscope::IdentifyHardware()
m_modelid = MODEL_WAVESURFER_3K;
m_maxBandwidth = stoi(m_model.substr(3, 2)) * 100;
}
else if (m_vendor.compare("SIGLENT") == 0)
{
// TODO: if LeCroy and Siglent classes get split, then this should obviously
// move to the Siglent class.
if (m_model.compare(0, 4, "SDS2") == 0 && m_model.back() == 'X')
m_modelid = MODEL_SIGLENT_SDS2000X;

//FIXME
m_maxBandwidth = 200;
}

else
{
LogWarning("Model \"%s\" is unknown, available sample rates/memory depths may not be properly detected\n",
@@ -1103,7 +1092,6 @@ bool LeCroyOscilloscope::CanEnableChannel(size_t i)
case MODEL_WAVEMASTER_8ZI_B:
case MODEL_WAVEPRO_HD:
case MODEL_WAVERUNNER_9K:
case MODEL_SIGLENT_SDS2000X:
return (i == 1) || (i == 2) || (i > m_analogChannelCount);

case MODEL_WAVESURFER_3K: //TODO: can use ch1 if not 2, and ch3 if not 4
@@ -1372,7 +1360,6 @@ vector<unsigned int> LeCroyOscilloscope::GetChannelBandwidthLimiters(size_t /*i*
//Only the default 20/200
case MODEL_HDO_4KA:
case MODEL_HDO_6KA:
case MODEL_SIGLENT_SDS2000X:
default:
break;
}
2 changes: 0 additions & 2 deletions scopehal/LeCroyOscilloscope.h
Original file line number Diff line number Diff line change
@@ -174,8 +174,6 @@ class LeCroyOscilloscope

MODEL_WAVESURFER_3K,

MODEL_SIGLENT_SDS2000X,

MODEL_UNKNOWN
};