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

Commits on Sep 24, 2020

  1. include chrono required for refactoring of usleep

    include chrono required for refactoring of 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.
    lukekarrys Luke Karrys
    Copy the full SHA
    e3f6fb5 View commit details
  2. Merge pull request #188 from bvernoux/patch-3

    include chrono required for refactoring of usleep
    azonenberg authored Sep 24, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    lukekarrys Luke Karrys
    Copy the full SHA
    84ceacb View commit details
Showing with 1 addition and 0 deletions.
  1. +1 −0 src/glscopeclient/glscopeclient.h
1 change: 1 addition & 0 deletions src/glscopeclient/glscopeclient.h
Original file line number Diff line number Diff line change
@@ -43,6 +43,7 @@
#include "../scopehal/OscilloscopeChannel.h"
#include "../scopehal/Filter.h"

#include <chrono>
#include <thread>
#include <vector>