UI basics working.

Author: litui

config/config.go renamed to config/main.go

@@ -2,13 +2,50 @@ package config
 
 import "machine"
 
+// MIDI config
+const (
+	PIN_MIDI_TX = machine.UART0_TX_PIN
+	PIN_MIDI_RX = machine.UART0_RX_PIN
+)
+
+var (
+	MIDI_UART = machine.UART0
+)
+
+// Display & I2C config
 const (
 	PIN_I2C_SDA = machine.GP26
 	PIN_I2C_SCL = machine.GP27
 
-	PIN_MIDI_TX = machine.UART0_TX_PIN
-	PIN_MIDI_RX = machine.UART0_RX_PIN
+	DISPLAY_WIDTH       = 128
+	DISPLAY_HEIGHT      = 32
+	DISPLAY_I2C_ADDRESS = 0x3c
 
+	EXPANDER_I2C_ADDRESS = 0x20
+
+	// The following are pins on the i2c expander
+	ENCODER1_PIN1   = 3
+	ENCODER1_PIN2   = 4
+	ENCODER1_BUTTON = 5
+	ENCODER2_PIN1   = 0
+	ENCODER2_PIN2   = 1
+	ENCODER2_BUTTON = 2
+	ENCODER3_PIN1   = 11
+	ENCODER3_PIN2   = 12
+	ENCODER3_BUTTON = 13
+	ENCODER4_PIN1   = 8
+	ENCODER4_PIN2   = 9
+	ENCODER4_BUTTON = 10
+)
+
+var (
+	MAIN_I2C = machine.I2C1
+
+	ENCODER_OFFSETS = [4]int{ENCODER1_PIN1, ENCODER2_PIN1, ENCODER3_PIN1, ENCODER4_PIN1}
+)
+
+// SID config
+const (
 	PIN_SID_RW   = machine.GP18
 	PIN_SID_PHI2 = machine.GP28
 
@@ -20,9 +57,6 @@ const (
 )
 
 var (
-	MAIN_I2C  = machine.I2C1
-	MIDI_UART = machine.UART0
-
 	// Pin 28 is PWM6
 	SID_PWM = machine.PWM6
 

go.mod

@@ -1,11 +1,12 @@
 module github.com/litui/monosid
 
-go 1.21.7
+go 1.20
 
 require (
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
 	github.com/lunux2008/xulu v0.0.0-20160308154621-fff51ca7218e // indirect
 	tinygo.org/x/drivers v0.26.0 // indirect
 	tinygo.org/x/tinydraw v0.4.0 // indirect
 	tinygo.org/x/tinyfont v0.4.0 // indirect
+	tinygo.org/x/tinyfs v0.3.0 // indirect
 )

go.sum

@@ -8,3 +8,5 @@ tinygo.org/x/tinydraw v0.4.0 h1:U9V0mHz8/jPShKjlh199vCfq1ARFyUOD1b+FfqIwV8c=
 tinygo.org/x/tinydraw v0.4.0/go.mod h1:WCV/EMljTv8w04iAxjv+fRD6/4ffx0afATYeJlN90Yo=
 tinygo.org/x/tinyfont v0.4.0 h1:XexPKEKiHInf6p4CMCJwsIheVPY0T46HUs6ictYyZfE=
 tinygo.org/x/tinyfont v0.4.0/go.mod h1:7nVj3j3geqBoPDzpFukAhF1C8AP9YocMsZy0HSAcGCA=
+tinygo.org/x/tinyfs v0.3.0 h1:7GjwuDYOKTJeiCVFT7DfukdFyj/vi0jK4iMZ703AofE=
+tinygo.org/x/tinyfs v0.3.0/go.mod h1:07HkxHkz69kYVrAiLS96RIjuDytVY6tOJ0mH8e5cKa0=

graphics/graphics.go

@@ -0,0 +1,43 @@
+package led
+
+import (
+	"machine"
+	"runtime"
+)
+
+var (
+	led   = machine.LED
+	state bool
+)
+
+// Change LED state so it flashes once
+func Flash() {
+	state = true
+}
+
+// Monitors state of LED and flashes it if state changes
+func Task() {
+	state = false
+
+	led.Configure(machine.PinConfig{
+		Mode: machine.PinOutput,
+	})
+	led.Low()
+
+	for {
+		if state {
+			led.High()
+			for i := 0; i < 1000; i++ {
+				runtime.Gosched()
+			}
+
+			led.Low()
+			for i := 0; i < 1000; i++ {
+				runtime.Gosched()
+			}
+			state = false
+		}
+
+		runtime.Gosched()
+	}
+}

led/main.go

@@ -0,0 +1,34 @@
+package log
+
+import (
+	"fmt"
+)
+
+const (
+	MaxLogSize      = 10
+	VisibleLogLines = 4
+)
+
+var (
+	LogLines []string
+	logReady bool = false
+)
+
+// Write new log line to display buffer
+func Logf(format string, a ...any) {
+	if !logReady {
+		return
+	}
+
+	formatted := fmt.Sprintf(format, a...)
+
+	LogLines = append(LogLines, formatted)
+	for len(LogLines) > MaxLogSize {
+		LogLines = LogLines[1:]
+	}
+}
+
+func InitLog() {
+	LogLines = make([]string, 0)
+	logReady = true
+}

log/main.go

@@ -3,16 +3,22 @@ package main
 import (
 	"time"
 
-	"github.com/litui/monosid/graphics"
+	"github.com/litui/monosid/led"
+	"github.com/litui/monosid/log"
 	"github.com/litui/monosid/midi"
 	"github.com/litui/monosid/sid"
+	"github.com/litui/monosid/ui"
 )
 
 func main() {
+	log.InitLog()
+
 	i2c := i2cInit()
 	uart := uartInit()
 
-	go graphics.Task(i2c)
+	go led.Task()
+	go ui.Task(i2c)
+
 	go midi.Task(uart)
 	go sid.Task()
 

main.go

@@ -1,11 +1,18 @@
 package midi
 
-func handleNoteOff(channel uint8, note uint8, velocity uint8) {
+import (
+	"github.com/litui/monosid/led"
+	"github.com/litui/monosid/log"
+)
 
+func handleNoteOff(channel uint8, note uint8, velocity uint8) {
+	led.Flash()
+	log.Logf("NoteOff - Ch%d - %d - %d", channel, note, velocity)
 }
 
 func handleNoteOn(channel uint8, note uint8, velocity uint8) {
-
+	led.Flash()
+	log.Logf("NoteOn - Ch%d - %d - %d", channel, note, velocity)
 }
 
 func handlePolyAftertouch(channel uint8, note uint8, pressure uint8) {

midi/handlers.go

@@ -3,9 +3,13 @@ package midi
 import (
 	"machine"
 	"runtime"
+
+	"github.com/litui/monosid/log"
 )
 
 func Task(uart *machine.UART) {
+	log.Logf("MIDI ready")
+
 	for {
 		processBuffer(uart)
 

midi/midi.go renamed to midi/main.go

@@ -3,8 +3,6 @@ package midi
 import (
 	"machine"
 	"runtime"
-
-	"github.com/lunux2008/xulu"
 )
 
 var (
@@ -14,68 +12,76 @@ var (
 	inSysex     bool = false
 )
 
-// Determine what kind of midi message we're looking at and how to handle it
-func processBuffer(uart *machine.UART) {
-	bc := uart.Buffered()
-	if bc < 1 {
-		return
-	}
+func readNextByte(uart *machine.UART) byte {
+	for {
+		b, err := uart.ReadByte()
+		if err == nil {
+			return b
+		}
 
-	var tempBuf []byte
-	len, err := uart.Read(tempBuf)
-	if err != nil {
-		return
+		runtime.Gosched()
 	}
-	xulu.Use(len)
+}
 
-	// continue receiving sysex message if mid-message
-	for i := 0; i < len; i++ {
-		nextByte := tempBuf[i]
+// Determine what kind of midi message we're looking at and how to handle it
+func processBuffer(uart *machine.UART) {
+	for {
+		b, err := uart.ReadByte()
+		if err != nil {
+			break
+		}
 
 		// Assume we're still receiving sysex until the end byte
 		if inSysex {
-			if nextByte == MsgSysExEnd {
+			if b == MsgSysExEnd {
 				inSysex = false
 				handleSysex()
 
 			} else {
-				sysexBuffer = append(sysexBuffer, nextByte)
+				sysexBuffer = append(sysexBuffer, b)
 				sysexLen++
 			}
 		} else {
-			if nextByte == MsgSysExStart {
+			if b == MsgSysExStart {
 				// prepare for receiving sysex message
 				sysexLen = 0
 				inSysex = true
 
 			} else {
-				msgType := nextByte & 0xF0
-				channel := nextByte & 0xF
-				if i+2 < len {
-					switch msgType {
-					case MsgNoteOff:
-						handleNoteOff(channel, tempBuf[i+1], tempBuf[i+2])
-					case MsgNoteOn:
-						handleNoteOn(channel, tempBuf[i+1], tempBuf[i+2])
-					case MsgPolyAftertouch:
-						handlePolyAftertouch(channel, tempBuf[i+1], tempBuf[i+2])
-					case MsgControlChange:
-						handleControlChange(channel, tempBuf[i+1], tempBuf[i+2])
-					case MsgPitchBend:
-						pitchBend := (int16(tempBuf[i+1]&0x7f) | int16(tempBuf[i+1]&0x7f)<<7) - 0x2000
-						handlePitchBend(channel, pitchBend)
-					}
-				}
-				if i+1 < len {
-					switch msgType {
-					case MsgProgramChange:
-						handleProgramChange(channel, tempBuf[i+1])
-					case MsgChannelAftertouch:
-						handleChannelAftertouch(channel, tempBuf[i+1])
-					}
+				msgType := b & 0xF0
+				channel := b & 0xF
+				switch msgType {
+				case MsgNoteOff:
+					note := readNextByte(uart)
+					velocity := readNextByte(uart)
+					handleNoteOff(channel, note, velocity)
+				case MsgNoteOn:
+					note := readNextByte(uart)
+					velocity := readNextByte(uart)
+					handleNoteOn(channel, note, velocity)
+				case MsgPolyAftertouch:
+					note := readNextByte(uart)
+					pressure := readNextByte(uart)
+					handlePolyAftertouch(channel, note, pressure)
+				case MsgControlChange:
+					cc := readNextByte(uart)
+					value := readNextByte(uart)
+					handleControlChange(channel, cc, value)
+				case MsgPitchBend:
+					pbLow := readNextByte(uart)
+					pbHigh := readNextByte(uart)
+					pitchBend := (int16(pbLow&0x7f) | int16(pbHigh&0x7f)<<7) - 0x2000
+					handlePitchBend(channel, pitchBend)
+				case MsgProgramChange:
+					program := readNextByte(uart)
+					handleProgramChange(channel, program)
+				case MsgChannelAftertouch:
+					pressure := readNextByte(uart)
+					handleChannelAftertouch(channel, pressure)
 				}
 			}
 		}
+
 		runtime.Gosched()
 	}
 }