Merge branch 'device_updates'

Author: magicmonkey

comms.go

@@ -18,6 +18,8 @@ type deviceType struct {
 	usbProductID        uint16
 	resetPacket         []byte
 	numberOfButtons     uint
+	buttonRows          uint
+	buttonCols          uint
 	brightnessPacket    []byte
 	buttonReadOffset    uint
 	imageFormat         string
@@ -34,6 +36,8 @@ func RegisterDevicetype(
 	usbProductID uint16,
 	resetPacket []byte,
 	numberOfButtons uint,
+	buttonRows uint,
+	buttonCols uint,
 	brightnessPacket []byte,
 	buttonReadOffset uint,
 	imageFormat string,
@@ -46,6 +50,8 @@ func RegisterDevicetype(
 		usbProductID:        usbProductID,
 		resetPacket:         resetPacket,
 		numberOfButtons:     numberOfButtons,
+		buttonRows:          buttonRows,
+		buttonCols:          buttonCols,
 		brightnessPacket:    brightnessPacket,
 		buttonReadOffset:    buttonReadOffset,
 		imageFormat:         imageFormat,

devices/mini.go

@@ -61,12 +61,14 @@ func init() {
 	streamdeck.RegisterDevicetype(
 		miniName, // Name
 		image.Point{X: int(miniButtonWidth), Y: int(miniButtonHeight)}, // Width/height of a button
-		0x63,                        // USB productID
-		[]byte{0x0B, 0x63},      // Reset packet
-		6,                          // Number of buttons
-		[]byte{0x05, 0x55, 0xaa, 0xd1, 0x01},      // Reset packet
-		0,                           // Button read offset
-		"BMP",                      // Image format
+		0x63,                         // USB productID
+		resetPacket17(),              // Reset packet
+		6,                            // Number of buttons
+		2,                            // Number of rows
+		3,                            // Number of cols
+		brightnessPacket17(),         // Brightness packet
+		1,                            // Button read offset
+		"BMP",                        // Image format
 		miniImageReportPayloadLength, // Amount of image payload allowed per USB packet
 		GetImageHeaderMini,           // Function to get the comms image header
 	)

devices/origv2.go

@@ -46,9 +46,11 @@ func init() {
 		ov2Name, // Name
 		image.Point{X: int(ov2ButtonWidth), Y: int(ov2ButtonHeight)}, // Width/height of a button
 		0x6d,                        // USB productID
-		[]byte{'\x03', '\x02'},      // Reset packet
+		resetPacket32(),             // Reset packet
 		15,                          // Number of buttons
-		[]byte{'\x03', '\x08'},      // Set brightness packet preamble
+		3,                           // Number of rows
+		5,                           // Number of columns
+		brightnessPacket32(),        // Set brightness packet preamble
 		4,                           // Button read offset
 		"JPEG",                      // Image format
 		ov2ImageReportPayloadLength, // Amount of image payload allowed per USB packet

devices/shared.go

@@ -0,0 +1,36 @@
+package devices
+
+// resetPacket17 gives the reset packet for devices which need it to be 17 bytes long
+func resetPacket17() []byte {
+	pkt := make([]byte, 17)
+	pkt[0] = 0x0b
+	pkt[1] = 0x63
+	return pkt
+}
+
+// resetPacket32 gives the reset packet for devices which need it to be 32 bytes long
+func resetPacket32() []byte {
+	pkt := make([]byte, 32)
+	pkt[0] = 0x03
+	pkt[1] = 0x02
+	return pkt
+}
+
+// brightnessPacket17 gives the brightness packet for devices which need it to be 17 bytes long
+func brightnessPacket17() []byte {
+	pkt := make([]byte, 17)
+	pkt[0] = 0x05
+	pkt[1] = 0x55
+	pkt[2] = 0xaa
+	pkt[3] = 0xd1
+	pkt[4] = 0x01
+	return pkt
+}
+
+// brightnessPacket32 gives the brightness packet for devices which need it to be 32 bytes long
+func brightnessPacket32() []byte {
+	pkt := make([]byte, 32)
+	pkt[0] = 0x03
+	pkt[1] = 0x08
+	return pkt
+}

devices/xl.go

@@ -46,9 +46,11 @@ func init() {
 		xlName, // Name
 		image.Point{X: int(xlButtonWidth), Y: int(xlButtonHeight)}, // Width/height of a button
 		0x6c,                       // USB productID
-		[]byte{'\x03', '\x02'},     // Reset packet
+		resetPacket32(),            // Reset packet
 		32,                         // Number of buttons
-		[]byte{'\x03', '\x08'},     // Set brightness packet preamble
+		4,                          // Number of rows
+		8,                          // Number of cols
+		brightnessPacket32(),       // Set brightness packet preamble
 		4,                          // Button read offset
 		"JPEG",                     // Image format
 		xlImageReportPayloadLength, // Amount of image payload allowed per USB packet