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

Commits on Jul 21, 2020

  1. Copy the full SHA
    a9e2677 View commit details

Commits on Jul 30, 2020

  1. Comply with code style

    pepijndevos authored Jul 30, 2020
    Copy the full SHA
    3147af7 View commit details
  2. Merge pull request #182 from pepijndevos/timeout

    set rx/tx timeout after connect, to avoid it being reset
    azonenberg authored Jul 30, 2020
    Copy the full SHA
    fcca2e6 View commit details
Showing with 4 additions and 3 deletions.
  1. +4 −3 scopehal/SCPISocketTransport.cpp
7 changes: 4 additions & 3 deletions scopehal/SCPISocketTransport.cpp
Original file line number Diff line number Diff line change
@@ -59,15 +59,16 @@ 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();
LogError("Couldn't connect to socket\n");
return;
}
if(!m_socket.SetRxTimeout(2000000))
LogWarning("No Rx timeout: %s\n", strerror(errno));
if(!m_socket.SetTxTimeout(2000000))
LogWarning("No Tx timeout: %s\n", strerror(errno));
if(!m_socket.DisableNagle())
{
m_socket.Close();