diff --git a/Controllers/RazerController/RazerController.cpp b/Controllers/RazerController/RazerController.cpp index 71100386..ff5a73df 100644 --- a/Controllers/RazerController/RazerController.cpp +++ b/Controllers/RazerController/RazerController.cpp @@ -361,6 +361,7 @@ bool RazerController::SupportsWave() case RAZER_BLACKWIDOW_V3_TKL_PID: case RAZER_BLACKWIDOW_V3_MINI_WIRED_PID: case RAZER_BLACKWIDOW_V3_MINI_WIRELESS_PID: + case RAZER_BLACKWIDOW_V4_PRO_PID: case RAZER_BLACKWIDOW_V4_X_PID: case RAZER_BLACKWIDOW_X_CHROMA_PID: case RAZER_BLACKWIDOW_X_CHROMA_TE_PID: diff --git a/Controllers/RazerController/RazerControllerDetect.cpp b/Controllers/RazerController/RazerControllerDetect.cpp index 2368d50d..82e57bc9 100644 --- a/Controllers/RazerController/RazerControllerDetect.cpp +++ b/Controllers/RazerController/RazerControllerDetect.cpp @@ -160,6 +160,7 @@ REGISTER_HID_DETECTOR_IPU("Razer Blackwidow V3 Pro (Wireless)", Det REGISTER_HID_DETECTOR_IPU("Razer Blackwidow V3 TKL", DetectRazerControllers, RAZER_VID, RAZER_BLACKWIDOW_V3_TKL_PID, 0x02, 0x01, 0x02); REGISTER_HID_DETECTOR_IPU("Razer Blackwidow V3 Mini (Wired)", DetectRazerControllers, RAZER_VID, RAZER_BLACKWIDOW_V3_MINI_WIRED_PID, 0x03, 0x0C, 0x01); REGISTER_HID_DETECTOR_IPU("Razer Blackwidow V3 Mini (Wireless)", DetectRazerControllers, RAZER_VID, RAZER_BLACKWIDOW_V3_MINI_WIRELESS_PID, 0x03, 0x0C, 0x01); +REGISTER_HID_DETECTOR_IPU("Razer Blackwidow V4 Pro", DetectRazerControllers, RAZER_VID, RAZER_BLACKWIDOW_V4_PRO_PID, 0x03, 0x01, 0x00); REGISTER_HID_DETECTOR_IPU("Razer Blackwidow V4 X", DetectRazerControllers, RAZER_VID, RAZER_BLACKWIDOW_V4_X_PID, 0x02, 0x01, 0x02); REGISTER_HID_DETECTOR_IPU("Razer Blackwidow X Chroma", DetectRazerControllers, RAZER_VID, RAZER_BLACKWIDOW_X_CHROMA_PID, 0x02, 0x01, 0x02); REGISTER_HID_DETECTOR_IPU("Razer Blackwidow X Chroma Tournament Edition", DetectRazerControllers, RAZER_VID, RAZER_BLACKWIDOW_X_CHROMA_TE_PID, 0x02, 0x01, 0x02); diff --git a/Controllers/RazerController/RazerDevices.cpp b/Controllers/RazerController/RazerDevices.cpp index 1b16f0ad..0bff22e5 100644 --- a/Controllers/RazerController/RazerDevices.cpp +++ b/Controllers/RazerController/RazerDevices.cpp @@ -276,6 +276,39 @@ keyboard_keymap_overlay_values razer_blackwidow_v3_tkl_layout } }; +keyboard_keymap_overlay_values razer_blackwidow_v4_pro_layout +{ + KEYBOARD_SIZE::KEYBOARD_SIZE_FULL, + { + { /* ANSI Value set not used */ }, + { + /* Add more regional layout fixes here */ + } + }, + { + /*---------------------------------------------------------------------------------------------------------*\ + | Edit Keys | + | Zone, Row, Column, Value, Key, OpCode, | + \*---------------------------------------------------------------------------------------------------------*/ + { 0, 0, 0, 0, KEY_EN_UNUSED, KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, }, // Move 'Esc' 1 right (Shifts row) + { 0, 0, 1, 0, "Key: Dial", KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, }, // Insert Command Dial (Shifts row) + { 0, 0, 19, 0, KEY_EN_MEDIA_PREVIOUS, KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, }, + { 0, 0, 20, 0, KEY_EN_MEDIA_PLAY_PAUSE, KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, }, + { 0, 0, 21, 0, KEY_EN_MEDIA_NEXT, KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, }, + { 0, 0, 22, 0, KEY_EN_MEDIA_MUTE, KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, }, + { 0, 1, 0, 0, KEY_EN_UNUSED, KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, }, // Move Backtick 1 right (Shifts row) + { 0, 1, 1, 0, "Key: M5", KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, }, // Insert M5 macro key (Shifts row) + { 0, 2, 0, 0, KEY_EN_UNUSED, KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, }, // Move Tab 1 right (Shifts row) + { 0, 2, 1, 0, "Key: M4", KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, }, // Insert M4 macro key (Shifts row) + { 0, 3, 0, 0, KEY_EN_UNUSED, KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, }, // Move Caps 1 right (Shifts row) + { 0, 3, 1, 0, "Key: M3", KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, }, // Insert M3 macro key (Shifts row) + { 0, 4, 0, 0, KEY_EN_UNUSED, KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, }, // Move LFT_SHFT 1 right (Shifts row) + { 0, 4, 1, 0, "Key: M2", KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, }, // Insert M2 macro key (Shifts row) + { 0, 5, 0, 0, KEY_EN_UNUSED, KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, }, // Move LFT_CTRL 1 right (Shifts row) + { 0, 5, 1, 0, "Key: M1", KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, }, // Insert M1 macro key (Shifts row) + } +}; + keyboard_keymap_overlay_values razer_blackwidow_v4_x_layout { KEYBOARD_SIZE::KEYBOARD_SIZE_FULL, @@ -1510,6 +1543,88 @@ static const razer_device blackwidow_v3_mini_wireless_device = }, &razer_blackwidow_v3_mini_layout }; +/*-------------------------------------------------------------*\ +| Razer Blackwidow V4 Pro 1532:028D | +| | +| Zone "Keyboard" | +| Matrix | +| 6 Rows, 23 Columns | +| | +| Zone "Underglow Left" | +| Linear | +| 1 Row, 9 Columns | +| | +| Zone "Underglow right" | +| Linear | +| 1 Row, 9 Columns | +| | +| Zone "Void" - In testing these LEDs were not connected | +| Linear | +| 1 Row, 5 Columns | +| | +| Zone "Underglow Wrist Rest" | +| Linear | +| 1 Rows, 20 Columns | +\*-------------------------------------------------------------*/ +static const razer_zone blackwidow_v4_pro_zone = +{ + ZONE_EN_KEYBOARD, + ZONE_TYPE_MATRIX, + 6, + 23 +}; + +static const razer_zone blackwidow_v4_pro_lbl_zone = +{ + "Underglow Left", + ZONE_TYPE_LINEAR, + 1, + 9 +}; + +static const razer_zone blackwidow_v4_pro_lbr_zone = +{ + "Underglow Right", + ZONE_TYPE_LINEAR, + 1, + 9 +}; + +static const razer_zone blackwidow_v4_pro_void_zone = +{ + "Void", + ZONE_TYPE_LINEAR, + 1, + 5 +}; + +static const razer_zone blackwidow_v4_pro_lbwr_zone = +{ + "Underglow Wrist Rest", + ZONE_TYPE_LINEAR, + 1, + 20 +}; + +static const razer_device blackwidow_v4_pro_device = +{ + "Razer Blackwidow V4 Pro", + RAZER_BLACKWIDOW_V4_PRO_PID, + DEVICE_TYPE_KEYBOARD, + RAZER_MATRIX_TYPE_EXTENDED, + 0x1F, + 8, + 23, + { + &blackwidow_v4_pro_zone, + &blackwidow_v4_pro_lbl_zone, + &blackwidow_v4_pro_lbr_zone, + &blackwidow_v4_pro_void_zone, + &blackwidow_v4_pro_lbwr_zone, + NULL + }, + &razer_blackwidow_v4_pro_layout +}; /*-------------------------------------------------------------*\ | Razer Blackwidow V4 X 1532:0293 | @@ -7476,6 +7591,7 @@ const razer_device* razer_device_list[] = &blackwidow_v3_tkl_device, &blackwidow_v3_mini_wired_device, &blackwidow_v3_mini_wireless_device, + &blackwidow_v4_pro_device, &blackwidow_v4_x_device, &blackwidow_x_chroma_device, &blackwidow_x_chroma_te_device, diff --git a/Controllers/RazerController/RazerDevices.h b/Controllers/RazerController/RazerDevices.h index 333f632a..9131afcd 100644 --- a/Controllers/RazerController/RazerDevices.h +++ b/Controllers/RazerController/RazerDevices.h @@ -45,6 +45,7 @@ #define RAZER_BLACKWIDOW_V3_PRO_BLUETOOTH_PID 0x025B #define RAZER_BLACKWIDOW_V3_PRO_WIRELESS_PID 0x025C #define RAZER_BLACKWIDOW_V3_TKL_PID 0x0A24 +#define RAZER_BLACKWIDOW_V4_PRO_PID 0x028D #define RAZER_BLACKWIDOW_V4_X_PID 0x0293 #define RAZER_BLACKWIDOW_X_CHROMA_PID 0x0216 #define RAZER_BLACKWIDOW_X_CHROMA_TE_PID 0x021A