From e0cbdbc5d690f0dfb71aa970783a644aa98a7426 Mon Sep 17 00:00:00 2001 From: Minizbot2012 Date: Wed, 28 Jul 2021 02:44:33 -0400 Subject: [PATCH] updated to API --- backend/keypad/keypad_common.go | 5 ++++- go.mod | 4 +++- go.sum | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/backend/keypad/keypad_common.go b/backend/keypad/keypad_common.go index 61535ef..7c47d0a 100644 --- a/backend/keypad/keypad_common.go +++ b/backend/keypad/keypad_common.go @@ -2,6 +2,7 @@ package keypad import ( "fmt" + "os" "path/filepath" "github.com/OrbTools/OrbCommon/devices" @@ -23,7 +24,9 @@ func (p *Keypad) ProcOrbs(dev *devices.DeviceDef, orbs []string) { for _, orb := range orbs { abs, _ := filepath.Abs(orb) fmt.Println("Loading Orb " + abs) - KMap := devices.LoadKeymap(abs, dev) + file, _ := os.Open(abs) + KMap := devices.LoadKeymap(file, dev) + file.Close() p.keymaps.Maps = append(p.keymaps.Maps, KMap) } p.keymaps.MCount = len(orbs) diff --git a/go.mod b/go.mod index 59405a3..025d590 100644 --- a/go.mod +++ b/go.mod @@ -1,9 +1,11 @@ module github.com/OrbTools/OrbMap go 1.16 + require ( - github.com/OrbTools/OrbCommon v0.0.0-20210728062337-7715bc122c84 + github.com/OrbTools/OrbCommon v0.0.0-20210728064103-00fcb730cbf9 github.com/bendahl/uinput v1.4.1 + github.com/davecgh/go-xdr v0.0.0-20161123171359-e6a2ba005892 github.com/google/gousb v1.1.1 github.com/gvalkov/golang-evdev v0.0.0-20191114124502-287e62b94bcb github.com/lxn/win v0.0.0-20210218163916-a377121e959e diff --git a/go.sum b/go.sum index d24cd5f..ad07071 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -github.com/OrbTools/OrbCommon v0.0.0-20210728062337-7715bc122c84 h1:oyuSV4rYnHlM4jy4xKiQpKvPetR7Nx9IXm92a32uI5k= -github.com/OrbTools/OrbCommon v0.0.0-20210728062337-7715bc122c84/go.mod h1:LhYZl/HJpFZqHa/3CD/nxsXAZtMeVRinztSngSFMCDM= +github.com/OrbTools/OrbCommon v0.0.0-20210728064103-00fcb730cbf9 h1:6xeK3YlRK/mt8HQ09LMqgh53YLyZVkn9GH5dWcWV5vE= +github.com/OrbTools/OrbCommon v0.0.0-20210728064103-00fcb730cbf9/go.mod h1:LhYZl/HJpFZqHa/3CD/nxsXAZtMeVRinztSngSFMCDM= github.com/bendahl/uinput v1.4.1 h1:ecxSLcVxWk0EFyZBtmCTnOKjK/HCNdsUcWXRTkNt06k= github.com/bendahl/uinput v1.4.1/go.mod h1:Np7w3DINc9wB83p12fTAM3DPPhFnAKP0WTXRqCQJ6Z8= github.com/davecgh/go-xdr v0.0.0-20161123171359-e6a2ba005892 h1:qg9VbHo1TlL0KDM0vYvBG9EY0X0Yku5WYIPoFWt8f6o=