From 13b1da9d6499bfdf2d1bf967dfc4fb11227a3087 Mon Sep 17 00:00:00 2001
From: shawnc722 <sm4camer@uwaterloo.ca>
Date: Wed, 28 Apr 2021 17:17:51 -0400
Subject: [PATCH] Removed various brightness modes and made highest brightness
 into Direct mode. Can use relative intensity to set brightness, ie
 RGB(255,0,255) (magenta) at ~60% brightness is RGB(150,0,150)

(cherry picked from commit b43cfd3b04e9faf980e319c596be5de49140f9b0)
---
 .../RGBController_SteelSeriesOldApex.cpp      | 61 ++-----------------
 .../SteelSeriesOldApexController.h            | 18 +-----
 2 files changed, 8 insertions(+), 71 deletions(-)

diff --git a/Controllers/SteelSeriesController/RGBController_SteelSeriesOldApex.cpp b/Controllers/SteelSeriesController/RGBController_SteelSeriesOldApex.cpp
index 307e5b01..4cc65422 100644
--- a/Controllers/SteelSeriesController/RGBController_SteelSeriesOldApex.cpp
+++ b/Controllers/SteelSeriesController/RGBController_SteelSeriesOldApex.cpp
@@ -29,61 +29,12 @@ RGBController_SteelSeriesOldApex::RGBController_SteelSeriesOldApex(SteelSeriesOl
     location    = OldApex->GetDeviceLocation();
     serial      = OldApex->GetSerialString();
 
-    mode Brightness8;
-    Brightness8.name       = "Brightness 8";
-    Brightness8.value      = STEELSERIES_OLDAPEX_BRIGHTNESS_8;
-    Brightness8.flags      = MODE_FLAG_HAS_PER_LED_COLOR;
-    Brightness8.color_mode = MODE_COLORS_PER_LED;
-    modes.push_back(Brightness8);
-
-    mode Brightness7;
-    Brightness7.name       = "Brightness 7";
-    Brightness7.value      = STEELSERIES_OLDAPEX_BRIGHTNESS_7;
-    Brightness7.flags      = MODE_FLAG_HAS_PER_LED_COLOR;
-    Brightness7.color_mode = MODE_COLORS_PER_LED;
-    modes.push_back(Brightness7);
-
-    mode Brightness6;
-    Brightness6.name       = "Brightness 6";
-    Brightness6.value      = STEELSERIES_OLDAPEX_BRIGHTNESS_6;
-    Brightness6.flags      = MODE_FLAG_HAS_PER_LED_COLOR;
-    Brightness6.color_mode = MODE_COLORS_PER_LED;
-    modes.push_back(Brightness6);
-
-    mode Brightness5;
-    Brightness5.name       = "Brightness 5";
-    Brightness5.value      = STEELSERIES_OLDAPEX_BRIGHTNESS_5;
-    Brightness5.flags      = MODE_FLAG_HAS_PER_LED_COLOR;
-    Brightness5.color_mode = MODE_COLORS_PER_LED;
-    modes.push_back(Brightness5);
-
-    mode Brightness4;
-    Brightness4.name       = "Brightness 4";
-    Brightness4.value      = STEELSERIES_OLDAPEX_BRIGHTNESS_4;
-    Brightness4.flags      = MODE_FLAG_HAS_PER_LED_COLOR;
-    Brightness4.color_mode = MODE_COLORS_PER_LED;
-    modes.push_back(Brightness4);
-
-    mode Brightness3;
-    Brightness3.name       = "Brightness 3";
-    Brightness3.value      = STEELSERIES_OLDAPEX_BRIGHTNESS_3;
-    Brightness3.flags      = MODE_FLAG_HAS_PER_LED_COLOR;
-    Brightness3.color_mode = MODE_COLORS_PER_LED;
-    modes.push_back(Brightness3);
-
-    mode Brightness2;
-    Brightness2.name       = "Brightness 2";
-    Brightness2.value      = STEELSERIES_OLDAPEX_BRIGHTNESS_2;
-    Brightness2.flags      = MODE_FLAG_HAS_PER_LED_COLOR;
-    Brightness2.color_mode = MODE_COLORS_PER_LED;
-    modes.push_back(Brightness2);
-
-    mode Brightness1;
-    Brightness1.name       = "Brightness 1";
-    Brightness1.value      = STEELSERIES_OLDAPEX_BRIGHTNESS_1;
-    Brightness1.flags      = MODE_FLAG_HAS_PER_LED_COLOR;
-    Brightness1.color_mode = MODE_COLORS_PER_LED;
-    modes.push_back(Brightness1);
+    mode direct;
+    direct.name       = "Direct";
+    direct.value      = STEELSERIES_OLDAPEX_DIRECT;
+    direct.flags      = MODE_FLAG_HAS_PER_LED_COLOR;
+    direct.color_mode = MODE_COLORS_PER_LED;
+    modes.push_back(direct);
 
     SetupZones();
 }
diff --git a/Controllers/SteelSeriesController/SteelSeriesOldApexController.h b/Controllers/SteelSeriesController/SteelSeriesOldApexController.h
index b9c3e40f..b5b0c523 100644
--- a/Controllers/SteelSeriesController/SteelSeriesOldApexController.h
+++ b/Controllers/SteelSeriesController/SteelSeriesOldApexController.h
@@ -26,27 +26,13 @@
 /* Mode, we then use these to set actual effect based on speed. */
 enum
 {
-    STEELSERIES_OLDAPEX_BRIGHTNESS_1 = 0x01,
-    STEELSERIES_OLDAPEX_BRIGHTNESS_2 = 0x02,
-    STEELSERIES_OLDAPEX_BRIGHTNESS_3 = 0x03,
-    STEELSERIES_OLDAPEX_BRIGHTNESS_4 = 0x04,
-    STEELSERIES_OLDAPEX_BRIGHTNESS_5 = 0x05,
-    STEELSERIES_OLDAPEX_BRIGHTNESS_6 = 0x06,
-    STEELSERIES_OLDAPEX_BRIGHTNESS_7 = 0x07,
-    STEELSERIES_OLDAPEX_BRIGHTNESS_8 = 0x08,
+    STEELSERIES_OLDAPEX_DIRECT = 0x08,
 };
 
 /* Effects */
 enum
 {
-    STEELSERIES_OLDAPEX_EFFECT_BRIGHTNESS_1 = 0x01,
-    STEELSERIES_OLDAPEX_EFFECT_BRIGHTNESS_2 = 0x02,
-    STEELSERIES_OLDAPEX_EFFECT_BRIGHTNESS_3 = 0x03,
-    STEELSERIES_OLDAPEX_EFFECT_BRIGHTNESS_4 = 0x04,
-    STEELSERIES_OLDAPEX_EFFECT_BRIGHTNESS_5 = 0x05,
-    STEELSERIES_OLDAPEX_EFFECT_BRIGHTNESS_6 = 0x06,
-    STEELSERIES_OLDAPEX_EFFECT_BRIGHTNESS_7 = 0x07,
-    STEELSERIES_OLDAPEX_EFFECT_BRIGHTNESS_8 = 0x08,
+    STEELSERIES_OLDAPEX_EFFECT_DIRECT = 0x08,
 };
 
 class SteelSeriesOldApexController