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

chore: introduce CoilOn const (#1927)

Browse source
This commit is contained in:
andig 2021-11-24 09:20:59 +01:00 • committed by GitHub
parent 3c0e429190
commit 7a54e50a3c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
charger/phoenix-em-eth.go
View file

@ -112,7 +112,7 @@ func (wb *PhoenixEMEth) Enabled() (bool, error) {
func (wb *PhoenixEMEth) Enable(enable bool) error {
var u uint16
if enable {
u = 0xFF00
u = modbus.CoilOn
}
_, err := wb.conn.WriteSingleCoil(phxEMEthRegEnable, u)

2
charger/phoenix-ev-eth.go
View file

@ -113,7 +113,7 @@ func (wb *PhoenixEVEth) Enabled() (bool, error) {
func (wb *PhoenixEVEth) Enable(enable bool) error {
var u uint16
if enable {
u = 0xFF00
u = modbus.CoilOn
}
_, err := wb.conn.WriteSingleCoil(phxEVEthRegEnable, u)

2
charger/phoenix-ev-ser.go
View file

@ -82,7 +82,7 @@ func (wb *PhoenixEVSer) Enabled() (bool, error) {
func (wb *PhoenixEVSer) Enable(enable bool) error {
var u uint16
if enable {
u = 0xFF00
u = modbus.CoilOn
}
_, err := wb.conn.WriteSingleCoil(phxEVSerRegEnable, u)

2
charger/wallbe.go
View file

@ -143,7 +143,7 @@ func (wb *Wallbe) Enabled() (bool, error) {
func (wb *Wallbe) Enable(enable bool) error {
var u uint16
if enable {
u = 0xFF00
u = modbus.CoilOn
}
_, err := wb.conn.WriteSingleCoil(wbRegEnable, u)

3
provider/modbus.go
View file

@ -10,6 +10,7 @@ import (
"github.com/evcc-io/evcc/util"
"github.com/evcc-io/evcc/util/modbus"
gridx "github.com/grid-x/modbus"
"github.com/volkszaehler/mbmd/meters"
"github.com/volkszaehler/mbmd/meters/rs485"
"github.com/volkszaehler/mbmd/meters/sunspec"
@ -256,7 +257,7 @@ func (m *Modbus) IntSetter(param string) func(int64) error {
uval := uint16(int64(m.scale) * val)
switch op.FuncCode {
case modbus.WriteSingleRegister:
case gridx.FuncCodeWriteSingleRegister:
_, err = m.conn.WriteSingleRegister(op.OpCode, uval)
default:
err = fmt.Errorf("unknown function code %d", op.FuncCode)

12
util/modbus/modbus.go
View file

@ -8,20 +8,20 @@ import (
"time"
"github.com/evcc-io/evcc/util"
"github.com/grid-x/modbus"
"github.com/volkszaehler/mbmd/meters"
"github.com/volkszaehler/mbmd/meters/rs485"
"github.com/volkszaehler/mbmd/meters/sunspec"
)
// WriteSingleRegister 16-bit wise write access
const WriteSingleRegister = 6 // modbus.FuncCodeWriteSingleRegister
type WireFormat int
const (
TcpFormat WireFormat = iota
RtuFormat
AsciiFormat
CoilOn uint16 = 0xFF00
)
// Settings contains the ModBus settings
@ -254,11 +254,11 @@ func RegisterOperation(r Register) (rs485.Operation, error) {
switch strings.ToLower(r.Type) {
case "holding":
op.FuncCode = rs485.ReadHoldingReg
op.FuncCode = modbus.FuncCodeReadHoldingRegisters
case "input":
op.FuncCode = rs485.ReadInputReg
op.FuncCode = modbus.FuncCodeReadInputRegisters
case "writesingle":
op.FuncCode = WriteSingleRegister // modbus.FuncCodeWriteSingleRegister
op.FuncCode = modbus.FuncCodeWriteSingleRegister
default:
return rs485.Operation{}, fmt.Errorf("invalid register type: %s", r.Type)
}