diff --git a/Controllers/RoccatController/RoccatControllerDetect.cpp b/Controllers/RoccatController/RoccatControllerDetect.cpp index 5d0e4743..5ba42514 100644 --- a/Controllers/RoccatController/RoccatControllerDetect.cpp +++ b/Controllers/RoccatController/RoccatControllerDetect.cpp @@ -123,6 +123,7 @@ void DetectRoccatVulcanKeyboardControllers(hid_device_info* info, const std::str case ROCCAT_MAGMA_PID: case ROCCAT_MAGMA_MINI_PID: case ROCCAT_VULCAN_II_PID: + case ROCCAT_VULCAN_II_MAX_PID: case TURTLE_BEACH_VULCAN_II_PID: dev_led_page = 0xFF00; dev_ctrl_page = 0xFF01; @@ -337,6 +338,7 @@ REGISTER_HID_DETECTOR_IP ("Roccat Vulcan TKL", DetectRoccatVulc REGISTER_HID_DETECTOR_IP ("Roccat Vulcan Pro", DetectRoccatVulcanKeyboardControllers, ROCCAT_VID, ROCCAT_VULCAN_PRO_PID, 1, 0xFF01); REGISTER_HID_DETECTOR_IP ("Roccat Vulcan TKL Pro", DetectRoccatVulcanKeyboardControllers, ROCCAT_VID, ROCCAT_VULCAN_TKL_PRO_PID, 1, 0xFF01); REGISTER_HID_DETECTOR_IP ("Roccat Vulcan II", DetectRoccatVulcanKeyboardControllers, ROCCAT_VID, ROCCAT_VULCAN_II_PID, 1, 0xFF01); +REGISTER_HID_DETECTOR_IP ("Roccat Vulcan II Max", DetectRoccatVulcanKeyboardControllers, ROCCAT_VID, ROCCAT_VULCAN_II_MAX_PID, 1, 0xFF01); REGISTER_HID_DETECTOR_IP ("Turtle Beach Vulcan II", DetectRoccatVulcanKeyboardControllers, TURTLE_BEACH_VID, TURTLE_BEACH_VULCAN_II_PID, 1, 0xFF01); REGISTER_HID_DETECTOR_IP ("Turtle Beach Vulcan II TKL", DetectRoccatVulcanKeyboardControllers, TURTLE_BEACH_VID, TURTLE_BEACH_VULCAN_II_TKL_PID, 1, 11); REGISTER_HID_DETECTOR_IP ("Turtle Beach Vulcan II TKL Pro", DetectRoccatVulcanKeyboardControllers, TURTLE_BEACH_VID, TURTLE_BEACH_VULCAN_II_TKL_PRO_PID, 1, 0x0001); diff --git a/Controllers/RoccatController/RoccatVulcanKeyboardController/RGBController_RoccatVulcanKeyboard.cpp b/Controllers/RoccatController/RoccatVulcanKeyboardController/RGBController_RoccatVulcanKeyboard.cpp index 0b2a5cf5..70137f22 100644 --- a/Controllers/RoccatController/RoccatVulcanKeyboardController/RGBController_RoccatVulcanKeyboard.cpp +++ b/Controllers/RoccatController/RoccatVulcanKeyboardController/RGBController_RoccatVulcanKeyboard.cpp @@ -127,6 +127,9 @@ void RGBController_RoccatVulcanKeyboard::SetupZones() case TURTLE_BEACH_VULCAN_II_PID: keyboard_ptr = &RoccatVulcanIILayouts; break; + case ROCCAT_VULCAN_II_MAX_PID: + keyboard_ptr = &RoccatVulcanIIMaxLayouts; + break; case ROCCAT_MAGMA_PID: case ROCCAT_MAGMA_MINI_PID: keyboard_ptr = &RoccatMagmaLayouts; @@ -152,18 +155,97 @@ void RGBController_RoccatVulcanKeyboard::SetupZones() } + /*---------------------------------------------------------*\ + | Determine zone sizes | + | Vulcan II MAX has 108 keyboard keys + 24 secondary LEDs | + | (physically under parent keys) + 16 palm rest LEDs. | + | Secondary LEDs are split into labeled linear zones. | + \*---------------------------------------------------------*/ + int keyboard_size = keyboard[layout].size; + + if(pid == ROCCAT_VULCAN_II_MAX_PID) + { + keyboard_size = 108; + } + zone keyboard_zone; keyboard_zone.name = "Keyboard"; keyboard_zone.type = ZONE_TYPE_MATRIX; - keyboard_zone.leds_min = keyboard[layout].size; - keyboard_zone.leds_max = keyboard[layout].size; - keyboard_zone.leds_count = keyboard[layout].size; + keyboard_zone.leds_min = keyboard_size; + keyboard_zone.leds_max = keyboard_size; + keyboard_zone.leds_count = keyboard_size; keyboard_zone.matrix_map = new matrix_map_type; keyboard_zone.matrix_map->height = keyboard[layout].rows; keyboard_zone.matrix_map->width = keyboard[layout].cols; keyboard_zone.matrix_map->map = keyboard[layout].matrix_map; zones.push_back(keyboard_zone); + if(pid == ROCCAT_VULCAN_II_MAX_PID) + { + zone fkey_ind_zone; + fkey_ind_zone.name = "F-Key Indicators"; + fkey_ind_zone.type = ZONE_TYPE_LINEAR; + fkey_ind_zone.leds_min = 15; + fkey_ind_zone.leds_max = 15; + fkey_ind_zone.leds_count = 15; + fkey_ind_zone.matrix_map = NULL; + zones.push_back(fkey_ind_zone); + + zone nav1_zone; + nav1_zone.name = "Nav Cluster Indicators"; + nav1_zone.type = ZONE_TYPE_LINEAR; + nav1_zone.leds_min = 3; + nav1_zone.leds_max = 3; + nav1_zone.leds_count = 3; + nav1_zone.matrix_map = NULL; + zones.push_back(nav1_zone); + + zone numlock_zone; + numlock_zone.name = "Num Lock Indicator"; + numlock_zone.type = ZONE_TYPE_LINEAR; + numlock_zone.leds_min = 1; + numlock_zone.leds_max = 1; + numlock_zone.leds_count = 1; + numlock_zone.matrix_map = NULL; + zones.push_back(numlock_zone); + + zone nav2_zone; + nav2_zone.name = "Nav Cluster Indicators 2"; + nav2_zone.type = ZONE_TYPE_LINEAR; + nav2_zone.leds_min = 3; + nav2_zone.leds_max = 3; + nav2_zone.leds_count = 3; + nav2_zone.matrix_map = NULL; + zones.push_back(nav2_zone); + + zone caps_zone; + caps_zone.name = "Caps Lock Indicator"; + caps_zone.type = ZONE_TYPE_LINEAR; + caps_zone.leds_min = 1; + caps_zone.leds_max = 1; + caps_zone.leds_count = 1; + caps_zone.matrix_map = NULL; + zones.push_back(caps_zone); + + zone win_zone; + win_zone.name = "Win Key Indicator"; + win_zone.type = ZONE_TYPE_LINEAR; + win_zone.leds_min = 1; + win_zone.leds_max = 1; + win_zone.leds_count = 1; + win_zone.matrix_map = NULL; + zones.push_back(win_zone); + + zone palmrest_zone; + palmrest_zone.name = "Palm Rest"; + palmrest_zone.type = ZONE_TYPE_LINEAR; + palmrest_zone.leds_min = 16; + palmrest_zone.leds_max = 16; + palmrest_zone.leds_count = 16; + palmrest_zone.matrix_map = NULL; + zones.push_back(palmrest_zone); + } + for(int led_id = 0; led_id < keyboard[layout].size; led_id++) { led new_led; diff --git a/Controllers/RoccatController/RoccatVulcanKeyboardController/RoccatVulcanKeyboardController.cpp b/Controllers/RoccatController/RoccatVulcanKeyboardController/RoccatVulcanKeyboardController.cpp index 5ba57d39..3073fd26 100644 --- a/Controllers/RoccatController/RoccatVulcanKeyboardController/RoccatVulcanKeyboardController.cpp +++ b/Controllers/RoccatController/RoccatVulcanKeyboardController/RoccatVulcanKeyboardController.cpp @@ -69,6 +69,7 @@ device_info RoccatVulcanKeyboardController::InitDeviceInfo() case ROCCAT_VULCAN_PRO_PID: case ROCCAT_VULCAN_TKL_PRO_PID: case ROCCAT_VULCAN_II_PID: + case ROCCAT_VULCAN_II_MAX_PID: case TURTLE_BEACH_VULCAN_II_PID: case TURTLE_BEACH_VULCAN_II_TKL_PRO_PID: packet_length = 9; @@ -126,6 +127,7 @@ void RoccatVulcanKeyboardController::EnableDirect(bool on_off_switch) case ROCCAT_VULCAN_PRO_PID: case ROCCAT_VULCAN_TKL_PRO_PID: case ROCCAT_VULCAN_II_PID: + case ROCCAT_VULCAN_II_MAX_PID: case TURTLE_BEACH_VULCAN_II_PID: case TURTLE_BEACH_VULCAN_II_TKL_PRO_PID: buf = new uint8_t[5] { 0x0E, 0x05, on_off_switch, 0x00, 0x00 }; @@ -169,6 +171,11 @@ void RoccatVulcanKeyboardController::SendColors(std::vector colors) column_length = 1; protocol_version = 2; break; + case ROCCAT_VULCAN_II_MAX_PID: + packet_length = 567; + column_length = 1; + protocol_version = 2; + break; case TURTLE_BEACH_VULCAN_II_TKL_PRO_PID: packet_length = 320; column_length = 1; @@ -342,6 +349,11 @@ void RoccatVulcanKeyboardController::SendMode(unsigned int mode, unsigned int sp packet_length = 377; column_length = 1; break; + case ROCCAT_VULCAN_II_MAX_PID: + protocol_version = 2; + packet_length = 542; + column_length = 1; + break; case TURTLE_BEACH_VULCAN_II_TKL_PRO_PID: packet_length = 284; column_length = 1; diff --git a/Controllers/RoccatController/RoccatVulcanKeyboardController/RoccatVulcanKeyboardController.h b/Controllers/RoccatController/RoccatVulcanKeyboardController/RoccatVulcanKeyboardController.h index f8049793..485030e0 100644 --- a/Controllers/RoccatController/RoccatVulcanKeyboardController/RoccatVulcanKeyboardController.h +++ b/Controllers/RoccatController/RoccatVulcanKeyboardController/RoccatVulcanKeyboardController.h @@ -26,6 +26,7 @@ #define ROCCAT_VULCAN_PRO_PID 0x30F7 #define ROCCAT_VULCAN_TKL_PRO_PID 0x311A #define ROCCAT_VULCAN_II_PID 0x2F4E +#define ROCCAT_VULCAN_II_MAX_PID 0x2EE2 #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 688726b5..2d57765c 100644 --- a/Controllers/RoccatController/RoccatVulcanKeyboardController/RoccatVulcanKeyboardLayouts.h +++ b/Controllers/RoccatController/RoccatVulcanKeyboardController/RoccatVulcanKeyboardLayouts.h @@ -805,6 +805,234 @@ static std::map RoccatVulcanIILayouts = }, }; +static unsigned int ROCCAT_VULCAN_II_MAX_LAYOUT_KEYS_ANSI[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, 70, NA, 77, 81, 86, NA, 89, 94, 98, 103 }, + { 3, NA, 12, 18, 23, 28, 32, 38, 43, 48, 53, 59, 65, 73, NA, NA, NA, NA, NA, NA, 90, 95, 99, NA }, + { 4, NA, 13, 19, 24, 29, 33, 39, 44, 49, 54, 60, 71, NA, NA, NA, NA, 82, NA, NA, 91, 96, 100, 104 }, + { 5, 8, 14, NA, NA, NA, 34, NA, NA, NA, 55, 61, 66, 74, NA, NA, 78, 83, 87, NA, 92, NA, 101, NA } +}; + +static unsigned int ROCCAT_VULCAN_II_MAX_LAYOUT_PALM_REST[1][24] = +{ + { 0, NA, 1, 2, NA, 3, 4, NA, 5, 6, NA, 7, 8, NA, 9, 10, NA, 11, 12, NA, 13, 14, NA, 15 } +}; + +static std::map RoccatVulcanIIMaxLayouts = +{ + { + ROCCAT_VULCAN_LAYOUT_US, + { + *ROCCAT_VULCAN_II_MAX_LAYOUT_KEYS_ANSI, + 148, + 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_UNUSED, 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, 0x1F }, + { KEY_EN_5, 0x1E }, + { KEY_EN_R, 0x1B }, + { KEY_EN_F, 0x1C }, + { KEY_EN_V, 0x21 }, + + { KEY_EN_6, 0x24 }, + { KEY_EN_T, 0x20 }, + { KEY_EN_G, 0x1D }, + { KEY_EN_B, 0x22 }, + { KEY_EN_SPACE, 0x28 }, + + { KEY_EN_F5, 0x23 }, + { 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, 0x3D }, + { 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, 0x2A }, + { 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_ANSI_BACK_SLASH, 0x51 }, + { KEY_EN_RIGHT_SHIFT, 0x4B }, + + { KEY_EN_F12, 0x4F }, + { KEY_EN_ANSI_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, 0x60 }, + { KEY_EN_NUMPAD_7, 0x61 }, + { KEY_EN_NUMPAD_4, 0x62 }, + { KEY_EN_NUMPAD_1, 0x6C }, + { KEY_EN_NUMPAD_0, 0x64 }, + + { KEY_EN_NUMPAD_DIVIDE, 0x65 }, + { KEY_EN_NUMPAD_8, 0x66 }, + { KEY_EN_NUMPAD_5, 0x67 }, + { KEY_EN_NUMPAD_2, 0x68 }, + + { KEY_EN_NUMPAD_TIMES, 0x69 }, + { KEY_EN_NUMPAD_9, 0x6A }, + { KEY_EN_NUMPAD_6, 0x6B }, + { KEY_EN_NUMPAD_3, 0x63 }, + { KEY_EN_NUMPAD_PERIOD, 0x6D }, + + { KEY_EN_NUMPAD_MINUS, 0x6E }, + { KEY_EN_NUMPAD_PLUS, 0x6F }, + { KEY_EN_NUMPAD_ENTER, 0x71 }, + + { KEY_EN_MEDIA_PREVIOUS, 0x72 }, + { KEY_EN_MEDIA_PLAY_PAUSE, 0x73 }, + { KEY_EN_MEDIA_NEXT, 0x74 }, + + /*-------------------------------------------------------------*\ + | F-Key Indicators (secondary LEDs) | + \*-------------------------------------------------------------*/ + { "Key: F1 LED 2", 0x89 }, + { "Key: F2 LED 2", 0x7B }, + { "Key: F3 LED 2", 0x81 }, + { "Key: F4 LED 2", 0x87 }, + { "Key: F5 LED 2", 0x8D }, + { "Key: F6 LED 2", 0x76 }, + { "Key: F7 LED 2", 0x7C }, + { "Key: F8 LED 2", 0x82 }, + { "Key: F9 LED 2", 0x88 }, + { "Key: F10 LED 2", 0x8E }, + { "Key: F11 LED 2", 0x7A }, + { "Key: F12 LED 2", 0x80 }, + { "Key: Print Screen LED 2", 0x86 }, + { "Key: Scroll Lock LED 2", 0x8C }, + { "Key: Pause/Break LED 2", 0x92 }, + + /*-------------------------------------------------------------*\ + | Nav Cluster Indicators (secondary LEDs) | + \*-------------------------------------------------------------*/ + { "Key: Insert LED 2", 0x75 }, + { "Key: Home LED 2", 0x7E }, + { "Key: Page Up LED 2", 0x84 }, + + /*-------------------------------------------------------------*\ + | Num Lock Indicator (secondary LED) | + \*-------------------------------------------------------------*/ + { "Key: Num Lock LED 2", 0x8B }, + + /*-------------------------------------------------------------*\ + | Nav Cluster Indicators 2 (secondary LEDs) | + \*-------------------------------------------------------------*/ + { "Key: Delete LED 2", 0x78 }, + { "Key: End LED 2", 0x90 }, + { "Key: Page Down LED 2", 0x8A }, + + /*-------------------------------------------------------------*\ + | Caps Lock Indicator (secondary LED) | + \*-------------------------------------------------------------*/ + { "Key: Caps Lock LED 2", 0x7D }, + + /*-------------------------------------------------------------*\ + | Win Key Indicator (secondary LED) | + \*-------------------------------------------------------------*/ + { "Key: Left Windows LED 2", 0x83 }, + + /*-------------------------------------------------------------*\ + | Palm Rest LEDs (order approximate - needs verification) | + \*-------------------------------------------------------------*/ + { "Palm Rest LED 1", 0x96 }, + { "Palm Rest LED 2", 0xAD }, + { "Palm Rest LED 3", 0xA7 }, + { "Palm Rest LED 4", 0xA1 }, + { "Palm Rest LED 5", 0x9B }, + { "Palm Rest LED 6", 0x95 }, + { "Palm Rest LED 7", 0xAC }, + { "Palm Rest LED 8", 0xA6 }, + { "Palm Rest LED 9", 0xA0 }, + { "Palm Rest LED 10", 0x9A }, + { "Palm Rest LED 11", 0x94 }, + { "Palm Rest LED 12", 0xAB }, + { "Palm Rest LED 13", 0xA5 }, + { "Palm Rest LED 14", 0x9F }, + { "Palm Rest LED 15", 0x99 }, + { "Palm Rest LED 16", 0x93 } + } + } + }, +}; + static std::map RoccatVulcanTKLLayouts = { {