xdr: fix hid loading

vscode: settings.json
devices: close file with function

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "gopls": {
+    "build.buildFlags": ["xdr"]
+    }
+}

devices/devices_json.go

@@ -31,10 +31,11 @@ func LoadKeymap(file io.ReadCloser, dev *DeviceDef) *KeyMap {
 	mapped.Keymap = make([]uint16, dev.NumKeys)
 	binary.Read(file, binary.LittleEndian, mapped.Keymap)
 	binary.Read(file, binary.LittleEndian, mapped.Color)
+	file.Close()
 	return mapped
 }
 
-//SavePKMKeymap saves an orb after edit
+//SaveKeymap Saves Orbmap KM structure
 func SaveKeymap(file io.WriteCloser, mapped interface{}) {
 	binary.Write(file, binary.LittleEndian, mapped)
 	file.Close()

devices/devices_xdr.go

@@ -8,7 +8,6 @@ import (
 	xdr "github.com/davecgh/go-xdr/xdr2"
 	"io"
 	"io/fs"
-	"os"
 	"strings"
 )
 
@@ -21,7 +20,10 @@ func init() {
 	for _, file := range files {
 		dev := new(DeviceDef)
 		data, _ := df.ReadFile("xdr/" + file.Name())
-		xdr.Unmarshal(bytes.NewReader(data), dev)
+		_, err := xdr.Unmarshal(bytes.NewReader(data), dev)
+		if err != nil {
+			panic(err.Error())
+		}
 		DeviceTypes[strings.Split(file.Name(), ".")[0]] = dev
 	}
 }
@@ -29,11 +31,15 @@ func init() {
 //LoadKeymap Load Orbmap KM structure
 func LoadKeymap(file io.ReadCloser, dev *DeviceDef) *KeyMap {
 	mapped := new(KeyMap)
-	xdr.Unmarshal(of, mapped)
+	_, err := xdr.Unmarshal(file, mapped)
+	if err != nil {
+		panic(err.Error())
+	}
+	file.Close()
 	return mapped
 }
 
-//SavePKMKeymap saves an orb after edit
+//SaveKeymap Save Orbmap KM struction
 func SaveKeymap(file io.WriteCloser, mapped interface{}) {
 	xdr.Marshal(file, mapped)
 	file.Close()

go.mod

@@ -2,4 +2,4 @@ module github.com/OrbTools/OrbCommon
 
 go 1.16
 
-require github.com/davecgh/go-xdr v0.0.0-20161123171359-e6a2ba005892 // indirect
+require github.com/davecgh/go-xdr v0.0.0-20161123171359-e6a2ba005892

hid/generator/gen.go

@@ -2,34 +2,15 @@ package main
 
 import (
 	"encoding/json"
+	"github.com/OrbTools/OrbCommon/hid"
+	xdr "github.com/davecgh/go-xdr/xdr2"
 	"io"
 	"io/fs"
 	"os"
 	"regexp"
 	"strconv"
-
-	xdr "github.com/davecgh/go-xdr/xdr2"
 )
 
-type KeyMaps struct {
-	Usb   map[uint16]Key
-	Evdev map[uint16]Key
-	Xkb   map[uint16]Key
-	Win   map[uint16]Key
-	Mac   map[uint16]Key
-	Code  map[string]Key
-	Arr   []Key
-}
-
-type Key struct {
-	Usb   uint16
-	Evdev uint16
-	Xkb   uint16
-	Win   uint16
-	Mac   uint16
-	Code  string
-}
-
 func main() {
 	rege, _ := regexp.Compile("DOM_CODE\\(0x07([0-9a-f]*), 0x([0-9a-f]*), 0x([0-9a-f]*), 0x([0-9a-f]*), 0x([0-9a-f]*), \"?[A-Za-z0-9]*\"?, ([A-Za-z_0-9]*)")
 	//DOM_CODE(USB, evdev, XKB, Win, Mac, _, Code)
@@ -37,22 +18,22 @@ func main() {
 	byts, _ := io.ReadAll(fil)
 	fil.Close()
 	matches := rege.FindAllSubmatch(byts, -1)
-	KeyMaps := KeyMaps{
+	KeyMaps := hid.KeyMaps{
-		Usb:   make(map[uint16]Key),
+		Usb:   make(map[uint16]hid.Key),
-		Evdev: make(map[uint16]Key),
+		Evdev: make(map[uint16]hid.Key),
-		Xkb:   make(map[uint16]Key),
+		Xkb:   make(map[uint16]hid.Key),
-		Win:   make(map[uint16]Key),
+		Win:   make(map[uint16]hid.Key),
-		Mac:   make(map[uint16]Key),
+		Mac:   make(map[uint16]hid.Key),
-		Code:  make(map[string]Key),
+		Code:  make(map[string]hid.Key),
 	}
-	Arr := make([]Key, 0)
+	Arr := make([]hid.Key, 0)
 	for _, bar := range matches {
 		U, _ := strconv.ParseUint(string(bar[1]), 16, 16)
 		E, _ := strconv.ParseUint(string(bar[2]), 16, 16)
 		X, _ := strconv.ParseUint(string(bar[3]), 16, 16)
 		W, _ := strconv.ParseUint(string(bar[4]), 16, 16)
 		M, _ := strconv.ParseUint(string(bar[5]), 16, 16)
-		Keys := Key{
+		Keys := hid.Key{
 			Usb:   uint16(U),
 			Evdev: uint16(E),
 			Xkb:   uint16(X),

hid/hid_xdr.go

@@ -12,5 +12,5 @@ import (
 var file []byte
 
 func init() {
-	xdr.Unmarshal(bytes.NewReader(file), Mappings)
+	xdr.Unmarshal(bytes.NewReader(file), &Mappings)
 }