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: cf8eadd18a03
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: d663befce950
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 30, 2020

  1. Copy the full SHA
    0d852c4 View commit details
  2. Merge pull request #152 from noopwafel/slow-scope

    glscopeclient: Very slow scopes are not ahead of the UI.
    azonenberg authored Jul 30, 2020
    Copy the full SHA
    d663bef View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 src/glscopeclient/main.cpp
2 changes: 1 addition & 1 deletion src/glscopeclient/main.cpp
Original file line number Diff line number Diff line change
@@ -333,7 +333,7 @@ void ScopeThread(Oscilloscope* scope)

//If the queue is more than 5 sec long, wait for a while before polling any more.
//We've gotten ahead of the UI!
if(npending*dt > 5)
if(npending > 1 && npending*dt > 5)
{
LogTrace("Capture thread got 5 sec ahead of UI, sleeping\n");
std::this_thread::sleep_for(std::chrono::milliseconds(50));