Changed at requests.

api/modem/at/at.go

@@ -3,7 +3,6 @@ package at
 import (
 	"fmt"
 	"log"
-	"strings"
 	"time"
 
 	"go.bug.st/serial"
@@ -15,25 +14,6 @@ const (
 	InputBufSize = 128
 )
 
-// Command types
-type CmdType byte
-
-// Command types base on request/answer semantic:
-const (
-	CmdTest CmdType = iota
-	// AT\r\n
-	// OK
-	CmdCheck
-	// AT+<CMD>\r\n
-	// OK
-	CmdGet
-	// AT+<CMD>\r\n
-	// +<CMD>: <ANS>
-	CmdQuestion
-	// AT+<CMD>?\r\n
-	// +<CMD>: <ANS>
-)
-
 type atPort struct {
 	baudrate int
 	portName string
@@ -42,12 +22,14 @@ type atPort struct {
 }
 
 type Port interface {
+	GetName() string
+	GetSerialPort() serial.Port // For extra need
+
 	Connect() error
 	Disconnect() error
-	Request(cmdType CmdType, cmd string) (string, error)
-	GetName() string
 	IsConnected() bool
-	GetSerialPort() serial.Port // For extra need
+
+	Send(cmd string) (Resp, error)
 }
 
 func New(portName string, baudrate int) Port {
@@ -58,6 +40,14 @@ func New(portName string, baudrate int) Port {
 	}
 }
 
+func (p *atPort) GetName() string {
+	return p.portName
+}
+
+func (p *atPort) GetSerialPort() serial.Port {
+	return p.port
+}
+
 func (p *atPort) Connect() error {
 	log.Println("Connecting to", p.portName, "...")
 	s, err := serial.Open(p.portName, &serial.Mode{BaudRate: p.baudrate})
@@ -83,6 +73,10 @@ func (p *atPort) Disconnect() error {
 	return nil
 }
 
+func (p *atPort) IsConnected() bool {
+	return p.port != nil
+}
+
 // Low level write/read function
 func (p *atPort) makeReq(msg string) (string, error) {
 	// Write
@@ -100,59 +94,16 @@ func (p *atPort) makeReq(msg string) (string, error) {
 	return string(p.inputBuf[:readLen]), nil
 }
 
-func (p *atPort) Request(cmdType CmdType, cmd string) (outStr string, outErr error) {
-	defer func() {
-		if outErr != nil {
-			return
-		}
-
-		log.Println("GOT:", outStr, "BYTE:", []byte(outStr))
-	}()
-
-	msg := "AT"
-	// Make command
-	// By default it just will be AT check cmd
-	switch cmdType {
-	case CmdGet, CmdCheck:
-		msg += cmd
-	case CmdQuestion:
-		msg += cmd + "?"
-	}
-	msg += "\r\n"
-	rawResp, err := p.makeReq(msg)
-	log.Println("Got")
+func (p *atPort) Send(cmd string) (Resp, error) {
+	cmd += "\r\n"
+	rawResp, err := p.makeReq(cmd)
 	if err != nil {
-		return "", fmt.Errorf("make at request: %w", err)
+		return RespNil, fmt.Errorf("make request: %w", err)
 	}
-	if len(rawResp) == 0 {
-		return "", fmt.Errorf("read nothing")
+	if len(rawResp) <= 4 {
+		return RespNil, fmt.Errorf("read too small msg: %d byte", len(rawResp))
 	}
 	resp := rawResp[2 : len(rawResp)-2] // Cut \r\n
-	switch cmdType {
-	case CmdTest, CmdCheck:
-		// Check and test cmds do not suppose anything but OK
-		if len(resp) >= 2 && resp[:2] == "OK" {
-			return "", nil
-		}
-		return "", fmt.Errorf("connection lost")
-	case CmdGet, CmdQuestion:
-		checkL := len(cmd) + 1
-		if len(resp) >= checkL && resp[:checkL] != "+"+cmd {
-			return "", fmt.Errorf("connetion lost")
-		}
-		return strings.Split(resp, ":")[1], nil
-	}
-	return "", fmt.Errorf("undefined command type")
-}
 
-func (p *atPort) GetName() string {
-	return p.portName
-}
-
-func (p *atPort) IsConnected() bool {
-	return p.port != nil
-}
-
-func (p *atPort) GetSerialPort() serial.Port {
-	return p.port
+	return Resp(resp), nil
 }

api/modem/at/response.go

@@ -0,0 +1,17 @@
+package at
+
+type Resp string
+
+const RespNil = Resp("")
+
+func (resp Resp) Check() bool {
+	return len(resp) >= 2 && resp[len(resp)-2:] == "OK"
+}
+
+func (resp Resp) RmFront(str string) Resp {
+	return Resp(string(resp)[len(str):])
+}
+
+func (resp Resp) Str() string {
+	return string(resp)
+}