From 2652e92461779d0545f07bb53313165f99b3ef74 Mon Sep 17 00:00:00 2001 From: Chris M Date: Sun, 15 Dec 2024 22:50:51 +1100 Subject: [PATCH] Initial commit for Razer Firefly V2 Pro + Adding PID `0x0C08` for the Firefly V2 Pro + Added metadata to RazerDevices.cpp + Registered detectors + Added capabilities to RazerController.cpp + Resolves #4239 --- .../RazerController/RazerController.cpp | 2 + .../RazerController/RazerControllerDetect.cpp | 1 + Controllers/RazerController/RazerDevices.cpp | 38 ++++++++++++++++++- Controllers/RazerController/RazerDevices.h | 1 + 4 files changed, 41 insertions(+), 1 deletion(-) diff --git a/Controllers/RazerController/RazerController/RazerController.cpp b/Controllers/RazerController/RazerController/RazerController.cpp index 1a862cb0..1eeb7261 100644 --- a/Controllers/RazerController/RazerController/RazerController.cpp +++ b/Controllers/RazerController/RazerController/RazerController.cpp @@ -107,6 +107,7 @@ RazerController::RazerController(hid_device* dev_handle, hid_device* dev_argb_ha case RAZER_DEATHSTALKER_V2_PRO_WIRED_PID: case RAZER_DEATHSTALKER_V2_PRO_WIRELESS_PID: case RAZER_FIREFLY_V2_PID: + case RAZER_FIREFLY_V2_PRO_PID: case RAZER_FIREFLY_HYPERFLUX_PID: case RAZER_GOLIATHUS_CHROMA_EXTENDED_PID: case RAZER_GOLIATHUS_CHROMA_PID: @@ -488,6 +489,7 @@ bool RazerController::SupportsWave() case RAZER_CORE_X_PID: case RAZER_FIREFLY_PID: case RAZER_FIREFLY_V2_PID: + case RAZER_FIREFLY_V2_PRO_PID: case RAZER_FIREFLY_HYPERFLUX_PID: case RAZER_LAPTOP_STAND_CHROMA_PID: case RAZER_LAPTOP_STAND_CHROMA_V2_PID: diff --git a/Controllers/RazerController/RazerControllerDetect.cpp b/Controllers/RazerController/RazerControllerDetect.cpp index 4cc43706..0d243a99 100644 --- a/Controllers/RazerController/RazerControllerDetect.cpp +++ b/Controllers/RazerController/RazerControllerDetect.cpp @@ -323,6 +323,7 @@ REGISTER_HID_DETECTOR_I( "Razer Tiamat 7.1 V2", Det \*-----------------------------------------------------------------------------------------------------*/ REGISTER_HID_DETECTOR_IPU("Razer Firefly", DetectRazerControllers, RAZER_VID, RAZER_FIREFLY_PID, 0x00, 0x01, 0x02); REGISTER_HID_DETECTOR_IPU("Razer Firefly V2", DetectRazerControllers, RAZER_VID, RAZER_FIREFLY_V2_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Firefly V2 Pro", DetectRazerControllers, RAZER_VID, RAZER_FIREFLY_V2_PRO_PID, 0x00, 0x01, 0x02); REGISTER_HID_DETECTOR_IPU("Razer Firefly Hyperflux", DetectRazerControllers, RAZER_VID, RAZER_FIREFLY_HYPERFLUX_PID, 0x00, 0x01, 0x02); REGISTER_HID_DETECTOR_IPU("Razer Goliathus", DetectRazerControllers, RAZER_VID, RAZER_GOLIATHUS_CHROMA_PID, 0x00, 0x01, 0x02); REGISTER_HID_DETECTOR_IPU("Razer Goliathus Chroma 3XL", DetectRazerControllers, RAZER_VID, RAZER_GOLIATHUS_CHROMA_3XL_PID, 0x00, 0x01, 0x02); diff --git a/Controllers/RazerController/RazerDevices.cpp b/Controllers/RazerController/RazerDevices.cpp index 01c29afd..94173b61 100644 --- a/Controllers/RazerController/RazerDevices.cpp +++ b/Controllers/RazerController/RazerDevices.cpp @@ -7102,7 +7102,7 @@ static const razer_device firefly_hyperflux_device = | Razer Firefly V2 | | | | Zone "LED Strip" | -| Matrix | +| Linear | | 19 LEDs | \*-------------------------------------------------------------*/ static const razer_zone firefly_v2_zone = @@ -7133,6 +7133,41 @@ static const razer_device firefly_v2_device = NULL }; +/*-------------------------------------------------------------*\ +| Razer Firefly Pro V2 | +| | +| Zone "LED Strip" | +| Linear | +| 17 LEDs | +\*-------------------------------------------------------------*/ +static const razer_zone firefly_v2_pro_zone = +{ + "LED Strip", + ZONE_TYPE_LINEAR, + 1, + 17 +}; + +static const razer_device firefly_v2_pro_device = +{ + "Razer Firefly V2 Pro", + RAZER_FIREFLY_V2_PRO_PID, + DEVICE_TYPE_MOUSEMAT, + RAZER_MATRIX_TYPE_EXTENDED, + 0x1F, + 1, + 17, + { + &firefly_v2_pro_zone, + NULL, + NULL, + NULL, + NULL, + NULL + }, + NULL +}; + /*-------------------------------------------------------------*\ | Razer Goliathus | | | @@ -8521,6 +8556,7 @@ const razer_device* razer_device_list[] = &firefly_device, &firefly_hyperflux_device, &firefly_v2_device, + &firefly_v2_pro_device, &goliathus_chroma_3xl_device, &goliathus_device, &goliathus_extended_device, diff --git a/Controllers/RazerController/RazerDevices.h b/Controllers/RazerController/RazerDevices.h index 837fc8b4..c60b52aa 100644 --- a/Controllers/RazerController/RazerDevices.h +++ b/Controllers/RazerController/RazerDevices.h @@ -239,6 +239,7 @@ #define RAZER_FIREFLY_HYPERFLUX_PID 0x0068 #define RAZER_FIREFLY_PID 0x0C00 #define RAZER_FIREFLY_V2_PID 0x0C04 +#define RAZER_FIREFLY_V2_PRO_PID 0x0C08 #define RAZER_GOLIATHUS_CHROMA_EXTENDED_PID 0x0C02 #define RAZER_GOLIATHUS_CHROMA_PID 0x0C01 #define RAZER_GOLIATHUS_CHROMA_3XL_PID 0x0C06