From bdfd2a3290d3a7acce39b3c3fe9f537d802c75d0 Mon Sep 17 00:00:00 2001 From: "Julien \"_FrnchFrgg_\" Rivaud" Date: Sun, 20 Oct 2024 19:57:22 +0000 Subject: [PATCH] Add support for Turtle Beach (ex ROCCAT) Vulkan II --- .../RoccatControllerDetect.cpp | 2 + .../RGBController_RoccatVulcanKeyboard.cpp | 3 + .../RoccatVulcanKeyboardController.cpp | 12 ++ .../RoccatVulcanKeyboardController.h | 1 + .../RoccatVulcanKeyboardLayouts.h | 155 ++++++++++++++++++ 5 files changed, 173 insertions(+) diff --git a/Controllers/RoccatController/RoccatControllerDetect.cpp b/Controllers/RoccatController/RoccatControllerDetect.cpp index 3baa9a6a..726b065f 100644 --- a/Controllers/RoccatController/RoccatControllerDetect.cpp +++ b/Controllers/RoccatController/RoccatControllerDetect.cpp @@ -118,6 +118,7 @@ void DetectRoccatVulcanKeyboardControllers(hid_device_info* info, const std::str case ROCCAT_PYRO_PID: case ROCCAT_MAGMA_PID: case ROCCAT_MAGMA_MINI_PID: + case ROCCAT_VULCAN_II_PID: dev_led_page = 0xFF00; dev_ctrl_page = 0xFF01; break; @@ -318,6 +319,7 @@ REGISTER_HID_DETECTOR_IP ("Roccat Vulcan 100 Aimo", DetectRoccatVulcanKe REGISTER_HID_DETECTOR_IP ("Roccat Vulcan 120-Series Aimo", DetectRoccatVulcanKeyboardControllers, ROCCAT_VID, ROCCAT_VULCAN_120_AIMO_PID, 1, 11); REGISTER_HID_DETECTOR_IP ("Roccat Vulcan TKL", DetectRoccatVulcanKeyboardControllers, ROCCAT_VID, ROCCAT_VULCAN_TKL_PID, 1, 11); REGISTER_HID_DETECTOR_IP ("Roccat Vulcan Pro", DetectRoccatVulcanKeyboardControllers, ROCCAT_VID, ROCCAT_VULCAN_PRO_PID, 1, 0xFF01); +REGISTER_HID_DETECTOR_IP ("Roccat Vulcan II", DetectRoccatVulcanKeyboardControllers, ROCCAT_VID, ROCCAT_VULCAN_II_PID, 1, 0xFF01); /*-----------------------------------------------------------------*\ | MICE | diff --git a/Controllers/RoccatController/RoccatVulcanKeyboardController/RGBController_RoccatVulcanKeyboard.cpp b/Controllers/RoccatController/RoccatVulcanKeyboardController/RGBController_RoccatVulcanKeyboard.cpp index dbc87f78..d0ef7105 100644 --- a/Controllers/RoccatController/RoccatVulcanKeyboardController/RGBController_RoccatVulcanKeyboard.cpp +++ b/Controllers/RoccatController/RoccatVulcanKeyboardController/RGBController_RoccatVulcanKeyboard.cpp @@ -118,6 +118,9 @@ void RGBController_RoccatVulcanKeyboard::SetupZones() case ROCCAT_PYRO_PID: keyboard_ptr = &RoccatPyroLayouts; break; + case ROCCAT_VULCAN_II_PID: + keyboard_ptr = &RoccatVulcanIILayouts; + break; case ROCCAT_MAGMA_PID: case ROCCAT_MAGMA_MINI_PID: keyboard_ptr = &RoccatMagmaLayouts; diff --git a/Controllers/RoccatController/RoccatVulcanKeyboardController/RoccatVulcanKeyboardController.cpp b/Controllers/RoccatController/RoccatVulcanKeyboardController/RoccatVulcanKeyboardController.cpp index f818b959..caefc518 100644 --- a/Controllers/RoccatController/RoccatVulcanKeyboardController/RoccatVulcanKeyboardController.cpp +++ b/Controllers/RoccatController/RoccatVulcanKeyboardController/RoccatVulcanKeyboardController.cpp @@ -62,6 +62,7 @@ device_info RoccatVulcanKeyboardController::InitDeviceInfo() case ROCCAT_MAGMA_PID: case ROCCAT_MAGMA_MINI_PID: case ROCCAT_VULCAN_PRO_PID: + case ROCCAT_VULCAN_II_PID: packet_length = 9; report_id = 0x09; break; @@ -115,6 +116,7 @@ void RoccatVulcanKeyboardController::EnableDirect(bool on_off_switch) case ROCCAT_MAGMA_PID: case ROCCAT_MAGMA_MINI_PID: case ROCCAT_VULCAN_PRO_PID: + case ROCCAT_VULCAN_II_PID: buf = new uint8_t[5] { 0x0E, 0x05, on_off_switch, 0x00, 0x00 }; hid_send_feature_report(dev_ctrl, buf, 5); break; @@ -149,6 +151,11 @@ void RoccatVulcanKeyboardController::SendColors(std::vector colors) column_length = 12; protocol_version = 2; break; + case ROCCAT_VULCAN_II_PID: + packet_length = 396; + column_length = 1; + protocol_version = 2; + break; default: packet_length = 436; column_length = 12; @@ -277,6 +284,11 @@ void RoccatVulcanKeyboardController::SendMode(unsigned int mode, unsigned int sp packet_length = 371; column_length = 12; break; + case ROCCAT_VULCAN_II_PID: + protocol_version = 2; + packet_length = 377; + column_length = 1; + break; default: protocol_version = 1; packet_length = 443; diff --git a/Controllers/RoccatController/RoccatVulcanKeyboardController/RoccatVulcanKeyboardController.h b/Controllers/RoccatController/RoccatVulcanKeyboardController/RoccatVulcanKeyboardController.h index 00ea08d0..f6b8065f 100644 --- a/Controllers/RoccatController/RoccatVulcanKeyboardController/RoccatVulcanKeyboardController.h +++ b/Controllers/RoccatController/RoccatVulcanKeyboardController/RoccatVulcanKeyboardController.h @@ -24,6 +24,7 @@ #define ROCCAT_VULCAN_120_AIMO_PID 0x3098 #define ROCCAT_VULCAN_TKL_PID 0x2FEE #define ROCCAT_VULCAN_PRO_PID 0x30F7 +#define ROCCAT_VULCAN_II_PID 0x2F4E #define ROCCAT_PYRO_PID 0x314C #define ROCCAT_MAGMA_PID 0x3124 #define ROCCAT_MAGMA_MINI_PID 0x69A0 diff --git a/Controllers/RoccatController/RoccatVulcanKeyboardController/RoccatVulcanKeyboardLayouts.h b/Controllers/RoccatController/RoccatVulcanKeyboardController/RoccatVulcanKeyboardLayouts.h index 15e187ae..916640d7 100644 --- a/Controllers/RoccatController/RoccatVulcanKeyboardController/RoccatVulcanKeyboardLayouts.h +++ b/Controllers/RoccatController/RoccatVulcanKeyboardController/RoccatVulcanKeyboardLayouts.h @@ -61,6 +61,16 @@ static unsigned int ROCCAT_VULCAN_120_AIMO_LAYOUT_KEYS_105[6][24] = { 5, 8, 14, NA, NA, NA, 34, NA, NA, NA, 55, 61, 66, NA, 74, NA, 78, 83, 87, NA, 92, NA, 101, NA } }; +static unsigned int ROCCAT_VULCAN_II_LAYOUT_KEYS_105[6][24] = +{ + { 0, NA, 9, 15, 20, 25, NA, 35, 40, 45, 50, 56, 62, 67, 72, NA, 75, 79, 84, NA, 105, 106, 107, NA }, + { 1, 6, 10, 16, 21, 26, 30, 36, 41, 46, 51, 57, 63, 68, NA, NA, 76, 80, 85, NA, 88, 93, 97, 102 }, + { 2, NA, 11, 17, 22, 27, 31, 37, 42, 47, 52, 58, 64, 69, NA, NA, 77, 81, 86, NA, 89, 94, 98, 103 }, + { 3, NA, 12, 18, 23, 28, 32, 38, 43, 48, 53, 59, 65, 70, 73, NA, NA, NA, NA, NA, 90, 95, 99, NA }, + { 4, 7, 13, 19, 24, 29, 33, 39, 44, 49, 54, 60, NA, 71, NA, NA, NA, 82, NA, NA, 91, 96, 100, 104 }, + { 5, 8, 14, NA, NA, NA, 34, NA, NA, NA, 55, 61, 66, NA, 74, NA, 78, 83, 87, NA, 92, NA, 101, NA } +}; + static unsigned int ROCCAT_VULCAN_TKL_LAYOUT_KEYS_104[6][19] = { { 0, NA, 8, 14, 19, 24, NA, 34, 39, 44, 49, 55, 61, 66, 70, NA, 74, NA, NA }, @@ -640,6 +650,151 @@ static std::map RoccatPyroLayouts = }, }; +static std::map RoccatVulcanIILayouts = +{ + { + ROCCAT_VULCAN_LAYOUT_UK, + { + *ROCCAT_VULCAN_II_LAYOUT_KEYS_105, + 108, + 6, + 24, + { + { KEY_EN_ESCAPE, 0x02 }, + { KEY_EN_BACK_TICK, 0x03 }, + { KEY_EN_TAB, 0x04 }, + { KEY_EN_CAPS_LOCK, 0x05 }, + { KEY_EN_LEFT_SHIFT, 0x00 }, + { KEY_EN_LEFT_CONTROL, 0x01 }, + + { KEY_EN_1, 0x08 }, + { KEY_EN_ISO_BACK_SLASH, 0x06 }, + { KEY_EN_LEFT_WINDOWS, 0x07 }, + + { KEY_EN_F1, 0x0D }, + { KEY_EN_2, 0x0E }, + { KEY_EN_Q, 0x09 }, + { KEY_EN_A, 0x0A }, + { KEY_EN_Z, 0x0B }, + { KEY_EN_LEFT_ALT, 0x0C }, + + { KEY_EN_F2, 0x14 }, + { KEY_EN_3, 0x15 }, + { KEY_EN_W, 0x0F }, + { KEY_EN_S, 0x10 }, + { KEY_EN_X, 0x11 }, + + { KEY_EN_F3, 0x19 }, + { KEY_EN_4, 0x1A }, + { KEY_EN_E, 0x16 }, + { KEY_EN_D, 0x17 }, + { KEY_EN_C, 0x18 }, + + { KEY_EN_F4, 0x1E }, + { KEY_EN_5, 0x1F }, + { KEY_EN_R, 0x1B }, + { KEY_EN_F, 0x1C }, + { KEY_EN_V, 0x1D }, + + { KEY_EN_6, 0x24 }, + { KEY_EN_T, 0x20 }, + { KEY_EN_G, 0x21 }, + { KEY_EN_B, 0x22 }, + { KEY_EN_SPACE, 0x23 }, + + { KEY_EN_F5, 0x28 }, + { KEY_EN_7, 0x29 }, + { KEY_EN_Y, 0x25 }, + { KEY_EN_H, 0x26 }, + { KEY_EN_N, 0x27 }, + + { KEY_EN_F6, 0x2F }, + { KEY_EN_8, 0x30 }, + { KEY_EN_U, 0x2A }, + { KEY_EN_J, 0x2B }, + { KEY_EN_M, 0x2C }, + + { KEY_EN_F7, 0x35 }, + { KEY_EN_9, 0x36 }, + { KEY_EN_I, 0x31 }, + { KEY_EN_K, 0x32 }, + { KEY_EN_COMMA, 0x33 }, + + { KEY_EN_F8, 0x3B }, + { KEY_EN_0, 0x3C }, + { KEY_EN_O, 0x37 }, + { KEY_EN_L, 0x38 }, + { KEY_EN_PERIOD, 0x39 }, + { KEY_EN_RIGHT_ALT, 0x3A }, + + { KEY_EN_F9, 0x41 }, + { KEY_EN_MINUS, 0x42 }, + { KEY_EN_P, 0x3D }, + { KEY_EN_SEMICOLON, 0x3E }, + { KEY_EN_FORWARD_SLASH, 0x3F }, + { KEY_EN_RIGHT_FUNCTION, 0x40 }, + + { KEY_EN_F10, 0x47 }, + { KEY_EN_EQUALS, 0x48 }, + { KEY_EN_LEFT_BRACKET, 0x43 }, + { KEY_EN_QUOTE, 0x44 }, + { KEY_EN_MENU, 0x46 }, + + { KEY_EN_F11, 0x4D }, + { KEY_EN_BACKSPACE, 0x50 }, + { KEY_EN_RIGHT_BRACKET, 0x49 }, + { KEY_EN_POUND, 0x4A }, + { KEY_EN_RIGHT_SHIFT, 0x4B }, + + { KEY_EN_F12, 0x4F }, + { KEY_EN_ISO_ENTER, 0x52 }, + { KEY_EN_RIGHT_CONTROL, 0x4C }, + + { KEY_EN_PRINT_SCREEN, 0x53 }, + { KEY_EN_INSERT, 0x54 }, + { KEY_EN_DELETE, 0x55 }, + { KEY_EN_LEFT_ARROW, 0x56 }, + + { KEY_EN_SCROLL_LOCK, 0x57 }, + { KEY_EN_HOME, 0x58 }, + { KEY_EN_END, 0x59 }, + { KEY_EN_UP_ARROW, 0x5A }, + { KEY_EN_DOWN_ARROW, 0x5B }, + + { KEY_EN_PAUSE_BREAK, 0x5C }, + { KEY_EN_PAGE_UP, 0x5D }, + { KEY_EN_PAGE_DOWN, 0x5E }, + { KEY_EN_RIGHT_ARROW, 0x5F }, + + { KEY_EN_NUMPAD_LOCK, 0x61 }, + { KEY_EN_NUMPAD_7, 0x62 }, + { KEY_EN_NUMPAD_4, 0x63 }, + { KEY_EN_NUMPAD_1, 0x64 }, + { KEY_EN_NUMPAD_0, 0x65 }, + + { KEY_EN_NUMPAD_DIVIDE, 0x67 }, + { KEY_EN_NUMPAD_8, 0x68 }, + { KEY_EN_NUMPAD_5, 0x69 }, + { KEY_EN_NUMPAD_2, 0x6A }, + + { KEY_EN_NUMPAD_TIMES, 0x6C }, + { KEY_EN_NUMPAD_9, 0x6D }, + { KEY_EN_NUMPAD_6, 0x6E }, + { KEY_EN_NUMPAD_3, 0x6F }, + { KEY_EN_NUMPAD_PERIOD, 0x70 }, + + { KEY_EN_NUMPAD_MINUS, 0x72 }, + { KEY_EN_NUMPAD_PLUS, 0x73 }, + { KEY_EN_NUMPAD_ENTER, 0x75 }, + { KEY_EN_MEDIA_PREVIOUS, 0x76 }, + { KEY_EN_MEDIA_PLAY_PAUSE, 0x78 }, + + { KEY_EN_MEDIA_NEXT, 0x79 } + } + } + }, +}; + static std::map RoccatVulcanTKLLayouts = { {