Skip to content

Commit 406c83b

Browse files
Chr1sNoCalcProgrammer1
Chr1sNo
authored and
CalcProgrammer1
committed
Initial commit for Razer Deathstalker V2
+ Added PID for the Deathstalker V2 + Registered detectors + Added layout and metadata to RazerDevices.cpp + Added capabilities to RazerController.cpp + Resolves #2904
1 parent 9cd278c commit 406c83b

File tree

5 files changed

+89
-1
lines changed

5 files changed

+89
-1
lines changed

‎Controllers/RazerController/RazerController.cpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ RazerController::RazerController(hid_device* dev_handle, hid_device* dev_argb_ha
6868
case RAZER_DEATHADDER_CHROMA_PID:
6969
case RAZER_DEATHADDER_ESSENTIAL_V2_PID:
7070
case RAZER_DEATHADDER_V2_MINI_PID:
71+
case RAZER_DEATHSTALKER_V2_PID:
7172
case RAZER_LAPTOP_STAND_CHROMA_PID:
7273
case RAZER_LAPTOP_STAND_CHROMA_V2_PID:
7374
case RAZER_MAMBA_ELITE_PID:
@@ -175,6 +176,7 @@ RazerController::RazerController(hid_device* dev_handle, hid_device* dev_argb_ha
175176
case RAZER_CYNOSA_CHROMA_PID:
176177
case RAZER_CYNOSA_LITE_PID:
177178
case RAZER_CYNOSA_V2_PID:
179+
case RAZER_DEATHSTALKER_V2_PID:
178180
case RAZER_HUNTSMAN_ELITE_PID:
179181
case RAZER_HUNTSMAN_PID:
180182
case RAZER_HUNTSMAN_MINI_PID:
@@ -280,6 +282,7 @@ RazerController::RazerController(hid_device* dev_handle, hid_device* dev_argb_ha
280282
case RAZER_DEATHADDER_V2_PID:
281283
case RAZER_DEATHADDER_V2_PRO_WIRED_PID:
282284
case RAZER_DEATHADDER_V2_PRO_WIRELESS_PID:
285+
case RAZER_DEATHSTALKER_V2_PID:
283286
case RAZER_FIREFLY_HYPERFLUX_PID:
284287
case RAZER_FIREFLY_V2_PID:
285288
case RAZER_GOLIATHUS_CHROMA_EXTENDED_PID:
@@ -613,6 +616,7 @@ bool RazerController::SupportsWave()
613616
case RAZER_CYNOSA_CHROMA_PID:
614617
case RAZER_CYNOSA_V2_PID:
615618
case RAZER_DEATHSTALKER_CHROMA_PID:
619+
case RAZER_DEATHSTALKER_V2_PID:
616620
case RAZER_ORNATA_CHROMA_PID:
617621
case RAZER_ORNATA_CHROMA_V2_PID:
618622
case RAZER_ORNATA_V3_PID:

‎Controllers/RazerController/RazerControllerDetect.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,7 @@ REGISTER_HID_DETECTOR_IPU("Razer Cynosa Chroma", Det
260260
REGISTER_HID_DETECTOR_IPU("Razer Cynosa Chroma V2", DetectRazerControllers, RAZER_VID, RAZER_CYNOSA_V2_PID, 0x02, 0x01, 0x02);
261261
REGISTER_HID_DETECTOR_IPU("Razer Cynosa Lite", DetectRazerControllers, RAZER_VID, RAZER_CYNOSA_LITE_PID, 0x02, 0x01, 0x02);
262262
REGISTER_HID_DETECTOR_IPU("Razer Deathstalker Chroma", DetectRazerControllers, RAZER_VID, RAZER_DEATHSTALKER_CHROMA_PID, 0x02, 0x01, 0x02);
263+
REGISTER_HID_DETECTOR_IPU("Razer Deathstalker V2", DetectRazerControllers, RAZER_VID, RAZER_DEATHSTALKER_V2_PID, 0x03, 0x0C, 0x01);
263264
REGISTER_HID_DETECTOR_IPU("Razer Huntsman", DetectRazerControllers, RAZER_VID, RAZER_HUNTSMAN_PID, 0x02, 0x01, 0x02);
264265
REGISTER_HID_DETECTOR_IPU("Razer Huntsman Elite", DetectRazerControllers, RAZER_VID, RAZER_HUNTSMAN_ELITE_PID, 0x02, 0x01, 0x02);
265266
REGISTER_HID_DETECTOR_IPU("Razer Huntsman Mini", DetectRazerControllers, RAZER_VID, RAZER_HUNTSMAN_MINI_PID, 0x02, 0x01, 0x02);

‎Controllers/RazerController/RazerDevices.cpp‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,51 @@ keyboard_keymap_overlay_values razer_blade_15_2021_advanced_layout
189189
}
190190
};
191191

192+
keyboard_keymap_overlay_values razer_deathstalker_v2_layout
193+
{
194+
KEYBOARD_SIZE::KEYBOARD_SIZE_FULL,
195+
{
196+
{ /* ANSI Value set not used */ },
197+
{
198+
{
199+
KEYBOARD_LAYOUT_ANSI_QWERTY,
200+
{
201+
/*---------------------------------------------------------------------*\
202+
| Swap Keys |
203+
| Zone, Row, Column, Index, Key |
204+
\*---------------------------------------------------------------------*/
205+
{ 0, 4, 1, 0, KEY_EN_UNUSED, }, // Move 'Z' 1 right (Account for ISO key)
206+
}
207+
},
208+
{
209+
KEYBOARD_LAYOUT_ISO_QWERTY,
210+
{
211+
/*---------------------------------------------------------------------*\
212+
| Swap Keys |
213+
| Zone, Row, Column, Index, Key |
214+
\*---------------------------------------------------------------------*/
215+
{ 0, 2, 13, 0, KEY_EN_UNUSED, }, // Remove ANSI_BACKSLASH
216+
{ 0, 4, 1, 0, KEY_EN_ISO_BACK_SLASH, }, // Add ISO_BACK_SLASH
217+
}
218+
},
219+
/* Add more regional layout fixes here */
220+
}
221+
},
222+
{
223+
/*---------------------------------------------------------------------*\
224+
| Insert Keys |
225+
| Zone, Row, Column, Index, Key |
226+
\*---------------------------------------------------------------------*/
227+
{ 0, 1, 13, 0, KEY_EN_UNUSED, }, // Move Backspace 1 right
228+
},
229+
{
230+
/*---------------------------------------------------------------------*\
231+
| Swap Keys |
232+
| Zone, Row, Column, Index, Key |
233+
\*---------------------------------------------------------------------*/
234+
}
235+
};
236+
192237
keyboard_keymap_overlay_values razer_huntsman_elite_layout
193238
{
194239
KEYBOARD_SIZE::KEYBOARD_SIZE_FULL,
@@ -3693,6 +3738,42 @@ static const razer_device deathstalker_chroma_device =
36933738
&razer_empty_layout
36943739
};
36953740

3741+
/*-------------------------------------------------------------*\
3742+
| Razer Deathstalker V2 1532:0295 |
3743+
| |
3744+
| Zone "Keyboard" |
3745+
| Matrix |
3746+
| 6 Rows, 22 Columns |
3747+
\*-------------------------------------------------------------*/
3748+
static const razer_zone deathstalker_v2_zone =
3749+
{
3750+
ZONE_EN_KEYBOARD,
3751+
ZONE_TYPE_MATRIX,
3752+
6,
3753+
22
3754+
};
3755+
3756+
static const razer_device deathstalker_v2_device =
3757+
{
3758+
"Razer Deathstalker V2",
3759+
RAZER_DEATHSTALKER_V2_PID,
3760+
DEVICE_TYPE_KEYBOARD,
3761+
true,
3762+
6,
3763+
22,
3764+
{
3765+
&deathstalker_v2_zone,
3766+
NULL,
3767+
NULL,
3768+
NULL,
3769+
NULL,
3770+
NULL
3771+
},
3772+
NULL,
3773+
0,
3774+
&razer_deathstalker_v2_layout
3775+
};
3776+
36963777
/*-------------------------------------------------------------*\
36973778
| Razer Huntsman 1532:0227 |
36983779
| |
@@ -9101,6 +9182,7 @@ const razer_device* razer_device_list[] =
91019182
&cynosa_v2_device,
91029183
&cynosa_lite_device,
91039184
&deathstalker_chroma_device,
9185+
&deathstalker_v2_device,
91049186
&huntsman_device,
91059187
&huntsman_elite_device,
91069188
&huntsman_mini_device,

‎Controllers/RazerController/RazerDevices.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@
9191
#define RAZER_CYNOSA_LITE_PID 0x023F
9292
#define RAZER_CYNOSA_V2_PID 0x025E
9393
#define RAZER_DEATHSTALKER_CHROMA_PID 0x0204
94+
#define RAZER_DEATHSTALKER_V2_PID 0x0295
9495
#define RAZER_HUNTSMAN_ELITE_PID 0x0226
9596
#define RAZER_HUNTSMAN_PID 0x0227
9697
#define RAZER_HUNTSMAN_MINI_PID 0x0257

‎RGBController/KeyboardLayoutManager.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ keyboard_keymap_overlay iso_qwertz
222222
{ 0, 3, 10, 0, KEY_DE_DIAERESIS_O, },
223223
{ 0, 3, 11, 0, KEY_DE_DIAERESIS_A, },
224224
{ 0, 4, 2, 0, KEY_EN_Y, },
225-
{ 0, 5, 12, 0, KEY_EN_MINUS, },
225+
{ 0, 4, 11, 0, KEY_EN_MINUS, },
226226
}
227227
};
228228

0 commit comments

Comments
 (0)