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

Commits on Jul 29, 2020

  1. Copy the full SHA
    6d7ad45 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 scopehal/SignalGeneratorOscilloscope.cpp
4 changes: 2 additions & 2 deletions scopehal/SignalGeneratorOscilloscope.cpp
Original file line number Diff line number Diff line change
@@ -126,8 +126,8 @@ Oscilloscope::TriggerMode SignalGeneratorOscilloscope::PollTrigger()

bool SignalGeneratorOscilloscope::AcquireData(bool toQueue)
{
//cap waveform rate at 50 wfm/s to avoid saturating cpu etc
usleep(20 * 1000);
//cap waveform rate at 25 wfm/s to avoid saturating cpu etc with channel emulation
usleep(40 * 1000);

auto waveform = m_bufmodel->SimulatePRBS(
rand(),