Skip to content

Commit ce74787

Browse files
xQwexxCalcProgrammer1
xQwexx
authored and
CalcProgrammer1
committed
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 <[email protected]>
1 parent 8736f1b commit ce74787

File tree

6 files changed

+185
-40
lines changed

6 files changed

+185
-40
lines changed

‎60-openrgb.rules

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,8 @@ SUBSYSTEMS=="usb", ATTR{idVendor}=="054c", ATTR{idProduct}=="0ba0", TAG+="uacces
672672
# SteelSeries Rival 300 Blackops Edition #
673673
# SteelSeries Rival 310 #
674674
# SteelSeries Rival 310 CS:GO Howl Edition #
675-
# SteelSeries Rival 310 PubG Edition #
675+
# SteelSeries Rival 310 PubG Edition #
676+
# SteelSeries Rival 650 Wireless #
676677
# SteelSeries Rival Sensei Ten #
677678
# SteelSeries Rival Sensei Ten CS:GO Neon Rider #
678679
# SteelSeries Rival Sensei 310 #
@@ -707,6 +708,8 @@ SUBSYSTEMS=="usb", ATTR{idVendor}=="1038", ATTR{idProduct}=="1736", TAG+="uacces
707708
SUBSYSTEMS=="usb", ATTR{idVendor}=="1038", ATTR{idProduct}=="1832", TAG+="uaccess"
708709
SUBSYSTEMS=="usb", ATTR{idVendor}=="1038", ATTR{idProduct}=="1834", TAG+="uaccess"
709710
SUBSYSTEMS=="usb", ATTR{idVendor}=="1038", ATTR{idProduct}=="1722", TAG+="uaccess"
711+
SUBSYSTEMS=="usb", ATTR{idVendor}=="1038", ATTR{idProduct}=="1726", TAG+="uaccess"
712+
SUBSYSTEMS=="usb", ATTR{idVendor}=="1038", ATTR{idProduct}=="172B", TAG+="uaccess"
710713

711714
SUBSYSTEMS=="usb", ATTR{idVendor}=="1038", ATTR{idProduct}=="1229", TAG+="uaccess"
712715

‎Controllers/SteelSeriesController/RGBController_SteelSeriesRival.cpp

Lines changed: 77 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,25 @@
99

1010
#include "RGBController_SteelSeriesRival.h"
1111

