Added support for sync

xaal.go

@@ -35,13 +35,13 @@ type Battery struct {
 
 type PowerRelay struct {
 	XAALDevice
-	Z2MDevice
+	Z2MDevice Z2MDevice
 	Property  string
 }
 
 type Lamp struct {
 	XAALDevice
-	Z2MDevice
+	Z2MDevice Z2MDevice
 }
 
 type XAALDeviceInterface interface {
@@ -71,9 +71,11 @@ func NewContact(addr uuid.UUID, zDev *Z2MDevice) XAALDeviceInterface {
 }
 
 func (dev *Contact) update(payload map[string]interface{}) {
-	value := payload["contact"].(bool)
+	value, exists := payload["contact"].(bool)
+	if exists {
 		dev.GetAttribute("detected").SetValue(!value)
 	}
+}
 
 // ----------------------------------------------------------------------------
 // Thermometer
@@ -85,9 +87,11 @@ func NewThermometer(addr uuid.UUID, zDev *Z2MDevice) XAALDeviceInterface {
 }
 
 func (dev *Thermometer) update(payload map[string]interface{}) {
-	value := payload["temperature"].(float64)
+	value, exists := payload["temperature"].(float64)
+	if exists {
 		dev.GetAttribute("temperature").SetValue(value)
 	}
+}
 
 // ----------------------------------------------------------------------------
 // Hygrometer
@@ -99,9 +103,11 @@ func NewHygrometer(addr uuid.UUID, zDev *Z2MDevice) XAALDeviceInterface {
 }
 
 func (dev *Hygrometer) update(payload map[string]interface{}) {
-	value := payload["humidity"].(float64)
+	value, exists := payload["humidity"].(float64)
+	if exists {
 		dev.GetAttribute("humidity").SetValue(value)
 	}
+}
 
 // ----------------------------------------------------------------------------
 // LinkQuality
@@ -113,10 +119,12 @@ func NewLinkQuality(addr uuid.UUID, zDev *Z2MDevice) XAALDeviceInterface {
 }
 
 func (dev *LinkQuality) update(payload map[string]interface{}) {
-	value := payload["linkquality"].(float64)
+	value, exists := payload["linkquality"].(float64)
+	if exists {
 		value = math.Round(value / 255 * 100)
 		dev.GetAttribute("level").SetValue(value)
 	}
+}
 
 // ----------------------------------------------------------------------------
 // Battery
@@ -128,9 +136,11 @@ func NewBattery(addr uuid.UUID, zDev *Z2MDevice) XAALDeviceInterface {
 }
 
 func (dev *Battery) update(payload map[string]interface{}) {
-	value := payload["battery"].(float64)
+	value, exists := payload["battery"].(float64)
+	if exists {
 		dev.GetAttribute("level").SetValue(value)
 	}
+}
 
 // ----------------------------------------------------------------------------
 // PowerRelay
@@ -145,7 +155,8 @@ func NewPowerRelay(addr uuid.UUID, zDev *Z2MDevice, property string) XAALDeviceI
 }
 
 func (dev *PowerRelay) update(payload map[string]interface{}) {
-	value := payload[dev.Property].(string)
+	value, exists := payload[dev.Property].(string)
+	if exists {
 		power := dev.GetAttribute("power")
 		if value == "ON" {
 			power.SetValue(true)
@@ -153,6 +164,7 @@ func (dev *PowerRelay) update(payload map[string]interface{}) {
 			power.SetValue(false)
 		}
 	}
+}
 
 func (dev *PowerRelay) SetProperty(value string) {
 	body := fmt.Sprintf(`{"%s": "%s"}`, dev.Property, value)
@@ -187,7 +199,8 @@ func NewLamp(addr uuid.UUID, zDev *Z2MDevice) XAALDeviceInterface {
 }
 
 func (dev *Lamp) update(payload map[string]interface{}) {
-	value := payload["state"].(string)
+	value, exists := payload["state"].(string)
+	if exists {
 		light := dev.GetAttribute("light")
 		if value == "ON" {
 			light.SetValue(true)
@@ -195,6 +208,7 @@ func (dev *Lamp) update(payload map[string]interface{}) {
 			light.SetValue(false)
 		}
 	}
+}
 
 func (dev *Lamp) On(xaal.MessageBody) *xaal.MessageBody {
 	dev.Z2MDevice.Send(`{"state": "ON"}`)

z2m.go

@@ -92,19 +92,9 @@ func (zDev *Z2MDevice) Available() {
 
 func (zDev *Z2MDevice) Sync() {
 	client := GetGW().client
-	buf := ``
-	for _, expose := range zDev.Definition.Exposes {
-		if expose.Access == 1 || expose.Access == 3 || expose.Access == 5 || expose.Access == 7 {
-			buf += fmt.Sprintf(`"%s": "",`, expose.Name)
-		}
-	}
-	buf = strings.TrimSuffix(buf, ",")
-	buf = `{` + buf + `}`
-	fmt.Println(buf)
-	if token := client.Publish(zDev.GetTopic()+"/get", 0, false, buf); token.Wait() && token.Error() != nil {
+	if token := client.Publish(zDev.GetTopic()+"/dump", 0, false, "{}"); token.Wait() && token.Error() != nil {
 		slog.Error("REFRESH Error", ":", token.Error())
 	}
-
 }
 
 func (l AccessLevel) String() string {
@@ -168,7 +158,7 @@ func jsonParseDevices(jsonData []byte) {
 		newXAALDevices(gw, &zDev)
 		// TODO: filter if device already exists
 		gw.AddZDevice(&zDev)
-		// zDev.Sync()
+		zDev.Sync()
 	}
 }