theater/qrun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix image headers, add Stream Deck+ color mixer with coarse/fine encoders

Browse Source
This commit is contained in:
Ian Gulliver
2026-02-11 22:16:20 -08:00
parent 12e02e680d
commit f268d519b8
3 changed files with 156 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
lib/streamdeck/streamdeck.go
View File

@@ -181,10 +181,10 @@ func (d *Device) ClearAllKeys() error {
func (d *Device) sendKeyImage(key byte, imgData []byte) error {
reportLen := d.dev.GetOutputReportLength()
hdrLen := uint16(8)
hdrLen := uint16(7)
payloadLen := reportLen - hdrLen
var page uint16
var page byte
for start := uint16(0); start < uint16(len(imgData)); page++ {
end := start + payloadLen
last := byte(0)
@@ -195,14 +195,13 @@ func (d *Device) sendKeyImage(key byte, imgData []byte) error {
chunk := imgData[start:end]
hdr := []byte{
0x02,
0x07,
key,
last,
byte(len(chunk)),
byte(len(chunk) >> 8),
byte(page),
byte(page >> 8),
page,
0,
}
payload := append(hdr, chunk...)
@@ -241,10 +240,10 @@ func (d *Device) SetLCDColor(x, y, w, h int, c color.Color) error {
func (d *Device) sendLCDImage(x, y, w, h uint16, imgData []byte) error {
reportLen := d.dev.GetOutputReportLength()
hdrLen := uint16(16)
hdrLen := uint16(15)
payloadLen := reportLen - hdrLen
var page uint16
var page byte
for start := uint16(0); start < uint16(len(imgData)); page++ {
end := start + payloadLen
last := byte(0)
@@ -254,17 +253,22 @@ func (d *Device) sendLCDImage(x, y, w, h uint16, imgData []byte) error {
}
chunk := imgData[start:end]
hdr := make([]byte, 16)
hdr[0] = 0x02
hdr[1] = 0x0C
binary.LittleEndian.PutUint16(hdr[2:], x)
binary.LittleEndian.PutUint16(hdr[4:], y)
binary.LittleEndian.PutUint16(hdr[6:], w)
binary.LittleEndian.PutUint16(hdr[8:], h)
hdr[10] = last
binary.LittleEndian.PutUint16(hdr[11:], page)
binary.LittleEndian.PutUint16(hdr[13:], uint16(len(chunk)))
hdr[15] = 0
hdr := make([]byte, 15)
hdr[0] = 0x0C
hdr[1] = byte(x)
hdr[2] = byte(x >> 8)
hdr[3] = byte(y)
hdr[4] = byte(y >> 8)
hdr[5] = byte(w)
hdr[6] = byte(w >> 8)
hdr[7] = byte(h)
hdr[8] = byte(h >> 8)
hdr[9] = last
hdr[10] = page
hdr[11] = 0
hdr[12] = byte(len(chunk))
hdr[13] = byte(len(chunk) >> 8)
hdr[14] = 0
payload := append(hdr, chunk...)
padding := make([]byte, reportLen-uint16(len(payload)))

21
lib/streamdeck/text.go
View File

@@ -17,17 +17,23 @@ import (
var fontFS embed.FS
var (
MonoRegular font.Face
MonoMedium font.Face
MonoBold font.Face
Regular font.Face
Bold font.Face
MonoRegular font.Face
MonoMedium font.Face
MonoBold font.Face
MonoRegularSmall font.Face
MonoMediumSmall font.Face
MonoBoldSmall font.Face
Regular font.Face
Bold font.Face
)
func init() {
MonoRegular = loadFace("fonts/AtkinsonHyperlegibleMono-Regular.ttf", 72)
MonoMedium = loadFace("fonts/AtkinsonHyperlegibleMono-Medium.ttf", 72)
MonoBold = loadFace("fonts/AtkinsonHyperlegibleMono-Bold.ttf", 72)
MonoRegularSmall = loadFace("fonts/AtkinsonHyperlegibleMono-Regular.ttf", 40)
MonoMediumSmall = loadFace("fonts/AtkinsonHyperlegibleMono-Medium.ttf", 40)
MonoBoldSmall = loadFace("fonts/AtkinsonHyperlegibleMono-Bold.ttf", 40)
Regular = loadFace("fonts/AtkinsonHyperlegible-Regular.ttf", 16)
Bold = loadFace("fonts/AtkinsonHyperlegible-Bold.ttf", 16)
}
@@ -93,6 +99,11 @@ func (d *Device) SetKeyText(key int, bg color.Color, fg color.Color, text string
return d.SetKeyImage(key, TextImageSized(d.model.KeySize, bg, fg, lines...))
}
func (d *Device) SetKeyTextWithFace(key int, face font.Face, bg color.Color, fg color.Color, text string) error {
lines := strings.Split(text, "\n")
return d.SetKeyImage(key, TextImageWithFaceSized(face, d.model.KeySize, bg, fg, lines...))
}
func (d *Device) SetKeyBoldText(key int, bg color.Color, fg color.Color, text string) error {
lines := strings.Split(text, "\n")
return d.SetKeyImage(key, TextImageWithFaceSized(MonoBold, d.model.KeySize, bg, fg, lines...))