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

Commits on Jun 21, 2020

  1. Copy the full SHA
    984b384 View commit details

Commits on Jun 22, 2020

  1. Merge pull request #161 from x44203/master

    fixed rigol showing 'Invalid input'
    azonenberg authored Jun 22, 2020
    Copy the full SHA
    d104166 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 scopehal/RigolOscilloscope.cpp
2 changes: 1 addition & 1 deletion scopehal/RigolOscilloscope.cpp
Original file line number Diff line number Diff line change
@@ -577,7 +577,7 @@ bool RigolOscilloscope::AcquireData(bool toQueue)
size_t end = npoint + maxpoints;
if(end > npoints)
end = npoints;
snprintf(tmp, sizeof(tmp), "WAV:STOP %zu", end + 1);
snprintf(tmp, sizeof(tmp), "WAV:STOP %zu", end); //Here it is zero based, so it gets from 1-1000
m_transport->SendCommand(tmp);

//Ask for the data block