From cbf867c0ee50f2a3cac8322afd204ea96080dc8c Mon Sep 17 00:00:00 2001
From: TheRogueZeta <6479694-TheRogueZeta@users.noreply.gitlab.com>
Date: Sun, 30 Aug 2020 16:59:15 -0700
Subject: [PATCH] Change zone name and move Polychrome_V1

---
 .../PolychromeController.cpp                     | 16 ++++++++--------
 .../PolychromeController/PolychromeController.h  |  4 ++--
 RGBController/RGBController_Polychrome.cpp       |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Controllers/PolychromeController/PolychromeController.cpp b/Controllers/PolychromeController/PolychromeController.cpp
index e3be0e45..c2d928fe 100644
--- a/Controllers/PolychromeController/PolychromeController.cpp
+++ b/Controllers/PolychromeController/PolychromeController.cpp
@@ -102,17 +102,17 @@ void PolychromeController::ReadLEDConfiguration()
     if (bus->i2c_smbus_read_byte_data(dev, POLYCHROME_REG_LED_CONFIG) == 0x06)
     {
         std::this_thread::sleep_for(1ms);
-        zone_led_count[POLYCHROME_ZONE_RGB_FAN_HDR] = bus->i2c_smbus_read_byte(dev);
+        zone_led_count[POLYCHROME_ZONE_RGB_LED_0_HDR]   = bus->i2c_smbus_read_byte(dev);
         std::this_thread::sleep_for(1ms);
-        zone_led_count[POLYCHROME_ZONE_RGB_LED_HDR] = bus->i2c_smbus_read_byte(dev);
+        zone_led_count[POLYCHROME_ZONE_RGB_LED_1_HDR]   = bus->i2c_smbus_read_byte(dev);
         std::this_thread::sleep_for(1ms);
-        zone_led_count[POLYCHROME_ZONE_AUDIO]       = bus->i2c_smbus_read_byte(dev);
+        zone_led_count[POLYCHROME_ZONE_AUDIO]           = bus->i2c_smbus_read_byte(dev);
         std::this_thread::sleep_for(1ms);
-        zone_led_count[POLYCHROME_ZONE_PCH]         = bus->i2c_smbus_read_byte(dev);
+        zone_led_count[POLYCHROME_ZONE_PCH]             = bus->i2c_smbus_read_byte(dev);
         std::this_thread::sleep_for(1ms);
-        zone_led_count[POLYCHROME_ZONE_IO_COVER]    = bus->i2c_smbus_read_byte(dev);
+        zone_led_count[POLYCHROME_ZONE_IO_COVER]        = bus->i2c_smbus_read_byte(dev);
         std::this_thread::sleep_for(1ms);
-        zone_led_count[POLYCHROME_ZONE_ADDRESSABLE] = bus->i2c_smbus_read_byte(dev);
+        zone_led_count[POLYCHROME_ZONE_ADDRESSABLE]     = bus->i2c_smbus_read_byte(dev);
     }
     else
     {
@@ -133,6 +133,7 @@ void PolychromeController::SetColorsAndSpeed(unsigned char led, unsigned char re
     switch(asrock_type)
     {
         case ASROCK_TYPE_ASRLED:
+        case ASROCK_TYPE_POLYCHROME_V1:
             switch(active_mode)
             {
                 /*-----------------------------------------------------*\
@@ -170,7 +171,6 @@ void PolychromeController::SetColorsAndSpeed(unsigned char led, unsigned char re
             std::this_thread::sleep_for(1ms);
             break;
 
-        case ASROCK_TYPE_POLYCHROME_V1:
         case ASROCK_TYPE_POLYCHROME_V2:
             /*-----------------------------------------------------*\
             | Select LED                                            |
@@ -196,11 +196,11 @@ void PolychromeController::SetMode(unsigned char mode, unsigned char speed)
     switch(asrock_type)
     {
         case ASROCK_TYPE_ASRLED:
+        case ASROCK_TYPE_POLYCHROME_V1:
             bus->i2c_smbus_write_block_data(dev, ASRLED_REG_MODE, 1, &active_mode);
             std::this_thread::sleep_for(1ms);
             break;
 
-        case ASROCK_TYPE_POLYCHROME_V1:
         case ASROCK_TYPE_POLYCHROME_V2:
             bus->i2c_smbus_write_block_data(dev, POLYCHROME_REG_MODE, 1, &active_mode);
             std::this_thread::sleep_for(1ms);
diff --git a/Controllers/PolychromeController/PolychromeController.h b/Controllers/PolychromeController/PolychromeController.h
index 72ca80ac..26ed5858 100644
--- a/Controllers/PolychromeController/PolychromeController.h
+++ b/Controllers/PolychromeController/PolychromeController.h
@@ -89,8 +89,8 @@ enum
 
 enum
 {
-    POLYCHROME_ZONE_RGB_FAN_HDR     = 0x00,     /* RGB Fan Header                       */
-    POLYCHROME_ZONE_RGB_LED_HDR     = 0x01,     /* RGB LED Header                       */
+    POLYCHROME_ZONE_RGB_LED_0_HDR   = 0x00,     /* RGB LED 0 Header                     */
+    POLYCHROME_ZONE_RGB_LED_1_HDR   = 0x01,     /* RGB LED 1 Header                     */
     POLYCHROME_ZONE_AUDIO           = 0x02,     /* Audio Zone LEDs                      */
     POLYCHROME_ZONE_PCH             = 0x03,     /* PCH Zone LEDs                        */
     POLYCHROME_ZONE_IO_COVER        = 0x04,     /* IO Cover Zone LEDs                   */
diff --git a/RGBController/RGBController_Polychrome.cpp b/RGBController/RGBController_Polychrome.cpp
index 24ebc5f0..cc222e27 100644
--- a/RGBController/RGBController_Polychrome.cpp
+++ b/RGBController/RGBController_Polychrome.cpp
@@ -14,8 +14,8 @@
 
 static const char* polychrome_v2_zone_names[] =
 {
-    "RGB Fan Header",
-    "RGB LED Header",
+    "RGB LED 0 Header",
+    "RGB LED 1 Header",
     "Audio",
     "PCH",
     "IO Cover",