diff --git a/Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardController.cpp b/Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardController.cpp index f0040f46..ba784add 100644 --- a/Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardController.cpp +++ b/Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardController.cpp @@ -77,6 +77,7 @@ std::string AuraTUFKeyboardController::GetVersion() { case AURA_TUF_K3_GAMING_PID: case AURA_ROG_STRIX_FLARE_II_ANIMATE_PID: + case AURA_ROG_STRIX_SCOPE_II_96_WIRELESS_USB_PID: snprintf(version, 9, "%02X.%02X.%02X", usb_buf_out[6], usb_buf_out[5], usb_buf_out[4]); break; default: diff --git a/Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardController.h b/Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardController.h index 1fba1c0b..23bd5905 100644 --- a/Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardController.h +++ b/Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardController.h @@ -33,19 +33,20 @@ enum enum { - AURA_ROG_STRIX_FLARE_PID = 0x1875, - AURA_ROG_STRIX_FLARE_PNK_LTD_PID = 0x18CF, - AURA_ROG_STRIX_FLARE_COD_BO4_PID = 0x18AF, - AURA_ROG_FALCHION_WIRED_PID = 0x193C, - AURA_ROG_FALCHION_WIRELESS_PID = 0x193E, - AURA_ROG_STRIX_SCOPE_PID = 0x18F8, - AURA_ROG_STRIX_SCOPE_RX_PID = 0x1951, - AURA_ROG_STRIX_FLARE_II_ANIMATE_PID = 0x19FC, - AURA_TUF_K1_GAMING_PID = 0x1945, - AURA_TUF_K3_GAMING_PID = 0x194B, - AURA_TUF_K5_GAMING_PID = 0x1899, - AURA_TUF_K7_GAMING_PID = 0x18AA, - AURA_ROG_CLAYMORE_PID = 0x184D, + AURA_ROG_STRIX_FLARE_PID = 0x1875, + AURA_ROG_STRIX_FLARE_PNK_LTD_PID = 0x18CF, + AURA_ROG_STRIX_FLARE_COD_BO4_PID = 0x18AF, + AURA_ROG_FALCHION_WIRED_PID = 0x193C, + AURA_ROG_FALCHION_WIRELESS_PID = 0x193E, + AURA_ROG_STRIX_SCOPE_PID = 0x18F8, + AURA_ROG_STRIX_SCOPE_RX_PID = 0x1951, + AURA_ROG_STRIX_SCOPE_II_96_WIRELESS_USB_PID = 0x1AAE, + AURA_ROG_STRIX_FLARE_II_ANIMATE_PID = 0x19FC, + AURA_TUF_K1_GAMING_PID = 0x1945, + AURA_TUF_K3_GAMING_PID = 0x194B, + AURA_TUF_K5_GAMING_PID = 0x1899, + AURA_TUF_K7_GAMING_PID = 0x18AA, + AURA_ROG_CLAYMORE_PID = 0x184D, }; struct led_color diff --git a/Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardLayouts.h b/Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardLayouts.h index 3058413d..19156c3a 100644 --- a/Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardLayouts.h +++ b/Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardLayouts.h @@ -101,6 +101,26 @@ static unsigned int ASUS_ROG_STRIX_SCOPE_LAYOUT_KEYS_UK[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 ASUS_ROG_STRIX_SCOPE_II_96_WIRELESS_LAYOUT_KEYS_US[6][19] = +{ + { 0, 6, 11, 17, 22, 27, 33, 39, 45, 50, 55, 61, 67, 72, 77, 80, 86, NA, 97 }, + { 1, 7, 12, 18, 23, 28, 34, 40, 46, 51, 56, 62, 68, 73, NA, 81, 87, 92, 98 }, + { 2, 8, 13, 19, 24, 29, 35, 41, 47, 52, 57, 63, 69, 74, NA, 82, 88, 93, 99 }, + { 3, 9, 14, 20, 25, 30, 36, 42, 48, 53, 58, 64, NA, 75, NA, 83, 89, 94, NA }, + { 4, NA, 15, 21, 26, 31, 37, 43, 49, 54, 59, 65, 70, NA, 78, 84, 90, 95, 100 }, + { 5, 10, 16, NA, NA, 32, 38, 44, NA, NA, 60, 66, 71, 76, 79, 85, 91, 96, NA } +}; + +static unsigned int ASUS_ROG_STRIX_SCOPE_II_96_WIRELESS_LAYOUT_KEYS_UK[6][19] = +{ + { 0, 6, 12, 18, 23, 28, 34, 40, 46, 51, 56, 62, 68, 74, 78, 81, 87, NA, 98 }, + { 1, 7, 13, 19, 24, 29, 35, 41, 47, 52, 57, 63, 69, 75, NA, 82, 88, 93, 99 }, + { 2, 8, 14, 20, 25, 30, 36, 42, 48, 53, 58, 64, 70, NA, NA, 83, 89, 94, 100 }, + { 3, 9, 15, 21, 26, 31, 37, 43, 49, 54, 59, 65, 71, 76, NA, 84, 90, 95, NA }, + { 4, 10, 16, 22, 27, 32, 38, 44, 50, 55, 60, 66, 72, NA, 79, 85, 91, 96, 101 }, + { 5, 11, 17, NA, NA, 33, 39, 45, NA, NA, 61, 67, 73, 77, 80, 86, 92, 97, NA } +}; + static unsigned int ASUS_ROG_STRIX_FLARE_LAYOUT_KEYS_US[6][26] = { { NA, 0, NA, 8, 14, 19, 24, NA, 34, 39, 44, 49, 55, 61, 66, 70, NA, 74, 78, 83, NA, 104, NA, NA, NA, NA }, @@ -792,6 +812,402 @@ static std::map AsusROGStrixScopeLayouts = }, }; +static std::map AsusROGStrixScopeII96WirelessLayouts = +{ + { + ASUS_TUF_K7_LAYOUT_NO, + { + *ASUS_ROG_STRIX_SCOPE_II_96_WIRELESS_LAYOUT_KEYS_UK, + 102, + 6, + 19, + { + { KEY_EN_ESCAPE, 0x00 }, + { KEY_NORD_HALF, 0x01 }, + { KEY_EN_TAB, 0x02 }, + { KEY_EN_CAPS_LOCK, 0x03 }, + { KEY_EN_LEFT_SHIFT, 0x04 }, + { KEY_EN_LEFT_CONTROL, 0x05 }, + + { KEY_EN_F1, 0x08 }, + { KEY_EN_1, 0x09 }, + { KEY_EN_Q, 0x0A }, + { KEY_EN_A, 0x0B }, + { KEY_NORD_ANGLE_BRACKET, 0x0C }, + { KEY_EN_LEFT_WINDOWS, 0x0D }, + + { KEY_EN_F2, 0x10 }, + { KEY_EN_2, 0x11 }, + { KEY_EN_W, 0x12 }, + { KEY_EN_S, 0x13 }, + { KEY_EN_Z, 0x14 }, + { KEY_EN_LEFT_ALT, 0x15 }, + + { KEY_EN_F3, 0x18 }, + { KEY_EN_3, 0x19 }, + { KEY_EN_E, 0x1A }, + { KEY_EN_D, 0x1B }, + { KEY_EN_X, 0x1C }, + + { KEY_EN_F4, 0x20 }, + { KEY_EN_4, 0x21 }, + { KEY_EN_R, 0x22 }, + { KEY_EN_F, 0x23 }, + { KEY_EN_C, 0x24 }, + + { KEY_EN_F5, 0x28 }, + { KEY_EN_5, 0x29 }, + { KEY_EN_T, 0x2A }, + { KEY_EN_G, 0x2B }, + { KEY_EN_V, 0x2C }, + { KEY_EN_SPACE, 0x2D }, + + { KEY_EN_F6, 0x30 }, + { KEY_EN_6, 0x31 }, + { KEY_EN_Y, 0x32 }, + { KEY_EN_H, 0x33 }, + { KEY_EN_B, 0x34 }, + { KEY_EN_SPACE, 0x35 }, + + { KEY_EN_F7, 0x38 }, + { KEY_EN_7, 0x39 }, + { KEY_EN_U, 0x3A }, + { KEY_EN_J, 0x3B }, + { KEY_EN_N, 0x3C }, + { KEY_EN_SPACE, 0x3D }, + + { KEY_EN_F8, 0x40 }, + { KEY_EN_8, 0x41 }, + { KEY_EN_I, 0x42 }, + { KEY_EN_K, 0x43 }, + { KEY_EN_M, 0x44 }, + + { KEY_EN_F9, 0x48 }, + { KEY_EN_9, 0x49 }, + { KEY_EN_O, 0x4A }, + { KEY_EN_L, 0x4B }, + { KEY_EN_COMMA, 0x4C }, + + { KEY_EN_F10, 0x50 }, + { KEY_EN_0, 0x51 }, + { KEY_EN_P, 0x52 }, + { KEY_NORD_O_AE, 0x53 }, + { KEY_EN_PERIOD, 0x54 }, + { KEY_EN_RIGHT_ALT, 0x55 }, + + { KEY_EN_F11, 0x58 }, + { KEY_NORD_PLUS_QUESTION, 0x59 }, + { KEY_NORD_AAL, 0x5A }, + { KEY_NORD_A_OE, 0x5B }, + { KEY_NORD_HYPHEN, 0x5C }, + { KEY_EN_RIGHT_FUNCTION, 0x5D }, + + { KEY_EN_F12, 0x60 }, + { KEY_NORD_ACUTE_GRAVE, 0x61 }, + { KEY_NORD_DOTS_CARET, 0x62 }, + { KEY_NORD_QUOTE, 0x63 }, + { KEY_EN_RIGHT_SHIFT, 0x64 }, + { KEY_EN_RIGHT_CONTROL, 0x65 }, + + { KEY_EN_INSERT, 0x68 }, + { KEY_EN_BACKSPACE, 0x69 }, + { KEY_EN_ISO_ENTER, 0x6B }, + { KEY_EN_LEFT_ARROW, 0x6D }, + + { KEY_EN_DELETE, 0x70 }, + { KEY_EN_UP_ARROW, 0x74 }, + { KEY_EN_DOWN_ARROW, 0x75 }, + + { KEY_EN_PAGE_UP, 0x78 }, + { KEY_EN_NUMPAD_LOCK, 0x79 }, + { KEY_EN_NUMPAD_7, 0x7A }, + { KEY_EN_NUMPAD_4, 0x7B }, + { KEY_EN_NUMPAD_1, 0x7C }, + { KEY_EN_RIGHT_ARROW, 0x7D }, + + { KEY_EN_PAGE_DOWN, 0x80 }, + { KEY_EN_NUMPAD_DIVIDE, 0x81 }, + { KEY_EN_NUMPAD_8, 0x82 }, + { KEY_EN_NUMPAD_5, 0x83 }, + { KEY_EN_NUMPAD_2, 0x84 }, + { KEY_EN_NUMPAD_0, 0x85 }, + + { KEY_EN_NUMPAD_TIMES, 0x89 }, + { KEY_EN_NUMPAD_9, 0x8A }, + { KEY_EN_NUMPAD_6, 0x8B }, + { KEY_EN_NUMPAD_3, 0x8C }, + { KEY_EN_NUMPAD_PERIOD, 0x8D }, + + { "Logo", 0x88 }, + { KEY_EN_NUMPAD_MINUS, 0x91 }, + { KEY_EN_NUMPAD_PLUS, 0x92 }, + { KEY_EN_NUMPAD_ENTER, 0x94 } + } + } + }, + { + ASUS_TUF_K7_LAYOUT_UK, + { + *ASUS_ROG_STRIX_SCOPE_II_96_WIRELESS_LAYOUT_KEYS_UK, + 102, + 6, + 19, + { + { KEY_EN_ESCAPE, 0x00 }, + { KEY_EN_BACK_TICK, 0x01 }, + { KEY_EN_TAB, 0x02 }, + { KEY_EN_CAPS_LOCK, 0x03 }, + { KEY_EN_LEFT_SHIFT, 0x04 }, + { KEY_EN_LEFT_CONTROL, 0x05 }, + + { KEY_EN_F1, 0x08 }, + { KEY_EN_1, 0x09 }, + { KEY_EN_Q, 0x0A }, + { KEY_EN_A, 0x0B }, + { KEY_EN_ISO_BACK_SLASH, 0x0C }, + { KEY_EN_LEFT_WINDOWS, 0x0D }, + + { KEY_EN_F2, 0x10 }, + { KEY_EN_2, 0x11 }, + { KEY_EN_W, 0x12 }, + { KEY_EN_S, 0x13 }, + { KEY_EN_Z, 0x14 }, + { KEY_EN_LEFT_ALT, 0x15 }, + + { KEY_EN_F3, 0x18 }, + { KEY_EN_3, 0x19 }, + { KEY_EN_E, 0x1A }, + { KEY_EN_D, 0x1B }, + { KEY_EN_X, 0x1C }, + + { KEY_EN_F4, 0x20 }, + { KEY_EN_4, 0x21 }, + { KEY_EN_R, 0x22 }, + { KEY_EN_F, 0x23 }, + { KEY_EN_C, 0x24 }, + + { KEY_EN_F5, 0x28 }, + { KEY_EN_5, 0x29 }, + { KEY_EN_T, 0x2A }, + { KEY_EN_G, 0x2B }, + { KEY_EN_V, 0x2C }, + { KEY_EN_SPACE, 0x2D }, + + { KEY_EN_F6, 0x30 }, + { KEY_EN_6, 0x31 }, + { KEY_EN_Y, 0x32 }, + { KEY_EN_H, 0x33 }, + { KEY_EN_B, 0x34 }, + { KEY_EN_SPACE, 0x35 }, + + { KEY_EN_F7, 0x38 }, + { KEY_EN_7, 0x39 }, + { KEY_EN_U, 0x3A }, + { KEY_EN_J, 0x3B }, + { KEY_EN_N, 0x3C }, + { KEY_EN_SPACE, 0x3D }, + + { KEY_EN_F8, 0x40 }, + { KEY_EN_8, 0x41 }, + { KEY_EN_I, 0x42 }, + { KEY_EN_K, 0x43 }, + { KEY_EN_M, 0x44 }, + + { KEY_EN_F9, 0x48 }, + { KEY_EN_9, 0x49 }, + { KEY_EN_O, 0x4A }, + { KEY_EN_L, 0x4B }, + { KEY_EN_COMMA, 0x4C }, + + { KEY_EN_F10, 0x50 }, + { KEY_EN_0, 0x51 }, + { KEY_EN_P, 0x52 }, + { KEY_EN_SEMICOLON, 0x53 }, + { KEY_EN_PERIOD, 0x54 }, + { KEY_EN_RIGHT_ALT, 0x55 }, + + { KEY_EN_F11, 0x58 }, + { KEY_EN_MINUS, 0x59 }, + { KEY_EN_LEFT_BRACKET, 0x5A }, + { KEY_EN_QUOTE, 0x5B }, + { KEY_EN_FORWARD_SLASH, 0x5C }, + { KEY_EN_RIGHT_FUNCTION, 0x5D }, + + { KEY_EN_F12, 0x60 }, + { KEY_EN_EQUALS, 0x61 }, + { KEY_EN_RIGHT_BRACKET, 0x62 }, + { KEY_EN_POUND, 0x63 }, + { KEY_EN_RIGHT_SHIFT, 0x64 }, + { KEY_EN_RIGHT_CONTROL, 0x65 }, + + { KEY_EN_INSERT, 0x68 }, + { KEY_EN_BACKSPACE, 0x69 }, + { KEY_EN_ISO_ENTER, 0x6B }, + { KEY_EN_LEFT_ARROW, 0x6D }, + + { KEY_EN_DELETE, 0x70 }, + { KEY_EN_UP_ARROW, 0x74 }, + { KEY_EN_DOWN_ARROW, 0x75 }, + + { KEY_EN_PAGE_UP, 0x78 }, + { KEY_EN_NUMPAD_LOCK, 0x79 }, + { KEY_EN_NUMPAD_7, 0x7A }, + { KEY_EN_NUMPAD_4, 0x7B }, + { KEY_EN_NUMPAD_1, 0x7C }, + { KEY_EN_RIGHT_ARROW, 0x7D }, + + { KEY_EN_PAGE_DOWN, 0x80 }, + { KEY_EN_NUMPAD_DIVIDE, 0x81 }, + { KEY_EN_NUMPAD_8, 0x82 }, + { KEY_EN_NUMPAD_5, 0x83 }, + { KEY_EN_NUMPAD_2, 0x84 }, + { KEY_EN_NUMPAD_0, 0x85 }, + + { KEY_EN_NUMPAD_TIMES, 0x89 }, + { KEY_EN_NUMPAD_9, 0x8A }, + { KEY_EN_NUMPAD_6, 0x8B }, + { KEY_EN_NUMPAD_3, 0x8C }, + { KEY_EN_NUMPAD_PERIOD, 0x8D }, + + { "Logo", 0x88 }, + { KEY_EN_NUMPAD_MINUS, 0x91 }, + { KEY_EN_NUMPAD_PLUS, 0x92 }, + { KEY_EN_NUMPAD_ENTER, 0x94 } + } + } + }, + { + ASUS_TUF_K7_LAYOUT_US, + { + *ASUS_ROG_STRIX_SCOPE_II_96_WIRELESS_LAYOUT_KEYS_US, + 101, + 6, + 19, + { + { KEY_EN_ESCAPE, 0x00 }, + { KEY_EN_BACK_TICK, 0x01 }, + { KEY_EN_TAB, 0x02 }, + { KEY_EN_CAPS_LOCK, 0x03 }, + { KEY_EN_LEFT_SHIFT, 0x04 }, + { KEY_EN_LEFT_CONTROL, 0x05 }, + + { KEY_EN_F1, 0x08 }, + { KEY_EN_1, 0x09 }, + { KEY_EN_Q, 0x0A }, + { KEY_EN_A, 0x0B }, + { KEY_EN_LEFT_WINDOWS, 0x0D }, + + { KEY_EN_F2, 0x10 }, + { KEY_EN_2, 0x11 }, + { KEY_EN_W, 0x12 }, + { KEY_EN_S, 0x13 }, + { KEY_EN_Z, 0x14 }, + { KEY_EN_LEFT_ALT, 0x15 }, + + { KEY_EN_F3, 0x18 }, + { KEY_EN_3, 0x19 }, + { KEY_EN_E, 0x1A }, + { KEY_EN_D, 0x1B }, + { KEY_EN_X, 0x1C }, + + { KEY_EN_F4, 0x20 }, + { KEY_EN_4, 0x21 }, + { KEY_EN_R, 0x22 }, + { KEY_EN_F, 0x23 }, + { KEY_EN_C, 0x24 }, + + { KEY_EN_F5, 0x28 }, + { KEY_EN_5, 0x29 }, + { KEY_EN_T, 0x2A }, + { KEY_EN_G, 0x2B }, + { KEY_EN_V, 0x2C }, + { KEY_EN_SPACE, 0x2D }, + + { KEY_EN_F6, 0x30 }, + { KEY_EN_6, 0x31 }, + { KEY_EN_Y, 0x32 }, + { KEY_EN_H, 0x33 }, + { KEY_EN_B, 0x34 }, + { KEY_EN_SPACE, 0x35 }, + + { KEY_EN_F7, 0x38 }, + { KEY_EN_7, 0x39 }, + { KEY_EN_U, 0x3A }, + { KEY_EN_J, 0x3B }, + { KEY_EN_N, 0x3C }, + { KEY_EN_SPACE, 0x3D }, + + { KEY_EN_F8, 0x40 }, + { KEY_EN_8, 0x41 }, + { KEY_EN_I, 0x42 }, + { KEY_EN_K, 0x43 }, + { KEY_EN_M, 0x44 }, + + { KEY_EN_F9, 0x48 }, + { KEY_EN_9, 0x49 }, + { KEY_EN_O, 0x4A }, + { KEY_EN_L, 0x4B }, + { KEY_EN_COMMA, 0x4C }, + + { KEY_EN_F10, 0x50 }, + { KEY_EN_0, 0x51 }, + { KEY_EN_P, 0x52 }, + { KEY_EN_SEMICOLON, 0x53 }, + { KEY_EN_PERIOD, 0x54 }, + { KEY_EN_RIGHT_ALT, 0x55 }, + + { KEY_EN_F11, 0x58 }, + { KEY_EN_MINUS, 0x59 }, + { KEY_EN_LEFT_BRACKET, 0x5A }, + { KEY_EN_QUOTE, 0x5B }, + { KEY_EN_FORWARD_SLASH, 0x5C }, + { KEY_EN_RIGHT_FUNCTION, 0x5D }, + + { KEY_EN_F12, 0x60 }, + { KEY_EN_EQUALS, 0x61 }, + { KEY_EN_RIGHT_BRACKET, 0x62 }, + { KEY_EN_RIGHT_SHIFT, 0x64 }, + { KEY_EN_RIGHT_CONTROL, 0x65 }, + + { KEY_EN_INSERT, 0x68 }, + { KEY_EN_BACKSPACE, 0x69 }, + { KEY_EN_ANSI_BACK_SLASH, 0x6A }, + { KEY_EN_ANSI_ENTER, 0x6B }, + { KEY_EN_LEFT_ARROW, 0x6D }, + + { KEY_EN_DELETE, 0x70 }, + { KEY_EN_UP_ARROW, 0x74 }, + { KEY_EN_DOWN_ARROW, 0x75 }, + + { KEY_EN_PAGE_UP, 0x78 }, + { KEY_EN_NUMPAD_LOCK, 0x79 }, + { KEY_EN_NUMPAD_7, 0x7A }, + { KEY_EN_NUMPAD_4, 0x7B }, + { KEY_EN_NUMPAD_1, 0x7C }, + { KEY_EN_RIGHT_ARROW, 0x7D }, + + { KEY_EN_PAGE_DOWN, 0x80 }, + { KEY_EN_NUMPAD_DIVIDE, 0x81 }, + { KEY_EN_NUMPAD_8, 0x82 }, + { KEY_EN_NUMPAD_5, 0x83 }, + { KEY_EN_NUMPAD_2, 0x84 }, + { KEY_EN_NUMPAD_0, 0x85 }, + + { KEY_EN_NUMPAD_TIMES, 0x89 }, + { KEY_EN_NUMPAD_9, 0x8A }, + { KEY_EN_NUMPAD_6, 0x8B }, + { KEY_EN_NUMPAD_3, 0x8C }, + { KEY_EN_NUMPAD_PERIOD, 0x8D }, + + { "Logo", 0x88 }, + { KEY_EN_NUMPAD_MINUS, 0x91 }, + { KEY_EN_NUMPAD_PLUS, 0x92 }, + { KEY_EN_NUMPAD_ENTER, 0x94 } + } + } + }, +}; + static std::map AsusROGStrixFlareLayouts = { { diff --git a/Controllers/AsusAuraUSBController/AsusAuraUSBControllerDetect.cpp b/Controllers/AsusAuraUSBController/AsusAuraUSBControllerDetect.cpp index 7f113b9b..49b16c2b 100644 --- a/Controllers/AsusAuraUSBController/AsusAuraUSBControllerDetect.cpp +++ b/Controllers/AsusAuraUSBController/AsusAuraUSBControllerDetect.cpp @@ -26,76 +26,77 @@ #include #include "dependencies/dmiinfo.h" -#define AURA_USB_VID 0x0B05 +#define AURA_USB_VID 0x0B05 /*-----------------------------------------------------------------*\ | MOTHERBOARDS | \*-----------------------------------------------------------------*/ -#define AURA_ADDRESSABLE_1_PID 0x1867 -#define AURA_ADDRESSABLE_2_PID 0x1872 -#define AURA_ADDRESSABLE_3_PID 0x18A3 -#define AURA_ADDRESSABLE_4_PID 0x18A5 -#define AURA_MOTHERBOARD_1_PID 0x18F3 -#define AURA_MOTHERBOARD_2_PID 0x1939 -#define AURA_MOTHERBOARD_3_PID 0x19AF +#define AURA_ADDRESSABLE_1_PID 0x1867 +#define AURA_ADDRESSABLE_2_PID 0x1872 +#define AURA_ADDRESSABLE_3_PID 0x18A3 +#define AURA_ADDRESSABLE_4_PID 0x18A5 +#define AURA_MOTHERBOARD_1_PID 0x18F3 +#define AURA_MOTHERBOARD_2_PID 0x1939 +#define AURA_MOTHERBOARD_3_PID 0x19AF /*-----------------------------------------------------------------*\ | KEYBOARDS | \*-----------------------------------------------------------------*/ -#define AURA_ROG_FALCHION_WIRED_PID 0x193C -#define AURA_ROG_FALCHION_WIRELESS_PID 0x193E -#define AURA_ROG_STRIX_FLARE_PID 0x1875 -#define AURA_ROG_STRIX_FLARE_PNK_LTD_PID 0x18CF -#define AURA_ROG_STRIX_FLARE_COD_BO4_PID 0x18AF -#define AURA_ROG_STRIX_FLARE_II_ANIMATE_PID 0x19FC -#define AURA_ROG_STRIX_SCOPE_PID 0x18F8 -#define AURA_ROG_STRIX_SCOPE_RX_PID 0x1951 -#define AURA_ROG_STRIX_SCOPE_TKL_PID 0x190C -#define AURA_ROG_STRIX_SCOPE_RX_TKL_DELUXE_PID 0x1A05 -#define AURA_ROG_STRIX_SCOPE_TKL_PNK_LTD_PID 0x1954 -#define AURA_ROG_CLAYMORE_PID 0x184D -#define AURA_TUF_K1_GAMING_PID 0x1945 -#define AURA_TUF_K3_GAMING_PID 0x194B -#define AURA_TUF_K5_GAMING_PID 0x1899 -#define AURA_TUF_K7_GAMING_PID 0x18AA +#define AURA_ROG_FALCHION_WIRED_PID 0x193C +#define AURA_ROG_FALCHION_WIRELESS_PID 0x193E +#define AURA_ROG_STRIX_FLARE_PID 0x1875 +#define AURA_ROG_STRIX_FLARE_PNK_LTD_PID 0x18CF +#define AURA_ROG_STRIX_FLARE_COD_BO4_PID 0x18AF +#define AURA_ROG_STRIX_FLARE_II_ANIMATE_PID 0x19FC +#define AURA_ROG_STRIX_SCOPE_PID 0x18F8 +#define AURA_ROG_STRIX_SCOPE_RX_PID 0x1951 +#define AURA_ROG_STRIX_SCOPE_TKL_PID 0x190C +#define AURA_ROG_STRIX_SCOPE_RX_TKL_DELUXE_PID 0x1A05 +#define AURA_ROG_STRIX_SCOPE_TKL_PNK_LTD_PID 0x1954 +#define AURA_ROG_STRIX_SCOPE_II_96_WIRELESS_USB_PID 0x1AAE +#define AURA_ROG_CLAYMORE_PID 0x184D +#define AURA_TUF_K1_GAMING_PID 0x1945 +#define AURA_TUF_K3_GAMING_PID 0x194B +#define AURA_TUF_K5_GAMING_PID 0x1899 +#define AURA_TUF_K7_GAMING_PID 0x18AA /*-----------------------------------------------------------------*\ | MICE - defined in AsusAuraMouseDevices.h | \*-----------------------------------------------------------------*/ -#define AURA_ROG_STRIX_EVOLVE_PID 0x185B +#define AURA_ROG_STRIX_EVOLVE_PID 0x185B /*-----------------------------------------------------------------*\ | MOUSEMATS | \*-----------------------------------------------------------------*/ -#define AURA_ROG_BALTEUS_PID 0x1891 -#define AURA_ROG_BALTEUS_QI_PID 0x1890 +#define AURA_ROG_BALTEUS_PID 0x1891 +#define AURA_ROG_BALTEUS_QI_PID 0x1890 /*-----------------------------------------------------------------*\ | MONITORS | \*-----------------------------------------------------------------*/ -#define AURA_ROG_STRIX_XG27AQ_PID 0x198C -#define AURA_ROG_STRIX_XG27AQM_PID 0x19BB -#define AURA_ROG_STRIX_XG279Q_PID 0x1919 -#define AURA_ROG_STRIX_XG27W_PID 0x1933 -#define AURA_ROG_PG32UQ_PID 0x19B9 +#define AURA_ROG_STRIX_XG27AQ_PID 0x198C +#define AURA_ROG_STRIX_XG27AQM_PID 0x19BB +#define AURA_ROG_STRIX_XG279Q_PID 0x1919 +#define AURA_ROG_STRIX_XG27W_PID 0x1933 +#define AURA_ROG_PG32UQ_PID 0x19B9 /*-----------------------------------------------------------------*\ | HEADSETSTANDS | \*-----------------------------------------------------------------*/ -#define AURA_ROG_THRONE_PID 0x18D9 -#define AURA_ROG_THRONE_QI_PID 0x18C5 -#define AURA_ROG_THRONE_QI_GUNDAM_PID 0x1994 +#define AURA_ROG_THRONE_PID 0x18D9 +#define AURA_ROG_THRONE_QI_PID 0x18C5 +#define AURA_ROG_THRONE_QI_GUNDAM_PID 0x1994 /*-----------------------------------------------------------------*\ | OTHER | \*-----------------------------------------------------------------*/ -#define AURA_TERMINAL_PID 0x1889 -#define ROG_STRIX_LC120_PID 0x879E -#define AURA_RYUO_AIO_PID 0x1887 -#define ASUS_ROG_ALLY_PID 0x1ABE +#define AURA_TERMINAL_PID 0x1889 +#define ROG_STRIX_LC120_PID 0x879E +#define AURA_RYUO_AIO_PID 0x1887 +#define ASUS_ROG_ALLY_PID 0x1ABE AuraKeyboardMappingLayoutType GetKeyboardMappingLayoutType(int pid) { @@ -328,6 +329,7 @@ REGISTER_HID_DETECTOR_IP("ASUS TUF Gaming K5", DetectAs REGISTER_HID_DETECTOR_IP("ASUS ROG Strix Scope", DetectAsusAuraTUFUSBKeyboard, AURA_USB_VID, AURA_ROG_STRIX_SCOPE_PID, 1, 0xFF00); REGISTER_HID_DETECTOR_IP("ASUS ROG Strix Scope RX", DetectAsusAuraTUFUSBKeyboard, AURA_USB_VID, AURA_ROG_STRIX_SCOPE_RX_PID, 1, 0xFF00); REGISTER_HID_DETECTOR_IP("ASUS TUF Gaming K7", DetectAsusAuraTUFUSBKeyboard, AURA_USB_VID, AURA_TUF_K7_GAMING_PID, 1, 0xFF00); +REGISTER_HID_DETECTOR_IP("ASUS ROG Strix Scope II 96 Wireless USB", DetectAsusAuraTUFUSBKeyboard, AURA_USB_VID, AURA_ROG_STRIX_SCOPE_II_96_WIRELESS_USB_PID, 1, 0xFF00); /*-----------------------------------------------------------------*\ | MICE | diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraTUFKeyboard.cpp b/Controllers/AsusAuraUSBController/RGBController_AsusAuraTUFKeyboard.cpp index 3cb1c947..525763f6 100644 --- a/Controllers/AsusAuraUSBController/RGBController_AsusAuraTUFKeyboard.cpp +++ b/Controllers/AsusAuraUSBController/RGBController_AsusAuraTUFKeyboard.cpp @@ -63,6 +63,7 @@ RGBController_AuraTUFKeyboard::RGBController_AuraTUFKeyboard(AuraTUFKeyboardCont case AURA_ROG_STRIX_FLARE_II_ANIMATE_PID: case AURA_ROG_STRIX_SCOPE_RX_PID: case AURA_ROG_STRIX_SCOPE_PID: + case AURA_ROG_STRIX_SCOPE_II_96_WIRELESS_USB_PID: case AURA_TUF_K5_GAMING_PID: AURA_KEYBOARD_SPEED_MIN = 255; AURA_KEYBOARD_SPEED_MAX = 0; @@ -411,6 +412,9 @@ void RGBController_AuraTUFKeyboard::SetupZones() case AURA_ROG_STRIX_SCOPE_RX_PID: keyboard_ptr = &AsusROGStrixScopeLayouts; break; + case AURA_ROG_STRIX_SCOPE_II_96_WIRELESS_USB_PID: + keyboard_ptr = &AsusROGStrixScopeII96WirelessLayouts; + break; case AURA_ROG_STRIX_FLARE_II_ANIMATE_PID: keyboard_ptr = &AsusROGStrixFlareIILayouts; break;