From be838aa1d6b50b7ffe2003a78c6f2a8a8e448ef9 Mon Sep 17 00:00:00 2001 From: TheRogueZeta <6479694-TheRogueZeta@users.noreply.gitlab.com> Date: Tue, 1 Jun 2021 04:13:46 +0000 Subject: [PATCH] Update Logitech Lightspeed detector names --- .../LogitechControllerDetect.cpp | 79 ++++++++++--------- ...r.cpp => LogitechLightspeedController.cpp} | 18 ++--- ...oller.h => LogitechLightspeedController.h} | 13 +-- ...p => RGBController_LogitechLightspeed.cpp} | 48 +++++------ ...s.h => RGBController_LogitechLightspeed.h} | 14 ++-- OpenRGB.pro | 8 +- 6 files changed, 92 insertions(+), 88 deletions(-) rename Controllers/LogitechController/{LogitechGProWirelessController.cpp => LogitechLightspeedController.cpp} (65%) rename Controllers/LogitechController/{LogitechGProWirelessController.h => LogitechLightspeedController.h} (85%) rename Controllers/LogitechController/{RGBController_LogitechGProWireless.cpp => RGBController_LogitechLightspeed.cpp} (79%) rename Controllers/LogitechController/{RGBController_LogitechGProWireless.h => RGBController_LogitechLightspeed.h} (62%) diff --git a/Controllers/LogitechController/LogitechControllerDetect.cpp b/Controllers/LogitechController/LogitechControllerDetect.cpp index b0332407..fd25d98d 100644 --- a/Controllers/LogitechController/LogitechControllerDetect.cpp +++ b/Controllers/LogitechController/LogitechControllerDetect.cpp @@ -8,7 +8,7 @@ #include "LogitechG910Controller.h" #include "LogitechG815Controller.h" #include "LogitechGLightsyncController.h" -#include "LogitechGProWirelessController.h" +#include "LogitechLightspeedController.h" #include "RGBController.h" #include "RGBController_LogitechG203L.h" #include "RGBController_LogitechG213.h" @@ -18,7 +18,7 @@ #include "RGBController_LogitechG815.h" #include "RGBController_LogitechGLightsync.h" #include "RGBController_LogitechGLightsync1zone.h" -#include "RGBController_LogitechGProWireless.h" +#include "RGBController_LogitechLightspeed.h" #include "RGBController_LogitechGPowerPlay.h" #include #include @@ -60,7 +60,7 @@ #define LOGITECH_G903_LIGHTSPEED_PID 0xC086 #define LOGITECH_G_PRO_PID 0xC085 #define LOGITECH_G_PRO_HERO_PID 0xC08C -#define LOGITECH_G_PRO_WIRED_PID 0xC088 +#define LOGITECH_G_PRO_WIRELESS_PID 0xC088 /*-----------------------------------------------------*\ | Mousemat product IDs | @@ -88,7 +88,7 @@ #define LOGITECH_G703_LIGHTSPEED_VIRTUAL_PID 0x4070 #define LOGITECH_G900_LIGHTSPEED_VIRTUAL_PID 0x4053 #define LOGITECH_G903_LIGHTSPEED_VIRTUAL_PID 0x4067 -#define LOGITECH_GPRO_LIGHTSPEED_VIRTUAL_PID 0x4079 +#define LOGITECH_G_PRO_WIRELESS_VIRTUAL_PID 0x4079 /*-----------------------------------------------------*\ | Logitech Keyboards | @@ -441,6 +441,11 @@ void DetectLogitechMouseG403(hid_device_info* info, const std::string& name) addLogitechLightsyncMouse2zone(info, name, 0xFF, 0x0E, 0x3A); } +void DetectLogitechMouseGPRO(hid_device_info* info, const std::string& name) +{ + addLogitechLightsyncMouse2zone(info, name, 0x01, 0x07, 0x3C); +} + /*-----------------------------------------------------*\ | Other Logitech Devices | \*-----------------------------------------------------*/ @@ -481,6 +486,8 @@ REGISTER_HID_DETECTOR_IP ("Logitech G203 Prodigy", Dete REGISTER_HID_DETECTOR_IPU("Logitech G203 Lightsync", DetectLogitechMouseG203L, LOGITECH_VID, LOGITECH_G203_LIGHTSYNC_PID, 1, 0xFF00, 2); REGISTER_HID_DETECTOR_IP ("Logitech G303 Daedalus Apex", DetectLogitechMouseG303, LOGITECH_VID, LOGITECH_G303_PID, 1, 0xFF00); REGISTER_HID_DETECTOR_IP ("Logitech G403 Hero", DetectLogitechMouseG403, LOGITECH_VID, LOGITECH_G403_HERO_PID, 1, 0xFF00); +REGISTER_HID_DETECTOR_IP ("Logitech G Pro Gaming Mouse", DetectLogitechMouseGPRO, LOGITECH_VID, LOGITECH_G_PRO_PID, 1, 0xFF00); +REGISTER_HID_DETECTOR_IP ("Logitech G Pro (HERO) Gaming Mouse", DetectLogitechMouseGPRO, LOGITECH_VID, LOGITECH_G_PRO_HERO_PID, 1, 0xFF00); /*-------------------------------------------------------------------------------------------------------------------------------------------------*\ | Speakers | \*-------------------------------------------------------------------------------------------------------------------------------------------------*/ @@ -526,9 +533,9 @@ usages BundleLogitechUsages(hid_device_info* info) void CreateLogitechLightspeedDevice(char *path, usages device_usages, uint8_t device_index, bool wireless, std::shared_ptr mutex_ptr) { - LogitechGProWirelessController* controller = new LogitechGProWirelessController(device_usages.find(2)->second, path); + LogitechLightspeedController* controller = new LogitechLightspeedController(device_usages.find(2)->second, path); controller->lightspeed = new logitech_device(path, device_usages, device_index, wireless, mutex_ptr); - RGBController_LogitechGProWireless* rgb_controller = new RGBController_LogitechGProWireless(controller); + RGBController_LogitechLightspeed* rgb_controller = new RGBController_LogitechLightspeed(controller); ResourceManager::get()->RegisterRGBController(rgb_controller); } @@ -582,22 +589,20 @@ void DetectLogitechWired(hid_device_info* info, const std::string& /*name*/) /*-------------------------------------------------------------------------------------------------------------------------------------------------*\ | Lightspeed Receivers (Windows Wireless) | \*-------------------------------------------------------------------------------------------------------------------------------------------------*/ -REGISTER_HID_DETECTOR_IP("Logitech Lightspeed Receiver", DetectLogitechLightspeedReceiver, LOGITECH_VID, LOGITECH_G_LIGHTSPEED_RECEIVER_PID, 2, 0xFF00); -REGISTER_HID_DETECTOR_IP("Logitech G Powerplay Mousepad", DetectLogitechLightspeedReceiver, LOGITECH_VID, LOGITECH_G_LIGHTSPEED_POWERPLAY_PID, 2, 0xFF00); +REGISTER_HID_DETECTOR_IP("Logitech Lightspeed Receiver", DetectLogitechLightspeedReceiver, LOGITECH_VID, LOGITECH_G_LIGHTSPEED_RECEIVER_PID, 2, 0xFF00); +REGISTER_HID_DETECTOR_IP("Logitech G Powerplay Mousepad", DetectLogitechLightspeedReceiver, LOGITECH_VID, LOGITECH_G_LIGHTSPEED_POWERPLAY_PID, 2, 0xFF00); /*-------------------------------------------------------------------------------------------------------------------------------------------------*\ -| Lightspeed Devices (Windows Wired) | +| Lightspeed Wireless Devices (Windows Wired) | \*-------------------------------------------------------------------------------------------------------------------------------------------------*/ -REGISTER_HID_DETECTOR_IP("Logitech G403 Wired Gaming Mouse", DetectLogitechWired, LOGITECH_VID, LOGITECH_G403_LIGHTSPEED_PID, 1, 0xFF00); -REGISTER_HID_DETECTOR_IP("Logitech G502 Wired Gaming Mouse", DetectLogitechWired, LOGITECH_VID, LOGITECH_G502_PROTEUS_SPECTRUM_PID, 1, 0xFF00); -REGISTER_HID_DETECTOR_IP("Logitech G502 Hero Wired Gaming Mouse", DetectLogitechWired, LOGITECH_VID, LOGITECH_G502_HERO_PID, 1, 0xFF00); -REGISTER_HID_DETECTOR_IP("Logitech G502 Wired Gaming Mouse", DetectLogitechWired, LOGITECH_VID, LOGITECH_G502_LIGHTSPEED_PID, 1, 0xFF00); -REGISTER_HID_DETECTOR_IP("Logitech G703 Wired Gaming Mouse", DetectLogitechWired, LOGITECH_VID, LOGITECH_G703_LIGHTSPEED_PID, 1, 0xFF00); -REGISTER_HID_DETECTOR_IP("Logitech G900 Wired Gaming Mouse", DetectLogitechWired, LOGITECH_VID, LOGITECH_G900_LIGHTSPEED_PID, 1, 0xFF00); -REGISTER_HID_DETECTOR_IP("Logitech G903 Wired Gaming Mouse", DetectLogitechWired, LOGITECH_VID, LOGITECH_G903_LIGHTSPEED_PID, 1, 0xFF00); -REGISTER_HID_DETECTOR_IP("Logitech G Pro Gaming Mouse", DetectLogitechWired, LOGITECH_VID, LOGITECH_G_PRO_PID, 1, 0xFF00); -REGISTER_HID_DETECTOR_IP("Logitech G Pro (HERO) Gaming Mouse", DetectLogitechWired, LOGITECH_VID, LOGITECH_G_PRO_HERO_PID, 1, 0xFF00); -REGISTER_HID_DETECTOR_IP("Logitech G Pro Wired Gaming Mouse", DetectLogitechWired, LOGITECH_VID, LOGITECH_G_PRO_WIRED_PID, 2, 0xFF00); +REGISTER_HID_DETECTOR_IP("Logitech G403 Wireless Gaming Mouse (wired)", DetectLogitechWired, LOGITECH_VID, LOGITECH_G403_LIGHTSPEED_PID, 1, 0xFF00); +REGISTER_HID_DETECTOR_IP("Logitech G502 Wireless Gaming Mouse (wired)", DetectLogitechWired, LOGITECH_VID, LOGITECH_G502_PROTEUS_SPECTRUM_PID, 1, 0xFF00); +REGISTER_HID_DETECTOR_IP("Logitech G502 Hero Wireless Gaming Mouse (wired)", DetectLogitechWired, LOGITECH_VID, LOGITECH_G502_HERO_PID, 1, 0xFF00); +REGISTER_HID_DETECTOR_IP("Logitech G502 Wireless Gaming Mouse (wired)", DetectLogitechWired, LOGITECH_VID, LOGITECH_G502_LIGHTSPEED_PID, 1, 0xFF00); +REGISTER_HID_DETECTOR_IP("Logitech G703 Wireless Gaming Mouse (wired)", DetectLogitechWired, LOGITECH_VID, LOGITECH_G703_LIGHTSPEED_PID, 1, 0xFF00); +REGISTER_HID_DETECTOR_IP("Logitech G900 Wireless Gaming Mouse (wired)", DetectLogitechWired, LOGITECH_VID, LOGITECH_G900_LIGHTSPEED_PID, 1, 0xFF00); +REGISTER_HID_DETECTOR_IP("Logitech G903 Wireless Gaming Mouse (wired)", DetectLogitechWired, LOGITECH_VID, LOGITECH_G903_LIGHTSPEED_PID, 1, 0xFF00); +REGISTER_HID_DETECTOR_IP("Logitech G Pro Wireless Gaming Mouse (wired)", DetectLogitechWired, LOGITECH_VID, LOGITECH_G_PRO_WIRELESS_PID, 2, 0xFF00); #endif @@ -621,9 +626,9 @@ void CreateLogitechLightspeedDevice(hid_device_info* info, bool wireless) if(device_usages.size() > 0) { - LogitechGProWirelessController* controller = new LogitechGProWirelessController(device_usages.find(0)->second, info->path); + LogitechLightspeedController* controller = new LogitechLightspeedController(device_usages.find(0)->second, info->path); controller->lightspeed = new logitech_device(info->path, device_usages, 0xFF, wireless); - RGBController_LogitechGProWireless* rgb_controller = new RGBController_LogitechGProWireless(controller); + RGBController_LogitechLightspeed* rgb_controller = new RGBController_LogitechLightspeed(controller); ResourceManager::get()->RegisterRGBController(rgb_controller); } } @@ -641,25 +646,23 @@ void DetectLogitechWired(hid_device_info* info, const std::string& /*name*/) /*-------------------------------------------------------------------------------------------------------------------------------------------------*\ | Lightspeed Devices (Linux Wireless) | \*-------------------------------------------------------------------------------------------------------------------------------------------------*/ -REGISTER_HID_DETECTOR_IPU("Logitech G403 Wireless Gaming Mouse", DetectLogitechWireless, LOGITECH_VID, LOGITECH_G403_LIGHTSPEED_VIRTUAL_PID, 2, 0xFF00, 2); -REGISTER_HID_DETECTOR_IPU("Logitech G502 Wireless Gaming Mouse", DetectLogitechWireless, LOGITECH_VID, LOGITECH_G502_LIGHTSPEED_VIRTUAL_PID, 2, 0xFF00, 2); -REGISTER_HID_DETECTOR_IPU("Logitech G703 Wireless Gaming Mouse", DetectLogitechWireless, LOGITECH_VID, LOGITECH_G703_LIGHTSPEED_VIRTUAL_PID, 2, 0xFF00, 2); -REGISTER_HID_DETECTOR_IPU("Logitech G900 Wireless Gaming Mouse", DetectLogitechWireless, LOGITECH_VID, LOGITECH_G900_LIGHTSPEED_VIRTUAL_PID, 2, 0xFF00, 2); -REGISTER_HID_DETECTOR_IPU("Logitech G903 Wireless Gaming Mouse", DetectLogitechWireless, LOGITECH_VID, LOGITECH_G903_LIGHTSPEED_VIRTUAL_PID, 2, 0xFF00, 2); -REGISTER_HID_DETECTOR_IPU("Logitech G Pro Wireless Gaming Mouse", DetectLogitechWireless, LOGITECH_VID, LOGITECH_GPRO_LIGHTSPEED_VIRTUAL_PID, 2, 0xFF00, 2); +REGISTER_HID_DETECTOR_IPU("Logitech G403 Wireless Gaming Mouse", DetectLogitechWireless, LOGITECH_VID, LOGITECH_G403_LIGHTSPEED_VIRTUAL_PID, 2, 0xFF00, 2); +REGISTER_HID_DETECTOR_IPU("Logitech G502 Wireless Gaming Mouse", DetectLogitechWireless, LOGITECH_VID, LOGITECH_G502_LIGHTSPEED_VIRTUAL_PID, 2, 0xFF00, 2); +REGISTER_HID_DETECTOR_IPU("Logitech G703 Wireless Gaming Mouse", DetectLogitechWireless, LOGITECH_VID, LOGITECH_G703_LIGHTSPEED_VIRTUAL_PID, 2, 0xFF00, 2); +REGISTER_HID_DETECTOR_IPU("Logitech G900 Wireless Gaming Mouse", DetectLogitechWireless, LOGITECH_VID, LOGITECH_G900_LIGHTSPEED_VIRTUAL_PID, 2, 0xFF00, 2); +REGISTER_HID_DETECTOR_IPU("Logitech G903 Wireless Gaming Mouse", DetectLogitechWireless, LOGITECH_VID, LOGITECH_G903_LIGHTSPEED_VIRTUAL_PID, 2, 0xFF00, 2); +REGISTER_HID_DETECTOR_IPU("Logitech G Pro Wireless Gaming Mouse", DetectLogitechWireless, LOGITECH_VID, LOGITECH_G_PRO_WIRELESS_VIRTUAL_PID, 2, 0xFF00, 2); /*-------------------------------------------------------------------------------------------------------------------------------------------------*\ -| Lightspeed Devices (Linux Wired) | +| Lightspeed Wireless Devices (Linux Wired) | \*-------------------------------------------------------------------------------------------------------------------------------------------------*/ -REGISTER_HID_DETECTOR_IPU("Logitech G403 Wired Gaming Mouse", DetectLogitechWired, LOGITECH_VID, LOGITECH_G403_LIGHTSPEED_PID, 1, 0xFF00, 2); -REGISTER_HID_DETECTOR_IPU("Logitech G502 Wired Gaming Mouse", DetectLogitechWired, LOGITECH_VID, LOGITECH_G502_PROTEUS_SPECTRUM_PID, 1, 0xFF00, 2); -REGISTER_HID_DETECTOR_IPU("Logitech G502 Wired Gaming Mouse", DetectLogitechWired, LOGITECH_VID, LOGITECH_G502_LIGHTSPEED_PID, 1, 0xFF00, 2); -REGISTER_HID_DETECTOR_IPU("Logitech G502 Hero Wired Gaming Mouse", DetectLogitechWired, LOGITECH_VID, LOGITECH_G502_HERO_PID, 1, 0xFF00, 2); -REGISTER_HID_DETECTOR_IPU("Logitech G703 Wired Gaming Mouse", DetectLogitechWired, LOGITECH_VID, LOGITECH_G703_LIGHTSPEED_PID, 1, 0xFF00, 2); -REGISTER_HID_DETECTOR_IPU("Logitech G900 Wired Gaming Mouse", DetectLogitechWired, LOGITECH_VID, LOGITECH_G900_LIGHTSPEED_PID, 1, 0xFF00, 2); -REGISTER_HID_DETECTOR_IPU("Logitech G903 Wired Gaming Mouse", DetectLogitechWired, LOGITECH_VID, LOGITECH_G903_LIGHTSPEED_PID, 1, 0xFF00, 2); -REGISTER_HID_DETECTOR_IPU("Logitech G Pro Gaming Mouse", DetectLogitechWired, LOGITECH_VID, LOGITECH_G_PRO_PID, 1, 0xFF00, 2); -REGISTER_HID_DETECTOR_IPU("Logitech G Pro (HERO) Gaming Mouse", DetectLogitechWired, LOGITECH_VID, LOGITECH_G_PRO_HERO_PID, 1, 0xFF00, 2); -REGISTER_HID_DETECTOR_IPU("Logitech G Pro Wired Gaming Mouse", DetectLogitechWired, LOGITECH_VID, LOGITECH_G_PRO_WIRED_PID, 2, 0xFF00, 2); +REGISTER_HID_DETECTOR_IPU("Logitech G403 Wireless Gaming Mouse (wired)", DetectLogitechWired, LOGITECH_VID, LOGITECH_G403_LIGHTSPEED_PID, 1, 0xFF00, 2); +REGISTER_HID_DETECTOR_IPU("Logitech G502 Wireless Gaming Mouse (wired)", DetectLogitechWired, LOGITECH_VID, LOGITECH_G502_PROTEUS_SPECTRUM_PID, 1, 0xFF00, 2); +REGISTER_HID_DETECTOR_IPU("Logitech G502 Hero Wireless Gaming Mouse (wired)", DetectLogitechWired, LOGITECH_VID, LOGITECH_G502_LIGHTSPEED_PID, 1, 0xFF00, 2); +REGISTER_HID_DETECTOR_IPU("Logitech G502 Wireless Gaming Mouse (wired)", DetectLogitechWired, LOGITECH_VID, LOGITECH_G502_HERO_PID, 1, 0xFF00, 2); +REGISTER_HID_DETECTOR_IPU("Logitech G703 Wireless Gaming Mouse (wired)", DetectLogitechWired, LOGITECH_VID, LOGITECH_G703_LIGHTSPEED_PID, 1, 0xFF00, 2); +REGISTER_HID_DETECTOR_IPU("Logitech G900 Wireless Gaming Mouse (wired)", DetectLogitechWired, LOGITECH_VID, LOGITECH_G900_LIGHTSPEED_PID, 1, 0xFF00, 2); +REGISTER_HID_DETECTOR_IPU("Logitech G903 Wireless Gaming Mouse (wired)", DetectLogitechWired, LOGITECH_VID, LOGITECH_G903_LIGHTSPEED_PID, 1, 0xFF00, 2); +REGISTER_HID_DETECTOR_IPU("Logitech G Pro Wireless Gaming Mouse (wired)", DetectLogitechWired, LOGITECH_VID, LOGITECH_G_PRO_WIRELESS_PID, 2, 0xFF00, 2); #endif diff --git a/Controllers/LogitechController/LogitechGProWirelessController.cpp b/Controllers/LogitechController/LogitechLightspeedController.cpp similarity index 65% rename from Controllers/LogitechController/LogitechGProWirelessController.cpp rename to Controllers/LogitechController/LogitechLightspeedController.cpp index 3aa5395a..8670df3d 100644 --- a/Controllers/LogitechController/LogitechGProWirelessController.cpp +++ b/Controllers/LogitechController/LogitechLightspeedController.cpp @@ -1,33 +1,33 @@ /*-----------------------------------------*\ -| LogitechGProWirelessController.cpp | +| LogitechLightspeedController.cpp | | | -| Driver for Logitech G Pro Wireless Gaming| -| Mouse lighting controller | +| Driver for Logitech Lightspeed Wireless | +| Gaming Mice lighting controller | | | | TheRogueZeta 8/5/2020 | \*-----------------------------------------*/ -#include "LogitechGProWirelessController.h" +#include "LogitechLightspeedController.h" #include -LogitechGProWirelessController::LogitechGProWirelessController(hid_device* dev_handle, const char* path) +LogitechLightspeedController::LogitechLightspeedController(hid_device* dev_handle, const char* path) { dev = dev_handle; location = path; } -LogitechGProWirelessController::~LogitechGProWirelessController() +LogitechLightspeedController::~LogitechLightspeedController() { delete lightspeed; } -std::string LogitechGProWirelessController::GetDeviceLocation() +std::string LogitechLightspeedController::GetDeviceLocation() { return("HID: " + location + " (Receiver) \r\nWireless Index: " + std::to_string(lightspeed->device_index)); } -std::string LogitechGProWirelessController::GetSerialString() +std::string LogitechLightspeedController::GetSerialString() { wchar_t serial_string[128]; hid_get_serial_number_string(dev, serial_string, 128); @@ -38,7 +38,7 @@ std::string LogitechGProWirelessController::GetSerialString() return(return_string); } -void LogitechGProWirelessController::SendMouseMode +void LogitechLightspeedController::SendMouseMode ( unsigned char mode, std::uint16_t speed, diff --git a/Controllers/LogitechController/LogitechGProWirelessController.h b/Controllers/LogitechController/LogitechLightspeedController.h similarity index 85% rename from Controllers/LogitechController/LogitechGProWirelessController.h rename to Controllers/LogitechController/LogitechLightspeedController.h index 92ab7115..3212581e 100644 --- a/Controllers/LogitechController/LogitechGProWirelessController.h +++ b/Controllers/LogitechController/LogitechLightspeedController.h @@ -1,8 +1,9 @@ /*-----------------------------------------*\ -| LogitechGProWirelessController.h | +| LogitechLightspeedController.h | | | -| Definitions and types for Logitech G Pro | -| Wireless Gaming Mouse lighting controller| +| Definitions and types for Logitech G | +| Lightsync Wireless Gaming Mice lighting | +| controller | | | | TheRogueZeta 8/5/2020 | \*-----------------------------------------*/ @@ -34,11 +35,11 @@ enum LOGITECH_G_PRO_WIRELESS_SPEED_FASTEST = 0x0A, /* Fastest speed */ }; -class LogitechGProWirelessController +class LogitechLightspeedController { public: - LogitechGProWirelessController(hid_device* dev_handle, const char* path); - ~LogitechGProWirelessController(); + LogitechLightspeedController(hid_device* dev_handle, const char* path); + ~LogitechLightspeedController(); logitech_device* lightspeed; diff --git a/Controllers/LogitechController/RGBController_LogitechGProWireless.cpp b/Controllers/LogitechController/RGBController_LogitechLightspeed.cpp similarity index 79% rename from Controllers/LogitechController/RGBController_LogitechGProWireless.cpp rename to Controllers/LogitechController/RGBController_LogitechLightspeed.cpp index a7f40bc1..84f67a50 100644 --- a/Controllers/LogitechController/RGBController_LogitechGProWireless.cpp +++ b/Controllers/LogitechController/RGBController_LogitechLightspeed.cpp @@ -1,15 +1,15 @@ /*-----------------------------------------*\ -| RGBController_LogitechGProWireless.cpp | +| RGBController_LogitechLightspeed.cpp | | | | Generic RGB Interface for | -| Logitech G Pro Wireless Gaming Mouse | +| Logitech Lightspeed Gaming Mice | | | | TheRogueZeta 8/5/2020 | \*-----------------------------------------*/ -#include "RGBController_LogitechGProWireless.h" +#include "RGBController_LogitechLightspeed.h" -RGBController_LogitechGProWireless::RGBController_LogitechGProWireless(LogitechGProWirelessController* logitech_ptr) +RGBController_LogitechLightspeed::RGBController_LogitechLightspeed(LogitechLightspeedController* logitech_ptr) { logitech = logitech_ptr; bool connected = logitech->lightspeed->connected(); @@ -91,12 +91,12 @@ RGBController_LogitechGProWireless::RGBController_LogitechGProWireless(LogitechG } } -RGBController_LogitechGProWireless::~RGBController_LogitechGProWireless() +RGBController_LogitechLightspeed::~RGBController_LogitechLightspeed() { delete logitech; } -void RGBController_LogitechGProWireless::SetupZones() +void RGBController_LogitechLightspeed::SetupZones() { uint8_t LED_count = logitech->lightspeed->getLEDinfo(); @@ -104,33 +104,33 @@ void RGBController_LogitechGProWireless::SetupZones() { for(size_t i = 0; i < LED_count; i++) { - zone GProWireless_logo_zone; - GProWireless_logo_zone.name = "Zone " + std::to_string(i); - GProWireless_logo_zone.type = ZONE_TYPE_SINGLE; - GProWireless_logo_zone.leds_min = 1; - GProWireless_logo_zone.leds_max = 1; - GProWireless_logo_zone.leds_count = 1; - GProWireless_logo_zone.matrix_map = NULL; - zones.push_back(GProWireless_logo_zone); + zone Lightspeed_logo_zone; + Lightspeed_logo_zone.name = "Zone " + std::to_string(i); + Lightspeed_logo_zone.type = ZONE_TYPE_SINGLE; + Lightspeed_logo_zone.leds_min = 1; + Lightspeed_logo_zone.leds_max = 1; + Lightspeed_logo_zone.leds_count = 1; + Lightspeed_logo_zone.matrix_map = NULL; + zones.push_back(Lightspeed_logo_zone); - led GProWireless_logo_led; - GProWireless_logo_led.name = "LED " + std::to_string(i); - GProWireless_logo_led.value = i; - leds.push_back(GProWireless_logo_led); + led Lightspeed_logo_led; + Lightspeed_logo_led.name = "LED " + std::to_string(i); + Lightspeed_logo_led.value = i; + leds.push_back(Lightspeed_logo_led); } } SetupColors(); } -void RGBController_LogitechGProWireless::ResizeZone(int /*zone*/, int /*new_size*/) +void RGBController_LogitechLightspeed::ResizeZone(int /*zone*/, int /*new_size*/) { /*---------------------------------------------------------*\ | This device does not support resizing zones | \*---------------------------------------------------------*/ } -void RGBController_LogitechGProWireless::DeviceUpdateLEDs() +void RGBController_LogitechLightspeed::DeviceUpdateLEDs() { for(std::vector::iterator led_index = leds.begin(); led_index != leds.end(); led_index++) { @@ -138,7 +138,7 @@ void RGBController_LogitechGProWireless::DeviceUpdateLEDs() } } -void RGBController_LogitechGProWireless::UpdateZoneLEDs(int zone) +void RGBController_LogitechLightspeed::UpdateZoneLEDs(int zone) { unsigned char red = RGBGetRValue(colors[zone]); unsigned char grn = RGBGetGValue(colors[zone]); @@ -152,12 +152,12 @@ void RGBController_LogitechGProWireless::UpdateZoneLEDs(int zone) logitech->SendMouseMode(temp_mode, modes[active_mode].speed, zone, red, grn, blu); } -void RGBController_LogitechGProWireless::UpdateSingleLED(int led) +void RGBController_LogitechLightspeed::UpdateSingleLED(int led) { UpdateZoneLEDs(led); } -void RGBController_LogitechGProWireless::SetCustomMode() +void RGBController_LogitechLightspeed::SetCustomMode() { if(logitech->lightspeed->connected()) { @@ -165,7 +165,7 @@ void RGBController_LogitechGProWireless::SetCustomMode() } } -void RGBController_LogitechGProWireless::DeviceUpdateMode() +void RGBController_LogitechLightspeed::DeviceUpdateMode() { /*---------------------------------------------------------*\ | If direct mode is true, then sent the packet to put the | diff --git a/Controllers/LogitechController/RGBController_LogitechGProWireless.h b/Controllers/LogitechController/RGBController_LogitechLightspeed.h similarity index 62% rename from Controllers/LogitechController/RGBController_LogitechGProWireless.h rename to Controllers/LogitechController/RGBController_LogitechLightspeed.h index 14b41e01..0edec179 100644 --- a/Controllers/LogitechController/RGBController_LogitechGProWireless.h +++ b/Controllers/LogitechController/RGBController_LogitechLightspeed.h @@ -1,21 +1,21 @@ /*-----------------------------------------*\ -| RGBController_LogitechGProWireless.h | +| RGBController_LogitechLightspeed.h | | | | Generic RGB Interface for | -| Logitech G Pro Wireless Gaming Mouse | +| Logitech Lightspeed Gaming Mice | | | | TheRogueZeta 8/5/2020 | \*-----------------------------------------*/ #pragma once #include "RGBController.h" -#include "LogitechGProWirelessController.h" +#include "LogitechLightspeedController.h" -class RGBController_LogitechGProWireless : public RGBController +class RGBController_LogitechLightspeed : public RGBController { public: - RGBController_LogitechGProWireless(LogitechGProWirelessController* logitech_ptr); - ~RGBController_LogitechGProWireless(); + RGBController_LogitechLightspeed(LogitechLightspeedController* logitech_ptr); + ~RGBController_LogitechLightspeed(); void SetupZones(); @@ -29,5 +29,5 @@ public: void DeviceUpdateMode(); private: - LogitechGProWirelessController* logitech; + LogitechLightspeedController* logitech; }; diff --git a/OpenRGB.pro b/OpenRGB.pro index 29019675..60238c93 100644 --- a/OpenRGB.pro +++ b/OpenRGB.pro @@ -285,7 +285,7 @@ HEADERS += Controllers/LogitechController/LogitechG910Controller.h \ Controllers/LogitechController/LogitechG815Controller.h \ Controllers/LogitechController/LogitechGLightsyncController.h \ - Controllers/LogitechController/LogitechGProWirelessController.h \ + Controllers/LogitechController/LogitechLightspeedController.h \ Controllers/LogitechController/RGBController_LogitechG203L.h \ Controllers/LogitechController/RGBController_LogitechG213.h \ Controllers/LogitechController/RGBController_LogitechG560.h \ @@ -295,7 +295,7 @@ HEADERS += Controllers/LogitechController/RGBController_LogitechGLightsync.h \ Controllers/LogitechController/RGBController_LogitechGLightsync1zone.h \ Controllers/LogitechController/RGBController_LogitechGPowerPlay.h \ - Controllers/LogitechController/RGBController_LogitechGProWireless.h \ + Controllers/LogitechController/RGBController_LogitechLightspeed.h \ Controllers/MSI3ZoneController/MSI3ZoneController.h \ Controllers/MSI3ZoneController/RGBController_MSI3Zone.h \ Controllers/MSIGPUController/MSIGPUController.h \ @@ -569,7 +569,7 @@ SOURCES += Controllers/LogitechController/LogitechG910Controller.cpp \ Controllers/LogitechController/LogitechG815Controller.cpp \ Controllers/LogitechController/LogitechGLightsyncController.cpp \ - Controllers/LogitechController/LogitechGProWirelessController.cpp \ + Controllers/LogitechController/LogitechLightspeedController.cpp \ Controllers/LogitechController/RGBController_LogitechG203L.cpp \ Controllers/LogitechController/RGBController_LogitechG213.cpp \ Controllers/LogitechController/RGBController_LogitechG560.cpp \ @@ -579,7 +579,7 @@ SOURCES += Controllers/LogitechController/RGBController_LogitechGLightsync.cpp \ Controllers/LogitechController/RGBController_LogitechGLightsync1zone.cpp \ Controllers/LogitechController/RGBController_LogitechGPowerPlay.cpp \ - Controllers/LogitechController/RGBController_LogitechGProWireless.cpp \ + Controllers/LogitechController/RGBController_LogitechLightspeed.cpp \ Controllers/MSI3ZoneController/MSI3ZoneController.cpp \ Controllers/MSI3ZoneController/MSI3ZoneControllerDetect.cpp \ Controllers/MSI3ZoneController/RGBController_MSI3Zone.cpp \