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

Commits on May 26, 2020

  1. Timeouts added

    x44203 committed May 26, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    StollD Dorian Stoll
    Copy the full SHA
    f31bca5 View commit details
  2. Merge pull request #126 from x44203/master

    Timeouts added
    azonenberg authored May 26, 2020
    Copy the full SHA
    35cb991 View commit details
Showing with 3 additions and 0 deletions.
  1. +3 −0 scopehal/SCPISocketTransport.cpp
3 changes: 3 additions & 0 deletions scopehal/SCPISocketTransport.cpp
Original file line number Diff line number Diff line change
@@ -59,6 +59,9 @@ SCPISocketTransport::SCPISocketTransport(string args)

LogDebug("Connecting to SCPI oscilloscope at %s:%d\n", m_hostname.c_str(), m_port);

m_socket.SetRxTimeout(2000000);
m_socket.SetTxTimeout(2000000);

if(!m_socket.Connect(m_hostname, m_port))
{
m_socket.Close();