From 5166316ca14e6aaf16833b363222c0f985ec3142 Mon Sep 17 00:00:00 2001 From: Milan Cermak Date: Wed, 17 Nov 2021 19:57:42 +0100 Subject: [PATCH] Add support for SteelSeries Rival 7x0 mice --- .../RGBController_SteelSeriesRival.cpp | 5 +- .../SteelSeriesControllerDetect.cpp | 17 +++++ .../SteelSeriesGeneric.h | 1 + .../SteelSeriesRivalController.cpp | 72 +++++++++++++++++++ .../SteelSeriesRivalController.h | 8 +++ 5 files changed, 101 insertions(+), 2 deletions(-) diff --git a/Controllers/SteelSeriesController/RGBController_SteelSeriesRival.cpp b/Controllers/SteelSeriesController/RGBController_SteelSeriesRival.cpp index 5642f4ba..e42b85a4 100644 --- a/Controllers/SteelSeriesController/RGBController_SteelSeriesRival.cpp +++ b/Controllers/SteelSeriesController/RGBController_SteelSeriesRival.cpp @@ -90,8 +90,9 @@ void RGBController_SteelSeriesRival::SetupZones() logo_led.value = 0; leds.push_back(logo_led); - /* Rival 300 extends this by adding Scroll Wheel LED + Zone */ - if(rival->GetMouseType() == RIVAL_300) + /* Rival 300 and 700 extend this by adding Scroll Wheel LED + Zone */ + if(rival->GetMouseType() == RIVAL_300 || + rival->GetMouseType() == RIVAL_700) { zone wheel_zone; wheel_zone.name = "Scroll Wheel"; diff --git a/Controllers/SteelSeriesController/SteelSeriesControllerDetect.cpp b/Controllers/SteelSeriesController/SteelSeriesControllerDetect.cpp index 2e8f5b89..f97321e2 100644 --- a/Controllers/SteelSeriesController/SteelSeriesControllerDetect.cpp +++ b/Controllers/SteelSeriesController/SteelSeriesControllerDetect.cpp @@ -46,6 +46,8 @@ #define STEELSERIES_RIVAL_600_DOTA_2_PID 0x172E #define STEELSERIES_RIVAL_650_PID 0x172B #define STEELSERIES_RIVAL_650_WIRELESS_PID 0x1726 +#define STEELSERIES_RIVAL_700_PID 0x1700 +#define STEELSERIES_RIVAL_710_PID 0x1730 #define STEELSERIES_RIVAL_3_OLD_PID 0x1824 #define STEELSERIES_RIVAL_3_PID 0x184C #define STEELSERIES_SENSEI_TEN_PID 0x1832 @@ -208,6 +210,19 @@ void DetectSteelSeriesRival650(hid_device_info* info, const std::string& name) } } +void DetectSteelSeriesRival700(hid_device_info* info, const std::string& name) +{ + hid_device* dev = hid_open_path(info->path); + if(dev) + { + SteelSeriesRivalController* controller = new SteelSeriesRivalController(dev, RIVAL_700, info->path); + RGBController_SteelSeriesRival* rgb_controller = new RGBController_SteelSeriesRival(controller); + rgb_controller->name = name; + ResourceManager::get()->RegisterRGBController(rgb_controller); + } +} + + void DetectSteelSeriesRival3(hid_device_info* info, const std::string& name) { hid_device* dev = hid_open_path(info->path); @@ -254,6 +269,8 @@ REGISTER_HID_DETECTOR_I("SteelSeries Rival 600", Dete REGISTER_HID_DETECTOR_I("SteelSeries Rival 600 Dota 2 Edition", DetectSteelSeriesRival600, STEELSERIES_VID, STEELSERIES_RIVAL_600_DOTA_2_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 Rival 700", DetectSteelSeriesRival700, STEELSERIES_VID, STEELSERIES_RIVAL_700_PID, 0 ); +REGISTER_HID_DETECTOR_I("SteelSeries Rival 710", DetectSteelSeriesRival700, STEELSERIES_VID, STEELSERIES_RIVAL_710_PID, 0 ); REGISTER_HID_DETECTOR_I("SteelSeries Rival 3 (Old Firmware)", DetectSteelSeriesRival3, STEELSERIES_VID, STEELSERIES_RIVAL_3_OLD_PID, 3); REGISTER_HID_DETECTOR_I("SteelSeries Rival 3", DetectSteelSeriesRival3, STEELSERIES_VID, STEELSERIES_RIVAL_3_PID, 3); REGISTER_HID_DETECTOR_I("SteelSeries Sensei TEN", DetectSteelSeriesSensei, STEELSERIES_VID, STEELSERIES_SENSEI_TEN_PID, 0 ); diff --git a/Controllers/SteelSeriesController/SteelSeriesGeneric.h b/Controllers/SteelSeriesController/SteelSeriesGeneric.h index 36829812..cd7dcb4d 100644 --- a/Controllers/SteelSeriesController/SteelSeriesGeneric.h +++ b/Controllers/SteelSeriesController/SteelSeriesGeneric.h @@ -29,5 +29,6 @@ typedef enum RIVAL_600 = 0x09, RIVAL_3 = 0x0a, APEX_TZONE = 0x0b, + RIVAL_700 = 0x0c, } steelseries_type; diff --git a/Controllers/SteelSeriesController/SteelSeriesRivalController.cpp b/Controllers/SteelSeriesController/SteelSeriesRivalController.cpp index e6cbede4..6c80decd 100644 --- a/Controllers/SteelSeriesController/SteelSeriesRivalController.cpp +++ b/Controllers/SteelSeriesController/SteelSeriesRivalController.cpp @@ -104,6 +104,9 @@ void SteelSeriesRivalController::SetLightEffect usb_buf[0x01] = zone_id + 1; break; + case RIVAL_700: + return; + default: break; } @@ -242,6 +245,71 @@ void SteelSeriesRivalController::SetRival600Color send_usb_msg(dev, usb_buf, 0x02); } +void SteelSeriesRivalController::SetRival700Color + ( + unsigned char zone_id, + unsigned char red, + unsigned char green, + unsigned char blue + ) +{ + char usb_buf[0xA5]; + + memset(usb_buf, 0x00, sizeof(usb_buf)); + + usb_buf[0x00] = 0x05; + usb_buf[0x02] = zone_id; + + usb_buf[0x03] = 0x1D; + usb_buf[0x04] = 0x01; + usb_buf[0x05] = 0x02; + usb_buf[0x06] = 0x31; + usb_buf[0x07] = 0x51; + usb_buf[0x08] = 0xFF; + usb_buf[0x09] = 0xC8; + + // 128 bytes of unused color fields + + // Static color value + unsigned short color_value; + color_value = ((unsigned short) red) << 4; + usb_buf[0x8D] = (unsigned char)(color_value & 0xFF); + usb_buf[0x8E] = (unsigned char)(color_value >> 8); + color_value = ((unsigned short) green) << 4; + usb_buf[0x8F] = (unsigned char)(color_value & 0xFF); + usb_buf[0x90] = (unsigned char)(color_value >> 8); + color_value = ((unsigned short) blue) << 4; + usb_buf[0x91] = (unsigned char)(color_value & 0xFF); + usb_buf[0x92] = (unsigned char)(color_value >> 8); + + usb_buf[0x93] = 0xFF; + usb_buf[0x95] = 0xDC; // magic value: 1500 + usb_buf[0x96] = 0x05; + usb_buf[0x97] = 0x8A; // magic value: 650 + usb_buf[0x98] = 0x02; + usb_buf[0x9D] = 0x01; + + // 0x9F and 0xA0 = number of colors in sequence - 1 = 0 + + usb_buf[0xA1] = 0xE8; // Default duration: 1000 ms + usb_buf[0xA2] = 0x03; + + const int pkt_len = 0xA3 + 1; + unsigned char* usb_pkt = new unsigned char[pkt_len]; + usb_pkt[0] = 0x00; + for(unsigned int i = 1; i < pkt_len; i++) + { + usb_pkt[i] = usb_buf[i-1]; + } + +// hid_write(dev, (unsigned char *)usb_pkt, pkt_len); + hid_send_feature_report(dev, (unsigned char *)usb_pkt, pkt_len); + + usb_buf[0x00] = 0x09; + usb_buf[0x01] = 0x00; + send_usb_msg(dev, usb_buf, 0x02); +} + void SteelSeriesRivalController::SetColor ( unsigned char zone_id, @@ -272,6 +340,10 @@ void SteelSeriesRivalController::SetColor SetRival600Color(zone_id, red, green, blue); return; + case RIVAL_700: + SetRival700Color(zone_id, red, green, blue); + return; + default: break; } diff --git a/Controllers/SteelSeriesController/SteelSeriesRivalController.h b/Controllers/SteelSeriesController/SteelSeriesRivalController.h index acafe1f4..80695c67 100644 --- a/Controllers/SteelSeriesController/SteelSeriesRivalController.h +++ b/Controllers/SteelSeriesController/SteelSeriesRivalController.h @@ -96,4 +96,12 @@ private: unsigned char green, unsigned char blue ); + + void SetRival700Color + ( + unsigned char zone_id, + unsigned char red, + unsigned char green, + unsigned char blue + ); };