From bf3e628ad2e6ca0e7a77be06f8be959c33ac95f5 Mon Sep 17 00:00:00 2001 From: Minizbot2012 Date: Wed, 2 Feb 2022 00:27:13 -0500 Subject: [PATCH] Sync --- .vscode/settings.json | 0 devices/compiller/compile.go | 4 ++-- devices/devices.go | 8 ++++++-- devices/json/orbweaver.json | 0 devices/xdr/orbweaver.bin | Bin go.mod | 0 go.sum | 0 hid/data/keycode_data.inc | 0 hid/generated.bin | Bin hid/generator/gen.go | 0 hid/hid.go | 0 module.go | 0 12 files changed, 8 insertions(+), 4 deletions(-) mode change 100644 => 100755 .vscode/settings.json mode change 100644 => 100755 devices/compiller/compile.go mode change 100644 => 100755 devices/devices.go mode change 100644 => 100755 devices/json/orbweaver.json mode change 100644 => 100755 devices/xdr/orbweaver.bin mode change 100644 => 100755 go.mod mode change 100644 => 100755 go.sum mode change 100644 => 100755 hid/data/keycode_data.inc mode change 100644 => 100755 hid/generated.bin mode change 100644 => 100755 hid/generator/gen.go mode change 100644 => 100755 hid/hid.go mode change 100644 => 100755 module.go diff --git a/.vscode/settings.json b/.vscode/settings.json old mode 100644 new mode 100755 diff --git a/devices/compiller/compile.go b/devices/compiller/compile.go old mode 100644 new mode 100755 index 3054871..33ef2d4 --- a/devices/compiller/compile.go +++ b/devices/compiller/compile.go @@ -5,7 +5,7 @@ import ( "os" "strings" - xdr "github.com/Minizbot2012/minxdr" + "github.com/Minizbot2012/minxdr" "github.com/OrbTools/OrbCommon/devices" ) @@ -16,7 +16,7 @@ func main() { DevDef := &devices.DeviceDef{} json.Unmarshal(data, DevDef) xdo, _ := os.Create("devices/xdr/" + strings.Split(file.Name(), ".")[0] + ".bin") - xdr.Marshal(xdo, DevDef) + minxdr.Marshal(xdo, DevDef) xdo.Close() } } diff --git a/devices/devices.go b/devices/devices.go old mode 100644 new mode 100755 index 15219de..22c380e --- a/devices/devices.go +++ b/devices/devices.go @@ -1,8 +1,12 @@ package devices import ( - _ "embed" + "bytes" + "embed" "github.com/Minizbot2012/minxdr" + "io" + "io/fs" + "strings" ) var DeviceTypes map[string]*DeviceDef @@ -52,7 +56,7 @@ func init() { for _, file := range files { dev := new(DeviceDef) data, _ := df.ReadFile("xdr/" + file.Name()) - _, err := mindxdr.Unmarshal(bytes.NewReader(data), dev) + _, err := minxdr.Unmarshal(bytes.NewReader(data), dev) if err != nil { panic(err.Error()) } diff --git a/devices/json/orbweaver.json b/devices/json/orbweaver.json old mode 100644 new mode 100755 diff --git a/devices/xdr/orbweaver.bin b/devices/xdr/orbweaver.bin old mode 100644 new mode 100755 diff --git a/go.mod b/go.mod old mode 100644 new mode 100755 diff --git a/go.sum b/go.sum old mode 100644 new mode 100755 diff --git a/hid/data/keycode_data.inc b/hid/data/keycode_data.inc old mode 100644 new mode 100755 diff --git a/hid/generated.bin b/hid/generated.bin old mode 100644 new mode 100755 diff --git a/hid/generator/gen.go b/hid/generator/gen.go old mode 100644 new mode 100755 diff --git a/hid/hid.go b/hid/hid.go old mode 100644 new mode 100755 diff --git a/module.go b/module.go old mode 100644 new mode 100755