From 7bdf19387d133e08bc4fa4669f231ecb86866007 Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Thu, 2 Jan 2020 21:23:56 -0600 Subject: [PATCH] Add Windows support for E1.31 Streaming ACN protocol devices --- .gitmodules | 2 +- OpenRGB.cpp | 3 ++- OpenRGB.pro | 10 +++++----- RGBController/E131ControllerDetect.cpp | 4 +++- dependencies/libe131 | 2 +- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.gitmodules b/.gitmodules index 9d63ed0f..12be370b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "dependencies/libe131"] path = dependencies/libe131 - url = https://github.com/hhromic/libe131 + url = https://github.com/CalcProgrammer1/libe131 diff --git a/OpenRGB.cpp b/OpenRGB.cpp index 975da2bb..47b0738a 100644 --- a/OpenRGB.cpp +++ b/OpenRGB.cpp @@ -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 diff --git a/OpenRGB.pro b/OpenRGB.pro index 4928b7be..e5f415e7 100644 --- a/OpenRGB.pro +++ b/OpenRGB.pro @@ -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 \ diff --git a/RGBController/E131ControllerDetect.cpp b/RGBController/E131ControllerDetect.cpp index 26639413..5716df1d 100644 --- a/RGBController/E131ControllerDetect.cpp +++ b/RGBController/E131ControllerDetect.cpp @@ -13,6 +13,8 @@ #ifndef WIN32 #include #include +#else +#include #endif #ifndef WIN32 @@ -167,4 +169,4 @@ void DetectE131Controllers(std::vector &rgb_controllers) } } -} /* DetectLEDStripControllers() */ \ No newline at end of file +} /* DetectE131Controllers() */ diff --git a/dependencies/libe131 b/dependencies/libe131 index 0fc009f1..93095679 160000 --- a/dependencies/libe131 +++ b/dependencies/libe131 @@ -1 +1 @@ -Subproject commit 0fc009f1f6c7eb93c465ccc8d79d5490f5186835 +Subproject commit 930956795ab3344088c6f8e56a7662575ecc3eca