From eafe2e41cafd3e1d0e9d77fb48b09580ec92a926 Mon Sep 17 00:00:00 2001
From: jkerdreux-imt <jerome.kerdreux@imt-atlantique.fr>
Date: Sun, 17 Nov 2024 03:41:26 +0100
Subject: [PATCH] Config parsing in progress
---
gateway.go | 6 +++---
main.go | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/gateway.go b/gateway.go
index 66204f3..2503589 100644
--- a/gateway.go
+++ b/gateway.go
@@ -22,14 +22,14 @@ var (
func GetGW() *Gateway {
once.Do(func() {
- baseAdrr, _ := uuid.FromString("64eacb5a-8181-11ef-0000-000000000000")
- instance = &Gateway{baseAddr: baseAdrr, devices: make(map[string]*Z2MDevice)}
+ instance = &Gateway{devices: make(map[string]*Z2MDevice)}
})
return instance
}
-func NewGW(client MQTT.Client) *Gateway {
+func NewGW(client MQTT.Client, cfg *Config) *Gateway {
gw := GetGW()
+ gw.baseAddr = cfg.baseAddr
gw.client = client
return gw
}
diff --git a/main.go b/main.go
index 4973312..fd439af 100644
--- a/main.go
+++ b/main.go
@@ -18,7 +18,7 @@ func main() {
client := mqttSetup(cfg.brokerHost, cfg.brokerPort)
eng := xaal.NewEngine()
- gw := NewGW(client)
+ gw := NewGW(client, cfg)
gw.engine = eng
eng.Run()
client.Disconnect(250)
--
GitLab