From 2edecdf9e716875b2b096ff6b911d2296dcfdc3c Mon Sep 17 00:00:00 2001 From: Minizbot2012 Date: Wed, 3 Mar 2021 09:42:03 -0500 Subject: [PATCH] go module updates & fix linux processing --- devices/orbweaver/orbweaver_linux.go | 4 +--- go.mod | 4 ++-- go.sum | 8 ++++---- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/devices/orbweaver/orbweaver_linux.go b/devices/orbweaver/orbweaver_linux.go index 0da8fff..39dadab 100644 --- a/devices/orbweaver/orbweaver_linux.go +++ b/devices/orbweaver/orbweaver_linux.go @@ -27,9 +27,7 @@ func OrbLoop(km *morb.KeyMaps, KeyBus chan keyevents.KeyEvent) { for { f.Read(b) KeyEv := keyevents.KeyEvent{} - KeyEv.Type = binary.LittleEndian.Uint16(b[16:18]) - KeyEv.Code = km.Maps[km.Currentmap].Keymap[ecm[binary.LittleEndian.Uint16(b[18:20])]] - binary.Read(bytes.NewReader(b[20:]), binary.LittleEndian, &KeyEv.Value) + binary.Read(bytes.NewReader(b[16:]), binary.LittleEndian, &KeyEv) KeyEv.Code = km.Maps[km.Currentmap].Keymap[ecm[KeyEv.Code]] if KeyEv.Code != 0 && KeyEv.Type != 4 { KeyBus <- KeyEv diff --git a/go.mod b/go.mod index 4d08b6f..8ef7df1 100644 --- a/go.mod +++ b/go.mod @@ -3,9 +3,9 @@ module github.com/OrbTools/OrbMap go 1.16 require ( - github.com/OrbTools/OrbCommon v0.0.0-20210210190718-26987f35f7fe + github.com/OrbTools/OrbCommon v0.0.0-20210302052644-6a27f15862ae github.com/bendahl/uinput v1.4.0 github.com/google/gousb v1.1.1 github.com/lxn/win v0.0.0-20210218163916-a377121e959e - golang.org/x/sys v0.0.0-20210301091718-77cc2087c03b // indirect + golang.org/x/sys v0.0.0-20210303074136-134d130e1a04 // indirect ) diff --git a/go.sum b/go.sum index f70622e..feff613 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -github.com/OrbTools/OrbCommon v0.0.0-20210210190718-26987f35f7fe h1:hypW2DMdummU8SiitR67h2pUwVpcOSfEKU8E0KZCCys= -github.com/OrbTools/OrbCommon v0.0.0-20210210190718-26987f35f7fe/go.mod h1:ErdpS2Y/8Ik89IDNsH+yaOWo/XcKzf4riEBfPG3xK+o= +github.com/OrbTools/OrbCommon v0.0.0-20210302052644-6a27f15862ae h1:/O7MDEwGqISFrGwnkQsezsbjgKThAY8223Y2lLi61Qs= +github.com/OrbTools/OrbCommon v0.0.0-20210302052644-6a27f15862ae/go.mod h1:8HEhD7wF9Fqritt/jYxDmjbxEScWhFfVajdYdPO5Y14= 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= @@ -7,5 +7,5 @@ github.com/google/gousb v1.1.1/go.mod h1:b3uU8itc6dHElt063KJobuVtcKHWEfFOysOqBNz github.com/lxn/win v0.0.0-20210218163916-a377121e959e h1:H+t6A/QJMbhCSEH5rAuRxh+CtW96g0Or0Fxa9IKr4uc= github.com/lxn/win v0.0.0-20210218163916-a377121e959e/go.mod h1:KxxjdtRkfNoYDCUP5ryK7XJJNTnpC8atvtmTheChOtk= golang.org/x/sys v0.0.0-20201018230417-eeed37f84f13/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210301091718-77cc2087c03b h1:kHlr0tATeLRMEiZJu5CknOw/E8V6h69sXXQFGoPtjcc= -golang.org/x/sys v0.0.0-20210301091718-77cc2087c03b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210303074136-134d130e1a04 h1:cEhElsAv9LUt9ZUUocxzWe05oFLVd+AA2nstydTeI8g= +golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=