Get rid of zone_based_per_led_data buffer, just use the same configuration buffer for both as it overwrites the original configuration when written to the controller anyways

Fix update calls
Move mode setting to DeviceUpdateMode and leave LED setting to DeviceUpdateLEDs
2026-09-06 20:54:37 -05:00 · 2026-09-06 19:54:33 -05:00 · 2026-09-06 19:42:00 -05:00 · 2026-09-06 16:30:01 -05:00 · 2026-09-06 16:05:03 -05:00 · 2026-09-06 15:34:12 -05:00
6 changed files with 548 additions and 326 deletions
@@ -104,18 +104,18 @@ void MSIMotherboard112Controller::SetMode
    {
        zone_data->effect                    = mode;
        zone_data->speedAndBrightnessFlags   = (brightness << 2) | (speed & 0x03);
-        zone_data->colorFlags                = BITSET(zone_data->colorFlags, !rainbow_color, 7u);
+        zone_data->colorFlags                = (rainbow_color ? 0 : MSI_COLOR_FLAG_USE_CUSTOM_COLOR);
        zone_data->padding                   = 0x00;

        if(mode > MSI_MODE_DOUBLE_FLASHING)
        {
-            zone_data->speedAndBrightnessFlags |= SYNC_SETTING_JRGB;
-            zone_data->colorFlags              |= SYNC_SETTING_ONBOARD;
+            zone_data->speedAndBrightnessFlags |= MSI_SPEED_BRIGHTNESS_FLAG_SYNC_SETTING_JRGB;
+            zone_data->colorFlags              |= MSI_COLOR_FLAG_SYNC_SETTING_ONBOARD;
        }
        else
        {
-            zone_data->speedAndBrightnessFlags &= ~SYNC_SETTING_JRGB;
-            zone_data->colorFlags              &= ~SYNC_SETTING_ONBOARD;
+            zone_data->speedAndBrightnessFlags &= ~MSI_SPEED_BRIGHTNESS_FLAG_SYNC_SETTING_JRGB;
+            zone_data->colorFlags              &= ~MSI_COLOR_FLAG_SYNC_SETTING_ONBOARD;
        }
    }

@@ -127,7 +127,7 @@ void MSIMotherboard112Controller::SetMode
        {
            zone_data->effect                    = mode;
            zone_data->speedAndBrightnessFlags   = (brightness << 2) | (speed & 0x03);
-            zone_data->colorFlags                = BITSET(zone_data->colorFlags, !rainbow_color, 7u);
+            zone_data->colorFlags                = (rainbow_color ? 0 : MSI_COLOR_FLAG_USE_CUSTOM_COLOR);
            zone_data->padding                   = 0x00;
        }
    }
@@ -410,10 +410,10 @@ void MSIMotherboard112Controller::GetMode
    /*-----------------------------------------------------*\
    | Update pointers with data                             |
    \*-----------------------------------------------------*/
-    mode            = (MSI_MODE)zone_data->effect;
-    speed           = (MSI_SPEED)(zone_data->speedAndBrightnessFlags & 0x03);
-    brightness      = (MSI_BRIGHTNESS)((zone_data->speedAndBrightnessFlags >> 2) & 0x1F);
-    rainbow_color   = (zone_data->colorFlags & 0x80) == 0 ? true : false;
+    mode            = (MSI_MODE)        zone_data->effect;
+    speed           = (MSI_SPEED)     ((zone_data->speedAndBrightnessFlags >> MSI_SPEED_BRIGHTNESS_FLAG_SPEED_SHIFT)      & MSI_SPEED_BRIGHTNESS_FLAG_SPEED_MASK);
+    brightness      = (MSI_BRIGHTNESS)((zone_data->speedAndBrightnessFlags >> MSI_SPEED_BRIGHTNESS_FLAG_BRIGHTNESS_SHIFT) & MSI_SPEED_BRIGHTNESS_FLAG_BRIGHTNESS_MASK);
+    rainbow_color   = ((zone_data->colorFlags & MSI_COLOR_FLAG_USE_CUSTOM_COLOR) == 0 ? false : true);
    color           = ToRGBColor(zone_data->color.R, zone_data->color.G, zone_data->color.B);
 }

@@ -12,12 +12,9 @@

 #include <algorithm>
 #include <array>
-#include <bitset>
 #include "MSIMotherboard162Controller.h"
 #include "StringUtils.h"

-#define BITSET(val, bit, pos)       ((unsigned char)std::bitset<8>(val).set((pos), (bit)).to_ulong())
-
 struct mystic_light_162_config
 {
    unsigned short                  pid;                    // PID of the board
@@ -147,19 +144,20 @@ void MSIMotherboard162Controller::SetMode
    if (zone <= MSI_ZONE_ON_BOARD_LED_0)
    {
        zone_data->effect                    = mode;
-        zone_data->speedAndBrightnessFlags   = (brightness << 2) | (speed & 0x03);
-        zone_data->colorFlags                = BITSET(zone_data->colorFlags, !rainbow_color, 7u);
+        zone_data->speedAndBrightnessFlags   = ((brightness << MSI_SPEED_BRIGHTNESS_FLAG_BRIGHTNESS_SHIFT) & MSI_SPEED_BRIGHTNESS_FLAG_BRIGHTNESS_MASK)
+                                             | ((speed << MSI_SPEED_BRIGHTNESS_FLAG_SPEED_SHIFT)           & MSI_SPEED_BRIGHTNESS_FLAG_SPEED_MASK);
+        zone_data->colorFlags                = (rainbow_color ? 0 : MSI_COLOR_FLAG_USE_CUSTOM_COLOR);
        zone_data->padding                   = 0x00;

        if(mode > MSI_MODE_DOUBLE_FLASHING)
        {
-            zone_data->speedAndBrightnessFlags |= SYNC_SETTING_JRGB;
-            zone_data->colorFlags              |= SYNC_SETTING_ONBOARD;
+            zone_data->speedAndBrightnessFlags |= MSI_SPEED_BRIGHTNESS_FLAG_SYNC_SETTING_JRGB;
+            zone_data->colorFlags              |= MSI_COLOR_FLAG_SYNC_SETTING_ONBOARD;
        }
        else
        {
-            zone_data->speedAndBrightnessFlags &= ~SYNC_SETTING_JRGB;
-            zone_data->colorFlags              &= ~SYNC_SETTING_ONBOARD;
+            zone_data->speedAndBrightnessFlags &= ~MSI_SPEED_BRIGHTNESS_FLAG_SYNC_SETTING_JRGB;
+            zone_data->colorFlags              &= ~MSI_COLOR_FLAG_SYNC_SETTING_ONBOARD;
        }
    }

@@ -170,8 +168,9 @@ void MSIMotherboard162Controller::SetMode
        if(zone_data != nullptr)
        {
            zone_data->effect                    = mode;
-            zone_data->speedAndBrightnessFlags   = (brightness << 2) | (speed & 0x03);
-            zone_data->colorFlags                = BITSET(zone_data->colorFlags, !rainbow_color, 7u);
+            zone_data->speedAndBrightnessFlags   = ((brightness << MSI_SPEED_BRIGHTNESS_FLAG_BRIGHTNESS_SHIFT) & MSI_SPEED_BRIGHTNESS_FLAG_BRIGHTNESS_MASK)
+                                                 | ((speed << MSI_SPEED_BRIGHTNESS_FLAG_SPEED_SHIFT)           & MSI_SPEED_BRIGHTNESS_FLAG_SPEED_MASK);
+            zone_data->colorFlags                = (rainbow_color ? 0 : MSI_COLOR_FLAG_USE_CUSTOM_COLOR);
            zone_data->padding                   = 0x00;
        }
    }
@@ -431,10 +430,10 @@ void MSIMotherboard162Controller::GetMode
    /*-----------------------------------------------------*\
    | Update pointers with data                             |
    \*-----------------------------------------------------*/
-    mode            = (MSI_MODE)zone_data->effect;
-    speed           = (MSI_SPEED)(zone_data->speedAndBrightnessFlags & 0x03);
-    brightness      = (MSI_BRIGHTNESS)((zone_data->speedAndBrightnessFlags >> 2) & 0x1F);
-    rainbow_color   = (zone_data->colorFlags & 0x80) == 0 ? true : false;
+    mode            = (MSI_MODE)        zone_data->effect;
+    speed           = (MSI_SPEED)     ((zone_data->speedAndBrightnessFlags >> MSI_SPEED_BRIGHTNESS_FLAG_SPEED_SHIFT)      & MSI_SPEED_BRIGHTNESS_FLAG_SPEED_MASK);
+    brightness      = (MSI_BRIGHTNESS)((zone_data->speedAndBrightnessFlags >> MSI_SPEED_BRIGHTNESS_FLAG_BRIGHTNESS_SHIFT) & MSI_SPEED_BRIGHTNESS_FLAG_BRIGHTNESS_MASK);
+    rainbow_color   = ((zone_data->colorFlags & MSI_COLOR_FLAG_USE_CUSTOM_COLOR) == 0 ? false : true);
    color           = ToRGBColor(zone_data->color.R, zone_data->color.G, zone_data->color.B);
 }

@@ -17,15 +17,13 @@

 #include <algorithm>
 #include <array>
-#include <bitset>
+#include <cstdio>
 #include "MSIMotherboard185Controller.h"
+#include "LogManager.h"
 #include "StringUtils.h"

 using namespace std::chrono_literals;

-
-#define BITSET(val, bit, pos)       ((unsigned char)std::bitset<8>(val).set((pos), (bit)).to_ulong())
-
 #define SYNC_PER_LED_MODE_JRAINBOW_LED_COUNT     40
 #define SYNC_PER_LED_MODE_CORSAIR_LED_COUNT     120
 #define JRAINBOW1_MAX_LED_COUNT                 200
@@ -33,12 +31,13 @@ using namespace std::chrono_literals;
 #define JCORSAIR_MAX_LED_COUNT                  240

 #define MSI_DIRECT_MODE                         0x25
