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

Modbus: use context (#19301)

Browse source
This commit is contained in:
andig 2025-03-01 19:13:41 +01:00 • committed by GitHub
parent 766a6f6b2b
commit 45623bfa15
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
49 changed files with 241 additions and 183 deletions
Download patch file Download diff file Expand all files Collapse all files

3
server/modbus/proxy.go
View file

@ -1,6 +1,7 @@
package modbus
import (
"context"
"fmt"
"net"
@ -12,7 +13,7 @@ import (
)
func StartProxy(port int, config modbus.Settings, readOnly ReadOnlyMode) error {
conn, err := modbus.NewConnection(config.URI, config.Device, config.Comset, config.Baudrate, config.Protocol(), config.ID)
conn, err := modbus.NewConnection(context.Background(), config.URI, config.Device, config.Comset, config.Baudrate, config.Protocol(), config.ID)
if err != nil {
return err
}

7
server/modbus/proxy_test.go
View file

@ -1,6 +1,7 @@
package modbus
import (
"context"
"encoding/binary"
"math/rand"
"net"
@ -34,7 +35,7 @@ func TestConcurrentRead(t *testing.T) {
go func(id int) {
// client
conn, err := modbus.NewConnection(l.Addr().String(), "", "", 0, modbus.Tcp, uint8(id))
conn, err := modbus.NewConnection(context.TODO(), l.Addr().String(), "", "", 0, modbus.Tcp, uint8(id))
require.NoError(t, err)
for range 50 {
@ -78,7 +79,7 @@ func TestReadCoils(t *testing.T) {
require.NoError(t, err)
defer pl.Close()
downstreamConn, err := modbus.NewConnection(l.Addr().String(), "", "", 0, modbus.Tcp, 1)
downstreamConn, err := modbus.NewConnection(context.TODO(), l.Addr().String(), "", "", 0, modbus.Tcp, 1)
require.NoError(t, err)
proxy, _ := mbserver.New(&handler{
@ -90,7 +91,7 @@ func TestReadCoils(t *testing.T) {
// test client
{
conn, err := modbus.NewConnection(pl.Addr().String(), "", "", 0, modbus.Tcp, 1)
conn, err := modbus.NewConnection(context.TODO(), pl.Addr().String(), "", "", 0, modbus.Tcp, 1)
require.NoError(t, err)
{ // read