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: 34d894526a71
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: 5aaa9e801d32
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Feb 13, 2020

  1. ScopeThread: cleanly return if a capture fails

    @azonenberg
    azonenberg committed Feb 13, 2020
    Copy the full SHA
    5aaa9e8 View commit details
Showing with 7 additions and 2 deletions.
  1. +7 −2 glscopeclient/main.cpp
9 changes: 7 additions & 2 deletions glscopeclient/main.cpp
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
* *
* ANTIKERNEL v0.1 *
* *
* Copyright (c) 2012-2019 Andrew D. Zonenberg *
* Copyright (c) 2012-2020 Andrew D. Zonenberg *
* All rights reserved. *
* *
* Redistribution and use in source and binary forms, with or without modification, are permitted provided that the *
@@ -316,7 +316,12 @@ void ScopeThread(Oscilloscope* scope)

if(stat == Oscilloscope::TRIGGER_MODE_TRIGGERED)
{
scope->AcquireData(true);
//Collect the data, fail if that doesn't work
if(!scope->AcquireData(true))
{
tlast = GetTime();
continue;
}

//Measure how long the acquisition took
double now = GetTime();