Skip to content

Commit be838aa

Browse files
TheRogueZetaCalcProgrammer1
TheRogueZeta
authored and
CalcProgrammer1
committed
Update Logitech Lightspeed detector names
1 parent 68b0287 commit be838aa

File tree

6 files changed

+93
-89
lines changed

6 files changed

+93
-89
lines changed

‎Controllers/LogitechController/LogitechControllerDetect.cpp

Lines changed: 41 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "LogitechG910Controller.h"
99
#include "LogitechG815Controller.h"
1010
#include "LogitechGLightsyncController.h"
11-
#include "LogitechGProWirelessController.h"
11+
#include "LogitechLightspeedController.h"
1212
#include "RGBController.h"
1313
#include "RGBController_LogitechG203L.h"
1414
#include "RGBController_LogitechG213.h"
@@ -18,7 +18,7 @@
1818
#include "RGBController_LogitechG815.h"
1919
#include "RGBController_LogitechGLightsync.h"
2020
#include "RGBController_LogitechGLightsync1zone.h"
21-
#include "RGBController_LogitechGProWireless.h"
21+
#include "RGBController_LogitechLightspeed.h"
2222
#include "RGBController_LogitechGPowerPlay.h"
2323
#include <vector>
2424
#include <hidapi/hidapi.h>
@@ -60,7 +60,7 @@
6060
#define LOGITECH_G903_LIGHTSPEED_PID 0xC086
6161
#define LOGITECH_G_PRO_PID 0xC085
6262
#define LOGITECH_G_PRO_HERO_PID 0xC08C
63-
#define LOGITECH_G_PRO_WIRED_PID 0xC088
63+
#define LOGITECH_G_PRO_WIRELESS_PID 0xC088
6464

