gen: account for OrbCommon changes

backend/keypad/keypad_common.go

@@ -26,7 +26,6 @@ func (p *Keypad) ProcOrbs(dev *devices.DeviceDef, orbs []string) {
 			fmt.Println("Loading Orb " + abs)
 			file, _ := os.Open(abs)
 			KMap := devices.LoadKeymap(file, dev)
-			file.Close()
 			p.keymaps.Maps = append(p.keymaps.Maps, KMap)
 		}
 		p.keymaps.MCount = len(orbs)

backend/keypad/keypad_linux.go

@@ -1,4 +1,5 @@
-// +build linux !windows
+// +build !windows
+
 package keypad
 
 import (

cmd/OrbToXorb/main.go

@@ -9,6 +9,7 @@ import (
 	"flag"
 	"io"
 	"os"
+	"path/filepath"
 	"strings"
 
 	"github.com/OrbTools/OrbCommon/devices"
@@ -24,7 +25,7 @@ func loadOrb(file string, dev *devices.DeviceDef) *devices.KeyMap {
 	binary.Read(of, binary.LittleEndian, mapped.Color)
 	return mapped
 }
-func writeXorb(mapped interface{}, file io.WriteCloser) {
+func writeXorb(file io.WriteCloser, mapped interface{}) {
 	xdr.Marshal(file, mapped)
 	file.Close()
 }
@@ -32,7 +33,8 @@ func main() {
 	devt := flag.String("dev", "", "Device type to convert")
 	inorb := flag.String("orb", "", "orb file to convert to xorb")
 	flag.Parse()
+	path, _ := filepath.Abs(*inorb)
 	km := loadOrb(*inorb, devices.DeviceTypes[*devt])
-	file, _ := os.Create(strings.Split(*inorb, ".")[0] + ".xorb")
-	writeXorb(km, file)
+	file, _ := os.Create(strings.Split(path, ".")[0] + ".xorb")
+	writeXorb(file, km)
 }

go.mod

@@ -3,7 +3,7 @@ module github.com/OrbTools/OrbMap
 go 1.16
 
 require (
-	github.com/OrbTools/OrbCommon v0.0.0-20210728121911-2b9161a8742c
+	github.com/OrbTools/OrbCommon v0.0.0-20210728124319-ce853a74ab0d
 	github.com/bendahl/uinput v1.4.1
 	github.com/davecgh/go-xdr v0.0.0-20161123171359-e6a2ba005892
 	github.com/google/gousb v1.1.1

go.sum

@@ -1,5 +1,7 @@
 github.com/OrbTools/OrbCommon v0.0.0-20210728121911-2b9161a8742c h1:wvtd18WR162mMkyECuHXfN9oU06ng4xitj28WE8TmLI=
 github.com/OrbTools/OrbCommon v0.0.0-20210728121911-2b9161a8742c/go.mod h1:LhYZl/HJpFZqHa/3CD/nxsXAZtMeVRinztSngSFMCDM=
+github.com/OrbTools/OrbCommon v0.0.0-20210728124319-ce853a74ab0d h1:zi7bF3t4Hr1pOvPICE+Eq+mNAvOszR1Mc1XVfmRwUCo=
+github.com/OrbTools/OrbCommon v0.0.0-20210728124319-ce853a74ab0d/go.mod h1:QpmZXfsa8ixOQkr29N9sD38PJuV9eYw3b1xTazot6PA=
 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=