From a02c0e29ba10158be25263414bd092ff7fb42b8b Mon Sep 17 00:00:00 2001 From: andig Date: Wed, 26 Aug 2020 16:08:28 +0200 Subject: [PATCH] Fix evse register usage and add logging (#314) --- charger/simpleevse.go | 12 +++++++----- go.mod | 2 ++ go.sum | 6 ++---- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/charger/simpleevse.go b/charger/simpleevse.go index 79ebfd6d0..115e837a9 100644 --- a/charger/simpleevse.go +++ b/charger/simpleevse.go @@ -48,6 +48,7 @@ func NewSimpleEVSE(conn, device string) (api.Charger, error) { handler = modbus.NewTCPClientHandler(conn) handler.(*modbus.TCPClientHandler).Timeout = time.Second handler.(*modbus.TCPClientHandler).SlaveID = 1 + handler.(*modbus.TCPClientHandler).Logger = log.TRACE } if device != "" { handler = modbus.NewRTUClientHandler(device) @@ -57,6 +58,7 @@ func NewSimpleEVSE(conn, device string) (api.Charger, error) { handler.(*modbus.RTUClientHandler).Parity = "N" handler.(*modbus.RTUClientHandler).Timeout = time.Second handler.(*modbus.RTUClientHandler).SlaveID = 1 + handler.(*modbus.RTUClientHandler).Logger = log.TRACE } if handler == nil { return nil, errors.New("must define either uri or device") @@ -76,13 +78,13 @@ func NewSimpleEVSE(conn, device string) (api.Charger, error) { // Status implements the Charger.Status interface func (evse *SimpleEVSE) Status() (api.ChargeStatus, error) { b, err := evse.client.ReadHoldingRegisters(evseRegVehicleStatus, 1) - evse.log.TRACE.Printf("read charge enable (%d): %0 X", evseRegVehicleStatus, b) + evse.log.TRACE.Printf("read status (%d): %0 X", evseRegVehicleStatus, b) if err != nil { evse.handler.Close() return api.StatusNone, err } - switch b[0] { + switch b[1] { case 1: // ready return api.StatusA, nil case 2: // EV is present @@ -107,7 +109,7 @@ func (evse *SimpleEVSE) Enabled() (bool, error) { return false, err } - return b[0] == 1, nil + return b[1] == 1, nil } // Enable implements the Charger.Enable interface @@ -120,9 +122,9 @@ func (evse *SimpleEVSE) Enable(enable bool) error { } if enable { - b[0] |= 1 + b[1] |= 1 } else { - b[0] &= ^byte(1) + b[1] &= ^byte(1) } b, err = evse.client.WriteMultipleRegisters(evseRegTurnOff, 1, b) diff --git a/go.mod b/go.mod index 438d08c2a..30b3076aa 100644 --- a/go.mod +++ b/go.mod @@ -39,3 +39,5 @@ require ( golang.org/x/tools v0.0.0-20200717024301-6ddee64345a6 gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c ) + +replace github.com/grid-x/modbus => github.com/andig/gridx-modbus v0.0.0-20200826125157-fae5d19005f7 diff --git a/go.sum b/go.sum index 97fd5da5b..1b5b9c30e 100644 --- a/go.sum +++ b/go.sum @@ -24,6 +24,8 @@ github.com/andig/evcc-config v0.0.0-20200822120120-f129cbffa9aa h1:+t8n7jFHvd/QI github.com/andig/evcc-config v0.0.0-20200822120120-f129cbffa9aa/go.mod h1:N0hIjIy+5E2AR1fF7Tg2IzBlblBrnFvCCaDGAaHzbWk= github.com/andig/gosunspec v0.0.0-20200429133549-3cf6a82fed9c h1:AMtX56iHlNYVxMID7fe9efuVtaxgtdjyMeolg7q87IE= github.com/andig/gosunspec v0.0.0-20200429133549-3cf6a82fed9c/go.mod h1:YkshK8WMzYn1iXAZzHUO75gIqhMSan2ctgBVtBkRIyA= +github.com/andig/gridx-modbus v0.0.0-20200826125157-fae5d19005f7 h1:iiA2qGJKwmu+KS2lfOCvSsPE0xlixmC7xlW2mnrhCg0= +github.com/andig/gridx-modbus v0.0.0-20200826125157-fae5d19005f7/go.mod h1:9mi0a7/tbYsUWwsC32q/R0r2p1lkNt+8li81Zaf/yTE= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= @@ -137,10 +139,6 @@ github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0U github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gregdel/pushover v0.0.0-20200416074932-c8ad547caed4 h1:QZVozMeLCqyMOOhA+OuqQdNXkyu4uUQEu4+mPBB5pPQ= github.com/gregdel/pushover v0.0.0-20200416074932-c8ad547caed4/go.mod h1:EcaO66Nn1StkpEm1iKtBTV3d2A16SoMsVER1PthX7to= -github.com/grid-x/modbus v0.0.0-20200108122021-57d05a9f1e1a h1:3UySDE1dqaYXW4tTw5e/8DhSBev4ucKiN8VMtPg5CXo= -github.com/grid-x/modbus v0.0.0-20200108122021-57d05a9f1e1a/go.mod h1:cOS1YDRu+JId5eT7kRulYTlfpACFppj2MpftCvHeiuM= -github.com/grid-x/modbus v0.0.0-20200704184817-73c05928caa1 h1:BYLp5X1lVALMF3s8aMjBeV1w1Htru75EKzn4Kqtwvv8= -github.com/grid-x/modbus v0.0.0-20200704184817-73c05928caa1/go.mod h1:cOS1YDRu+JId5eT7kRulYTlfpACFppj2MpftCvHeiuM= github.com/grid-x/serial v0.0.0-20191104121038-e24bc9bf6f08 h1:syBxnRYnSPUDdkdo5U4sy2roxBPQDjNiw4od7xlsABQ= github.com/grid-x/serial v0.0.0-20191104121038-e24bc9bf6f08/go.mod h1:kdOd86/VGFWRrtkNwf1MPk0u1gIjc4Y7R2j7nhwc7Rk= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=