Still working on the newDevice API.

This stuff sucks

devices.go

@@ -14,7 +14,7 @@ func setupDevice(dev *xaal.Device, bDevice *BridgeDevice) {
 	dev.Info = "z2m: " + bDevice.FriendlyName
 }
 
-func newDevices(bDevice *BridgeDevice) {
+func newDevices(gw *gateway, bDevice *BridgeDevice) {
 	// TODO: Handle errors
 	baseAddr := GetGW().baseAddr
 	ieeeAddr, _ := hexStringToInteger(bDevice.IeeeAddress)
@@ -46,7 +46,7 @@ func newDevices(bDevice *BridgeDevice) {
 			setupDevice(dev, bDevice)
 			dev.Dump()
 			bDevice.XAALDevice = append(bDevice.XAALDevice, dev)
-			GetGW().engine.AddDevice(dev)
+			gw.engine.AddDevice(dev)
 		}
 	}
 }

z2m.go

@@ -101,7 +101,7 @@ func parseDeviceJSON(jsonData []byte) {
 		}
 		fmt.Printf("------------------\n\n")
 		// spew.Dump(device)
-		newDevices(&device)
+		newDevices(gw, &device)
 		// TODO: filter if device already exists
 		gw.devices = append(gw.devices, &device)
 	}