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

Commits on Jul 30, 2020

  1. Copy the full SHA
    a2664a1 View commit details
Showing with 9 additions and 1 deletion.
  1. +7 −0 scopehal/LeCroyOscilloscope.cpp
  2. +2 −1 scopehal/LeCroyOscilloscope.h
7 changes: 7 additions & 0 deletions scopehal/LeCroyOscilloscope.cpp
Original file line number Diff line number Diff line change
@@ -43,6 +43,7 @@ LeCroyOscilloscope::LeCroyOscilloscope(SCPITransport* transport)
, m_hasLA(false)
, m_hasDVM(false)
, m_hasFunctionGen(false)
, m_hasFastSampleRate(false)
, m_triggerArmed(false)
, m_triggerOneShot(false)
, m_sampleRateValid(false)
@@ -125,7 +126,11 @@ void LeCroyOscilloscope::IdentifyHardware()
else if(m_model.find("DDA5") == 0)
m_modelid = MODEL_DDA_5K;
else if(m_model.find("WAVERUNNER8") == 0)
{
m_modelid = MODEL_WAVERUNNER_8K;
if(m_model.find("4M") != string::npos)
m_hasFastSampleRate = true;
}
else if(m_model.find("SDA3") == 0)
m_modelid = MODEL_SDA_3K;
else if (m_vendor.compare("SIGLENT") == 0)
@@ -1876,6 +1881,8 @@ vector<uint64_t> LeCroyOscilloscope::GetSampleRatesNonInterleaved()
case MODEL_WAVERUNNER_8K:
ret.push_back(5 * g);
ret.push_back(10 * g);
if(m_hasFastSampleRate)
ret.push_back(20 * g);
break;

case MODEL_HDO_9K:
3 changes: 2 additions & 1 deletion scopehal/LeCroyOscilloscope.h
Original file line number Diff line number Diff line change
@@ -205,6 +205,7 @@ class LeCroyOscilloscope
bool m_hasLA;
bool m_hasDVM;
bool m_hasFunctionGen;
bool m_hasFastSampleRate; //-M models

bool m_triggerArmed;
bool m_triggerOneShot;
@@ -241,4 +242,4 @@ class LeCroyOscilloscope
static std::string GetDriverNameInternal();
OSCILLOSCOPE_INITPROC(LeCroyOscilloscope)
};
#endif
#endif