Remove the dependency on the keycodes/jp package from tinygo-keyboard

Author: sago35

keyboard.go

@@ -12,7 +12,6 @@ import (
 	"time"
 
 	"github.com/sago35/tinygo-keyboard/keycodes"
-	"github.com/sago35/tinygo-keyboard/keycodes/jp"
 	"golang.org/x/exp/slices"
 )
 
@@ -549,27 +548,27 @@ func (d *Device) KeyVia(layer, kbIndex, index int) Keycode {
 	}
 	kc := d.kb[kbIndex].Key(layer, index)
 	switch kc {
-	case jp.MouseLeft:
+	case keycodes.MouseLeft:
 		kc = 0x00D1
-	case jp.MouseRight:
+	case keycodes.MouseRight:
 		kc = 0x00D2
-	case jp.MouseMiddle:
+	case keycodes.MouseMiddle:
 		kc = 0x00D3
-	case jp.MouseBack:
+	case keycodes.MouseBack:
 		kc = 0x00D4
-	case jp.MouseForward:
+	case keycodes.MouseForward:
 		kc = 0x00D5
-	case jp.WheelUp:
+	case keycodes.WheelUp:
 		kc = 0x00D9
-	case jp.WheelDown:
+	case keycodes.WheelDown:
 		kc = 0x00DA
-	case jp.KeyMediaBrightnessDown:
+	case keycodes.KeyMediaBrightnessDown:
 		kc = 0x00BE
-	case jp.KeyMediaBrightnessUp:
+	case keycodes.KeyMediaBrightnessUp:
 		kc = 0x00BD
-	case jp.KeyMediaVolumeInc:
+	case keycodes.KeyMediaVolumeInc:
 		kc = 0x00A9
-	case jp.KeyMediaVolumeDec:
+	case keycodes.KeyMediaVolumeDec:
 		kc = 0x00AA
 	case 0xFF10, 0xFF11, 0xFF12, 0xFF13, 0xFF14, 0xFF15:
 		// TO(x)
@@ -612,27 +611,27 @@ func keycodeViaToTGK(key Keycode) Keycode {
 
 	switch key {
 	case 0x00D1:
-		kc = jp.MouseLeft
+		kc = keycodes.MouseLeft
 	case 0x00D2:
-		kc = jp.MouseRight
+		kc = keycodes.MouseRight
 	case 0x00D3:
-		kc = jp.MouseMiddle
+		kc = keycodes.MouseMiddle
 	case 0x00D4:
-		kc = jp.MouseBack
+		kc = keycodes.MouseBack
 	case 0x00D5:
-		kc = jp.MouseForward
+		kc = keycodes.MouseForward
 	case 0x00D9:
-		kc = jp.WheelUp
+		kc = keycodes.WheelUp
 	case 0x00DA:
-		kc = jp.WheelDown
+		kc = keycodes.WheelDown
 	case 0x00BD:
-		kc = jp.KeyMediaBrightnessUp
+		kc = keycodes.KeyMediaBrightnessUp
 	case 0x00BE:
-		kc = jp.KeyMediaBrightnessDown
+		kc = keycodes.KeyMediaBrightnessDown
 	case 0x00A9:
-		kc = jp.KeyMediaVolumeInc
+		kc = keycodes.KeyMediaVolumeInc
 	case 0x00AA:
-		kc = jp.KeyMediaVolumeDec
+		kc = keycodes.KeyMediaVolumeDec
 	case 0x5200, 0x5201, 0x5202, 0x5203, 0x5204, 0x5205:
 		// TO(x)
 		kc = 0xFF10 | (kc & 0x000F)

keycodes/jp/keycodes.go

@@ -116,9 +116,9 @@ const (
 	KeyF22         = keycodes.TypeNormal | 0x71
 	KeyF23         = keycodes.TypeNormal | 0x72
 	KeyF24         = keycodes.TypeNormal | 0x73
-	KeyBackslash   = keycodes.TypeNormal | 0x87 // \ |
+	KeyBackslash   = keycodes.TypeNormal | 0x87 // \ _
 	KeyHiragana    = keycodes.TypeNormal | 0x88
-	KeyBackslash2  = keycodes.TypeNormal | 0x89 // \ _
+	KeyBackslash2  = keycodes.TypeNormal | 0x89 // \ |
 	KeyHenkan      = keycodes.TypeNormal | 0x8A
 	KeyMuhenkan    = keycodes.TypeNormal | 0x8B
 	KeyKana        = keycodes.TypeNormal | 0x90
@@ -132,33 +132,33 @@ const (
 )
 
 const (
-	KeyMediaBrightnessUp   = keycodes.TypeMediaKey | 0x6F
-	KeyMediaBrightnessDown = keycodes.TypeMediaKey | 0x70
-	KeyMediaPlay           = keycodes.TypeMediaKey | 0xB0
-	KeyMediaPause          = keycodes.TypeMediaKey | 0xB1
-	KeyMediaRecord         = keycodes.TypeMediaKey | 0xB2
-	KeyMediaFastForward    = keycodes.TypeMediaKey | 0xB3
-	KeyMediaRewind         = keycodes.TypeMediaKey | 0xB4
-	KeyMediaNextTrack      = keycodes.TypeMediaKey | 0xB5
-	KeyMediaPrevTrack      = keycodes.TypeMediaKey | 0xB6
-	KeyMediaStop           = keycodes.TypeMediaKey | 0xB7
-	KeyMediaEject          = keycodes.TypeMediaKey | 0xB8
-	KeyMediaRandomPlay     = keycodes.TypeMediaKey | 0xB9
-	KeyMediaPlayPause      = keycodes.TypeMediaKey | 0xCD
-	KeyMediaPlaySkip       = keycodes.TypeMediaKey | 0xCE
-	KeyMediaMute           = keycodes.TypeMediaKey | 0xE2
-	KeyMediaVolumeInc      = keycodes.TypeMediaKey | 0xE9
-	KeyMediaVolumeDec      = keycodes.TypeMediaKey | 0xEA
+	KeyMediaBrightnessUp   = keycodes.KeyMediaBrightnessUp
+	KeyMediaBrightnessDown = keycodes.KeyMediaBrightnessDown
+	KeyMediaPlay           = keycodes.KeyMediaPlay
+	KeyMediaPause          = keycodes.KeyMediaPause
+	KeyMediaRecord         = keycodes.KeyMediaRecord
+	KeyMediaFastForward    = keycodes.KeyMediaFastForward
+	KeyMediaRewind         = keycodes.KeyMediaRewind
+	KeyMediaNextTrack      = keycodes.KeyMediaNextTrack
+	KeyMediaPrevTrack      = keycodes.KeyMediaPrevTrack
+	KeyMediaStop           = keycodes.KeyMediaStop
+	KeyMediaEject          = keycodes.KeyMediaEject
+	KeyMediaRandomPlay     = keycodes.KeyMediaRandomPlay
+	KeyMediaPlayPause      = keycodes.KeyMediaPlayPause
+	KeyMediaPlaySkip       = keycodes.KeyMediaPlaySkip
+	KeyMediaMute           = keycodes.KeyMediaMute
+	KeyMediaVolumeInc      = keycodes.KeyMediaVolumeInc
+	KeyMediaVolumeDec      = keycodes.KeyMediaVolumeDec
 )
 
 const (
-	MouseLeft    = keycodes.TypeMouse | 0x01 // mouse.Left
-	MouseRight   = keycodes.TypeMouse | 0x02 // mouse.Right
-	MouseMiddle  = keycodes.TypeMouse | 0x04 // mouse.Middle
-	MouseBack    = keycodes.TypeMouse | 0x08 // mouse.Back
-	MouseForward = keycodes.TypeMouse | 0x10 // mouse.Forward
-	WheelDown    = keycodes.TypeMouse | 0x20
-	WheelUp      = keycodes.TypeMouse | 0x40
+	MouseLeft    = keycodes.MouseLeft
+	MouseRight   = keycodes.MouseRight
+	MouseMiddle  = keycodes.MouseMiddle
+	MouseBack    = keycodes.MouseBack
+	MouseForward = keycodes.MouseForward
+	WheelDown    = keycodes.WheelDown
+	WheelUp      = keycodes.WheelUp
 )
 
 const (

keycodes/keycodes.go

@@ -65,3 +65,33 @@ const (
 	// restore default keymap for QMK
 	KeyRestoreDefaultKeymap = 0x7C03
 )
+
+const (
+	KeyMediaBrightnessUp   = TypeMediaKey | 0x6F
+	KeyMediaBrightnessDown = TypeMediaKey | 0x70
+	KeyMediaPlay           = TypeMediaKey | 0xB0
+	KeyMediaPause          = TypeMediaKey | 0xB1
+	KeyMediaRecord         = TypeMediaKey | 0xB2
+	KeyMediaFastForward    = TypeMediaKey | 0xB3
+	KeyMediaRewind         = TypeMediaKey | 0xB4
+	KeyMediaNextTrack      = TypeMediaKey | 0xB5
+	KeyMediaPrevTrack      = TypeMediaKey | 0xB6
+	KeyMediaStop           = TypeMediaKey | 0xB7
+	KeyMediaEject          = TypeMediaKey | 0xB8
+	KeyMediaRandomPlay     = TypeMediaKey | 0xB9
+	KeyMediaPlayPause      = TypeMediaKey | 0xCD
+	KeyMediaPlaySkip       = TypeMediaKey | 0xCE
+	KeyMediaMute           = TypeMediaKey | 0xE2
+	KeyMediaVolumeInc      = TypeMediaKey | 0xE9
+	KeyMediaVolumeDec      = TypeMediaKey | 0xEA
+)
+
+const (
+	MouseLeft    = TypeMouse | 0x01 // mouse.Left
+	MouseRight   = TypeMouse | 0x02 // mouse.Right
+	MouseMiddle  = TypeMouse | 0x04 // mouse.Middle
+	MouseBack    = TypeMouse | 0x08 // mouse.Back
+	MouseForward = TypeMouse | 0x10 // mouse.Forward
+	WheelDown    = TypeMouse | 0x20
+	WheelUp      = TypeMouse | 0x40
+)