-#define PER_LED_BASIC_SYNC_MODE                 (0x80 | SYNC_SETTING_ONBOARD | SYNC_SETTING_JPIPE1 | SYNC_SETTING_JPIPE2)
-#define PER_LED_FULL_SYNC_MODE                  (PER_LED_BASIC_SYNC_MODE | SYNC_SETTING_JRAINBOW1 | SYNC_SETTING_JRAINBOW2 | SYNC_SETTING_JCORSAIR)
+#define PER_LED_BASIC_SYNC_MODE                 (MSI_SPEED_BRIGHTNESS_FLAG_SYNC_SETTING_JRGB | MSI_COLOR_FLAG_SYNC_SETTING_ONBOARD | MSI_COLOR_FLAG_SYNC_SETTING_JPIPE1 | MSI_COLOR_FLAG_SYNC_SETTING_JPIPE2)
+#define PER_LED_FULL_SYNC_MODE                  (PER_LED_BASIC_SYNC_MODE | MSI_COLOR_FLAG_SYNC_SETTING_JRAINBOW1 | MSI_COLOR_FLAG_SYNC_SETTING_JRAINBOW2 | MSI_COLOR_FLAG_SYNC_SETTING_JCORSAIR)

 struct mystic_light_185_config
 {
    unsigned short                           pid;                   // PID of the board
+    const char*                              name;                  // DMI board name for filtering (nullptr = match any name)
    int                                      numof_onboard_leds;    // number of onboard leds
    int                                      numof_pipe1_leds;      // number of pipe 1 leds (used in per LED mode only)
    int                                      numof_pipe2_leds;      // number of pipe 2 leds (used in per LED mode only)
@@ -257,101 +256,102 @@ const std::vector<MSI_ZONE> zones_set21 =

 static const mystic_light_185_config board_configs[] =
 {
-    { 0x7B93, 6,  1,  0, 1, &zones_set3,  MSIMotherboard185Controller::DIRECT_MODE_ZONE_BASED },    // MPG X570 GAMING PRO CARBON WIFI
-    { 0x7C34, 0,  1,  1, 1, &zones_set8,  MSIMotherboard185Controller::DIRECT_MODE_ZONE_BASED },    // MEG X570 GODLIKE
-    { 0x7C35, 0,  1,  0, 1, &zones_set9,  MSIMotherboard185Controller::DIRECT_MODE_ZONE_BASED },    // MEG X570 ACE
-    { 0x7C36, 6,  1,  0, 1, &zones_set3,  MSIMotherboard185Controller::DIRECT_MODE_ZONE_BASED },    // PRESTIGE X570 CREATION
-    { 0x7C37, 6,  0,  0, 2, &zones_set0,  MSIMotherboard185Controller::DIRECT_MODE_ZONE_BASED },    // MPG X570 GAMING PLUS
-    { 0x7C56, 6,  0,  0, 1, &zones_set2,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MPG B550 GAMING PLUS
-    { 0x7C59, 0,  8,  0, 1, &zones_set9,  MSIMotherboard185Controller::DIRECT_MODE_DISABLED },      // CREATOR TRX40
-    { 0x7C60, 6,  0,  0, 1, &zones_set1,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // TRX40-A PRO
-    { 0x7C67, 6,  0,  0, 1, &zones_set5,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MAG B365M MORTAR
-    { 0x7C71, 6,  6,  0, 1, &zones_set3,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MEG Z490 ACE
-    { 0x7C73, 6,  4,  0, 1, &zones_set3,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MPG Z490 GAMING CARBON WIFI
-    { 0x7C75, 6,  0,  0, 1, &zones_set2,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MPG Z490 GAMING PLUS
-    { 0x7C76, 6,  0,  0, 2, &zones_set0,  MSIMotherboard185Controller::DIRECT_MODE_DISABLED },      // MPG Z490M GAMING EDGE
-    { 0x7C77, 0,  0,  0, 0, &zones_set14, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MEG Z490I UNIFY
-    { 0x7C79, 6,  0,  0, 2, &zones_set0,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MPG Z490 GAMING EDGE WIFI
-    { 0x7C80, 6,  0,  0, 2, &zones_set0,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MAG Z490 TOMAHAWK
-    { 0x7C02, 6,  0,  0, 2, &zones_set0,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MAG B450 TOMAHAWK MAX
-    { 0x7C81, 6,  0,  0, 2, &zones_set0,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MAG B460 TOMAHAWK
-    { 0x7C82, 6,  0,  0, 1, &zones_set5,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MAG B460M MORTAR WIFI
-    { 0x7C83, 6,  0,  0, 1, &zones_set5,  MSIMotherboard185Controller::DIRECT_MODE_DISABLED },      // B460M PRO-VDH WIFI
-    { 0x7C84, 6,  0,  0, 2, &zones_set0,  MSIMotherboard185Controller::DIRECT_MODE_ZONE_BASED },    // MAG X570 TOMAHAWK WIFI
-    { 0x7C86, 6,  0,  0, 1, &zones_set5,  MSIMotherboard185Controller::DIRECT_MODE_DISABLED },      // MPG B460I GAMING EDGE
-    { 0x7C87, 6,  0,  0, 2, &zones_set13, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // B450M BAZOOKA MAX WIFI
-    { 0x7C90, 6,  4,  0, 1, &zones_set3,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MPG B550 GAMING CARBON WIFI
-    { 0x7C91, 6,  0,  0, 2, &zones_set0,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MAG B550 TOMAHAWK
-    { 0x7C92, 6,  0,  0, 0, &zones_set6,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MPG B550I GAMING EDGE WIFI
-    { 0x7C94, 6,  0,  0, 1, &zones_set11, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MAG B550M MORTAR
-    { 0x7C95, 6,  0,  0, 2, &zones_set0,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // B550M PRO-VDH WIFI
-    { 0x7C98, 6,  0,  0, 1, &zones_set5,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // Z490 PLUS
-    { 0x7D03, 0, 15, 18, 1, &zones_set8,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MPG Z590 GODLIKE
-    { 0x7D06, 4,  4,  0, 1, &zones_set3,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MPG Z590 GAMING FORCE
-    { 0x7D07, 4,  5,  0, 2, &zones_set7,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MPG Z590 GAMING EDGE WIFI
-    { 0x7D08, 6,  0,  0, 2, &zones_set0,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MAG Z590 TOMAHAWK
-    { 0x7D09, 6,  0,  0, 2, &zones_set11, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // Z590-A PRO WIFI
-    { 0x7D13, 6,  0,  0, 1, &zones_set1,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MEG B550 UNIFY
-    { 0x7D14, 6,  0,  0, 1, &zones_set5,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // A520M PRO
-    { 0x7D15, 6,  0,  0, 2, &zones_set0,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MAG B560 TOMAHAWK WIFI
-    { 0x7D17, 6,  0,  0, 2, &zones_set11, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MAG B560M MORTAR
-    { 0x7D18, 6,  0,  0, 2, &zones_set5,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MAG B560M PRO-VDH
-    { 0x7D19, 6,  0,  0, 2, &zones_set5,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MPG B560I GAMIING EDGE WIFI
-    { 0x7D20, 6,  0,  0, 2, &zones_set5,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MAG B560M PRO
-    { 0x7D25, 6,  0,  0, 2, &zones_set11, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // PRO Z690-A WIFI DDR4
-    { 0x7D27, 6,  0,  0, 2, &zones_set1,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MEG Z690 ACE
-    { 0x7D28, 6,  0,  0, 1, &zones_set1,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MEG Z690 UNIFY-X
-    { 0x7D29, 6,  0,  0, 0, &zones_set6,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MEG Z690I UNIFY
-    { 0x7D30, 6,  6,  0, 2, &zones_set3,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MPG Z690 CARBON WIFI
-    { 0x7D31, 4,  8,  0, 2, &zones_set12, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MPG EDGE WIFI DDR4
-    { 0x7D32, 1,  0,  0, 1, &zones_set10, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MAG Z690 TOMAHAWK WIFI DDR4
-    { 0x7D33, 6,  0,  0, 2, &zones_set5,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // PRO Z790-VC WIFI
-    { 0x7D36, 6,  0,  0, 2, &zones_set5,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // PRO Z690-P DDR4
-    { 0x7D37, 6,  0,  0, 2, &zones_set11, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // PRO B760M-VC WIFI (MS-7D37) - fans on JRAINBOW2
-    { 0x7D38, 0,  0,  0, 1, &zones_set1,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MEG Z590 UNIFY-X
-    { 0x7D40, 0,  0,  0, 1, &zones_set5,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MPG B760i EDGE WIFI DDR4
-    { 0x7D41, 6,  0,  0, 2, &zones_set13, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MAG B660M TOMAHAWK WIFI DDR4
-    { 0x7D42, 6,  0,  0, 2, &zones_set11, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MAG B660 MORTAR WIFI DDR4
-    { 0x7D43, 0,  0,  0, 2, &zones_set11, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // PRO B660M-A WIFI DDR4
-    { 0x7D46, 0,  1,  1, 0, &zones_set11, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // PRO H610M-G DDR4
-    { 0x7D50, 6, 12,  0, 1, &zones_set3,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MEG X570S ACE MAX
-    { 0x7D51, 6,  0,  0, 2, &zones_set1,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MEG X570S UNIFY-X MAX
-    { 0x7D52, 6, 14,  0, 1, &zones_set3,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MPG X570S CARBON EK X
-    { 0x7D53, 6,  0,  0, 2, &zones_set0,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MPG X570S EDGE MAX WIFI
-    { 0x7D54, 6,  0,  0, 2, &zones_set0,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MAG X570S TOMAHAWK MAX WIFI
-    { 0x7D59, 0,  0,  0, 2, &zones_set11, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // PRO B660-A DDR4
-    { 0x7D67, 0,  0,  0, 1, &zones_set11, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // PRO X670-P WIFI
-    { 0x7D69, 9,  2,  4, 1, &zones_set15, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MEG X670E ACE
-    { 0x7D70, 0,  6,  0, 1, &zones_set9,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MPG X670E Carbon WIFI
-    { 0x7D73, 1,  0,  0, 0, &zones_set6,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MPG B650I EDGE WIFI
-    { 0x7D74, 0,  6,  0, 1, &zones_set18, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MPG B650 CARBON WIFI
-    { 0x7D75, 0,  0,  0, 2, &zones_set13, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MAG B650 TOMAHAWK WIFI
-    { 0x7D76, 0,  0,  0, 2, &zones_set13, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MAG B650M MORTAR WIFI
-    { 0x7D77, 0,  0,  0, 2, &zones_set13, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // PRO B650M-A WIFI
-    { 0x7D78, 0,  0,  0, 2, &zones_set13, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // PRO B650-P WIFI
-    { 0x7D86, 0, 18,  4, 1, &zones_set16, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MEG Z790 ACE
-    { 0x7D88, 0,  0,  0, 1, &zones_set20, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MPG Z790-S WIFI
-    { 0x7D89, 0,  6,  0, 1, &zones_set18, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MPG Z790 CARBON WIFI
-    { 0x7D90, 0,  0,  0, 1, &zones_set11, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // B760M BOMBER DDR4
-    { 0x7D91, 1,  0,  0, 1, &zones_set10, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MAG Z790 TOMAHAWK WIFI
-    { 0x7D93, 6,  0,  0, 1, &zones_set2,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // Z790 GAMING PRO WIFI
-    { 0x7D96, 0,  0,  0, 2, &zones_set13, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MAG B760 TOMAHAWK WIFI DDR5
-    { 0x7D97, 6,  0,  0, 2, &zones_set11, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MAG B660 MORTAR MAX WIFI DDR4
-    { 0x7D98, 0,  0,  0, 1, &zones_set11, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // PRO B760-P WIFI DDR4
-    { 0x7D99, 6,  0,  0, 1, &zones_set11, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // PRO B760M-A WIFI DDR4
-    { 0x7E01, 0,  0,  0, 1, &zones_set11, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MAG B760M MORTAR MAX
-    { 0x7E03, 6,  0,  0, 0, &zones_set6,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MPG Z790I EDGE WIFI
-    { 0x7E06, 0,  0,  0, 2, &zones_set11, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // PRO Z790-P WIFI DDR4
-    { 0x7E07, 0,  0,  0, 2, &zones_set10, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // PRO Z790-A WIFI DDR4
-    { 0x7E09, 0,  0,  0, 0, &zones_set19, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // B650M PROJECT ZERO
-    { 0x7E10, 0,  6,  0, 2, &zones_set17, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MPG B650 EDGE WIFI
-    { 0x7E12, 0,  0,  0, 2, &zones_set13, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MAG X670E TOMAHAWK WIFI
-    { 0x0076, 0,  0,  0, 2, &zones_set13, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MAG X670E TOMAHAWK WIFI (Common PID)
-    { 0x7E16, 0,  0,  0, 2, &zones_set13, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // X670E GAMING PLUS WIFI
-    { 0x7E24, 0,  0,  0, 2, &zones_set13, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // B650M GAMING PLUS WIFI
-    { 0x7E26, 0,  0,  0, 2, &zones_set13, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // B650 GAMING PLUS WIFI
-    { 0x7E27, 0,  0,  0, 2, &zones_set13, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // PRO B650M-P
-    { 0x7E28, 6,  0,  0, 2, &zones_set21, MSIMotherboard185Controller::DIRECT_MODE_ZONE_BASED },    // MSI PRO A620M-B (MS-7E28)
+    { 0x7B93, nullptr,                              6,  1,  0, 1, &zones_set3,  MSIMotherboard185Controller::DIRECT_MODE_ZONE_BASED },    // MPG X570 GAMING PRO CARBON WIFI
+    { 0x7C34, nullptr,                              0,  1,  1, 1, &zones_set8,  MSIMotherboard185Controller::DIRECT_MODE_ZONE_BASED },    // MEG X570 GODLIKE
+    { 0x7C35, nullptr,                              0,  1,  0, 1, &zones_set9,  MSIMotherboard185Controller::DIRECT_MODE_ZONE_BASED },    // MEG X570 ACE
+    { 0x7C36, nullptr,                              6,  1,  0, 1, &zones_set3,  MSIMotherboard185Controller::DIRECT_MODE_ZONE_BASED },    // PRESTIGE X570 CREATION
+    { 0x7C37, nullptr,                              6,  0,  0, 2, &zones_set0,  MSIMotherboard185Controller::DIRECT_MODE_ZONE_BASED },    // MPG X570 GAMING PLUS
+    { 0x7C56, "MSI B550-A PRO (MS-7C56)",           6,  0,  0, 1, &zones_set11, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MPG B550-A PRO
+    { 0x7C56, "MSI MPG B550 GAMING PLUS (MS-7C56)", 6,  0,  0, 1, &zones_set2,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MPG B550 GAMING PLUS
+    { 0x7C59, nullptr,                              0,  8,  0, 1, &zones_set9,  MSIMotherboard185Controller::DIRECT_MODE_DISABLED },      // CREATOR TRX40
+    { 0x7C60, nullptr,                              6,  0,  0, 1, &zones_set1,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // TRX40-A PRO
+    { 0x7C67, nullptr,                              6,  0,  0, 1, &zones_set5,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MAG B365M MORTAR
+    { 0x7C71, nullptr,                              6,  6,  0, 1, &zones_set3,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MEG Z490 ACE
+    { 0x7C73, nullptr,                              6,  4,  0, 1, &zones_set3,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MPG Z490 GAMING CARBON WIFI
+    { 0x7C75, nullptr,                              6,  0,  0, 1, &zones_set2,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MPG Z490 GAMING PLUS
+    { 0x7C76, nullptr,                              6,  0,  0, 2, &zones_set0,  MSIMotherboard185Controller::DIRECT_MODE_DISABLED },      // MPG Z490M GAMING EDGE
+    { 0x7C77, nullptr,                              0,  0,  0, 0, &zones_set14, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MEG Z490I UNIFY
+    { 0x7C79, nullptr,                              6,  0,  0, 2, &zones_set0,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MPG Z490 GAMING EDGE WIFI
+    { 0x7C80, nullptr,                              6,  0,  0, 2, &zones_set0,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MAG Z490 TOMAHAWK
+    { 0x7C02, nullptr,                              6,  0,  0, 2, &zones_set0,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MAG B450 TOMAHAWK MAX
+    { 0x7C81, nullptr,                              6,  0,  0, 2, &zones_set0,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MAG B460 TOMAHAWK
+    { 0x7C82, nullptr,                              6,  0,  0, 1, &zones_set5,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MAG B460M MORTAR WIFI
+    { 0x7C83, nullptr,                              6,  0,  0, 1, &zones_set5,  MSIMotherboard185Controller::DIRECT_MODE_DISABLED },      // B460M PRO-VDH WIFI
+    { 0x7C84, nullptr,                              6,  0,  0, 2, &zones_set0,  MSIMotherboard185Controller::DIRECT_MODE_ZONE_BASED },    // MAG X570 TOMAHAWK WIFI
+    { 0x7C86, nullptr,                              6,  0,  0, 1, &zones_set5,  MSIMotherboard185Controller::DIRECT_MODE_DISABLED },      // MPG B460I GAMING EDGE
+    { 0x7C87, nullptr,                              6,  0,  0, 2, &zones_set13, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // B450M BAZOOKA MAX WIFI
+    { 0x7C90, nullptr,                              6,  4,  0, 1, &zones_set3,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MPG B550 GAMING CARBON WIFI
+    { 0x7C91, nullptr,                              6,  0,  0, 2, &zones_set0,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MAG B550 TOMAHAWK
+    { 0x7C92, nullptr,                              6,  0,  0, 0, &zones_set6,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MPG B550I GAMING EDGE WIFI
+    { 0x7C94, nullptr,                              6,  0,  0, 1, &zones_set11, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MAG B550M MORTAR
+    { 0x7C95, nullptr,                              6,  0,  0, 2, &zones_set0,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // B550M PRO-VDH WIFI
+    { 0x7C98, nullptr,                              6,  0,  0, 1, &zones_set5,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // Z490 PLUS
+    { 0x7D03, nullptr,                              0, 15, 18, 1, &zones_set8,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MPG Z590 GODLIKE
+    { 0x7D06, nullptr,                              4,  4,  0, 1, &zones_set3,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MPG Z590 GAMING FORCE
+    { 0x7D07, nullptr,                              4,  5,  0, 2, &zones_set7,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MPG Z590 GAMING EDGE WIFI
+    { 0x7D08, nullptr,                              6,  0,  0, 2, &zones_set0,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MAG Z590 TOMAHAWK
+    { 0x7D09, nullptr,                              6,  0,  0, 2, &zones_set11, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // Z590-A PRO WIFI
+    { 0x7D13, nullptr,                              6,  0,  0, 1, &zones_set1,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MEG B550 UNIFY
+    { 0x7D14, nullptr,                              6,  0,  0, 1, &zones_set5,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // A520M PRO
+    { 0x7D15, nullptr,                              6,  0,  0, 2, &zones_set0,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MAG B560 TOMAHAWK WIFI
+    { 0x7D17, nullptr,                              6,  0,  0, 2, &zones_set11, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MAG B560M MORTAR
+    { 0x7D18, nullptr,                              6,  0,  0, 2, &zones_set5,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MAG B560M PRO-VDH
+    { 0x7D19, nullptr,                              6,  0,  0, 2, &zones_set5,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MPG B560I GAMIING EDGE WIFI
+    { 0x7D20, nullptr,                              6,  0,  0, 2, &zones_set5,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MAG B560M PRO
+    { 0x7D25, nullptr,                              6,  0,  0, 2, &zones_set11, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // PRO Z690-A WIFI DDR4
+    { 0x7D27, nullptr,                              6,  0,  0, 2, &zones_set1,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MEG Z690 ACE
+    { 0x7D28, nullptr,                              6,  0,  0, 1, &zones_set1,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MEG Z690 UNIFY-X
+    { 0x7D29, nullptr,                              6,  0,  0, 0, &zones_set6,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MEG Z690I UNIFY
+    { 0x7D30, nullptr,                              6,  6,  0, 2, &zones_set3,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MPG Z690 CARBON WIFI
+    { 0x7D31, nullptr,                              4,  8,  0, 2, &zones_set12, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MPG EDGE WIFI DDR4
+    { 0x7D32, nullptr,                              1,  0,  0, 1, &zones_set10, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MAG Z690 TOMAHAWK WIFI DDR4
+    { 0x7D33, nullptr,                              6,  0,  0, 2, &zones_set5,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // PRO Z790-VC WIFI
+    { 0x7D36, nullptr,                              6,  0,  0, 2, &zones_set5,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // PRO Z690-P DDR4
+    { 0x7D37, nullptr,                              6,  0,  0, 2, &zones_set11, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // PRO B760M-VC WIFI (MS-7D37) - fans on JRAINBOW2
+    { 0x7D38, nullptr,                              0,  0,  0, 1, &zones_set1,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MEG Z590 UNIFY-X
+    { 0x7D40, nullptr,                              0,  0,  0, 1, &zones_set5,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MPG B760i EDGE WIFI DDR4
+    { 0x7D41, nullptr,                              6,  0,  0, 2, &zones_set13, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MAG B660M TOMAHAWK WIFI DDR4
+    { 0x7D42, nullptr,                              6,  0,  0, 2, &zones_set11, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MAG B660 MORTAR WIFI DDR4
+    { 0x7D43, nullptr,                              0,  0,  0, 2, &zones_set11, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // PRO B660M-A WIFI DDR4
+    { 0x7D46, nullptr,                              0,  1,  1, 0, &zones_set11, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // PRO H610M-G DDR4
+    { 0x7D50, nullptr,                              6, 12,  0, 1, &zones_set3,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MEG X570S ACE MAX
+    { 0x7D51, nullptr,                              6,  0,  0, 2, &zones_set1,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MEG X570S UNIFY-X MAX
+    { 0x7D52, nullptr,                              6, 14,  0, 1, &zones_set3,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MPG X570S CARBON EK X
+    { 0x7D53, nullptr,                              6,  0,  0, 2, &zones_set0,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MPG X570S EDGE MAX WIFI
+    { 0x7D54, nullptr,                              6,  0,  0, 2, &zones_set0,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MAG X570S TOMAHAWK MAX WIFI
+    { 0x7D59, nullptr,                              0,  0,  0, 2, &zones_set11, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // PRO B660-A DDR4
+    { 0x7D67, nullptr,                              0,  0,  0, 1, &zones_set11, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // PRO X670-P WIFI
+    { 0x7D69, nullptr,                              9,  2,  4, 1, &zones_set15, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MEG X670E ACE
+    { 0x7D70, nullptr,                              0,  6,  0, 1, &zones_set9,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MPG X670E Carbon WIFI
+    { 0x7D73, nullptr,                              1,  0,  0, 0, &zones_set6,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MPG B650I EDGE WIFI
+    { 0x7D74, nullptr,                              0,  6,  0, 1, &zones_set18, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MPG B650 CARBON WIFI
+    { 0x7D75, nullptr,                              0,  0,  0, 2, &zones_set13, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MAG B650 TOMAHAWK WIFI
+    { 0x7D76, nullptr,                              0,  0,  0, 2, &zones_set13, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MAG B650M MORTAR WIFI
+    { 0x7D77, nullptr,                              0,  0,  0, 2, &zones_set13, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // PRO B650M-A WIFI
+    { 0x7D78, nullptr,                              0,  0,  0, 2, &zones_set13, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // PRO B650-P WIFI
+    { 0x7D86, nullptr,                              0, 18,  4, 1, &zones_set16, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MEG Z790 ACE
+    { 0x7D88, nullptr,                              0,  0,  0, 1, &zones_set20, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MPG Z790-S WIFI
+    { 0x7D89, nullptr,                              0,  6,  0, 1, &zones_set18, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MPG Z790 CARBON WIFI
+    { 0x7D90, nullptr,                              0,  0,  0, 1, &zones_set11, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // B760M BOMBER DDR4
+    { 0x7D91, nullptr,                              1,  0,  0, 1, &zones_set10, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MAG Z790 TOMAHAWK WIFI
+    { 0x7D93, nullptr,                              6,  0,  0, 1, &zones_set2,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // Z790 GAMING PRO WIFI
+    { 0x7D96, nullptr,                              0,  0,  0, 2, &zones_set13, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MAG B760 TOMAHAWK WIFI DDR5
+    { 0x7D97, nullptr,                              6,  0,  0, 2, &zones_set11, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MAG B660 MORTAR MAX WIFI DDR4
+    { 0x7D98, nullptr,                              0,  0,  0, 1, &zones_set11, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // PRO B760-P WIFI DDR4
+    { 0x7D99, nullptr,                              6,  0,  0, 1, &zones_set11, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // PRO B760M-A WIFI DDR4
+    { 0x7E01, nullptr,                              0,  0,  0, 1, &zones_set11, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MAG B760M MORTAR MAX
+    { 0x7E03, nullptr,                              6,  0,  0, 0, &zones_set6,  MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MPG Z790I EDGE WIFI
+    { 0x7E06, nullptr,                              0,  0,  0, 2, &zones_set11, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // PRO Z790-P WIFI DDR4
+    { 0x7E07, nullptr,                              0,  0,  0, 2, &zones_set10, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // PRO Z790-A WIFI DDR4
+    { 0x7E09, nullptr,                              0,  0,  0, 0, &zones_set19, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // B650M PROJECT ZERO
+    { 0x7E10, nullptr,                              0,  6,  0, 2, &zones_set17, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MPG B650 EDGE WIFI
+    { 0x7E12, nullptr,                              0,  0,  0, 2, &zones_set13, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MAG X670E TOMAHAWK WIFI
+    { 0x0076, nullptr,                              0,  0,  0, 2, &zones_set13, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // MAG X670E TOMAHAWK WIFI (Common PID)
+    { 0x7E16, nullptr,                              0,  0,  0, 2, &zones_set13, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // X670E GAMING PLUS WIFI
+    { 0x7E24, nullptr,                              0,  0,  0, 2, &zones_set13, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // B650M GAMING PLUS WIFI
+    { 0x7E26, nullptr,                              0,  0,  0, 2, &zones_set13, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // B650 GAMING PLUS WIFI
+    { 0x7E27, nullptr,                              0,  0,  0, 2, &zones_set13, MSIMotherboard185Controller::DIRECT_MODE_PER_LED },       // PRO B650M-P
+    { 0x7E28, nullptr,                              6,  0,  0, 2, &zones_set21, MSIMotherboard185Controller::DIRECT_MODE_ZONE_BASED },    // MSI PRO A620M-B (MS-7E28)
 };


@@ -365,24 +365,46 @@ Color* per_led_jrainbow1_sync;
 Color* per_led_jrainbow2_sync;
 Color* per_led_jcorsair_sync;

+/*-----------------------------------------------------*\
+| Static helper to check if a zone is supported by the  |
+| given supported_zones vector                          |
+\*-----------------------------------------------------*/
+bool MSIMotherboard185Controller::IsZoneSupported(MSI_ZONE zone, const std::vector<MSI_ZONE>* supported_zones)
+{
+    if(supported_zones == nullptr)
+    {
+        return false;
+    }
+    return std::find(supported_zones->begin(), supported_zones->end(), zone) != supported_zones->end();
+}
+
 MSIMotherboard185Controller::MSIMotherboard185Controller(hid_device* handle, const char* path, unsigned short pid, std::string dev_name)
 {
    dev         = handle;
    location    = path;
    name        = dev_name;

-    if(dev)
-    {
-        ReadFwVersion();
-        ReadSettings();
-    }
+    /*-----------------------------------------------------*\
+    | Perform initial reads - get the controller's firmware |
+    | version and then read the controller's active         |
+    | configuration data                                    |
+    \*-----------------------------------------------------*/
+    ReadFwVersion();
+    ReadConfigurationData();

+    /*-----------------------------------------------------*\
+    | Common PID boards embed their virtual PID in the      |
+    | serial number, extract it                             |
+    \*-----------------------------------------------------*/
    if(pid == MSI_USB_PID_COMMON)
    {
        std::string pidStr(GetSerial().substr(0, 4));
        pid = std::stoi(pidStr, nullptr, 16);
    }

+    /*-----------------------------------------------------*\
+    | Determine if this board has mixed-mode support        |
+    \*-----------------------------------------------------*/
    mixed_mode_support = false;

    if(pid >= 0x7D03)
@@ -391,22 +413,57 @@ MSIMotherboard185Controller::MSIMotherboard185Controller(hid_device* handle, con
    }

    /*-----------------------------------------------------*\
-    | Initialize save flag and some static settings         |
+    | The last byte of the packet is the save flag.  This   |
+    | byte is stored as a zero in the data flash, but is    |
+    | set to 1 at the protocol level to tell the firmware   |
+    | to save the active configuration to flash.            |
    \*-----------------------------------------------------*/
-    data.save_data = 0;
-    data.on_board_led.colorFlags = 0x80 | SYNC_SETTING_ONBOARD; // always enable onboard sync flag to have expected zone control
+    configuration_data.save_data = 0;

+    configuration_data.on_board_led.colorFlags = MSI_COLOR_FLAG_USE_CUSTOM_COLOR | MSI_COLOR_FLAG_SYNC_SETTING_ONBOARD; // always enable onboard sync flag to have expected zone control
+
+    /*-----------------------------------------------------*\
+    | Search for the board configuration matching this      |
+    | board.                                                |
+    \*-----------------------------------------------------*/
    const mystic_light_185_config* board_config = nullptr;

+    /*-----------------------------------------------------*\
+    | First pass: look for a config that matches both PID   |
+    | and board name (when name is specified in the config) |
+    \*-----------------------------------------------------*/
    for(std::size_t i = 0; i < NUMOF_CONFIGS; ++i)
    {
-        if(board_configs[i].pid == pid)
+        if(board_configs[i].pid == pid && board_configs[i].name != nullptr)
        {
-            board_config = &board_configs[i];
-            break;
+            if(name.find(board_configs[i].name) != std::string::npos)
+            {
+                board_config = &board_configs[i];
+                break;
+            }
        }
    }

+    /*-----------------------------------------------------*\
+    | Second pass: fall back to PID-only match for entries  |
+    | without a name filter (backward compatible)           |
+    \*-----------------------------------------------------*/
+    if(board_config == nullptr)
+    {
+        for(std::size_t i = 0; i < NUMOF_CONFIGS; ++i)
+        {
+            if(board_configs[i].pid == pid && board_configs[i].name == nullptr)
+            {
+                board_config = &board_configs[i];
+                break;
+            }
+        }
+    }
+
+    /*-----------------------------------------------------*\
+    | Fill in the number of each zone type based on the     |
+    | board configuration                                   |
+    \*-----------------------------------------------------*/
    if(board_config != nullptr)
    {
        numof_onboard_leds = board_config->numof_onboard_leds;
@@ -481,84 +538,49 @@ MSIMotherboard185Controller::MSIMotherboard185Controller(hid_device* handle, con
    | Set up per-LED switching message for synchronized     |
    | mode.                                                 |
    \*-----------------------------------------------------*/
+    memset(&enable_per_led_msg, 0, sizeof(enable_per_led_msg));
    enable_per_led_msg.j_rgb_1.speedAndBrightnessFlags              = 0x08;
-    enable_per_led_msg.j_rgb_1.colorFlags                           = 0x80;
+    enable_per_led_msg.j_rgb_1.colorFlags                           = MSI_COLOR_FLAG_USE_CUSTOM_COLOR;
    enable_per_led_msg.j_pipe_1.speedAndBrightnessFlags             = 0x2A;
-    enable_per_led_msg.j_pipe_1.colorFlags                          = 0x80;
+    enable_per_led_msg.j_pipe_1.colorFlags                          = MSI_COLOR_FLAG_USE_CUSTOM_COLOR;
    enable_per_led_msg.j_pipe_2.speedAndBrightnessFlags             = 0x2A;
-    enable_per_led_msg.j_pipe_2.colorFlags                          = 0x80;
+    enable_per_led_msg.j_pipe_2.colorFlags                          = MSI_COLOR_FLAG_USE_CUSTOM_COLOR;
    enable_per_led_msg.j_rainbow_1.speedAndBrightnessFlags          = 0x29;
-    enable_per_led_msg.j_rainbow_1.colorFlags                       = 0x80;
+    enable_per_led_msg.j_rainbow_1.colorFlags                       = MSI_COLOR_FLAG_USE_CUSTOM_COLOR;
    enable_per_led_msg.j_rainbow_1.cycle_or_led_num                 = 0x28;
    enable_per_led_msg.j_rainbow_2.speedAndBrightnessFlags          = 0x29;
-    enable_per_led_msg.j_rainbow_2.colorFlags                       = 0x80;
+    enable_per_led_msg.j_rainbow_2.colorFlags                       = MSI_COLOR_FLAG_USE_CUSTOM_COLOR;
    enable_per_led_msg.j_rainbow_2.cycle_or_led_num                 = 0x28;
    enable_per_led_msg.j_corsair.fan_flags                          = 0x29;
    enable_per_led_msg.j_corsair.corsair_quantity                   = 0x00;
    enable_per_led_msg.j_corsair.padding[2]                         = 0x82;
    enable_per_led_msg.j_corsair.is_individual                      = 0x78;
    enable_per_led_msg.j_corsair_outerll120.speedAndBrightnessFlags = 0x28;
-    enable_per_led_msg.j_corsair_outerll120.colorFlags              = 0x80;
+    enable_per_led_msg.j_corsair_outerll120.colorFlags              = MSI_COLOR_FLAG_USE_CUSTOM_COLOR;
    enable_per_led_msg.on_board_led.effect                          = MSI_DIRECT_MODE;
-    enable_per_led_msg.on_board_led.speedAndBrightnessFlags         = 0x29 | SYNC_SETTING_JRGB;
+    enable_per_led_msg.on_board_led.speedAndBrightnessFlags         = 0x29 | MSI_SPEED_BRIGHTNESS_FLAG_SYNC_SETTING_JRGB;
    enable_per_led_msg.on_board_led.colorFlags                      = PER_LED_FULL_SYNC_MODE;
    enable_per_led_msg.on_board_led_1.speedAndBrightnessFlags       = 0x28;
-    enable_per_led_msg.on_board_led_1.colorFlags                    = 0x80;
+    enable_per_led_msg.on_board_led_1.colorFlags                    = MSI_COLOR_FLAG_USE_CUSTOM_COLOR;
    enable_per_led_msg.on_board_led_2.speedAndBrightnessFlags       = 0x28;
-    enable_per_led_msg.on_board_led_2.colorFlags                    = 0x80;
+    enable_per_led_msg.on_board_led_2.colorFlags                    = MSI_COLOR_FLAG_USE_CUSTOM_COLOR;
    enable_per_led_msg.on_board_led_3.speedAndBrightnessFlags       = 0x28;
-    enable_per_led_msg.on_board_led_3.colorFlags                    = 0x80;
+    enable_per_led_msg.on_board_led_3.colorFlags                    = MSI_COLOR_FLAG_USE_CUSTOM_COLOR;
    enable_per_led_msg.on_board_led_4.speedAndBrightnessFlags       = 0x28;
-    enable_per_led_msg.on_board_led_4.colorFlags                    = 0x80;
+    enable_per_led_msg.on_board_led_4.colorFlags                    = MSI_COLOR_FLAG_USE_CUSTOM_COLOR;
    enable_per_led_msg.on_board_led_5.speedAndBrightnessFlags       = 0x28;
-    enable_per_led_msg.on_board_led_5.colorFlags                    = 0x80;
+    enable_per_led_msg.on_board_led_5.colorFlags                    = MSI_COLOR_FLAG_USE_CUSTOM_COLOR;
    enable_per_led_msg.on_board_led_6.speedAndBrightnessFlags       = 0x28;
-    enable_per_led_msg.on_board_led_6.colorFlags                    = 0x80;
+    enable_per_led_msg.on_board_led_6.colorFlags                    = MSI_COLOR_FLAG_USE_CUSTOM_COLOR;
    enable_per_led_msg.on_board_led_7.speedAndBrightnessFlags       = 0x28;
-    enable_per_led_msg.on_board_led_7.colorFlags                    = 0x80;
+    enable_per_led_msg.on_board_led_7.colorFlags                    = MSI_COLOR_FLAG_USE_CUSTOM_COLOR;
    enable_per_led_msg.on_board_led_8.speedAndBrightnessFlags       = 0x28;
-    enable_per_led_msg.on_board_led_8.colorFlags                    = 0x80;
+    enable_per_led_msg.on_board_led_8.colorFlags                    = MSI_COLOR_FLAG_USE_CUSTOM_COLOR;
    enable_per_led_msg.on_board_led_9.speedAndBrightnessFlags       = 0x28;
-    enable_per_led_msg.on_board_led_9.colorFlags                    = 0x80;
+    enable_per_led_msg.on_board_led_9.colorFlags                    = MSI_COLOR_FLAG_USE_CUSTOM_COLOR;
    enable_per_led_msg.j_rgb_2.speedAndBrightnessFlags              = 0x2A;
-    enable_per_led_msg.j_rgb_2.colorFlags                           = 0x80;
-
-    /*-----------------------------------------------------*\
-    | Initialize zone based per LED data                    |
-    \*-----------------------------------------------------*/
-    zone_based_per_led_data.j_rgb_1.speedAndBrightnessFlags         = MSI_BRIGHTNESS_LEVEL_100 << 2;
-    zone_based_per_led_data.j_rgb_1.colorFlags                      = BITSET(zone_based_per_led_data.j_rgb_1.colorFlags, true, 7u);
-    zone_based_per_led_data.j_pipe_1.speedAndBrightnessFlags        = MSI_BRIGHTNESS_LEVEL_100 << 2;
-    zone_based_per_led_data.j_pipe_1.colorFlags                     = BITSET(zone_based_per_led_data.j_pipe_1.colorFlags, true, 7u);
-    zone_based_per_led_data.j_pipe_2.speedAndBrightnessFlags        = MSI_BRIGHTNESS_LEVEL_100 << 2;
-    zone_based_per_led_data.j_pipe_2.colorFlags                     = BITSET(zone_based_per_led_data.j_pipe_2.colorFlags, true, 7u);
-    zone_based_per_led_data.j_rainbow_1.speedAndBrightnessFlags     = MSI_BRIGHTNESS_LEVEL_100 << 2;
-    zone_based_per_led_data.j_rainbow_1.colorFlags                  = BITSET(zone_based_per_led_data.j_rainbow_1.colorFlags, true, 7u);
-    zone_based_per_led_data.j_rainbow_2.speedAndBrightnessFlags     = MSI_BRIGHTNESS_LEVEL_100 << 2;
-    zone_based_per_led_data.j_rainbow_2.colorFlags                  = BITSET(zone_based_per_led_data.j_rainbow_2.colorFlags, true, 7u);
-    zone_based_per_led_data.on_board_led.speedAndBrightnessFlags    = MSI_BRIGHTNESS_LEVEL_100 << 2;
-    zone_based_per_led_data.on_board_led.colorFlags                 = BITSET(zone_based_per_led_data.on_board_led.colorFlags, true, 7u);
-    zone_based_per_led_data.on_board_led_1.speedAndBrightnessFlags  = MSI_BRIGHTNESS_LEVEL_100 << 2;
-    zone_based_per_led_data.on_board_led_1.colorFlags               = BITSET(zone_based_per_led_data.on_board_led_1.colorFlags, true, 7u);
-    zone_based_per_led_data.on_board_led_2.speedAndBrightnessFlags  = MSI_BRIGHTNESS_LEVEL_100 << 2;
-    zone_based_per_led_data.on_board_led_2.colorFlags               = BITSET(zone_based_per_led_data.on_board_led_2.colorFlags, true, 7u);
-    zone_based_per_led_data.on_board_led_3.speedAndBrightnessFlags  = MSI_BRIGHTNESS_LEVEL_100 << 2;
-    zone_based_per_led_data.on_board_led_3.colorFlags               = BITSET(zone_based_per_led_data.on_board_led_3.colorFlags, true, 7u);
-    zone_based_per_led_data.on_board_led_4.speedAndBrightnessFlags  = MSI_BRIGHTNESS_LEVEL_100 << 2;
-    zone_based_per_led_data.on_board_led_4.colorFlags               = BITSET(zone_based_per_led_data.on_board_led_4.colorFlags, true, 7u);
-    zone_based_per_led_data.on_board_led_5.speedAndBrightnessFlags  = MSI_BRIGHTNESS_LEVEL_100 << 2;
-    zone_based_per_led_data.on_board_led_5.colorFlags               = BITSET(zone_based_per_led_data.on_board_led_5.colorFlags, true, 7u);
-    zone_based_per_led_data.on_board_led_6.speedAndBrightnessFlags  = MSI_BRIGHTNESS_LEVEL_100 << 2 << 2;
-    zone_based_per_led_data.on_board_led_6.colorFlags               = BITSET(zone_based_per_led_data.on_board_led_6.colorFlags, true, 7u);
-    zone_based_per_led_data.on_board_led_7.speedAndBrightnessFlags  = MSI_BRIGHTNESS_LEVEL_100;
-    zone_based_per_led_data.on_board_led_7.colorFlags               = BITSET(zone_based_per_led_data.on_board_led_7.colorFlags, true, 7u);
-    zone_based_per_led_data.on_board_led_8.speedAndBrightnessFlags  = MSI_BRIGHTNESS_LEVEL_100 << 2;
-    zone_based_per_led_data.on_board_led_8.colorFlags               = BITSET(zone_based_per_led_data.on_board_led_8.colorFlags, true, 7u);
-    zone_based_per_led_data.on_board_led_9.speedAndBrightnessFlags  = MSI_BRIGHTNESS_LEVEL_100 << 2;
-    zone_based_per_led_data.on_board_led_9.colorFlags               = BITSET(zone_based_per_led_data.on_board_led_9.colorFlags, true, 7u);
-    zone_based_per_led_data.j_rgb_2.speedAndBrightnessFlags         = MSI_BRIGHTNESS_LEVEL_100 << 2;
-    zone_based_per_led_data.j_rgb_2.colorFlags                      = BITSET(zone_based_per_led_data.j_rgb_2.colorFlags, true, 7u);
-    zone_based_per_led_data.save_data                               = 0;
+    enable_per_led_msg.j_rgb_2.colorFlags                           = MSI_COLOR_FLAG_USE_CUSTOM_COLOR;
+    enable_per_led_msg.save_data                                    = 0;

    direct_mode             = false;
    direct_mode_configured  = false;
@@ -584,51 +606,83 @@ void MSIMotherboard185Controller::SetMode
        return;
    }

-    ZoneData* zone_data = GetZoneData(data, zone);
+    /*-----------------------------------------------------*\
+    | Get the zone data pointer within the configuration    |
+    | data buffer                                           |
+    \*-----------------------------------------------------*/
+    ZoneData* zone_data = GetZoneData(configuration_data, zone);

+    /*-----------------------------------------------------*\
+    | Return if zone is invalid                             |
+    \*-----------------------------------------------------*/
    if(zone_data == nullptr)
    {
        return;
    }

+    /*-----------------------------------------------------*\
+    | Update the zone's mode and mode parameters            |
+    \*-----------------------------------------------------*/
    zone_data->effect                    = mode;
-    zone_data->speedAndBrightnessFlags   = (brightness << 2) | (speed & 0x03);
-    zone_data->colorFlags                = BITSET(zone_data->colorFlags, !rainbow_color, 7u);
+    zone_data->speedAndBrightnessFlags   = ((brightness << MSI_SPEED_BRIGHTNESS_FLAG_BRIGHTNESS_SHIFT) & MSI_SPEED_BRIGHTNESS_FLAG_BRIGHTNESS_MASK)
+                                         | ((speed << MSI_SPEED_BRIGHTNESS_FLAG_SPEED_SHIFT)           & MSI_SPEED_BRIGHTNESS_FLAG_SPEED_MASK);
+    zone_data->colorFlags                = (rainbow_color ? 0 : MSI_COLOR_FLAG_USE_CUSTOM_COLOR);
+
+    /*-----------------------------------------------------*\
+    | J_RAINBOW_3 zone needs padding of 4                   |
+    \*-----------------------------------------------------*/
    zone == MSI_ZONE_J_RAINBOW_3 ? zone_data->padding = 4 : zone_data->padding = 0;

-    ZoneData* on_board_zone = GetZoneData(data, MSI_ZONE_ON_BOARD_LED_0);
+    /*-----------------------------------------------------*\
+    | Get the zone data pointer to the on-board LED 0 zone  |
+    \*-----------------------------------------------------*/
+    ZoneData* on_board_zone = GetZoneData(configuration_data, MSI_ZONE_ON_BOARD_LED_0);

+    /*-----------------------------------------------------*\
+    | If the zone is JRGB or JPIPE and the board has no     |
+    | onboard LEDs, set the onboard zone to this zone's     |
+    | settings                                              |
+    \*-----------------------------------------------------*/
    if(no_onboards && ((zone == MSI_ZONE_J_RGB_1) || (zone == MSI_ZONE_J_RGB_2) || (zone == MSI_ZONE_J_PIPE_1) || (zone == MSI_ZONE_J_PIPE_2)))
    {
-        on_board_zone->effect                  =  zone_data->effect;
-        on_board_zone->speedAndBrightnessFlags =  zone_data->speedAndBrightnessFlags;
-        on_board_zone->colorFlags              =  zone_data->colorFlags;
-        on_board_zone->colorFlags              |= SYNC_SETTING_ONBOARD;
-        on_board_zone->padding                 =  0x00;
+        on_board_zone->effect                  = zone_data->effect;
+        on_board_zone->speedAndBrightnessFlags = zone_data->speedAndBrightnessFlags;
+        on_board_zone->colorFlags              = zone_data->colorFlags;
+        on_board_zone->colorFlags             |= MSI_COLOR_FLAG_SYNC_SETTING_ONBOARD;
+        on_board_zone->padding                 = 0x00;
    }

+    /*-----------------------------------------------------*\
+    | For modes above MSI_MODE_LIGHTNING, set the onboard   |
+    | zone to sync with JRGB, JPIPE1, and JPIPE2            |
+    \*-----------------------------------------------------*/
    if(mode > MSI_MODE_LIGHTNING)
    {
-        on_board_zone->speedAndBrightnessFlags |= SYNC_SETTING_JRGB;
-        on_board_zone->colorFlags              |= (SYNC_SETTING_JPIPE1 | SYNC_SETTING_JPIPE2);
+        on_board_zone->speedAndBrightnessFlags |= MSI_SPEED_BRIGHTNESS_FLAG_SYNC_SETTING_JRGB;
+        on_board_zone->colorFlags              |= (MSI_COLOR_FLAG_SYNC_SETTING_JPIPE1 | MSI_COLOR_FLAG_SYNC_SETTING_JPIPE2);
    }
    else
    {
-        on_board_zone->speedAndBrightnessFlags &= ~SYNC_SETTING_JRGB;
-        on_board_zone->colorFlags              &= ~(SYNC_SETTING_JPIPE1 | SYNC_SETTING_JPIPE2);
+        on_board_zone->speedAndBrightnessFlags &= ~MSI_SPEED_BRIGHTNESS_FLAG_SYNC_SETTING_JRGB;
+        on_board_zone->colorFlags              &= ~(MSI_COLOR_FLAG_SYNC_SETTING_JPIPE1 | MSI_COLOR_FLAG_SYNC_SETTING_JPIPE2);
    }

+    /*-----------------------------------------------------*\
+    | For modes at or below MSI_MODE_LIGHTNING, set all     |
+    | onboard LED zones to match onboard LED zone 0         |
+    \*-----------------------------------------------------*/
    if((zone == MSI_ZONE_ON_BOARD_LED_0) && (mode <= MSI_MODE_LIGHTNING))
    {
        for(int i = 0; i < numof_onboard_leds; ++i)
        {
-            zone_data = GetZoneData(data, (MSI_ZONE)((int)MSI_ZONE_ON_BOARD_LED_1 + i));
+            zone_data = GetZoneData(configuration_data, (MSI_ZONE)((int)MSI_ZONE_ON_BOARD_LED_1 + i));

            if(zone_data != nullptr)
            {
                zone_data->effect                    = mode;
-                zone_data->speedAndBrightnessFlags   = (brightness << 2) | (speed & 0x03);
-                zone_data->colorFlags                = BITSET(zone_data->colorFlags, !rainbow_color, 7u);
+                zone_data->speedAndBrightnessFlags   = ((brightness << MSI_SPEED_BRIGHTNESS_FLAG_BRIGHTNESS_SHIFT) & MSI_SPEED_BRIGHTNESS_FLAG_BRIGHTNESS_MASK)
+                                                     | ((speed << MSI_SPEED_BRIGHTNESS_FLAG_SPEED_SHIFT)           & MSI_SPEED_BRIGHTNESS_FLAG_SPEED_MASK);
+                zone_data->colorFlags                = (rainbow_color ? 0 : MSI_COLOR_FLAG_USE_CUSTOM_COLOR);
                zone_data->padding                   = 0x00;
            }
        }
@@ -663,12 +717,33 @@ std::string MSIMotherboard185Controller::GetSerial()
    return(StringUtils::wstring_to_string(serial_string));
 }

-bool MSIMotherboard185Controller::ReadSettings()
+bool MSIMotherboard185Controller::ReadConfigurationData()
 {
    /*-----------------------------------------------------*\
    | Read packet from hardware, return true if successful  |
    \*-----------------------------------------------------*/
-    return(hid_get_feature_report(dev, (unsigned char*)&data, sizeof(data)) == sizeof data);
+    int ret = hid_get_feature_report(dev, (unsigned char*)&configuration_data, sizeof(configuration_data));
+
+    /*-----------------------------------------------------*\
+    | Log the configuration data in hex at TRACE level      |
+    \*-----------------------------------------------------*/
+    if(LogManager::get()->GetLogLevel() >= LL_TRACE)
+    {
+        LOG_TRACE("[MSIMotherboard185Controller] Read configuration data packet (%zu bytes):", sizeof(configuration_data));
+        for(size_t i = 0; i < sizeof(configuration_data); i += 16)
+        {
+            std::string hex_line = "";
+            for(size_t j = i; j < i + 16 && j < sizeof(configuration_data); j++)
+            {
+                char buf[4];
+                snprintf(buf, sizeof(buf), "%02X ", ((unsigned char*)&configuration_data)[j]);
+                hex_line += buf;
+            }
+            LOG_TRACE("    %04zX: %s", i, hex_line.c_str());
+        }
+    }
+
+    return(ret == sizeof configuration_data);
 }

 bool MSIMotherboard185Controller::Update
@@ -749,27 +824,43 @@ bool MSIMotherboard185Controller::Update
        }
        else
        {
-            return(hid_send_feature_report(dev, (unsigned char*)&zone_based_per_led_data, sizeof(zone_based_per_led_data)) == sizeof(zone_based_per_led_data));
+            return(hid_send_feature_report(dev, (unsigned char*)&configuration_data, sizeof(configuration_data)) == sizeof(configuration_data));
        }
    }
    else
    {
        /*-------------------------------------------------*\
-        | Save new state, read current state from board,    |
-        | send old state first, then new state.             |
-        | Windows Mystic Light sends two consecutive        |
-        | reports.                                          |
+        | Set the save flag                                 |
        \*-------------------------------------------------*/
-        FeaturePacket_185 new_data = data;
-        memcpy((unsigned char*)&new_data, (unsigned char*)&data, sizeof(data));
+        configuration_data.save_data = save;

-        ReadSettings();
-        data.save_data = save;
-        hid_send_feature_report(dev, (unsigned char*)&data, sizeof(data));
+        /*-------------------------------------------------*\
+        | Save a copy of the new configuration data         |
+        \*-------------------------------------------------*/
+        FeaturePacket_185 new_configuration;

-        memcpy((unsigned char*)&data, (unsigned char*)&new_data, sizeof(data));
-        data.save_data = save;
-        return(hid_send_feature_report(dev, (unsigned char*)&data, sizeof(data)) == sizeof(data));
+        memcpy((unsigned char*)&new_configuration, (unsigned char*)&configuration_data, sizeof(configuration_data));
+
+        /*-------------------------------------------------*\
+        | Read the existing configuration data              |
+        \*-------------------------------------------------*/
+        ReadConfigurationData();
+
+        /*-------------------------------------------------*\
+        | First, send a copy of the existing configuration  |
+        | data                                              |
+        \*-------------------------------------------------*/
+        hid_send_feature_report(dev, (unsigned char*)&configuration_data, sizeof(configuration_data));
+
+        /*-------------------------------------------------*\
+        | Second, restore the new configuration data into   |
+        | the buffer and then send it.  MSI software on     |
+        | Windows sends the old data followed by new data   |
+        | so this mimics that flow.                         |
+        \*-------------------------------------------------*/
+        memcpy((unsigned char*)&configuration_data, (unsigned char*)&new_configuration, sizeof(new_configuration));
+
+        return(hid_send_feature_report(dev, (unsigned char*)&configuration_data, sizeof(configuration_data)) == sizeof(configuration_data));
    }
 }

@@ -789,13 +880,23 @@ void MSIMotherboard185Controller::SetZoneColor
        return;
    }

-    ZoneData* zone_data = GetZoneData(data, zone);
+    /*-----------------------------------------------------*\
+    | Get the zone data pointer within the configuration    |
+    | data buffer                                           |
+    \*-----------------------------------------------------*/
+    ZoneData* zone_data = GetZoneData(configuration_data, zone);

+    /*-----------------------------------------------------*\
+    | Return if zone is invalid                             |
+    \*-----------------------------------------------------*/
    if(zone_data == nullptr)
    {
        return;
    }

+    /*-----------------------------------------------------*\
+    | Set the colors in the zone data                       |
+    \*-----------------------------------------------------*/
    zone_data->color.R  = red1;
    zone_data->color.G  = grn1;
    zone_data->color.B  = blu1;
@@ -803,9 +904,14 @@ void MSIMotherboard185Controller::SetZoneColor
    zone_data->color2.G = grn2;
    zone_data->color2.B = blu2;

+    /*-----------------------------------------------------*\
+    | If the zone is JRGB or JPIPE and the board has no     |
+    | onboard LEDs, set the onboard zone's colors to this   |
+    | zone's colors                                         |
+    \*-----------------------------------------------------*/
    if(no_onboards && ((zone == MSI_ZONE_J_RGB_1) || (zone == MSI_ZONE_J_RGB_2) || (zone == MSI_ZONE_J_PIPE_1) || (zone == MSI_ZONE_J_PIPE_2)))
    {
-        ZoneData* on_board_zone = GetZoneData(data, MSI_ZONE_ON_BOARD_LED_0);
+        ZoneData* on_board_zone = GetZoneData(configuration_data, MSI_ZONE_ON_BOARD_LED_0);

        on_board_zone->color.R  = red1;
        on_board_zone->color.G  = grn1;
@@ -815,11 +921,15 @@ void MSIMotherboard185Controller::SetZoneColor
        on_board_zone->color2.B = blu2;
    }

+    /*-----------------------------------------------------*\
+    | Set all onboard LED zones' colors to match onboard    |
+    | LED 0                                                 |
+    \*-----------------------------------------------------*/
    if(zone == MSI_ZONE_ON_BOARD_LED_0)
    {
        for(int i = 0; i < numof_onboard_leds; ++i)
        {
-            zone_data = GetZoneData(data, (MSI_ZONE)((int)MSI_ZONE_ON_BOARD_LED_1 + i));
+            zone_data = GetZoneData(configuration_data, (MSI_ZONE)((int)MSI_ZONE_ON_BOARD_LED_1 + i));

            if(zone_data != nullptr)
            {
@@ -843,6 +953,10 @@ void MSIMotherboard185Controller::SetLedColor
    unsigned char   blu
    )
 {
+    /*-----------------------------------------------------*\
+    | If this board supports Per-LED direct mode, update    |
+    | the per-LED packet buffers                            |
+    \*-----------------------------------------------------*/
    if(per_led_mode == DIRECT_MODE_PER_LED)
    {
        Color* zone_data = GetPerLedZoneData(zone);
@@ -878,19 +992,32 @@ void MSIMotherboard185Controller::SetLedColor
            }
        }
    }
+    /*-----------------------------------------------------*\
+    | Otherwise, colors are set per zone.                   |
+    \*-----------------------------------------------------*/
    else
    {
+        /*-------------------------------------------------*\
+        | The JRAINBOW and JPIPE zones have a single LED    |
+        | each at the RGBController layer, so index must be |
+        | 0.                                                |
+        \*-------------------------------------------------*/
        if(((zone == MSI_ZONE_J_RAINBOW_1) || (zone == MSI_ZONE_J_RAINBOW_2) || (zone == MSI_ZONE_J_PIPE_1) || (zone == MSI_ZONE_J_PIPE_2)) && (index != 0))
        {
            return;
        }
-
+        /*-------------------------------------------------*\
+        | The onboard LEDs are treated as a single zone by  |
+        | the RGBController layer, so LED index is used to  |
+        | select which onboard LED zone in the              |
+        | configuration data to update with the given color.|
+        \*-------------------------------------------------*/
        if(zone >= MSI_ZONE_ON_BOARD_LED_0)
        {
            zone = (MSI_ZONE)((int)zone + index + 1);
        }

-        ZoneData *zone_data = GetZoneData(zone_based_per_led_data, zone);
+        ZoneData *zone_data = GetZoneData(configuration_data, zone);

        if(zone_data == nullptr)
        {
@@ -1033,11 +1160,11 @@ RainbowZoneData *MSIMotherboard185Controller::GetRainbowZoneData
    switch(zone)
    {
        case MSI_ZONE_J_RAINBOW_1:
-            return &data.j_rainbow_1;
+            return &configuration_data.j_rainbow_1;
        case MSI_ZONE_J_RAINBOW_2:
-            return &data.j_rainbow_2;
+            return &configuration_data.j_rainbow_2;
        case MSI_ZONE_J_RAINBOW_3:
-            return (RainbowZoneData*)&data.j_corsair;
+            return (RainbowZoneData*)&configuration_data.j_corsair;
        case MSI_ZONE_J_CORSAIR:
        default:
            return nullptr;
@@ -1128,14 +1255,14 @@ bool MSIMotherboard185Controller::ReadFwVersion()

 MSI_MODE MSIMotherboard185Controller::GetMode()
 {
-    if(data.on_board_led.effect == MSI_DIRECT_MODE)
+    if(configuration_data.on_board_led.effect == MSI_DIRECT_MODE)
    {
        direct_mode = true;
        return MSI_MODE_DIRECT_DUMMY;
    }
    else
    {
-        return (MSI_MODE)data.j_rainbow_1.effect;
+        return (MSI_MODE)configuration_data.j_rainbow_1.effect;
    }
 }

@@ -1150,9 +1277,10 @@ void MSIMotherboard185Controller::GetMode
    )
 {
    /*-----------------------------------------------------*\
-    | Get data for given zone                               |
+    | Get the zone data pointer within the configuration    |
+    | data buffer                                           |
    \*-----------------------------------------------------*/
-    ZoneData *zone_data = GetZoneData(data, zone);
+    ZoneData *zone_data = GetZoneData(configuration_data, zone);

    /*-----------------------------------------------------*\
    | Return if zone is invalid                             |
@@ -1165,10 +1293,10 @@ void MSIMotherboard185Controller::GetMode
    /*-----------------------------------------------------*\
    | Update pointers with data                             |
    \*-----------------------------------------------------*/
-    mode            = (MSI_MODE)zone_data->effect;
-    speed           = (MSI_SPEED)(zone_data->speedAndBrightnessFlags & 0x03);
-    brightness      = (MSI_BRIGHTNESS)((zone_data->speedAndBrightnessFlags >> 2) & 0x1F);
-    rainbow_color   = (zone_data->colorFlags & 0x80) == 0 ? true : false;
+    mode            = (MSI_MODE)        zone_data->effect;
+    speed           = (MSI_SPEED)     ((zone_data->speedAndBrightnessFlags >> MSI_SPEED_BRIGHTNESS_FLAG_SPEED_SHIFT)      & MSI_SPEED_BRIGHTNESS_FLAG_SPEED_MASK);
+    brightness      = (MSI_BRIGHTNESS)((zone_data->speedAndBrightnessFlags >> MSI_SPEED_BRIGHTNESS_FLAG_BRIGHTNESS_SHIFT) & MSI_SPEED_BRIGHTNESS_FLAG_BRIGHTNESS_MASK);
+    rainbow_color   = ((zone_data->colorFlags & MSI_COLOR_FLAG_USE_CUSTOM_COLOR) == 0 ? false : true);
    color           = ToRGBColor(zone_data->color.R, zone_data->color.G, zone_data->color.B);
 }

@@ -1322,6 +1450,48 @@ bool MSIMotherboard185Controller::SelectPerLedProtocol()

    if(direct_mode)
    {
+        /*-------------------------------------------------*\
+        | Initialize configuration data for direct mode.    |
+        | This sets up brightness and color flags for all   |
+        | zones, which is only done when actually entering  |
+        | direct mode to preserve the state read from the   |
+        | controller for normal (non-direct) mode           |
+        | operation.                                        |
+        \*-------------------------------------------------*/
+        configuration_data.j_rgb_1.speedAndBrightnessFlags         = MSI_BRIGHTNESS_LEVEL_100 << MSI_SPEED_BRIGHTNESS_FLAG_BRIGHTNESS_SHIFT;
+        configuration_data.j_rgb_1.colorFlags                      = MSI_COLOR_FLAG_USE_CUSTOM_COLOR;
+        configuration_data.j_pipe_1.speedAndBrightnessFlags        = MSI_BRIGHTNESS_LEVEL_100 << MSI_SPEED_BRIGHTNESS_FLAG_BRIGHTNESS_SHIFT;
+        configuration_data.j_pipe_1.colorFlags                     = MSI_COLOR_FLAG_USE_CUSTOM_COLOR;
+        configuration_data.j_pipe_2.speedAndBrightnessFlags        = MSI_BRIGHTNESS_LEVEL_100 << MSI_SPEED_BRIGHTNESS_FLAG_BRIGHTNESS_SHIFT;
+        configuration_data.j_pipe_2.colorFlags                     = MSI_COLOR_FLAG_USE_CUSTOM_COLOR;
+        configuration_data.j_rainbow_1.speedAndBrightnessFlags     = MSI_BRIGHTNESS_LEVEL_100 << MSI_SPEED_BRIGHTNESS_FLAG_BRIGHTNESS_SHIFT;
+        configuration_data.j_rainbow_1.colorFlags                  = MSI_COLOR_FLAG_USE_CUSTOM_COLOR;
+        configuration_data.j_rainbow_2.speedAndBrightnessFlags     = MSI_BRIGHTNESS_LEVEL_100 << MSI_SPEED_BRIGHTNESS_FLAG_BRIGHTNESS_SHIFT;
+        configuration_data.j_rainbow_2.colorFlags                  = MSI_COLOR_FLAG_USE_CUSTOM_COLOR;
+        configuration_data.on_board_led.speedAndBrightnessFlags    = MSI_BRIGHTNESS_LEVEL_100 << MSI_SPEED_BRIGHTNESS_FLAG_BRIGHTNESS_SHIFT;
+        configuration_data.on_board_led.colorFlags                 = MSI_COLOR_FLAG_USE_CUSTOM_COLOR;
+        configuration_data.on_board_led_1.speedAndBrightnessFlags  = MSI_BRIGHTNESS_LEVEL_100 << MSI_SPEED_BRIGHTNESS_FLAG_BRIGHTNESS_SHIFT;
+        configuration_data.on_board_led_1.colorFlags               = MSI_COLOR_FLAG_USE_CUSTOM_COLOR;
+        configuration_data.on_board_led_2.speedAndBrightnessFlags  = MSI_BRIGHTNESS_LEVEL_100 << MSI_SPEED_BRIGHTNESS_FLAG_BRIGHTNESS_SHIFT;
+        configuration_data.on_board_led_2.colorFlags               = MSI_COLOR_FLAG_USE_CUSTOM_COLOR;
+        configuration_data.on_board_led_3.speedAndBrightnessFlags  = MSI_BRIGHTNESS_LEVEL_100 << MSI_SPEED_BRIGHTNESS_FLAG_BRIGHTNESS_SHIFT;
+        configuration_data.on_board_led_3.colorFlags               = MSI_COLOR_FLAG_USE_CUSTOM_COLOR;
+        configuration_data.on_board_led_4.speedAndBrightnessFlags  = MSI_BRIGHTNESS_LEVEL_100 << MSI_SPEED_BRIGHTNESS_FLAG_BRIGHTNESS_SHIFT;
+        configuration_data.on_board_led_4.colorFlags               = MSI_COLOR_FLAG_USE_CUSTOM_COLOR;
+        configuration_data.on_board_led_5.speedAndBrightnessFlags  = MSI_BRIGHTNESS_LEVEL_100 << MSI_SPEED_BRIGHTNESS_FLAG_BRIGHTNESS_SHIFT;
+        configuration_data.on_board_led_5.colorFlags               = MSI_COLOR_FLAG_USE_CUSTOM_COLOR;
+        configuration_data.on_board_led_6.speedAndBrightnessFlags  = MSI_BRIGHTNESS_LEVEL_100 << MSI_SPEED_BRIGHTNESS_FLAG_BRIGHTNESS_SHIFT;
+        configuration_data.on_board_led_6.colorFlags               = MSI_COLOR_FLAG_USE_CUSTOM_COLOR;
+        configuration_data.on_board_led_7.speedAndBrightnessFlags  = MSI_BRIGHTNESS_LEVEL_100 << MSI_SPEED_BRIGHTNESS_FLAG_BRIGHTNESS_SHIFT;
+        configuration_data.on_board_led_7.colorFlags               = MSI_COLOR_FLAG_USE_CUSTOM_COLOR;
+        configuration_data.on_board_led_8.speedAndBrightnessFlags  = MSI_BRIGHTNESS_LEVEL_100 << MSI_SPEED_BRIGHTNESS_FLAG_BRIGHTNESS_SHIFT;
+        configuration_data.on_board_led_8.colorFlags               = MSI_COLOR_FLAG_USE_CUSTOM_COLOR;
+        configuration_data.on_board_led_9.speedAndBrightnessFlags  = MSI_BRIGHTNESS_LEVEL_100 << MSI_SPEED_BRIGHTNESS_FLAG_BRIGHTNESS_SHIFT;
+        configuration_data.on_board_led_9.colorFlags               = MSI_COLOR_FLAG_USE_CUSTOM_COLOR;
+        configuration_data.j_rgb_2.speedAndBrightnessFlags         = MSI_BRIGHTNESS_LEVEL_100 << MSI_SPEED_BRIGHTNESS_FLAG_BRIGHTNESS_SHIFT;
+        configuration_data.j_rgb_2.colorFlags                      = MSI_COLOR_FLAG_USE_CUSTOM_COLOR;
+        configuration_data.save_data                               = 0;
+
        if(per_led_mode == DIRECT_MODE_PER_LED)
        {
            if(hid_send_feature_report(dev, (unsigned char*)&enable_per_led_msg, sizeof(enable_per_led_msg)) != sizeof(enable_per_led_msg))
@@ -121,12 +121,19 @@ private:
    std::string                     version_APROM;
    std::string                     version_LDROM;

-    FeaturePacket_185               data;
+    /*-----------------------------------------------------*\
+    | Configuration Data, mirrors the configuration block   |
+    | stored in the microcontroller's data flash            |
+    \*-----------------------------------------------------*/
+    FeaturePacket_185               configuration_data;
+
+    /*-----------------------------------------------------*\
+    | Per-LED Direct Mode packet buffers for each zone      |
+    \*-----------------------------------------------------*/
    FeaturePacket_PerLED_185        per_led_data_onboard_and_sync;
    FeaturePacket_PerLED_185        per_led_data_jrainbow1;
    FeaturePacket_PerLED_185        per_led_data_jrainbow2;
    FeaturePacket_PerLED_185        per_led_data_jcorsair;
-    FeaturePacket_185               zone_based_per_led_data;
    bool                            direct_mode;
    bool                            direct_mode_configured;
    bool                            sync_direct_mode;
@@ -142,7 +149,7 @@ private:
    const std::vector<MSI_ZONE>*    supported_zones;
    DIRECT_MODE                     per_led_mode;

-    bool            ReadSettings();
+    bool            ReadConfigurationData();
    bool            ReadFwVersion();
    ZoneData*       GetZoneData
                        (
@@ -155,4 +162,6 @@ private:
                        MSI_ZONE zone
                        );
    bool            SelectPerLedProtocol();
+    static bool     IsZoneSupported(MSI_ZONE zone, const std::vector<MSI_ZONE>* supported_zones);
 };
+
@@ -119,6 +119,59 @@ int RGBController_MSIMotherboard185::GetDeviceMode()
    return 0;
 }

+void RGBController_MSIMotherboard185::SetupModes()
+{
+    constexpr unsigned int COMMON       = MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR | MODE_FLAG_MANUAL_SAVE;
+    constexpr unsigned int MODE_SPECIFIC_ONLY = MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_MANUAL_SAVE;
+    constexpr unsigned int RANDOM_ONLY  = MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_RANDOM_COLOR | MODE_FLAG_MANUAL_SAVE;
+
+    if(controller->GetSupportedDirectMode() != MSIMotherboard185Controller::DIRECT_MODE_DISABLED)
+    {
+        SetupMode("Direct",                 MSI_MODE_DIRECT_DUMMY,                  MODE_FLAG_HAS_PER_LED_COLOR);
+    }
+
+    SetupMode("Static",                     MSI_MODE_STATIC,                        MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_MANUAL_SAVE);
+    // SetupMode("Off",                        MSI_MODE_DISABLE,                       0);
+    SetupMode("Breathing",                  MSI_MODE_BREATHING,                     MODE_SPECIFIC_ONLY);
+    SetupMode("Flashing",                   MSI_MODE_FLASHING,                      COMMON);
+    SetupMode("Double flashing",            MSI_MODE_DOUBLE_FLASHING,               COMMON);
+    SetupMode("Lightning",                  MSI_MODE_LIGHTNING,                     MODE_SPECIFIC_ONLY);
+    // 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,                    RANDOM_ONLY);
+    SetupMode("Planetary",                  MSI_MODE_PLANETARY,                     RANDOM_ONLY);
+    SetupMode("Double meteor",              MSI_MODE_DOUBLE_METEOR,                 RANDOM_ONLY);
+    SetupMode("Energy",                     MSI_MODE_ENERGY,                        RANDOM_ONLY);
+    SetupMode("Blink",                      MSI_MODE_BLINK,                         COMMON);
+    SetupMode("Clock",                      MSI_MODE_CLOCK,                         RANDOM_ONLY);
+    SetupMode("Color pulse",                MSI_MODE_COLOR_PULSE,                   COMMON);
+    SetupMode("Color shift",                MSI_MODE_COLOR_SHIFT,                   RANDOM_ONLY);
+    SetupMode("Color wave",                 MSI_MODE_COLOR_WAVE,                    COMMON);
+    SetupMode("Marquee",                    MSI_MODE_MARQUEE,                       MODE_SPECIFIC_ONLY);
+    // SetupMode("Rainbow",                    MSI_MODE_RAINBOW,                       COMMON);
+    SetupMode("Rainbow wave",               MSI_MODE_RAINBOW_WAVE,                  RANDOM_ONLY);
+    SetupMode("Visor",                      MSI_MODE_VISOR,                         COMMON);
+    // SetupMode("JRainbow",                   MSI_MODE_JRAINBOW,                      COMMON);
+    SetupMode("Rainbow flashing",           MSI_MODE_RAINBOW_FLASHING,              RANDOM_ONLY);
+    // 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,    RANDOM_ONLY);
+    SetupMode("Stack",                      MSI_MODE_STACK,                         COMMON);
+    // SetupMode("Corsair Que",                MSI_MODE_CORSAIR_QUE,                   COMMON);
+    SetupMode("Fire",                       MSI_MODE_FIRE,                          RANDOM_ONLY);
+    // SetupMode("Lava",                       MSI_MODE_LAVA,                          COMMON);
+}
+
 void RGBController_MSIMotherboard185::SetupZones()
 {
    /*-----------------------------------------------------*\
@@ -279,7 +332,8 @@ void RGBController_MSIMotherboard185::DeviceUpdateLEDs()
            UpdateLed((int)zone_idx, led_idx);
        }
    }
-    controller->Update((modes[active_mode].flags & MODE_FLAG_AUTOMATIC_SAVE) != 0);
+
+    controller->Update(false);
 }

 void RGBController_MSIMotherboard185::DeviceUpdateZoneLEDs(int zone)
@@ -293,7 +347,8 @@ void RGBController_MSIMotherboard185::DeviceUpdateZoneLEDs(int zone)
    {
        UpdateLed(zone, led_idx);
    }
-    controller->Update((modes[active_mode].flags & MODE_FLAG_AUTOMATIC_SAVE) != 0);
+
+    controller->Update(false);
 }

 void RGBController_MSIMotherboard185::DeviceUpdateSingleLED
@@ -316,7 +371,8 @@ void RGBController_MSIMotherboard185::DeviceUpdateSingleLED

    int led_index = led - zones[zone_index].start_idx;
    UpdateLed(zone_index, led_index);
-    controller->Update((modes[active_mode].flags & MODE_FLAG_AUTOMATIC_SAVE) != 0);
+
+    controller->Update(false);
 }

 void RGBController_MSIMotherboard185::DeviceUpdateMode()
@@ -328,8 +384,40 @@ void RGBController_MSIMotherboard185::DeviceUpdateMode()
    else
    {
        controller->SetDirectMode(false);
-        DeviceUpdateLEDs();
+
+        /*-------------------------------------------------*\
+        | Set mode configuration for all zones              |
+        \*-------------------------------------------------*/
+        for(std::size_t zone_idx = 0; zone_idx < zones.size(); ++zone_idx)
+        {
+            if(zones[zone_idx].leds_count > 0)
+            {
+                bool           random     = modes[active_mode].color_mode == MODE_COLORS_RANDOM;
+                MSI_MODE       mode       = (MSI_MODE)modes[active_mode].value;
+                MSI_SPEED      speed      = (MSI_SPEED)modes[active_mode].speed;
+                MSI_BRIGHTNESS brightness = (MSI_BRIGHTNESS)modes[active_mode].brightness;
+
+                controller->SetMode((MSI_ZONE)zones[zone_idx].leds[0].value, mode, speed, brightness, random);
+
+                /*-----------------------------------------*\
+                | Set mode-specific colors if available     |
+                \*-----------------------------------------*/
+                if(modes[active_mode].flags & MODE_FLAG_HAS_MODE_SPECIFIC_COLOR)
+                {
+                    unsigned char red = 0, grn = 0, blu = 0;
+                    if(modes[active_mode].colors.size() > 0)
+                    {
+                        red = RGBGetRValue(modes[active_mode].colors[0]);
+                        grn = RGBGetGValue(modes[active_mode].colors[0]);
+                        blu = RGBGetBValue(modes[active_mode].colors[0]);
+                    }
+                    controller->SetZoneColor((MSI_ZONE)zones[zone_idx].leds[0].value, red, grn, blu, red, grn, blu);
+                }
+            }
+        }
    }
+
+    controller->Update(false);
 }

 void RGBController_MSIMotherboard185::DeviceSaveMode()
@@ -337,59 +425,6 @@ void RGBController_MSIMotherboard185::DeviceSaveMode()
    controller->Update(true);
 }

-void RGBController_MSIMotherboard185::SetupModes()
-{
-    constexpr unsigned int PER_LED_ONLY = MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_MANUAL_SAVE;
-    constexpr unsigned int RANDOM_ONLY  = MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_RANDOM_COLOR | MODE_FLAG_MANUAL_SAVE;
-    constexpr unsigned int COMMON       = RANDOM_ONLY | MODE_FLAG_HAS_PER_LED_COLOR;
-
-    if(controller->GetSupportedDirectMode() != MSIMotherboard185Controller::DIRECT_MODE_DISABLED)
-    {
-        SetupMode("Direct",                 MSI_MODE_DIRECT_DUMMY,                  MODE_FLAG_HAS_PER_LED_COLOR);
-    }
-
-    SetupMode("Static",                     MSI_MODE_STATIC,                        MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_MANUAL_SAVE);
-    // SetupMode("Off",                        MSI_MODE_DISABLE,                       0);
-    SetupMode("Breathing",                  MSI_MODE_BREATHING,                     PER_LED_ONLY);
-    SetupMode("Flashing",                   MSI_MODE_FLASHING,                      COMMON);
-    SetupMode("Double flashing",            MSI_MODE_DOUBLE_FLASHING,               COMMON);
-    SetupMode("Lightning",                  MSI_MODE_LIGHTNING,                     PER_LED_ONLY);
-    // 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,                    RANDOM_ONLY);
-    SetupMode("Planetary",                  MSI_MODE_PLANETARY,                     RANDOM_ONLY);
-    SetupMode("Double meteor",              MSI_MODE_DOUBLE_METEOR,                 RANDOM_ONLY);
-    SetupMode("Energy",                     MSI_MODE_ENERGY,                        RANDOM_ONLY);
-    SetupMode("Blink",                      MSI_MODE_BLINK,                         COMMON);
-    SetupMode("Clock",                      MSI_MODE_CLOCK,                         RANDOM_ONLY);
-    SetupMode("Color pulse",                MSI_MODE_COLOR_PULSE,                   COMMON);
-    SetupMode("Color shift",                MSI_MODE_COLOR_SHIFT,                   RANDOM_ONLY);
-    SetupMode("Color wave",                 MSI_MODE_COLOR_WAVE,                    COMMON);
-    SetupMode("Marquee",                    MSI_MODE_MARQUEE,                       PER_LED_ONLY);
-    // SetupMode("Rainbow",                    MSI_MODE_RAINBOW,                       COMMON);
-    SetupMode("Rainbow wave",               MSI_MODE_RAINBOW_WAVE,                  RANDOM_ONLY);
-    SetupMode("Visor",                      MSI_MODE_VISOR,                         COMMON);
-    // SetupMode("JRainbow",                   MSI_MODE_JRAINBOW,                      COMMON);
-    SetupMode("Rainbow flashing",           MSI_MODE_RAINBOW_FLASHING,              RANDOM_ONLY);
-    // 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,    RANDOM_ONLY);
-    SetupMode("Stack",                      MSI_MODE_STACK,                         COMMON);
-    // SetupMode("Corsair Que",                MSI_MODE_CORSAIR_QUE,                   COMMON);
-    SetupMode("Fire",                       MSI_MODE_FIRE,                          RANDOM_ONLY);
-    // SetupMode("Lava",                       MSI_MODE_LAVA,                          COMMON);
-}
-
 void RGBController_MSIMotherboard185::UpdateLed
    (
    int zone,
@@ -404,19 +439,6 @@ void RGBController_MSIMotherboard185::UpdateLed
    {
        controller->SetLedColor((MSI_ZONE)(zones[zone].leds[led].value), led, red, grn, blu);
    }
-    else
-    {
-        if(led == 0)
-        {
-            bool           random     = modes[active_mode].color_mode == MODE_COLORS_RANDOM;
-            MSI_MODE       mode       = (MSI_MODE)modes[active_mode].value;
-            MSI_SPEED      speed      = (MSI_SPEED)modes[active_mode].speed;
-            MSI_BRIGHTNESS brightness = (MSI_BRIGHTNESS)modes[active_mode].brightness;
-
-            controller->SetMode((MSI_ZONE)zones[zone].leds[led].value, mode, speed, brightness, random);
-            controller->SetZoneColor((MSI_ZONE)zones[zone].leds[led].value, red, grn, blu, red, grn, blu);
-        }
-    }
 }

 void RGBController_MSIMotherboard185::SetupMode
@@ -435,6 +457,14 @@ void RGBController_MSIMotherboard185::SetupMode
    {
        Mode.color_mode = MODE_COLORS_PER_LED;
    }
+    else if(flags & MODE_FLAG_HAS_MODE_SPECIFIC_COLOR)
+    {
+        Mode.color_mode = MODE_COLORS_MODE_SPECIFIC;
+        Mode.colors_min = 1;
+        Mode.colors_max = 1;
+        Mode.colors.resize(1);
+        Mode.colors[0]  = ToRGBColor(255, 255, 255);
+    }
    else
    {
        Mode.color_mode = MODE_COLORS_RANDOM;
@@ -512,19 +542,24 @@ void RGBController_MSIMotherboard185::GetDeviceConfig()
                {
                   modes[i].brightness = brightness;
                }
-                if(rainbow)
+                if(modes[i].flags & (MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR))
                {
-                    if(modes[i].flags & (MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_HAS_RANDOM_COLOR))
+                    if(rainbow && (modes[i].flags & MODE_FLAG_HAS_RANDOM_COLOR))
                    {
-                        if(rainbow)
+                        modes[i].color_mode = MODE_COLORS_RANDOM;
+                    }
+                    else if(modes[i].flags & MODE_FLAG_HAS_MODE_SPECIFIC_COLOR)
+                    {
+                        modes[i].color_mode = MODE_COLORS_MODE_SPECIFIC;
+                        if(modes[i].colors.size() > 0)
                        {
-                            modes[i].color_mode = MODE_COLORS_RANDOM;
-                        }
-                        else
-                        {
-                            modes[i].color_mode = MODE_COLORS_PER_LED;
+                            modes[i].colors[0] = color;
                        }
                    }
+                    else
+                    {
+                        modes[i].color_mode = MODE_COLORS_PER_LED;
+                    }
                }
                break;
            }
@@ -122,13 +122,22 @@ enum MSI_BRIGHTNESS
 #define NUMOF_PER_LED_MODE_LEDS                     240
 #define NUM_LEDS_761                                720

-#define SYNC_SETTING_ONBOARD                        0x01
-#define SYNC_SETTING_JRAINBOW1                      0x02
-#define SYNC_SETTING_JRAINBOW2                      0x04
-#define SYNC_SETTING_JCORSAIR                       0x08
-#define SYNC_SETTING_JPIPE1                         0x10
-#define SYNC_SETTING_JPIPE2                         0x20
-#define SYNC_SETTING_JRGB                           0x80
+/*---------------------------------------------------------*\
+| Flag bitfield bit definitions                             |
+| Note that the sync flags split across the two fields      |
+\*---------------------------------------------------------*/
+#define MSI_SPEED_BRIGHTNESS_FLAG_SPEED_SHIFT       0
+#define MSI_SPEED_BRIGHTNESS_FLAG_SPEED_MASK        (0x03 << MSI_SPEED_BRIGHTNESS_FLAG_SPEED_SHIFT)
+#define MSI_SPEED_BRIGHTNESS_FLAG_BRIGHTNESS_SHIFT  2
+#define MSI_SPEED_BRIGHTNESS_FLAG_BRIGHTNESS_MASK   (0x1F << MSI_SPEED_BRIGHTNESS_FLAG_BRIGHTNESS_SHIFT)
+#define MSI_SPEED_BRIGHTNESS_FLAG_SYNC_SETTING_JRGB (1 << 7)
+#define MSI_COLOR_FLAG_SYNC_SETTING_ONBOARD         (1 << 0)
+#define MSI_COLOR_FLAG_SYNC_SETTING_JRAINBOW1       (1 << 1)
+#define MSI_COLOR_FLAG_SYNC_SETTING_JRAINBOW2       (1 << 2)
+#define MSI_COLOR_FLAG_SYNC_SETTING_JCORSAIR        (1 << 3)
+#define MSI_COLOR_FLAG_SYNC_SETTING_JPIPE1          (1 << 4)
+#define MSI_COLOR_FLAG_SYNC_SETTING_JPIPE2          (1 << 5)
+#define MSI_COLOR_FLAG_USE_CUSTOM_COLOR             (1 << 7)

 struct Color
 {
Author	SHA1	Message	Date
Adam Honse	e3e0f1a6a5	Get rid of zone_based_per_led_data buffer, just use the same configuration buffer for both as it overwrites the original configuration when written to the controller anyways	2026-09-06 20:54:37 -05:00
Adam Honse	63b780ee80	Fix update calls	2026-09-06 19:54:33 -05:00
Adam Honse	b9068ccf68	Move mode setting to DeviceUpdateMode and leave LED setting to DeviceUpdateLEDs	2026-09-06 19:42:00 -05:00
Adam Honse	58140eed82	Test: try per-led mode on 7B93 after firmware update	2026-09-06 16:30:01 -05:00
Adam Honse	7acaf2d12d	Zero out the Per-LED enable message buffer rather than initialize it from the configuration data	2026-09-06 16:05:03 -05:00
Adam Honse	717c257d8e	More cleanup	2026-09-06 15:34:12 -05:00
Adam Honse	c03d422b32	Fix Update	2026-09-06 13:46:35 -05:00
Adam Honse	b3fa0c1b96	Remove zone checks	2026-09-06 04:33:33 -05:00
Adam Honse	8a9fe3f5bb	Test fixes	2026-09-06 03:38:42 -05:00
Adam Honse	b60084be2e	Undo changes to per-LED switching messages	2026-09-06 02:23:33 -05:00
Adam Honse	a5eb5a4d53	Add comments to better describe the functionality	2026-09-06 01:41:56 -05:00
Adam Honse	46d24fd9bc	Add board filtering by name for boards with duplicate PIDs, add zone supported checks before modifying the zone blocks for any zone in the settings	2026-09-05 20:45:06 -05:00
Adam Honse	b15358582f	Treat 7C56 as B550-A PRO which does not have onboard LEDs	2026-09-05 19:57:12 -05:00
Adam Honse	81e0ea5cfa	Add trace level settings packet log to MSI 185 controller	2026-09-05 18:47:20 -05:00