Merge branch 'master' of github:magicmonkey/go-streamdeck

Author: magicmonkey

README.md

@@ -27,6 +27,7 @@ SUBSYSTEM=="usb", ATTRS{idVendor}=="0fd9", ATTRS{idProduct}=="0060", MODE:="666"
 SUBSYSTEM=="usb", ATTRS{idVendor}=="0fd9", ATTRS{idProduct}=="0063", MODE:="666"
 SUBSYSTEM=="usb", ATTRS{idVendor}=="0fd9", ATTRS{idProduct}=="006c", MODE:="666"
 SUBSYSTEM=="usb", ATTRS{idVendor}=="0fd9", ATTRS{idProduct}=="006d", MODE:="666"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="0fd9", ATTRS{idProduct}=="0080", MODE:="666"
 ```
 
 ## Usage

comms.go

@@ -119,7 +119,7 @@ func (d *Device) Close() {
 
 // SetBrightness sets the button brightness
 // pct is an integer between 0-100
-func (d *Device) SetBrightness(pct int) {
+func (d *Device) SetBrightness(pct int) error {
 	if pct < 0 {
 		pct = 0
 	}
@@ -129,15 +129,33 @@ func (d *Device) SetBrightness(pct int) {
 
 	preamble := d.deviceType.brightnessPacket
 	payload := append(preamble, byte(pct))
-	d.fd.SendFeatureReport(payload)
+	_, err := d.fd.SendFeatureReport(payload)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+// GetButtonImageSize returns the size of the images to uploaded to the buttons
+func (d* Device) GetButtonImageSize() image.Point {
+	return d.deviceType.imageSize
+}
+
+// GetNumButtonsOnDevice returns the number of button this device has
+func (d* Device) GetNumButtonsOnDevice() uint {
+	return d.deviceType.numberOfButtons
 }
 
 // ClearButtons writes a black square to all buttons
-func (d *Device) ClearButtons() {
+func (d *Device) ClearButtons() error {
 	numButtons := int(d.deviceType.numberOfButtons)
 	for i := 0; i < numButtons; i++ {
-		d.WriteColorToButton(i, color.Black)
+		err := d.WriteColorToButton(i, color.Black)
+		if err != nil {
+			return err
+		}
 	}
+	return nil
 }
 
 // WriteColorToButton writes a specified color to the given button
@@ -156,7 +174,10 @@ func (d *Device) WriteImageToButton(btnIndex int, filename string) error {
 	if err != nil {
 		return err
 	}
-	d.WriteRawImageToButton(btnIndex, img)
+	err = d.WriteRawImageToButton(btnIndex, img)
+	if err != nil {
+		return err
+	}
 	return nil
 }
 
@@ -195,9 +216,10 @@ func (d *Device) ButtonPress(f func(int, *Device, error)) {
 }
 
 // ResetComms will reset the comms protocol to the StreamDeck; useful if things have gotten de-synced, but it will also reboot the StreamDeck
-func (d *Device) ResetComms() {
+func (d *Device) ResetComms() error {
 	payload := d.deviceType.resetPacket
-	d.fd.SendFeatureReport(payload)
+	_, err := d.fd.SendFeatureReport(payload)
+	return err
 }
 
 // WriteRawImageToButton takes an `image.Image` and writes it to the given button, after resizing and rotating the image to fit the button (for some reason the StreamDeck screens are all upside down)
@@ -250,7 +272,10 @@ func (d *Device) rawWriteToButton(btnIndex int, rawImage []byte) error {
 		padding := make([]byte, imageReportLength-len(payload))
 
 		thingToSend := append(payload, padding...)
-		d.fd.Write(thingToSend)
+		_, err := d.fd.Write(thingToSend)
+		if err != nil {
+			return err
+		}
 
 		bytesRemaining = bytesRemaining - thisLength
 		pageNumber = pageNumber + 1

devices/origmk2.go

@@ -0,0 +1,59 @@
+package devices
+
+import (
+	"image"
+
+	streamdeck "github.com/magicmonkey/go-streamdeck"
+)
+
+var (
+	omk2Name                     string
+	omk2ButtonWidth              uint
+	omk2ButtonHeight             uint
+	omk2ImageReportPayloadLength uint
+)
+
+// GetImageHeaderOv2 returns the USB comms header for a button image for the XL
+func GetImageHeaderOMK2(bytesRemaining uint, btnIndex uint, pageNumber uint) []byte {
+	thisLength := uint(0)
+	if ov2ImageReportPayloadLength < bytesRemaining {
+		thisLength = ov2ImageReportPayloadLength
+	} else {
+		thisLength = bytesRemaining
+	}
+	header := []byte{'\x02', '\x07', byte(btnIndex)}
+	if thisLength == bytesRemaining {
+		header = append(header, '\x01')
+	} else {
+		header = append(header, '\x00')
+	}
+
+	header = append(header, byte(thisLength&0xff))
+	header = append(header, byte(thisLength>>8))
+
+	header = append(header, byte(pageNumber&0xff))
+	header = append(header, byte(pageNumber>>8))
+
+	return header
+}
+
+func init() {
+	omk2Name = "Stream Deck MK.2"
+	omk2ButtonWidth = 72
+	omk2ButtonHeight = 72
+	omk2ImageReportPayloadLength = 1024
+	streamdeck.RegisterDevicetype(
+		omk2Name, // Name
+		image.Point{X: int(omk2ButtonWidth), Y: int(omk2ButtonHeight)}, // Width/height of a button
+		0x80,                         // USB productID
+		resetPacket32(),              // Reset packet
+		15,                           // Number of buttons
+		3,                            // Number of rows
+		5,                            // Number of columns
+		brightnessPacket32(),         // Set brightness packet preamble
+		4,                            // Button read offset
+		"JPEG",                       // Image format
+		omk2ImageReportPayloadLength, // Amount of image payload allowed per USB packet
+		GetImageHeaderOMK2,           // Function to get the comms image header
+	)
+}

image.go

@@ -25,7 +25,7 @@ func resizeAndRotate(img image.Image, width, height int, devname string) image.I
 
 func deviceSpecifics(devName string, width, height int) (*gift.GIFT, error) {
 	switch devName {
-	case "Streamdeck XL", "Streamdeck (original v2)":
+	case "Streamdeck XL", "Streamdeck (original v2)", "Stream Deck MK.2":
 		return gift.New(
 			gift.Resize(width, height, gift.LanczosResampling),
 			gift.Rotate180(),
@@ -41,7 +41,6 @@ func deviceSpecifics(devName string, width, height int) (*gift.GIFT, error) {
 			gift.Resize(width, height, gift.LanczosResampling),
 			gift.Rotate180(),
 		), nil
-
 	default:
 		return nil, errors.New(fmt.Sprintf("Unsupported Device: %s", devName))
 	}
@@ -62,7 +61,7 @@ func getImageForButton(img image.Image, btnFormat string) ([]byte, error) {
 
 func getSolidColourImage(colour color.Color, btnSize int) *image.RGBA {
 	img := image.NewRGBA(image.Rect(0, 0, btnSize, btnSize))
-	//colour := color.RGBA{red, green, blue, 0}
+	// colour := color.RGBA{red, green, blue, 0}
 	draw.Draw(img, img.Bounds(), image.NewUniform(colour), image.Point{0, 0}, draw.Src)
 	return img
 }