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

Commits on Dec 3, 2020

  1. Fix Rigol MSO5000 issues/timeout bugs when retrieving :WAV:DATA 

    Fix the issue #358 glscopeclient hangs on Rigol MSO5000
This fix oscilloscope single trigger synchronization with waveform data by adding "*WAI" command which "Waits for all the pending operations to complete before executing any additional commands." (it is an IEEE488.2 Common Commands)
    @bvernoux
    bvernoux authored Dec 3, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6bfbfb4 View commit details

  2. Merge pull request #359 from bvernoux/patch-1 

    Fix glscopeclient hangs on Rigol MSO5000
    @azonenberg
    azonenberg authored Dec 3, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7d3f4dc View commit details
Showing with 9 additions and 0 deletions.
  1. +9 −0 scopehal/RigolOscilloscope.cpp
9 changes: 9 additions & 0 deletions scopehal/RigolOscilloscope.cpp
View file
Original file line number Diff line number Diff line change
@@ -789,7 +789,10 @@ bool RigolOscilloscope::AcquireData()
m_transport->SendCommand(":RUN");
}
else
{
m_transport->SendCommand(":SING");
m_transport->SendCommand("*WAI");
}
m_triggerArmed = true;
}

@@ -808,7 +811,10 @@ void RigolOscilloscope::Start()
m_transport->SendCommand(":RUN");
}
else
{
m_transport->SendCommand(":SING");
m_transport->SendCommand("*WAI");
}
m_triggerArmed = true;
m_triggerOneShot = false;
}
@@ -822,7 +828,10 @@ void RigolOscilloscope::StartSingleTrigger()
m_transport->SendCommand(":RUN");
}
else
{
m_transport->SendCommand(":SING");
m_transport->SendCommand("*WAI");
}
m_triggerArmed = true;
m_triggerOneShot = true;
}