add heartbeat send data every 30 Seconds

.gitignore

@@ -1,3 +1,5 @@
+.DS_Store
 *.cfg
 *.log
 artNetDriver-arm64
+tecamino-driver-artNet-linux-arm64

driver/artNet.go

@@ -4,6 +4,7 @@ import (
 	"artNet/cfg"
 	"artNet/models"
 	ws "artNet/websocket"
+	"encoding/json"
 	"fmt"
 	"path"
 
@@ -81,7 +82,7 @@ func (d *ArtNetDriver) SetValue(bus string, address uint, value uint8) error {
 		return fmt.Errorf("no dmx data on bus '%s' found", bus)
 	}
 	d.Buses[bus].Data.SetValue(address, value)
-	return d.Buses[bus].SendData()
+	return nil
 }
 
 // connect to websocket server and listen to subscriptions
@@ -101,7 +102,23 @@ func (d *ArtNetDriver) Connect(ip, id string, port uint) error {
 	}
 
 	client.OnMessage = func(data []byte) {
-		fmt.Println(100, string(data))
+
+		request := json_data.NewResponse()
+		err = json.Unmarshal(data, &request)
+		if err != nil {
+			return
+		}
+		if request.Subscribe != nil {
+			d.Subscribe(request.Subscribe...)
+		}
+		if request.Publish != nil {
+			d.Publish(request.Publish...)
+		}
+	}
+
+	if err != nil {
+		d.Log.Error("artNet.Connect", err)
+		return err
 	}
 
 	req := json_data.NewRequest()
@@ -112,10 +129,15 @@ func (d *ArtNetDriver) Connect(ip, id string, port uint) error {
 		d.Log.Error("websocket send data", err)
 	}
 
-	for {
-		select {
-		case err := <-errChan:
-			return err
-		}
+	for err := range errChan {
+		return err
+	}
+	return nil
+}
+
+// send data to all buses that the send flage is true
+func (d *ArtNetDriver) SendData() {
+	for _, bus := range d.Buses {
+		bus.Send <- bus.Data
 	}
 }

driver/publish.go

@@ -0,0 +1,19 @@
+package driver
+
+import (
+	json_dataModels "github.com/tecamino/tecamino-json_data/models"
+)
+
+func (d *ArtNetDriver) Publish(pubs ...json_dataModels.Publish) error {
+	if d.Subscriptions == nil {
+		return nil
+	}
+
+	for _, pub := range pubs {
+		if drv, ok := (d.Subscriptions)[pub.Uuid]; ok {
+			d.SetValue(drv.Bus, drv.Address, uint8(pub.Value.(float64)))
+		}
+	}
+	d.SendData()
+	return nil
+}

driver/subscribe.go

@@ -17,4 +17,5 @@ func (d *ArtNetDriver) Subscribe(subs ...json_dataModels.Subscription) {
 			d.SetValue(drv.Bus, drv.Address, uint8(sub.Value.(float64)))
 		}
 	}
+	d.SendData()
 }

models/bus.go

@@ -29,6 +29,7 @@ type Bus struct {
 	Resubscribe *[]json_dataModels.Subscription `yaml:"-" json:"resubscribe"`
 	Watchdog    context.CancelFunc              `yaml:"-" json:"-"`
 	Reachable   bool                            `yaml:"-" json:"-"`
+	Send        chan *DMX                       `yaml:"-" json:"-"`
 }
 
 // adds new Art-Net interface to driver port 0 = 6454 (default art-net)
@@ -102,7 +103,7 @@ func (b *Bus) Poll(interval time.Duration) error {
 }
 
 // start bus
-func (b *Bus) Start(log *logging.Logger) {
+func (b *Bus) Start(log *logging.Logger) error {
 	var ctx context.Context
 	ctx, b.Watchdog = context.WithCancel(context.Background())
 
@@ -125,6 +126,8 @@ func (b *Bus) Start(log *logging.Logger) {
 					interval = 5 * time.Second
 				} else {
 					b.Reachable = true
+					// send data as a heartbeat for the ArtNet Protocol
+					b.Send <- b.Data
 					log.Info("bus.Start", fmt.Sprintf("device:%s ip:%s watchdog running", b.Name, b.Ip))
 					interval = 30 * time.Second
 				}
@@ -132,26 +135,7 @@ func (b *Bus) Start(log *logging.Logger) {
 			}
 		}
 	}()
-}
 
-// stop bus
-func (b *Bus) Stop() {
-	if b.Watchdog != nil {
-		b.Watchdog()
-	}
-}
-
-// status bus
-func (b *Bus) Status() bool {
-	return b.Watchdog != nil
-}
-
-// send dmx data
-func (b *Bus) SendData() error {
-	if !b.Reachable {
-		return nil
-	}
-	// Send packet over UDP
 	conn, err := net.DialUDP("udp", nil, &net.UDPAddr{
 		IP:   net.ParseIP(b.Ip),
 		Port: *b.Port,
@@ -160,11 +144,38 @@ func (b *Bus) SendData() error {
 	if err != nil {
 		return err
 	}
-	defer conn.Close()
 
-	_, err = conn.Write(NewArtNetPackage(b.Data))
+	b.Send = make(chan *DMX, 1024)
 
-	return err
+	go func() {
+		defer conn.Close()
+		//close send channel
+		close(b.Send)
+		for send := range b.Send {
+			_, err = conn.Write(NewArtNetPackage(send))
+			if err != nil {
+				log.Error("bus.Start", err)
+				return
+			}
+			time.Sleep(23 * time.Millisecond)
+		}
+	}()
+	return nil
+}
+
+// stop bus
+func (b *Bus) Stop() {
+	if b.Watchdog != nil {
+		//cancels context
+		b.Watchdog()
+		//close send channel
+		close(b.Send)
+	}
+}
+
+// status bus
+func (b *Bus) Status() bool {
+	return b.Watchdog != nil
 }
 
 func (b *Bus) ParsePayload(c *gin.Context) error {