aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2015-05-12 15:31:15 +0200
committerDimitri Sokolyuk <demon@dim13.org>2015-05-12 15:31:15 +0200
commit8ece448ad141f460aa9bdff0c37dfe4dba0e2d1a (patch)
tree8efc4638d9ed4794a7cf0b0e5dea55e9c9f91bb7
parentb89a07c5efff1b491560209d154f1ba57c297acd (diff)
Try to add Type1 marks
-rw-r--r--cutter.go12
-rw-r--r--main.go2
-rw-r--r--misc.go4
3 files changed, 13 insertions, 5 deletions
diff --git a/cutter.go b/cutter.go
index 471c702..16b35cc 100644
--- a/cutter.go
+++ b/cutter.go
@@ -359,9 +359,17 @@ func (c Cutter) TrackEnhancing(state OnOff) {
c.Send("FY", state)
}
-func (c Cutter) SearchMarks(p Point) bool {
+type MarksType int
+
+// probably wrong
+const (
+ Type1 MarksType = iota
+ Type2
+)
+
+func (c Cutter) SearchMarks(p Point, typ MarksType) bool {
c.Send("TB99")
- c.Send("TB55,1")
+ c.Send("TB55,", typ)
c.Send("TB123,", p)
return c.returnUnit() == 0
}
diff --git a/main.go b/main.go
index a93f8a6..c3e54ec 100644
--- a/main.go
+++ b/main.go
@@ -44,7 +44,7 @@ func main() {
//fmt.Println("Gin", c.Gin())
//fmt.Println("Call Gin", c.CallGin())
- //c.MustMarks(Point{19 * CM, 18 * CM})
+ c.MustMarks(Point{18 * CM, 19 * CM}, Type2)
if *cmd != "" {
c.Send(*cmd)
log.Println(c.returnString())
diff --git a/misc.go b/misc.go
index c320bc0..9b756c2 100644
--- a/misc.go
+++ b/misc.go
@@ -27,8 +27,8 @@ func (c Cutter) DrawCircles() {
}
}
-func (c Cutter) MustMarks(p Point) {
- if !c.SearchMarks(p) {
+func (c Cutter) MustMarks(p Point, typ MarksType) {
+ if !c.SearchMarks(p, typ) {
log.Fatal("marks not found")
}
}