6565
/*-----------------------------------------------------*\
6666
| Mousemat product IDs |
@@ -88,7 +88,7 @@
8888
#define LOGITECH_G703_LIGHTSPEED_VIRTUAL_PID 0x4070
8989
#define LOGITECH_G900_LIGHTSPEED_VIRTUAL_PID 0x4053
9090
#define LOGITECH_G903_LIGHTSPEED_VIRTUAL_PID 0x4067
91-
#define LOGITECH_GPRO_LIGHTSPEED_VIRTUAL_PID 0x4079
91+
#define LOGITECH_G_PRO_WIRELESS_VIRTUAL_PID 0x4079
9292

9393
/*-----------------------------------------------------*\
9494
| Logitech Keyboards |
@@ -441,6 +441,11 @@ void DetectLogitechMouseG403(hid_device_info* info, const std::string& name)
441441
addLogitechLightsyncMouse2zone(info, name, 0xFF, 0x0E, 0x3A);
442442
}
443443

444+
void DetectLogitechMouseGPRO(hid_device_info* info, const std::string& name)
445+
{
446+
addLogitechLightsyncMouse2zone(info, name, 0x01, 0x07, 0x3C);
447+
}
448+
444449
/*-----------------------------------------------------*\
445450
| Other Logitech Devices |
446451
\*-----------------------------------------------------*/
@@ -481,6 +486,8 @@ REGISTER_HID_DETECTOR_IP ("Logitech G203 Prodigy", Dete
481486
REGISTER_HID_DETECTOR_IPU("Logitech G203 Lightsync", DetectLogitechMouseG203L, LOGITECH_VID, LOGITECH_G203_LIGHTSYNC_PID, 1, 0xFF00, 2);
482487
REGISTER_HID_DETECTOR_IP ("Logitech G303 Daedalus Apex", DetectLogitechMouseG303, LOGITECH_VID, LOGITECH_G303_PID, 1, 0xFF00);
483488
REGISTER_HID_DETECTOR_IP ("Logitech G403 Hero", DetectLogitechMouseG403, LOGITECH_VID, LOGITECH_G403_HERO_PID, 1, 0xFF00);
489+
REGISTER_HID_DETECTOR_IP ("Logitech G Pro Gaming Mouse", DetectLogitechMouseGPRO, LOGITECH_VID, LOGITECH_G_PRO_PID, 1, 0xFF00);
490+
REGISTER_HID_DETECTOR_IP ("Logitech G Pro (HERO) Gaming Mouse", DetectLogitechMouseGPRO, LOGITECH_VID, LOGITECH_G_PRO_HERO_PID, 1, 0xFF00);
484491
/*-------------------------------------------------------------------------------------------------------------------------------------------------*\
485492
| Speakers |
486493
\*-------------------------------------------------------------------------------------------------------------------------------------------------*/
@@ -526,9 +533,9 @@ usages BundleLogitechUsages(hid_device_info* info)
526533

527534
void CreateLogitechLightspeedDevice(char *path, usages device_usages, uint8_t device_index, bool wireless, std::shared_ptr<std::mutex> mutex_ptr)
528535
{
529-
LogitechGProWirelessController* controller = new LogitechGProWirelessController(device_usages.find(2)->second, path);
536+
LogitechLightspeedController* controller = new LogitechLightspeedController(device_usages.find(2)->second, path);
530537
controller->lightspeed = new logitech_device(path, device_usages, device_index, wireless, mutex_ptr);
531-
RGBController_LogitechGProWireless* rgb_controller = new RGBController_LogitechGProWireless(controller);
538+
RGBController_LogitechLightspeed* rgb_controller = new RGBController_LogitechLightspeed(controller);
532539
ResourceManager::get()->RegisterRGBController(rgb_controller);
533540
}
534541

@@ -582,22 +589,20 @@ void DetectLogitechWired(hid_device_info* info, const std::string& /*name*/)
582589
/*-------------------------------------------------------------------------------------------------------------------------------------------------*\
583590
| Lightspeed Receivers (Windows Wireless) |
584591
\*-------------------------------------------------------------------------------------------------------------------------------------------------*/
585-
REGISTER_HID_DETECTOR_IP("Logitech Lightspeed Receiver", DetectLogitechLightspeedReceiver, LOGITECH_VID, LOGITECH_G_LIGHTSPEED_RECEIVER_PID, 2, 0xFF00);
586-
REGISTER_HID_DETECTOR_IP("Logitech G Powerplay Mousepad", DetectLogitechLightspeedReceiver, LOGITECH_VID, LOGITECH_G_LIGHTSPEED_POWERPLAY_PID, 2, 0xFF00);
592+
REGISTER_HID_DETECTOR_IP("Logitech Lightspeed Receiver", DetectLogitechLightspeedReceiver, LOGITECH_VID, LOGITECH_G_LIGHTSPEED_RECEIVER_PID, 2, 0xFF00);
593+
REGISTER_HID_DETECTOR_IP("Logitech G Powerplay Mousepad", DetectLogitechLightspeedReceiver, LOGITECH_VID, LOGITECH_G_LIGHTSPEED_POWERPLAY_PID, 2, 0xFF00);
587594

588595
/*-------------------------------------------------------------------------------------------------------------------------------------------------*\
589-
| Lightspeed Devices (Windows Wired) |
596+
| Lightspeed Wireless Devices (Windows Wired) |
590597
\*-------------------------------------------------------------------------------------------------------------------------------------------------*/
591-
REGISTER_HID_DETECTOR_IP("Logitech G403 Wired Gaming Mouse", DetectLogitechWired, LOGITECH_VID, LOGITECH_G403_LIGHTSPEED_PID, 1, 0xFF00);
592-
REGISTER_HID_DETECTOR_IP("Logitech G502 Wired Gaming Mouse", DetectLogitechWired, LOGITECH_VID, LOGITECH_G502_PROTEUS_SPECTRUM_PID, 1, 0xFF00);
593-
REGISTER_HID_DETECTOR_IP("Logitech G502 Hero Wired Gaming Mouse", DetectLogitechWired, LOGITECH_VID, LOGITECH_G502_HERO_PID, 1, 0xFF00);
594-
REGISTER_HID_DETECTOR_IP("Logitech G502 Wired Gaming Mouse", DetectLogitechWired, LOGITECH_VID, LOGITECH_G502_LIGHTSPEED_PID, 1, 0xFF00);
595-
REGISTER_HID_DETECTOR_IP("Logitech G703 Wired Gaming Mouse", DetectLogitechWired, LOGITECH_VID, LOGITECH_G703_LIGHTSPEED_PID, 1, 0xFF00);
596-
REGISTER_HID_DETECTOR_IP("Logitech G900 Wired Gaming Mouse", DetectLogitechWired, LOGITECH_VID, LOGITECH_G900_LIGHTSPEED_PID, 1, 0xFF00);
597-
REGISTER_HID_DETECTOR_IP("Logitech G903 Wired Gaming Mouse", DetectLogitechWired, LOGITECH_VID, LOGITECH_G903_LIGHTSPEED_PID, 1, 0xFF00);
598-
REGISTER_HID_DETECTOR_IP("Logitech G Pro Gaming Mouse", DetectLogitechWired, LOGITECH_VID, LOGITECH_G_PRO_PID, 1, 0xFF00);
599-
REGISTER_HID_DETECTOR_IP("Logitech G Pro (HERO) Gaming Mouse", DetectLogitechWired, LOGITECH_VID, LOGITECH_G_PRO_HERO_PID, 1, 0xFF00);
600-
REGISTER_HID_DETECTOR_IP("Logitech G Pro Wired Gaming Mouse", DetectLogitechWired, LOGITECH_VID, LOGITECH_G_PRO_WIRED_PID, 2, 0xFF00);
598+
REGISTER_HID_DETECTOR_IP("Logitech G403 Wireless Gaming Mouse (wired)", DetectLogitechWired, LOGITECH_VID, LOGITECH_G403_LIGHTSPEED_PID, 1, 0xFF00);
599+
REGISTER_HID_DETECTOR_IP("Logitech G502 Wireless Gaming Mouse (wired)", DetectLogitechWired, LOGITECH_VID, LOGITECH_G502_PROTEUS_SPECTRUM_PID, 1, 0xFF00);
600+
REGISTER_HID_DETECTOR_IP("Logitech G502 Hero Wireless Gaming Mouse (wired)", DetectLogitechWired, LOGITECH_VID, LOGITECH_G502_HERO_PID, 1, 0xFF00);
601+
REGISTER_HID_DETECTOR_IP("Logitech G502 Wireless Gaming Mouse (wired)", DetectLogitechWired, LOGITECH_VID, LOGITECH_G502_LIGHTSPEED_PID, 1, 0xFF00);
602+
REGISTER_HID_DETECTOR_IP("Logitech G703 Wireless Gaming Mouse (wired)", DetectLogitechWired, LOGITECH_VID, LOGITECH_G703_LIGHTSPEED_PID, 1, 0xFF00);
603+
REGISTER_HID_DETECTOR_IP("Logitech G900 Wireless Gaming Mouse (wired)", DetectLogitechWired, LOGITECH_VID, LOGITECH_G900_LIGHTSPEED_PID, 1, 0xFF00);
604+
REGISTER_HID_DETECTOR_IP("Logitech G903 Wireless Gaming Mouse (wired)", DetectLogitechWired, LOGITECH_VID, LOGITECH_G903_LIGHTSPEED_PID, 1, 0xFF00);
605+
REGISTER_HID_DETECTOR_IP("Logitech G Pro Wireless Gaming Mouse (wired)", DetectLogitechWired, LOGITECH_VID, LOGITECH_G_PRO_WIRELESS_PID, 2, 0xFF00);
601606

602607
#endif
603608

@@ -621,9 +626,9 @@ void CreateLogitechLightspeedDevice(hid_device_info* info, bool wireless)
621626

622627
if(device_usages.size() > 0)
623628
{
624-
LogitechGProWirelessController* controller = new LogitechGProWirelessController(device_usages.find(0)->second, info->path);
629+
LogitechLightspeedController* controller = new LogitechLightspeedController(device_usages.find(0)->second, info->path);
625630
controller->lightspeed = new logitech_device(info->path, device_usages, 0xFF, wireless);
626-
RGBController_LogitechGProWireless* rgb_controller = new RGBController_LogitechGProWireless(controller);
631+
RGBController_LogitechLightspeed* rgb_controller = new RGBController_LogitechLightspeed(controller);
627632
ResourceManager::get()->RegisterRGBController(rgb_controller);
628633
}
629634
}
@@ -641,25 +646,23 @@ void DetectLogitechWired(hid_device_info* info, const std::string& /*name*/)
641646
/*-------------------------------------------------------------------------------------------------------------------------------------------------*\
642647
| Lightspeed Devices (Linux Wireless) |
643648
\*-------------------------------------------------------------------------------------------------------------------------------------------------*/
644-
REGISTER_HID_DETECTOR_IPU("Logitech G403 Wireless Gaming Mouse", DetectLogitechWireless, LOGITECH_VID, LOGITECH_G403_LIGHTSPEED_VIRTUAL_PID, 2, 0xFF00, 2);
645-
REGISTER_HID_DETECTOR_IPU("Logitech G502 Wireless Gaming Mouse", DetectLogitechWireless, LOGITECH_VID, LOGITECH_G502_LIGHTSPEED_VIRTUAL_PID, 2, 0xFF00, 2);
646-
REGISTER_HID_DETECTOR_IPU("Logitech G703 Wireless Gaming Mouse", DetectLogitechWireless, LOGITECH_VID, LOGITECH_G703_LIGHTSPEED_VIRTUAL_PID, 2, 0xFF00, 2);
647-
REGISTER_HID_DETECTOR_IPU("Logitech G900 Wireless Gaming Mouse", DetectLogitechWireless, LOGITECH_VID, LOGITECH_G900_LIGHTSPEED_VIRTUAL_PID, 2, 0xFF00, 2);
648-
REGISTER_HID_DETECTOR_IPU("Logitech G903 Wireless Gaming Mouse", DetectLogitechWireless, LOGITECH_VID, LOGITECH_G903_LIGHTSPEED_VIRTUAL_PID, 2, 0xFF00, 2);
649-
REGISTER_HID_DETECTOR_IPU("Logitech G Pro Wireless Gaming Mouse", DetectLogitechWireless, LOGITECH_VID, LOGITECH_GPRO_LIGHTSPEED_VIRTUAL_PID, 2, 0xFF00, 2);
649+
REGISTER_HID_DETECTOR_IPU("Logitech G403 Wireless Gaming Mouse", DetectLogitechWireless, LOGITECH_VID, LOGITECH_G403_LIGHTSPEED_VIRTUAL_PID, 2, 0xFF00, 2);
650+
REGISTER_HID_DETECTOR_IPU("Logitech G502 Wireless Gaming Mouse", DetectLogitechWireless, LOGITECH_VID, LOGITECH_G502_LIGHTSPEED_VIRTUAL_PID, 2, 0xFF00, 2);
651+
REGISTER_HID_DETECTOR_IPU("Logitech G703 Wireless Gaming Mouse", DetectLogitechWireless, LOGITECH_VID, LOGITECH_G703_LIGHTSPEED_VIRTUAL_PID, 2, 0xFF00, 2);
652+
REGISTER_HID_DETECTOR_IPU("Logitech G900 Wireless Gaming Mouse", DetectLogitechWireless, LOGITECH_VID, LOGITECH_G900_LIGHTSPEED_VIRTUAL_PID, 2, 0xFF00, 2);
653+
REGISTER_HID_DETECTOR_IPU("Logitech G903 Wireless Gaming Mouse", DetectLogitechWireless, LOGITECH_VID, LOGITECH_G903_LIGHTSPEED_VIRTUAL_PID, 2, 0xFF00, 2);
654+
REGISTER_HID_DETECTOR_IPU("Logitech G Pro Wireless Gaming Mouse", DetectLogitechWireless, LOGITECH_VID, LOGITECH_G_PRO_WIRELESS_VIRTUAL_PID, 2, 0xFF00, 2);
650655

