Skip to content

Wait for correct response id #77

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Wait for correct response id #77

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb5ceb3
Wait for correct response id
Nov 2, 2023
c44b32a
Added error return value
Nov 3, 2023
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
26 changes: 20 additions & 6 deletions client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ package modbus
import (
"encoding/binary"
"fmt"
"time"
)

// logger is the interface to the required logging functions
Expand Down Expand Up @@ -487,12 +488,25 @@ func (mb *client) send(request *ProtocolDataUnit) (response *ProtocolDataUnit, e
if err != nil {
return
}
aduResponse, err := mb.transporter.Send(aduRequest)
if err != nil {
return
}
if err = mb.packager.Verify(aduRequest, aduResponse); err != nil {
return

// Wait for correct response ID before throwing error.
var aduResponse []byte
maxTime := time.Now().Add(tcpTimeout)
for {
aduResponse, err = mb.transporter.Send(aduRequest)
if err != nil {
return
}
err = mb.packager.Verify(aduRequest, aduResponse)

if err == nil {
break
}
if time.Now().After(maxTime) {
err = fmt.Errorf("modbus: response timeout")
return
}
// Else try again until timeout.
}
response, err = mb.packager.Decode(aduResponse)
if err != nil {
Expand Down