Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add delay before modbus operations #316

Merged
merged 3 commits into from
Aug 26, 2020
Merged

Add delay before modbus operations #316

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cddaf0f
Switch modbus write method
andig Aug 26, 2020
e6a7c3c
Guard all operations
andig Aug 26, 2020
709bb72
Use 100ms
andig Aug 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Guard all operations
  • Loading branch information
@andig
andig committed Aug 26, 2020
commit e6a7c3c33885b946c1df38532a26a20fcc605981
17 changes: 15 additions & 2 deletions charger/simpleevse.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ func NewSimpleEVSE(conn, device string) (api.Charger, error) {
if conn != "" {
handler = modbus.NewTCPClientHandler(conn)
handler.(*modbus.TCPClientHandler).Timeout = time.Second
handler.(*modbus.TCPClientHandler).SlaveID = 1
handler.(*modbus.TCPClientHandler).Logger = log.TRACE
}
if device != "" {
Expand All @@ -59,7 +58,6 @@ func NewSimpleEVSE(conn, device string) (api.Charger, error) {
handler.(*modbus.RTUClientHandler).StopBits = 1
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 {
Expand All @@ -77,8 +75,20 @@ func NewSimpleEVSE(conn, device string) (api.Charger, error) {
return evse, nil
}

// prepare for bus operation
func (evse *SimpleEVSE) prepare() {
if h, ok := evse.handler.(*modbus.TCPClientHandler); ok {
h.SlaveID = 1
} else if h, ok := evse.handler.(*modbus.RTUClientHandler); ok {
h.SlaveID = 1
}

time.Sleep(50 * time.Millisecond)
}

// Status implements the Charger.Status interface
func (evse *SimpleEVSE) Status() (api.ChargeStatus, error) {
evse.prepare()
b, err := evse.client.ReadHoldingRegisters(evseRegVehicleStatus, 1)
evse.log.TRACE.Printf("read status (%d): %0 X", evseRegVehicleStatus, b)
if err != nil {
Expand All @@ -104,6 +114,7 @@ func (evse *SimpleEVSE) Status() (api.ChargeStatus, error) {

// Enabled implements the Charger.Enabled interface
func (evse *SimpleEVSE) Enabled() (bool, error) {
evse.prepare()
b, err := evse.client.ReadHoldingRegisters(evseRegTurnOff, 1)
evse.log.TRACE.Printf("read charge enable (%d): %0 X", evseRegTurnOff, b)
if err != nil {
Expand All @@ -116,6 +127,7 @@ func (evse *SimpleEVSE) Enabled() (bool, error) {

// Enable implements the Charger.Enable interface
func (evse *SimpleEVSE) Enable(enable bool) error {
evse.prepare()
b, err := evse.client.ReadHoldingRegisters(evseRegTurnOff, 1)
evse.log.TRACE.Printf("read charge enable (%d): %0 X", evseRegTurnOff, b)
if err != nil {
Expand All @@ -142,6 +154,7 @@ func (evse *SimpleEVSE) Enable(enable bool) error {
func (evse *SimpleEVSE) MaxCurrent(current int64) error {
b := []byte{0, byte(current)}

evse.prepare()
b, err := evse.client.WriteMultipleRegisters(evseRegAmpsConfig, 1, b)
evse.log.TRACE.Printf("write max current %d %0X: %0 X", evseRegAmpsConfig, current, b)
if err != nil {
Expand Down