From ce7478737cecc6b7cedd58d1270e3a174c64c397 Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 10 Jun 2021 19:29:01 +0200 Subject: [PATCH] Add Steelseries Rival 650 wireless support * Also reworks the LED update functions to handle zones with more than one LED * Some other minor code style cleanup in the Rival code Commits squashed and amended for code style by Adam Honse --- 60-openrgb.rules | 5 +- .../RGBController_SteelSeriesRival.cpp | 109 +++++++++++++----- .../SteelSeriesControllerDetect.cpp | 15 +++ .../SteelSeriesGeneric.h | 1 + .../SteelSeriesRivalController.cpp | 75 +++++++++++- .../SteelSeriesRivalController.h | 20 +++- 6 files changed, 185 insertions(+), 40 deletions(-) diff --git a/60-openrgb.rules b/60-openrgb.rules index cc1a77c35..4b377dad3 100644 --- a/60-openrgb.rules +++ b/60-openrgb.rules @@ -672,7 +672,8 @@ SUBSYSTEMS=="usb", ATTR{idVendor}=="054c", ATTR{idProduct}=="0ba0", TAG+="uacces # SteelSeries Rival 300 Blackops Edition # # SteelSeries Rival 310 # # SteelSeries Rival 310 CS:GO Howl Edition # -# SteelSeries Rival 310 PubG Edition # +# SteelSeries Rival 310 PubG Edition # +# SteelSeries Rival 650 Wireless # # SteelSeries Rival Sensei Ten # # SteelSeries Rival Sensei Ten CS:GO Neon Rider # # SteelSeries Rival Sensei 310 # @@ -707,6 +708,8 @@ SUBSYSTEMS=="usb", ATTR{idVendor}=="1038", ATTR{idProduct}=="1736", TAG+="uacces SUBSYSTEMS=="usb", ATTR{idVendor}=="1038", ATTR{idProduct}=="1832", TAG+="uaccess" SUBSYSTEMS=="usb", ATTR{idVendor}=="1038", ATTR{idProduct}=="1834", TAG+="uaccess" SUBSYSTEMS=="usb", ATTR{idVendor}=="1038", ATTR{idProduct}=="1722", TAG+="uaccess" +SUBSYSTEMS=="usb", ATTR{idVendor}=="1038", ATTR{idProduct}=="1726", TAG+="uaccess" +SUBSYSTEMS=="usb", ATTR{idVendor}=="1038", ATTR{idProduct}=="172B", TAG+="uaccess" SUBSYSTEMS=="usb", ATTR{idVendor}=="1038", ATTR{idProduct}=="1229", TAG+="uaccess" diff --git a/Controllers/SteelSeriesController/RGBController_SteelSeriesRival.cpp b/Controllers/SteelSeriesController/RGBController_SteelSeriesRival.cpp index 93da15d6d..df9228532 100644 --- a/Controllers/SteelSeriesController/RGBController_SteelSeriesRival.cpp +++ b/Controllers/SteelSeriesController/RGBController_SteelSeriesRival.cpp @@ -9,9 +9,25 @@ #include "RGBController_SteelSeriesRival.h" +typedef struct +{ + const char* name; + const int value; +} steelseries_rival_led_info; + +static const steelseries_rival_led_info rival_650_leds[]= +{ + {"Left 1", 0x12}, + {"Left 2", 0x14}, + {"Left 3", 0x16}, + {"Right 1", 0x13}, + {"Right 2", 0x15}, + {"Right 3", 0x17}, +}; + RGBController_SteelSeriesRival::RGBController_SteelSeriesRival(SteelSeriesRivalController* rival_ptr) { - rival = rival_ptr; + rival = rival_ptr; name = rival->GetDeviceName(); vendor = "SteelSeries"; @@ -58,11 +74,13 @@ void RGBController_SteelSeriesRival::SetupZones() zones.push_back(logo_zone); led logo_led; - logo_led.name = "Logo"; + logo_led.name = "Logo"; + logo_led.value = 0; leds.push_back(logo_led); - /* Rival 300 extends this by adding another LED + Zone */ - if (rival->GetMouseType() == RIVAL_300) { + /* Rival 300 extends this by adding Scroll Wheel LED + Zone */ + if(rival->GetMouseType() == RIVAL_300) + { zone wheel_zone; wheel_zone.name = "Scroll Wheel"; wheel_zone.type = ZONE_TYPE_SINGLE; @@ -73,9 +91,47 @@ void RGBController_SteelSeriesRival::SetupZones() zones.push_back(wheel_zone); led wheel_led; - wheel_led.name = "Scroll Wheel"; + wheel_led.name = "Scroll Wheel"; + wheel_led.value = 1; leds.push_back(wheel_led); } + /* Rival 650 extends this by Scroll Wheel LED + Zone and additional lights LEDs + Zone */ + else if(rival->GetMouseType() == RIVAL_650) + { + leds[0].value = 0x11; + + zone wheel_zone; + wheel_zone.name = "Scroll Wheel"; + wheel_zone.type = ZONE_TYPE_SINGLE; + wheel_zone.leds_min = 1; + wheel_zone.leds_max = 1; + wheel_zone.leds_count = 1; + wheel_zone.matrix_map = NULL; + zones.push_back(wheel_zone); + + led wheel_led; + wheel_led.name = "Scroll Wheel"; + wheel_led.value = 0x10; + leds.push_back(wheel_led); + + zone mouse_zone; + mouse_zone.name = "Mouse"; + mouse_zone.type = ZONE_TYPE_LINEAR; + mouse_zone.leds_min = 6; + mouse_zone.leds_max = 6; + mouse_zone.leds_count = 6; + mouse_zone.matrix_map = NULL; + zones.push_back(mouse_zone); + + for(const steelseries_rival_led_info led_info: rival_650_leds) + { + led mouse_led; + mouse_led.name = led_info.name; + mouse_led.value = led_info.value; + leds.push_back(mouse_led); + } + + } SetupColors(); } @@ -88,43 +144,32 @@ void RGBController_SteelSeriesRival::ResizeZone(int /*zone*/, int /*new_size*/) void RGBController_SteelSeriesRival::DeviceUpdateLEDs() { - unsigned char red = RGBGetRValue(colors[0]); - unsigned char grn = RGBGetGValue(colors[0]); - unsigned char blu = RGBGetBValue(colors[0]); - rival->SetColorAll(red, grn, blu); + for(unsigned int i = 0; i < leds.size(); i++) + { + unsigned char red = RGBGetRValue(colors[i]); + unsigned char grn = RGBGetGValue(colors[i]); + unsigned char blu = RGBGetBValue(colors[i]); + rival->SetColor(leds[i].value, red, grn, blu); + } } void RGBController_SteelSeriesRival::UpdateZoneLEDs(int zone) { - RGBColor color = colors[zone]; - unsigned char red = RGBGetRValue(color); - unsigned char grn = RGBGetGValue(color); - unsigned char blu = RGBGetBValue(color); - - if(zone == 0) + for(unsigned int i = 0; i < zones[zone].leds_count; i++) { - rival->SetColorAll(red, grn, blu); - } - else - { - /* We can add custom cases depending on different devices here. */ - switch(rival->GetMouseType()) - { - case RIVAL_300: - rival->SetColor(zone, red, grn, blu); - break; - - default: - break; - } + unsigned char red = RGBGetRValue(zones[zone].colors[i]); + unsigned char grn = RGBGetGValue(zones[zone].colors[i]); + unsigned char blu = RGBGetBValue(zones[zone].colors[i]); + rival->SetColor(zones[zone].leds[i].value, red, grn, blu); } } void RGBController_SteelSeriesRival::UpdateSingleLED(int led) { - /* Each zone only has a single LED, so we can use the LED ID to reference - * the existing zone code. */ - UpdateZoneLEDs(led); + unsigned char red = RGBGetRValue(colors[led]); + unsigned char grn = RGBGetGValue(colors[led]); + unsigned char blu = RGBGetBValue(colors[led]); + rival->SetColor(leds[led].value, red, grn, blu); } void RGBController_SteelSeriesRival::SetCustomMode() diff --git a/Controllers/SteelSeriesController/SteelSeriesControllerDetect.cpp b/Controllers/SteelSeriesController/SteelSeriesControllerDetect.cpp index 81947b473..e89de80a4 100644 --- a/Controllers/SteelSeriesController/SteelSeriesControllerDetect.cpp +++ b/Controllers/SteelSeriesController/SteelSeriesControllerDetect.cpp @@ -38,6 +38,8 @@ #define STEELSERIES_RIVAL_310_PID 0x1720 #define STEELSERIES_RIVAL_310_CSGO_HOWL_PID 0x171e #define STEELSERIES_RIVAL_310_PUBG_PID 0x1736 +#define STEELSERIES_RIVAL_650_PID 0x172B +#define STEELSERIES_RIVAL_650_WIRELESS_PID 0x1726 #define STEELSERIES_SENSEI_TEN_PID 0x1832 #define STEELSERIES_SENSEI_TEN_CSGO_NEON_RIDER_PID 0x1834 #define STEELSERIES_SENSEI_310_PID 0x1722 @@ -156,6 +158,17 @@ void DetectSteelSeriesRival300(hid_device_info* info, const std::string& name) ResourceManager::get()->RegisterRGBController(rgb_controller); } } +void DetectSteelSeriesRival650(hid_device_info* info, const std::string& name) +{ + hid_device* dev = hid_open_path(info->path); + if(dev) + { + SteelSeriesRivalController* controller = new SteelSeriesRivalController(dev, RIVAL_650, info->path); + RGBController_SteelSeriesRival* rgb_controller = new RGBController_SteelSeriesRival(controller); + rgb_controller->name = name; + ResourceManager::get()->RegisterRGBController(rgb_controller); + } +} void DetectSteelSeriesSensei(hid_device_info* info, const std::string& name) { @@ -187,6 +200,8 @@ REGISTER_HID_DETECTOR_I("SteelSeries Rival 300 Black Ops Edition", Dete REGISTER_HID_DETECTOR_I("SteelSeries Rival 310", DetectSteelSeriesSensei, STEELSERIES_VID, STEELSERIES_RIVAL_310_PID, 0 ); REGISTER_HID_DETECTOR_I("SteelSeries Rival 310 CS:GO Howl Edition", DetectSteelSeriesSensei, STEELSERIES_VID, STEELSERIES_RIVAL_310_CSGO_HOWL_PID, 0 ); REGISTER_HID_DETECTOR_I("SteelSeries Rival 310 PUBG Edition", DetectSteelSeriesSensei, STEELSERIES_VID, STEELSERIES_RIVAL_310_PUBG_PID, 0 ); +REGISTER_HID_DETECTOR_I("SteelSeries Rival 650", DetectSteelSeriesRival650, STEELSERIES_VID, STEELSERIES_RIVAL_650_PID, 0 ); +REGISTER_HID_DETECTOR_I("SteelSeries Rival 650 Wireless", DetectSteelSeriesRival650, STEELSERIES_VID, STEELSERIES_RIVAL_650_WIRELESS_PID, 0 ); REGISTER_HID_DETECTOR_I("SteelSeries Sensei TEN", DetectSteelSeriesSensei, STEELSERIES_VID, STEELSERIES_SENSEI_TEN_PID, 0 ); REGISTER_HID_DETECTOR_I("SteelSeries Sensei TEN CS:GO Neon Rider Edition", DetectSteelSeriesSensei, STEELSERIES_VID, STEELSERIES_SENSEI_TEN_CSGO_NEON_RIDER_PID,0 ); REGISTER_HID_DETECTOR_I("SteelSeries Sensei 310", DetectSteelSeriesSensei, STEELSERIES_VID, STEELSERIES_SENSEI_310_PID, 0 ); diff --git a/Controllers/SteelSeriesController/SteelSeriesGeneric.h b/Controllers/SteelSeriesController/SteelSeriesGeneric.h index 662519875..53aa03857 100644 --- a/Controllers/SteelSeriesController/SteelSeriesGeneric.h +++ b/Controllers/SteelSeriesController/SteelSeriesGeneric.h @@ -19,6 +19,7 @@ typedef enum { RIVAL_100 = 0x00, RIVAL_300 = 0x01, + RIVAL_650 = 0x02, SIBERIA_350 = 0x03, APEX = 0x04, APEX_TKL = 0x05, diff --git a/Controllers/SteelSeriesController/SteelSeriesRivalController.cpp b/Controllers/SteelSeriesController/SteelSeriesRivalController.cpp index 4e4881ae2..f9c333e7a 100644 --- a/Controllers/SteelSeriesController/SteelSeriesRivalController.cpp +++ b/Controllers/SteelSeriesController/SteelSeriesRivalController.cpp @@ -128,12 +128,74 @@ void SteelSeriesRivalController::SetLightEffectAll SetLightEffect(0, effect); SetLightEffect(1, effect); break; - + + case RIVAL_650: + for(int i=0x10; i<0x18; i++) + { + SetLightEffect(i, effect); + } + break; + default: break; } } +void SteelSeriesRivalController::SetRival650Color + ( + unsigned char zone_id, + unsigned char red, + unsigned char green, + unsigned char blue + ) +{ + char usb_buf[60]; + + memset(usb_buf, 0x00, sizeof(usb_buf)); + + usb_buf[0x00] = 0x03; + usb_buf[0x04] = 0x30; + usb_buf[0x06] = 0x10; + usb_buf[0x07] = 0x27; + usb_buf[0x16] = 0x01; + usb_buf[0x1E] = 0x04; + usb_buf[0x1F] = red; + usb_buf[0x20] = green; + usb_buf[0x21] = blue; + usb_buf[0x22] = 0xff; + usb_buf[0x27] = 0xff; + usb_buf[0x29] = 0x54; + usb_buf[0x2c] = 0xff; + usb_buf[0x2d] = 0x54; + usb_buf[0x2e] = red; + usb_buf[0x2f] = green; + usb_buf[0x30] = blue; + usb_buf[0x31] = 0x56; + + send_usb_msg(dev, usb_buf, 60); + + memset(usb_buf, 0x00, sizeof(usb_buf)); + usb_buf[0x00] = 0x03; + usb_buf[0x02] = 0x30; + usb_buf[0x04] = 0x2c; + + send_usb_msg(dev, usb_buf, 60); + + memset(usb_buf, 0x00, sizeof(usb_buf)); + usb_buf[0x00] = 0x05; + usb_buf[0x02] = zone_id;//mousekey 0x10-0x17 + usb_buf[0x03] = 0xff; + usb_buf[0x08] = 0x5c; + + send_usb_msg(dev, usb_buf, 60); + + memset(usb_buf, 0x00, sizeof(usb_buf)); + usb_buf[0x00] = 0x1c; + usb_buf[0x02] = 0x55; + usb_buf[0x04] = 0x46; + + send_usb_msg(dev, usb_buf, 60); +} void SteelSeriesRivalController::SetColor ( @@ -157,6 +219,10 @@ void SteelSeriesRivalController::SetColor usb_buf[0x01] = zone_id + 1; break; + case RIVAL_650: + SetRival650Color(zone_id, red, green, blue); + return; + default: break; } @@ -186,6 +252,13 @@ void SteelSeriesRivalController::SetColorAll SetColor(1, red, green, blue); break; + case RIVAL_650: + for(int i = 0x10; i < 0x18; i++) + { + SetColor(i, red, green, blue); + } + break; + default: break; } diff --git a/Controllers/SteelSeriesController/SteelSeriesRivalController.h b/Controllers/SteelSeriesController/SteelSeriesRivalController.h index 699c2f2b3..bbbf7e538 100644 --- a/Controllers/SteelSeriesController/SteelSeriesRivalController.h +++ b/Controllers/SteelSeriesController/SteelSeriesRivalController.h @@ -17,17 +17,17 @@ /* Mode, we then use these to set actual effect based on speed. */ enum { - STEELSERIES_RIVAL_DIRECT = 0x00, - STEELSERIES_RIVAL_PULSATE = 0x01 + STEELSERIES_RIVAL_DIRECT = 0x00, + STEELSERIES_RIVAL_PULSATE = 0x01 }; /* Effects */ enum { - STEELSERIES_RIVAL_EFFECT_DIRECT = 0x01, - STEELSERIES_RIVAL_EFFECT_PULSATE_MIN = 0x02, - STEELSERIES_RIVAL_EFFECT_PULSATE_MID = 0x03, - STEELSERIES_RIVAL_EFFECT_PULSATE_MAX = 0x04 + STEELSERIES_RIVAL_EFFECT_DIRECT = 0x01, + STEELSERIES_RIVAL_EFFECT_PULSATE_MIN = 0x02, + STEELSERIES_RIVAL_EFFECT_PULSATE_MID = 0x03, + STEELSERIES_RIVAL_EFFECT_PULSATE_MAX = 0x04 }; class SteelSeriesRivalController @@ -80,4 +80,12 @@ private: hid_device* dev; std::string location; steelseries_type proto; + + void SetRival650Color + ( + unsigned char zone_id, + unsigned char red, + unsigned char green, + unsigned char blue + ); };