From ce853a74ab0d66aa4d54bd5203920e3ec1bd7aa2 Mon Sep 17 00:00:00 2001 From: mini Date: Wed, 28 Jul 2021 08:43:19 -0400 Subject: [PATCH] generations: update vscode: settings.json devices: close file with function --- .vscode/settings.json | 5 +++++ devices/devices_json.go | 1 + devices/devices_xdr.go | 3 ++- devices/xdr/orbweaver.bin | Bin 560 -> 544 bytes go.mod | 2 +- hid/generated.bin | Bin 37912 -> 37912 bytes 6 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..80906c1 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "gopls": { + "build.buildFlags": ["xdr"] + } +} \ No newline at end of file diff --git a/devices/devices_json.go b/devices/devices_json.go index b2925aa..337bdc6 100644 --- a/devices/devices_json.go +++ b/devices/devices_json.go @@ -31,6 +31,7 @@ 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 } diff --git a/devices/devices_xdr.go b/devices/devices_xdr.go index 761f6b2..de3cf8c 100644 --- a/devices/devices_xdr.go +++ b/devices/devices_xdr.go @@ -29,10 +29,11 @@ func init() { func LoadKeymap(file io.ReadCloser, dev *DeviceDef) *KeyMap { mapped := new(KeyMap) xdr.Unmarshal(file, mapped) + 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() diff --git a/devices/xdr/orbweaver.bin b/devices/xdr/orbweaver.bin index 73474354a61a38691fc6d4e48657fdc59ad96f08..fe77bfa9c88e096c067f3c54e41c743a9e8cd2eb 100644 GIT binary patch delta 14 WcmdnMvVdhm`^J6_#>w*;CjtN}PX&Dd delta 25 gcmZ3$vVmnnJ1euVX8^;-7H&os=3vi&$=!@o0bhy-MgRZ+ diff --git a/go.mod b/go.mod index 6aa821c..189c1d6 100644 --- a/go.mod +++ b/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 diff --git a/hid/generated.bin b/hid/generated.bin index 0465c2cb4a217f1578ecc369a268578f7a18c394..d06eb334a6c279ba60ca4090571f75063f6dc573 100644 GIT binary patch delta 4489 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