diff --git a/usbcontroller.h b/usbcontroller.h index 754be4f..9f1601e 100644 --- a/usbcontroller.h +++ b/usbcontroller.h @@ -148,6 +148,10 @@ private: void buttonState(QString but, double val); usbDeviceType usbDevice = usbNone; + unsigned short knownUsbDevices[3][3] = { + {shuttleXpress,0x0b33,0x0020}, + {shuttlePro2,0x0b33,0x0030}, + {RC28,0x0c26,0x001e} }; protected: diff --git a/wfviewtypes.h b/wfviewtypes.h index 454fdb7..b86e131 100644 --- a/wfviewtypes.h +++ b/wfviewtypes.h @@ -196,13 +196,4 @@ enum passbandActions {passbandStatic, pbtInnerMove, pbtOuterMove, pbtMoving, pas enum usbDeviceType { usbNone = 0, shuttleXpress, shuttlePro2, RC28, xBoxGamepad, unknownGamepad }; - -/* Entries in knownUsbDevices contain: - * {usbDeviceType,vendorId,productId} - */ -static unsigned short knownUsbDevices[3][3] = { - {shuttleXpress,0x0b33,0x0020}, - {shuttlePro2,0x0b33,0x0030}, - {RC28,0x0c26,0x001e} }; - #endif // WFVIEWTYPES_H