OrbCommon: Sync

backend/keypad/keypad.go

@@ -6,26 +6,27 @@ import (
 	"path/filepath"
 
 	"github.com/OrbTools/OrbCommon/devices"
+	"github.com/OrbTools/OrbCommon/devices/structs"
 	"github.com/OrbTools/OrbMap/registry"
 )
 
 type Keypad struct {
 	eventcodes []byte
 	ecm        map[uint16]int
-	keymaps    *devices.KeyMaps
-	definition *devices.DeviceDef
+	keymaps    *structs.KeyMaps
+	definition *structs.DeviceDef
 }
 
 //ProbcOrbFiles processes orbs
-func (p *Keypad) ProcOrbs(dev *devices.DeviceDef, orbs []string) {
+func (p *Keypad) ProcOrbs(dev *structs.DeviceDef, orbs []string) {
 	p.definition = dev
-	p.keymaps = &devices.KeyMaps{Currentmap: 0}
+	p.keymaps = &structs.KeyMaps{Currentmap: 0}
 	if len(orbs) > 0 {
 		for _, orb := range orbs {
 			abs, _ := filepath.Abs(orb)
 			fmt.Println("Loading Orb " + abs)
 			file, _ := os.Open(abs)
-			KMap := devices.LoadKeymap(file, dev)
+			KMap := devices.LoadKeymap(file)
 			p.keymaps.Maps = append(p.keymaps.Maps, KMap)
 		}
 		p.keymaps.MCount = len(orbs)

cmd/OrbToXorb/main.go

@@ -1,40 +0,0 @@
-//OrbToXorb will convert old orb files to the new Xorb format
-//XOrb will contain new features eventually, however this
-//Is an interium measure while converting to xdr2 within
-//OrbMap, OrbBind and OrbCommon
-package main
-
-import (
-	"encoding/binary"
-	"flag"
-	"io"
-	"os"
-	"path/filepath"
-	"strings"
-
-	xdr "github.com/Minizbot2012/minxdr"
-	"github.com/OrbTools/OrbCommon/devices"
-)
-
-func loadOrb(file string, dev *devices.DeviceDef) *devices.KeyMap {
-	mapped := new(devices.KeyMap)
-	of, _ := os.Open(file)
-	defer of.Close()
-	mapped.Keymap = make([]uint16, dev.NumKeys)
-	binary.Read(of, binary.LittleEndian, mapped.Keymap)
-	binary.Read(of, binary.LittleEndian, mapped.Color)
-	return mapped
-}
-func writeXorb(file io.WriteCloser, mapped interface{}) {
-	xdr.Marshal(file, mapped)
-	file.Close()
-}
-func main() {
-	devt := flag.String("dev", "", "Device type to convert")
-	inorb := flag.String("orb", "", "orb file to convert to xorb")
-	flag.Parse()
-	path, _ := filepath.Abs(*inorb)
-	km := loadOrb(*inorb, devices.DeviceTypes[*devt])
-	file, _ := os.Create(strings.Split(path, ".")[0] + ".xorb")
-	writeXorb(file, km)
-}

go.mod

@@ -3,12 +3,14 @@ module github.com/OrbTools/OrbMap
 go 1.17
 
 require (
-	github.com/Minizbot2012/minxdr v0.0.0-20211128051657-16f8bd94f749
-	github.com/OrbTools/OrbCommon v0.0.0-20210927233033-a2443efa0fee
+	github.com/OrbTools/OrbCommon v0.0.0-20220202055136-5d11e7ec765c
 	github.com/bendahl/uinput v1.5.0
 	github.com/google/gousb v1.1.1
 	github.com/gvalkov/golang-evdev v0.0.0-20191114124502-287e62b94bcb
 	github.com/lxn/win v0.0.0-20210218163916-a377121e959e
 )
 
-require golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27 // indirect
+require (
+	github.com/Minizbot2012/minxdr v0.0.0-20220202052052-41040d8d2a6a // indirect
+	golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27 // indirect
+)

go.sum

@@ -1,7 +1,8 @@
-github.com/Minizbot2012/minxdr v0.0.0-20211128051657-16f8bd94f749 h1:x7qoX7Lh5AFaYDsbQZKNFHpixY6ek2X1ud+j4qK7R6c=
 github.com/Minizbot2012/minxdr v0.0.0-20211128051657-16f8bd94f749/go.mod h1:Qtnd0s9q5lVY7qtAGJPYVsRsfNLsIMVhxYqm01ohZJk=
-github.com/OrbTools/OrbCommon v0.0.0-20210927233033-a2443efa0fee h1:JtKTimPP+tYTpQTTPJjhcJ/AbLfzTepDAhQKpB6ajq4=
-github.com/OrbTools/OrbCommon v0.0.0-20210927233033-a2443efa0fee/go.mod h1:aBTmodk+QgmqsIHxoF6LfbZ4fTORDtTE4vnZdDElW9k=
+github.com/Minizbot2012/minxdr v0.0.0-20220202052052-41040d8d2a6a h1:JHts7vzHcrHjoJ/OLh+QORXlOazmxjjWVknBTWVtPdI=
+github.com/Minizbot2012/minxdr v0.0.0-20220202052052-41040d8d2a6a/go.mod h1:Qtnd0s9q5lVY7qtAGJPYVsRsfNLsIMVhxYqm01ohZJk=
+github.com/OrbTools/OrbCommon v0.0.0-20220202055136-5d11e7ec765c h1:SgEftC8Tiqb6pwmA/v4cVtA6+mg4vLTV2pxbI9fIbmE=
+github.com/OrbTools/OrbCommon v0.0.0-20220202055136-5d11e7ec765c/go.mod h1:ZN/0kkPoCthJetQBrFvrVgt42HnrN8RRZ2U2wrptcio=
 github.com/bendahl/uinput v1.5.0 h1:W+QLck2vvOQeo8McsZzPgFJZEg8KP4IIYOB3mbVvTWY=
 github.com/bendahl/uinput v1.5.0/go.mod h1:Np7w3DINc9wB83p12fTAM3DPPhFnAKP0WTXRqCQJ6Z8=
 github.com/google/gousb v1.1.1 h1:2sjwXlc0PIBgDnXtNxUrHcD/RRFOmAtRq4QgnFBE6xc=
@@ -10,7 +11,6 @@ github.com/gvalkov/golang-evdev v0.0.0-20191114124502-287e62b94bcb h1:WHSAxLz3P5
 github.com/gvalkov/golang-evdev v0.0.0-20191114124502-287e62b94bcb/go.mod h1:SAzVFKCRezozJTGavF3GX8MBUruETCqzivVLYiywouA=
 github.com/lxn/win v0.0.0-20210218163916-a377121e959e h1:H+t6A/QJMbhCSEH5rAuRxh+CtW96g0Or0Fxa9IKr4uc=
 github.com/lxn/win v0.0.0-20210218163916-a377121e959e/go.mod h1:KxxjdtRkfNoYDCUP5ryK7XJJNTnpC8atvtmTheChOtk=
-github.com/minizbot2012/minxdr v0.0.0-20210801163755-568fb466e98d/go.mod h1:/f3HTVitNhL2hl4VdOCar3rLHlLc5pSogj2Yp4OQRY0=
 golang.org/x/sys v0.0.0-20201018230417-eeed37f84f13/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27 h1:XDXtA5hveEEV8JB2l7nhMTp3t3cHp9ZpwcdjqyEWLlo=
 golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

registry/registry.go

@@ -3,7 +3,7 @@ package registry
 import (
 	"reflect"
 
-	"github.com/OrbTools/OrbCommon/devices"
+	"github.com/OrbTools/OrbCommon/devices/structs"
 	"github.com/OrbTools/OrbMap/keyevents"
 )
 
@@ -13,7 +13,7 @@ var (
 
 type Device interface {
 	OrbLoop(chan *keyevents.KeyEvent)
-	ProcOrbs(*devices.DeviceDef, []string)
+	ProcOrbs(*structs.DeviceDef, []string)
 }
 
 func init() {