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

Commits on Sep 24, 2020

  1. Verified

    This commit was signed with the committer’s verified signature.
    skmcgrail Sean McGrail
    Copy the full SHA
    2169771 View commit details
  2. Updated submodules

    azonenberg committed Sep 24, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    skmcgrail Sean McGrail
    Copy the full SHA
    e652795 View commit details
Showing with 6 additions and 2 deletions.
  1. +1 −1 doc
  2. +1 −1 lib
  3. +4 −0 src/glscopeclient/main.cpp
2 changes: 1 addition & 1 deletion doc
Submodule doc updated from 127f43 to 755d58
2 changes: 1 addition & 1 deletion lib
Submodule lib updated from 6a5d67 to 079c78
4 changes: 4 additions & 0 deletions src/glscopeclient/main.cpp
Original file line number Diff line number Diff line change
@@ -374,6 +374,10 @@ void ScopeThread(Oscilloscope* scope)
//LogDebug("Triggered, dt = %.3f ms (npolls = %zu)\n",
// dt*1000, npolls);

//If this is a really slow connection (VPN etc), wait a while to let the UI thread do stuff.
if(dt > 1000)
std::this_thread::sleep_for(std::chrono::milliseconds(500));

npolls = 0;

continue;