From 1f4a49516e16a0e9c1e303f76317f5cf3eaea001 Mon Sep 17 00:00:00 2001
From: David Sansome <me@davidsansome.com>
Date: Sun, 5 Jan 2020 01:29:45 +1100
Subject: [PATCH] inky: Minor cleanups: (#431)

* Use maxTxSize from conn.Limits
* Show an error instead of crashing on invalid pin names
---
 experimental/devices/inky/inky.go | 45 +++++++++++++++++++------------
 1 file changed, 28 insertions(+), 17 deletions(-)

diff --git a/experimental/devices/inky/inky.go b/experimental/devices/inky/inky.go
index 24eec3c..64b3320 100644
--- a/experimental/devices/inky/inky.go
+++ b/experimental/devices/inky/inky.go
@@ -41,7 +41,7 @@ func (c *Color) String() string {
 	case White:
 		return "white"
 	default:
-		return "Unknown"
+		return "unknown"
 	}
 }
 
@@ -49,13 +49,13 @@ func (c *Color) String() string {
 func (c *Color) Set(s string) error {
 	switch s {
 	case "black":
-		*c = (Color)(Black)
+		*c = Black
 	case "red":
-		*c = (Color)(Red)
+		*c = Red
 	case "yellow":
-		*c = (Color)(Yellow)
+		*c = Yellow
 	case "white":
-		*c = (Color)(White)
+		*c = White
 	default:
 		return fmt.Errorf("Unknown color %q: expected either black, red, yellow or white", s)
 	}
@@ -86,9 +86,9 @@ func (m *Model) String() string {
 func (m *Model) Set(s string) error {
 	switch s {
 	case "PHAT":
-		*m = (Model)(PHAT)
+		*m = PHAT
 	case "WHAT":
-		*m = (Model)(WHAT)
+		*m = WHAT
 	default:
 		return fmt.Errorf("Unknown model %q: expected either PHAT or WHAT", s)
 	}
@@ -106,8 +106,6 @@ type Opts struct {
 	BorderColor Color
 }
 
-const spiChunkSize = 4096
-
 var borderColor = map[Color]byte{
 	Black:  0x00,
 	Red:    0x73,
@@ -126,13 +124,24 @@ func New(p spi.Port, dc gpio.PinOut, reset gpio.PinOut, busy gpio.PinIn, o *Opts
 		return nil, fmt.Errorf("failed to connect to inky over spi: %v", err)
 	}
 
+	// Get the maxTxSize from the conn if it implements the conn.Limits interface,
+	// otherwise use 4096 bytes.
+	maxTxSize := 0
+	if limits, ok := c.(conn.Limits); ok {
+		maxTxSize = limits.MaxTxSize()
+	}
+	if maxTxSize == 0 {
+		maxTxSize = 4096 // Use a conservative default.
+	}
+
 	d := &Dev{
-		c:      c,
-		dc:     dc,
-		r:      reset,
-		busy:   busy,
-		color:  o.ModelColor,
-		border: o.BorderColor,
+		c:         c,
+		maxTxSize: maxTxSize,
+		dc:        dc,
+		r:         reset,
+		busy:      busy,
+		color:     o.ModelColor,
+		border:    o.BorderColor,
 	}
 
 	switch o.Model {
@@ -149,6 +158,8 @@ func New(p spi.Port, dc gpio.PinOut, reset gpio.PinOut, busy gpio.PinIn, o *Opts
 // Dev is a handle to an Inky.
 type Dev struct {
 	c conn.Conn
+	// Maximum number of bytes allowed to be sent as a single I/O on c.
+	maxTxSize int
 	// Low when sending a command, high when sending data.
 	dc gpio.PinOut
 	// Reset pin, active low.
@@ -383,8 +394,8 @@ func (d *Dev) sendData(data []byte) error {
 	}
 	for len(data) != 0 {
 		var chunk []byte
-		if len(data) > spiChunkSize {
-			chunk, data = data[:spiChunkSize], data[spiChunkSize:]
+		if len(data) > d.maxTxSize {
+			chunk, data = data[:d.maxTxSize], data[d.maxTxSize:]
 		} else {
 			chunk, data = data, nil
 		}