651656
/*-------------------------------------------------------------------------------------------------------------------------------------------------*\
652-
| Lightspeed Devices (Linux Wired) |
657+
| Lightspeed Wireless Devices (Linux Wired) |
653658
\*-------------------------------------------------------------------------------------------------------------------------------------------------*/
654-
REGISTER_HID_DETECTOR_IPU("Logitech G403 Wired Gaming Mouse", DetectLogitechWired, LOGITECH_VID, LOGITECH_G403_LIGHTSPEED_PID, 1, 0xFF00, 2);
655-
REGISTER_HID_DETECTOR_IPU("Logitech G502 Wired Gaming Mouse", DetectLogitechWired, LOGITECH_VID, LOGITECH_G502_PROTEUS_SPECTRUM_PID, 1, 0xFF00, 2);
656-
REGISTER_HID_DETECTOR_IPU("Logitech G502 Wired Gaming Mouse", DetectLogitechWired, LOGITECH_VID, LOGITECH_G502_LIGHTSPEED_PID, 1, 0xFF00, 2);
657-
REGISTER_HID_DETECTOR_IPU("Logitech G502 Hero Wired Gaming Mouse", DetectLogitechWired, LOGITECH_VID, LOGITECH_G502_HERO_PID, 1, 0xFF00, 2);
658-
REGISTER_HID_DETECTOR_IPU("Logitech G703 Wired Gaming Mouse", DetectLogitechWired, LOGITECH_VID, LOGITECH_G703_LIGHTSPEED_PID, 1, 0xFF00, 2);
659-
REGISTER_HID_DETECTOR_IPU("Logitech G900 Wired Gaming Mouse", DetectLogitechWired, LOGITECH_VID, LOGITECH_G900_LIGHTSPEED_PID, 1, 0xFF00, 2);
660-
REGISTER_HID_DETECTOR_IPU("Logitech G903 Wired Gaming Mouse", DetectLogitechWired, LOGITECH_VID, LOGITECH_G903_LIGHTSPEED_PID, 1, 0xFF00, 2);
661-
REGISTER_HID_DETECTOR_IPU("Logitech G Pro Gaming Mouse", DetectLogitechWired, LOGITECH_VID, LOGITECH_G_PRO_PID, 1, 0xFF00, 2);
662-
REGISTER_HID_DETECTOR_IPU("Logitech G Pro (HERO) Gaming Mouse", DetectLogitechWired, LOGITECH_VID, LOGITECH_G_PRO_HERO_PID, 1, 0xFF00, 2);
663-
REGISTER_HID_DETECTOR_IPU("Logitech G Pro Wired Gaming Mouse", DetectLogitechWired, LOGITECH_VID, LOGITECH_G_PRO_WIRED_PID, 2, 0xFF00, 2);
659+
REGISTER_HID_DETECTOR_IPU("Logitech G403 Wireless Gaming Mouse (wired)", DetectLogitechWired, LOGITECH_VID, LOGITECH_G403_LIGHTSPEED_PID, 1, 0xFF00, 2);
660+
REGISTER_HID_DETECTOR_IPU("Logitech G502 Wireless Gaming Mouse (wired)", DetectLogitechWired, LOGITECH_VID, LOGITECH_G502_PROTEUS_SPECTRUM_PID, 1, 0xFF00, 2);
661+
REGISTER_HID_DETECTOR_IPU("Logitech G502 Hero Wireless Gaming Mouse (wired)", DetectLogitechWired, LOGITECH_VID, LOGITECH_G502_LIGHTSPEED_PID, 1, 0xFF00, 2);
662+
REGISTER_HID_DETECTOR_IPU("Logitech G502 Wireless Gaming Mouse (wired)", DetectLogitechWired, LOGITECH_VID, LOGITECH_G502_HERO_PID, 1, 0xFF00, 2);
663+
REGISTER_HID_DETECTOR_IPU("Logitech G703 Wireless Gaming Mouse (wired)", DetectLogitechWired, LOGITECH_VID, LOGITECH_G703_LIGHTSPEED_PID, 1, 0xFF00, 2);
664+
REGISTER_HID_DETECTOR_IPU("Logitech G900 Wireless Gaming Mouse (wired)", DetectLogitechWired, LOGITECH_VID, LOGITECH_G900_LIGHTSPEED_PID, 1, 0xFF00, 2);
665+
REGISTER_HID_DETECTOR_IPU("Logitech G903 Wireless Gaming Mouse (wired)", DetectLogitechWired, LOGITECH_VID, LOGITECH_G903_LIGHTSPEED_PID, 1, 0xFF00, 2);
666+
REGISTER_HID_DETECTOR_IPU("Logitech G Pro Wireless Gaming Mouse (wired)", DetectLogitechWired, LOGITECH_VID, LOGITECH_G_PRO_WIRELESS_PID, 2, 0xFF00, 2);
664667

