microbitmatrix: harmonize v1 and v2 implementation

microbitmatrix/microbitmatrix-v2.go

@@ -8,50 +8,55 @@ package microbitmatrix // import "tinygo.org/x/drivers/microbitmatrix"
 
 import (
 	"machine"
-	"time"
 )
 
+// 4 rotation orientations (0, 90, 180, 270), CW (clock wise)
+// 5 rows
+// 5 cols
+// target coordinates in machine rows (y) and cols (x)
 var matrixRotations = [4][5][5][2]uint8{
 	{ // 0
-		{{0, 0}, {1, 0}, {2, 0}, {3, 0}, {4, 0}},
-		{{0, 1}, {1, 1}, {2, 1}, {3, 1}, {4, 1}},
-		{{0, 2}, {1, 2}, {2, 2}, {3, 2}, {4, 2}},
-		{{0, 3}, {1, 3}, {2, 3}, {3, 3}, {4, 3}},
-		{{0, 4}, {1, 4}, {2, 4}, {3, 4}, {4, 4}},
-	},
-	{ // 90 CCW
-		{{4, 0}, {4, 1}, {4, 2}, {4, 3}, {4, 4}},
-		{{3, 0}, {3, 1}, {3, 2}, {3, 3}, {3, 4}},
-		{{2, 0}, {2, 1}, {2, 2}, {2, 3}, {2, 4}},
-		{{1, 0}, {1, 1}, {1, 2}, {1, 3}, {1, 4}},
 		{{0, 0}, {0, 1}, {0, 2}, {0, 3}, {0, 4}},
+		{{1, 0}, {1, 1}, {1, 2}, {1, 3}, {1, 4}},
+		{{2, 0}, {2, 1}, {2, 2}, {2, 3}, {2, 4}},
+		{{3, 0}, {3, 1}, {3, 2}, {3, 3}, {3, 4}},
+		{{4, 0}, {4, 1}, {4, 2}, {4, 3}, {4, 4}},
+	},
+	{ // 90 CW
+		{{0, 4}, {1, 4}, {2, 4}, {3, 4}, {4, 4}},
+		{{0, 3}, {1, 3}, {2, 3}, {3, 3}, {4, 3}},
+		{{0, 2}, {1, 2}, {2, 2}, {3, 2}, {4, 2}},
+		{{0, 1}, {1, 1}, {2, 1}, {3, 1}, {4, 1}},
+		{{0, 0}, {1, 0}, {2, 0}, {3, 0}, {4, 0}},
 	},
 	{ // 180
-		{{4, 4}, {3, 4}, {2, 4}, {1, 4}, {0, 4}},
-		{{4, 3}, {3, 3}, {2, 3}, {1, 3}, {0, 3}},
-		{{4, 2}, {3, 2}, {2, 2}, {1, 2}, {0, 2}},
-		{{4, 1}, {3, 1}, {2, 1}, {1, 1}, {0, 1}},
-		{{4, 0}, {3, 0}, {2, 0}, {1, 0}, {0, 0}},
+		{{4, 4}, {4, 3}, {4, 2}, {4, 1}, {4, 0}},
+		{{3, 4}, {3, 3}, {3, 2}, {3, 1}, {3, 0}},
+		{{2, 4}, {2, 3}, {2, 2}, {2, 1}, {2, 0}},
+		{{1, 4}, {1, 3}, {1, 2}, {1, 1}, {1, 0}},
+		{{0, 4}, {0, 3}, {0, 2}, {0, 1}, {0, 0}},
 	},
 	{ // 270
-		{{0, 4}, {0, 3}, {0, 2}, {0, 1}, {0, 0}},
-		{{1, 4}, {1, 3}, {1, 2}, {1, 1}, {1, 0}},
-		{{2, 4}, {2, 3}, {2, 2}, {2, 1}, {2, 0}},
-		{{3, 4}, {3, 3}, {3, 2}, {3, 1}, {3, 0}},
-		{{4, 4}, {4, 3}, {4, 2}, {4, 1}, {4, 0}},
+		{{4, 0}, {3, 0}, {2, 0}, {1, 0}, {0, 0}},
+		{{4, 1}, {3, 1}, {2, 1}, {1, 1}, {0, 1}},
+		{{4, 2}, {3, 2}, {2, 2}, {1, 2}, {0, 2}},
+		{{4, 3}, {3, 3}, {2, 3}, {1, 3}, {0, 3}},
+		{{4, 4}, {3, 4}, {2, 4}, {1, 4}, {0, 4}},
 	},
 }
 
+const (
+	ledRows = 5
+	ledCols = 5
+)
+
 type Device struct {
-	pin      [10]machine.Pin
-	buffer   [5][5]bool
+	pin      [ledCols + ledRows]machine.Pin
+	buffer   [ledRows][ledCols]bool
 	rotation uint8
 }
 
-// Configure sets up the device.
-func (d *Device) Configure(cfg Config) {
-	d.SetRotation(cfg.Rotation)
-
+func (d *Device) assignPins() {
 	d.pin[0] = machine.LED_COL_1
 	d.pin[1] = machine.LED_COL_2
 	d.pin[2] = machine.LED_COL_3
@@ -64,53 +69,7 @@ func (d *Device) Configure(cfg Config) {
 	d.pin[8] = machine.LED_ROW_4
 	d.pin[9] = machine.LED_ROW_5
 
-	for i := 0; i < 10; i++ {
+	for i := 0; i < len(d.pin); i++ {
 		d.pin[i].Configure(machine.PinConfig{Mode: machine.PinOutput})
 	}
-
-	d.ClearDisplay()
-	d.DisableAll()
-}
-
-// Display sends the buffer (if any) to the screen.
-func (d *Device) Display() error {
-	for x := 0; x < 5; x++ {
-		d.DisableAll()
-		d.pin[x].Low()
-
-		for y := 0; y < 5; y++ {
-			if d.buffer[x][y] {
-				d.pin[5+y].High()
-			} else {
-				d.pin[5+y].Low()
-			}
-		}
-		time.Sleep(time.Millisecond * 4)
-	}
-	return nil
-}
-
-// ClearDisplay erases the internal buffer
-func (d *Device) ClearDisplay() {
-	for row := 0; row < 5; row++ {
-		for col := 0; col < 5; col++ {
-			d.buffer[row][col] = false
-		}
-	}
-}
-
-// DisableAll disables all the LEDs without modifying the buffer
-func (d *Device) DisableAll() {
-	for i := 0; i < 5; i++ {
-		d.pin[i].High()
-		d.pin[5+i].Low()
-	}
-}
-
-// EnableAll enables all the LEDs without modifying the buffer
-func (d *Device) EnableAll() {
-	for i := 0; i < 5; i++ {
-		d.pin[i].Low()
-		d.pin[5+i].High()
-	}
 }