From 495c3cfe6801e9035d3c6540700058bf8f415071 Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Mon, 9 Nov 2020 23:35:50 -0600 Subject: [PATCH] Fix padding in MSI Mystic Light controller and disable multiple-zone modes. Controller is still not enabled for general use. See Issue #389 --- .../MSIMysticLightController.h | 2 +- .../RGBController_MSIMysticLight.cpp | 68 +++++++++---------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/Controllers/MSIMysticLightController/MSIMysticLightController.h b/Controllers/MSIMysticLightController/MSIMysticLightController.h index 7799bfe8..39397239 100644 --- a/Controllers/MSIMysticLightController/MSIMysticLightController.h +++ b/Controllers/MSIMysticLightController/MSIMysticLightController.h @@ -128,7 +128,7 @@ struct CorsairZoneData Color color { 0, 0, 0 }; unsigned char fan_flags = 40; unsigned char corsair_quantity; - unsigned char padding[3]; + unsigned char padding[4]; unsigned char is_individual = 0; }; diff --git a/Controllers/MSIMysticLightController/RGBController_MSIMysticLight.cpp b/Controllers/MSIMysticLightController/RGBController_MSIMysticLight.cpp index e85bf117..ec4c89e5 100644 --- a/Controllers/MSIMysticLightController/RGBController_MSIMysticLight.cpp +++ b/Controllers/MSIMysticLightController/RGBController_MSIMysticLight.cpp @@ -149,40 +149,40 @@ void RGBController_MSIMysticLight::SetupModes() SetupMode("Flashing", MSI_MODE_FLASHING, COMMON); SetupMode("Double flashing", MSI_MODE_DOUBLE_FLASHING, COMMON); SetupMode("Lightning", MSI_MODE_LIGHTNING, COMMON); - SetupMode("MSI Marquee", MSI_MODE_MSI_MARQUEE, COMMON); - SetupMode("Meteor", MSI_MODE_METEOR, COMMON); - SetupMode("Water drop", MSI_MODE_WATER_DROP, COMMON); - SetupMode("MSI Rainbow", MSI_MODE_MSI_RAINBOW, RANDOM_ONLY); - SetupMode("Pop", MSI_MODE_POP, COMMON); - SetupMode("Rap", MSI_MODE_RAP, COMMON); - SetupMode("Jazz", MSI_MODE_JAZZ, COMMON); - SetupMode("Play", MSI_MODE_PLAY, COMMON); - SetupMode("Movie", MSI_MODE_MOVIE, COMMON); - SetupMode("Color ring", MSI_MODE_COLOR_RING, COMMON); - SetupMode("Planetary", MSI_MODE_PLANETARY, COMMON); - SetupMode("Double meteor", MSI_MODE_DOUBLE_METEOR, COMMON); - SetupMode("Energy", MSI_MODE_ENERGY, COMMON); - SetupMode("Blink", MSI_MODE_BLINK, COMMON); - SetupMode("Clock", MSI_MODE_CLOCK, COMMON); - SetupMode("Color pulse", MSI_MODE_COLOR_PULSE, COMMON); - SetupMode("Color shift", MSI_MODE_COLOR_SHIFT, COMMON); - SetupMode("Color wave", MSI_MODE_COLOR_WAVE, COMMON); - SetupMode("Marquee", MSI_MODE_MARQUEE, COMMON); - SetupMode("Rainbow", MSI_MODE_RAINBOW, COMMON); - SetupMode("Rainbow wave", MSI_MODE_RAINBOW_WAVE, COMMON); - SetupMode("Visor", MSI_MODE_VISOR, COMMON); - SetupMode("JRainbow", MSI_MODE_JRAINBOW, COMMON); - SetupMode("Rainbow flashing", MSI_MODE_RAINBOW_FLASHING, COMMON); - SetupMode("Rainbow double flashing", MSI_MODE_RAINBOW_DOUBLE_FLASHING, COMMON); - SetupMode("Random", MSI_MODE_RANDOM, COMMON); - SetupMode("Fan control", MSI_MODE_FAN_CONTROL, COMMON); - SetupMode("Off 2", MSI_MODE_DISABLE_2, COMMON); - SetupMode("Color ring flashing", MSI_MODE_COLOR_RING_FLASHING, COMMON); - SetupMode("Color ring double flashing", MSI_MODE_COLOR_RING_DOUBLE_FLASHING, COMMON); - SetupMode("Stack", MSI_MODE_STACK, COMMON); - SetupMode("Corsair Que", MSI_MODE_CORSAIR_QUE, COMMON); - SetupMode("Fire", MSI_MODE_FIRE, COMMON); - SetupMode("Lava", MSI_MODE_LAVA, COMMON); + // SetupMode("MSI Marquee", MSI_MODE_MSI_MARQUEE, COMMON); + // SetupMode("Meteor", MSI_MODE_METEOR, COMMON); + // SetupMode("Water drop", MSI_MODE_WATER_DROP, COMMON); + // SetupMode("MSI Rainbow", MSI_MODE_MSI_RAINBOW, RANDOM_ONLY); + // SetupMode("Pop", MSI_MODE_POP, COMMON); + // SetupMode("Rap", MSI_MODE_RAP, COMMON); + // SetupMode("Jazz", MSI_MODE_JAZZ, COMMON); + // SetupMode("Play", MSI_MODE_PLAY, COMMON); + // SetupMode("Movie", MSI_MODE_MOVIE, COMMON); + // SetupMode("Color ring", MSI_MODE_COLOR_RING, COMMON); + // SetupMode("Planetary", MSI_MODE_PLANETARY, COMMON); + // SetupMode("Double meteor", MSI_MODE_DOUBLE_METEOR, COMMON); + // SetupMode("Energy", MSI_MODE_ENERGY, COMMON); + // SetupMode("Blink", MSI_MODE_BLINK, COMMON); + // SetupMode("Clock", MSI_MODE_CLOCK, COMMON); + // SetupMode("Color pulse", MSI_MODE_COLOR_PULSE, COMMON); + // SetupMode("Color shift", MSI_MODE_COLOR_SHIFT, COMMON); + // SetupMode("Color wave", MSI_MODE_COLOR_WAVE, COMMON); + // SetupMode("Marquee", MSI_MODE_MARQUEE, COMMON); + // SetupMode("Rainbow", MSI_MODE_RAINBOW, COMMON); + // SetupMode("Rainbow wave", MSI_MODE_RAINBOW_WAVE, COMMON); + // SetupMode("Visor", MSI_MODE_VISOR, COMMON); + // SetupMode("JRainbow", MSI_MODE_JRAINBOW, COMMON); + // SetupMode("Rainbow flashing", MSI_MODE_RAINBOW_FLASHING, COMMON); + // SetupMode("Rainbow double flashing", MSI_MODE_RAINBOW_DOUBLE_FLASHING, COMMON); + // SetupMode("Random", MSI_MODE_RANDOM, COMMON); + // SetupMode("Fan control", MSI_MODE_FAN_CONTROL, COMMON); + // SetupMode("Off 2", MSI_MODE_DISABLE_2, COMMON); + // SetupMode("Color ring flashing", MSI_MODE_COLOR_RING_FLASHING, COMMON); + // SetupMode("Color ring double flashing", MSI_MODE_COLOR_RING_DOUBLE_FLASHING, COMMON); + // SetupMode("Stack", MSI_MODE_STACK, COMMON); + // SetupMode("Corsair Que", MSI_MODE_CORSAIR_QUE, COMMON); + // SetupMode("Fire", MSI_MODE_FIRE, COMMON); + // SetupMode("Lava", MSI_MODE_LAVA, COMMON); } void RGBController_MSIMysticLight::UpdateLed(int zone, int led)