Update MSI-RGB controller to new RGBController API

This commit is contained in:
Adam Honse
2020-03-07 16:20:35 -06:00
parent 2ffb02abde
commit 515c17b8dd
4 changed files with 31 additions and 16 deletions

View File

@@ -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);

View File

@@ -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 \

View File

@@ -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)
{
}

View File

@@ -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;
};
};