665668
#endif

‎Controllers/LogitechController/LogitechGProWirelessController.cpp renamed to ‎Controllers/LogitechController/LogitechLightspeedController.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
/*-----------------------------------------*\
2-
| LogitechGProWirelessController.cpp |
2+
| LogitechLightspeedController.cpp |
33
| |
4-
| Driver for Logitech G Pro Wireless Gaming|
5-
| Mouse lighting controller |
4+
| Driver for Logitech Lightspeed Wireless |
5+
| Gaming Mice lighting controller |
66
| |
77
| TheRogueZeta 8/5/2020 |
88
\*-----------------------------------------*/
99

10-
#include "LogitechGProWirelessController.h"
10+
#include "LogitechLightspeedController.h"
1111

1212
#include <cstring>
1313

14-
LogitechGProWirelessController::LogitechGProWirelessController(hid_device* dev_handle, const char* path)
14+
LogitechLightspeedController::LogitechLightspeedController(hid_device* dev_handle, const char* path)
1515
{
1616
dev = dev_handle;
1717
location = path;
1818
}
1919

20-
LogitechGProWirelessController::~LogitechGProWirelessController()
20+
LogitechLightspeedController::~LogitechLightspeedController()
2121
{
2222
delete lightspeed;
2323
}
2424

25-
std::string LogitechGProWirelessController::GetDeviceLocation()
25+
std::string LogitechLightspeedController::GetDeviceLocation()
2626
{
2727
return("HID: " + location + " (Receiver) \r\nWireless Index: " + std::to_string(lightspeed->device_index));
2828
}
2929

