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)
This commit is contained in:
shawnc722 2021-04-28 17:17:51 -04:00 committed by Adam Honse
parent 5616f547e4
commit 13b1da9d64
2 changed files with 8 additions and 71 deletions

View file

@ -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();
}

View file

@ -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