jalr/OpenRGB
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add Windows support for E1.31 Streaming ACN protocol devices

Browse source
This commit is contained in:
Adam Honse 2020-01-02 21:23:56 -06:00
parent a27c614a8b
commit 7bdf19387d
5 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitmodules vendored
View file

@ -1,3 +1,3 @@
[submodule "dependencies/libe131"]
path = dependencies/libe131
url = https://github.com/hhromic/libe131
url = https://github.com/CalcProgrammer1/libe131

3
OpenRGB.cpp
View file

@ -359,6 +359,8 @@ void DetectRGBControllers(void)
DetectAMDWraithPrismControllers(rgb_controllers);
DetectE131Controllers(rgb_controllers);
/*-------------------------------------*\
| Windows-only devices |
\*-------------------------------------*/
@ -370,7 +372,6 @@ void DetectRGBControllers(void)
| Linux-only devices |
\*-------------------------------------*/
#else
DetectE131Controllers(rgb_controllers);
DetectOpenRazerControllers(rgb_controllers);
#endif

10
OpenRGB.pro
View file

@ -6,6 +6,7 @@ TARGET = OpenRGB
TEMPLATE = app
INCLUDEPATH += \
dependencies/libe131/src/ \
i2c_smbus/ \
i2c_tools/ \
net_port/ \
@ -25,6 +26,7 @@ INCLUDEPATH += \
qt/
SOURCES += \
dependencies/libe131/src/e131.c \
main.cpp \
OpenRGB.cpp \
qt/OpenRGBDeviceInfoPage.cpp \
@ -59,6 +61,7 @@ SOURCES += \
Controllers/PolychromeController/PolychromeControllerDetect.cpp \
Controllers/RGBFusionController/RGBFusionController.cpp \
Controllers/RGBFusionController/RGBFusionControllerDetect.cpp \
RGBController/E131ControllerDetect.cpp \
RGBController/RGBController_AMDWraithPrism.cpp \
RGBController/RGBController_Aura.cpp \
RGBController/RGBController_Corsair.cpp \
@ -66,6 +69,7 @@ SOURCES += \
RGBController/RGBController_Hue2.cpp \
RGBController/RGBController_HuePlus.cpp \
RGBController/RGBController_HyperX.cpp \
RGBController/RGBController_E131.cpp \
RGBController/RGBController_LEDStrip.cpp \
RGBController/RGBController_PatriotViper.cpp \
RGBController/RGBController_Polychrome.cpp \
@ -98,6 +102,7 @@ HEADERS += \
RGBController/RGBController_Aura.h \
RGBController/RGBController_Corsair.h \
RGBController/RGBController_CorsairPro.h \
RGBController/RGBController_E131.h \
RGBController/RGBController_Hue2.h \
RGBController/RGBController_HuePlus.h \
RGBController/RGBController_HyperX.h \
@ -161,19 +166,14 @@ win32:DEFINES += \
# Linux specific project configuration
#-----------------------------------------------
unix:INCLUDEPATH += \
dependencies/libe131/src/ \
unix:HEADERS += \
i2c_smbus/i2c_smbus_linux.h \
RGBController/RGBController_E131.h \
unix:LIBS += \
-lusb-1.0
unix:SOURCES += \
dependencies/libe131/src/e131.c \
i2c_smbus/i2c_smbus_linux.cpp \
RGBController/OpenRazerDetect.cpp \
RGBController/E131ControllerDetect.cpp \
RGBController/RGBController_E131.cpp \
RGBController/RGBController_OpenRazer.cpp \

4
RGBController/E131ControllerDetect.cpp
View file

@ -13,6 +13,8 @@
#ifndef WIN32
#include <unistd.h>
#include <dirent.h>
#else
#include <windows.h>
#endif
#ifndef WIN32
@ -167,4 +169,4 @@ void DetectE131Controllers(std::vector<RGBController*> &rgb_controllers)
}
}
} /* DetectLEDStripControllers() */
} /* DetectE131Controllers() */

2
dependencies/libe131 vendored

@ -1 +1 @@
Subproject commit 0fc009f1f6c7eb93c465ccc8d79d5490f5186835
Subproject commit 930956795ab3344088c6f8e56a7662575ecc3eca