Change to always define 6 layers

kbduplexmatrix.go

@@ -28,11 +28,21 @@ func (d *Device) AddDuplexMatrixKeyboard(colPins, rowPins []machine.Pin, keys []
 		rowPins[r].Configure(machine.PinConfig{Mode: machine.PinInputPullup})
 	}
 
+	keydef := make([][]Keycode, LayerCount)
+	for l := 0; l < len(keydef); l++ {
+		keydef[l] = make([]Keycode, len(state))
+	}
+	for l := 0; l < len(keys); l++ {
+		for kc := 0; kc < len(keys[l]); kc++ {
+			keydef[l][kc] = keys[l][kc]
+		}
+	}
+
 	k := &DuplexMatrixKeyboard{
 		Col:      colPins,
 		Row:      rowPins,
 		State:    state,
-		Keys:     keys,
+		Keys:     keydef,
 		callback: func(layer, index int, state State) {},
 	}
 
@@ -129,7 +139,7 @@ func (d *DuplexMatrixKeyboard) Get() []State {
 }
 
 func (d *DuplexMatrixKeyboard) Key(layer, index int) Keycode {
-	if layer >= len(d.Keys) {
+	if layer >= LayerCount {
 		return 0
 	}
 	if index >= len(d.Keys[layer]) {
@@ -139,7 +149,7 @@ func (d *DuplexMatrixKeyboard) Key(layer, index int) Keycode {
 }
 
 func (d *DuplexMatrixKeyboard) SetKeycode(layer, index int, key Keycode) {
-	if layer >= len(d.Keys) {
+	if layer >= LayerCount {
 		return
 	}
 	if index >= len(d.Keys[layer]) {
@@ -148,6 +158,10 @@ func (d *DuplexMatrixKeyboard) SetKeycode(layer, index int, key Keycode) {
 	d.Keys[layer][index] = key
 }
 
+func (d *DuplexMatrixKeyboard) GetKeyCount() int {
+	return len(d.State)
+}
+
 func (d *DuplexMatrixKeyboard) Init() error {
 	return nil
 }

kbgpio.go

@@ -26,10 +26,20 @@ func (d *Device) AddGpioKeyboard(pins []machine.Pin, keys [][]Keycode, opt ...Op
 		f(&o)
 	}
 
+	keydef := make([][]Keycode, LayerCount)
+	for l := 0; l < len(keydef); l++ {
+		keydef[l] = make([]Keycode, len(state))
+	}
+	for l := 0; l < len(keys); l++ {
+		for kc := 0; kc < len(keys[l]); kc++ {
+			keydef[l][kc] = keys[l][kc]
+		}
+	}
+
 	k := &GpioKeyboard{
 		Col:      pins,
 		State:    state,
-		Keys:     keys,
+		Keys:     keydef,
 		options:  o,
 		callback: func(layer, index int, state State) {},
 	}
@@ -85,7 +95,7 @@ func (d *GpioKeyboard) Get() []State {
 }
 
 func (d *GpioKeyboard) Key(layer, index int) Keycode {
-	if layer >= len(d.Keys) {
+	if layer >= LayerCount {
 		return 0
 	}
 	if index >= len(d.Keys[layer]) {
@@ -95,7 +105,7 @@ func (d *GpioKeyboard) Key(layer, index int) Keycode {
 }
 
 func (d *GpioKeyboard) SetKeycode(layer, index int, key Keycode) {
-	if layer >= len(d.Keys) {
+	if layer >= LayerCount {
 		return
 	}
 	if index >= len(d.Keys[layer]) {
@@ -104,6 +114,10 @@ func (d *GpioKeyboard) SetKeycode(layer, index int, key Keycode) {
 	d.Keys[layer][index] = key
 }
 
+func (d *GpioKeyboard) GetKeyCount() int {
+	return len(d.State)
+}
+
 func (d *GpioKeyboard) Init() error {
 	return nil
 }

kbmatrix.go

@@ -33,11 +33,21 @@ func (d *Device) AddMatrixKeyboard(colPins, rowPins []machine.Pin, keys [][]Keyc
 		f(&o)
 	}
 
+	keydef := make([][]Keycode, LayerCount)
+	for l := 0; l < len(keydef); l++ {
+		keydef[l] = make([]Keycode, len(state))
+	}
+	for l := 0; l < len(keys); l++ {
+		for kc := 0; kc < len(keys[l]); kc++ {
+			keydef[l][kc] = keys[l][kc]
+		}
+	}
+
 	k := &MatrixKeyboard{
 		Col:      colPins,
 		Row:      rowPins,
 		State:    state,
-		Keys:     keys,
+		Keys:     keydef,
 		options:  o,
 		callback: func(layer, index int, state State) {},
 	}
@@ -108,7 +118,7 @@ func (d *MatrixKeyboard) Get() []State {
 }
 
 func (d *MatrixKeyboard) Key(layer, index int) Keycode {
-	if layer >= len(d.Keys) {
+	if layer >= LayerCount {
 		return 0
 	}
 	if index >= len(d.Keys[layer]) {
@@ -118,7 +128,7 @@ func (d *MatrixKeyboard) Key(layer, index int) Keycode {
 }
 
 func (d *MatrixKeyboard) SetKeycode(layer, index int, key Keycode) {
-	if layer >= len(d.Keys) {
+	if layer >= LayerCount {
 		return
 	}
 	if index >= len(d.Keys[layer]) {
@@ -127,6 +137,10 @@ func (d *MatrixKeyboard) SetKeycode(layer, index int, key Keycode) {
 	d.Keys[layer][index] = key
 }
 
+func (d *MatrixKeyboard) GetKeyCount() int {
+	return len(d.State)
+}
+
 func (d *MatrixKeyboard) Init() error {
 	return nil
 }

kbrotary.go

@@ -23,9 +23,19 @@ func (d *Device) AddRotaryKeyboard(rotA, rotB machine.Pin, keys [][]Keycode) *Ro
 	enc := rotary_encoder.New(rotA, rotB)
 	enc.Configure()
 
+	keydef := make([][]Keycode, LayerCount)
+	for l := 0; l < len(keydef); l++ {
+		keydef[l] = make([]Keycode, len(state))
+	}
+	for l := 0; l < len(keys); l++ {
+		for kc := 0; kc < len(keys[l]); kc++ {
+			keydef[l][kc] = keys[l][kc]
+		}
+	}
+
 	k := &RotaryKeyboard{
 		State:    state,
-		Keys:     keys,
+		Keys:     keydef,
 		callback: func(layer, index int, state State) {},
 
 		enc: enc,
@@ -86,7 +96,7 @@ func (d *RotaryKeyboard) Get() []State {
 }
 
 func (d *RotaryKeyboard) Key(layer, index int) Keycode {
-	if layer >= len(d.Keys) {
+	if layer >= LayerCount {
 		return 0
 	}
 	if index >= len(d.Keys[layer]) {
@@ -96,7 +106,7 @@ func (d *RotaryKeyboard) Key(layer, index int) Keycode {
 }
 
 func (d *RotaryKeyboard) SetKeycode(layer, index int, key Keycode) {
-	if layer >= len(d.Keys) {
+	if layer >= LayerCount {
 		return
 	}
 	if index >= len(d.Keys[layer]) {
@@ -105,6 +115,10 @@ func (d *RotaryKeyboard) SetKeycode(layer, index int, key Keycode) {
 	d.Keys[layer][index] = key
 }
 
+func (d *RotaryKeyboard) GetKeyCount() int {
+	return len(d.State)
+}
+
 func (d *RotaryKeyboard) Init() error {
 	return nil
 }

kbsquaredmatrix.go

@@ -21,10 +21,20 @@ func (d *Device) AddSquaredMatrixKeyboard(pins []machine.Pin, keys [][]Keycode)
 		pins[i].Configure(machine.PinConfig{Mode: machine.PinInputPullup})
 	}
 
+	keydef := make([][]Keycode, LayerCount)
+	for l := 0; l < len(keydef); l++ {
+		keydef[l] = make([]Keycode, len(state))
+	}
+	for l := 0; l < len(keys); l++ {
+		for kc := 0; kc < len(keys[l]); kc++ {
+			keydef[l][kc] = keys[l][kc]
+		}
+	}
+
 	k := &SquaredMatrixKeyboard{
 		Pins:     pins,
 		State:    state,
-		Keys:     keys,
+		Keys:     keydef,
 		callback: func(layer, index int, state State) {},
 	}
 
@@ -93,7 +103,7 @@ func (d *SquaredMatrixKeyboard) Get() []State {
 }
 
 func (d *SquaredMatrixKeyboard) Key(layer, index int) Keycode {
-	if layer >= len(d.Keys) {
+	if layer >= LayerCount {
 		return 0
 	}
 	if index >= len(d.Keys[layer]) {
@@ -103,7 +113,7 @@ func (d *SquaredMatrixKeyboard) Key(layer, index int) Keycode {
 }
 
 func (d *SquaredMatrixKeyboard) SetKeycode(layer, index int, key Keycode) {
-	if layer >= len(d.Keys) {
+	if layer >= LayerCount {
 		return
 	}
 	if index >= len(d.Keys[layer]) {
@@ -112,6 +122,10 @@ func (d *SquaredMatrixKeyboard) SetKeycode(layer, index int, key Keycode) {
 	d.Keys[layer][index] = key
 }
 
+func (d *SquaredMatrixKeyboard) GetKeyCount() int {
+	return len(d.State)
+}
+
 func (d *SquaredMatrixKeyboard) Init() error {
 	return nil
 }

kbuart.go

@@ -18,9 +18,19 @@ type UartKeyboard struct {
 func (d *Device) AddUartKeyboard(size int, uart *machine.UART, keys [][]Keycode) *UartKeyboard {
 	state := make([]State, size)
 
+	keydef := make([][]Keycode, LayerCount)
+	for l := 0; l < len(keydef); l++ {
+		keydef[l] = make([]Keycode, len(state))
+	}
+	for l := 0; l < len(keys); l++ {
+		for kc := 0; kc < len(keys[l]); kc++ {
+			keydef[l][kc] = keys[l][kc]
+		}
+	}
+
 	k := &UartKeyboard{
 		State:    state,
-		Keys:     keys,
+		Keys:     keydef,
 		callback: func(layer, index int, state State) {},
 		uart:     uart,
 		buf:      make([]byte, 0, 3),
@@ -99,7 +109,7 @@ func (d *UartKeyboard) Get() []State {
 }
 
 func (d *UartKeyboard) Key(layer, index int) Keycode {
-	if layer >= len(d.Keys) {
+	if layer >= LayerCount {
 		return 0
 	}
 	if index >= len(d.Keys[layer]) {
@@ -109,7 +119,7 @@ func (d *UartKeyboard) Key(layer, index int) Keycode {
 }
 
 func (d *UartKeyboard) SetKeycode(layer, index int, key Keycode) {
-	if layer >= len(d.Keys) {
+	if layer >= LayerCount {
 		return
 	}
 	if index >= len(d.Keys[layer]) {
@@ -118,6 +128,10 @@ func (d *UartKeyboard) SetKeycode(layer, index int, key Keycode) {
 	d.Keys[layer][index] = key
 }
 
+func (d *UartKeyboard) GetKeyCount() int {
+	return len(d.State)
+}
+
 func (d *UartKeyboard) Init() error {
 	for d.uart.Buffered() > 0 {
 		d.uart.ReadByte()

keyboard.go

@@ -31,6 +31,7 @@ type KBer interface {
 	Get() []State
 	Key(layer, index int) Keycode
 	SetKeycode(layer, index int, key Keycode)
+	GetKeyCount() int
 	Init() error
 }
 
@@ -86,7 +87,7 @@ func (d *Device) Init() error {
 	// TODO: Allow change to match keyboard
 	layers := LayerCount
 	keyboards := len(d.kb)
-	keys := MaxKeyCount
+	keys := d.GetMaxKeyCount()
 
 	// TODO: refactor
 	rbuf := make([]byte, 4+layers*keyboards*keys*2)
@@ -115,6 +116,17 @@ func (d *Device) Init() error {
 	return nil
 }
 
+func (d *Device) GetMaxKeyCount() int {
+	cnt := 0
+	for _, k := range d.kb {
+		if cnt < k.GetKeyCount() {
+			cnt = k.GetKeyCount()
+		}
+	}
+
+	return cnt
+}
+
 func (d *Device) Tick() error {
 	pressToRelease := []Keycode{}
 

targets/fric10key/def.go

@@ -4,6 +4,6 @@ import keyboard "github.com/sago35/tinygo-keyboard"
 
 func loadKeyboardDef() {
 	keyboard.KeyboardDef = []byte{
-		0x5D, 0x00, 0x00, 0x80, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x3D, 0x82, 0x80, 0x19, 0x1B, 0x9A, 0xE8, 0xB8, 0xA7, 0x6E, 0x26, 0x77, 0x5D, 0x26, 0xFB, 0x93, 0xC2, 0xE2, 0xE7, 0x46, 0x70, 0xE8, 0x11, 0x8D, 0xB9, 0x33, 0x03, 0xF3, 0x3C, 0x2D, 0x1D, 0x2E, 0x0A, 0xF5, 0x82, 0x59, 0xFF, 0x78, 0xC5, 0x77, 0x9A, 0x65, 0x48, 0x70, 0x6B, 0xD6, 0xAA, 0x0E, 0xDE, 0x3F, 0x50, 0x84, 0x17, 0xAE, 0xCA, 0xCE, 0x28, 0xC7, 0x2B, 0x80, 0x38, 0x17, 0xBC, 0x5D, 0x5E, 0x2E, 0x02, 0x56, 0x51, 0x80, 0x8E, 0xE7, 0xF6, 0x0C, 0x53, 0x40, 0xE7, 0xB5, 0x4D, 0xA3, 0xD5, 0x08, 0x54, 0x3C, 0x69, 0xB2, 0xE6, 0x71, 0x4A, 0xAE, 0x90, 0x7A, 0xCE, 0xBD, 0x72, 0x4E, 0xD5, 0xB4, 0x1C, 0xD4, 0xB6, 0x03, 0xE9, 0xCA, 0x04, 0xBB, 0x9F, 0x8A, 0x16, 0x58, 0xDC, 0x32, 0x1A, 0x81, 0x45, 0x6C, 0x37, 0x5A, 0x69, 0xFE, 0x6C, 0xA0, 0xF1, 0xB2, 0xF1, 0x5B, 0xAE, 0x96, 0x1D, 0xDE, 0x83, 0xBC, 0x6E, 0x00, 0xD6, 0x46, 0x86, 0x29, 0x15, 0x20, 0x23, 0xD7, 0xC3, 0xDC, 0x9B, 0x1A, 0xF7, 0xC8, 0xC6, 0x2E, 0x95, 0x94, 0x40, 0xC8, 0x88, 0xA8, 0xA6, 0x38, 0x1E, 0x35, 0x09, 0xB9, 0xB6, 0xFC, 0xC3, 0x70, 0x66, 0x6A, 0x88, 0x0F, 0x17, 0xF9, 0x44, 0xB9, 0xBE, 0x84, 0x05, 0x30, 0xAB, 0x49, 0x4B, 0xFE, 0xB6, 0xF8, 0x18, 0xF1, 0x55, 0x4C, 0x6B, 0xC9, 0x14, 0xDB, 0xBA, 0x9B, 0x52, 0x1B, 0x9A, 0xA1, 0x87, 0x3D, 0x6C, 0x29, 0xF4, 0xFB, 0x85, 0x16, 0x57, 0x1A, 0x04, 0x17, 0xBE, 0x3D, 0x71, 0xBF, 0xC4, 0x1E, 0xEA, 0xDD, 0xFF, 0xE1, 0xD1, 0xC3, 0x80,
+		0x5D, 0x00, 0x00, 0x80, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x3D, 0x82, 0x80, 0x19, 0x1B, 0x9A, 0xE8, 0xB8, 0xA7, 0x6E, 0x26, 0x77, 0x5D, 0x26, 0xFB, 0x93, 0xC2, 0xE2, 0xE7, 0x46, 0x70, 0xE8, 0x11, 0x8D, 0xB9, 0x33, 0x03, 0xF3, 0x3C, 0x2D, 0x1D, 0x2E, 0x0A, 0xF5, 0x82, 0x59, 0xFF, 0x78, 0xC5, 0x77, 0x9A, 0x65, 0x48, 0x70, 0x6B, 0xD6, 0xAA, 0x0E, 0xDE, 0x3F, 0x50, 0x84, 0x17, 0xAE, 0xCA, 0xCE, 0x28, 0xC7, 0x2B, 0x80, 0x38, 0x17, 0xBC, 0x5D, 0x5E, 0x2E, 0x02, 0x56, 0x51, 0x80, 0x8E, 0xE7, 0xF6, 0x0C, 0x53, 0x40, 0xE7, 0xB5, 0x4D, 0xA3, 0xD5, 0x08, 0x54, 0x3C, 0x69, 0xB2, 0xE6, 0x71, 0x4A, 0xAF, 0xAF, 0x15, 0x47, 0x04, 0x46, 0xC8, 0x8F, 0x6B, 0xCD, 0x47, 0x49, 0x30, 0x7E, 0x29, 0x15, 0x6B, 0xCE, 0xEF, 0x32, 0xBC, 0xB3, 0xFC, 0xC7, 0xAE, 0x48, 0xA3, 0xCC, 0x5D, 0x8F, 0xEA, 0x58, 0x02, 0x50, 0xC4, 0x15, 0xB5, 0xDA, 0xBD, 0x51, 0xD3, 0xD3, 0x83, 0xD5, 0x07, 0x9D, 0xD4, 0x34, 0xCE, 0xFC, 0x2B, 0xF2, 0x0C, 0xEB, 0x2B, 0xC1, 0x74, 0x82, 0x16, 0x0B, 0xB9, 0xC8, 0x8F, 0xE0, 0xE7, 0x59, 0xF8, 0xF5, 0xDE, 0xA1, 0xF1, 0xEA, 0x73, 0x6E, 0x08, 0x07, 0x50, 0x53, 0xEC, 0x4A, 0xAF, 0x75, 0xB6, 0xAC, 0xBD, 0x7B, 0xEA, 0xAE, 0xA8, 0x2C, 0x3A, 0x65, 0xB3, 0x2E, 0xEB, 0x9C, 0x46, 0x62, 0xB5, 0xB5, 0x46, 0x11, 0x84, 0x21, 0x25, 0x4A, 0x79, 0x51, 0xF0, 0xED, 0xCA, 0x38, 0xFD, 0x09, 0xF1, 0x25, 0x4D, 0x53, 0x00, 0x60, 0xEE, 0xB5, 0x1A, 0x95, 0x54, 0x27, 0xE0, 0x75, 0xBC, 0xFE, 0x76, 0x55, 0xC0,
 	}
 }

targets/fric10key/vial.json

@@ -2,7 +2,7 @@
     "name": "tinygo-fric10key",
     "vendorId": "0x2e8a",
     "productId": "0x000a",
-    "matrix": {"rows": 1, "cols": 252},
+    "matrix": {"rows": 1, "cols": 28},
     "layouts": {
         "keymap": [
             ["0,0","0,1","0,2","0,3"],

targets/gopher-badge/def.go

@@ -4,6 +4,6 @@ import keyboard "github.com/sago35/tinygo-keyboard"
 
 func loadKeyboardDef() {
 	keyboard.KeyboardDef = []byte{
-		0x5D, 0x00, 0x00, 0x80, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x3D, 0x82, 0x80, 0x19, 0x1B, 0x9A, 0xE8, 0xB8, 0xA7, 0x6E, 0x26, 0x77, 0x5D, 0x26, 0xFB, 0x93, 0xC2, 0xE2, 0xE7, 0x46, 0x70, 0xF9, 0x60, 0x5C, 0x07, 0xC2, 0xA9, 0x58, 0xA5, 0x66, 0xC7, 0x7D, 0x60, 0x57, 0x18, 0x78, 0x77, 0xC3, 0xE1, 0x5B, 0xA0, 0xF4, 0xCE, 0x79, 0x11, 0xAD, 0x43, 0xE7, 0x77, 0xD8, 0xB9, 0x75, 0x65, 0x86, 0x7E, 0x47, 0x81, 0x17, 0x2B, 0xFF, 0xC4, 0x29, 0x05, 0x53, 0x3B, 0xC6, 0xD0, 0xA7, 0x9B, 0x33, 0x92, 0x6B, 0x73, 0xFF, 0x25, 0xA5, 0xDA, 0xAE, 0xD0, 0xC9, 0xD4, 0xC7, 0xF6, 0x41, 0x8A, 0x4D, 0xF7, 0x2E, 0x3C, 0x2C, 0x68, 0x61, 0xEE, 0x1C, 0x75, 0x65, 0xB9, 0xD0, 0x63, 0x4C, 0x39, 0xD2, 0xB5, 0x13, 0xBF, 0xFE, 0x59, 0x1A, 0x4F, 0x15, 0x78, 0x6A, 0x19, 0x05, 0x48, 0x70, 0xB9, 0xD0, 0x95, 0x03, 0x4E, 0x66, 0x4E, 0x10, 0x0D, 0xE4, 0x74, 0x4F, 0xD0, 0x4B, 0x60, 0x5C, 0x97, 0x9C, 0x8C, 0x4D, 0x62, 0x69, 0xF8, 0xD7, 0x97, 0x1A, 0x21, 0xA1, 0x33, 0x35, 0xB2, 0x3C, 0xEB, 0x9E, 0x5F, 0xAC, 0x90, 0x1F, 0x65, 0x7F, 0xCE, 0xA2, 0x01, 0xA7, 0x36, 0x65, 0xC0, 0x5C, 0x33, 0x82, 0x98, 0x6F, 0xFE, 0xC6, 0xB7, 0x40,
+		0x5D, 0x00, 0x00, 0x80, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x3D, 0x82, 0x80, 0x19, 0x1B, 0x9A, 0xE8, 0xB8, 0xA7, 0x6E, 0x26, 0x77, 0x5D, 0x26, 0xFB, 0x93, 0xC2, 0xE2, 0xE7, 0x46, 0x70, 0xF9, 0x60, 0x5C, 0x07, 0xC2, 0xA9, 0x58, 0xA5, 0x66, 0xC7, 0x7D, 0x60, 0x57, 0x18, 0x78, 0x77, 0xC3, 0xE1, 0x5B, 0xA0, 0xF4, 0xCE, 0x79, 0x11, 0xAD, 0x43, 0xE7, 0x77, 0xD8, 0xB9, 0x75, 0x65, 0x86, 0x7E, 0x47, 0x81, 0x17, 0x2B, 0xFF, 0xC4, 0x29, 0x05, 0x53, 0x3B, 0xC6, 0xD0, 0xA7, 0x9B, 0x33, 0x92, 0x6B, 0x73, 0xFF, 0x25, 0xA5, 0xDA, 0xAE, 0xD0, 0xC9, 0xD4, 0xC7, 0xF6, 0x41, 0x8A, 0x4D, 0xF7, 0x2E, 0x3C, 0x2C, 0x68, 0x62, 0x83, 0x4D, 0xD1, 0x86, 0x10, 0xAD, 0x39, 0x08, 0x4C, 0x9E, 0x55, 0x5F, 0xCB, 0x7F, 0x3D, 0x1B, 0x69, 0xEA, 0x47, 0xAD, 0x50, 0x7B, 0xD4, 0xE4, 0x7B, 0x36, 0xBE, 0x6E, 0x16, 0xF1, 0xF9, 0x8E, 0x7A, 0xDF, 0xC5, 0x6A, 0x27, 0xC9, 0x27, 0x13, 0x70, 0x96, 0x56, 0x57, 0xC6, 0x0E, 0x22, 0xE7, 0x7B, 0x14, 0x35, 0x31, 0x8F, 0x02, 0xAA, 0xBF, 0x66, 0xEC, 0x2B, 0x30, 0x62, 0x01, 0x11, 0xCA, 0xEF, 0xE0, 0xDB, 0x2B, 0x67, 0xAF, 0x83, 0xFA, 0x53, 0xC8, 0xFF, 0xF8, 0x7E, 0xFD, 0xA0,
 	}
 }

targets/gopher-badge/vial.json

@@ -2,7 +2,7 @@
     "name": "tinygo-gopher-badge",
     "vendorId": "0x2E8A",
     "productId": "0x0003",
-    "matrix": {"rows": 1, "cols": 252},
+    "matrix": {"rows": 1, "cols": 6},
     "layouts": {
         "keymap": [
             [{"x":1}, "0,3"],

targets/macropad-rp2040/def.go

@@ -4,6 +4,6 @@ import keyboard "github.com/sago35/tinygo-keyboard"
 
 func loadKeyboardDef() {
 	keyboard.KeyboardDef = []byte{
-		0x5D, 0x00, 0x00, 0x80, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x3D, 0x82, 0x80, 0x19, 0x1B, 0x9A, 0xE8, 0xB8, 0xA7, 0x6E, 0x26, 0x77, 0x5D, 0x26, 0xFB, 0x93, 0xC2, 0xE2, 0xE7, 0x46, 0x70, 0xE8, 0xFA, 0x0C, 0x64, 0x93, 0x9C, 0xC2, 0xDD, 0x9E, 0xCC, 0x8A, 0x2C, 0xCE, 0x38, 0xD5, 0xF7, 0x4C, 0x50, 0xF7, 0xA5, 0x0A, 0x17, 0xAF, 0x81, 0x7A, 0xC6, 0x9C, 0x17, 0x1C, 0xEF, 0x6B, 0x37, 0xDE, 0x3D, 0xEC, 0x13, 0x36, 0xE5, 0x37, 0x05, 0x1D, 0x6C, 0xEF, 0x52, 0xED, 0x27, 0xD4, 0xA3, 0x3E, 0x71, 0x36, 0x32, 0x6F, 0x10, 0x61, 0x34, 0x94, 0x6B, 0x39, 0x16, 0xCA, 0x0B, 0x3D, 0xE2, 0x70, 0x5A, 0x08, 0xBA, 0x0C, 0x0D, 0x6A, 0x80, 0xA7, 0xF0, 0x21, 0xC8, 0xEC, 0xC5, 0xFD, 0x32, 0x99, 0x4F, 0x1D, 0x74, 0x52, 0x92, 0x22, 0x23, 0x1A, 0xA4, 0x95, 0xF7, 0x5A, 0xCC, 0x8B, 0x4B, 0xD7, 0x00, 0x22, 0xE7, 0x0C, 0x3F, 0x34, 0x4D, 0xA6, 0xD4, 0x00, 0x92, 0x7F, 0x1E, 0x53, 0x47, 0xC6, 0x8A, 0x93, 0x86, 0xDB, 0x5F, 0x50, 0x95, 0xF4, 0x8D, 0xDF, 0xDD, 0x57, 0xB3, 0x95, 0x79, 0xC1, 0xF7, 0x91, 0x10, 0xD3, 0x24, 0xED, 0x3A, 0xB6, 0x92, 0x9C, 0x9D, 0x2F, 0xD4, 0x4A, 0x35, 0x50, 0xB3, 0xEF, 0x6B, 0xCB, 0x98, 0x2B, 0x1B, 0xE6, 0x34, 0x5E, 0x55, 0xC2, 0xDE, 0xED, 0xC0, 0xD2, 0x59, 0x72, 0x84, 0x19, 0x6A, 0x12, 0x7F, 0xE7, 0xBE, 0x08, 0xDF, 0xFE, 0x61, 0x15, 0xA8,
+		0x5D, 0x00, 0x00, 0x80, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x3D, 0x82, 0x80, 0x19, 0x1B, 0x9A, 0xE8, 0xB8, 0xA7, 0x6E, 0x26, 0x77, 0x5D, 0x26, 0xFB, 0x93, 0xC2, 0xE2, 0xE7, 0x46, 0x70, 0xE8, 0xFA, 0x0C, 0x64, 0x93, 0x9C, 0xC2, 0xDD, 0x9E, 0xCC, 0x8A, 0x2C, 0xCE, 0x38, 0xD5, 0xF7, 0x4C, 0x50, 0xF7, 0xA5, 0x0A, 0x17, 0xAF, 0x81, 0x7A, 0xC6, 0x9C, 0x17, 0x1C, 0xEF, 0x6B, 0x37, 0xDE, 0x3D, 0xEC, 0x13, 0x36, 0xE5, 0x37, 0x05, 0x1D, 0x6C, 0xEF, 0x52, 0xED, 0x27, 0xD4, 0xA3, 0x3E, 0x71, 0x36, 0x32, 0x6F, 0x10, 0x61, 0x34, 0x94, 0x6B, 0x39, 0x16, 0xCA, 0x0B, 0x3D, 0xE2, 0x70, 0x5A, 0x08, 0xBA, 0x0C, 0x0D, 0x6A, 0x80, 0xA6, 0x5F, 0xBB, 0x23, 0xB0, 0x62, 0xD6, 0xC6, 0xAD, 0x99, 0x19, 0xEC, 0x6E, 0x10, 0x07, 0xF1, 0x0D, 0x06, 0x04, 0x42, 0x83, 0x32, 0xBC, 0x73, 0xC0, 0xD4, 0xD7, 0xCF, 0x76, 0x10, 0x2D, 0xEF, 0xBD, 0x12, 0x47, 0x4B, 0x8F, 0x6F, 0x8A, 0xB1, 0x14, 0x99, 0x73, 0x3A, 0x2C, 0x0E, 0x07, 0xC1, 0x96, 0x63, 0x25, 0x57, 0x97, 0x1E, 0xDF, 0x82, 0x29, 0x2F, 0x78, 0xFF, 0xA9, 0x17, 0x28, 0xE9, 0x08, 0x3F, 0x8E, 0x4B, 0xA0, 0xB4, 0x97, 0x48, 0x6F, 0x1A, 0x2D, 0x93, 0x62, 0x15, 0x0E, 0x5A, 0xD6, 0x4E, 0xFD, 0x79, 0xDC, 0xAC, 0x1F, 0x53, 0x11, 0xE3, 0x62, 0x37, 0xD4, 0x4B, 0x9F, 0xAB, 0x12, 0x40, 0x98, 0x0C, 0xFE, 0xA0, 0xE8, 0xCB,
 	}
 }

targets/macropad-rp2040/vial.json

@@ -2,7 +2,7 @@
     "name": "tinygo-macropad-rp2040",
     "vendorId": "0x239A",
     "productId": "0x8107",
-    "matrix": {"rows": 2, "cols": 252},
+    "matrix": {"rows": 2, "cols": 12},
     "layouts": {
         "keymap": [
             [{"x":2, "w":0.5}, "1,0", {"w":0.5}, "1,1"],