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

Commits on May 11, 2020

  1. LeCroyOscilloscope: fixed bug in IsChannelEnabled() causing digital c… 

    …hannels to not hit the cache
    @azonenberg
    azonenberg committed May 11, 2020
    Copy the full SHA
    3785601 View commit details
Showing with 4 additions and 3 deletions.
  1. +4 −3 scopehal/LeCroyOscilloscope.cpp
7 changes: 4 additions & 3 deletions scopehal/LeCroyOscilloscope.cpp
View file
Original file line number Diff line number Diff line change
@@ -404,12 +404,13 @@ bool LeCroyOscilloscope::IsChannelEnabled(size_t i)
lock_guard<recursive_mutex> lock(m_mutex);
lock_guard<recursive_mutex> lock2(m_cacheMutex);

//Check cache
if(m_channelsEnabled.find(i) != m_channelsEnabled.end())
return m_channelsEnabled[i];

//Analog
if(i < m_analogChannelCount)
{
if(m_channelsEnabled.find(i) != m_channelsEnabled.end())
return m_channelsEnabled[i];

//See if the channel is enabled, hide it if not
string cmd = m_channels[i]->GetHwname() + ":TRACE?";
m_transport->SendCommand(cmd);