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

Commits on Jul 10, 2020

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    63b6d5f 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
@@ -61,7 +61,7 @@ RigolOscilloscope::RigolOscilloscope(SCPITransport* transport)
}
else
{
m_protocol = MSO5;
m_protocol = DS;
}

int nchans = m_modelNumber % 10;