Refactor: separate hardware initialization from koebiten

games/all/main.go

@@ -7,9 +7,12 @@ import (
 	"github.com/sago35/koebiten/games/blocks/blocks"
 	"github.com/sago35/koebiten/games/flappygopher/flappygopher"
 	"github.com/sago35/koebiten/games/jumpingopher/jumpingopher"
+	"github.com/sago35/koebiten/hardware"
 )
 
 func main() {
+	koebiten.SetHardware(hardware.Device)
+
 	menu := NewMenu()
 
 	menu.AddGames([]Game{

games/blocks/main.go

@@ -5,9 +5,11 @@ import (
 
 	"github.com/sago35/koebiten"
 	"github.com/sago35/koebiten/games/blocks/blocks"
+	"github.com/sago35/koebiten/hardware"
 )
 
 func main() {
+	koebiten.SetHardware(hardware.Device)
 	koebiten.SetRotation(koebiten.Rotation90)
 	koebiten.SetWindowSize(64, 128)
 	koebiten.SetWindowTitle("Tetris in Go")

games/flappygopher/main.go

@@ -5,9 +5,11 @@ import (
 
 	"github.com/sago35/koebiten"
 	"github.com/sago35/koebiten/games/flappygopher/flappygopher"
+	"github.com/sago35/koebiten/hardware"
 )
 
 func main() {
+	koebiten.SetHardware(hardware.Device)
 	koebiten.SetWindowSize(128, 64)
 	koebiten.SetWindowTitle("Flappy Gopher")
 

games/jumpingopher/main.go

@@ -5,9 +5,11 @@ import (
 
 	"github.com/sago35/koebiten"
 	"github.com/sago35/koebiten/games/jumpingopher/jumpingopher"
+	"github.com/sago35/koebiten/hardware"
 )
 
 func main() {
+	koebiten.SetHardware(hardware.Device)
 	koebiten.SetWindowSize(128, 64)
 	koebiten.SetWindowTitle("Jumpin Gopher")
 	game := jumpingopher.NewGame()

hardware.go

@@ -0,0 +1,7 @@
+package koebiten
+
+type Hardware interface {
+	Init() error
+	GetDisplay() Displayer
+	KeyUpdate() error
+}

machine.go → hardware/zero-kb02.go

@@ -1,15 +1,37 @@
-//go:build tinygo && !macropad_rp2040
+//go:build tinygo
 
-package koebiten
+package hardware
 
 import (
 	"machine"
 
+	"github.com/sago35/koebiten"
 	"tinygo.org/x/drivers"
 	"tinygo.org/x/drivers/encoders"
 	"tinygo.org/x/drivers/ssd1306"
 )
 
+var Device = ZERO_KB02{}
+
+type ZERO_KB02 struct {
+}
+
+func (z ZERO_KB02) Init() error {
+	return Init()
+}
+
+func (z ZERO_KB02) GetDisplay() koebiten.Displayer {
+	return Display
+}
+
+func (z ZERO_KB02) KeyUpdate() error {
+	return keyUpdate()
+}
+
+var (
+	Display *ssd1306.Device
+)
+
 var (
 	colPins          []machine.Pin
 	rowPins          []machine.Pin
@@ -46,7 +68,7 @@ func (a ADCDevice) Get() bool {
 	return a.PressedFunc()
 }
 
-func init() {
+func Init() error {
 	machine.InitADC()
 	ax := machine.ADC{Pin: machine.GPIO29}
 	ay := machine.ADC{Pin: machine.GPIO28}
@@ -75,7 +97,7 @@ func init() {
 	})
 	d.SetRotation(drivers.Rotation180)
 	d.ClearDisplay()
-	display = &d
+	Display = &d
 
 	gpioPins = []machine.Pin{
 		machine.GPIO2, // rotary
@@ -129,13 +151,15 @@ func init() {
 	cycle = make([]int, len(colPins)*len(rowPins)+len(gpioPins)+len(rotaryPins)+len(adcPins))
 	duration = make([]int, len(colPins)*len(rowPins)+len(gpioPins)+len(rotaryPins)+len(adcPins))
 
+	return nil
 }
 
-func keyUpdate() {
+func keyUpdate() error {
 	keyGpioUpdate()
 	keyRotaryUpdate()
 	keyMatrixUpdate()
 	keyJoystickUpdate()
+	return nil
 }
 
 func keyGpioUpdate() {
@@ -157,9 +181,9 @@ func keyGpioUpdate() {
 			}
 		case NoneToPress:
 			state[idx] = Press
-			AppendJustPressedKeys([]Key{Key(idx)})
+			koebiten.AppendJustPressedKeys([]koebiten.Key{koebiten.Key(idx)})
 		case Press:
-			AppendPressedKeys([]Key{Key(idx)})
+			koebiten.AppendPressedKeys([]koebiten.Key{koebiten.Key(idx)})
 			if current {
 				cycle[idx] = 0
 				duration[idx]++
@@ -174,7 +198,7 @@ func keyGpioUpdate() {
 			}
 		case PressToRelease:
 			state[idx] = None
-			AppendJustReleasedKeys([]Key{Key(idx)})
+			koebiten.AppendJustReleasedKeys([]koebiten.Key{koebiten.Key(idx)})
 		}
 	}
 }
@@ -204,9 +228,9 @@ func keyRotaryUpdate() {
 			} else {
 				state[idx] = PressToRelease
 			}
-			AppendJustPressedKeys([]Key{Key(idx)})
+			koebiten.AppendJustPressedKeys([]koebiten.Key{koebiten.Key(idx)})
 		case Press:
-			AppendPressedKeys([]Key{Key(idx)})
+			koebiten.AppendPressedKeys([]koebiten.Key{koebiten.Key(idx)})
 			if current {
 			} else {
 				state[idx] = PressToRelease
@@ -217,7 +241,7 @@ func keyRotaryUpdate() {
 			} else {
 				state[idx] = None
 			}
-			AppendJustReleasedKeys([]Key{Key(idx)})
+			koebiten.AppendJustReleasedKeys([]koebiten.Key{koebiten.Key(idx)})
 		}
 	}
 }
@@ -244,9 +268,9 @@ func keyMatrixUpdate() {
 				}
 			case NoneToPress:
 				state[idx] = Press
-				AppendJustPressedKeys([]Key{Key(idx)})
+				koebiten.AppendJustPressedKeys([]koebiten.Key{koebiten.Key(idx)})
 			case Press:
-				AppendPressedKeys([]Key{Key(idx)})
+				koebiten.AppendPressedKeys([]koebiten.Key{koebiten.Key(idx)})
 				if current {
 					cycle[idx] = 0
 					duration[idx]++
@@ -261,7 +285,7 @@ func keyMatrixUpdate() {
 				}
 			case PressToRelease:
 				state[idx] = None
-				AppendJustReleasedKeys([]Key{Key(idx)})
+				koebiten.AppendJustReleasedKeys([]koebiten.Key{koebiten.Key(idx)})
 			}
 
 			colPins[c].Low()
@@ -289,9 +313,9 @@ func keyJoystickUpdate() {
 			}
 		case NoneToPress:
 			state[idx] = Press
-			AppendJustPressedKeys([]Key{Key(idx)})
+			koebiten.AppendJustPressedKeys([]koebiten.Key{koebiten.Key(idx)})
 		case Press:
-			AppendPressedKeys([]Key{Key(idx)})
+			koebiten.AppendPressedKeys([]koebiten.Key{koebiten.Key(idx)})
 			if current {
 				cycle[idx] = 0
 				duration[idx]++
@@ -306,7 +330,7 @@ func keyJoystickUpdate() {
 			}
 		case PressToRelease:
 			state[idx] = None
-			AppendJustReleasedKeys([]Key{Key(idx)})
+			koebiten.AppendJustReleasedKeys([]koebiten.Key{koebiten.Key(idx)})
 		}
 	}
 }

koebiten.go

@@ -56,6 +56,8 @@ var (
 	black = color.RGBA{R: 0x00, G: 0x00, B: 0x00, A: 0xFF}
 )
 
+var keyUpdate = func() error { return nil }
+
 func init() {
 	pngBuffer = map[string]pixel.Image[pixel.Monochrome]{}
 }
@@ -104,6 +106,16 @@ func SetWindowSize(w, h int) {
 func SetWindowTitle(title string) {
 }
 
+func SetHardware(h Hardware) error {
+	err := h.Init()
+	if err != nil {
+		return err
+	}
+	display = h.GetDisplay()
+	keyUpdate = h.KeyUpdate
+	return nil
+}
+
 // SetRotation sets the display rotation mode.
 // If the display is already a RotatedDisplay, it updates the mode.
 // Otherwise, it wraps the existing display in a new RotatedDisplay with the specified mode.