12+
typedef struct
13+
{
14+
const char* name;
15+
const int value;
16+
} steelseries_rival_led_info;
17+
18+
static const steelseries_rival_led_info rival_650_leds[]=
19+
{
20+
{"Left 1", 0x12},
21+
{"Left 2", 0x14},
22+
{"Left 3", 0x16},
23+
{"Right 1", 0x13},
24+
{"Right 2", 0x15},
25+
{"Right 3", 0x17},
26+
};
27+
1228
RGBController_SteelSeriesRival::RGBController_SteelSeriesRival(SteelSeriesRivalController* rival_ptr)
1329
{
14-
rival = rival_ptr;
30+
rival = rival_ptr;
1531

1632
name = rival->GetDeviceName();
1733
vendor = "SteelSeries";
@@ -58,11 +74,13 @@ void RGBController_SteelSeriesRival::SetupZones()
5874
zones.push_back(logo_zone);
5975

6076
led logo_led;
61-
logo_led.name = "Logo";
77+
logo_led.name = "Logo";
78+
logo_led.value = 0;
6279
leds.push_back(logo_led);
6380

64-
/* Rival 300 extends this by adding another LED + Zone */
65-
if (rival->GetMouseType() == RIVAL_300) {
81+
/* Rival 300 extends this by adding Scroll Wheel LED + Zone */
82+
if(rival->GetMouseType() == RIVAL_300)
83+
{
6684
zone wheel_zone;
6785
wheel_zone.name = "Scroll Wheel";
6886
wheel_zone.type = ZONE_TYPE_SINGLE;
@@ -73,8 +91,46 @@ void RGBController_SteelSeriesRival::SetupZones()
7391
zones.push_back(wheel_zone);
7492

7593
led wheel_led;
76-
wheel_led.name = "Scroll Wheel";
94+
wheel_led.name = "Scroll Wheel";
95+
wheel_led.value = 1;
96+
leds.push_back(wheel_led);
97+
}
98+
/* Rival 650 extends this by Scroll Wheel LED + Zone and additional lights LEDs + Zone */
99+
else if(rival->GetMouseType() == RIVAL_650)
100+
{
101+
leds[0].value = 0x11;
102+
103+
zone wheel_zone;
104+
wheel_zone.name = "Scroll Wheel";
105+
wheel_zone.type = ZONE_TYPE_SINGLE;
106+
wheel_zone.leds_min = 1;
107+
wheel_zone.leds_max = 1;
108+
wheel_zone.leds_count = 1;
109+
wheel_zone.matrix_map = NULL;
110+
zones.push_back(wheel_zone);
111+
112+
led wheel_led;
113+
wheel_led.name = "Scroll Wheel";
114+
wheel_led.value = 0x10;
77115
leds.push_back(wheel_led);
116+
117+
zone mouse_zone;
118+
mouse_zone.name = "Mouse";
119+
mouse_zone.type = ZONE_TYPE_LINEAR;
120+
mouse_zone.leds_min = 6;
121+
mouse_zone.leds_max = 6;
122+
mouse_zone.leds_count = 6;
123+
mouse_zone.matrix_map = NULL;
124+
zones.push_back(mouse_zone);
125+
126+
for(const steelseries_rival_led_info led_info: rival_650_leds)
127+
{
128+
led mouse_led;
129+
mouse_led.name = led_info.name;
130+
mouse_led.value = led_info.value;
131+
leds.push_back(mouse_led);
132+
}
133+
78134
}
79135
SetupColors();
80136
}
@@ -88,43 +144,32 @@ void RGBController_SteelSeriesRival::ResizeZone(int /*zone*/, int /*new_size*/)
88144

89145
void RGBController_SteelSeriesRival::DeviceUpdateLEDs()
90146
{
91-
unsigned char red = RGBGetRValue(colors[0]);
92-
unsigned char grn = RGBGetGValue(colors[0]);
93-
unsigned char blu = RGBGetBValue(colors[0]);
94-
rival->SetColorAll(red, grn, blu);
147+
for(unsigned int i = 0; i < leds.size(); i++)
148+
{
149+
unsigned char red = RGBGetRValue(colors[i]);
150+
unsigned char grn = RGBGetGValue(colors[i]);
151+
unsigned char blu = RGBGetBValue(colors[i]);
152+
rival->SetColor(leds[i].value, red, grn, blu);
153+
}
95154
}
96155

97156
void RGBController_SteelSeriesRival::UpdateZoneLEDs(int zone)
98157
{
99-
RGBColor color = colors[zone];
100-
unsigned char red = RGBGetRValue(color);
101-
unsigned char grn = RGBGetGValue(color);
102-
unsigned char blu = RGBGetBValue(color);
103-
104-
if(zone == 0)
105-
{
106-
rival->SetColorAll(red, grn, blu);
107-
}
108-
else
158+
for(unsigned int i = 0; i < zones[zone].leds_count; i++)
109159
{
110-
/* We can add custom cases depending on different devices here. */
111-
switch(rival->GetMouseType())
112-
{
113-
case RIVAL_300:
114-
rival->SetColor(zone, red, grn, blu);
115-
break;
116-
117-
default:
118-
break;
119-
}
160+
unsigned char red = RGBGetRValue(zones[zone].colors[i]);
161+
unsigned char grn = RGBGetGValue(zones[zone].colors[i]);
162+
unsigned char blu = RGBGetBValue(zones[zone].colors[i]);
163+
rival->SetColor(zones[zone].leds[i].value, red, grn, blu);
120164
}
121165
}
122166

123167
void RGBController_SteelSeriesRival::UpdateSingleLED(int led)
124168
{
125-
/* Each zone only has a single LED, so we can use the LED ID to reference
126-
* the existing zone code. */
127-
UpdateZoneLEDs(led);
169+
unsigned char red = RGBGetRValue(colors[led]);
170+
unsigned char grn = RGBGetGValue(colors[led]);
171+
unsigned char blu = RGBGetBValue(colors[led]);
172+
rival->SetColor(leds[led].value, red, grn, blu);
128173
}
129174

130175
void RGBController_SteelSeriesRival::SetCustomMode()

‎Controllers/SteelSeriesController/SteelSeriesControllerDetect.cpp

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@
3838
#define STEELSERIES_RIVAL_310_PID 0x1720
3939
#define STEELSERIES_RIVAL_310_CSGO_HOWL_PID 0x171e
4040
#define STEELSERIES_RIVAL_310_PUBG_PID 0x1736
41+
#define STEELSERIES_RIVAL_650_PID 0x172B
42+
#define STEELSERIES_RIVAL_650_WIRELESS_PID 0x1726
4143
#define STEELSERIES_SENSEI_TEN_PID 0x1832
4244
#define STEELSERIES_SENSEI_TEN_CSGO_NEON_RIDER_PID 0x1834
4345
#define STEELSERIES_SENSEI_310_PID 0x1722
@@ -156,6 +158,17 @@ void DetectSteelSeriesRival300(hid_device_info* info, const std::string& name)
156158
ResourceManager::get()->RegisterRGBController(rgb_controller);
157159
}
158160
}
161+
void DetectSteelSeriesRival650(hid_device_info* info, const std::string& name)
162+
{
163+
hid_device* dev = hid_open_path(info->path);
164+
if(dev)
165+
{
166+
SteelSeriesRivalController* controller = new SteelSeriesRivalController(dev, RIVAL_650, info->path);
167+
RGBController_SteelSeriesRival* rgb_controller = new RGBController_SteelSeriesRival(controller);
168+
rgb_controller->name = name;
169+
ResourceManager::get()->RegisterRGBController(rgb_controller);
170+
}
171+
}
159172

