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

Commits on Sep 24, 2020

  1. Refactor usleep()

    bvernoux authored Sep 24, 2020
    Copy the full SHA
    7c86f3c View commit details
  2. Merge pull request #189 from bvernoux/patch-2

    Refactor usleep()
    azonenberg authored Sep 24, 2020
    Copy the full SHA
    54b3c6a View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 src/examples/curvetrace/main.cpp
4 changes: 2 additions & 2 deletions src/examples/curvetrace/main.cpp
Original file line number Diff line number Diff line change
@@ -104,7 +104,7 @@ int main(int argc, char* argv[])
LogNotice("%5d,%5.3f,",i,v);

//wait 25ms to stabilize
usleep(25 * 1000);
std::this_thread::sleep_for(std::chrono::microseconds(25 * 1000));

LogNotice("%5.7f\n", dmm.GetCurrent());

@@ -118,7 +118,7 @@ int main(int argc, char* argv[])

//Make sure all writes have committed before we close the socket
psu.GetSerial();
usleep(50 * 1000);
std::this_thread::sleep_for(std::chrono::microseconds(50 * 1000));

return 0;
}