From 05bd765623e9e96edfb34c804f3e222159983a60 Mon Sep 17 00:00:00 2001 From: andig Date: Sat, 29 Jan 2022 18:13:40 +0100 Subject: [PATCH] Modbus: fix using tcp instead of rtu over serial --- util/modbus/modbus.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/util/modbus/modbus.go b/util/modbus/modbus.go index dc0d031d0..97b9f29f0 100644 --- a/util/modbus/modbus.go +++ b/util/modbus/modbus.go @@ -161,7 +161,7 @@ func ProtocolFromRTU(rtu *bool) Protocol { } // NewConnection creates physical modbus device from config -func NewConnection(uri, device, comset string, baudrate int, wire Protocol, slaveID uint8) (*Connection, error) { +func NewConnection(uri, device, comset string, baudrate int, proto Protocol, slaveID uint8) (*Connection, error) { var conn meters.Connection if device != "" && uri != "" { @@ -181,10 +181,10 @@ func NewConnection(uri, device, comset string, baudrate int, wire Protocol, slav return nil, errors.New("invalid modbus configuration: need baudrate and comset") } - if wire == Rtu { - conn = registeredConnection(device, meters.NewRTU(device, baudrate, comset)) + if proto == Ascii { + conn = registeredConnection(device, meters.NewASCII(device, baudrate, comset)) } else { - conn = registeredConnection(uri, meters.NewASCII(device, baudrate, comset)) + conn = registeredConnection(device, meters.NewRTU(device, baudrate, comset)) } }