From 45c7bc8008eedb233d8e8663e5355a3d5fb78d69 Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Wed, 25 Dec 2019 00:54:45 -0600 Subject: [PATCH] Add an RGBController interface for AMD Wraith Prism --- .../AMDWraithPrismController.h | 2 + .../AMDWraithPrismControllerDetect.cpp | 6 +- OpenRGB.pro | 2 + .../RGBController_AMDWraithPrism.cpp | 57 +++++++++++++++++++ RGBController/RGBController_AMDWraithPrism.h | 29 ++++++++++ RGBController/RGBController_HuePlus.cpp | 2 +- RGBController/RGBController_HuePlus.h | 2 +- 7 files changed, 97 insertions(+), 3 deletions(-) create mode 100644 RGBController/RGBController_AMDWraithPrism.cpp create mode 100644 RGBController/RGBController_AMDWraithPrism.h diff --git a/Controllers/AMDWraithPrismController/AMDWraithPrismController.h b/Controllers/AMDWraithPrismController/AMDWraithPrismController.h index d8473ce4..78a207d6 100644 --- a/Controllers/AMDWraithPrismController/AMDWraithPrismController.h +++ b/Controllers/AMDWraithPrismController/AMDWraithPrismController.h @@ -10,6 +10,8 @@ #include #include +#pragma once + class AMDWraithPrismController { public: diff --git a/Controllers/AMDWraithPrismController/AMDWraithPrismControllerDetect.cpp b/Controllers/AMDWraithPrismController/AMDWraithPrismControllerDetect.cpp index 7d5cbf2e..24bf39dd 100644 --- a/Controllers/AMDWraithPrismController/AMDWraithPrismControllerDetect.cpp +++ b/Controllers/AMDWraithPrismController/AMDWraithPrismControllerDetect.cpp @@ -1,6 +1,6 @@ #include "AMDWraithPrismController.h" #include "RGBController.h" -//#include "RGBController_AMDWraithPrism.h" +#include "RGBController_AMDWraithPrism.h" #include #include @@ -29,5 +29,9 @@ void DetectAMDWraithPrismControllers(std::vector& rgb_controller libusb_claim_interface(dev, 1); AMDWraithPrismController* controller = new AMDWraithPrismController(dev); + + RGBController_AMDWraithPrism* rgb_controller = new RGBController_AMDWraithPrism(controller); + + rgb_controllers.push_back(rgb_controller); } } diff --git a/OpenRGB.pro b/OpenRGB.pro index 83ab87c3..78d11d61 100644 --- a/OpenRGB.pro +++ b/OpenRGB.pro @@ -54,6 +54,7 @@ SOURCES += \ Controllers/PolychromeController/PolychromeController.cpp \ Controllers/RGBFusionController/RGBFusionController.cpp \ Controllers/RGBFusionController/RGBFusionControllerDetect.cpp \ + RGBController/RGBController_AMDWraithPrism.cpp \ RGBController/RGBController_Aura.cpp \ RGBController/RGBController_Corsair.cpp \ RGBController/RGBController_CorsairPro.cpp \ @@ -81,6 +82,7 @@ HEADERS += \ Controllers/HyperXController/HyperXController.h \ Controllers/LEDStripController/LEDStripController.h \ RGBController/RGBController.h \ + RGBController/RGBController_AMDWraithPrism.h \ RGBController/RGBController_Aura.h \ RGBController/RGBController_Corsair.h \ RGBController/RGBController_CorsairPro.h \ diff --git a/RGBController/RGBController_AMDWraithPrism.cpp b/RGBController/RGBController_AMDWraithPrism.cpp new file mode 100644 index 00000000..3a2fd985 --- /dev/null +++ b/RGBController/RGBController_AMDWraithPrism.cpp @@ -0,0 +1,57 @@ +/*-----------------------------------------*\ +| RGBController_AMDWraithPrism.cpp | +| | +| Generic RGB Interface for AMD Wraith | +| Prism | +| | +| Adam Honse (CalcProgrammer1) 12/25/2019 | +\*-----------------------------------------*/ + +#include "RGBController_AMDWraithPrism.h" + +RGBController_AMDWraithPrism::RGBController_AMDWraithPrism(AMDWraithPrismController* wraith_ptr) +{ + wraith = wraith_ptr; + + name = "AMD Wraith Prism"; +} + +RGBController_AMDWraithPrism::~RGBController_AMDWraithPrism() +{ + +} + +int RGBController_AMDWraithPrism::GetMode() +{ + +} + +void RGBController_AMDWraithPrism::SetMode(int mode) +{ + +} + +void RGBController_AMDWraithPrism::SetCustomMode() +{ + +} + +void RGBController_AMDWraithPrism::SetAllLEDs(RGBColor color) +{ + +} + +void RGBController_AMDWraithPrism::SetAllZoneLEDs(int zone, RGBColor color) +{ + +} + +void RGBController_AMDWraithPrism::SetLED(int led, RGBColor color) +{ + +} + +void RGBController_AMDWraithPrism::UpdateLEDs() +{ + +} \ No newline at end of file diff --git a/RGBController/RGBController_AMDWraithPrism.h b/RGBController/RGBController_AMDWraithPrism.h new file mode 100644 index 00000000..001a9cf0 --- /dev/null +++ b/RGBController/RGBController_AMDWraithPrism.h @@ -0,0 +1,29 @@ +/*-----------------------------------------*\ +| RGBController_AMDWraithPrism.h | +| | +| Generic RGB Interface for AMD Wraith | +| Prism | +| | +| Adam Honse (CalcProgrammer1) 12/25/2019 | +\*-----------------------------------------*/ + +#pragma once +#include "RGBController.h" +#include "AMDWraithPrismController.h" + +class RGBController_AMDWraithPrism : public RGBController +{ +public: + RGBController_AMDWraithPrism(AMDWraithPrismController* wraith_ptr); + ~RGBController_AMDWraithPrism(); + int GetMode(); + void SetMode(int mode); + void SetCustomMode(); + void SetAllLEDs(RGBColor color); + void SetAllZoneLEDs(int zone, RGBColor color); + void SetLED(int led, RGBColor color); + void UpdateLEDs(); + +private: + AMDWraithPrismController* wraith; +}; \ No newline at end of file diff --git a/RGBController/RGBController_HuePlus.cpp b/RGBController/RGBController_HuePlus.cpp index ce4a100f..114f998a 100644 --- a/RGBController/RGBController_HuePlus.cpp +++ b/RGBController/RGBController_HuePlus.cpp @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| RGBController_HuePlus.cpp | +| RGBController_HuePlus.cpp | | | | Generic RGB Interface for NZXT Hue+ | | | diff --git a/RGBController/RGBController_HuePlus.h b/RGBController/RGBController_HuePlus.h index dbf89b34..0f575015 100644 --- a/RGBController/RGBController_HuePlus.h +++ b/RGBController/RGBController_HuePlus.h @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| RGBController_HuePlus.h | +| RGBController_HuePlus.h | | | | Generic RGB Interface for NZXT Hue+ | | |