Config parsing in progress

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
 }

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)