160173
void DetectSteelSeriesSensei(hid_device_info* info, const std::string& name)
161174
{
@@ -187,6 +200,8 @@ REGISTER_HID_DETECTOR_I("SteelSeries Rival 300 Black Ops Edition", Dete
187200
REGISTER_HID_DETECTOR_I("SteelSeries Rival 310", DetectSteelSeriesSensei, STEELSERIES_VID, STEELSERIES_RIVAL_310_PID, 0 );
188201
REGISTER_HID_DETECTOR_I("SteelSeries Rival 310 CS:GO Howl Edition", DetectSteelSeriesSensei, STEELSERIES_VID, STEELSERIES_RIVAL_310_CSGO_HOWL_PID, 0 );
189202
REGISTER_HID_DETECTOR_I("SteelSeries Rival 310 PUBG Edition", DetectSteelSeriesSensei, STEELSERIES_VID, STEELSERIES_RIVAL_310_PUBG_PID, 0 );
203+
REGISTER_HID_DETECTOR_I("SteelSeries Rival 650", DetectSteelSeriesRival650, STEELSERIES_VID, STEELSERIES_RIVAL_650_PID, 0 );
204+
REGISTER_HID_DETECTOR_I("SteelSeries Rival 650 Wireless", DetectSteelSeriesRival650, STEELSERIES_VID, STEELSERIES_RIVAL_650_WIRELESS_PID, 0 );
190205
REGISTER_HID_DETECTOR_I("SteelSeries Sensei TEN", DetectSteelSeriesSensei, STEELSERIES_VID, STEELSERIES_SENSEI_TEN_PID, 0 );
191206
REGISTER_HID_DETECTOR_I("SteelSeries Sensei TEN CS:GO Neon Rider Edition", DetectSteelSeriesSensei, STEELSERIES_VID, STEELSERIES_SENSEI_TEN_CSGO_NEON_RIDER_PID,0 );
192207
REGISTER_HID_DETECTOR_I("SteelSeries Sensei 310", DetectSteelSeriesSensei, STEELSERIES_VID, STEELSERIES_SENSEI_310_PID, 0 );

‎Controllers/SteelSeriesController/SteelSeriesGeneric.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ typedef enum
1919
{
2020
RIVAL_100 = 0x00,
2121
RIVAL_300 = 0x01,
22+
RIVAL_650 = 0x02,
2223
SIBERIA_350 = 0x03,
2324
APEX = 0x04,
2425
APEX_TKL = 0x05,

‎Controllers/SteelSeriesController/SteelSeriesRivalController.cpp

Lines changed: 74 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,12 +128,74 @@ void SteelSeriesRivalController::SetLightEffectAll
128128
SetLightEffect(0, effect);
129129
SetLightEffect(1, effect);
130130
break;
131-
131+
132+
case RIVAL_650:
133+
for(int i=0x10; i<0x18; i++)
134+
{
135+
SetLightEffect(i, effect);
136+
}
137+
break;
138+
132139
default:
133140
break;
134141
}
135142
}
136143

144+
void SteelSeriesRivalController::SetRival650Color
145+
(
146+
unsigned char zone_id,
147+
unsigned char red,
148+
unsigned char green,
149+
unsigned char blue
150+
)
151+
{
152+
char usb_buf[60];
153+
154+
memset(usb_buf, 0x00, sizeof(usb_buf));
155+
156+
usb_buf[0x00] = 0x03;
157+
usb_buf[0x04] = 0x30;
158+
usb_buf[0x06] = 0x10;
159+
usb_buf[0x07] = 0x27;
160+
usb_buf[0x16] = 0x01;
161+
usb_buf[0x1E] = 0x04;
162+
usb_buf[0x1F] = red;
163+
usb_buf[0x20] = green;
164+
usb_buf[0x21] = blue;
165+
usb_buf[0x22] = 0xff;
166+
usb_buf[0x27] = 0xff;
167+
usb_buf[0x29] = 0x54;
168+
usb_buf[0x2c] = 0xff;
169+
usb_buf[0x2d] = 0x54;
170+
usb_buf[0x2e] = red;
171+
usb_buf[0x2f] = green;
172+
usb_buf[0x30] = blue;
173+
usb_buf[0x31] = 0x56;
174+
175+
send_usb_msg(dev, usb_buf, 60);
176+
177+
memset(usb_buf, 0x00, sizeof(usb_buf));
178+
usb_buf[0x00] = 0x03;
179+
usb_buf[0x02] = 0x30;
180+
usb_buf[0x04] = 0x2c;
181+
182+
send_usb_msg(dev, usb_buf, 60);
183+
184+
memset(usb_buf, 0x00, sizeof(usb_buf));
185+
usb_buf[0x00] = 0x05;
186+
usb_buf[0x02] = zone_id;//mousekey 0x10-0x17
187+
usb_buf[0x03] = 0xff;
188+
usb_buf[0x08] = 0x5c;
189+
190+
send_usb_msg(dev, usb_buf, 60);
191+
192+
memset(usb_buf, 0x00, sizeof(usb_buf));
193+
usb_buf[0x00] = 0x1c;
194+
usb_buf[0x02] = 0x55;
195+
usb_buf[0x04] = 0x46;
196+
197+
send_usb_msg(dev, usb_buf, 60);
198+
}
137199

138200
void SteelSeriesRivalController::SetColor
139201
(
@@ -157,6 +219,10 @@ void SteelSeriesRivalController::SetColor
157219
usb_buf[0x01] = zone_id + 1;
158220
break;
159221

222+
case RIVAL_650:
223+
SetRival650Color(zone_id, red, green, blue);
224+
return;
225+
160226
default:
161227
break;
162228
}
@@ -186,6 +252,13 @@ void SteelSeriesRivalController::SetColorAll
186252
SetColor(1, red, green, blue);
187253
break;
188254

255+
case RIVAL_650:
256+
for(int i = 0x10; i < 0x18; i++)
257+
{
258+
SetColor(i, red, green, blue);
259+
}
260+
break;
261+
189262
default:
190263
break;
191264
}

