paadi/tecamino-driver-artNet
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

add read write lock to dmx data

Browse Source
This commit is contained in:
Adrian Zuercher
2025-07-26 07:18:26 +02:00
parent 05409c2544
commit a503b71fb6
5 changed files with 49 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
models/bus.go
View File

@@ -6,6 +6,7 @@ import (
"fmt"
"net"
"net/http"
"sync"
"time"
"github.com/gin-gonic/gin"
@@ -25,9 +26,10 @@ type Bus struct {
Name string `yaml:"name" json:"name"`
Ip string `yaml:"ip" json:"ip"`
Port *int `yaml:"port" json:"port,omitempty"`
Data *DMX `yaml:"-" json:"-"`
DMX *DMX `yaml:"-" json:"-"`
Resubscribe *[]json_dataModels.Subscription `yaml:"-" json:"resubscribe"`
Watchdog context.CancelFunc `yaml:"-" json:"-"`
mu sync.Mutex `yaml:"-" json:"-"`
Reachable bool `yaml:"-" json:"-"`
Send bool `yaml:"-" json:"-"`
}
@@ -42,7 +44,7 @@ func NewBus(name, ip string, port int) *Bus {
Name: name,
Ip: ip,
Port: &port,
Data: NewDMXUniverse(),
DMX: NewDMXUniverse(),
}
return &i
}
@@ -90,7 +92,7 @@ func (b *Bus) Poll(interval time.Duration) error {
}
}()
_, err = conn.Write(NewArtNetPackage(b.Data))
_, err = conn.Write(NewArtNetPackage(b.DMX))
if err != nil {
return err
}
@@ -161,7 +163,12 @@ func (b *Bus) Start(log *logging.Logger) error {
b.Send = false
_, err = conn.Write(NewArtNetPackage(b.Data))
b.mu.Lock()
data := NewDMXUniverse()
copy(data.Data, data.GetDMXData())
b.mu.Unlock()
_, err = conn.Write(NewArtNetPackage(data))
if err != nil {
log.Error("bus.Start", err)
return
@@ -206,6 +213,11 @@ func (b *Bus) ParsePayload(c *gin.Context) error {
return nil
}
func (b *Bus) SetDMXData(channel uint, value uint8) error {
b.DMX.SetValue(channel, value)
return nil
}
func isUDPReachable(ip string) (recieved bool, err error) {
p := fastping.NewPinger()
ra, err := net.ResolveIPAddr("ip4:icmp", ip)

23
models/dmx.go
View File

@@ -1,12 +1,27 @@
package models
type DMX []byte
import "sync"
type DMX struct {
Data []byte
mu sync.Mutex
}
func NewDMXUniverse() *DMX {
dmx := make(DMX, 512)
return &dmx
return &DMX{
Data: make([]byte, 512),
}
}
func (d *DMX) GetDMXData() (data []byte) {
d.mu.Lock()
data = d.Data
d.mu.Unlock()
return data
}
func (d *DMX) SetValue(channel uint, value uint8) {
(*d)[channel] = value
d.mu.Lock()
d.Data[channel] = value
d.mu.Unlock()
}

18
models/package.go
View File

@@ -16,14 +16,14 @@ type Package []byte
func NewArtNetPackage(data *DMX) Package {
// Build ArtDMX packet
packet := &bytes.Buffer{}
packet.WriteString(protocolID) // Art-Net ID
binary.Write(packet, binary.LittleEndian, uint16(opCode)) // OpCode (OpDmx)
packet.WriteByte(0x00) // Protocol Version High
packet.WriteByte(14) // Protocol Version Low (14 for Art-Net 4)
packet.WriteByte(0x00) // Sequence
packet.WriteByte(0x00) // Physical
binary.Write(packet, binary.BigEndian, uint16(0)) // Universe (net:subuni, usually 0)
binary.Write(packet, binary.BigEndian, uint16(len(*data))) // Length
packet.Write(*data)
packet.WriteString(protocolID) // Art-Net ID
binary.Write(packet, binary.LittleEndian, uint16(opCode)) // OpCode (OpDmx)
packet.WriteByte(0x00) // Protocol Version High
packet.WriteByte(14) // Protocol Version Low (14 for Art-Net 4)
packet.WriteByte(0x00) // Sequence
packet.WriteByte(0x00) // Physical
binary.Write(packet, binary.BigEndian, uint16(0)) // Universe (net:subuni, usually 0)
binary.Write(packet, binary.BigEndian, uint16(len(data.Data))) // Length
packet.Write(data.Data)
return packet.Bytes()
}