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

Commits on Dec 3, 2020

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    87e48ea View commit details
Showing with 1 addition and 0 deletions.
  1. +1 −0 scopehal/RigolOscilloscope.cpp
1 change: 1 addition & 0 deletions scopehal/RigolOscilloscope.cpp
Original file line number Diff line number Diff line change
@@ -684,6 +684,7 @@ bool RigolOscilloscope::AcquireData()
cap->m_timescale = fs_per_sample;
cap->m_triggerPhase = 0;
cap->m_startTimestamp = time(NULL);
cap->m_densePacked = true;
double t = GetTime();
cap->m_startFemtoseconds = (t - floor(t)) * FS_PER_SECOND;