From dcd51d01fb60a5ea3abd61d86e86c9509bb385e1 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Sun, 3 May 2015 01:41:40 +0200 Subject: Search Marks --- cutter.go | 6 ++++-- main.go | 8 +++++--- marks.go | 4 +--- usb.go | 4 ++-- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/cutter.go b/cutter.go index d02e3f0..8ade859 100644 --- a/cutter.go +++ b/cutter.go @@ -352,14 +352,16 @@ func (c Cutter) TrackEnhancing(state OnOff) { c.Send("FY", state) } -func (c Cutter) SearchMarks(p Point) bool { +func (c Cutter) SearchMarks(p Point, l int) bool { + c.RegMarkLen(l) c.Send("TB99") c.Send("TB55,1") c.Send("TB123,", p) return c.parseDigit() == 0 } -func (c Cutter) ManualSearchMarks(p Point) bool { +func (c Cutter) ManualSearchMarks(p Point, l int) bool { + c.RegMarkLen(l) c.Send("TB99") c.Send("TB55,1") c.Send("TB23,", p) diff --git a/main.go b/main.go index bb2e8a4..19594fa 100644 --- a/main.go +++ b/main.go @@ -1,5 +1,7 @@ package main +import "fmt" + func main() { dev := NewDevice() defer dev.Close() @@ -13,8 +15,8 @@ func main() { //c.TestCut() //c.TestPattern() //c.EasterEgg() - //c.DrawMarks() - //c.Move(Point{300, 300}) - //c.SearchMarks() + //c.DrawMarks(Point{}, Point{}, 0) + //c.WriteUpperRight(Point{4000,5440}) + fmt.Println(c.SearchMarks(Point{5240, 3800}, 400)) //c.Bezier(1, Point{0,0},Point{0,1000},Point{0,0},Point{1000,0}) } diff --git a/marks.go b/marks.go index cd90baf..b2a891a 100644 --- a/marks.go +++ b/marks.go @@ -35,7 +35,7 @@ package main +- -+ */ -func (c Cutter) DrawMarks(offset, size Point) (string, error) { +func (c Cutter) DrawMarks(offset, size Point, length int) { c.Move(Point{600, 3800}) c.Draw(Point{200, 3800}) c.Draw(Point{200, 3400}) @@ -47,6 +47,4 @@ func (c Cutter) DrawMarks(offset, size Point) (string, error) { c.Move(Point{4840, 200}) c.Draw(Point{5240, 200}) c.Draw(Point{5240, 600}) - - return c.readResponse() } diff --git a/usb.go b/usb.go index 75e9356..a935810 100644 --- a/usb.go +++ b/usb.go @@ -25,8 +25,8 @@ var ( func init() { // bump timeouts to one minute - usb.DefaultReadTimeout *= 10 - usb.DefaultWriteTimeout *= 10 + usb.DefaultReadTimeout *= 60 + usb.DefaultWriteTimeout *= 60 } func CC100(desc *usb.Descriptor) bool { -- cgit v1.2.3