config file

kubaceg · kubaceg · commit a715f7760cd4 · 2022-11-04T22:57:00.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -1 +1,3 @@
 /sofar
+sofar_g3_lsw3_logger_reader
+config.yaml
diff --git a/adapters/comms/serial/serial.go b/adapters/comms/serial/serial.go
@@ -4,7 +4,7 @@ import (
 	"io"
 	"time"
 
-	"git.xelasys.ro/sigxcpu/sofar/ports"
+	"github.com/kubaceg/sofar_g3_lsw3_logger_reader/ports"
 	"go.bug.st/serial"
 )
 
diff --git a/adapters/comms/tcpip/tcpip.go b/adapters/comms/tcpip/tcpip.go
@@ -5,7 +5,7 @@ import (
 	"net"
 	"time"
 
-	"git.xelasys.ro/sigxcpu/sofar/ports"
+	"github.com/kubaceg/sofar_g3_lsw3_logger_reader/ports"
 )
 
 type tcpIpPort struct {
diff --git a/adapters/databases/influx/influx.go b/adapters/databases/influx/influx.go
diff --git a/adapters/databases/mosquitto/mqtt.go b/adapters/databases/mosquitto/mqtt.go
@@ -9,6 +9,13 @@ import (
 	mqtt "github.com/eclipse/paho.mqtt.golang"
 )
 
+type MqttConfig struct {
+	Url      string `yaml:"url"`
+	User     string `yaml:"user"`
+	Password string `yaml:"password"`
+	Prefix   string `yaml:"prefix"`
+}
+
 type MosquittoConnection struct {
 	client mqtt.Client
 	prefix string
@@ -22,16 +29,24 @@ var connectLostHandler mqtt.ConnectionLostHandler = func(client mqtt.Client, err
 	log.Printf("Connect lost: %v", err)
 }
 
-func New(url string, prefix string) (*MosquittoConnection, error) {
+func New(config *MqttConfig) (*MosquittoConnection, error) {
 	opts := mqtt.NewClientOptions()
-	opts.AddBroker(url)
+	opts.AddBroker(config.Url)
 	opts.SetClientID("sofar")
 	opts.OnConnect = connectHandler
 	opts.OnConnectionLost = connectLostHandler
 
+	if config.User != "" {
+		opts.SetUsername(config.User)
+	}
+
+	if config.Password != "" {
+		opts.SetPassword(config.Password)
+	}
+
 	conn := &MosquittoConnection{}
 	conn.client = mqtt.NewClient(opts)
-	conn.prefix = prefix
+	conn.prefix = config.Prefix
 	if token := conn.client.Connect(); token.Wait() && token.Error() != nil {
 		return nil, token.Error()
 	}
diff --git a/adapters/devices/sofar/device.go b/adapters/devices/sofar/device.go
@@ -1,6 +1,6 @@
 package sofar
 
-import "git.xelasys.ro/sigxcpu/sofar/ports"
+import "github.com/kubaceg/sofar_g3_lsw3_logger_reader/ports"
 
 type SofarLogger struct {
 	serialNumber string
diff --git a/adapters/devices/sofar/lsw.go b/adapters/devices/sofar/lsw.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strconv"
 
-	"git.xelasys.ro/sigxcpu/sofar/ports"
+	"github.com/kubaceg/sofar_g3_lsw3_logger_reader/ports"
 	"github.com/sigurn/crc16"
 )
 
diff --git a/config-example.yaml b/config-example.yaml
@@ -0,0 +1,9 @@
+inverter:
+  port: 1.2.3.4:23 # required port name (e.g. /dev/ttyUSB0 for serial or 1.2.3.4:23 for TCP/IP
+  loggerSerial: 123456 # required logger serial number
+  readInterval: 60 # update interval in seconds, default 60
+mqtt:
+  url: 1.2.3.4:5678 #MQTT broker URL (e.g. 1.2.3.4:5678)
+  user: #MQTT username (leave empty when not needed)
+  password: #MQTT password (leave empty when not needed)
+  prefix: /sensors/energy/inverter #topic on which data will be sended
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
-module git.xelasys.ro/sigxcpu/sofar
+module github.com/kubaceg/sofar_g3_lsw3_logger_reader
 
-go 1.18
+go 1.19
 
 require (
 	github.com/eclipse/paho.mqtt.golang v1.3.1
@@ -14,4 +14,5 @@ require (
 	github.com/gorilla/websocket v1.4.2 // indirect
 	golang.org/x/net v0.0.0-20200425230154-ff2c4b7c35a0 // indirect
 	golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
diff --git a/go.sum b/go.sum
@@ -21,4 +21,7 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf h1:2ucpDCmfkl8Bd/FsLtiD653Wf96cW37s+iGx93zsu4k=
 golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
diff --git a/main.go b/main.go
@@ -1,81 +1,59 @@
 package main
 
 import (
-	"flag"
 	"log"
 	"strings"
 	"time"
 
 	"net/http"
 	_ "net/http/pprof"
 
-	"git.xelasys.ro/sigxcpu/sofar/adapters/comms/serial"
-	"git.xelasys.ro/sigxcpu/sofar/adapters/comms/tcpip"
-	"git.xelasys.ro/sigxcpu/sofar/adapters/databases/httpnow"
-	"git.xelasys.ro/sigxcpu/sofar/adapters/databases/influx"
-	"git.xelasys.ro/sigxcpu/sofar/adapters/databases/mosquitto"
-	"git.xelasys.ro/sigxcpu/sofar/adapters/devices/sofar"
+	"github.com/kubaceg/sofar_g3_lsw3_logger_reader/adapters/comms/serial"
+	"github.com/kubaceg/sofar_g3_lsw3_logger_reader/adapters/comms/tcpip"
+	"github.com/kubaceg/sofar_g3_lsw3_logger_reader/adapters/databases/httpnow"
+	"github.com/kubaceg/sofar_g3_lsw3_logger_reader/adapters/databases/mosquitto"
+	"github.com/kubaceg/sofar_g3_lsw3_logger_reader/adapters/devices/sofar"
 	gser "go.bug.st/serial"
 
-	"git.xelasys.ro/sigxcpu/sofar/ports"
+	"github.com/kubaceg/sofar_g3_lsw3_logger_reader/ports"
 )
 
 var (
+	config             Config
 	port               ports.CommunicationPort
-	db                 ports.Database
 	mqtt               ports.DatabaseWithListener
 	nowDB              ports.Database
 	device             ports.Device
 	lastDateTimeUpdate time.Time
-	loggerSerial       string
 
-	hasInflux bool
-	hasMQTT   bool
+	hasMQTT bool
 )
 
-func init() {
-	var portName, dbURL, dbName, mqttURL string
-
-	flag.StringVar(&portName, "port", "", "port name (e.g. /dev/ttyUSB0 for serial or 1.2.3.4:23 for TCP/IP")
-	flag.StringVar(&dbURL, "influx-url", "", "Influx DB URL for push (e.g. http://localhost:8086")
-	flag.StringVar(&dbName, "influx-db", "", "Influx DB database name")
-	flag.StringVar(&mqttURL, "mqtt-url", "", "MQTT broker URL (e.g. tcp://1.2.3.4:5678")
-	flag.StringVar(&loggerSerial, "logger-serial", "", "Logger serial number")
-	flag.Parse()
-
-	hasInflux = dbURL != "" && dbName != ""
-	hasMQTT = mqttURL != ""
-
-	// check config
-	if portName == "" {
-		flag.Usage()
-		log.Fatalf("please specify port")
-	}
-
-	if isSerialPort(portName) {
-		port = serial.New(portName, 2400, 8, gser.NoParity, gser.OneStopBit)
-		log.Printf("using serial communcations port %s", portName)
-	} else {
-		port = tcpip.New(portName)
-		log.Printf("using TCP/IP communications port %s", portName)
+func initialize() {
+	config, err := NewConfig("config.yaml")
+	if err != nil {
+		log.Fatalln(err)
 	}
 
-	if hasInflux {
-		log.Printf("starting with Influx URL: %s, Database: %s", dbURL, dbName)
+	hasMQTT = config.Mqtt.Url != "" && config.Mqtt.Prefix != ""
 
-		db = influx.New(dbURL, dbName, map[string]string{"device": "sofar"})
+	if isSerialPort(config.Inverter.Port) {
+		port = serial.New(config.Inverter.Port, 2400, 8, gser.NoParity, gser.OneStopBit)
+		log.Printf("using serial communcations port %s", config.Inverter.Port)
+	} else {
+		port = tcpip.New(config.Inverter.Port)
+		log.Printf("using TCP/IP communications port %s", config.Inverter.Port)
 	}
 
-	var err error
 	if hasMQTT {
-		mqtt, err = mosquitto.New(mqttURL, "/sensors/energy/inverter2")
+		mqtt, err = mosquitto.New(&config.Mqtt)
 		if err != nil {
 			log.Fatalf("MQTT connection failed: %s", err)
 		}
 
 	}
 
-	device = sofar.NewSofarLogger(loggerSerial, port)
+	device = sofar.NewSofarLogger(config.Inverter.LoggerSerial, port)
 
 	nowDB = httpnow.NewHttpNow(8081)
 
@@ -86,6 +64,7 @@ func init() {
 }
 
 func main() {
+	initialize()
 
 	for {
 		log.Printf("performing measurements")
@@ -98,14 +77,6 @@ func main() {
 			continue
 		}
 
-		if hasInflux {
-			err = db.InsertRecord(measurements)
-
-			if err != nil {
-				log.Printf("failed to insert into database: %s", err)
-			}
-		}
-
 		if hasMQTT {
 			err = mqtt.InsertRecord(measurements)
 			if err != nil {
@@ -117,7 +88,7 @@ func main() {
 
 		duration := time.Since(timeStart)
 
-		delay := 10*time.Second - duration
+		delay := time.Duration(config.Inverter.ReadInterval)*time.Second - duration
 		if delay <= 0 {
 			delay = 1 * time.Second
 		}

Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
`1`	`1`	`/sofar`
	`2`	`+sofar_g3_lsw3_logger_reader`
	`3`	`+config.yaml`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"io"`
`5`	`5`	`"time"`
`6`	`6`
`7`		`- "git.xelasys.ro/sigxcpu/sofar/ports"`
	`7`	`+ "github.com/kubaceg/sofar_g3_lsw3_logger_reader/ports"`
`8`	`8`	`"go.bug.st/serial"`
`9`	`9`	`)`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"net"`
`6`	`6`	`"time"`
`7`	`7`
`8`		`- "git.xelasys.ro/sigxcpu/sofar/ports"`
	`8`	`+ "github.com/kubaceg/sofar_g3_lsw3_logger_reader/ports"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`type tcpIpPort struct {`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"fmt"`
`6`	`6`	`"strconv"`
`7`	`7`
`8`		`- "git.xelasys.ro/sigxcpu/sofar/ports"`
	`8`	`+ "github.com/kubaceg/sofar_g3_lsw3_logger_reader/ports"`
`9`	`9`	`"github.com/sigurn/crc16"`
`10`	`10`	`)`
`11`	`11`