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

7
plugin/sunspec.go
View file

@ -1,6 +1,7 @@
package plugin
import (
"context"
"errors"
"fmt"
"math"
@ -24,11 +25,11 @@ type ModbusSunspec struct {
}
func init() {
registry.Add("sunspec", NewModbusSunspecFromConfig)
registry.AddCtx("sunspec", NewModbusSunspecFromConfig)
}
// NewModbusSunspecFromConfig creates Modbus plugin
func NewModbusSunspecFromConfig(other map[string]interface{}) (Plugin, error) {
func NewModbusSunspecFromConfig(ctx context.Context, other map[string]interface{}) (Plugin, error) {
cc := struct {
modbus.Settings `mapstructure:",squash"`
Value []string
@ -47,7 +48,7 @@ func NewModbusSunspecFromConfig(other map[string]interface{}) (Plugin, error) {
modbus.Lock()
defer modbus.Unlock()
conn, err := modbus.NewConnection(cc.URI, cc.Device, cc.Comset, cc.Baudrate, cc.Settings.Protocol(), cc.ID)
conn, err := modbus.NewConnection(ctx, cc.URI, cc.Device, cc.Comset, cc.Baudrate, cc.Settings.Protocol(), cc.ID)
if err != nil {
return nil, err
}