massive generification works

main
Minizbot2012 3 years ago
parent 84e9a1664b
commit 3d726389ac
No known key found for this signature in database
GPG Key ID: 977C8ADE12361917

@ -8,8 +8,8 @@ import (
"encoding/binary"
"encoding/hex"
"github.com/OrbTools/OrbCommon/devices/common"
"github.com/OrbTools/OrbCommon/devices/orbweaver"
"github.com/OrbTools/OrbCommon/hid"
"github.com/OrbTools/OrbMap/interface/keyevents"
"github.com/google/gousb"
)
@ -117,14 +117,14 @@ func OrbLoop(km *orbweaver.KeyMaps, KeyBus chan *keyevents.KeyEvent) {
}
for i := 2; i < in.Desc.MaxPacketSize; i++ {
if data[i] != 0 {
data[i] = common.KEYCODE_WINDOWS_FROM_HID[data[i]]
data[i] = hid.KEYCODE_WINDOWS_FROM_HID[data[i]]
}
}
binary.Read(bytes.NewReader(data), binary.LittleEndian, swaper.S1)
//data[0] = trans[data[0]]
for i := 2; i < in.Desc.MaxPacketSize; i++ {
if data[i] != 0 {
if common.KEYCODE_WINDOWS_FROM_HID[data[i]] != 255 {
if hid.KEYCODE_WINDOWS_FROM_HID[data[i]] != 255 {
if !swaper.S2.contains(data[i]) {
KeyEv := &keyevents.KeyEvent{}
KeyEv.Code = uint16(data[i])

@ -3,10 +3,9 @@ module github.com/OrbTools/OrbMap
go 1.15
require (
github.com/OrbTools/OrbCommon v0.0.0-20210209215542-e5d03278f0d5
github.com/OrbTools/OrbCommon v0.0.0-20210210011236-0136c0179a2c
github.com/bendahl/uinput v1.4.0
github.com/google/gousb v1.1.1
github.com/lxn/win v0.0.0-20201111105847-2a20daff6a55
github.com/minizbot2012/orbmap v0.0.0-20210105003420-10a2212c927a // indirect
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c // indirect
)

@ -1,17 +1,12 @@
github.com/OrbTools/OrbCommon v0.0.0-20210209212230-c28d897d2760 h1:2eOcDeOxaRpMd0OIt3jsSl7EjPSzu8FYsGOqM+ilOgE=
github.com/OrbTools/OrbCommon v0.0.0-20210209212230-c28d897d2760/go.mod h1:ErdpS2Y/8Ik89IDNsH+yaOWo/XcKzf4riEBfPG3xK+o=
github.com/OrbTools/OrbCommon v0.0.0-20210209215542-e5d03278f0d5 h1:W48w6MC69gxrqfR2xPUjaPyB7SWOAP6szppMvIKwauI=
github.com/OrbTools/OrbCommon v0.0.0-20210209215542-e5d03278f0d5/go.mod h1:ErdpS2Y/8Ik89IDNsH+yaOWo/XcKzf4riEBfPG3xK+o=
github.com/OrbTools/OrbCommon v0.0.0-20210210011236-0136c0179a2c h1:qr1dT3WKovev6HngC7D7PTQzh1gn0+PbH+OGKKq4LNg=
github.com/OrbTools/OrbCommon v0.0.0-20210210011236-0136c0179a2c/go.mod h1:ErdpS2Y/8Ik89IDNsH+yaOWo/XcKzf4riEBfPG3xK+o=
github.com/bendahl/uinput v1.4.0 h1:aVJhayM1wEv7yXXLvC/fbXMmA1uB+jAspKhXQaV+76U=
github.com/bendahl/uinput v1.4.0/go.mod h1:Np7w3DINc9wB83p12fTAM3DPPhFnAKP0WTXRqCQJ6Z8=
github.com/google/gousb v1.1.1 h1:2sjwXlc0PIBgDnXtNxUrHcD/RRFOmAtRq4QgnFBE6xc=
github.com/google/gousb v1.1.1/go.mod h1:b3uU8itc6dHElt063KJobuVtcKHWEfFOysOqBNzHhLY=
github.com/lxn/win v0.0.0-20201111105847-2a20daff6a55 h1:4BxFx5XCtXc+nFtXDGDW+Uu5sPtsAbvPh6RObj3fG9o=
github.com/lxn/win v0.0.0-20201111105847-2a20daff6a55/go.mod h1:KxxjdtRkfNoYDCUP5ryK7XJJNTnpC8atvtmTheChOtk=
github.com/minizbot2012/orbmap v0.0.0-20210105003420-10a2212c927a h1:qtU00Hp1ucalaRmVooaEL7yM5UMtF2sehd/Rjv1i+4k=
github.com/minizbot2012/orbmap v0.0.0-20210105003420-10a2212c927a/go.mod h1:D7b0uyHB9+agQ5ydqFT/qyhHKFgsPKQcgKDQn4pfpsE=
golang.org/x/sys v0.0.0-20201018230417-eeed37f84f13 h1:5jaG59Zhd+8ZXe8C+lgiAGqkOaZBruqrWclLkgAww34=
golang.org/x/sys v0.0.0-20201018230417-eeed37f84f13/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c h1:VwygUrnw9jn88c4u8GD3rZQbqrP/tgas88tPUbBxQrk=
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

Loading…
Cancel
Save