Merge branch 'master' into blackwidowV4PPro-support-stickoking

3 files changed, 16 insertions, 0 deletions

diff --git a/src/include/razerkbd_driver.h b/src/include/razerkbd_driver.h
index 79c150f..360f3c3 100644
--- a/src/include/razerkbd_driver.h
+++ b/src/include/razerkbd_driver.h
@@ -83,6 +83,7 @@
 #define USB_DEVICE_ID_RAZER_BLACKWIDOW_V4_75 0x02a5
 #define USB_DEVICE_ID_RAZER_BLACKWIDOW_V4_PRO 0x028D
 #define USB_DEVICE_ID_RAZER_DEATHSTALKER_V2 0x0295
+#define USB_DEVICE_ID_RAZER_ORNATA_V3X 0x02a2
 
 /* Each keyboard report has 90 bytes*/
 #define RAZER_BLACKWIDOW_REPORT_LEN 0x5A
diff --git a/src/lib/razerdevice.c b/src/lib/razerdevice.c
index b5271f6..f274017 100755
--- a/src/lib/razerdevice.c
+++ b/src/lib/razerdevice.c
@@ -69,6 +69,7 @@ bool is_keyboard(IOUSBDeviceInterface **usb_dev)
 	case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3_MINI_WIRELESS:
 	case USB_DEVICE_ID_RAZER_BLACKWIDOW_V4_75:
 	case USB_DEVICE_ID_RAZER_BLACKWIDOW_V4_PRO:
+  case USB_DEVICE_ID_RAZER_ORNATA_V3X:
 		return true;
 	}
 
