Sync

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()
 	}
 }

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())
 		}