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

Commits on Sep 24, 2020

  1. Refactor usleep()

    bvernoux authored Sep 24, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    lukekarrys Luke Karrys
    Copy the full SHA
    356403c View commit details
  2. Merge pull request #186 from bvernoux/patch-5

    Refactor usleep()
    azonenberg authored Sep 24, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    lukekarrys Luke Karrys
    Copy the full SHA
    96d3b5c View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 src/examples/fgtest/main.cpp
2 changes: 1 addition & 1 deletion src/examples/fgtest/main.cpp
Original file line number Diff line number Diff line change
@@ -84,7 +84,7 @@ int main(int argc, char* argv[])
for(float mhz=0.5; mhz<5; mhz += 0.01)
{
scope.SetFunctionChannelFrequency(0, mhz * 1.0e6f);
usleep(1000 * 50);
std::this_thread::sleep_for(std::chrono::microseconds(1000 * 50));
}
}