diff --git a/Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardController.cpp b/Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardController.cpp index 3d0607b8..77e7fc05 100644 --- a/Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardController.cpp +++ b/Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardController.cpp @@ -100,6 +100,7 @@ std::string AuraTUFKeyboardController::GetVersion() case AURA_TUF_K3_GAMING_PID: case AURA_ROG_STRIX_FLARE_II_ANIMATE_PID: case AURA_ROG_STRIX_SCOPE_NX_WIRELESS_DELUXE_USB_PID: + case AURA_ROG_STRIX_SCOPE_II_PID: case AURA_ROG_STRIX_SCOPE_II_RX_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]); @@ -494,8 +495,9 @@ void AuraTUFKeyboardController::UpdateDevice || device_pid == AURA_ROG_AZOTH_2_4_PID || device_pid == AURA_ROG_STRIX_SCOPE_NX_WIRELESS_DELUXE_USB_PID || device_pid == AURA_ROG_STRIX_SCOPE_NX_WIRELESS_DELUXE_2_4_PID - || device_pid == AURA_ROG_STRIX_SCOPE_II_96_WIRELESS_USB_PID - || device_pid == AURA_ROG_STRIX_SCOPE_II_RX_PID) + || device_pid == AURA_ROG_STRIX_SCOPE_II_PID + || device_pid == AURA_ROG_STRIX_SCOPE_II_RX_PID + || device_pid == AURA_ROG_STRIX_SCOPE_II_96_WIRELESS_USB_PID) { if(mode == AURA_KEYBOARD_MODE_WAVE || mode == AURA_KEYBOARD_MODE_RIPPLE) { diff --git a/Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardController.h b/Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardController.h index 27b14f0e..42656cf7 100644 --- a/Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardController.h +++ b/Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardController.h @@ -47,6 +47,7 @@ enum AURA_ROG_STRIX_SCOPE_RX_PID = 0x1951, AURA_ROG_STRIX_SCOPE_NX_WIRELESS_DELUXE_USB_PID = 0x19F6, AURA_ROG_STRIX_SCOPE_NX_WIRELESS_DELUXE_2_4_PID = 0x19F8, + AURA_ROG_STRIX_SCOPE_II_PID = 0x1AB3, AURA_ROG_STRIX_SCOPE_II_RX_PID = 0x1AB5, AURA_ROG_STRIX_SCOPE_II_96_WIRELESS_USB_PID = 0x1AAE, AURA_TUF_K1_GAMING_PID = 0x1945, diff --git a/Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardLayouts.h b/Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardLayouts.h index 8b19c501..d3bc6d26 100644 --- a/Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardLayouts.h +++ b/Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardLayouts.h @@ -119,7 +119,7 @@ static unsigned int ASUS_ROG_STRIX_SCOPE_LAYOUT_KEYS_ISO[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_RX_LAYOUT_KEYS_ANSI[6][24] = +static unsigned int ASUS_ROG_STRIX_SCOPE_II_LAYOUT_KEYS_ANSI[6][24] = { { 0, NA, 8, 14, 19, 24, NA, 35, 41, 46, 51, 57, 63, 68, 72, NA, 76, 80, 85, NA, NA, 94, NA, NA }, { 1, 6, 9, 15, 20, 25, 30, 36, 42, 47, 52, 58, 64, 69, NA, NA, 77, 81, 86, NA, 89, 95, 99, 104 }, @@ -130,7 +130,7 @@ static unsigned int ASUS_ROG_STRIX_SCOPE_II_RX_LAYOUT_KEYS_ANSI[6][24] = }; -static unsigned int ASUS_ROG_STRIX_SCOPE_II_RX_LAYOUT_KEYS_ISO[6][24] = +static unsigned int ASUS_ROG_STRIX_SCOPE_II_LAYOUT_KEYS_ISO[6][24] = { { 0, NA, 9, 15, 20, 25, NA, 36, 42, 47, 52, 58, 64, 69, 74, NA, 77, 81, 86, NA, NA, 95, NA, NA }, { 1, 6, 10, 16, 21, 26, 31, 37, 43, 48, 53, 59, 65, 70, NA, NA, 78, 82, 87, NA, 90, 96, 100, 105 }, @@ -1092,12 +1092,12 @@ static std::map AsusROGStrixScopeLayouts = }, }; -static std::map AsusROGStrixScopeIIRXLayouts = +static std::map AsusROGStrixScopeIILayouts = { { ASUS_TUF_K7_LAYOUT_UK, { - *ASUS_ROG_STRIX_SCOPE_II_RX_LAYOUT_KEYS_ISO, + *ASUS_ROG_STRIX_SCOPE_II_LAYOUT_KEYS_ISO, 108, 6, 24, @@ -1238,7 +1238,7 @@ static std::map AsusROGStrixScopeIIRXLayouts = { ASUS_TUF_K7_LAYOUT_US, { - *ASUS_ROG_STRIX_SCOPE_II_RX_LAYOUT_KEYS_ANSI, + *ASUS_ROG_STRIX_SCOPE_II_LAYOUT_KEYS_ANSI, 107, 6, 24, diff --git a/Controllers/AsusAuraUSBController/AsusAuraUSBControllerDetect.cpp b/Controllers/AsusAuraUSBController/AsusAuraUSBControllerDetect.cpp index d7338cc5..dec3bf96 100644 --- a/Controllers/AsusAuraUSBController/AsusAuraUSBControllerDetect.cpp +++ b/Controllers/AsusAuraUSBController/AsusAuraUSBControllerDetect.cpp @@ -61,6 +61,7 @@ #define AURA_ROG_STRIX_SCOPE_RX_TKL_DELUXE_PID 0x1A05 #define AURA_ROG_STRIX_SCOPE_NX_WIRELESS_DELUXE_USB_PID 0x19F6 #define AURA_ROG_STRIX_SCOPE_NX_WIRELESS_DELUXE_2_4_PID 0x19F8 +#define AURA_ROG_STRIX_SCOPE_II_PID 0x1AB3 #define AURA_ROG_STRIX_SCOPE_II_RX_PID 0x1AB5 #define AURA_ROG_STRIX_SCOPE_II_96_WIRELESS_USB_PID 0x1AAE #define AURA_TUF_K1_GAMING_PID 0x1945 @@ -354,6 +355,7 @@ REGISTER_HID_DETECTOR_IP("ASUS ROG Strix Scope", Dete 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 ROG Strix Scope NX Wireless Deluxe USB", DetectAsusAuraTUFUSBKeyboard, AURA_USB_VID, AURA_ROG_STRIX_SCOPE_NX_WIRELESS_DELUXE_USB_PID, 1, 0xFF00); REGISTER_HID_DETECTOR_IP("ASUS ROG Strix Scope NX Wireless Deluxe 2.4GHz", DetectAsusAuraTUFUSBKeyboard, AURA_USB_VID, AURA_ROG_STRIX_SCOPE_NX_WIRELESS_DELUXE_2_4_PID, 1, 0xFF00); +REGISTER_HID_DETECTOR_IP("ASUS ROG Strix Scope II", DetectAsusAuraTUFUSBKeyboard, AURA_USB_VID, AURA_ROG_STRIX_SCOPE_II_PID, 1, 0xFF00); REGISTER_HID_DETECTOR_IP("ASUS ROG Strix Scope II RX", DetectAsusAuraTUFUSBKeyboard, AURA_USB_VID, AURA_ROG_STRIX_SCOPE_II_RX_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); REGISTER_HID_DETECTOR_IP("ASUS TUF Gaming K1", DetectAsusAuraTUFUSBKeyboard, AURA_USB_VID, AURA_TUF_K1_GAMING_PID, 2, 0xFF00); diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraTUFKeyboard.cpp b/Controllers/AsusAuraUSBController/RGBController_AsusAuraTUFKeyboard.cpp index aeb1014d..8750b597 100644 --- a/Controllers/AsusAuraUSBController/RGBController_AsusAuraTUFKeyboard.cpp +++ b/Controllers/AsusAuraUSBController/RGBController_AsusAuraTUFKeyboard.cpp @@ -68,6 +68,7 @@ RGBController_AuraTUFKeyboard::RGBController_AuraTUFKeyboard(AuraTUFKeyboardCont case AURA_ROG_STRIX_SCOPE_PID: case AURA_ROG_STRIX_SCOPE_NX_WIRELESS_DELUXE_2_4_PID: case AURA_ROG_STRIX_SCOPE_NX_WIRELESS_DELUXE_USB_PID: + case AURA_ROG_STRIX_SCOPE_II_PID: case AURA_ROG_STRIX_SCOPE_II_RX_PID: case AURA_ROG_STRIX_SCOPE_II_96_WIRELESS_USB_PID: case AURA_TUF_K5_GAMING_PID: @@ -420,8 +421,9 @@ void RGBController_AuraTUFKeyboard::SetupZones() case AURA_ROG_STRIX_SCOPE_NX_WIRELESS_DELUXE_2_4_PID: keyboard_ptr = &AsusROGStrixScopeLayouts; break; + case AURA_ROG_STRIX_SCOPE_II_PID: case AURA_ROG_STRIX_SCOPE_II_RX_PID: - keyboard_ptr = &AsusROGStrixScopeIIRXLayouts; + keyboard_ptr = &AsusROGStrixScopeIILayouts; break; case AURA_ROG_STRIX_SCOPE_II_96_WIRELESS_USB_PID: keyboard_ptr = &AsusROGStrixScopeII96WirelessLayouts;