Use grid-x default timeouts (#324)

volkszaehler · Jun 19, 2023 · eff79d9 · eff79d9
1 parent d3c3174
commit eff79d9
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 8 deletions.
diff --git a/meters/ascii.go b/meters/ascii.go
@@ -33,8 +33,6 @@ func NewASCIIClientHandler(device string, baudrate int, comset string) *modbus.A
  log.Fatalf("Invalid communication set specified: %s. See -h for help.", comset)
  }
 
- handler.Timeout = 300 * time.Millisecond
-
  return handler
 }
 

diff --git a/meters/asciiovertcp.go b/meters/asciiovertcp.go
@@ -19,7 +19,6 @@ func NewASCIIOverTCPClientHandler(device string) *modbus.ASCIIOverTCPClientHandl
  handler := modbus.NewASCIIOverTCPClientHandler(device)
 
  // set default timings
- handler.Timeout = 1 * time.Second
  handler.ProtocolRecoveryTimeout = 10 * time.Second // not used
  handler.LinkRecoveryTimeout = 15 * time.Second // not used
 

diff --git a/meters/rtu.go b/meters/rtu.go
@@ -33,8 +33,6 @@ func NewClientHandler(device string, baudrate int, comset string) *modbus.RTUCli
  log.Fatalf("Invalid communication set specified: %s. See -h for help.", comset)
  }
 
- handler.Timeout = 300 * time.Millisecond
-
  return handler
 }
 

diff --git a/meters/rtuovertcp.go b/meters/rtuovertcp.go
@@ -19,7 +19,6 @@ func NewRTUOverTCPClientHandler(device string) *modbus.RTUOverTCPClientHandler {
  handler := modbus.NewRTUOverTCPClientHandler(device)
 
  // set default timings
- handler.Timeout = 1 * time.Second
  handler.ProtocolRecoveryTimeout = 10 * time.Second // not used
  handler.LinkRecoveryTimeout = 15 * time.Second // not used
 

diff --git a/meters/tcp.go b/meters/tcp.go
@@ -18,8 +18,6 @@ func NewTCPClientHandler(device string) *modbus.TCPClientHandler {
  handler := modbus.NewTCPClientHandler(device)
 
  // set default timings
- handler.Timeout = 1 * time.Second
- handler.IdleTimeout = 5 * time.Second
  handler.ProtocolRecoveryTimeout = 10 * time.Second
  handler.LinkRecoveryTimeout = 15 * time.Second