From ba70f397f55344e2a03f1841de90d1adc2c25a91 Mon Sep 17 00:00:00 2001 From: Minizbot2012 Date: Wed, 28 Jul 2021 08:59:21 -0400 Subject: [PATCH] generator: hid use builtin structures --- devices/devices_json.go | 2 +- hid/generated.bin | Bin 37912 -> 37912 bytes hid/generator/gen.go | 41 +++++++++++----------------------------- 3 files changed, 12 insertions(+), 31 deletions(-) diff --git a/devices/devices_json.go b/devices/devices_json.go index 337bdc6..8126447 100644 --- a/devices/devices_json.go +++ b/devices/devices_json.go @@ -35,7 +35,7 @@ func LoadKeymap(file io.ReadCloser, dev *DeviceDef) *KeyMap { 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() diff --git a/hid/generated.bin b/hid/generated.bin index d06eb334a6c279ba60ca4090571f75063f6dc573..3115feaef53cd2d9bb28b0cb92541726fc79438d 100644 GIT binary patch delta 4359 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 diff --git a/hid/generator/gen.go b/hid/generator/gen.go index a62dca3..dd2fa91 100644 --- a/hid/generator/gen.go +++ b/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{ - Usb: make(map[uint16]Key), - Evdev: make(map[uint16]Key), - Xkb: make(map[uint16]Key), - Win: make(map[uint16]Key), - Mac: make(map[uint16]Key), - Code: make(map[string]Key), + KeyMaps := hid.KeyMaps{ + Usb: make(map[uint16]hid.Key), + Evdev: make(map[uint16]hid.Key), + Xkb: make(map[uint16]hid.Key), + Win: make(map[uint16]hid.Key), + Mac: make(map[uint16]hid.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),