diff --git a/src/lib/razerkbd_driver.c b/src/lib/razerkbd_driver.c
index 209366a..c103939 100644
--- a/src/lib/razerkbd_driver.c
+++ b/src/lib/razerkbd_driver.c
@@ -122,6 +122,7 @@ ssize_t razer_attr_write_mode_macro_effect(IOUSBDeviceInterface **usb_dev, const
     case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3_TK:
     case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3_PRO_WIRED:
     case USB_DEVICE_ID_RAZER_HUNTSMAN_MINI:
+    case USB_DEVICE_ID_RAZER_ORNATA_V3X:
         report = razer_chroma_standard_set_led_effect(NOSTORE, MACRO_LED, enabled);
         report.transaction_id.id = 0x3F;
         break;
@@ -360,6 +361,7 @@ ssize_t razer_attr_write_mode_none(IOUSBDeviceInterface **usb_dev, const char *b
     case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3_MINI_WIRED:
     case USB_DEVICE_ID_RAZER_BLACKWIDOW_V4_75:
     case USB_DEVICE_ID_RAZER_BLACKWIDOW_V4_PRO:
+    case USB_DEVICE_ID_RAZER_ORNATA_V3X:
         report = razer_chroma_extended_matrix_effect_none(VARSTORE, BACKLIGHT_LED);
         report.transaction_id.id = 0x1F;
         break;
@@ -438,6 +440,7 @@ ssize_t razer_attr_write_mode_wave(IOUSBDeviceInterface **usb_dev, const char *b
     case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3_MINI_WIRED:
     case USB_DEVICE_ID_RAZER_BLACKWIDOW_V4_75:
     case USB_DEVICE_ID_RAZER_BLACKWIDOW_V4_PRO:
+    case USB_DEVICE_ID_RAZER_ORNATA_V3X:
         report = razer_chroma_extended_matrix_effect_wave(VARSTORE, BACKLIGHT_LED, direction, speed);
         report.transaction_id.id = 0x1F;
         break;
@@ -495,6 +498,7 @@ ssize_t razer_attr_write_mode_spectrum(IOUSBDeviceInterface **usb_dev, const cha
     case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3_MINI_WIRED:
     case USB_DEVICE_ID_RAZER_BLACKWIDOW_V4_75:
     case USB_DEVICE_ID_RAZER_BLACKWIDOW_V4_PRO:
+    case USB_DEVICE_ID_RAZER_ORNATA_V3X:
         report = razer_chroma_extended_matrix_effect_spectrum(VARSTORE, BACKLIGHT_LED);
         report.transaction_id.id = 0x1F;
         break;
@@ -572,6 +576,7 @@ ssize_t razer_attr_write_mode_reactive(IOUSBDeviceInterface **usb_dev, const cha
         case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3_MINI_WIRED:
         case USB_DEVICE_ID_RAZER_BLACKWIDOW_V4_75:
         case USB_DEVICE_ID_RAZER_BLACKWIDOW_V4_PRO:
+        case USB_DEVICE_ID_RAZER_ORNATA_V3X:
             report = razer_chroma_extended_matrix_effect_reactive(VARSTORE, BACKLIGHT_LED, speed, (struct razer_rgb *)&buf[1]);
             report.transaction_id.id = 0x1F;
             break;
@@ -723,6 +728,7 @@ ssize_t razer_attr_write_mode_static(IOUSBDeviceInterface **usb_dev, const char
     case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3_MINI_WIRED:
     case USB_DEVICE_ID_RAZER_BLACKWIDOW_V4_75:
     case USB_DEVICE_ID_RAZER_BLACKWIDOW_V4_PRO:
+    case USB_DEVICE_ID_RAZER_ORNATA_V3X:
         if (count == 3)
         {
             report = razer_chroma_extended_matrix_effect_static(VARSTORE, BACKLIGHT_LED, (struct razer_rgb *)&buf[0]);
@@ -894,6 +900,7 @@ ssize_t razer_attr_write_mode_static_no_store(IOUSBDeviceInterface **usb_dev, co
     case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3_MINI_WIRED:
     case USB_DEVICE_ID_RAZER_BLACKWIDOW_V4_75:
     case USB_DEVICE_ID_RAZER_BLACKWIDOW_V4_PRO:
+    case USB_DEVICE_ID_RAZER_ORNATA_V3X:
         if (count == 3)
         {
             report = razer_chroma_extended_matrix_effect_static(NOSTORE, BACKLIGHT_LED, (struct razer_rgb *)&buf[0]);
@@ -1015,6 +1022,7 @@ ssize_t razer_attr_write_mode_starlight(IOUSBDeviceInterface **usb_dev, const ch
     case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3_MINI_WIRED:
     case USB_DEVICE_ID_RAZER_BLACKWIDOW_V4_75:
     case USB_DEVICE_ID_RAZER_BLACKWIDOW_V4_PRO:
+    case USB_DEVICE_ID_RAZER_ORNATA_V3X:
         if (count == 7)
         {
             report = razer_chroma_extended_matrix_effect_starlight_dual(VARSTORE, BACKLIGHT_LED, buf[0], (struct razer_rgb *)&buf[1], (struct razer_rgb *)&buf[4]);
@@ -1217,6 +1225,7 @@ ssize_t razer_attr_write_mode_breath(IOUSBDeviceInterface **usb_dev, const char
     case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3_MINI_WIRED:
     case USB_DEVICE_ID_RAZER_BLACKWIDOW_V4_75:
     case USB_DEVICE_ID_RAZER_BLACKWIDOW_V4_PRO:
+    case USB_DEVICE_ID_RAZER_ORNATA_V3X:
         if (count == 3)
         { // Single colour mode
             report = razer_chroma_extended_matrix_effect_breathing_single(VARSTORE, BACKLIGHT_LED, (struct razer_rgb *)&buf[0]);
@@ -1425,6 +1434,7 @@ ssize_t razer_attr_write_mode_custom(IOUSBDeviceInterface **usb_dev, const char
     case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3_MINI_WIRED:
     case USB_DEVICE_ID_RAZER_BLACKWIDOW_V4_75:
     case USB_DEVICE_ID_RAZER_BLACKWIDOW_V4_PRO:
+    case USB_DEVICE_ID_RAZER_ORNATA_V3X:
         report = razer_chroma_extended_matrix_effect_custom_frame();
         report.transaction_id.id = 0x1F;
         break;
@@ -1509,6 +1519,7 @@ ssize_t razer_attr_write_set_brightness(IOUSBDeviceInterface **usb_dev, ushort b
     case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3_MINI_WIRED:
     case USB_DEVICE_ID_RAZER_BLACKWIDOW_V4_75:
     case USB_DEVICE_ID_RAZER_BLACKWIDOW_V4_PRO:
+    case USB_DEVICE_ID_RAZER_ORNATA_V3X:
         report = razer_chroma_extended_matrix_brightness(VARSTORE, BACKLIGHT_LED, brightness);
         report.transaction_id.id = 0x1F;
         break;
@@ -1595,6 +1606,7 @@ ushort razer_attr_read_set_brightness(IOUSBDeviceInterface **usb_dev)
     case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3_MINI_WIRED:
     case USB_DEVICE_ID_RAZER_BLACKWIDOW_V4_75:
     case USB_DEVICE_ID_RAZER_BLACKWIDOW_V4_PRO:
+    case USB_DEVICE_ID_RAZER_ORNATA_V3X:
         report = razer_chroma_extended_matrix_get_brightness(VARSTORE, BACKLIGHT_LED);
         report.transaction_id.id = 0x1F;
         is_matrix_brightness = true;
@@ -1721,6 +1733,7 @@ ssize_t razer_attr_write_matrix_custom_frame(IOUSBDeviceInterface **usb_dev, con
         case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3_MINI_WIRED:
         case USB_DEVICE_ID_RAZER_BLACKWIDOW_V4_75:
         case USB_DEVICE_ID_RAZER_BLACKWIDOW_V4_PRO:
+        case USB_DEVICE_ID_RAZER_ORNATA_V3X:
             report = razer_chroma_extended_matrix_set_custom_frame(row_id, start_col, stop_col, (unsigned char *)&buf[offset]);
             report.transaction_id.id = 0x1F;
             break;
@@ -1793,6 +1806,7 @@ static int razer_get_report(IOUSBDeviceInterface **usb_dev, struct razer_report
     case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3_TK:
     case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3_PRO_WIRED:
     case USB_DEVICE_ID_RAZER_HUNTSMAN_MINI:
+    case USB_DEVICE_ID_RAZER_ORNATA_V3X:
         report_index = 0x02;
         response_index = 0x02;
         break;