From 2850bd1a192d9add2e1e35fdac60ff0c66c451c9 Mon Sep 17 00:00:00 2001 From: TheRogueZeta <6479694-TheRogueZeta@users.noreply.gitlab.com> Date: Tue, 24 Nov 2020 08:07:22 +0000 Subject: [PATCH] Logitech code cleanup --- 60-openrgb.rules | 29 +- .../LogitechControllerDetect.cpp | 284 ++++++++++-------- .../RGBController_LogitechG502PS.cpp | 76 ++--- .../RGBController_LogitechGPowerPlay.cpp | 44 +-- .../RGBController_LogitechGProWireless.cpp | 76 ++--- 5 files changed, 275 insertions(+), 234 deletions(-) diff --git a/60-openrgb.rules b/60-openrgb.rules index 235acb02..74ced115 100644 --- a/60-openrgb.rules +++ b/60-openrgb.rules @@ -148,6 +148,14 @@ SUBSYSTEMS=="usb", ATTR{idVendor}=="0951", ATTR{idProduct}=="1705", TAG+="uacces #---------------------------------------------------------------# # Logitech Peripheral Devices # # # +# Keyboards: # +# Logitech G213 # +# Logitech G512 # +# Logitech G512 RGB # +# Logitech G610 # +# Logitech G810 #1 # +# Logitech G810 #2 # +# # # Mice: # # Logitech G203 Prodigy # # Logitech G203 Lightsync # @@ -156,27 +164,28 @@ SUBSYSTEMS=="usb", ATTR{idVendor}=="0951", ATTR{idProduct}=="1705", TAG+="uacces # Logitech G502 Proteus Spectrum # # Logitech G Lightspeed Wireless Gaming Mouse # # Logitech G Pro Wireless Gaming Mouse (Wired) # +# # +# Mousemats: # # Logitech G Powerplay Mousepad with Lightspeed # # # -# Keyboards: # -# Logitech G512 # -# Logitech G512 RGB # -# Logitech G810 #1 # -# Logitech G810 #2 # #---------------------------------------------------------------# +SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c336", TAG+="uaccess" +SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c342", TAG+="uaccess" +SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c33c", TAG+="uaccess" +SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c333", TAG+="uaccess" +SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c331", TAG+="uaccess" +SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c337", TAG+="uaccess" + SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c084", TAG+="uaccess" SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c092", TAG+="uaccess" SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c083", TAG+="uaccess" SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c08f", TAG+="uaccess" SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c332", TAG+="uaccess" +SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c08b", TAG+="uaccess" SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c539", TAG+="uaccess" SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c088", TAG+="uaccess" -SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c53a", TAG+="uaccess" -SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c342", TAG+="uaccess" -SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c33c", TAG+="uaccess" -SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c337", TAG+="uaccess" -SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c331", TAG+="uaccess" +SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c53a", TAG+="uaccess" #---------------------------------------------------------------# # MSI Mysticlight # diff --git a/Controllers/LogitechController/LogitechControllerDetect.cpp b/Controllers/LogitechController/LogitechControllerDetect.cpp index 45605858..c5822829 100644 --- a/Controllers/LogitechController/LogitechControllerDetect.cpp +++ b/Controllers/LogitechController/LogitechControllerDetect.cpp @@ -26,12 +26,12 @@ /*-----------------------------------------------------*\ | Keyboard product IDs | \*-----------------------------------------------------*/ -#define LOGITECH_G810_1_PID 0xC337 -#define LOGITECH_G810_2_PID 0xC331 -#define LOGITECH_G610_PID 0xC333 +#define LOGITECH_G213_PID 0xC336 #define LOGITECH_G512_PID 0xC342 #define LOGITECH_G512_RGB_PID 0xC33C -#define LOGITECH_G213_PID 0xC336 +#define LOGITECH_G610_PID 0xC333 +#define LOGITECH_G810_1_PID 0xC331 +#define LOGITECH_G810_2_PID 0xC337 /*-----------------------------------------------------*\ | Mouse product IDs | \*-----------------------------------------------------*/ @@ -45,6 +45,9 @@ #define LOGITECH_GPRO_WIRED_PID 0xC085 #define LOGITECH_GPRO_HERO_WIRED_PID 0xC08C #define LOGITECH_GPRO_WIRELESS_PID 0xC088 +/*-----------------------------------------------------*\ +| Mousemat product IDs | +\*-----------------------------------------------------*/ #define LOGITECH_G_LIGHTSPEED_POWERPLAY_PID 0xC53A typedef struct @@ -63,12 +66,12 @@ static const logitech_device device_list[] = /*-------------------------------------------------------------------------------------------------------------------------------------------------*\ | Keyboards | \*-------------------------------------------------------------------------------------------------------------------------------------------------*/ - { LOGITECH_VID, LOGITECH_G810_1_PID, 1, DEVICE_TYPE_KEYBOARD, "Logitech G810 Orion Spectrum" }, - { LOGITECH_VID, LOGITECH_G810_2_PID, 1, DEVICE_TYPE_KEYBOARD, "Logitech G810 Orion Spectrum" }, - { LOGITECH_VID, LOGITECH_G610_PID, 1, DEVICE_TYPE_KEYBOARD, "Logitech G610 Orion" }, + { LOGITECH_VID, LOGITECH_G213_PID, 1, DEVICE_TYPE_KEYBOARD, "Logitech G213" }, { LOGITECH_VID, LOGITECH_G512_PID, 1, DEVICE_TYPE_KEYBOARD, "Logitech G512" }, { LOGITECH_VID, LOGITECH_G512_RGB_PID, 1, DEVICE_TYPE_KEYBOARD, "Logitech G512 RGB" }, - { LOGITECH_VID, LOGITECH_G213_PID, 1, DEVICE_TYPE_KEYBOARD, "Logitech G213" }, + { LOGITECH_VID, LOGITECH_G610_PID, 1, DEVICE_TYPE_KEYBOARD, "Logitech G610 Orion" }, + { LOGITECH_VID, LOGITECH_G810_1_PID, 1, DEVICE_TYPE_KEYBOARD, "Logitech G810 Orion Spectrum" }, + { LOGITECH_VID, LOGITECH_G810_2_PID, 1, DEVICE_TYPE_KEYBOARD, "Logitech G810 Orion Spectrum" }, /*-------------------------------------------------------------------------------------------------------------------------------------------------*\ | Mice | \*-------------------------------------------------------------------------------------------------------------------------------------------------*/ @@ -82,10 +85,10 @@ static const logitech_device device_list[] = { LOGITECH_VID, LOGITECH_GPRO_HERO_WIRED_PID, 1, DEVICE_TYPE_MOUSE, "Logitech G Pro (HERO) Gaming Mouse" }, { LOGITECH_VID, LOGITECH_G_LIGHTSPEED_WIRELESS_PID, 2, DEVICE_TYPE_MOUSE, "Logitech G Lightspeed Wireless Gaming Mouse" }, { LOGITECH_VID, LOGITECH_GPRO_WIRELESS_PID, 2, DEVICE_TYPE_MOUSE, "Logitech G Pro Wireless Gaming Mouse (Wired)" }, - { LOGITECH_VID, LOGITECH_G_LIGHTSPEED_POWERPLAY_PID, 2, DEVICE_TYPE_MOUSE, "Logitech G Powerplay Mousepad with Lightspeed" }, /*-------------------------------------------------------------------------------------------------------------------------------------------------*\ | Mousemats | \*-------------------------------------------------------------------------------------------------------------------------------------------------*/ + { LOGITECH_VID, LOGITECH_G_LIGHTSPEED_POWERPLAY_PID, 2, DEVICE_TYPE_MOUSEMAT, "Logitech G Powerplay Mousepad with Lightspeed" }, }; /******************************************************************************************\ @@ -131,80 +134,79 @@ void DetectLogitechControllers(std::vector& rgb_controllers) #ifdef USE_HID_USAGE switch(device_list[device_idx].usb_pid) { - case LOGITECH_G810_1_PID: - case LOGITECH_G810_2_PID: - case LOGITECH_G512_PID: - case LOGITECH_G512_RGB_PID: - { - hid_device_info* tmp_info_0x0604 = info; - - while(tmp_info_0x0604) + case LOGITECH_G213_PID: { - if((tmp_info_0x0604->vendor_id == device_list[device_idx].usb_vid) - &&(tmp_info_0x0604->product_id == device_list[device_idx].usb_pid) - &&(tmp_info_0x0604->interface_number == device_list[device_idx].usb_interface) - &&(tmp_info_0x0604->usage_page == 0xFF43) - &&(tmp_info_0x0604->usage == 0x0604)) - { - hid_device* dev_usage_0x0604 = hid_open_path(tmp_info_0x0604->path); + LogitechG213Controller* controller = new LogitechG213Controller(dev_usage_0x0602); - if(dev_usage_0x0604) - { - LogitechG810Controller* controller = new LogitechG810Controller(dev_usage_0x0602, dev_usage_0x0604); + RGBController_LogitechG213* rgb_controller = new RGBController_LogitechG213(controller); - RGBController_LogitechG810* rgb_controller = new RGBController_LogitechG810(controller); - - rgb_controller->name = device_list[device_idx].name; - rgb_controllers.push_back(rgb_controller); - } - } - tmp_info_0x0604 = tmp_info_0x0604->next; + rgb_controller->name = device_list[device_idx].name; + rgb_controllers.push_back(rgb_controller); } - } - break; + break; - case LOGITECH_G213_PID: - { - LogitechG213Controller* controller = new LogitechG213Controller(dev_usage_0x0602); + case LOGITECH_G512_PID: + case LOGITECH_G512_RGB_PID: + case LOGITECH_G610_PID: + case LOGITECH_G810_1_PID: + case LOGITECH_G810_2_PID: + { + hid_device_info* tmp_info_0x0604 = info; - RGBController_LogitechG213* rgb_controller = new RGBController_LogitechG213(controller); + while(tmp_info_0x0604) + { + if((tmp_info_0x0604->vendor_id == device_list[device_idx].usb_vid) + &&(tmp_info_0x0604->product_id == device_list[device_idx].usb_pid) + &&(tmp_info_0x0604->interface_number == device_list[device_idx].usb_interface) + &&(tmp_info_0x0604->usage_page == 0xFF43) + &&(tmp_info_0x0604->usage == 0x0604)) + { + hid_device* dev_usage_0x0604 = hid_open_path(tmp_info_0x0604->path); - rgb_controller->name = device_list[device_idx].name; - rgb_controllers.push_back(rgb_controller); - } - break; + if(dev_usage_0x0604) + { + LogitechG810Controller* controller = new LogitechG810Controller(dev_usage_0x0602, dev_usage_0x0604); + RGBController_LogitechG810* rgb_controller = new RGBController_LogitechG810(controller); + + rgb_controller->name = device_list[device_idx].name; + rgb_controllers.push_back(rgb_controller); + } + } + tmp_info_0x0604 = tmp_info_0x0604->next; + } + } + break; } #else switch(device_list[device_idx].usb_pid) { - case LOGITECH_G810_1_PID: - case LOGITECH_G810_2_PID: - case LOGITECH_G610_PID: - case LOGITECH_G512_PID: - case LOGITECH_G512_RGB_PID: - { - LogitechG810Controller* controller = new LogitechG810Controller(dev_usage_0x0602, dev_usage_0x0602); + case LOGITECH_G213_PID: + { + LogitechG213Controller* controller = new LogitechG213Controller(dev_usage_0x0602); - RGBController_LogitechG810* rgb_controller = new RGBController_LogitechG810(controller); + RGBController_LogitechG213* rgb_controller = new RGBController_LogitechG213(controller); - rgb_controller->name = device_list[device_idx].name; - rgb_controllers.push_back(rgb_controller); - } - break; + rgb_controller->name = device_list[device_idx].name; + rgb_controllers.push_back(rgb_controller); + } + break; - case LOGITECH_G213_PID: - { - LogitechG213Controller* controller = new LogitechG213Controller(dev_usage_0x0602); + case LOGITECH_G512_PID: + case LOGITECH_G512_RGB_PID: + case LOGITECH_G610_PID: + case LOGITECH_G810_1_PID: + case LOGITECH_G810_2_PID: + { + LogitechG810Controller* controller = new LogitechG810Controller(dev_usage_0x0602, dev_usage_0x0602); - RGBController_LogitechG213* rgb_controller = new RGBController_LogitechG213(controller); + RGBController_LogitechG810* rgb_controller = new RGBController_LogitechG810(controller); - rgb_controller->name = device_list[device_idx].name; - rgb_controllers.push_back(rgb_controller); - } - break; + rgb_controller->name = device_list[device_idx].name; + rgb_controllers.push_back(rgb_controller); + } + break; } - #endif } } @@ -239,84 +241,114 @@ void DetectLogitechControllers(std::vector& rgb_controllers) { switch(device_list[device_idx].usb_pid) { - case LOGITECH_G203_PID: - case LOGITECH_GPRO_WIRED_PID: - case LOGITECH_GPRO_HERO_WIRED_PID: - { - LogitechG203Controller* controller = new LogitechG203Controller(dev, info->path); + case LOGITECH_G203_PID: + case LOGITECH_GPRO_WIRED_PID: + case LOGITECH_GPRO_HERO_WIRED_PID: + { + LogitechG203Controller* controller = new LogitechG203Controller(dev, info->path); - RGBController_LogitechG203* rgb_controller = new RGBController_LogitechG203(controller); + RGBController_LogitechG203* rgb_controller = new RGBController_LogitechG203(controller); - rgb_controller->name = device_list[device_idx].name; - rgb_controllers.push_back(rgb_controller); - } - break; + rgb_controller->name = device_list[device_idx].name; + rgb_controllers.push_back(rgb_controller); + } + break; - case LOGITECH_G203L_PID: - { - LogitechG203LController* controller = new LogitechG203LController(dev, info->path); + case LOGITECH_G203L_PID: + { + LogitechG203LController* controller = new LogitechG203LController(dev, info->path); - RGBController_LogitechG203L* rgb_controller = new RGBController_LogitechG203L(controller); + RGBController_LogitechG203L* rgb_controller = new RGBController_LogitechG203L(controller); - rgb_controller->name = device_list[device_idx].name; - rgb_controllers.push_back(rgb_controller); - } - break; + rgb_controller->name = device_list[device_idx].name; + rgb_controllers.push_back(rgb_controller); + } + break; - case LOGITECH_G403_PID: - case LOGITECH_G403H_PID: - { - LogitechG403Controller* controller = new LogitechG403Controller(dev, info->path); + case LOGITECH_G403_PID: + case LOGITECH_G403H_PID: + { + LogitechG403Controller* controller = new LogitechG403Controller(dev, info->path); - RGBController_LogitechG403* rgb_controller = new RGBController_LogitechG403(controller); + RGBController_LogitechG403* rgb_controller = new RGBController_LogitechG403(controller); - rgb_controller->name = device_list[device_idx].name; - rgb_controllers.push_back(rgb_controller); - } - break; + rgb_controller->name = device_list[device_idx].name; + rgb_controllers.push_back(rgb_controller); + } + break; - case LOGITECH_G502_PS_PID: - case LOGITECH_G502H_PID: - { - LogitechG502PSController* controller = new LogitechG502PSController(dev, info->path); + case LOGITECH_G502_PS_PID: + case LOGITECH_G502H_PID: + { + LogitechG502PSController* controller = new LogitechG502PSController(dev, info->path); - RGBController_LogitechG502PS* rgb_controller = new RGBController_LogitechG502PS(controller); + RGBController_LogitechG502PS* rgb_controller = new RGBController_LogitechG502PS(controller); - rgb_controller->name = device_list[device_idx].name; - rgb_controllers.push_back(rgb_controller); - } - break; - - case LOGITECH_GPRO_WIRELESS_PID: - case LOGITECH_G_LIGHTSPEED_WIRELESS_PID: - { - LogitechGProWirelessController* controller = new LogitechGProWirelessController(dev, info->path); + rgb_controller->name = device_list[device_idx].name; + rgb_controllers.push_back(rgb_controller); + } + break; - RGBController_LogitechGProWireless* rgb_controller = new RGBController_LogitechGProWireless(controller); + case LOGITECH_GPRO_WIRELESS_PID: + case LOGITECH_G_LIGHTSPEED_WIRELESS_PID: + { + LogitechGProWirelessController* controller = new LogitechGProWirelessController(dev, info->path); - rgb_controller->name = device_list[device_idx].name; - rgb_controllers.push_back(rgb_controller); - } - break; - case LOGITECH_G_LIGHTSPEED_POWERPLAY_PID: - { - //Add mouse - LogitechGProWirelessController* mouse_controller = new LogitechGProWirelessController(dev, info->path); + RGBController_LogitechGProWireless* rgb_controller = new RGBController_LogitechGProWireless(controller); - RGBController_LogitechGProWireless* mouse_rgb_controller = new RGBController_LogitechGProWireless(mouse_controller); + rgb_controller->name = device_list[device_idx].name; + rgb_controllers.push_back(rgb_controller); + } + break; + } + } + } + info = info->next; + } + hid_free_enumeration(info); + } + break; + case DEVICE_TYPE_MOUSEMAT: + { + hid_device_info* info = hid_enumerate(device_list[device_idx].usb_vid, device_list[device_idx].usb_pid); - mouse_rgb_controller->name = device_list[device_idx].name; - rgb_controllers.push_back(mouse_rgb_controller); - - //Add Powerplay mousemat - LogitechGPowerPlayController* mousemat_controller = new LogitechGPowerPlayController(dev, info->path); + while(info) + { + if((info->vendor_id == device_list[device_idx].usb_vid) + &&(info->product_id == device_list[device_idx].usb_pid) +#ifdef USE_HID_USAGE + &&(info->interface_number == device_list[device_idx].usb_interface) + &&(info->usage_page == 0xFF00) + &&(info->usage == 2)) +#else + &&(info->interface_number == device_list[device_idx].usb_interface)) +#endif + { + hid_device* dev = hid_open_path(info->path); - RGBController_LogitechGPowerPlay* mousemat_rgb_controller = new RGBController_LogitechGPowerPlay(mousemat_controller); + if(dev) + { + switch(device_list[device_idx].usb_pid) + { + case LOGITECH_G_LIGHTSPEED_POWERPLAY_PID: + { + //Add mouse + LogitechGProWirelessController* mouse_controller = new LogitechGProWirelessController(dev, info->path); - mousemat_rgb_controller->name = device_list[device_idx].name; - rgb_controllers.push_back(mousemat_rgb_controller); - } - break; + RGBController_LogitechGProWireless* mouse_rgb_controller = new RGBController_LogitechGProWireless(mouse_controller); + + mouse_rgb_controller->name = device_list[device_idx].name; + rgb_controllers.push_back(mouse_rgb_controller); + + //Add Powerplay mousemat + LogitechGPowerPlayController* mousemat_controller = new LogitechGPowerPlayController(dev, info->path); + + RGBController_LogitechGPowerPlay* mousemat_rgb_controller = new RGBController_LogitechGPowerPlay(mousemat_controller); + + mousemat_rgb_controller->name = device_list[device_idx].name; + rgb_controllers.push_back(mousemat_rgb_controller); + } + break; } } } diff --git a/Controllers/LogitechController/RGBController_LogitechG502PS.cpp b/Controllers/LogitechController/RGBController_LogitechG502PS.cpp index 302ed7bc..561944db 100644 --- a/Controllers/LogitechController/RGBController_LogitechG502PS.cpp +++ b/Controllers/LogitechController/RGBController_LogitechG502PS.cpp @@ -13,43 +13,43 @@ RGBController_LogitechG502PS::RGBController_LogitechG502PS(LogitechG502PSControl { logitech = logitech_ptr; - name = "Logitech Mouse Device"; - type = DEVICE_TYPE_MOUSE; - description = "Logitech Mouse Device"; - location = logitech->GetDeviceLocation(); + name = "Logitech Mouse Device"; + type = DEVICE_TYPE_MOUSE; + description = "Logitech Mouse Device"; + location = logitech->GetDeviceLocation(); mode Static; - Static.name = "Static"; - Static.value = LOGITECH_G502_PS_MODE_STATIC; - Static.flags = MODE_FLAG_HAS_PER_LED_COLOR; - Static.color_mode = MODE_COLORS_PER_LED; + Static.name = "Static"; + Static.value = LOGITECH_G502_PS_MODE_STATIC; + Static.flags = MODE_FLAG_HAS_PER_LED_COLOR; + Static.color_mode = MODE_COLORS_PER_LED; modes.push_back(Static); mode Off; - Off.name = "Off"; - Off.value = LOGITECH_G502_PS_MODE_OFF; - Off.flags = 0; - Off.color_mode = MODE_COLORS_NONE; + Off.name = "Off"; + Off.value = LOGITECH_G502_PS_MODE_OFF; + Off.flags = 0; + Off.color_mode = MODE_COLORS_NONE; modes.push_back(Off); mode Cycle; - Cycle.name = "Cycle"; - Cycle.value = LOGITECH_G502_PS_MODE_CYCLE; - Cycle.flags = MODE_FLAG_HAS_SPEED; - Cycle.color_mode = MODE_COLORS_NONE; - Cycle.speed_min = LOGITECH_G502_PS_SPEED_SLOWEST; - Cycle.speed_max = LOGITECH_G502_PS_SPEED_FASTEST; - Cycle.speed = LOGITECH_G502_PS_SPEED_NORMAL; + Cycle.name = "Cycle"; + Cycle.value = LOGITECH_G502_PS_MODE_CYCLE; + Cycle.flags = MODE_FLAG_HAS_SPEED; + Cycle.color_mode = MODE_COLORS_NONE; + Cycle.speed_min = LOGITECH_G502_PS_SPEED_SLOWEST; + Cycle.speed_max = LOGITECH_G502_PS_SPEED_FASTEST; + Cycle.speed = LOGITECH_G502_PS_SPEED_NORMAL; modes.push_back(Cycle); mode Breathing; - Breathing.name = "Breathing"; - Breathing.value = LOGITECH_G502_PS_MODE_BREATHING; - Breathing.flags = MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_HAS_SPEED; - Breathing.color_mode = MODE_COLORS_PER_LED; - Breathing.speed_min = LOGITECH_G502_PS_SPEED_SLOWEST; - Breathing.speed_max = LOGITECH_G502_PS_SPEED_FASTEST; - Breathing.speed = LOGITECH_G502_PS_SPEED_NORMAL; + Breathing.name = "Breathing"; + Breathing.value = LOGITECH_G502_PS_MODE_BREATHING; + Breathing.flags = MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_HAS_SPEED; + Breathing.color_mode = MODE_COLORS_PER_LED; + Breathing.speed_min = LOGITECH_G502_PS_SPEED_SLOWEST; + Breathing.speed_max = LOGITECH_G502_PS_SPEED_FASTEST; + Breathing.speed = LOGITECH_G502_PS_SPEED_NORMAL; modes.push_back(Breathing); SetupZones(); @@ -58,12 +58,12 @@ RGBController_LogitechG502PS::RGBController_LogitechG502PS(LogitechG502PSControl void RGBController_LogitechG502PS::SetupZones() { zone G502_PS_side_zone; - G502_PS_side_zone.name = "DPI"; - G502_PS_side_zone.type = ZONE_TYPE_SINGLE; - G502_PS_side_zone.leds_min = 1; - G502_PS_side_zone.leds_max = 1; - G502_PS_side_zone.leds_count = 1; - G502_PS_side_zone.matrix_map = NULL; + G502_PS_side_zone.name = "DPI"; + G502_PS_side_zone.type = ZONE_TYPE_SINGLE; + G502_PS_side_zone.leds_min = 1; + G502_PS_side_zone.leds_max = 1; + G502_PS_side_zone.leds_count = 1; + G502_PS_side_zone.matrix_map = NULL; zones.push_back(G502_PS_side_zone); led G502_PS_side_led; @@ -71,12 +71,12 @@ void RGBController_LogitechG502PS::SetupZones() leds.push_back(G502_PS_side_led); zone G502_logo_zone; - G502_logo_zone.name = "Logo"; - G502_logo_zone.type = ZONE_TYPE_SINGLE; - G502_logo_zone.leds_min = 1; - G502_logo_zone.leds_max = 1; - G502_logo_zone.leds_count = 1; - G502_logo_zone.matrix_map = NULL; + G502_logo_zone.name = "Logo"; + G502_logo_zone.type = ZONE_TYPE_SINGLE; + G502_logo_zone.leds_min = 1; + G502_logo_zone.leds_max = 1; + G502_logo_zone.leds_count = 1; + G502_logo_zone.matrix_map = NULL; zones.push_back(G502_logo_zone); led G502_logo_led; diff --git a/Controllers/LogitechController/RGBController_LogitechGPowerPlay.cpp b/Controllers/LogitechController/RGBController_LogitechGPowerPlay.cpp index e4f23e94..8d8179b0 100644 --- a/Controllers/LogitechController/RGBController_LogitechGPowerPlay.cpp +++ b/Controllers/LogitechController/RGBController_LogitechGPowerPlay.cpp @@ -18,37 +18,37 @@ RGBController_LogitechGPowerPlay::RGBController_LogitechGPowerPlay(LogitechGPowe description = "Logitech G PowerPlay Wireless Charging System"; mode Off; - Off.name = "Off"; - Off.value = LOGITECH_G_POWERPLAY_MODE_OFF; - Off.flags = 0; - Off.color_mode = MODE_COLORS_PER_LED; + Off.name = "Off"; + Off.value = LOGITECH_G_POWERPLAY_MODE_OFF; + Off.flags = 0; + Off.color_mode = MODE_COLORS_PER_LED; modes.push_back(Off); mode Static; - Static.name = "Static"; - Static.value = LOGITECH_G_POWERPLAY_MODE_STATIC; - Static.flags = MODE_FLAG_HAS_PER_LED_COLOR; - Static.color_mode = MODE_COLORS_PER_LED; + Static.name = "Static"; + Static.value = LOGITECH_G_POWERPLAY_MODE_STATIC; + Static.flags = MODE_FLAG_HAS_PER_LED_COLOR; + Static.color_mode = MODE_COLORS_PER_LED; modes.push_back(Static); mode Cycle; - Cycle.name = "Cycle"; - Cycle.value = LOGITECH_G_POWERPLAY_MODE_CYCLE; - Cycle.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_BRIGHTNESS; - Cycle.color_mode = MODE_COLORS_PER_LED; - Cycle.speed_min = LOGITECH_G_POWERPLAY_SPEED_SLOWEST; - Cycle.speed_max = LOGITECH_G_POWERPLAY_SPEED_FASTEST; - Cycle.speed = LOGITECH_G_POWERPLAY_SPEED_NORMAL; + Cycle.name = "Cycle"; + Cycle.value = LOGITECH_G_POWERPLAY_MODE_CYCLE; + Cycle.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_BRIGHTNESS; + Cycle.color_mode = MODE_COLORS_PER_LED; + Cycle.speed_min = LOGITECH_G_POWERPLAY_SPEED_SLOWEST; + Cycle.speed_max = LOGITECH_G_POWERPLAY_SPEED_FASTEST; + Cycle.speed = LOGITECH_G_POWERPLAY_SPEED_NORMAL; modes.push_back(Cycle); mode Breathing; - Breathing.name = "Breathing"; - Breathing.value = LOGITECH_G_POWERPLAY_MODE_BREATHING; - Breathing.flags = MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_BRIGHTNESS; - Breathing.color_mode = MODE_COLORS_PER_LED; - Breathing.speed_min = LOGITECH_G_POWERPLAY_SPEED_SLOWEST; - Breathing.speed_max = LOGITECH_G_POWERPLAY_SPEED_FASTEST; - Breathing.speed = LOGITECH_G_POWERPLAY_SPEED_NORMAL; + Breathing.name = "Breathing"; + Breathing.value = LOGITECH_G_POWERPLAY_MODE_BREATHING; + Breathing.flags = MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_BRIGHTNESS; + Breathing.color_mode = MODE_COLORS_PER_LED; + Breathing.speed_min = LOGITECH_G_POWERPLAY_SPEED_SLOWEST; + Breathing.speed_max = LOGITECH_G_POWERPLAY_SPEED_FASTEST; + Breathing.speed = LOGITECH_G_POWERPLAY_SPEED_NORMAL; modes.push_back(Breathing); SetupZones(); diff --git a/Controllers/LogitechController/RGBController_LogitechGProWireless.cpp b/Controllers/LogitechController/RGBController_LogitechGProWireless.cpp index bae7cf7f..ce053cbf 100644 --- a/Controllers/LogitechController/RGBController_LogitechGProWireless.cpp +++ b/Controllers/LogitechController/RGBController_LogitechGProWireless.cpp @@ -13,43 +13,43 @@ RGBController_LogitechGProWireless::RGBController_LogitechGProWireless(LogitechG { logitech = logitech_ptr; - name = "Logitech G Pro Wireless Gaming Mouse"; - type = DEVICE_TYPE_MOUSE; - description = "Logitech G Pro Wireless Gaming Mouse"; - location = logitech->GetDeviceLocation(); + name = "Logitech G Pro Wireless Gaming Mouse"; + type = DEVICE_TYPE_MOUSE; + description = "Logitech G Pro Wireless Gaming Mouse"; + location = logitech->GetDeviceLocation(); mode Off; - Off.name = "Off"; - Off.value = LOGITECH_G_PRO_WIRELESS_MODE_OFF; - Off.flags = 0; - Off.color_mode = MODE_COLORS_NONE; + Off.name = "Off"; + Off.value = LOGITECH_G_PRO_WIRELESS_MODE_OFF; + Off.flags = 0; + Off.color_mode = MODE_COLORS_NONE; modes.push_back(Off); mode Static; - Static.name = "Static"; - Static.value = LOGITECH_G_PRO_WIRELESS_MODE_STATIC; - Static.flags = MODE_FLAG_HAS_PER_LED_COLOR; - Static.color_mode = MODE_COLORS_PER_LED; + Static.name = "Static"; + Static.value = LOGITECH_G_PRO_WIRELESS_MODE_STATIC; + Static.flags = MODE_FLAG_HAS_PER_LED_COLOR; + Static.color_mode = MODE_COLORS_PER_LED; modes.push_back(Static); mode Cycle; - Cycle.name = "Cycle"; - Cycle.value = LOGITECH_G_PRO_WIRELESS_MODE_CYCLE; - Cycle.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_BRIGHTNESS; - Cycle.color_mode = MODE_COLORS_NONE; - Cycle.speed_min = LOGITECH_G_PRO_WIRELESS_SPEED_SLOWEST; - Cycle.speed_max = LOGITECH_G_PRO_WIRELESS_SPEED_FASTEST; - Cycle.speed = LOGITECH_G_PRO_WIRELESS_SPEED_NORMAL; + Cycle.name = "Cycle"; + Cycle.value = LOGITECH_G_PRO_WIRELESS_MODE_CYCLE; + Cycle.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_BRIGHTNESS; + Cycle.color_mode = MODE_COLORS_NONE; + Cycle.speed_min = LOGITECH_G_PRO_WIRELESS_SPEED_SLOWEST; + Cycle.speed_max = LOGITECH_G_PRO_WIRELESS_SPEED_FASTEST; + Cycle.speed = LOGITECH_G_PRO_WIRELESS_SPEED_NORMAL; modes.push_back(Cycle); mode Breathing; - Breathing.name = "Breathing"; - Breathing.value = LOGITECH_G_PRO_WIRELESS_MODE_BREATHING; - Breathing.flags = MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_BRIGHTNESS; - Breathing.color_mode = MODE_COLORS_PER_LED; - Breathing.speed_min = LOGITECH_G_PRO_WIRELESS_SPEED_SLOWEST; - Breathing.speed_max = LOGITECH_G_PRO_WIRELESS_SPEED_FASTEST; - Breathing.speed = LOGITECH_G_PRO_WIRELESS_SPEED_NORMAL; + Breathing.name = "Breathing"; + Breathing.value = LOGITECH_G_PRO_WIRELESS_MODE_BREATHING; + Breathing.flags = MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_BRIGHTNESS; + Breathing.color_mode = MODE_COLORS_PER_LED; + Breathing.speed_min = LOGITECH_G_PRO_WIRELESS_SPEED_SLOWEST; + Breathing.speed_max = LOGITECH_G_PRO_WIRELESS_SPEED_FASTEST; + Breathing.speed = LOGITECH_G_PRO_WIRELESS_SPEED_NORMAL; modes.push_back(Breathing); SetupZones(); @@ -58,12 +58,12 @@ RGBController_LogitechGProWireless::RGBController_LogitechGProWireless(LogitechG void RGBController_LogitechGProWireless::SetupZones() { zone GProWireless_primary_zone; - GProWireless_primary_zone.name = "DPI"; - GProWireless_primary_zone.type = ZONE_TYPE_SINGLE; - GProWireless_primary_zone.leds_min = 1; - GProWireless_primary_zone.leds_max = 1; - GProWireless_primary_zone.leds_count = 1; - GProWireless_primary_zone.matrix_map = NULL; + GProWireless_primary_zone.name = "DPI"; + GProWireless_primary_zone.type = ZONE_TYPE_SINGLE; + GProWireless_primary_zone.leds_min = 1; + GProWireless_primary_zone.leds_max = 1; + GProWireless_primary_zone.leds_count = 1; + GProWireless_primary_zone.matrix_map = NULL; zones.push_back(GProWireless_primary_zone); led GProWireless_primary_led; @@ -71,12 +71,12 @@ void RGBController_LogitechGProWireless::SetupZones() leds.push_back(GProWireless_primary_led); zone GProWireless_logo_zone; - GProWireless_logo_zone.name = "Logo"; - 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; + GProWireless_logo_zone.name = "Logo"; + 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); led GProWireless_logo_led;