From 814a118666a6b02f7685f20fff9ff5e03030b51e Mon Sep 17 00:00:00 2001 From: Minizbot2012 Date: Wed, 28 Jul 2021 02:19:02 -0400 Subject: [PATCH] naming conflicts --- devices/devices_json.go | 6 +++--- devices/devices_xdr.go | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/devices/devices_json.go b/devices/devices_json.go index 760884f..d3106f7 100644 --- a/devices/devices_json.go +++ b/devices/devices_json.go @@ -13,14 +13,14 @@ import ( ) //go:embed json/* -var data embed.FS +var df embed.FS func init() { DeviceTypes = make(map[string]*DeviceDef) - files, _ := fs.ReadDir(data, "json") + files, _ := fs.ReadDir(df, "json") for _, file := range files { dev := new(DeviceDef) - data, _ := data.ReadFile("json/" + file.Name()) + data, _ := df.ReadFile("json/" + file.Name()) json.Unmarshal(data, dev) DeviceTypes[strings.Split(file.Name(), ".")[0]] = dev } diff --git a/devices/devices_xdr.go b/devices/devices_xdr.go index cc7ab62..d00b8aa 100644 --- a/devices/devices_xdr.go +++ b/devices/devices_xdr.go @@ -4,7 +4,7 @@ package devices import ( "embed" - "github.com/davecgh/go-xdr/xdr2" + xdr "github.com/davecgh/go-xdr/xdr2" "io" "io/fs" "os" @@ -12,20 +12,20 @@ import ( ) //go:embed xdr/* -var data embed.FS +var df embed.FS func init() { DeviceTypes = make(map[string]*DeviceDef) - files, _ := fs.ReadDir(data, "xdr") + files, _ := fs.ReadDir(df, "xdr") for _, file := range files { dev := new(DeviceDef) - data, _ := jsons.ReadFile("xdr/" + file.Name()) - xdr2.Unmarshal(data, dev) + data, _ := df.ReadFile("xdr/" + file.Name()) + xdr.Unmarshal(data, dev) DeviceTypes[strings.Split(file.Name(), ".")[0]] = dev } } -//LoadKM Load Orbmap KM structure +//LoadKeymap Load Orbmap KM structure func LoadKeymap(file string, dev *DeviceDef) *KeyMap { mapped := new(KeyMap) of, _ := os.Open(file)