load symbols and memory from string

ab.go

@@ -15,6 +15,7 @@ import (
 	"fmt"
 	"math/rand"
 	"net"
+	"os"
 	"sync"
 	"time"
 )
@@ -44,8 +45,8 @@ type PLC struct {
 	Timeout     time.Duration
 }
 
-// Init initialize library. Must be called first.
-func Init(eds string) (*PLC, error) {
+// Init initializes library. Must be called first.
+func Init(eds []byte) (*PLC, error) {
 	var p PLC
 	p.Class = make(map[int]*Class)
 	p.tags = make(map[string]*Tag)
@@ -61,6 +62,16 @@ func Init(eds string) (*PLC, error) {
 	return &p, nil
 }
 
+// InitEDS initializes library. Must be called first.
+func InitEDS(eds string) (*PLC, error) {
+	edsB, err := os.ReadFile(eds)
+	if err != nil {
+		return nil, err
+	}
+
+	return Init(edsB)
+}
+
 func (p *PLC) debug(args ...interface{}) {
 	if p.Verbose {
 		fmt.Println(args...)

c/libplcconnector/main.go

@@ -44,7 +44,7 @@ func call(service int, status int, tag *plc.Tag) {
 
 //export plcconnector_init
 func plcconnector_init() {
-	p, _ = plc.Init("")
+	p, _ = plc.Init(nil)
 }
 
 //export plcconnector_set_verbose

eds.go

@@ -58,32 +58,26 @@ func (p *PLC) getEDSInt(section string, item string) (int, error) {
 	return 0, errNotFound
 }
 
-func (p *PLC) loadEDS(fn string) error {
+func (p *PLC) loadEDS(eds []byte) error {
 	var (
-		orig_f []byte
-		f      []byte
-		err    error
-		gz     = false
+		f   []byte
+		err error
+		gz  = false
 	)
 
-	if fn == "" {
-		orig_f = defEDS
-	} else {
-		orig_f, err = os.ReadFile(fn)
-		if err != nil {
-			return err
-		}
+	if len(eds) == 0 {
+		eds = defEDS
 	}
 
-	if len(orig_f) >= 10 && orig_f[0] == 0x1f && orig_f[1] == 0x8b {
+	if len(eds) >= 10 && eds[0] == 0x1f && eds[1] == 0x8b {
 		gz = true
-		f, err = loadGzip(orig_f)
+		f, err = loadGzip(eds)
 		if err != nil {
 			return nil
 		}
 	} else {
-		f = make([]byte, len(orig_f))
-		copy(f, orig_f)
+		f = make([]byte, len(eds))
+		copy(f, eds)
 	}
 
 	p.eds = make(map[string]map[string]string)
@@ -262,7 +256,7 @@ func (p *PLC) loadEDS(fn string) error {
 		gz.Close()
 		in.data = buf.Bytes()
 	} else {
-		in.data = orig_f
+		in.data = eds
 	}
 
 	chksum := 0

example/main.go

@@ -80,20 +80,20 @@ func main() {
 	if len(os.Args) >= 2 {
 		eds = os.Args[1]
 	}
-	p, err := plc.Init(eds)
+	p, err := plc.InitEDS(eds)
 	if err != nil {
 		fmt.Println(err)
 		return
 	}
 
 	if len(os.Args) >= 3 {
-		err = p.ImportJSON(os.Args[2])
+		err = p.ImportSymbols(os.Args[2])
 		if err != nil {
 			fmt.Println(err)
 			return
 		}
 		if len(os.Args) >= 4 {
-			err = p.ImportMemoryJSON(os.Args[3])
+			err = p.ImportMemory(os.Args[3])
 			if err != nil {
 				fmt.Println(err)
 				return

json.go

@@ -40,14 +40,10 @@ type JS struct {
 	Templates map[string]jsTemplates `json:"templates"`
 }
 
-// ImportJSON .
-func (p *PLC) ImportJSON(file string) error {
-	data, err := os.ReadFile(file)
-	if err != nil {
-		return err
-	}
+// UseSymbols .
+func (p *PLC) UseSymbols(symbols string) error {
 	var db JS
-	err = json.Unmarshal(data, &db)
+	err := json.Unmarshal([]byte(symbols), &db)
 	if err != nil {
 		return err
 	}
@@ -117,19 +113,24 @@ func (p *PLC) ImportJSON(file string) error {
 	return nil
 }
 
+// ImportSymbols .
+func (p *PLC) ImportSymbols(file string) error {
+	data, err := os.ReadFile(file)
+	if err != nil {
+		return err
+	}
+	return p.UseSymbols(string(data))
+}
+
 type memJS struct {
 	Rx   []uint8 `json:"rx"`
 	Read bool    `json:"read"`
 }
 
-// ImportMemoryJSON .
-func (p *PLC) ImportMemoryJSON(file string) error {
-	data, err := os.ReadFile(file)
-	if err != nil {
-		return err
-	}
+// UseMemory .
+func (p *PLC) UseMemory(memory string) error {
 	db := make(map[string]memJS)
-	err = json.Unmarshal(data, &db)
+	err := json.Unmarshal([]byte(memory), &db)
 	if err != nil {
 		return err
 	}
@@ -145,7 +146,7 @@ func (p *PLC) ImportMemoryJSON(file string) error {
 		if c.Read {
 			if len(c.Rx) != len(tag.data) {
 				if p.Verbose {
-					fmt.Println(file, "data length mismatch", n)
+					fmt.Println("memory JSON data length mismatch", n)
 				}
 				continue
 				// return errors.New("data length mismatch " + n)
@@ -156,3 +157,13 @@ func (p *PLC) ImportMemoryJSON(file string) error {
 
 	return nil
 }
+
+// ImportMemory .
+func (p *PLC) ImportMemory(file string) error {
+	data, err := os.ReadFile(file)
+	if err != nil {
+		return err
+	}
+
+	return p.UseMemory(string(data))
+}