aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2018-01-03 01:07:02 +0100
committerDimitri Sokolyuk <demon@dim13.org>2018-01-03 01:07:02 +0100
commit670f94252c2f0bb66ebb025a726ef51f8c1fc59f (patch)
tree2971bfbc3325a51269d6634b250998821532d481
parent16df0bea5fe8ce0a4ea871d409f589b298567a97 (diff)
...
-rw-r--r--cmd/testpattern/main.go12
-rw-r--r--media.go4
-rw-r--r--plot.go22
3 files changed, 30 insertions, 8 deletions
diff --git a/cmd/testpattern/main.go b/cmd/testpattern/main.go
index fee97bc..1bdae5c 100644
--- a/cmd/testpattern/main.go
+++ b/cmd/testpattern/main.go
@@ -7,16 +7,14 @@ import (
)
func main() {
- dev, err := robo.Open()
+ dev, err := robo.NewRobo()
if err != nil {
log.Fatal(err)
}
defer dev.Close()
+ defer dev.Home()
- handle := dev.Handle()
- defer robo.Home(handle.Writer)
-
- robo.Initialize(handle, 113, robo.Portrait)
- robo.A4.UpperRight(handle.Writer)
- robo.TestPattern(handle.Writer)
+ dev.Initialize(robo.MediaPen, robo.Portrait)
+ dev.UpperRight(robo.A4)
+ //dev.TestPattern(handle.Writer)
}
diff --git a/media.go b/media.go
index 6576e7b..235faee 100644
--- a/media.go
+++ b/media.go
@@ -10,6 +10,10 @@ type Media struct {
Overcut Unit // FC ?
}
+func (m Media) String() string {
+ return m.Descr
+}
+
func (r Robo) SetMedia(m Media) {
r.Media(m.ID)
r.Speed(m.Speed)
diff --git a/plot.go b/plot.go
index 4eb22f6..75bfccb 100644
--- a/plot.go
+++ b/plot.go
@@ -103,7 +103,6 @@ func (r Robo) Offset(p Point) { r.Printf("^%v", p) }
func (r Robo) LowerLeft(p Point) { r.Printf("\\%v", p) }
func (r Robo) UpperRight(p Point) { r.Printf("Z%v", p) }
func (r Robo) CuttingArea(p Point) { r.Printf("FU%v", p) }
-func (r Robo) Calibration(p Point) { r.Printf("TB72,%v", p) }
func (r Robo) Move(p Point) { r.Printf("M%v", p) }
func (r Robo) MoveRelative(p Point) { r.Printf("O%v", p) }
func (r Robo) Draw(p ...Point) { r.Printf("D%v", Path(p)) }
@@ -129,3 +128,24 @@ func (r Robo) TrackEnhancing(u Unit) { r.Printf("FY%v", u) }
func (r Robo) RegMarkLen(u Unit) { r.Printf("TB51,%v", u) }
func (r Robo) Orientation(o Orientation) { r.Printf("FN%d", o) }
+
+func (r Robo) Initialize(m Media, o Orientation) {
+ r.Init()
+ if !r.Ready() {
+ fmt.Println("not ready")
+ }
+ r.GoHome()
+
+ // Print version
+ // fmt.Println("Craft ROBO Ver.", r.Version())
+
+ r.SetMedia(m)
+ r.TrackEnhancing(Unit(0))
+ r.UnknownFE(Unit(0))
+
+ // Print calibration
+ // Print distance correction
+
+ r.RegMarkLen(Unit(400))
+ r.Orientation(o)
+}