From 38891f6105acc1051b91a92e748a0e554e59611e Mon Sep 17 00:00:00 2001 From: Minizbot2012 Date: Sat, 24 Jul 2021 03:01:10 -0400 Subject: [PATCH] reduce windows translation complexity for hid.go --- devices/orbweaver/orbweaver_windows.go | 6 ++---- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/devices/orbweaver/orbweaver_windows.go b/devices/orbweaver/orbweaver_windows.go index 05b0c98..3e9ddd4 100644 --- a/devices/orbweaver/orbweaver_windows.go +++ b/devices/orbweaver/orbweaver_windows.go @@ -7,7 +7,6 @@ import ( "encoding/binary" "fmt" - morb "github.com/OrbTools/OrbCommon/devices/orbweaver" "github.com/OrbTools/OrbCommon/hid" "github.com/OrbTools/OrbMap/keyevents" "github.com/google/gousb" @@ -141,10 +140,9 @@ func (p Orbweaver) OrbLoop(KeyBus chan *keyevents.KeyEvent) { dat := append(addin, tdat...) for i := 0; i < len(dat); i++ { if dat[i] != 0 { - dat[i] = byte(hid.GetLinuxFromHid(uint16(dat[i]))) + dat[i] = byte(hid.GetMappingFromHID(uint16(dat[i])).Evdev) dat[i] = byte(p.keymaps.Maps[p.keymaps.Currentmap].Keymap[p.ecm[uint16(dat[i])]]) - dat[i] = byte(hid.GetHidFromLinux(uint16(dat[i]))) - dat[i] = byte(hid.GetWindowsFromHid(uint16(dat[i]))) + dat[i] = byte(hid.GetMappingFromLinux(uint16(dat[i])).Win) } } err = binary.Read(bytes.NewReader(dat), binary.LittleEndian, swaper.S1) diff --git a/go.mod b/go.mod index 7a5b165..8e878d5 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/OrbTools/OrbMap go 1.16 require ( - github.com/OrbTools/OrbCommon v0.0.0-20210604213605-2c1ec68f6f91 + github.com/OrbTools/OrbCommon v0.0.0-20210724065833-4ff2abe0a12c github.com/bendahl/uinput v1.4.1 github.com/google/gousb v1.1.1 github.com/gvalkov/golang-evdev v0.0.0-20191114124502-287e62b94bcb diff --git a/go.sum b/go.sum index dafb2aa..9336fff 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -github.com/OrbTools/OrbCommon v0.0.0-20210604213605-2c1ec68f6f91 h1:zsCP3Xou+cciiCjs/hTT5Ecr9WT1X0mIsfX4MR0nYW8= -github.com/OrbTools/OrbCommon v0.0.0-20210604213605-2c1ec68f6f91/go.mod h1:8HEhD7wF9Fqritt/jYxDmjbxEScWhFfVajdYdPO5Y14= +github.com/OrbTools/OrbCommon v0.0.0-20210724065833-4ff2abe0a12c h1:oTZtQVfLPB3ef+m8NVY8pnvAZgrvMRyr6u21HdkRa9I= +github.com/OrbTools/OrbCommon v0.0.0-20210724065833-4ff2abe0a12c/go.mod h1:8HEhD7wF9Fqritt/jYxDmjbxEScWhFfVajdYdPO5Y14= github.com/bendahl/uinput v1.4.1 h1:ecxSLcVxWk0EFyZBtmCTnOKjK/HCNdsUcWXRTkNt06k= github.com/bendahl/uinput v1.4.1/go.mod h1:Np7w3DINc9wB83p12fTAM3DPPhFnAKP0WTXRqCQJ6Z8= github.com/google/gousb v1.1.1 h1:2sjwXlc0PIBgDnXtNxUrHcD/RRFOmAtRq4QgnFBE6xc=