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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: fcca2e699934
Choose a base ref
...
head repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e961df4026f1
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Jul 30, 2020

  1. Commented out debug spam

    azonenberg committed Jul 30, 2020
    Copy the full SHA
    62b3efd View commit details
  2. Copy the full SHA
    3dd5be6 View commit details
  3. Updated xptools

    azonenberg committed Jul 30, 2020
    Copy the full SHA
    e961df4 View commit details
Showing with 3 additions and 3 deletions.
  1. +2 −2 scopehal/RigolOscilloscope.cpp
  2. +1 −1 xptools
4 changes: 2 additions & 2 deletions scopehal/RigolOscilloscope.cpp
Original file line number Diff line number Diff line change
@@ -665,11 +665,11 @@ bool RigolOscilloscope::AcquireData(bool toQueue)

//Read block header
unsigned char header[12] = {0};

double start = GetTime();
unsigned char header_size;
m_transport->ReadRawData(2, header);
LogWarning("Time %f\n", (GetTime() - start));
//LogWarning("Time %f\n", (GetTime() - start));

sscanf((char*)header, "#%c", &header_size);
header_size = header_size - '0';
2 changes: 1 addition & 1 deletion xptools