‎Controllers/SteelSeriesController/SteelSeriesRivalController.h

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@
1717
/* Mode, we then use these to set actual effect based on speed. */
1818
enum
1919
{
20-
STEELSERIES_RIVAL_DIRECT = 0x00,
21-
STEELSERIES_RIVAL_PULSATE = 0x01
20+
STEELSERIES_RIVAL_DIRECT = 0x00,
21+
STEELSERIES_RIVAL_PULSATE = 0x01
2222
};
2323

2424
/* Effects */
2525
enum
2626
{
27-
STEELSERIES_RIVAL_EFFECT_DIRECT = 0x01,
28-
STEELSERIES_RIVAL_EFFECT_PULSATE_MIN = 0x02,
29-
STEELSERIES_RIVAL_EFFECT_PULSATE_MID = 0x03,
30-
STEELSERIES_RIVAL_EFFECT_PULSATE_MAX = 0x04
27+
STEELSERIES_RIVAL_EFFECT_DIRECT = 0x01,
28+
STEELSERIES_RIVAL_EFFECT_PULSATE_MIN = 0x02,
29+
STEELSERIES_RIVAL_EFFECT_PULSATE_MID = 0x03,
30+
STEELSERIES_RIVAL_EFFECT_PULSATE_MAX = 0x04
3131
};
3232

3333
class SteelSeriesRivalController
@@ -80,4 +80,12 @@ class SteelSeriesRivalController
8080
hid_device* dev;
8181
std::string location;
8282
steelseries_type proto;
83+
84+
void SetRival650Color
85+
(
86+
unsigned char zone_id,
87+
unsigned char red,
88+
unsigned char green,
89+
unsigned char blue
90+
);
8391
};

0 commit comments

Comments
 (0)