Skip to content

fix modem comm on RPi #8

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
dgnorton wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix modem comm on RPi #8

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 7 additions & 9 deletions hayes/hayes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ func Open(conn string) (*Modem, error) {
portCfg := &serial.Config{
Name: cfg.port,
Baud: cfg.baud,
ReadTimeout: 50 * time.Millisecond,
ReadTimeout: time.Second,
}

port, err := serial.OpenPort(portCfg)
Expand Down Expand Up @@ -382,6 +382,7 @@ func (m *Modem) run() {
m.stopped.Done()
return
case req := <-m.tx:
fmt.Printf("sending cmd: %s\n", string(req.Cmd))
// Send command to modem.
if err := write(m.port, string(req.Cmd)); err != nil {
req.Response <- &Response{Err: err}
Expand Down Expand Up @@ -495,11 +496,11 @@ func (m *Modem) readResponse() *Response {

switch b[0] {
case 13: // CR
case 10: // LF
if s := string(buf); s != "" {
return &Response{Data: string(buf)}
}
buf = buf[:0]
case 10: // LF
default:
buf = append(buf, b[0])
}
Expand Down Expand Up @@ -539,14 +540,11 @@ func writeRead(p *serial.Port, s string) (string, error) {
}

func write(p *serial.Port, s string) error {
cmd := []byte(fmt.Sprintf("%s\r\n", s))
n, err := p.Write(cmd)
if err != nil {
cmd := []byte(fmt.Sprintf("%s\r", s))
if n, err := p.Write(cmd); err != nil {
return err
}

if n != len(s)+2 {
return fmt.Errorf("only wrote %d of %d bytes", n, len(s)+2)
} else if n != len(cmd) {
return fmt.Errorf("only wrote %d of %d bytes", n, len(cmd))
}
return nil
}
Expand Down