From d29b92edd06b39aa203a6328a531a1c703aabc91 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Sun, 17 May 2015 23:52:35 +0200 Subject: Combine SearchMarks --- robo.go | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/robo.go b/robo.go index fb4b21d..10b3d25 100644 --- a/robo.go +++ b/robo.go @@ -35,17 +35,14 @@ func (p Point) UpperRight(c *bufio.Writer) { p.send(c, "Z") } func (p Point) CuttingArea(c *bufio.Writer) { p.send(c, "FU") } func (p Point) Calibration(c *bufio.Writer) { p.send(c, "TB72,") } -func (p Point) SearchMarks(c *bufio.ReadWriter) bool { +func (p Point) SearchMarks(c *bufio.ReadWriter, auto bool) bool { send(c.Writer, "TB99") send(c.Writer, "TB55,1") - send(c.Writer, "TB123,", p) - return parseUnit(recv(c.Reader)) == 0 -} - -func (p Point) SearchMarksManual(c *bufio.ReadWriter) bool { - send(c.Writer, "TB99") - send(c.Writer, "TB55,1") - send(c.Writer, "TB23,", p) + if auto { + send(c.Writer, "TB123,", p) + } else { + send(c.Writer, "TB23,", p) + } return parseUnit(recv(c.Reader)) == 0 } -- cgit v1.2.3