From 558cce3002ee2b3bcf99bc4266c0289076f4486b Mon Sep 17 00:00:00 2001
From: Chris M <galdarian@gmail.com>
Date: Wed, 18 Oct 2023 07:24:48 +1100
Subject: [PATCH] Initial commit for Razer Ornata V3X Rev2

+ Adding PID for the Ornata V3X Rev2
+ Registered detectors
+ Added metadata to RazerDevices.cpp
+ Added capabilities to RazerController.cpp
+ Resolves #3673
---
 .../RazerController/RazerControllerDetect.cpp |  1 +
 Controllers/RazerController/RazerDevices.cpp  | 35 +++++++++++++++++++
 Controllers/RazerController/RazerDevices.h    |  1 +
 3 files changed, 37 insertions(+)

diff --git a/Controllers/RazerController/RazerControllerDetect.cpp b/Controllers/RazerController/RazerControllerDetect.cpp
index 82e57bc9..2066b252 100644
--- a/Controllers/RazerController/RazerControllerDetect.cpp
+++ b/Controllers/RazerController/RazerControllerDetect.cpp
@@ -185,6 +185,7 @@ REGISTER_HID_DETECTOR_IPU("Razer Ornata Chroma V2",                          Det
 REGISTER_HID_DETECTOR_IPU("Razer Ornata V3",                                 DetectRazerControllers,        RAZER_VID,  RAZER_ORNATA_V3_PID,                            0x02,   0x01,   0x02);
 REGISTER_HID_DETECTOR_IPU("Razer Ornata V3 Rev2",                            DetectRazerControllers,        RAZER_VID,  RAZER_ORNATA_V3_REV2_PID,                       0x02,   0x01,   0x02);
 REGISTER_HID_DETECTOR_IPU("Razer Ornata V3 X",                               DetectRazerControllers,        RAZER_VID,  RAZER_ORNATA_V3_X_PID,                          0x02,   0x01,   0x02);
+REGISTER_HID_DETECTOR_IPU("Razer Ornata V3 X Rev2",                          DetectRazerControllers,        RAZER_VID,  RAZER_ORNATA_V3_X_REV2_PID,                     0x02,   0x01,   0x02);
 /*-----------------------------------------------------------------------------------------------------*\
 | Laptops                                                                                               |
 \*-----------------------------------------------------------------------------------------------------*/
diff --git a/Controllers/RazerController/RazerDevices.cpp b/Controllers/RazerController/RazerDevices.cpp
index 0bff22e5..2df3f5ad 100644
--- a/Controllers/RazerController/RazerDevices.cpp
+++ b/Controllers/RazerController/RazerDevices.cpp
@@ -2011,6 +2011,40 @@ static const razer_device ornata_v3_x_device =
     NULL
 };
 
+/*-------------------------------------------------------------*\
+|  Razer Ornata V3 X Rev2   1532:02A2                           |
+|                                                               |
+|  Zone "Keyboard"                                              |
+|       Single                                                  |
+|       1 LED                                                   |
+\*-------------------------------------------------------------*/
+static const razer_zone ornata_v3_x_v2_zone =
+{
+    ZONE_EN_KEYBOARD,
+    ZONE_TYPE_SINGLE,
+    1,
+    1
+};
+
+static const razer_device ornata_v3_x_v2_device =
+{
+    "Razer Ornata V3 X Rev2",
+    RAZER_ORNATA_V3_X_REV2_PID,
+    DEVICE_TYPE_KEYBOARD,
+    RAZER_MATRIX_TYPE_EXTENDED,
+    0x1F,
+    1,
+    1,
+    {
+        &ornata_v3_x_v2_zone,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL
+    },
+    NULL
+};
 
 /*-------------------------------------------------------------*\
 |  Razer DeathStalker Chroma                                    |
@@ -7616,6 +7650,7 @@ const razer_device* razer_device_list[] =
     &ornata_v3_device,
     &ornata_v3_rev2_device,
     &ornata_v3_x_device,
+    &ornata_v3_x_v2_device,
 /*-----------------------------------------------------------------*\
 |  LAPTOPS                                                          |
 \*-----------------------------------------------------------------*/
diff --git a/Controllers/RazerController/RazerDevices.h b/Controllers/RazerController/RazerDevices.h
index 9131afcd..7268c5ce 100644
--- a/Controllers/RazerController/RazerDevices.h
+++ b/Controllers/RazerController/RazerDevices.h
@@ -112,6 +112,7 @@
 #define RAZER_ORNATA_V3_PID                             0x028F
 #define RAZER_ORNATA_V3_REV2_PID                        0x02A1
 #define RAZER_ORNATA_V3_X_PID                           0x0294
+#define RAZER_ORNATA_V3_X_REV2_PID                      0x02A2
 #define RAZER_TARTARUS_CHROMA_PID                       0x0208
 #define RAZER_TARTARUS_PRO_PID                          0x0244
 #define RAZER_TARTARUS_V2_PID                           0x022B