epd2in66b: review feedback

Makefile

@@ -19,7 +19,7 @@ rwildcard=$(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst
 # Recursively find all *_test.go files from cwd & reduce to unique dir names
 HAS_TESTS = $(sort $(dir $(call rwildcard,,*_test.go)))
 # Exclude anything we explicitly don't want to test for whatever reason
-EXCLUDE_TESTS = image
+EXCLUDE_TESTS = image waveshare-epd/epd2in66b
 TESTS = $(filter-out $(addsuffix /%,$(EXCLUDE_TESTS)),$(HAS_TESTS))
 
 unit-test:

smoketest.sh

@@ -80,7 +80,7 @@ tinygo build -size short -o ./build/test.hex -target=itsybitsy-m0 ./examples/vl6
 tinygo build -size short -o ./build/test.hex -target=microbit ./examples/waveshare-epd/epd2in13/main.go
 tinygo build -size short -o ./build/test.hex -target=microbit ./examples/waveshare-epd/epd2in13x/main.go
 tinygo build -size short -o ./build/test.hex -target=microbit ./examples/waveshare-epd/epd4in2/main.go
-tinygo build -size short -o ./build/test.hex -target=pico ./examples/waveshare-epd/epd4in66b/main.go
+tinygo build -size short -o ./build/test.hex -target=pico ./examples/waveshare-epd/epd2in66b/main.go
 tinygo build -size short -o ./build/test.hex -target=circuitplay-express ./examples/ws2812
 tinygo build -size short -o ./build/test.bin -target=m5stamp-c3          ./examples/ws2812
 tinygo build -size short -o ./build/test.hex -target=feather-nrf52840 ./examples/is31fl3731/main.go

waveshare-epd/epd2in66b/dev.go

@@ -12,17 +12,17 @@ import (
 )
 
 const (
-	width  = 152
-	height = 296
+	displayWidth  = 152
+	displayHeight = 296
 
 	// using numerical values to enable generic tinygo compilation
-	rstPin  = 12
 	dcPin   = 8
 	csPin   = 9
+	rstPin  = 12
 	busyPin = 13
 )
 
-const Baudrate = 4 * machine.MHz
+const Baudrate = 4_000_000 // 4 MHz
 
 type Config struct {
 	ResetPin      machine.Pin
@@ -38,32 +38,23 @@ type Device struct {
 	rst  machine.Pin
 	busy machine.Pin
 
-	width  int16
-	height int16
-
 	blackBuffer []byte
 	redBuffer   []byte
 }
 
 // New allocates a new device. The SPI for the built-in header to be used is picos machine.SPI1 at 4 MHz baudrate.
 // The bus is expected to be configured and ready for use.
 func New(bus drivers.SPI) Device {
-	pixelCount := width * height
-	if pixelCount%8 != 0 {
-		// defend against copy & pasta foot-guns
-		panic("pixel count expected to be a multiple of 8")
-	}
+	pixelCount := displayWidth * displayHeight
 
 	bufLen := pixelCount / 8
 
 	return Device{
-		bus:    bus,
-		cs:     csPin,
-		dc:     dcPin,
-		rst:    rstPin,
-		busy:   busyPin,
-		height: height,
-		width:  width,
+		bus:  bus,
+		cs:   csPin,
+		dc:   dcPin,
+		rst:  rstPin,
+		busy: busyPin,
 
 		blackBuffer: make([]byte, bufLen),
 		redBuffer:   make([]byte, bufLen),
@@ -103,7 +94,7 @@ func (d *Device) Configure(c Config) error {
 }
 
 func (d *Device) Size() (x, y int16) {
-	return d.width, d.height
+	return displayWidth, displayHeight
 }
 
 // SetPixel modifies the internal buffer in a single pixel.
@@ -113,30 +104,30 @@ func (d *Device) Size() (x, y int16) {
 // - red = RGBA(1-255,0,0,1-255)
 // - Anything else as black
 func (d *Device) SetPixel(x int16, y int16, c color.RGBA) {
-	if x < 0 || x >= d.width || y < 0 || y >= d.height {
+	if x < 0 || x >= displayWidth || y < 0 || y >= displayHeight {
 		return
 	}
 
-	bytePos, bitPos := pos(x, y, d.width)
+	bytePos, bitPos := pos(x, y, displayWidth)
 
 	if c.R == 0xff && c.G == 0xff && c.B == 0xff && c.A > 0 { // white
-		set(d.blackBuffer, bytePos, bitPos, true)
-		set(d.redBuffer, bytePos, bitPos, false)
+		set(d.blackBuffer, bytePos, bitPos)
+		unset(d.redBuffer, bytePos, bitPos)
 	} else if c.R != 0 && c.G == 0 && c.B == 0 && c.A > 0 { // red-ish
-		set(d.blackBuffer, bytePos, bitPos, true)
-		set(d.redBuffer, bytePos, bitPos, true)
+		set(d.blackBuffer, bytePos, bitPos)
+		set(d.redBuffer, bytePos, bitPos)
 	} else { // black or other
-		set(d.blackBuffer, bytePos, bitPos, false)
-		set(d.redBuffer, bytePos, bitPos, false)
+		unset(d.blackBuffer, bytePos, bitPos)
+		unset(d.redBuffer, bytePos, bitPos)
 	}
 }
 
-func set(buf []byte, bytePos, bitPos int, v bool) {
-	if v {
-		buf[bytePos] |= 0x1 << bitPos
-	} else {
-		buf[bytePos] &^= 0x1 << bitPos
-	}
+func set(buf []byte, bytePos, bitPos int) {
+	buf[bytePos] |= 0x1 << bitPos
+}
+
+func unset(buf []byte, bytePos, bitPos int) {
+	buf[bytePos] &^= 0x1 << bitPos
 }
 
 func pos(x, y, stride int16) (bytePos int, bitPos int) {
@@ -204,7 +195,7 @@ func (d *Device) Reset() error {
 		return err
 	}
 
-	if err := d.setWindow(0, d.width-1, 0, d.height-1); err != nil {
+	if err := d.setWindow(0, displayWidth-1, 0, displayHeight-1); err != nil {
 		return err
 	}
 

waveshare-epd/epd2in66b/dev_test.go

@@ -51,7 +51,7 @@ func toImage(dev *Device) *image.RGBA {
 	for x := 0; x < int(xMax); x++ {
 		for y := 0; y < int(yMax); y++ {
 
-			bytePos, bitPos := pos(int16(x), int16(y), dev.width)
+			bytePos, bitPos := pos(int16(x), int16(y), displayWidth)
 
 			if isSet(dev.redBuffer, bytePos, bitPos) {
 				container.Set(x, y, red)