Merge pull request #1410 from bitte-ein-bit/feature/de-interface

Feature/de interface

Author: peternewman

debian/ola.udev

@@ -21,6 +21,12 @@ SUBSYSTEM=="usb|usb_device", ACTION=="add", ATTRS{idVendor}=="0483", ATTRS{idPro
 # udev rules for the DMXControl Projects e.V. Nodle U1
 SUBSYSTEM=="usb|usb_device", ACTION=="add", ATTRS{idVendor}=="16d0", ATTRS{idProduct}=="0830", GROUP="plugdev", TAG+="uaccess"
 
+# udev rules for the Digital Enlightenment USB-DMX device
+SUBSYSTEM=="usb|usb_device", ACTION=="add", ATTRS{idVendor}=="04b4", ATTRS{idProduct}=="0f1f", GROUP="plugdev"
+
+# udev rules for the FX5 DMX device
+SUBSYSTEM=="usb|usb_device", ACTION=="add", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="088b", GROUP="plugdev"
+
 # udev rules for the DMXCreator 512 Basic device
 SUBSYSTEM=="usb|usb_device", ACTION=="add", ATTRS{idVendor}=="0a30", ATTRS{idProduct}=="0002", GROUP="plugdev"
 

debian/org.openlighting.ola.ola.metainfo.xml

@@ -26,7 +26,10 @@
     <modalias>usb:v16C0p05DCd*</modalias> <!-- Anyma DMX -->
     <modalias>usb:v0962p*</modalias> <!-- USBDMX2 -->
     <modalias>usb:v10CFp8062d*</modalias> <!-- Velleman -->
+    <modalias>usb:v0a30p0002d*</modalias> <!-- DMXCreator 512 Basic -->
     <modalias>usb:v16D0p0830d*</modalias> <!-- DMXControl Projects e.V. Nodle U1 -->
+    <modalias>usb:v04B4p0F1Fd*</modalias> <!-- Digital Enlightenment DMX-USB -->
+    <modalias>usb:v16C0p088Bd*</modalias> <!-- FX5 DMX -->
     <modalias>usb:v04D8pFA63d*</modalias> <!-- Eurolite -->
     <!--<modalias>usb:vpd*</modalias>--> <!-- Karate -->
     <modalias>usb:v1D50p607Ad*</modalias> <!-- Scanlime Fadecandy -->

plugins/usbdmx/DMXCProjectsNodleU1.cpp

@@ -49,7 +49,10 @@ namespace {
 
 static const unsigned char WRITE_ENDPOINT = 0x02;
 static const unsigned char READ_ENDPOINT = 0x81;
-static const unsigned int URB_TIMEOUT_MS = 50;
+// On a non-overclocked Raspberry Pi 1 the previous value of 50ms lead to some
+// timeout transfer errors. Changing to 60 and a nice level of -20 made them go
+// away. Changing to 70 made them go away without touching the nice level.
+static const unsigned int URB_TIMEOUT_MS = 70;
 static const int CONFIGURATION = 1;
 static const int INTERFACE = 0;
 

plugins/usbdmx/DMXCProjectsNodleU1Factory.cpp

@@ -30,14 +30,25 @@ namespace ola {
 namespace plugin {
 namespace usbdmx {
 
-const uint16_t DMXCProjectsNodleU1Factory::VENDOR_ID = 0x16d0;
-const uint16_t DMXCProjectsNodleU1Factory::PRODUCT_ID = 0x0830;
+const uint16_t DMXCProjectsNodleU1Factory::VENDOR_ID_DMXC_PROJECTS = 0x16d0;
+const uint16_t DMXCProjectsNodleU1Factory::PRODUCT_ID_DMXC_P_NODLE_U1 = 0x0830;
+
+const uint16_t DMXCProjectsNodleU1Factory::VENDOR_ID_DE = 0x4b4;
+const uint16_t DMXCProjectsNodleU1Factory::PRODUCT_ID_DE_USB_DMX = 0xf1f;
+
+const uint16_t DMXCProjectsNodleU1Factory::VENDOR_ID_FX5 = 0x16c0;
+const uint16_t DMXCProjectsNodleU1Factory::PRODUCT_ID_FX5_DMX = 0x88b;
 
 bool DMXCProjectsNodleU1Factory::DeviceAdded(
     WidgetObserver *observer,
     libusb_device *usb_device,
     const struct libusb_device_descriptor &descriptor) {
-  if (descriptor.idVendor != VENDOR_ID || descriptor.idProduct != PRODUCT_ID) {
+  if (!((descriptor.idVendor == VENDOR_ID_DMXC_PROJECTS &&
+         descriptor.idProduct == PRODUCT_ID_DMXC_P_NODLE_U1) ||
+        (descriptor.idVendor == VENDOR_ID_DE &&
+         descriptor.idProduct == PRODUCT_ID_DE_USB_DMX) ||
+        (descriptor.idVendor == VENDOR_ID_FX5 &&
+         descriptor.idProduct == PRODUCT_ID_FX5_DMX) )) {
     return false;
   }
 

plugins/usbdmx/DMXCProjectsNodleU1Factory.h

@@ -57,8 +57,12 @@ class DMXCProjectsNodleU1Factory :
   PluginAdaptor* const m_plugin_adaptor;
   Preferences* const m_preferences;
 
-  static const uint16_t VENDOR_ID;
-  static const uint16_t PRODUCT_ID;
+  static const uint16_t VENDOR_ID_DMXC_PROJECTS;
+  static const uint16_t VENDOR_ID_DE;
+  static const uint16_t VENDOR_ID_FX5;
+  static const uint16_t PRODUCT_ID_DMXC_P_NODLE_U1;
+  static const uint16_t PRODUCT_ID_DE_USB_DMX;
+  static const uint16_t PRODUCT_ID_FX5_DMX;
 
   DISALLOW_COPY_AND_ASSIGN(DMXCProjectsNodleU1Factory);
 };

plugins/usbdmx/README.md

@@ -5,11 +5,13 @@ This plugin supports various USB DMX devices including:
 
 * Anyma uDMX
 * AVLdiy D512
+* Digital Enlightenment USB-DMX
 * DMXControl Projects e.V. Nodle U1
 * DMXCreator 512 Basic
 * Eurolite USB-DMX512 PRO
 * Eurolite USB-DMX512 PRO MK2 (when `enable_eurolite_mk2 = true`)
 * Fadecandy
+* FX5 DMX
 * ShowJockey SJ-DMX-U1
 * Sunlite USBDMX2
 * Velleman K8062.