From f110589f91a3e41ef9077ee837ec256dce3436d7 Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Sat, 25 Jan 2020 16:06:28 -0600 Subject: [PATCH] Fix some small issues with AMD Wraith Prism driver --- .../AMDWraithPrismController.cpp | 6 +++--- RGBController/RGBController_AMDWraithPrism.cpp | 11 +++++++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Controllers/AMDWraithPrismController/AMDWraithPrismController.cpp b/Controllers/AMDWraithPrismController/AMDWraithPrismController.cpp index 9a99a6a9..a5a6c468 100644 --- a/Controllers/AMDWraithPrismController/AMDWraithPrismController.cpp +++ b/Controllers/AMDWraithPrismController/AMDWraithPrismController.cpp @@ -19,15 +19,15 @@ AMDWraithPrismController::AMDWraithPrismController(libusb_device_handle* dev_han strcpy(device_name, "AMD Wraith Prism"); current_fan_mode = AMD_WRAITH_PRISM_FAN_LOGO_MODE_STATIC; - current_fan_speed = 0x00; + current_fan_speed = 0xFF; current_fan_random_color = false; current_logo_mode = AMD_WRAITH_PRISM_FAN_LOGO_MODE_STATIC; - current_logo_speed = 0x00; + current_logo_speed = 0xFF; current_logo_random_color = false; current_ring_mode = AMD_WRAITH_PRISM_EFFECT_CHANNEL_STATIC; - current_ring_speed = 0x00; + current_ring_speed = 0xFF; current_ring_direction = false; SendEnableCommand(); diff --git a/RGBController/RGBController_AMDWraithPrism.cpp b/RGBController/RGBController_AMDWraithPrism.cpp index cacf42b9..6184f6a4 100644 --- a/RGBController/RGBController_AMDWraithPrism.cpp +++ b/RGBController/RGBController_AMDWraithPrism.cpp @@ -18,9 +18,10 @@ RGBController_AMDWraithPrism::RGBController_AMDWraithPrism(AMDWraithPrismControl version = wraith->GetFirmwareVersionString(); mode Static; - Static.name = "Static"; - Static.value = AMD_WRAITH_PRISM_EFFECT_CHANNEL_STATIC; - Static.flags = MODE_FLAG_HAS_COLOR | MODE_FLAG_PER_LED_COLOR; + Static.name = "Static"; + Static.value = AMD_WRAITH_PRISM_EFFECT_CHANNEL_STATIC; + Static.flags = MODE_FLAG_HAS_COLOR | MODE_FLAG_PER_LED_COLOR; + Static.random = false; modes.push_back(Static); mode Breathing; @@ -39,6 +40,7 @@ RGBController_AMDWraithPrism::RGBController_AMDWraithPrism(AMDWraithPrismControl ColorCycle.flags = MODE_FLAG_HAS_SPEED; ColorCycle.speed_min = AMD_WRAITH_PRISM_SPEED_SLOWEST; ColorCycle.speed_max = AMD_WRAITH_PRISM_SPEED_FASTEST; + ColorCycle.random = false; ColorCycle.speed = AMD_WRAITH_PRISM_SPEED_NORMAL; modes.push_back(ColorCycle); @@ -48,6 +50,7 @@ RGBController_AMDWraithPrism::RGBController_AMDWraithPrism(AMDWraithPrismControl Rainbow.flags = MODE_FLAG_HAS_SPEED; Rainbow.speed_min = AMD_WRAITH_PRISM_SPEED_SLOWEST; Rainbow.speed_max = AMD_WRAITH_PRISM_SPEED_FASTEST; + Rainbow.random = false; Rainbow.speed = AMD_WRAITH_PRISM_SPEED_NORMAL; modes.push_back(Rainbow); @@ -168,7 +171,7 @@ void RGBController_AMDWraithPrism::SetMode(int mode) void RGBController_AMDWraithPrism::SetCustomMode() { - + SetMode(0); } void RGBController_AMDWraithPrism::UpdateLEDs()