From 36f961637e8303442ebac100a83e06109ba6659d Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Thu, 26 Aug 2021 11:33:14 -0500 Subject: [PATCH] Add Razer Core X to RazerController --- .../RazerController/RazerController.cpp | 6 +++ .../RazerController/RazerControllerDetect.cpp | 1 + Controllers/RazerController/RazerDevices.h | 49 +++++++++++++++++++ 3 files changed, 56 insertions(+) diff --git a/Controllers/RazerController/RazerController.cpp b/Controllers/RazerController/RazerController.cpp index d87a607f9..e96c435ba 100644 --- a/Controllers/RazerController/RazerController.cpp +++ b/Controllers/RazerController/RazerController.cpp @@ -81,6 +81,7 @@ RazerController::RazerController(hid_device* dev_handle, hid_device* dev_argb_ha case RAZER_BASE_STATION_CHROMA_PID: case RAZER_CHROMA_HDK_PID: case RAZER_CORE_PID: + case RAZER_CORE_X_PID: case RAZER_FIREFLY_PID: case RAZER_FIREFLY_HYPERFLUX_PID: case RAZER_FIREFLY_V2_PID: @@ -104,6 +105,7 @@ RazerController::RazerController(hid_device* dev_handle, hid_device* dev_argb_ha case RAZER_BASE_STATION_V2_CHROMA_PID: case RAZER_CHARGING_PAD_CHROMA_PID: case RAZER_CHROMA_HDK_PID: + case RAZER_CORE_X_PID: case RAZER_FIREFLY_V2_PID: dev_led_id = RAZER_LED_ID_ZERO; break; @@ -121,6 +123,7 @@ RazerController::RazerController(hid_device* dev_handle, hid_device* dev_argb_ha case RAZER_HUNTSMAN_TE_PID: case RAZER_ORNATA_CHROMA_PID: case RAZER_ORNATA_CHROMA_V2_PID: + case RAZER_CORE_PID: case RAZER_FIREFLY_PID: default: dev_led_id = RAZER_LED_ID_BACKLIGHT; @@ -166,6 +169,7 @@ RazerController::RazerController(hid_device* dev_handle, hid_device* dev_argb_ha case RAZER_BLADE_STEALTH_LATE_2020_PID: case RAZER_BOOK_13_2020_PID: case RAZER_NAGA_HEX_V2_PID: + case RAZER_CORE_PID: matrix_type = RAZER_MATRIX_TYPE_STANDARD; break; @@ -184,6 +188,7 @@ RazerController::RazerController(hid_device* dev_handle, hid_device* dev_argb_ha case RAZER_CHARGING_PAD_CHROMA_PID: case RAZER_CHROMA_HDK_PID: case RAZER_CHROMA_PC_CASE_LIGHTING_KIT_PID: + case RAZER_CORE_X_PID: case RAZER_CYNOSA_CHROMA_PID: case RAZER_CYNOSA_V2_PID: case RAZER_DEATHADDER_ELITE_PID: @@ -477,6 +482,7 @@ bool RazerController::SupportsWave() case RAZER_CHROMA_HDK_PID: case RAZER_CHROMA_PC_CASE_LIGHTING_KIT_PID: case RAZER_CORE_PID: + case RAZER_CORE_X_PID: case RAZER_FIREFLY_PID: case RAZER_FIREFLY_V2_PID: case RAZER_MOUSE_BUNGEE_V3_CHROMA_PID: diff --git a/Controllers/RazerController/RazerControllerDetect.cpp b/Controllers/RazerController/RazerControllerDetect.cpp index 755215029..90112ca5b 100644 --- a/Controllers/RazerController/RazerControllerDetect.cpp +++ b/Controllers/RazerController/RazerControllerDetect.cpp @@ -329,6 +329,7 @@ REGISTER_HID_DETECTOR_IPU("Razer Chroma HDK", Det REGISTER_HID_DETECTOR_IPU("Razer Chroma Mug Holder", DetectRazerControllers, RAZER_VID, RAZER_CHROMA_MUG_PID, 0x00, 0x01, 0x02); REGISTER_HID_DETECTOR_IPU("Razer Chroma PC Case Lighting Kit", DetectRazerControllers, RAZER_VID, RAZER_CHROMA_PC_CASE_LIGHTING_KIT_PID, 0x00, 0x01, 0x02); REGISTER_HID_DETECTOR_IPU("Razer Core", DetectRazerControllers, RAZER_VID, RAZER_CORE_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Core X", DetectRazerControllers, RAZER_VID, RAZER_CORE_X_PID, 0x00, 0x01, 0x02); REGISTER_HID_DETECTOR_IPU("Razer Mouse Bungee V3 Chroma", DetectRazerControllers, RAZER_VID, RAZER_MOUSE_BUNGEE_V3_CHROMA_PID, 0x00, 0x01, 0x02); REGISTER_HID_DETECTOR_IPU("Razer Mouse Dock Chroma", DetectRazerControllers, RAZER_VID, RAZER_MOUSE_DOCK_CHROMA_PID, 0x00, 0x01, 0x02); REGISTER_HID_DETECTOR_IPU("Razer Nommo Chroma", DetectRazerControllers, RAZER_VID, RAZER_NOMMO_CHROMA_PID, 0x00, 0x01, 0x03); diff --git a/Controllers/RazerController/RazerDevices.h b/Controllers/RazerController/RazerDevices.h index 70bf8d1f7..4e83b4d75 100644 --- a/Controllers/RazerController/RazerDevices.h +++ b/Controllers/RazerController/RazerDevices.h @@ -158,6 +158,7 @@ #define RAZER_CHROMA_MUG_PID 0x0F07 #define RAZER_CHROMA_PC_CASE_LIGHTING_KIT_PID 0x0F0E #define RAZER_CORE_PID 0x0215 +#define RAZER_CORE_X_PID 0x0F1A #define RAZER_FIREFLY_HYPERFLUX_PID 0x0068 #define RAZER_FIREFLY_PID 0x0C00 #define RAZER_FIREFLY_V2_PID 0x0C04 @@ -5678,6 +5679,53 @@ static const razer_device core_device = 0 }; +/*-------------------------------------------------------------*\ +| Razer Core X | +| | +| Zone "Side Window Lights" | +| Single | +| 1 LED | +| | +| Zone "LED Strip" | +| Linear | +| 15 LEDs | +\*-------------------------------------------------------------*/ +static const razer_zone core_x_side_zone = +{ + "Side Window Lights", + ZONE_TYPE_SINGLE, + 1, + 1 +}; + +static const razer_zone core_x_led_strip_zone = +{ + "LED Strip", + ZONE_TYPE_LINEAR, + 1, + 15 +}; + +static const razer_device core_x_device = +{ + "Razer Core X", + RAZER_CORE_X_PID, + DEVICE_TYPE_UNKNOWN, + true, + 1, + 16, + { + &core_x_side_zone, + &core_x_led_strip_zone, + NULL, + NULL, + NULL, + NULL + }, + NULL, + 0 +}; + /*-------------------------------------------------------------*\ | Razer Chroma Mug Holder | | | @@ -6292,6 +6340,7 @@ static const razer_device* device_list[] = &chromahdk_device, &chroma_pc_case_lighting_kit_device, &core_device, + &core_x_device, &mug_holder_device, &mouse_dock_chroma_device, &nommo_chroma_device,