Cleanup

devices.go

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

z2m.go

@@ -12,8 +12,7 @@ import (
 	"gitlab.imt-atlantique.fr/xaal/code/go/core/xaal"
 )
 
-var (
-	ignoredTopics = []string{
+var ignoredTopics = []string{
 	mqttTopic + "/bridge/groups",
 	mqttTopic + "/bridge/definitions",
 	mqttTopic + "/bridge/extensions",
@@ -22,7 +21,6 @@ var (
 	mqttTopic + "/bridge/logging",
 	mqttTopic + "/bridge/config",
 }
-)
 
 // JSON structures for the z2m device from /bridge/devices
 type BridgeDevice struct {
@@ -42,9 +40,9 @@ type BridgeDevice struct {
 type Expose struct {
 	Name     string    `json:"name"`
 	Type     string    `json:"type"`
+	Unit     string    `json:"unit,omitempty"`
 	Features []Feature `json:"features,omitempty"`
 	Values   []string  `json:"values,omitempty"`
-	Unit     string    `json:"unit,omitempty"`
 }
 
 type Feature struct {
@@ -103,7 +101,7 @@ func parseDeviceJSON(jsonData []byte) {
 		}
 		fmt.Printf("------------------\n\n")
 		// spew.Dump(device)
-		NewDevices(&device)
+		newDevices(&device)
 		// TODO: filter if device already exists
 		gw.devices = append(gw.devices, &device)
 	}
@@ -161,7 +159,6 @@ func dumpMessage(msg MQTT.Message) {
 }
 
 func publishHander(client MQTT.Client, msg MQTT.Message) {
-
 	if slices.Contains(ignoredTopics, msg.Topic()) {
 		return
 	}