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: 4b43648c6c4a
Choose a base ref
...
head repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a10f77229a68
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jun 8, 2020

  1. Bugfix: LeCroyOscilloscope would sometimes hang checking the trigger …

    …voltage on scopes with the MSO option installed
    azonenberg committed Jun 8, 2020
    Copy the full SHA
    a10f772 View commit details
Showing with 10 additions and 1 deletion.
  1. +10 −1 scopehal/LeCroyOscilloscope.cpp
11 changes: 10 additions & 1 deletion scopehal/LeCroyOscilloscope.cpp
Original file line number Diff line number Diff line change
@@ -1651,7 +1651,16 @@ float LeCroyOscilloscope::GetTriggerVoltage()
return m_triggerLevel;

lock_guard<recursive_mutex> lock(m_mutex);
m_transport->SendCommand("TRLV?");

//If we have the MSO option installed, the last channel we touched might have been digital.
//If this is the case the scope will be derpy and drop the command even if the trigger source is an analog channel!
//The fix is to explicitly query the trigger voltage on the actual analog channel.
if(m_hasLA)
m_transport->SendCommand(m_channels[m_triggerChannel]->GetHwname() + ":TRLV?");
else
m_transport->SendCommand("TRLV?");


string reply = m_transport->ReadReply();
sscanf(reply.c_str(), "%f", &m_triggerLevel);
m_triggerLevelValid = true;