From 045d7efb7ddaf3ae05b6c4b51191abac31a96a8f Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Thu, 23 Apr 2015 21:19:40 +0200 Subject: Fix spelling --- cutter.go | 17 +++++++--- media.go | 107 +++++++++++++++++++++++++++++++++----------------------------- 2 files changed, 70 insertions(+), 54 deletions(-) diff --git a/cutter.go b/cutter.go index 9527ad7..9fe5d6a 100644 --- a/cutter.go +++ b/cutter.go @@ -167,14 +167,23 @@ func (c Cutter) ReadUpperRight() (string, error) { return c.readResponse() } +// Speed 10..100 mm/s func (c Cutter) Speed(n int) { - defer c.EOT() - fmt.Fprint(c, "!", n) + if n >= 1 && n <= 10 { + defer c.EOT() + fmt.Fprint(c, "!", n) + } +} + +func (c Cutter) Thickness(n int) { + if n >= 1 && n <= 30 { + defer c.EOT() + fmt.Fprint(c, "FX", n) + } } func (c Cutter) Force(n int) { - defer c.EOT() - fmt.Fprint(c, "FX", n) + c.Thickness(n) } func (c Cutter) Initialize() { diff --git a/media.go b/media.go index 711b875..54df659 100644 --- a/media.go +++ b/media.go @@ -1,75 +1,82 @@ package main +import "fmt" + type Media struct { - Descr string // Description - ID int // FW111 - Speed int // !10 - Thicknes int // FX10,0 - FC int // FC ? + Descr string // Description + ID int // FW111 + Speed int // !10 + Thickness int // FX10,0 + FC int // FC ? +} + +func (m Media) String() string { + return fmt.Sprintf("%v: Speed %2d, Thickness %2d %s", + m.ID, m.Speed, m.Thickness, m.Descr) } var Medias = []Media{ Media{ - Descr: "Card without Craft Paper Backing", - ID: 100, - Speed: 10, - Thicknes: 27, - FC: 18, + Descr: "Card without Craft Paper Backing", + ID: 100, + Speed: 10, + Thickness: 27, + FC: 18, }, Media{ - Descr: "Card with Craft Paper Backing", - ID: 101, - Speed: 10, - Thicknes: 27, - FC: 18, + Descr: "Card with Craft Paper Backing", + ID: 101, + Speed: 10, + Thickness: 27, + FC: 18, }, Media{ - Descr: "Vinyl Sticker", - ID: 102, - Speed: 10, - Thicknes: 10, - FC: 18, + Descr: "Vinyl Sticker", + ID: 102, + Speed: 10, + Thickness: 10, + FC: 18, }, Media{ - Descr: "Film Labels", - ID: 106, - Speed: 10, - Thicknes: 14, - FC: 18, + Descr: "Film Labels", + ID: 106, + Speed: 10, + Thickness: 14, + FC: 18, }, Media{ - Descr: "Magnetic Sheet", - ID: 107, - Speed: 10, - Thicknes: 12, - FC: 18, + Descr: "Magnetic Sheet", + ID: 107, + Speed: 10, + Thickness: 12, + FC: 18, }, Media{ - Descr: "Thick Media", - ID: 111, - Speed: 10, - Thicknes: 27, - FC: 18, + Descr: "Thick Media", + ID: 111, + Speed: 10, + Thickness: 27, + FC: 18, }, Media{ - Descr: "Thin Media", - ID: 112, - Speed: 10, - Thicknes: 2, - FC: 18, + Descr: "Thin Media", + ID: 112, + Speed: 10, + Thickness: 2, + FC: 18, }, Media{ - Descr: "Pen", - ID: 113, - Speed: 10, - Thicknes: 10, - FC: 0, + Descr: "Pen", + ID: 113, + Speed: 10, + Thickness: 10, + FC: 0, }, Media{ - Descr: "Custom", - ID: 300, - Speed: 10, - Thicknes: 10, - FC: 18, + Descr: "Custom", + ID: 300, + Speed: 10, + Thickness: 10, + FC: 18, }, } -- cgit v1.2.3