From 515c17b8dd10e15a7c979ebe3388fa9ab0ebdec3 Mon Sep 17 00:00:00 2001
From: Adam Honse <calcprogrammer1@gmail.com>
Date: Sat, 7 Mar 2020 16:20:35 -0600
Subject: [PATCH] Update MSI-RGB controller to new RGBController API

---
 OpenRGB.cpp                            |  2 +-
 OpenRGB.pro                            |  8 +++----
 RGBController/RGBController_MSIRGB.cpp | 30 +++++++++++++++++---------
 RGBController/RGBController_MSIRGB.h   |  7 +++++-
 4 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/OpenRGB.cpp b/OpenRGB.cpp
index 28c0fa1c6..021690db5 100644
--- a/OpenRGB.cpp
+++ b/OpenRGB.cpp
@@ -325,7 +325,7 @@ void DetectRGBControllers(void)
     DetectRGBFusionGPUControllers(busses, rgb_controllers);
 
     DetectRGBFusionControllers(busses, rgb_controllers);
-    //DetectMSIRGBControllers(rgb_controllers);
+    DetectMSIRGBControllers(rgb_controllers);
 
     DetectLEDStripControllers(rgb_controllers);
     DetectHue2Controllers(rgb_controllers);
diff --git a/OpenRGB.pro b/OpenRGB.pro
index f49c6ad13..2e6542510 100644
--- a/OpenRGB.pro
+++ b/OpenRGB.pro
@@ -43,7 +43,7 @@ INCLUDEPATH +=                                                          \
 #    Controllers/HyperXKeyboardController/                               \
     Controllers/LEDStripController/                                     \
 #    Controllers/MSI3ZoneController/                                     \
-#    Controllers/MSIRGBController/                                       \
+    Controllers/MSIRGBController/                                       \
 #    Controllers/PatriotViperController/                                 \
 #    Controllers/PolychromeController/                                   \
 #    Controllers/PoseidonZRGBController/                                 \
@@ -103,8 +103,8 @@ SOURCES +=                                                              \
     Controllers/LEDStripController/LEDStripControllerDetect.cpp         \
 #    Controllers/MSI3ZoneController/MSI3ZoneController.cpp               \
 #    Controllers/MSI3ZoneController/MSI3ZoneControllerDetect.cpp         \
-#    Controllers/MSIRGBController/MSIRGBController.cpp                   \
-#    Controllers/MSIRGBController/MSIRGBControllerDetect.cpp             \
+    Controllers/MSIRGBController/MSIRGBController.cpp                   \
+    Controllers/MSIRGBController/MSIRGBControllerDetect.cpp             \
 #    Controllers/PatriotViperController/PatriotViperController.cpp       \
 #    Controllers/PatriotViperController/PatriotViperControllerDetect.cpp \
 #    Controllers/PolychromeController/PolychromeController.cpp           \
@@ -137,7 +137,7 @@ SOURCES +=                                                              \
     RGBController/RGBController_E131.cpp                                \
     RGBController/RGBController_LEDStrip.cpp                            \
 #    RGBController/RGBController_MSI3Zone.cpp                            \
-#    RGBController/RGBController_MSIRGB.cpp                              \
+    RGBController/RGBController_MSIRGB.cpp                              \
 #    RGBController/RGBController_PatriotViper.cpp                        \
 #    RGBController/RGBController_Polychrome.cpp                          \
 #    RGBController/RGBController_PoseidonZRGB.cpp                        \
diff --git a/RGBController/RGBController_MSIRGB.cpp b/RGBController/RGBController_MSIRGB.cpp
index a07bd5675..e77c1e578 100644
--- a/RGBController/RGBController_MSIRGB.cpp
+++ b/RGBController/RGBController_MSIRGB.cpp
@@ -24,22 +24,32 @@ RGBController_MSIRGB::RGBController_MSIRGB(MSIRGBController* msi_ptr)
     Direct.color_mode = MODE_COLORS_PER_LED;
     modes.push_back(Direct);
 
+    SetupZones();
+}
+
+RGBController_MSIRGB::~RGBController_MSIRGB()
+{
+
+}
+
+void RGBController_MSIRGB::SetupZones()
+{
+    zone msi_zone;
+    msi_zone.name           = "MSI Zone";
+    msi_zone.type           = ZONE_TYPE_SINGLE;
+    msi_zone.leds_min       = 1;
+    msi_zone.leds_max       = 1;
+    msi_zone.leds_count     = 1;
+    zones.push_back(msi_zone);
+
     led msi_led;
     msi_led.name = "MSI LED";
     leds.push_back(msi_led);
 
-    zone msi_zone;
-    msi_zone.name = "MSI Zone";
-    msi_zone.type = ZONE_TYPE_SINGLE;
-    std::vector<int> msi_zone_map;
-    msi_zone_map.push_back(0);
-    msi_zone.map.push_back(msi_zone_map);
-    zones.push_back(msi_zone);
-
-    colors.push_back(0x00000000);
+    SetupColors();
 }
 
-RGBController_MSIRGB::~RGBController_MSIRGB()
+void RGBController_MSIRGB::ResizeZone(int zone, int new_size)
 {
 
 }
diff --git a/RGBController/RGBController_MSIRGB.h b/RGBController/RGBController_MSIRGB.h
index f3d1ef212..fb57cc7d3 100644
--- a/RGBController/RGBController_MSIRGB.h
+++ b/RGBController/RGBController_MSIRGB.h
@@ -15,6 +15,11 @@ class RGBController_MSIRGB : public RGBController
 public:
     RGBController_MSIRGB(MSIRGBController* msi_ptr);
     ~RGBController_MSIRGB();
+
+    void        SetupZones();
+
+    void        ResizeZone(int zone, int new_size);
+
     void        UpdateLEDs();
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
@@ -24,4 +29,4 @@ public:
 
 private:
     MSIRGBController*       msi;
-};
\ No newline at end of file
+};