From b9f8243904e70bc06d9e148fc7c7c89811d36cb5 Mon Sep 17 00:00:00 2001 From: Chris M Date: Wed, 29 Nov 2023 14:17:16 +0000 Subject: [PATCH] Fixed initial brightness for the CLI and fix initial brightness for Lian Li Hub SL V2 controller. --- .../LianLiController/LianLiControllerDetect.cpp | 17 ++++++++--------- .../RGBController_LianLiUniHubSLV2.cpp | 2 +- cli.cpp | 2 +- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/Controllers/LianLiController/LianLiControllerDetect.cpp b/Controllers/LianLiController/LianLiControllerDetect.cpp index 9f2c88a8..09d9bc90 100644 --- a/Controllers/LianLiController/LianLiControllerDetect.cpp +++ b/Controllers/LianLiController/LianLiControllerDetect.cpp @@ -239,18 +239,17 @@ void DetectLianLiGAIITrinity(hid_device_info* info, const std::string& /*name*/) } } -REGISTER_DETECTOR("Lian Li Uni Hub", DetectLianLiUniHub); -REGISTER_HID_DETECTOR_IPU("Lian Li Uni Hub - AL", DetectLianLiUniHubAL, ENE_USB_VID, UNI_HUB_AL_PID, 0x01, 0xFF72, 0xA1); -REGISTER_HID_DETECTOR_IPU("Lian Li Uni Hub - SL V2", DetectLianLiUniHubSLV2, ENE_USB_VID, UNI_HUB_SLV2_PID, 0x01, 0xFF72, 0xA1); -REGISTER_HID_DETECTOR_IPU("Lian Li Uni Hub - SL V2 v0.5", DetectLianLiUniHubSLV2, ENE_USB_VID, UNI_HUB_SLV2_V05_PID, 0x01, 0xFF72, 0xA1); -REGISTER_HID_DETECTOR_IPU("Lian Li Uni Hub - SL Infinity", DetectLianLiUniHubSLInfinity, ENE_USB_VID, UNI_HUB_SLINF_PID, 0x01, 0xFF72, 0xA1); +REGISTER_DETECTOR("Lian Li Uni Hub", DetectLianLiUniHub); +REGISTER_HID_DETECTOR_IPU("Lian Li Uni Hub - AL", DetectLianLiUniHubAL, ENE_USB_VID, UNI_HUB_AL_PID, 0x01, 0xFF72, 0xA1); +REGISTER_HID_DETECTOR_IPU("Lian Li Uni Hub - SL V2", DetectLianLiUniHubSLV2, ENE_USB_VID, UNI_HUB_SLV2_PID, 0x01, 0xFF72, 0xA1); +REGISTER_HID_DETECTOR_IPU("Lian Li Uni Hub - SL V2 v0.5", DetectLianLiUniHubSLV2, ENE_USB_VID, UNI_HUB_SLV2_V05_PID, 0x01, 0xFF72, 0xA1); +REGISTER_HID_DETECTOR_IPU("Lian Li Uni Hub - SL Infinity", DetectLianLiUniHubSLInfinity, ENE_USB_VID, UNI_HUB_SLINF_PID, 0x01, 0xFF72, 0xA1); /*---------------------------------------------------------------------------------------------------------*\ | Entries for dynamic UDEV rules | | | | DUMMY_DEVICE_DETECTOR("Lian Li Uni Hub", DetectLianLiUniHub, 0x0CF2, 0x7750 ) | \*---------------------------------------------------------------------------------------------------------*/ -REGISTER_HID_DETECTOR_IPU("Strimer L Connect", DetectStrimerControllers, ENE_USB_VID, STRIMER_L_CONNECT_PID, 1, 0xFF72, 0xA1); - -REGISTER_HID_DETECTOR_I("Lian Li GA II Trinity", DetectLianLiGAIITrinity, NUVOTON_USB_VID, GAII_USB_PID, 0x02); -REGISTER_HID_DETECTOR_I("Lian Li GA II Trinity Performance", DetectLianLiGAIITrinity, NUVOTON_USB_VID, GAII_Perf_USB_PID, 0x02); +REGISTER_HID_DETECTOR_IPU("Strimer L Connect", DetectStrimerControllers, ENE_USB_VID, STRIMER_L_CONNECT_PID, 1, 0xFF72, 0xA1); +REGISTER_HID_DETECTOR_I("Lian Li GA II Trinity", DetectLianLiGAIITrinity, NUVOTON_USB_VID, GAII_USB_PID, 0x02); +REGISTER_HID_DETECTOR_I("Lian Li GA II Trinity Performance", DetectLianLiGAIITrinity, NUVOTON_USB_VID, GAII_Perf_USB_PID, 0x02); diff --git a/Controllers/LianLiController/RGBController_LianLiUniHubSLV2.cpp b/Controllers/LianLiController/RGBController_LianLiUniHubSLV2.cpp index 52073ff7..9ba5c5e5 100644 --- a/Controllers/LianLiController/RGBController_LianLiUniHubSLV2.cpp +++ b/Controllers/LianLiController/RGBController_LianLiUniHubSLV2.cpp @@ -43,7 +43,7 @@ RGBController_LianLiUniHubSLV2::RGBController_LianLiUniHubSLV2(LianLiUniHubSLV2C Custom.flags = MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_PER_LED_COLOR; Custom.brightness_min = 0; Custom.brightness_max = 50; - Custom.brightness = 37; + Custom.brightness = 50; Custom.color_mode = MODE_COLORS_PER_LED; modes.push_back(Custom); diff --git a/cli.cpp b/cli.cpp index f491f733..ce513fee 100644 --- a/cli.cpp +++ b/cli.cpp @@ -47,7 +47,7 @@ struct DeviceOptions int zone = -1; std::vector> colors; std::string mode; - unsigned int brightness; + unsigned int brightness = 100; unsigned int size; bool random_colors = false; bool hasSize = false;