Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add DMXControl Projects e.V. Nodle R4S #1978

Merged
merged 1 commit into from
Nov 11, 2024
+10 −0
Merged

Add DMXControl Projects e.V. Nodle R4S #1978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions debian/ola.udev
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ SUBSYSTEM=="usb|usb_device", ACTION=="add", ATTRS{idVendor}=="10cf", ATTRS{idPro
# udev rules for the ShowJockey-DMX-U1 device
SUBSYSTEM=="usb|usb_device", ACTION=="add", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="57fe", GROUP="plugdev"

# udev rules for the DMXControl Projects e.V. Nodle R4S
SUBSYSTEM=="usb|usb_device", ACTION=="add", ATTRS{idVendor}=="16d0", ATTRS{idProduct}=="0833", GROUP="plugdev", TAG+="uaccess"

# 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"

Expand Down
1 change: 1 addition & 0 deletions debian/org.openlighting.ola.ola.metainfo.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
<modalias>usb:v0962p*</modalias> <!-- USBDMX2 -->
<modalias>usb:v10CFp8062d*</modalias> <!-- Velleman -->
<modalias>usb:v0a30p0002d*</modalias> <!-- DMXCreator 512 Basic -->
<modalias>usb:v16D0p0833d*</modalias> <!-- DMXControl Projects e.V. Nodle R4S -->
<modalias>usb:v16D0p0830d*</modalias> <!-- DMXControl Projects e.V. Nodle U1 -->
<modalias>usb:v04B4p0F1Fd*</modalias> <!-- Digital Enlightenment DMX-USB -->
<modalias>usb:v16C0p088Bd*</modalias> <!-- FX5 DMX -->
Expand Down
3 changes: 3 additions & 0 deletions plugins/usbdmx/DMXCProjectsNodleU1Factory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ namespace usbdmx {

const uint16_t DMXCProjectsNodleU1Factory::VENDOR_ID_DMXC_PROJECTS = 0x16d0;
const uint16_t DMXCProjectsNodleU1Factory::PRODUCT_ID_DMXC_P_NODLE_U1 = 0x0830;
const uint16_t DMXCProjectsNodleU1Factory::PRODUCT_ID_DMXC_P_NODLE_R4S = 0x0833;

const uint16_t DMXCProjectsNodleU1Factory::VENDOR_ID_DE = 0x4b4;
const uint16_t DMXCProjectsNodleU1Factory::PRODUCT_ID_DE_USB_DMX = 0xf1f;
Expand All @@ -45,6 +46,8 @@ bool DMXCProjectsNodleU1Factory::DeviceAdded(
const struct libusb_device_descriptor &descriptor) {
if (!((descriptor.idVendor == VENDOR_ID_DMXC_PROJECTS &&
descriptor.idProduct == PRODUCT_ID_DMXC_P_NODLE_U1) ||
(descriptor.idVendor == VENDOR_ID_DMXC_PROJECTS &&
descriptor.idProduct == PRODUCT_ID_DMXC_P_NODLE_R4S) ||
(descriptor.idVendor == VENDOR_ID_DE &&
descriptor.idProduct == PRODUCT_ID_DE_USB_DMX) ||
(descriptor.idVendor == VENDOR_ID_FX5 &&
Expand Down
1 change: 1 addition & 0 deletions plugins/usbdmx/DMXCProjectsNodleU1Factory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ class DMXCProjectsNodleU1Factory :
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_DMXC_P_NODLE_R4S;
static const uint16_t PRODUCT_ID_DE_USB_DMX;
static const uint16_t PRODUCT_ID_FX5_DMX;

Expand Down
1 change: 1 addition & 0 deletions plugins/usbdmx/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ This plugin supports various USB DMX devices including:
* Anyma uDMX
* AVLdiy D512
* Digital Enlightenment USB-DMX
* DMXControl Projects e.V. Nodle R4S
* DMXControl Projects e.V. Nodle U1
* DMXCreator 512 Basic
* Eurolite USB-DMX512 PRO
Expand Down
1 change: 1 addition & 0 deletions plugins/usbdmx/UsbDmxPlugin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ namespace usbdmx {
* This plugin supports a number of USB dongles including
* - Anyma uDMX.
* - AVLdiy D512.
* - DMXControl Projects e.V. Nodle R4S.
* - DMXControl Projects e.V. Nodle U1.
* - DMXCreator 512 Basic USB.
* - Eurolite DMX USB Pro.
Expand Down
Loading