From a989166cdca04bedb5774f3c197c515afd323d36 Mon Sep 17 00:00:00 2001 From: Chris M Date: Sat, 11 Nov 2023 18:13:48 +1100 Subject: [PATCH] Fixed regression bug from fd3434b8 * Renamed LenovoRGBController_Gen7_8 to RGBController_Lenovo_Gen7_8 to align with naming convention * Fixed #include statements pointing to wrong header(s) * Corrected variable names in RGBController_Lenovo_Gen7USB.cpp * Other style and formatting changes --- .../LenovoUSBController_Gen7_8.cpp | 4 +-- .../LenovoUSBController_Gen7_8.h | 3 +- .../LenovoControllers/LenovoUSBDetect.cpp | 11 +++--- .../RGBController_Lenovo_Gen7USB.cpp | 36 +++++++++++-------- ..._8.cpp => RGBController_Lenovo_Gen7_8.cpp} | 24 ++++++++----- ...Gen7_8.h => RGBController_Lenovo_Gen7_8.h} | 2 +- OpenRGB.pro | 4 +++ 7 files changed, 49 insertions(+), 35 deletions(-) rename Controllers/LenovoControllers/{LenovoRGBController_Gen7_8.cpp => RGBController_Lenovo_Gen7_8.cpp} (97%) rename Controllers/LenovoControllers/{LenovoRGBController_Gen7_8.h => RGBController_Lenovo_Gen7_8.h} (97%) diff --git a/Controllers/LenovoControllers/LenovoUSBController_Gen7_8.cpp b/Controllers/LenovoControllers/LenovoUSBController_Gen7_8.cpp index d607713b..0adcc385 100644 --- a/Controllers/LenovoControllers/LenovoUSBController_Gen7_8.cpp +++ b/Controllers/LenovoControllers/LenovoUSBController_Gen7_8.cpp @@ -1,6 +1,6 @@ -#include "LenovoUSBController_Gen7_8.h" -#include #include +#include +#include "LenovoUSBController_Gen7_8.h" using namespace std; diff --git a/Controllers/LenovoControllers/LenovoUSBController_Gen7_8.h b/Controllers/LenovoControllers/LenovoUSBController_Gen7_8.h index 20fe115d..a2d2dda9 100644 --- a/Controllers/LenovoControllers/LenovoUSBController_Gen7_8.h +++ b/Controllers/LenovoControllers/LenovoUSBController_Gen7_8.h @@ -1,5 +1,5 @@ /*-------------------------------------------------------------------*\ -| LenovoGen7And8USBController.h | +| LenovoGen7And8USBController.h | | | | Driver for Lenovo Legion 7 Gen 7 | | | @@ -54,7 +54,6 @@ class LenovoGen7And8USBController |ctor(s) and dtor| \*--------------*/ LenovoGen7And8USBController(hid_device* dev_handle, const char* path, uint16_t in_pid); - LenovoGen7And8USBController(); ~LenovoGen7And8USBController(); /*--------------*\ diff --git a/Controllers/LenovoControllers/LenovoUSBDetect.cpp b/Controllers/LenovoControllers/LenovoUSBDetect.cpp index a21fa790..09c97d94 100644 --- a/Controllers/LenovoControllers/LenovoUSBDetect.cpp +++ b/Controllers/LenovoControllers/LenovoUSBDetect.cpp @@ -10,11 +10,10 @@ #include "Detector.h" #include "LogManager.h" #include "RGBController.h" -#include "LenovoGen7And8USBController.h" -#include "LenovoUSBController.h" + #include "LenovoDevices.h" #include "RGBController_LenovoUSB.h" -#include "LenovoRGBController_Gen7_8.h" +#include "RGBController_Lenovo_Gen7_8.h" #include /*-----------------------------------------------------*\ @@ -51,9 +50,9 @@ void DetectLenovoLegionUSBControllersGen7And8(hid_device_info* info, const std:: if(dev) { - LenovoGen7And8USBController* controller = new LenovoGen7And8USBController(dev, info->path, info->product_id); - LenovoRGBController_Gen7_8* rgb_controller = new LenovoRGBController_Gen7_8(controller); - rgb_controller->name = name; + LenovoGen7And8USBController* controller = new LenovoGen7And8USBController(dev, info->path, info->product_id); + LenovoRGBController_Gen7_8* rgb_controller = new LenovoRGBController_Gen7_8(controller); + rgb_controller->name = name; ResourceManager::get()->RegisterRGBController(rgb_controller); } diff --git a/Controllers/LenovoControllers/RGBController_Lenovo_Gen7USB.cpp b/Controllers/LenovoControllers/RGBController_Lenovo_Gen7USB.cpp index 6afdf958..ce255dbb 100644 --- a/Controllers/LenovoControllers/RGBController_Lenovo_Gen7USB.cpp +++ b/Controllers/LenovoControllers/RGBController_Lenovo_Gen7USB.cpp @@ -263,10 +263,10 @@ RGBController_Lenovo_Gen7USB::~RGBController_Lenovo_Gen7USB() void RGBController_Lenovo_Gen7USB::SetupZones() { vector lenovo_zones; - lenovo_zones.push_back(lenovo_legion_7gen7_kbd_ansi); + lenovo_zones.push_back(legion7_gen7and8_kbd_ansi); lenovo_zones.push_back(lenovo_legion_7gen7_logo); lenovo_zones.push_back(lenovo_legion_7gen7_vents); - lenovo_zones.push_back(lenovo_legion_7gen7_neon); + lenovo_zones.push_back(legion7_gen7and8_neon); for(unsigned int i = 0; i < lenovo_zones.size(); i++) { @@ -322,12 +322,12 @@ void RGBController_Lenovo_Gen7USB::ResizeZone(int /*zone*/, int /*new_size*/) \*---------------------------------------------------------*/ } -void RGBController_Lenovo_Gen7USB::UpdateSingleLED(int led) +void RGBController_Lenovo_Gen7USB::UpdateSingleLED(int /*led*/) { DeviceUpdateLEDs(); } -void RGBController_Lenovo_Gen7USB::UpdateZoneLEDs(int led) +void RGBController_Lenovo_Gen7USB::UpdateZoneLEDs(int /*led*/) { DeviceUpdateLEDs(); } @@ -335,7 +335,8 @@ void RGBController_Lenovo_Gen7USB::UpdateZoneLEDs(int led) void RGBController_Lenovo_Gen7USB::DeviceUpdateMode() { uint8_t hw_profile_id = controller->getCurrentProfileId(); - if(hw_profile_id != profile_id) { + if(hw_profile_id != profile_id) + { profile_id = hw_profile_id; ReadDeviceSettings(); last_mode = active_mode; @@ -351,7 +352,8 @@ void RGBController_Lenovo_Gen7USB::DeviceUpdateMode() } } - if(last_mode != active_mode){ + if(last_mode != active_mode) + { if(modes[last_mode].value == LENOVO_LEGION_GEN7_MODE_DIRECT) { @@ -390,9 +392,10 @@ void RGBController_Lenovo_Gen7USB::DeviceUpdateLEDs() void RGBController_Lenovo_Gen7USB::ReadDeviceSettings() { vector current_settings = controller->getProfileSettings(profile_id); - if(current_settings.size()>0) + if(current_settings.size() > 0) { - for(int i = 0; i0) + if(lg.colors.size() > 0) { for(uint16_t led_id : lg.leds) { @@ -436,9 +442,9 @@ void RGBController_Lenovo_Gen7USB::ReadDeviceSettings() break; case MODE_COLORS_MODE_SPECIFIC: - for(size_t j=0; j RGBController_Lenovo_Gen7USB::GetLedGroups() std::unordered_map> led_map; if(modes[active_mode].color_mode == MODE_COLORS_PER_LED && - modes[active_mode].value != LENOVO_LEGION_GEN7_MODE_DIRECT) + modes[active_mode].value != LENOVO_LEGION_GEN7_MODE_DIRECT) { for(size_t i = 0; i < leds.size(); i++) { @@ -500,10 +506,10 @@ std::vector RGBController_Lenovo_Gen7USB::GetLedGroups() size_t end = leds.size(); /*---------------------------------------------------------*\ - | Riplle and Type only apply to keyboard | + | Ripple and Type only apply to keyboard | \*---------------------------------------------------------*/ if(modes[active_mode].value == LENOVO_LEGION_GEN7_MODE_RIPPLE || - modes[active_mode].value == LENOVO_LEGION_GEN7_MODE_TYPE) + modes[active_mode].value == LENOVO_LEGION_GEN7_MODE_TYPE) { for(const zone &z : zones) { diff --git a/Controllers/LenovoControllers/LenovoRGBController_Gen7_8.cpp b/Controllers/LenovoControllers/RGBController_Lenovo_Gen7_8.cpp similarity index 97% rename from Controllers/LenovoControllers/LenovoRGBController_Gen7_8.cpp rename to Controllers/LenovoControllers/RGBController_Lenovo_Gen7_8.cpp index 59983f24..3ab33a29 100644 --- a/Controllers/LenovoControllers/LenovoRGBController_Gen7_8.cpp +++ b/Controllers/LenovoControllers/RGBController_Lenovo_Gen7_8.cpp @@ -1,4 +1,4 @@ -#include "LenovoRGBController_Gen7_8.h" +#include "RGBController_Lenovo_Gen7_8.h" #include "LenovoDevices.h" #include @@ -351,7 +351,8 @@ void LenovoRGBController_Gen7_8::UpdateZoneLEDs(int led) void LenovoRGBController_Gen7_8::DeviceUpdateMode() { uint8_t hw_profile_id = controller->getCurrentProfileId(); - if(hw_profile_id != profile_id) { + if(hw_profile_id != profile_id) + { profile_id = hw_profile_id; ReadDeviceSettings(); last_mode = active_mode; @@ -367,7 +368,8 @@ void LenovoRGBController_Gen7_8::DeviceUpdateMode() } } - if(last_mode != active_mode){ + if(last_mode != active_mode) + { if(modes[last_mode].value == LENOVO_LEGION_GEN7_8_MODE_DIRECT) { @@ -406,9 +408,10 @@ void LenovoRGBController_Gen7_8::DeviceUpdateLEDs() void LenovoRGBController_Gen7_8::ReadDeviceSettings() { vector current_settings = controller->getProfileSettings(profile_id); - if(current_settings.size()>0) + if(current_settings.size() > 0) { - for(int i = 0; i0) + if(lg.colors.size() > 0) { for(uint16_t led_id : lg.leds) { @@ -452,9 +458,9 @@ void LenovoRGBController_Gen7_8::ReadDeviceSettings() break; case MODE_COLORS_MODE_SPECIFIC: - for(size_t j=0; j