Stefan/evcc-io
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Modbus: fix using tcp instead of rtu over serial

Browse source
This commit is contained in:
andig 2022-01-29 18:13:40 +01:00
parent 14bfec15ac
commit 05bd765623
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
util/modbus/modbus.go
View file

@ -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))
}
}