aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2016-09-24 03:01:12 +0200
committerDimitri Sokolyuk <demon@dim13.org>2016-09-24 03:01:12 +0200
commit21aee3dfe51e4e1b3310c1d2068f7ebd1aafd50b (patch)
tree8bf51fa1ab6626fea62d7c6ce0fd5f6f1de24fe0
parent23bc3d8109537b4e2684610426f30c0be353b95f (diff)
Return err with NewDevice
-rw-r--r--cmd/drawtext/main.go6
-rw-r--r--cmd/testpattern/main.go11
-rw-r--r--cmd/version/main.go6
-rw-r--r--device_darwin.go13
-rw-r--r--device_linux.go10
-rw-r--r--device_openbsd.go10
-rw-r--r--lp.go4
-rw-r--r--media.go18
-rw-r--r--plot.go4
9 files changed, 39 insertions, 43 deletions
diff --git a/cmd/drawtext/main.go b/cmd/drawtext/main.go
index 5f02e5d..251cd7a 100644
--- a/cmd/drawtext/main.go
+++ b/cmd/drawtext/main.go
@@ -2,6 +2,7 @@ package main
import (
"flag"
+ "log"
"os"
"dim13.org/robo"
@@ -12,7 +13,10 @@ var scale = flag.Float64("scale", 1.0, "font scale")
func main() {
flag.Parse()
- dev := robo.NewDevice()
+ dev, err := robo.NewDevice()
+ if err != nil {
+ log.Fatal(err)
+ }
defer dev.Close()
handle := dev.Handle()
diff --git a/cmd/testpattern/main.go b/cmd/testpattern/main.go
index 26e5a24..accbe6e 100644
--- a/cmd/testpattern/main.go
+++ b/cmd/testpattern/main.go
@@ -1,9 +1,16 @@
package main
-import "dim13.org/robo"
+import (
+ "log"
+
+ "dim13.org/robo"
+)
func main() {
- dev := robo.NewDevice()
+ dev, err := robo.NewDevice()
+ if err != nil {
+ log.Fatal(err)
+ }
defer dev.Close()
handle := dev.Handle()
diff --git a/cmd/version/main.go b/cmd/version/main.go
index b68f02e..aa88689 100644
--- a/cmd/version/main.go
+++ b/cmd/version/main.go
@@ -2,12 +2,16 @@ package main
import (
"fmt"
+ "log"
"dim13.org/robo"
)
func main() {
- dev := robo.NewDevice()
+ dev, err := robo.NewDevice()
+ if err != nil {
+ log.Fatal(err)
+ }
defer dev.Close()
fmt.Println(robo.Version(dev))
}
diff --git a/device_darwin.go b/device_darwin.go
index 3eb6ae1..4df22d6 100644
--- a/device_darwin.go
+++ b/device_darwin.go
@@ -1,14 +1,5 @@
package robo
-import (
- "io"
- "log"
-)
-
-func NewDevice() io.ReadWriteCloser {
- dev, err := NewUSB()
- if err != nil {
- log.Fatal(err)
- }
- return dev
+func NewDevice() (Device, error) {
+ return NewUSB()
}
diff --git a/device_linux.go b/device_linux.go
index 912e34d..f6b2c6e 100644
--- a/device_linux.go
+++ b/device_linux.go
@@ -1,11 +1,5 @@
package robo
-import "log"
-
-func NewDevice() Device {
- dev, err := NewLP("/dev/usb/lp0")
- if err != nil {
- log.Fatal(err)
- }
- return dev
+func NewDevice() (Device, error) {
+ return NewLP("/dev/usb/lp0")
}
diff --git a/device_openbsd.go b/device_openbsd.go
index 40ddf95..b33b19e 100644
--- a/device_openbsd.go
+++ b/device_openbsd.go
@@ -1,12 +1,6 @@
// note: ulpt* doesn't support read(), thus this dev is broken atm.
package robo
-import "log"
-
-func NewDevice() Device {
- dev, err := NewLP("/dev/ulpt0")
- if err != nil {
- log.Fatal(err)
- }
- return dev
+func NewDevice() (Device, error) {
+ return NewLP("/dev/ulpt0")
}
diff --git a/lp.go b/lp.go
index aee2d23..b10ba2a 100644
--- a/lp.go
+++ b/lp.go
@@ -15,8 +15,8 @@ func NewLP(path string) (LP, error) {
return LP{f}, err
}
-func (d LP) Close() {
- d.File.Close()
+func (d LP) Close() error {
+ return d.File.Close()
}
func (d LP) SetNonblock() {
diff --git a/media.go b/media.go
index e55f75a..d30481f 100644
--- a/media.go
+++ b/media.go
@@ -36,63 +36,63 @@ func (m Media) Apply(c *bufio.Writer) {
}
var Medias = []Media{
- Media{
+ {
Descr: "Card without Craft Paper Backing",
ID: 100,
Speed: 10,
Force: 27,
Overcut: 18,
},
- Media{
+ {
Descr: "Card with Craft Paper Backing",
ID: 101,
Speed: 10,
Force: 27,
Overcut: 18,
},
- Media{
+ {
Descr: "Vinyl Sticker",
ID: 102,
Speed: 10,
Force: 10,
Overcut: 18,
},
- Media{
+ {
Descr: "Film Labels",
ID: 106,
Speed: 10,
Force: 14,
Overcut: 18,
},
- Media{
+ {
Descr: "Magnetic Sheet",
ID: 107,
Speed: 10,
Force: 12,
Overcut: 18,
},
- Media{
+ {
Descr: "Thick Media",
ID: 111,
Speed: 10,
Force: 27,
Overcut: 18,
},
- Media{
+ {
Descr: "Thin Media",
ID: 112,
Speed: 10,
Force: 2,
Overcut: 18,
},
- Media{
+ {
Descr: "Pen",
ID: 113,
Speed: 10,
Force: 10,
Overcut: 0,
},
- Media{
+ {
Descr: "Custom",
ID: 300,
Speed: 10,
diff --git a/plot.go b/plot.go
index 4259eed..e0c778b 100644
--- a/plot.go
+++ b/plot.go
@@ -5,7 +5,9 @@ type Plotter interface {
}
type Line []Point
-type Berzier [4]Point
+type Bezier [4]Point
+type Circle [3]Point
func (v Line) Draw() []byte { return nil } // MDDDD...
func (v Bezier) Draw() []byte { return nil } // BZ...
+func (v Circle) Draw() []byte { return nil } // W...