Started to build a way to separate the device types, to allow for different Streamdecks

Author: magicmonkey

comms.go

@@ -8,12 +8,41 @@ import (
 	"github.com/karalabe/hid"
 )
 
-const vendorID = 4057
-const productID = 0x6c
+const vendorID = 0x0fd9
+
+// deviceType represents one of the various types of StreamDeck (mini/orig/orig2/xl)
+type deviceType struct {
+	name            string
+	imageSize       image.Point
+	usbProductID    uint16
+	resetPacket     []byte
+	numberOfButtons uint
+}
+
+var deviceTypes []deviceType
+
+// RegisterDevicetype allows the declaration of a new type of device, intended for use by subpackage "devices"
+func RegisterDevicetype(
+	name string,
+	imageSize image.Point,
+	usbProductID uint16,
+	resetPacket []byte,
+	numberOfButtons uint,
+) {
+	d := deviceType{
+		name:            name,
+		imageSize:       imageSize,
+		usbProductID:    usbProductID,
+		resetPacket:     resetPacket,
+		numberOfButtons: numberOfButtons,
+	}
+	deviceTypes = append(deviceTypes, d)
+}
 
 // Device is a struct which represents an actual Streamdeck device, and holds its reference to the USB HID device
 type Device struct {
 	fd                   *hid.Device
+	deviceType           deviceType
 	buttonPressListeners []func(int, *Device, error)
 }
 
@@ -29,16 +58,23 @@ func OpenWithoutReset() (*Device, error) {
 
 // Opens a new StreamdeckXL device, and returns a handle
 func rawOpen(reset bool) (*Device, error) {
-	devices := hid.Enumerate(vendorID, productID)
+	devices := hid.Enumerate(vendorID, 0)
 	if len(devices) == 0 {
-		return nil, errors.New("no stream deck device found")
+		return nil, errors.New("No elgato devices found")
 	}
+
+	retval := &Device{}
 	id := 0
+	// Iterate over the known device types, matching to product ID
+	for _, devType := range deviceTypes {
+		if devices[id].ProductID == devType.usbProductID {
+			retval.deviceType = devType
+		}
+	}
 	dev, err := devices[id].Open()
 	if err != nil {
 		return nil, err
 	}
-	retval := &Device{}
 	retval.fd = dev
 	if reset {
 		retval.ResetComms()

devices/xl.go

@@ -0,0 +1,17 @@
+package devices
+
+import (
+	"image"
+
+	streamdeck "github.com/magicmonkey/go-streamdeck"
+)
+
+func init() {
+	streamdeck.RegisterDevicetype(
+		"Streamdeck XL",
+		image.Point{X: 96, Y: 96},
+		0x6c,                   // productID
+		[]byte{'\x03', '\x02'}, // reset packet
+		32,
+	)
+}

examples/client/client.go

@@ -8,6 +8,7 @@ import (
 	"github.com/magicmonkey/go-streamdeck/actionhandlers"
 	"github.com/magicmonkey/go-streamdeck/buttons"
 	"github.com/magicmonkey/go-streamdeck/decorators"
+	_ "github.com/magicmonkey/go-streamdeck/devices"
 )
 
 func main() {