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: 96d3b5c5e4ba
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: 308e4eb3f480
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 24, 2020

  1. Refactor usleep()

    Refactor usleep(..) by std::this_thread::sleep_for(std::chrono::microseconds(..))
    bvernoux authored Sep 24, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    skmcgrail Sean McGrail
    Copy the full SHA
    6e255eb View commit details
  2. Merge pull request #187 from bvernoux/patch-4

    Refactor usleep()
    azonenberg authored Sep 24, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    skmcgrail Sean McGrail
    Copy the full SHA
    308e4eb View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 src/glscopeclient/OscilloscopeWindow.cpp
2 changes: 1 addition & 1 deletion src/glscopeclient/OscilloscopeWindow.cpp
Original file line number Diff line number Diff line change
@@ -789,7 +789,7 @@ void OscilloscopeWindow::LoadWaveformDataForScope(
scope->m_nickname.c_str(),
frac * 100);
progress.Update(tmp, base_progress + frac*waveform_progress);
usleep(1000 * 50);
std::this_thread::sleep_for(std::chrono::microseconds(1000 * 50));

g_app->DispatchPendingEvents();
}