Removed the device-specific stuff from the shared file, and allowed the device-specific files to choose

Author: magicmonkey

devices/mini.go

@@ -58,27 +58,17 @@ func init() {
 	miniButtonWidth = 80
 	miniButtonHeight = 80
 	miniImageReportPayloadLength = 1024
-	// Get reset packet from device name
-	reset, err := resetPacket(miniName)
-	if err != nil {
-		panic(err)
-	}
-	// Get brightness packet from device name
-	brightness, err := brightnessPacket(miniName)
-	if err != nil {
-		panic(err)
-	}
 	streamdeck.RegisterDevicetype(
 		miniName, // Name
 		image.Point{X: int(miniButtonWidth), Y: int(miniButtonHeight)}, // Width/height of a button
-		0x63,                        // USB productID
-		reset,                      // Reset packet
-		6,                          // Number of buttons
-		2,                           // Number of rows
-		3,                           // Number of cols
-		brightness,                  // Reset packet
-		1,                           // 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

@@ -42,25 +42,15 @@ func init() {
 	ov2ButtonWidth = 72
 	ov2ButtonHeight = 72
 	ov2ImageReportPayloadLength = 1024
-	// Get reset packet based on device
-	reset, err := resetPacket(ov2Name)
-	if err != nil {
-		panic(err)
-	}
-	// Get brightness packet based on device
-	brightness, err := brightnessPacket(ov2Name)
-	if err != nil {
-		panic(err)
-	}
 	streamdeck.RegisterDevicetype(
 		ov2Name, // Name
 		image.Point{X: int(ov2ButtonWidth), Y: int(ov2ButtonHeight)}, // Width/height of a button
 		0x6d,                        // USB productID
-		reset,                       // Reset packet
+		resetPacket32(),             // Reset packet
 		15,                          // Number of buttons
 		3,                           // Number of rows
 		5,                           // Number of columns
-		brightness,                  // Set brightness packet preamble
+		brightnessPacket32(),        // Set brightness packet preamble
 		4,                           // Button read offset
 		"JPEG",                      // Image format
 		ov2ImageReportPayloadLength, // Amount of image payload allowed per USB packet

devices/shared.go

@@ -1,51 +1,36 @@
 package devices
 
-import "errors"
-
-func resetPacket(device string) ([]byte, error) {
-	var size int
-	var header []byte
-	
-	switch device {
-	case "Streamdeck XL", "Streamdeck (original v2)":
-		size = 32
-		header = []byte{0x03, 0x02}
-	case "Streamdeck Mini":
-		size = 17
-		header = []byte{0x0b, 0x63}
-	default:
-		return nil, errors.New("Device not supported!")
-	}
-	
-	b := make([]byte, size)
-	b[0] = header[0]
-	b[1] = header[1]
-	return b, nil
+// 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
 }
 
-func brightnessPacket(device string) ([]byte, error) {
-	var size int
-	var header []byte
-
-	switch device {
-	case "Streamdeck XL", "Streamdeck (original v2)":
-		size = 32
-		header = []byte{0x03, 0x08}
-	case "Streamdeck Mini":
-		size = 17
-		header = []byte{0x05, 0x55, 0xaa, 0xd1, 0x01}
-	default:
-		return nil, errors.New("Device is not supported!")
-	}
+// 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
+}
 
-	b := make([]byte, size)
-	b[0] = header[0]
-	b[1] = header[1]
-	if device == "Streamdeck Mini" {
-		b[2] = header[2]
-		b[3] = header[3]
-		b[4] = header[4]
-	}
-	return b, nil
+// 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

@@ -42,25 +42,15 @@ func init() {
 	xlButtonWidth = 96
 	xlButtonHeight = 96
 	xlImageReportPayloadLength = 1024
-	// Get reset packet from device name
-	reset, err := resetPacket(xlName)
-	if err != nil {
-		panic(err)
-	}
-	// Get brightness packet from device name
-	brightness, err := brightnessPacket(xlName)
-	if err != nil {
-		panic(err)
-	}
 	streamdeck.RegisterDevicetype(
 		xlName, // Name
 		image.Point{X: int(xlButtonWidth), Y: int(xlButtonHeight)}, // Width/height of a button
 		0x6c,                       // USB productID
-		reset,                      // Reset packet
+		resetPacket32(),            // Reset packet
 		32,                         // Number of buttons
 		4,                          // Number of rows
 		8,                          // Number of cols
-		brightness,                 // Set brightness packet preamble
+		brightnessPacket32(),       // Set brightness packet preamble
 		4,                          // Button read offset
 		"JPEG",                     // Image format
 		xlImageReportPayloadLength, // Amount of image payload allowed per USB packet