aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2015-05-12 20:07:45 +0200
committerDimitri Sokolyuk <demon@dim13.org>2015-05-12 20:07:45 +0200
commit810b19c2e08dee90755f76dd0adedc7a950bd486 (patch)
tree1e365cfdf08cddbbe7325cbdd9ae8d3a05c444f4
parentcf79b796e59bbd8f45824ab164c751e753967f10 (diff)
Add initial pen position
-rw-r--r--cutter.go15
-rw-r--r--pen.go25
2 files changed, 11 insertions, 29 deletions
diff --git a/cutter.go b/cutter.go
index 4a5b2c1..87be6ee 100644
--- a/cutter.go
+++ b/cutter.go
@@ -404,7 +404,14 @@ func (c Cutter) ManualSearchMarks(p Point) bool {
return c.returnUnit() == 0
}
-func (c Cutter) Curve(a int, pts ...Point) {
+type PenPosition int
+
+const (
+ PenUp = iota
+ PenDown
+)
+
+func (c Cutter) Curve(a PenPosition, pts ...Point) {
c.Add("Y", a, ",")
for _, p := range pts {
c.Add(p, ",")
@@ -412,7 +419,7 @@ func (c Cutter) Curve(a int, pts ...Point) {
c.EOT()
}
-func (c Cutter) CurveRelative(a int, pts ...Point) {
+func (c Cutter) CurveRelative(a PenPosition, pts ...Point) {
c.Add("_", a, ",")
for _, p := range pts {
c.Add(p, ",")
@@ -435,12 +442,12 @@ func (c Cutter) Circle3P(p1, p2, p3 Point) {
c.Send("WP", p1, ",", p2, ",", p3)
}
-func (c Cutter) Ellipse(a int, p Point, start, end Polar, theta Unit) {
+func (c Cutter) Ellipse(a PenPosition, p Point, start, end Polar, theta Unit) {
c.Send(")", a, ",", p, ",", start.R, ",", end.R, ",",
start.Theta, ",", end.Theta, ",", theta)
}
-func (c Cutter) Bezier(a int, p0, p1, p2, p3 Point) {
+func (c Cutter) Bezier(a PenPosition, p0, p1, p2, p3 Point) {
c.Send("BZ", a, ",", p0, ",", p1, ",", p2, ",", p3)
}
diff --git a/pen.go b/pen.go
deleted file mode 100644
index 6bcc02b..0000000
--- a/pen.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package main
-
-type Pen struct {
- Speed int
- Force int
- Cap string
-}
-
-var pens = map[string]Pen{
- "pen": Pen{
- Speed: 10,
- Force: 10,
- Cap: "pen",
- },
- "thin": Pen{
- Speed: 10,
- Force: 2,
- Cap: "blue",
- },
- "thick": Pen{
- Speed: 10,
- Force: 27,
- Cap: "yellow",
- },
-}