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

Commits on Oct 10, 2020

  1. Copy the full SHA
    619998e View commit details
Showing with 4 additions and 1 deletion.
  1. +4 −1 scopehal/LeCroyOscilloscope.cpp
5 changes: 4 additions & 1 deletion scopehal/LeCroyOscilloscope.cpp
Original file line number Diff line number Diff line change
@@ -2734,7 +2734,10 @@ vector<uint64_t> LeCroyOscilloscope::GetSampleRatesNonInterleaved()
ret.push_back(500 * k);

ret.push_back(1 * m);
ret.push_back(2 * m);
if(m_modelid == MODEL_HDO_9K) //... with one exception
ret.push_back(2500 * k);
else
ret.push_back(2 * m);
ret.push_back(5 * m);
ret.push_back(10 * m);
ret.push_back(20 * m);