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

Commits on Oct 10, 2020

  1. Copy the full SHA
    214b29e View commit details
Showing with 4 additions and 0 deletions.
  1. +4 −0 scopehal/LeCroyOscilloscope.cpp
4 changes: 4 additions & 0 deletions scopehal/LeCroyOscilloscope.cpp
Original file line number Diff line number Diff line change
@@ -1282,6 +1282,8 @@ vector<unsigned int> LeCroyOscilloscope::GetChannelBandwidthLimiters(size_t /*i*

case MODEL_WAVEMASTER_8ZI_B:
ret.push_back(1000);
if(m_maxBandwidth >= 4000)
ret.push_back(3000);
if(m_maxBandwidth >= 6000)
ret.push_back(4000);
if(m_maxBandwidth >= 8000)
@@ -1375,6 +1377,8 @@ void LeCroyOscilloscope::SetChannelBandwidthLimit(size_t i, unsigned int limit_m
char cmd[128];
if(limit_mhz == 0)
snprintf(cmd, sizeof(cmd), "BANDWIDTH_LIMIT %s,OFF", m_channels[i]->GetHwname().c_str());
else if(limit_mhz >= 1000)
snprintf(cmd, sizeof(cmd), "BANDWIDTH_LIMIT %s,%uGHZ", m_channels[i]->GetHwname().c_str(), limit_mhz/1000);
else
snprintf(cmd, sizeof(cmd), "BANDWIDTH_LIMIT %s,%uMHZ", m_channels[i]->GetHwname().c_str(), limit_mhz);