From aed1409eed91bf5272b677264b0768c9b60a8042 Mon Sep 17 00:00:00 2001 From: TheRogueZeta <6479694-TheRogueZeta@users.noreply.gitlab.com> Date: Sun, 7 Feb 2021 12:50:34 -0800 Subject: [PATCH] Add whitespace in Polychrome controller lists. --- .../RGBController_ASRockPolychromeSMBus.cpp | 400 +++++++++--------- .../ASRockPolychromeUSBController.h | 4 +- .../RGBController_ASRockPolychromeUSB.cpp | 198 ++++----- 3 files changed, 302 insertions(+), 300 deletions(-) diff --git a/Controllers/ASRockPolychromeSMBusController/RGBController_ASRockPolychromeSMBus.cpp b/Controllers/ASRockPolychromeSMBusController/RGBController_ASRockPolychromeSMBus.cpp index 2888fa19..5d556dc4 100644 --- a/Controllers/ASRockPolychromeSMBusController/RGBController_ASRockPolychromeSMBus.cpp +++ b/Controllers/ASRockPolychromeSMBusController/RGBController_ASRockPolychromeSMBus.cpp @@ -49,74 +49,74 @@ RGBController_Polychrome::RGBController_Polychrome(PolychromeController* polychr description = "ASRock ASR LED Device"; mode Off; - Off.name = "Off"; - Off.value = ASRLED_MODE_OFF; - Off.flags = 0; - Off.color_mode = MODE_COLORS_NONE; + Off.name = "Off"; + Off.value = ASRLED_MODE_OFF; + Off.flags = 0; + Off.color_mode = MODE_COLORS_NONE; modes.push_back(Off); mode Static; - Static.name = "Static"; - Static.value = ASRLED_MODE_STATIC; - Static.flags = MODE_FLAG_HAS_PER_LED_COLOR; - Static.color_mode = MODE_COLORS_PER_LED; + Static.name = "Static"; + Static.value = ASRLED_MODE_STATIC; + Static.flags = MODE_FLAG_HAS_PER_LED_COLOR; + Static.color_mode = MODE_COLORS_PER_LED; modes.push_back(Static); mode Breathing; - Breathing.name = "Breathing"; - Breathing.value = ASRLED_MODE_BREATHING; - Breathing.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_PER_LED_COLOR; - Breathing.speed_min = ASRLED_SPEED_MIN; - Breathing.speed_max = ASRLED_SPEED_MAX; - Breathing.speed = ASRLED_SPEED_DEFAULT; - Breathing.color_mode = MODE_COLORS_PER_LED; + Breathing.name = "Breathing"; + Breathing.value = ASRLED_MODE_BREATHING; + Breathing.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_PER_LED_COLOR; + Breathing.speed_min = ASRLED_SPEED_MIN; + Breathing.speed_max = ASRLED_SPEED_MAX; + Breathing.speed = ASRLED_SPEED_DEFAULT; + Breathing.color_mode = MODE_COLORS_PER_LED; modes.push_back(Breathing); mode Strobe; - Strobe.name = "Strobe"; - Strobe.value = ASRLED_MODE_STROBE; - Strobe.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_PER_LED_COLOR; - Strobe.speed_min = ASRLED_SPEED_MIN; - Strobe.speed_max = ASRLED_SPEED_MAX; - Strobe.speed = ASRLED_SPEED_DEFAULT; - Strobe.color_mode = MODE_COLORS_PER_LED; + Strobe.name = "Strobe"; + Strobe.value = ASRLED_MODE_STROBE; + Strobe.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_PER_LED_COLOR; + Strobe.speed_min = ASRLED_SPEED_MIN; + Strobe.speed_max = ASRLED_SPEED_MAX; + Strobe.speed = ASRLED_SPEED_DEFAULT; + Strobe.color_mode = MODE_COLORS_PER_LED; modes.push_back(Strobe); mode SpectrumCycle; - SpectrumCycle.name = "Spectrum Cycle"; - SpectrumCycle.value = ASRLED_MODE_SPECTRUM_CYCLE; - SpectrumCycle.flags = MODE_FLAG_HAS_SPEED; - SpectrumCycle.speed_min = ASRLED_SPEED_MIN; - SpectrumCycle.speed_max = ASRLED_SPEED_MAX; - SpectrumCycle.speed = ASRLED_SPEED_DEFAULT; - SpectrumCycle.color_mode = MODE_COLORS_NONE; + SpectrumCycle.name = "Spectrum Cycle"; + SpectrumCycle.value = ASRLED_MODE_SPECTRUM_CYCLE; + SpectrumCycle.flags = MODE_FLAG_HAS_SPEED; + SpectrumCycle.speed_min = ASRLED_SPEED_MIN; + SpectrumCycle.speed_max = ASRLED_SPEED_MAX; + SpectrumCycle.speed = ASRLED_SPEED_DEFAULT; + SpectrumCycle.color_mode = MODE_COLORS_NONE; modes.push_back(SpectrumCycle); mode Random; - Random.name = "Random"; - Random.value = ASRLED_MODE_RANDOM; - Random.flags = MODE_FLAG_HAS_SPEED; - Random.speed_min = ASRLED_SPEED_MIN; - Random.speed_max = ASRLED_SPEED_MAX; - Random.speed = ASRLED_SPEED_DEFAULT; - Random.color_mode = MODE_COLORS_NONE; + Random.name = "Random"; + Random.value = ASRLED_MODE_RANDOM; + Random.flags = MODE_FLAG_HAS_SPEED; + Random.speed_min = ASRLED_SPEED_MIN; + Random.speed_max = ASRLED_SPEED_MAX; + Random.speed = ASRLED_SPEED_DEFAULT; + Random.color_mode = MODE_COLORS_NONE; modes.push_back(Random); mode Music; - Music.name = "Music"; - Music.value = ASRLED_MODE_MUSIC; - Music.flags = MODE_FLAG_HAS_PER_LED_COLOR; - Music.color_mode = MODE_COLORS_PER_LED; + Music.name = "Music"; + Music.value = ASRLED_MODE_MUSIC; + Music.flags = MODE_FLAG_HAS_PER_LED_COLOR; + Music.color_mode = MODE_COLORS_PER_LED; modes.push_back(Music); mode Wave; - Wave.name = "Wave"; - Wave.value = ASRLED_MODE_WAVE; - Wave.flags = MODE_FLAG_HAS_SPEED; - Wave.speed_min = ASRLED_SPEED_MIN; - Wave.speed_max = ASRLED_SPEED_MAX; - Wave.speed = ASRLED_SPEED_DEFAULT; - Wave.color_mode = MODE_COLORS_NONE; + Wave.name = "Wave"; + Wave.value = ASRLED_MODE_WAVE; + Wave.flags = MODE_FLAG_HAS_SPEED; + Wave.speed_min = ASRLED_SPEED_MIN; + Wave.speed_max = ASRLED_SPEED_MAX; + Wave.speed = ASRLED_SPEED_DEFAULT; + Wave.color_mode = MODE_COLORS_NONE; modes.push_back(Wave); } break; @@ -199,75 +199,77 @@ RGBController_Polychrome::RGBController_Polychrome(PolychromeController* polychr /*---------------------------------------------------------------------*\ | Comment out until per zone modes are working. These are only for ARGB | \*---------------------------------------------------------------------*/ -// mode Spring; -// Spring.name = "Spring"; -// Spring.value = POLYCHROME_V1_MODE_SPRING; -// Spring.flags = MODE_FLAG_HAS_SPEED; -// Spring.speed_min = POLYCHROME_V1_SPEED_MIN_ARGB; -// Spring.speed_max = POLYCHROME_V1_SPEED_MAX_ARGB; -// Spring.speed = POLYCHROME_V1_SPEED_DEFAULT_SPRING; -// Spring.color_mode = MODE_COLORS_PER_LED; -// modes.push_back(Spring); + /* + mode Spring; + Spring.name = "Spring"; + Spring.value = POLYCHROME_V1_MODE_SPRING; + Spring.flags = MODE_FLAG_HAS_SPEED; + Spring.speed_min = POLYCHROME_V1_SPEED_MIN_ARGB; + Spring.speed_max = POLYCHROME_V1_SPEED_MAX_ARGB; + Spring.speed = POLYCHROME_V1_SPEED_DEFAULT_SPRING; + Spring.color_mode = MODE_COLORS_PER_LED; + modes.push_back(Spring); -// mode Stack; -// Stack.name = "Stack"; -// Stack.value = POLYCHROME_V1_MODE_STACK; -// Stack.flags = MODE_FLAG_HAS_SPEED; -// Stack.speed_min = POLYCHROME_V1_SPEED_MIN_ARGB; -// Stack.speed_max = POLYCHROME_V1_SPEED_MAX_ARGB; -// Stack.speed = POLYCHROME_V1_SPEED_DEFAULT_STACK; -// Stack.color_mode = MODE_COLORS_PER_LED; -// modes.push_back(Stack); + mode Stack; + Stack.name = "Stack"; + Stack.value = POLYCHROME_V1_MODE_STACK; + Stack.flags = MODE_FLAG_HAS_SPEED; + Stack.speed_min = POLYCHROME_V1_SPEED_MIN_ARGB; + Stack.speed_max = POLYCHROME_V1_SPEED_MAX_ARGB; + Stack.speed = POLYCHROME_V1_SPEED_DEFAULT_STACK; + Stack.color_mode = MODE_COLORS_PER_LED; + modes.push_back(Stack); -// mode Cram; -// Cram.name = "Cram"; -// Cram.value = POLYCHROME_V1_MODE_CRAM; -// Cram.flags = MODE_FLAG_HAS_SPEED; -// Cram.speed_min = POLYCHROME_V1_SPEED_MIN_ARGB; -// Cram.speed_max = POLYCHROME_V1_SPEED_MAX_ARGB; -// Cram.speed = POLYCHROME_V1_SPEED_DEFAULT_CRAM; -// Cram.color_mode = MODE_COLORS_PER_LED; -// modes.push_back(Cram); + mode Cram; + Cram.name = "Cram"; + Cram.value = POLYCHROME_V1_MODE_CRAM; + Cram.flags = MODE_FLAG_HAS_SPEED; + Cram.speed_min = POLYCHROME_V1_SPEED_MIN_ARGB; + Cram.speed_max = POLYCHROME_V1_SPEED_MAX_ARGB; + Cram.speed = POLYCHROME_V1_SPEED_DEFAULT_CRAM; + Cram.color_mode = MODE_COLORS_PER_LED; + modes.push_back(Cram); -// mode Scan; -// Scan.name = "Scan"; -// Scan.value = POLYCHROME_V1_MODE_SCAN; -// Scan.flags = MODE_FLAG_HAS_SPEED; -// Scan.speed_min = POLYCHROME_V1_SPEED_MIN_ARGB; -// Scan.speed_max = POLYCHROME_V1_SPEED_MAX_ARGB; -// Scan.speed = POLYCHROME_V1_SPEED_DEFAULT_SCAN; -// Scan.color_mode = MODE_COLORS_PER_LED; -// modes.push_back(Scan); + mode Scan; + Scan.name = "Scan"; + Scan.value = POLYCHROME_V1_MODE_SCAN; + Scan.flags = MODE_FLAG_HAS_SPEED; + Scan.speed_min = POLYCHROME_V1_SPEED_MIN_ARGB; + Scan.speed_max = POLYCHROME_V1_SPEED_MAX_ARGB; + Scan.speed = POLYCHROME_V1_SPEED_DEFAULT_SCAN; + Scan.color_mode = MODE_COLORS_PER_LED; + modes.push_back(Scan); -// mode Neon; -// Neon.name = "Neon"; -// Neon.value = POLYCHROME_V1_MODE_NEON; -// Neon.flags = MODE_FLAG_HAS_SPEED; -// Neon.speed_min = POLYCHROME_V1_SPEED_MIN_ARGB; -// Neon.speed_max = POLYCHROME_V1_SPEED_MAX_ARGB; -// Neon.speed = POLYCHROME_V1_SPEED_DEFAULT_NEON; -// Neon.color_mode = MODE_COLORS_PER_LED; -// modes.push_back(Neon); + mode Neon; + Neon.name = "Neon"; + Neon.value = POLYCHROME_V1_MODE_NEON; + Neon.flags = MODE_FLAG_HAS_SPEED; + Neon.speed_min = POLYCHROME_V1_SPEED_MIN_ARGB; + Neon.speed_max = POLYCHROME_V1_SPEED_MAX_ARGB; + Neon.speed = POLYCHROME_V1_SPEED_DEFAULT_NEON; + Neon.color_mode = MODE_COLORS_PER_LED; + modes.push_back(Neon); -// mode Water; -// Water.name = "Water"; -// Water.value = POLYCHROME_V1_MODE_WATER; -// Water.flags = MODE_FLAG_HAS_SPEED; -// Water.speed_min = POLYCHROME_V1_SPEED_MIN_ARGB; -// Water.speed_max = POLYCHROME_V1_SPEED_MAX_ARGB; -// Water.speed = POLYCHROME_V1_SPEED_DEFAULT_WATER; -// Water.color_mode = MODE_COLORS_PER_LED; -// modes.push_back(Water); + mode Water; + Water.name = "Water"; + Water.value = POLYCHROME_V1_MODE_WATER; + Water.flags = MODE_FLAG_HAS_SPEED; + Water.speed_min = POLYCHROME_V1_SPEED_MIN_ARGB; + Water.speed_max = POLYCHROME_V1_SPEED_MAX_ARGB; + Water.speed = POLYCHROME_V1_SPEED_DEFAULT_WATER; + Water.color_mode = MODE_COLORS_PER_LED; + modes.push_back(Water); -// mode Rainbow; -// Rainbow.name = "Rainbow"; -// Rainbow.value = POLYCHROME_V1_MODE_RAINBOW; -// Rainbow.flags = MODE_FLAG_HAS_SPEED; -// Rainbow.speed_min = POLYCHROME_V1_SPEED_MIN_RAINBOW; -// Rainbow.speed_max = POLYCHROME_V1_SPEED_MAX_RAINBOW; -// Rainbow.speed = POLYCHROME_V1_SPEED_DEFAULT_RAINBOW; -// Rainbow.color_mode = MODE_COLORS_NONE; -// modes.push_back(Rainbow); + mode Rainbow; + Rainbow.name = "Rainbow"; + Rainbow.value = POLYCHROME_V1_MODE_RAINBOW; + Rainbow.flags = MODE_FLAG_HAS_SPEED; + Rainbow.speed_min = POLYCHROME_V1_SPEED_MIN_RAINBOW; + Rainbow.speed_max = POLYCHROME_V1_SPEED_MAX_RAINBOW; + Rainbow.speed = POLYCHROME_V1_SPEED_DEFAULT_RAINBOW; + Rainbow.color_mode = MODE_COLORS_NONE; + modes.push_back(Rainbow); + */ } break; @@ -276,134 +278,134 @@ RGBController_Polychrome::RGBController_Polychrome(PolychromeController* polychr description = "ASRock Polychrome v2 Device"; mode Off; - Off.name = "Off"; - Off.value = POLYCHROME_V2_MODE_OFF; - Off.flags = 0; - Off.color_mode = MODE_COLORS_NONE; + Off.name = "Off"; + Off.value = POLYCHROME_V2_MODE_OFF; + Off.flags = 0; + Off.color_mode = MODE_COLORS_NONE; modes.push_back(Off); mode Static; - Static.name = "Static"; - Static.value = POLYCHROME_V2_MODE_STATIC; - Static.flags = MODE_FLAG_HAS_PER_LED_COLOR; - Static.color_mode = MODE_COLORS_PER_LED; + Static.name = "Static"; + Static.value = POLYCHROME_V2_MODE_STATIC; + Static.flags = MODE_FLAG_HAS_PER_LED_COLOR; + Static.color_mode = MODE_COLORS_PER_LED; modes.push_back(Static); mode Breathing; - Breathing.name = "Breathing"; - Breathing.value = POLYCHROME_V2_MODE_BREATHING; - Breathing.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_PER_LED_COLOR; - Breathing.speed_min = POLYCHROME_V2_SPEED_MIN; - Breathing.speed_max = POLYCHROME_V2_SPEED_MAX; - Breathing.speed = POLYCHROME_V2_SPEED_DEFAULT; - Breathing.color_mode = MODE_COLORS_PER_LED; + Breathing.name = "Breathing"; + Breathing.value = POLYCHROME_V2_MODE_BREATHING; + Breathing.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_PER_LED_COLOR; + Breathing.speed_min = POLYCHROME_V2_SPEED_MIN; + Breathing.speed_max = POLYCHROME_V2_SPEED_MAX; + Breathing.speed = POLYCHROME_V2_SPEED_DEFAULT; + Breathing.color_mode = MODE_COLORS_PER_LED; modes.push_back(Breathing); mode Strobe; - Strobe.name = "Strobe"; - Strobe.value = POLYCHROME_V2_MODE_STROBE; - Strobe.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_PER_LED_COLOR; - Strobe.speed_min = POLYCHROME_V2_SPEED_MIN; - Strobe.speed_max = POLYCHROME_V2_SPEED_MAX; - Strobe.speed = POLYCHROME_V2_SPEED_DEFAULT; - Strobe.color_mode = MODE_COLORS_PER_LED; + Strobe.name = "Strobe"; + Strobe.value = POLYCHROME_V2_MODE_STROBE; + Strobe.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_PER_LED_COLOR; + Strobe.speed_min = POLYCHROME_V2_SPEED_MIN; + Strobe.speed_max = POLYCHROME_V2_SPEED_MAX; + Strobe.speed = POLYCHROME_V2_SPEED_DEFAULT; + Strobe.color_mode = MODE_COLORS_PER_LED; modes.push_back(Strobe); mode SpectrumCycle; - SpectrumCycle.name = "Spectrum Cycle"; - SpectrumCycle.value = POLYCHROME_V2_MODE_SPECTRUM_CYCLE; - SpectrumCycle.flags = MODE_FLAG_HAS_SPEED; - SpectrumCycle.speed_min = POLYCHROME_V2_SPEED_MIN; - SpectrumCycle.speed_max = POLYCHROME_V2_SPEED_MAX; - SpectrumCycle.speed = POLYCHROME_V2_SPEED_DEFAULT; - SpectrumCycle.color_mode = MODE_COLORS_NONE; + SpectrumCycle.name = "Spectrum Cycle"; + SpectrumCycle.value = POLYCHROME_V2_MODE_SPECTRUM_CYCLE; + SpectrumCycle.flags = MODE_FLAG_HAS_SPEED; + SpectrumCycle.speed_min = POLYCHROME_V2_SPEED_MIN; + SpectrumCycle.speed_max = POLYCHROME_V2_SPEED_MAX; + SpectrumCycle.speed = POLYCHROME_V2_SPEED_DEFAULT; + SpectrumCycle.color_mode = MODE_COLORS_NONE; modes.push_back(SpectrumCycle); mode Random; - Random.name = "Random"; - Random.value = POLYCHROME_V2_MODE_RANDOM; - Random.flags = MODE_FLAG_HAS_SPEED; - Random.speed_min = POLYCHROME_V2_SPEED_MIN; - Random.speed_max = POLYCHROME_V2_SPEED_MAX; - Random.speed = POLYCHROME_V2_SPEED_DEFAULT; - Random.color_mode = MODE_COLORS_NONE; + Random.name = "Random"; + Random.value = POLYCHROME_V2_MODE_RANDOM; + Random.flags = MODE_FLAG_HAS_SPEED; + Random.speed_min = POLYCHROME_V2_SPEED_MIN; + Random.speed_max = POLYCHROME_V2_SPEED_MAX; + Random.speed = POLYCHROME_V2_SPEED_DEFAULT; + Random.color_mode = MODE_COLORS_NONE; modes.push_back(Random); mode Wave; - Wave.name = "Wave"; - Wave.value = POLYCHROME_V2_MODE_WAVE; - Wave.flags = MODE_FLAG_HAS_SPEED; - Wave.speed_min = POLYCHROME_V2_SPEED_MIN; - Wave.speed_max = POLYCHROME_V2_SPEED_MAX; - Wave.speed = POLYCHROME_V2_SPEED_DEFAULT; - Wave.color_mode = MODE_COLORS_NONE; + Wave.name = "Wave"; + Wave.value = POLYCHROME_V2_MODE_WAVE; + Wave.flags = MODE_FLAG_HAS_SPEED; + Wave.speed_min = POLYCHROME_V2_SPEED_MIN; + Wave.speed_max = POLYCHROME_V2_SPEED_MAX; + Wave.speed = POLYCHROME_V2_SPEED_DEFAULT; + Wave.color_mode = MODE_COLORS_NONE; modes.push_back(Wave); mode Spring; - Spring.name = "Spring"; - Spring.value = POLYCHROME_V2_MODE_SPRING; - Spring.flags = MODE_FLAG_HAS_SPEED; - Spring.speed_min = POLYCHROME_V2_SPEED_MIN; - Spring.speed_max = POLYCHROME_V2_SPEED_MAX; - Spring.speed = POLYCHROME_V2_SPEED_DEFAULT; - Spring.color_mode = MODE_COLORS_NONE; + Spring.name = "Spring"; + Spring.value = POLYCHROME_V2_MODE_SPRING; + Spring.flags = MODE_FLAG_HAS_SPEED; + Spring.speed_min = POLYCHROME_V2_SPEED_MIN; + Spring.speed_max = POLYCHROME_V2_SPEED_MAX; + Spring.speed = POLYCHROME_V2_SPEED_DEFAULT; + Spring.color_mode = MODE_COLORS_NONE; modes.push_back(Spring); mode Stack; - Stack.name = "Stack"; - Stack.value = POLYCHROME_V2_MODE_STACK; - Stack.flags = MODE_FLAG_HAS_SPEED; - Stack.speed_min = POLYCHROME_V2_SPEED_MIN; - Stack.speed_max = POLYCHROME_V2_SPEED_MAX; - Stack.speed = POLYCHROME_V2_SPEED_DEFAULT; - Stack.color_mode = MODE_COLORS_NONE; + Stack.name = "Stack"; + Stack.value = POLYCHROME_V2_MODE_STACK; + Stack.flags = MODE_FLAG_HAS_SPEED; + Stack.speed_min = POLYCHROME_V2_SPEED_MIN; + Stack.speed_max = POLYCHROME_V2_SPEED_MAX; + Stack.speed = POLYCHROME_V2_SPEED_DEFAULT; + Stack.color_mode = MODE_COLORS_NONE; modes.push_back(Stack); mode Cram; - Cram.name = "Cram"; - Cram.value = POLYCHROME_V2_MODE_CRAM; - Cram.flags = MODE_FLAG_HAS_SPEED; - Cram.speed_min = POLYCHROME_V2_SPEED_MIN; - Cram.speed_max = POLYCHROME_V2_SPEED_MAX; - Cram.speed = POLYCHROME_V2_SPEED_DEFAULT; - Cram.color_mode = MODE_COLORS_NONE; + Cram.name = "Cram"; + Cram.value = POLYCHROME_V2_MODE_CRAM; + Cram.flags = MODE_FLAG_HAS_SPEED; + Cram.speed_min = POLYCHROME_V2_SPEED_MIN; + Cram.speed_max = POLYCHROME_V2_SPEED_MAX; + Cram.speed = POLYCHROME_V2_SPEED_DEFAULT; + Cram.color_mode = MODE_COLORS_NONE; modes.push_back(Cram); mode Scan; - Scan.name = "Scan"; - Scan.value = POLYCHROME_V2_MODE_SCAN; - Scan.flags = MODE_FLAG_HAS_SPEED; - Scan.speed_min = POLYCHROME_V2_SPEED_MIN; - Scan.speed_max = POLYCHROME_V2_SPEED_MAX; - Scan.speed = POLYCHROME_V2_SPEED_DEFAULT; - Scan.color_mode = MODE_COLORS_NONE; + Scan.name = "Scan"; + Scan.value = POLYCHROME_V2_MODE_SCAN; + Scan.flags = MODE_FLAG_HAS_SPEED; + Scan.speed_min = POLYCHROME_V2_SPEED_MIN; + Scan.speed_max = POLYCHROME_V2_SPEED_MAX; + Scan.speed = POLYCHROME_V2_SPEED_DEFAULT; + Scan.color_mode = MODE_COLORS_NONE; modes.push_back(Scan); mode Neon; - Neon.name = "Neon"; - Neon.value = POLYCHROME_V2_MODE_NEON; - Neon.flags = 0; - Neon.color_mode = MODE_COLORS_NONE; + Neon.name = "Neon"; + Neon.value = POLYCHROME_V2_MODE_NEON; + Neon.flags = 0; + Neon.color_mode = MODE_COLORS_NONE; modes.push_back(Neon); mode Water; - Water.name = "Water"; - Water.value = POLYCHROME_V2_MODE_WATER; - Water.flags = MODE_FLAG_HAS_SPEED; - Water.speed_min = POLYCHROME_V2_SPEED_MIN; - Water.speed_max = POLYCHROME_V2_SPEED_MAX; - Water.speed = POLYCHROME_V2_SPEED_DEFAULT; - Water.color_mode = MODE_COLORS_NONE; + Water.name = "Water"; + Water.value = POLYCHROME_V2_MODE_WATER; + Water.flags = MODE_FLAG_HAS_SPEED; + Water.speed_min = POLYCHROME_V2_SPEED_MIN; + Water.speed_max = POLYCHROME_V2_SPEED_MAX; + Water.speed = POLYCHROME_V2_SPEED_DEFAULT; + Water.color_mode = MODE_COLORS_NONE; modes.push_back(Water); mode Rainbow; - Rainbow.name = "Rainbow"; - Rainbow.value = POLYCHROME_V2_MODE_RAINBOW; - Rainbow.flags = MODE_FLAG_HAS_SPEED; - Rainbow.speed_min = POLYCHROME_V2_SPEED_MIN; - Rainbow.speed_max = POLYCHROME_V2_SPEED_MAX; - Rainbow.speed = POLYCHROME_V2_SPEED_DEFAULT; - Rainbow.color_mode = MODE_COLORS_NONE; + Rainbow.name = "Rainbow"; + Rainbow.value = POLYCHROME_V2_MODE_RAINBOW; + Rainbow.flags = MODE_FLAG_HAS_SPEED; + Rainbow.speed_min = POLYCHROME_V2_SPEED_MIN; + Rainbow.speed_max = POLYCHROME_V2_SPEED_MAX; + Rainbow.speed = POLYCHROME_V2_SPEED_DEFAULT; + Rainbow.color_mode = MODE_COLORS_NONE; modes.push_back(Rainbow); } break; diff --git a/Controllers/ASRockPolychromeUSBController/ASRockPolychromeUSBController.h b/Controllers/ASRockPolychromeUSBController/ASRockPolychromeUSBController.h index 7a42dcf6..7fa2f641 100755 --- a/Controllers/ASRockPolychromeUSBController/ASRockPolychromeUSBController.h +++ b/Controllers/ASRockPolychromeUSBController/ASRockPolychromeUSBController.h @@ -52,8 +52,8 @@ enum enum { - POLYCHROME_USB_LEDCOUNT_CFG = 0x02, // Config for LED Count - POLYCHROME_USB_RGSWAP_CFG = 0x03, // Config for RGSWAP + POLYCHROME_USB_LEDCOUNT_CFG = 0x02, // Config for LED Count + POLYCHROME_USB_RGSWAP_CFG = 0x03, // Config for RGSWAP POLYCHROME_USB_ZONE_UNAVAILABLE = 0x1E, // Value from LEDCOUNT CFG if zone not present }; diff --git a/Controllers/ASRockPolychromeUSBController/RGBController_ASRockPolychromeUSB.cpp b/Controllers/ASRockPolychromeUSBController/RGBController_ASRockPolychromeUSB.cpp index b70bbc9a..3cbbfeb9 100755 --- a/Controllers/ASRockPolychromeUSBController/RGBController_ASRockPolychromeUSB.cpp +++ b/Controllers/ASRockPolychromeUSBController/RGBController_ASRockPolychromeUSB.cpp @@ -15,150 +15,150 @@ RGBController_PolychromeUSB::RGBController_PolychromeUSB(PolychromeUSBController* polychrome_ptr) { - polychrome = polychrome_ptr; + polychrome = polychrome_ptr; - name = polychrome->GetDeviceName(); - description = "ASRock Polychrome USB Device"; - vendor = "ASRock"; - type = DEVICE_TYPE_MOTHERBOARD; - location = polychrome->GetDeviceLocation(); + name = polychrome->GetDeviceName(); + description = "ASRock Polychrome USB Device"; + vendor = "ASRock"; + type = DEVICE_TYPE_MOTHERBOARD; + location = polychrome->GetDeviceLocation(); mode Off; - Off.name = "Off"; - Off.value = POLYCHROME_USB_MODE_OFF; - Off.flags = 0; - Off.color_mode = MODE_COLORS_NONE; + Off.name = "Off"; + Off.value = POLYCHROME_USB_MODE_OFF; + Off.flags = 0; + Off.color_mode = MODE_COLORS_NONE; modes.push_back(Off); mode Static; - Static.name = "Static"; - Static.value = POLYCHROME_USB_MODE_STATIC; - Static.flags = MODE_FLAG_HAS_PER_LED_COLOR; - Static.color_mode = MODE_COLORS_PER_LED; + Static.name = "Static"; + Static.value = POLYCHROME_USB_MODE_STATIC; + Static.flags = MODE_FLAG_HAS_PER_LED_COLOR; + Static.color_mode = MODE_COLORS_PER_LED; modes.push_back(Static); mode Breathing; - Breathing.name = "Breathing"; - Breathing.value = POLYCHROME_USB_MODE_BREATHING; - Breathing.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_PER_LED_COLOR; - Breathing.speed_min = POLYCHROME_USB_SPEED_MIN; - Breathing.speed_max = POLYCHROME_USB_SPEED_MAX; - Breathing.speed = POLYCHROME_USB_SPEED_DEFAULT; - Breathing.color_mode = MODE_COLORS_PER_LED; + Breathing.name = "Breathing"; + Breathing.value = POLYCHROME_USB_MODE_BREATHING; + Breathing.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_PER_LED_COLOR; + Breathing.speed_min = POLYCHROME_USB_SPEED_MIN; + Breathing.speed_max = POLYCHROME_USB_SPEED_MAX; + Breathing.speed = POLYCHROME_USB_SPEED_DEFAULT; + Breathing.color_mode = MODE_COLORS_PER_LED; modes.push_back(Breathing); mode Strobe; - Strobe.name = "Strobe"; - Strobe.value = POLYCHROME_USB_MODE_STROBE; - Strobe.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_PER_LED_COLOR; - Strobe.speed_min = POLYCHROME_USB_SPEED_MIN; - Strobe.speed_max = POLYCHROME_USB_SPEED_MAX; - Strobe.speed = POLYCHROME_USB_SPEED_DEFAULT; - Strobe.color_mode = MODE_COLORS_PER_LED; + Strobe.name = "Strobe"; + Strobe.value = POLYCHROME_USB_MODE_STROBE; + Strobe.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_PER_LED_COLOR; + Strobe.speed_min = POLYCHROME_USB_SPEED_MIN; + Strobe.speed_max = POLYCHROME_USB_SPEED_MAX; + Strobe.speed = POLYCHROME_USB_SPEED_DEFAULT; + Strobe.color_mode = MODE_COLORS_PER_LED; modes.push_back(Strobe); mode SpectrumCycle; - SpectrumCycle.name = "Spectrum Cycle"; - SpectrumCycle.value = POLYCHROME_USB_MODE_SPECTRUM_CYCLE; - SpectrumCycle.flags = MODE_FLAG_HAS_SPEED; - SpectrumCycle.speed_min = POLYCHROME_USB_SPEED_MIN; - SpectrumCycle.speed_max = POLYCHROME_USB_SPEED_MAX; - SpectrumCycle.speed = POLYCHROME_USB_SPEED_DEFAULT; - SpectrumCycle.color_mode = MODE_COLORS_NONE; + SpectrumCycle.name = "Spectrum Cycle"; + SpectrumCycle.value = POLYCHROME_USB_MODE_SPECTRUM_CYCLE; + SpectrumCycle.flags = MODE_FLAG_HAS_SPEED; + SpectrumCycle.speed_min = POLYCHROME_USB_SPEED_MIN; + SpectrumCycle.speed_max = POLYCHROME_USB_SPEED_MAX; + SpectrumCycle.speed = POLYCHROME_USB_SPEED_DEFAULT; + SpectrumCycle.color_mode = MODE_COLORS_NONE; modes.push_back(SpectrumCycle); mode Random; - Random.name = "Random"; - Random.value = POLYCHROME_USB_MODE_RANDOM; - Random.flags = MODE_FLAG_HAS_SPEED; - Random.speed_min = POLYCHROME_USB_SPEED_MIN; - Random.speed_max = POLYCHROME_USB_SPEED_MAX; - Random.speed = POLYCHROME_USB_SPEED_DEFAULT; - Random.color_mode = MODE_COLORS_NONE; + Random.name = "Random"; + Random.value = POLYCHROME_USB_MODE_RANDOM; + Random.flags = MODE_FLAG_HAS_SPEED; + Random.speed_min = POLYCHROME_USB_SPEED_MIN; + Random.speed_max = POLYCHROME_USB_SPEED_MAX; + Random.speed = POLYCHROME_USB_SPEED_DEFAULT; + Random.color_mode = MODE_COLORS_NONE; modes.push_back(Random); mode Music; - Random.name = "Music"; - Random.value = POLYCHROME_USB_MODE_RANDOM; - Random.flags = MODE_FLAG_HAS_BRIGHTNESS; - Random.color_mode = MODE_COLORS_NONE; + Random.name = "Music"; + Random.value = POLYCHROME_USB_MODE_RANDOM; + Random.flags = MODE_FLAG_HAS_BRIGHTNESS; + Random.color_mode = MODE_COLORS_NONE; modes.push_back(Random); mode Wave; - Wave.name = "Wave"; - Wave.value = POLYCHROME_USB_MODE_WAVE; - Wave.flags = MODE_FLAG_HAS_SPEED; - Wave.speed_min = POLYCHROME_USB_SPEED_MIN; - Wave.speed_max = POLYCHROME_USB_SPEED_MAX; - Wave.speed = POLYCHROME_USB_SPEED_DEFAULT; - Wave.color_mode = MODE_COLORS_NONE; + Wave.name = "Wave"; + Wave.value = POLYCHROME_USB_MODE_WAVE; + Wave.flags = MODE_FLAG_HAS_SPEED; + Wave.speed_min = POLYCHROME_USB_SPEED_MIN; + Wave.speed_max = POLYCHROME_USB_SPEED_MAX; + Wave.speed = POLYCHROME_USB_SPEED_DEFAULT; + Wave.color_mode = MODE_COLORS_NONE; modes.push_back(Wave); mode Spring; - Spring.name = "Spring"; - Spring.value = POLYCHROME_USB_MODE_SPRING; - Spring.flags = MODE_FLAG_HAS_SPEED; - Spring.speed_min = POLYCHROME_USB_SPEED_MIN; - Spring.speed_max = POLYCHROME_USB_SPEED_MAX; - Spring.speed = POLYCHROME_USB_SPEED_DEFAULT; - Spring.color_mode = MODE_COLORS_NONE; + Spring.name = "Spring"; + Spring.value = POLYCHROME_USB_MODE_SPRING; + Spring.flags = MODE_FLAG_HAS_SPEED; + Spring.speed_min = POLYCHROME_USB_SPEED_MIN; + Spring.speed_max = POLYCHROME_USB_SPEED_MAX; + Spring.speed = POLYCHROME_USB_SPEED_DEFAULT; + Spring.color_mode = MODE_COLORS_NONE; modes.push_back(Spring); mode Stack; - Stack.name = "Stack"; - Stack.value = POLYCHROME_USB_MODE_STACK; - Stack.flags = MODE_FLAG_HAS_SPEED; - Stack.speed_min = POLYCHROME_USB_SPEED_MIN; - Stack.speed_max = POLYCHROME_USB_SPEED_MAX; - Stack.speed = POLYCHROME_USB_SPEED_DEFAULT; - Stack.color_mode = MODE_COLORS_NONE; + Stack.name = "Stack"; + Stack.value = POLYCHROME_USB_MODE_STACK; + Stack.flags = MODE_FLAG_HAS_SPEED; + Stack.speed_min = POLYCHROME_USB_SPEED_MIN; + Stack.speed_max = POLYCHROME_USB_SPEED_MAX; + Stack.speed = POLYCHROME_USB_SPEED_DEFAULT; + Stack.color_mode = MODE_COLORS_NONE; modes.push_back(Stack); mode Cram; - Cram.name = "Cram"; - Cram.value = POLYCHROME_USB_MODE_CRAM; - Cram.flags = MODE_FLAG_HAS_SPEED; - Cram.speed_min = POLYCHROME_USB_SPEED_MIN; - Cram.speed_max = POLYCHROME_USB_SPEED_MAX; - Cram.speed = POLYCHROME_USB_SPEED_DEFAULT; - Cram.color_mode = MODE_COLORS_NONE; + Cram.name = "Cram"; + Cram.value = POLYCHROME_USB_MODE_CRAM; + Cram.flags = MODE_FLAG_HAS_SPEED; + Cram.speed_min = POLYCHROME_USB_SPEED_MIN; + Cram.speed_max = POLYCHROME_USB_SPEED_MAX; + Cram.speed = POLYCHROME_USB_SPEED_DEFAULT; + Cram.color_mode = MODE_COLORS_NONE; modes.push_back(Cram); mode Scan; - Scan.name = "Scan"; - Scan.value = POLYCHROME_USB_MODE_SCAN; - Scan.flags = MODE_FLAG_HAS_SPEED; - Scan.speed_min = POLYCHROME_USB_SPEED_MIN; - Scan.speed_max = POLYCHROME_USB_SPEED_MAX; - Scan.speed = POLYCHROME_USB_SPEED_DEFAULT; - Scan.color_mode = MODE_COLORS_NONE; + Scan.name = "Scan"; + Scan.value = POLYCHROME_USB_MODE_SCAN; + Scan.flags = MODE_FLAG_HAS_SPEED; + Scan.speed_min = POLYCHROME_USB_SPEED_MIN; + Scan.speed_max = POLYCHROME_USB_SPEED_MAX; + Scan.speed = POLYCHROME_USB_SPEED_DEFAULT; + Scan.color_mode = MODE_COLORS_NONE; modes.push_back(Scan); mode Neon; - Neon.name = "Neon"; - Neon.value = POLYCHROME_USB_MODE_NEON; - Neon.flags = 0; - Neon.color_mode = MODE_COLORS_NONE; + Neon.name = "Neon"; + Neon.value = POLYCHROME_USB_MODE_NEON; + Neon.flags = 0; + Neon.color_mode = MODE_COLORS_NONE; modes.push_back(Neon); mode Water; - Water.name = "Water"; - Water.value = POLYCHROME_USB_MODE_WATER; - Water.flags = MODE_FLAG_HAS_SPEED; - Water.speed_min = POLYCHROME_USB_SPEED_MIN; - Water.speed_max = POLYCHROME_USB_SPEED_MAX; - Water.speed = POLYCHROME_USB_SPEED_DEFAULT; - Water.color_mode = MODE_COLORS_NONE; + Water.name = "Water"; + Water.value = POLYCHROME_USB_MODE_WATER; + Water.flags = MODE_FLAG_HAS_SPEED; + Water.speed_min = POLYCHROME_USB_SPEED_MIN; + Water.speed_max = POLYCHROME_USB_SPEED_MAX; + Water.speed = POLYCHROME_USB_SPEED_DEFAULT; + Water.color_mode = MODE_COLORS_NONE; modes.push_back(Water); mode Rainbow; - Rainbow.name = "Rainbow"; - Rainbow.value = POLYCHROME_USB_MODE_RAINBOW; - Rainbow.flags = MODE_FLAG_HAS_SPEED; - Rainbow.speed_min = POLYCHROME_USB_SPEED_MIN; - Rainbow.speed_max = POLYCHROME_USB_SPEED_MAX; - Rainbow.speed = POLYCHROME_USB_SPEED_DEFAULT; - Rainbow.color_mode = MODE_COLORS_NONE; + Rainbow.name = "Rainbow"; + Rainbow.value = POLYCHROME_USB_MODE_RAINBOW; + Rainbow.flags = MODE_FLAG_HAS_SPEED; + Rainbow.speed_min = POLYCHROME_USB_SPEED_MIN; + Rainbow.speed_max = POLYCHROME_USB_SPEED_MAX; + Rainbow.speed = POLYCHROME_USB_SPEED_DEFAULT; + Rainbow.color_mode = MODE_COLORS_NONE; modes.push_back(Rainbow); SetupZones();