From 635dcce7f0d036400651edcf2be4f1dd0ceb4e07 Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Fri, 31 Jul 2020 10:49:25 -0500 Subject: [PATCH] Use the name Direct for all custom/static modes that transition smoothly without flicker --- .../RGBController_AMDWraithPrism.cpp | 12 +++++----- .../RGBController_CorsairVengeancePro.cpp | 22 +++++++++---------- RGBController/RGBController_DuckyKeyboard.cpp | 12 +++++----- .../RGBController_HyperXAlloyOrigins.cpp | 12 +++++----- RGBController/RGBController_NZXTKraken.cpp | 12 +++++----- RGBController/RGBController_OpenRazer.cpp | 12 +++++----- .../RGBController_OpenRazerWindows.cpp | 12 +++++----- RGBController/RGBController_RGBFusion.cpp | 12 +++++----- RGBController/RGBController_RGBFusionGPU.cpp | 12 +++++----- 9 files changed, 59 insertions(+), 59 deletions(-) diff --git a/RGBController/RGBController_AMDWraithPrism.cpp b/RGBController/RGBController_AMDWraithPrism.cpp index 7f4ec8860..c835af82f 100644 --- a/RGBController/RGBController_AMDWraithPrism.cpp +++ b/RGBController/RGBController_AMDWraithPrism.cpp @@ -18,12 +18,12 @@ RGBController_AMDWraithPrism::RGBController_AMDWraithPrism(AMDWraithPrismControl description = "AMD Wraith Prism Device"; version = wraith->GetFirmwareVersionString(); - mode Static; - Static.name = "Static"; - Static.value = AMD_WRAITH_PRISM_EFFECT_CHANNEL_STATIC; - Static.flags = MODE_FLAG_HAS_PER_LED_COLOR; - Static.color_mode = MODE_COLORS_PER_LED; - modes.push_back(Static); + mode Direct; + Direct.name = "Direct"; + Direct.value = AMD_WRAITH_PRISM_EFFECT_CHANNEL_STATIC; + Direct.flags = MODE_FLAG_HAS_PER_LED_COLOR; + Direct.color_mode = MODE_COLORS_PER_LED; + modes.push_back(Direct); mode Breathing; Breathing.name = "Breathing"; diff --git a/RGBController/RGBController_CorsairVengeancePro.cpp b/RGBController/RGBController_CorsairVengeancePro.cpp index 15167e67c..b9acfa887 100644 --- a/RGBController/RGBController_CorsairVengeancePro.cpp +++ b/RGBController/RGBController_CorsairVengeancePro.cpp @@ -18,6 +18,16 @@ RGBController_CorsairVengeancePro::RGBController_CorsairVengeancePro(CorsairVeng description = "Corsair Vengeance Pro RGB Device"; location = corsair->GetDeviceLocation(); + mode Direct; + Direct.name = "Direct"; + Direct.value = CORSAIR_PRO_MODE_STATIC; + Direct.flags = MODE_FLAG_HAS_PER_LED_COLOR; + Direct.speed_min = 0; + Direct.speed_max = 0; + Direct.speed = 0; + Direct.color_mode = MODE_COLORS_PER_LED; + modes.push_back(Direct); + mode ColorShift; ColorShift.name = "Color Shift"; ColorShift.value = CORSAIR_PRO_MODE_COLOR_SHIFT; @@ -134,16 +144,6 @@ RGBController_CorsairVengeancePro::RGBController_CorsairVengeancePro(CorsairVeng Sequential.colors.resize(1); modes.push_back(Sequential); - mode Static; - Static.name = "Static"; - Static.value = CORSAIR_PRO_MODE_STATIC; - Static.flags = MODE_FLAG_HAS_PER_LED_COLOR; - Static.speed_min = 0; - Static.speed_max = 0; - Static.speed = 0; - Static.color_mode = MODE_COLORS_PER_LED; - modes.push_back(Static); - SetupZones(); active_mode = 9; @@ -216,7 +216,7 @@ void RGBController_CorsairVengeancePro::UpdateSingleLED(int led) void RGBController_CorsairVengeancePro::SetCustomMode() { - active_mode = 9; + active_mode = 0; } void RGBController_CorsairVengeancePro::DeviceUpdateMode() diff --git a/RGBController/RGBController_DuckyKeyboard.cpp b/RGBController/RGBController_DuckyKeyboard.cpp index fa9bd2bbe..616442e25 100644 --- a/RGBController/RGBController_DuckyKeyboard.cpp +++ b/RGBController/RGBController_DuckyKeyboard.cpp @@ -28,12 +28,12 @@ RGBController_DuckyKeyboard::RGBController_DuckyKeyboard(DuckyKeyboardController type = DEVICE_TYPE_KEYBOARD; description = "Ducky Keyboard Device"; - mode Custom; - Custom.name = "Custom"; - Custom.value = 0xFFFF; - Custom.flags = MODE_FLAG_HAS_PER_LED_COLOR; - Custom.color_mode = MODE_COLORS_PER_LED; - modes.push_back(Custom); + mode Direct; + Direct.name = "Direct"; + Direct.value = 0xFFFF; + Direct.flags = MODE_FLAG_HAS_PER_LED_COLOR; + Direct.color_mode = MODE_COLORS_PER_LED; + modes.push_back(Direct); SetupZones(); } diff --git a/RGBController/RGBController_HyperXAlloyOrigins.cpp b/RGBController/RGBController_HyperXAlloyOrigins.cpp index ca393c27c..928c5fb59 100644 --- a/RGBController/RGBController_HyperXAlloyOrigins.cpp +++ b/RGBController/RGBController_HyperXAlloyOrigins.cpp @@ -199,12 +199,12 @@ RGBController_HyperXAlloyOrigins::RGBController_HyperXAlloyOrigins(HyperXAlloyOr type = DEVICE_TYPE_KEYBOARD; description = "HyperX Alloy Origins Keyboard Device"; - mode Custom; - Custom.name = "Custom"; - Custom.value = 0xFFFF; - Custom.flags = MODE_FLAG_HAS_PER_LED_COLOR; - Custom.color_mode = MODE_COLORS_PER_LED; - modes.push_back(Custom); + mode Direct; + Direct.name = "Direct"; + Direct.value = 0xFFFF; + Direct.flags = MODE_FLAG_HAS_PER_LED_COLOR; + Direct.color_mode = MODE_COLORS_PER_LED; + modes.push_back(Direct); SetupZones(); diff --git a/RGBController/RGBController_NZXTKraken.cpp b/RGBController/RGBController_NZXTKraken.cpp index 6e7e02eb7..3ba0cf0af 100644 --- a/RGBController/RGBController_NZXTKraken.cpp +++ b/RGBController/RGBController_NZXTKraken.cpp @@ -19,12 +19,12 @@ RGBController_NZXTKraken::RGBController_NZXTKraken(NZXTKrakenController* nzxtkra description = "NZXT Kraken X42/X52/X62/X72"; version = nzxtkraken->GetFirmwareVersion(); - mode Fixed; - Fixed.name = "Fixed"; - Fixed.value = NZXT_KRAKEN_MODE_FIXED; - Fixed.flags = MODE_FLAG_HAS_PER_LED_COLOR; - Fixed.color_mode = MODE_COLORS_PER_LED; - modes.push_back(Fixed); + mode Direct; + Direct.name = "Direct"; + Direct.value = NZXT_KRAKEN_MODE_FIXED; + Direct.flags = MODE_FLAG_HAS_PER_LED_COLOR; + Direct.color_mode = MODE_COLORS_PER_LED; + modes.push_back(Direct); mode Fading; Fading.name = "Fading"; diff --git a/RGBController/RGBController_OpenRazer.cpp b/RGBController/RGBController_OpenRazer.cpp index 5e7e9c260..24bb6da3c 100644 --- a/RGBController/RGBController_OpenRazer.cpp +++ b/RGBController/RGBController_OpenRazer.cpp @@ -252,12 +252,12 @@ RGBController_OpenRazer::RGBController_OpenRazer(std::string dev_path) \*---------------------------------------------------------*/ if(matrix_effect_custom) { - mode Custom; - Custom.name = "Custom"; - Custom.value = RAZER_MODE_CUSTOM; - Custom.flags = MODE_FLAG_HAS_PER_LED_COLOR; - Custom.color_mode = MODE_COLORS_PER_LED; - modes.push_back(Custom); + mode Direct; + Direct.name = "Direct"; + Direct.value = RAZER_MODE_CUSTOM; + Direct.flags = MODE_FLAG_HAS_PER_LED_COLOR; + Direct.color_mode = MODE_COLORS_PER_LED; + modes.push_back(Direct); } if(matrix_effect_none || logo_matrix_effect_none || scroll_matrix_effect_none || backlight_led_state || logo_led_state || scroll_led_state) diff --git a/RGBController/RGBController_OpenRazerWindows.cpp b/RGBController/RGBController_OpenRazerWindows.cpp index 4e278acd7..5d41886ee 100644 --- a/RGBController/RGBController_OpenRazerWindows.cpp +++ b/RGBController/RGBController_OpenRazerWindows.cpp @@ -199,12 +199,12 @@ RGBController_OpenRazer::RGBController_OpenRazer(device * razer_device, device_f \*---------------------------------------------------------*/ if(razer_functions->matrix_effect_custom) { - mode Custom; - Custom.name = "Custom"; - Custom.value = RAZER_MODE_CUSTOM; - Custom.flags = MODE_FLAG_HAS_PER_LED_COLOR; - Custom.color_mode = MODE_COLORS_PER_LED; - modes.push_back(Custom); + mode Direct; + Direct.name = "Direct"; + Direct.value = RAZER_MODE_CUSTOM; + Direct.flags = MODE_FLAG_HAS_PER_LED_COLOR; + Direct.color_mode = MODE_COLORS_PER_LED; + modes.push_back(Direct); } if(razer_functions->matrix_effect_none || razer_functions->logo_matrix_effect_none || razer_functions->scroll_matrix_effect_none /*|| razer_functions->backlight_led_state*/ || razer_functions->logo_led_state || razer_functions->scroll_led_state) diff --git a/RGBController/RGBController_RGBFusion.cpp b/RGBController/RGBController_RGBFusion.cpp index b1ba3a094..4c612e1a6 100644 --- a/RGBController/RGBController_RGBFusion.cpp +++ b/RGBController/RGBController_RGBFusion.cpp @@ -25,12 +25,12 @@ RGBController_RGBFusion::RGBController_RGBFusion(RGBFusionController* rgb_fusion type = DEVICE_TYPE_MOTHERBOARD; - mode Static; - Static.name = "Static"; - Static.value = RGB_FUSION_MODE_STATIC; - Static.flags = MODE_FLAG_HAS_PER_LED_COLOR; - Static.color_mode = MODE_COLORS_PER_LED; - modes.push_back(Static); + mode Direct; + Direct.name = "Direct"; + Direct.value = RGB_FUSION_MODE_STATIC; + Direct.flags = MODE_FLAG_HAS_PER_LED_COLOR; + Direct.color_mode = MODE_COLORS_PER_LED; + modes.push_back(Direct); mode Breathing; Breathing.name = "Breathing"; diff --git a/RGBController/RGBController_RGBFusionGPU.cpp b/RGBController/RGBController_RGBFusionGPU.cpp index 83b64ea65..1ede24e97 100644 --- a/RGBController/RGBController_RGBFusionGPU.cpp +++ b/RGBController/RGBController_RGBFusionGPU.cpp @@ -19,12 +19,12 @@ RGBController_RGBFusionGPU::RGBController_RGBFusionGPU(RGBFusionGPUController* r type = DEVICE_TYPE_GPU; - mode Static; - Static.name = "Static"; - Static.value = RGB_FUSION_GPU_MODE_STATIC; - Static.flags = MODE_FLAG_HAS_PER_LED_COLOR; - Static.color_mode = MODE_COLORS_PER_LED; - modes.push_back(Static); + mode Direct; + Direct.name = "Direct"; + Direct.value = RGB_FUSION_GPU_MODE_STATIC; + Direct.flags = MODE_FLAG_HAS_PER_LED_COLOR; + Direct.color_mode = MODE_COLORS_PER_LED; + modes.push_back(Direct); mode Breathing; Breathing.name = "Breathing";