30-
std::string LogitechGProWirelessController::GetSerialString()
30+
std::string LogitechLightspeedController::GetSerialString()
3131
{
3232
wchar_t serial_string[128];
3333
hid_get_serial_number_string(dev, serial_string, 128);
@@ -38,7 +38,7 @@ std::string LogitechGProWirelessController::GetSerialString()
3838
return(return_string);
3939
}
4040

41-
void LogitechGProWirelessController::SendMouseMode
41+
void LogitechLightspeedController::SendMouseMode
4242
(
4343
unsigned char mode,
4444
std::uint16_t speed,

‎Controllers/LogitechController/LogitechGProWirelessController.h renamed to ‎Controllers/LogitechController/LogitechLightspeedController.h

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
/*-----------------------------------------*\
2-
| LogitechGProWirelessController.h |
2+
| LogitechLightspeedController.h |
33
| |
4-
| Definitions and types for Logitech G Pro |
5-
| Wireless Gaming Mouse lighting controller|
4+
| Definitions and types for Logitech G |
5+
| Lightsync Wireless Gaming Mice lighting |
6+
| controller |
67
| |
78
| TheRogueZeta 8/5/2020 |
89
\*-----------------------------------------*/
@@ -34,11 +35,11 @@ enum
3435
LOGITECH_G_PRO_WIRELESS_SPEED_FASTEST = 0x0A, /* Fastest speed */
3536
};
3637

37-
class LogitechGProWirelessController
38+
class LogitechLightspeedController
3839
{
3940
public:
40-
LogitechGProWirelessController(hid_device* dev_handle, const char* path);
41-
~LogitechGProWirelessController();
41+
LogitechLightspeedController(hid_device* dev_handle, const char* path);
42+
~LogitechLightspeedController();
4243

4344
logitech_device* lightspeed;
4445

0 commit comments

Comments
 (0)