Merge remote-tracking branch 'tuomaz/master'

Author: magicmonkey

comms.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"image"
 	"image/color"
+	"log"
 
 	"github.com/karalabe/hid"
 )
@@ -219,6 +220,8 @@ func (d *Device) rawWriteToButton(btnIndex int, rawImage []byte) error {
 
 	pageNumber := 0
 	bytesRemaining := len(rawImage)
+	halfImage := len(rawImage) / 2
+	bytesSent := 0
 
 	for bytesRemaining > 0 {
 
@@ -227,15 +230,21 @@ func (d *Device) rawWriteToButton(btnIndex int, rawImage []byte) error {
 		imageReportHeaderLength := len(header)
 		imageReportPayloadLength := imageReportLength - imageReportHeaderLength
 
+		if halfImage > imageReportPayloadLength {
+			log.Fatalf("image too large: %d", halfImage*2)
+		}
+
 		thisLength := 0
 		if imageReportPayloadLength < bytesRemaining {
-			thisLength = imageReportPayloadLength
+			if d.deviceType.name == "Stream Deck Original" {
+				thisLength = halfImage
+			} else {
+				thisLength = imageReportPayloadLength
+			}
 		} else {
 			thisLength = bytesRemaining
 		}
 
-		bytesSent := pageNumber * imageReportPayloadLength
-
 		payload := append(header, rawImage[bytesSent:(bytesSent+thisLength)]...)
 		padding := make([]byte, imageReportLength-len(payload))
 
@@ -244,6 +253,7 @@ func (d *Device) rawWriteToButton(btnIndex int, rawImage []byte) error {
 
 		bytesRemaining = bytesRemaining - thisLength
 		pageNumber = pageNumber + 1
+		bytesSent = bytesSent + thisLength
 	}
 	return nil
 }
@@ -256,7 +266,7 @@ func Min(x, y int) int {
 	return y
 }
 
-func Max (x, y int) int {
+func Max(x, y int) int {
 	if x > y {
 		return x
 	}

devices/orig.go

@@ -0,0 +1,65 @@
+package devices
+
+import (
+	"image"
+
+	streamdeck "github.com/magicmonkey/go-streamdeck"
+)
+
+var (
+	originalName                     string
+	originalButtonWidth              uint
+	originalButtonHeight             uint
+	originalImageReportPayloadLength uint
+)
+
+// GetImageHeaderMini returns the USB comms header for a button image for the original
+func GetImageHeaderOriginal(bytesRemaining uint, btnIndex uint, pageNumber uint) []byte {
+	var thisLength uint
+	if originalImageReportPayloadLength < bytesRemaining {
+		thisLength = originalImageReportPayloadLength
+	} else {
+		thisLength = bytesRemaining
+	}
+	header := []byte{
+		'\x02',
+		'\x01',
+		byte(pageNumber + 1),
+		0,
+		get_header_element(thisLength, bytesRemaining),
+		byte(btnIndex + 1),
+		'\x00',
+		'\x00',
+		'\x00',
+		'\x00',
+		'\x00',
+		'\x00',
+		'\x00',
+		'\x00',
+		'\x00',
+		'\x00',
+	}
+
+	return header
+}
+
+func init() {
+	originalName = "Stream Deck Original"
+	originalButtonWidth = 72
+	originalButtonHeight = 72
+	originalImageReportPayloadLength = 8191 //8191
+	streamdeck.RegisterDevicetype(
+		originalName, // Name
+		image.Point{X: int(originalButtonWidth), Y: int(originalButtonHeight)}, // Width/height of a button
+		0x60,                             // USB productID
+		resetPacket17(),                  // Reset packet
+		15,                               // Number of buttons
+		3,                                // Number of rows
+		5,                                // Number of cols
+		brightnessPacket17(),             // Brightness packet
+		1,                                // Button read offset
+		"BMP",                            // Image format
+		originalImageReportPayloadLength, // Amount of image payload allowed per USB packet
+		GetImageHeaderOriginal,           // Function to get the comms image header
+	)
+}

image.go

@@ -25,19 +25,25 @@ 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)":
-			return gift.New(
-				gift.Resize(width, height, gift.LanczosResampling),
-				gift.Rotate180(),
-			), nil
-		case "Streamdeck Mini":
-			return gift.New(
-				gift.Resize(width, height, gift.LanczosResampling),
-				gift.Rotate90(),
-				gift.FlipVertical(),
-			), nil
-		default:
-			return nil, errors.New(fmt.Sprintf("Unsupported Device: %s", devName))
+	case "Streamdeck XL", "Streamdeck (original v2)":
+		return gift.New(
+			gift.Resize(width, height, gift.LanczosResampling),
+			gift.Rotate180(),
+		), nil
+	case "Streamdeck Mini":
+		return gift.New(
+			gift.Resize(width, height, gift.LanczosResampling),
+			gift.Rotate90(),
+			gift.FlipVertical(),
+		), nil
+	case "Stream Deck Original":
+		return gift.New(
+			gift.Resize(width, height, gift.LanczosResampling),
+			gift.Rotate180(),
+		), nil
+
+	default:
+		return nil, errors.New(fmt.Sprintf("Unsupported Device: %s", devName))
 	}
 }