From b819ef44ba3f50741d08a8611f6bb3a8bc1746e6 Mon Sep 17 00:00:00 2001 From: WrathofthePast <75559873+WrathofthePast@users.noreply.github.com> Date: Fri, 17 Dec 2021 14:54:31 -0500 Subject: Cynosa Chroma Pro Support Seems the PR from the front didn't make the update to the DeathAdder Essential 2021, so that's included in this. --- src/include/razerkbd_driver.h | 1 + src/include/razermouse_driver.h | 2 +- src/lib/razerdevice.c | 3 ++- src/lib/razerkbd_driver.c | 13 +++++++++++++ src/lib/razermouse_driver.c | 32 ++++++++++++++++---------------- 5 files changed, 33 insertions(+), 18 deletions(-) diff --git a/src/include/razerkbd_driver.h b/src/include/razerkbd_driver.h index 0251c4b..8b5ed5c 100644 --- a/src/include/razerkbd_driver.h +++ b/src/include/razerkbd_driver.h @@ -51,6 +51,7 @@ #define USB_DEVICE_ID_RAZER_HUNTSMAN 0x0227 #define USB_DEVICE_ID_RAZER_BLACKWIDOW_ELITE 0x0228 #define USB_DEVICE_ID_RAZER_CYNOSA_CHROMA 0x022A +#define USB_DEVICE_ID_RAZER_CYNOSA_CHROMA_PRO 0x022C #define USB_DEVICE_ID_RAZER_TARTARUS_V2 0x022B #define USB_DEVICE_ID_RAZER_BLADE_STEALTH_MID_2017 0x022D #define USB_DEVICE_ID_RAZER_BLADE_PRO_2017_FULLHD 0x022F diff --git a/src/include/razermouse_driver.h b/src/include/razermouse_driver.h index 960e28e..c5dbbe7 100644 --- a/src/include/razermouse_driver.h +++ b/src/include/razermouse_driver.h @@ -74,7 +74,7 @@ #define USB_DEVICE_ID_RAZER_VIPER_MINI 0x008A #define USB_DEVICE_ID_RAZER_BASILISK_V2 0x0085 #define USB_DEVICE_ID_RAZER_NAGA_LEFT_HANDED_2020 0x008D -#define USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_NEW 0x0098 +#define USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_2021 0x0098 #define USB_DEVICE_ID_RAZER_BASILISK_V3 0x0099 /* Each keyboard report has 90 bytes*/ diff --git a/src/lib/razerdevice.c b/src/lib/razerdevice.c index ceef5c5..c5f157c 100755 --- a/src/lib/razerdevice.c +++ b/src/lib/razerdevice.c @@ -52,6 +52,7 @@ bool is_keyboard(IOUSBDeviceInterface **usb_dev) case USB_DEVICE_ID_RAZER_BLACKWIDOW_ELITE: case USB_DEVICE_ID_RAZER_HUNTSMAN: case USB_DEVICE_ID_RAZER_CYNOSA_CHROMA: + case USB_DEVICE_ID_RAZER_CYNOSA_CHROMA_PRO: case USB_DEVICE_ID_RAZER_BLACKWIDOW_CHROMA_V2: case USB_DEVICE_ID_RAZER_ANANSI: case USB_DEVICE_ID_RAZER_CYNOSA_V2: @@ -133,7 +134,7 @@ bool is_mouse(IOUSBDeviceInterface **usb_dev) case USB_DEVICE_ID_RAZER_DEATHADDER_V2_MINI: case USB_DEVICE_ID_RAZER_NAGA_LEFT_HANDED_2020: case USB_DEVICE_ID_RAZER_ATHERIS_RECEIVER: - case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_NEW: + case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_2021: case USB_DEVICE_ID_RAZER_BASILISK_V3: case USB_DEVICE_ID_RAZER_BASILISK_ESSENTIAL: return true; diff --git a/src/lib/razerkbd_driver.c b/src/lib/razerkbd_driver.c index b2a6d27..e7040c3 100644 --- a/src/lib/razerkbd_driver.c +++ b/src/lib/razerkbd_driver.c @@ -115,6 +115,7 @@ ssize_t razer_attr_write_mode_macro_effect(IOUSBDeviceInterface **usb_dev, const case USB_DEVICE_ID_RAZER_HUNTSMAN: case USB_DEVICE_ID_RAZER_BLACKWIDOW_ESSENTIAL: case USB_DEVICE_ID_RAZER_CYNOSA_CHROMA: + case USB_DEVICE_ID_RAZER_CYNOSA_CHROMA_PRO: case USB_DEVICE_ID_RAZER_CYNOSA_LITE: case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3: case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3_TK: @@ -278,6 +279,7 @@ ssize_t razer_attr_write_mode_none(IOUSBDeviceInterface **usb_dev, const char *b case USB_DEVICE_ID_RAZER_HUNTSMAN: case USB_DEVICE_ID_RAZER_BLACKWIDOW_ESSENTIAL: case USB_DEVICE_ID_RAZER_CYNOSA_CHROMA: + case USB_DEVICE_ID_RAZER_CYNOSA_CHROMA_PRO: case USB_DEVICE_ID_RAZER_CYNOSA_LITE: case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3_TK: case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3_PRO_WIRED: @@ -341,6 +343,7 @@ ssize_t razer_attr_write_mode_wave(IOUSBDeviceInterface **usb_dev, const char *b case USB_DEVICE_ID_RAZER_HUNTSMAN: case USB_DEVICE_ID_RAZER_BLACKWIDOW_ESSENTIAL: case USB_DEVICE_ID_RAZER_CYNOSA_CHROMA: + case USB_DEVICE_ID_RAZER_CYNOSA_CHROMA_PRO: case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3: case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3_TK: case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3_PRO_WIRED: @@ -392,6 +395,7 @@ ssize_t razer_attr_write_mode_spectrum(IOUSBDeviceInterface **usb_dev, const cha case USB_DEVICE_ID_RAZER_BLACKWIDOW_2019: case USB_DEVICE_ID_RAZER_HUNTSMAN: case USB_DEVICE_ID_RAZER_CYNOSA_CHROMA: + case USB_DEVICE_ID_RAZER_CYNOSA_CHROMA_PRO: case USB_DEVICE_ID_RAZER_CYNOSA_LITE: case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3: case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3_TK: @@ -458,6 +462,7 @@ ssize_t razer_attr_write_mode_reactive(IOUSBDeviceInterface **usb_dev, const cha case USB_DEVICE_ID_RAZER_BLACKWIDOW_2019: case USB_DEVICE_ID_RAZER_HUNTSMAN: case USB_DEVICE_ID_RAZER_CYNOSA_CHROMA: + case USB_DEVICE_ID_RAZER_CYNOSA_CHROMA_PRO: case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3: case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3_TK: case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3_PRO_WIRED: @@ -590,6 +595,7 @@ ssize_t razer_attr_write_mode_static(IOUSBDeviceInterface **usb_dev, const char case USB_DEVICE_ID_RAZER_HUNTSMAN: case USB_DEVICE_ID_RAZER_BLACKWIDOW_ESSENTIAL: case USB_DEVICE_ID_RAZER_CYNOSA_CHROMA: + case USB_DEVICE_ID_RAZER_CYNOSA_CHROMA_PRO: case USB_DEVICE_ID_RAZER_CYNOSA_LITE: case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3: case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3_TK: @@ -744,6 +750,7 @@ ssize_t razer_attr_write_mode_static_no_store(IOUSBDeviceInterface **usb_dev, co case USB_DEVICE_ID_RAZER_HUNTSMAN: case USB_DEVICE_ID_RAZER_BLACKWIDOW_ESSENTIAL: case USB_DEVICE_ID_RAZER_CYNOSA_CHROMA: + case USB_DEVICE_ID_RAZER_CYNOSA_CHROMA_PRO: case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3: case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3_TK: case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3_PRO_WIRED: @@ -836,6 +843,7 @@ ssize_t razer_attr_write_mode_starlight(IOUSBDeviceInterface **usb_dev, const ch case USB_DEVICE_ID_RAZER_BLACKWIDOW_2019: case USB_DEVICE_ID_RAZER_HUNTSMAN: case USB_DEVICE_ID_RAZER_CYNOSA_CHROMA: + case USB_DEVICE_ID_RAZER_CYNOSA_CHROMA_PRO: case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3: case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3_TK: case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3_PRO_WIRED: @@ -1007,6 +1015,7 @@ ssize_t razer_attr_write_mode_breath(IOUSBDeviceInterface **usb_dev, const char case USB_DEVICE_ID_RAZER_HUNTSMAN: case USB_DEVICE_ID_RAZER_BLACKWIDOW_ESSENTIAL: case USB_DEVICE_ID_RAZER_CYNOSA_CHROMA: + case USB_DEVICE_ID_RAZER_CYNOSA_CHROMA_PRO: case USB_DEVICE_ID_RAZER_CYNOSA_LITE: case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3: case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3_TK: @@ -1207,6 +1216,7 @@ ssize_t razer_attr_write_mode_custom(IOUSBDeviceInterface **usb_dev, const char case USB_DEVICE_ID_RAZER_BLACKWIDOW_2019: case USB_DEVICE_ID_RAZER_HUNTSMAN: case USB_DEVICE_ID_RAZER_CYNOSA_CHROMA: + case USB_DEVICE_ID_RAZER_CYNOSA_CHROMA_PRO: case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3: case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3_TK: case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3_PRO_WIRED: @@ -1280,6 +1290,7 @@ ssize_t razer_attr_write_set_brightness(IOUSBDeviceInterface **usb_dev, ushort b case USB_DEVICE_ID_RAZER_HUNTSMAN: case USB_DEVICE_ID_RAZER_BLACKWIDOW_ESSENTIAL: case USB_DEVICE_ID_RAZER_CYNOSA_CHROMA: + case USB_DEVICE_ID_RAZER_CYNOSA_CHROMA_PRO: case USB_DEVICE_ID_RAZER_CYNOSA_LITE: case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3: case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3_TK: @@ -1354,6 +1365,7 @@ ushort razer_attr_read_set_brightness(IOUSBDeviceInterface **usb_dev) case USB_DEVICE_ID_RAZER_HUNTSMAN: case USB_DEVICE_ID_RAZER_BLACKWIDOW_ESSENTIAL: case USB_DEVICE_ID_RAZER_CYNOSA_CHROMA: + case USB_DEVICE_ID_RAZER_CYNOSA_CHROMA_PRO: case USB_DEVICE_ID_RAZER_CYNOSA_LITE: case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3: case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3_TK: @@ -1469,6 +1481,7 @@ ssize_t razer_attr_write_matrix_custom_frame(IOUSBDeviceInterface **usb_dev, con case USB_DEVICE_ID_RAZER_BLACKWIDOW_2019: case USB_DEVICE_ID_RAZER_HUNTSMAN: case USB_DEVICE_ID_RAZER_CYNOSA_CHROMA: + case USB_DEVICE_ID_RAZER_CYNOSA_CHROMA_PRO: case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3: case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3_TK: case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3_PRO_WIRED: diff --git a/src/lib/razermouse_driver.c b/src/lib/razermouse_driver.c index 2fe17f4..685c869 100644 --- a/src/lib/razermouse_driver.c +++ b/src/lib/razermouse_driver.c @@ -175,7 +175,7 @@ ssize_t razer_attr_write_side_mode_static(IOUSBDeviceInterface **usb_dev, const case USB_DEVICE_ID_RAZER_LANCEHEAD_WIRELESS_WIRED: case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL: case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_WHITE_EDITION: - case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_NEW: + case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_2021: case USB_DEVICE_ID_RAZER_MAMBA_WIRELESS_RECEIVER: case USB_DEVICE_ID_RAZER_MAMBA_WIRELESS_WIRED: case USB_DEVICE_ID_RAZER_ABYSSUS_ELITE_DVA_EDITION: @@ -243,7 +243,7 @@ ssize_t razer_attr_write_side_mode_static_no_store(IOUSBDeviceInterface **usb_de case USB_DEVICE_ID_RAZER_LANCEHEAD_WIRELESS_WIRED: case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL: case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_WHITE_EDITION: - case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_NEW: + case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_2021: case USB_DEVICE_ID_RAZER_MAMBA_WIRELESS_RECEIVER: case USB_DEVICE_ID_RAZER_MAMBA_WIRELESS_WIRED: case USB_DEVICE_ID_RAZER_ABYSSUS_ELITE_DVA_EDITION: @@ -385,7 +385,7 @@ ssize_t razer_attr_write_side_mode_breath(IOUSBDeviceInterface **usb_dev, const case USB_DEVICE_ID_RAZER_BASILISK_V2: case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL: case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_WHITE_EDITION: - case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_NEW: + case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_2021: case USB_DEVICE_ID_RAZER_MAMBA_WIRELESS_RECEIVER: case USB_DEVICE_ID_RAZER_MAMBA_WIRELESS_WIRED: case USB_DEVICE_ID_RAZER_ABYSSUS_ELITE_DVA_EDITION: @@ -457,7 +457,7 @@ ssize_t razer_attr_write_side_mode_none(IOUSBDeviceInterface **usb_dev, const ch case USB_DEVICE_ID_RAZER_LANCEHEAD_WIRELESS_WIRED: case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL: case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_WHITE_EDITION: - case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_NEW: + case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_2021: case USB_DEVICE_ID_RAZER_MAMBA_WIRELESS_RECEIVER: case USB_DEVICE_ID_RAZER_MAMBA_WIRELESS_WIRED: case USB_DEVICE_ID_RAZER_ABYSSUS_ELITE_DVA_EDITION: @@ -626,7 +626,7 @@ ssize_t razer_attr_write_logo_mode_static(IOUSBDeviceInterface **usb_dev, const case USB_DEVICE_ID_RAZER_LANCEHEAD_WIRELESS_WIRED: case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL: case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_WHITE_EDITION: - case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_NEW: + case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_2021: case USB_DEVICE_ID_RAZER_MAMBA_WIRELESS_RECEIVER: case USB_DEVICE_ID_RAZER_MAMBA_WIRELESS_WIRED: case USB_DEVICE_ID_RAZER_ABYSSUS_ELITE_DVA_EDITION: @@ -700,7 +700,7 @@ ssize_t razer_attr_write_scroll_mode_static(IOUSBDeviceInterface **usb_dev, cons case USB_DEVICE_ID_RAZER_LANCEHEAD_WIRELESS_WIRED: case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL: case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_WHITE_EDITION: - case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_NEW: + case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_2021: case USB_DEVICE_ID_RAZER_MAMBA_WIRELESS_RECEIVER: case USB_DEVICE_ID_RAZER_MAMBA_WIRELESS_WIRED: case USB_DEVICE_ID_RAZER_ABYSSUS_ELITE_DVA_EDITION: @@ -796,7 +796,7 @@ ssize_t razer_attr_write_logo_mode_static_no_store(IOUSBDeviceInterface **usb_de case USB_DEVICE_ID_RAZER_LANCEHEAD_WIRELESS_WIRED: case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL: case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_WHITE_EDITION: - case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_NEW: + case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_2021: case USB_DEVICE_ID_RAZER_MAMBA_WIRELESS_RECEIVER: case USB_DEVICE_ID_RAZER_MAMBA_WIRELESS_WIRED: case USB_DEVICE_ID_RAZER_ABYSSUS_ELITE_DVA_EDITION: @@ -873,7 +873,7 @@ ssize_t razer_attr_write_scroll_mode_static_no_store(IOUSBDeviceInterface **usb_ case USB_DEVICE_ID_RAZER_LANCEHEAD_WIRELESS_WIRED: case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL: case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_WHITE_EDITION: - case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_NEW: + case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_2021: case USB_DEVICE_ID_RAZER_MAMBA_WIRELESS_RECEIVER: case USB_DEVICE_ID_RAZER_MAMBA_WIRELESS_WIRED: case USB_DEVICE_ID_RAZER_ABYSSUS_ELITE_DVA_EDITION: @@ -1124,7 +1124,7 @@ ssize_t razer_attr_write_logo_mode_breath(IOUSBDeviceInterface **usb_dev, const case USB_DEVICE_ID_RAZER_BASILISK_V2: case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL: case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_WHITE_EDITION: - case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_NEW: + case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_2021: case USB_DEVICE_ID_RAZER_MAMBA_WIRELESS_RECEIVER: case USB_DEVICE_ID_RAZER_MAMBA_WIRELESS_WIRED: case USB_DEVICE_ID_RAZER_ABYSSUS_ELITE_DVA_EDITION: @@ -1216,7 +1216,7 @@ ssize_t razer_attr_write_scroll_mode_breath(IOUSBDeviceInterface **usb_dev, cons case USB_DEVICE_ID_RAZER_BASILISK_V2: case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL: case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_WHITE_EDITION: - case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_NEW: + case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_2021: case USB_DEVICE_ID_RAZER_MAMBA_WIRELESS_RECEIVER: case USB_DEVICE_ID_RAZER_MAMBA_WIRELESS_WIRED: case USB_DEVICE_ID_RAZER_ABYSSUS_ELITE_DVA_EDITION: @@ -1312,7 +1312,7 @@ ssize_t razer_attr_write_logo_mode_none(IOUSBDeviceInterface **usb_dev, const ch case USB_DEVICE_ID_RAZER_LANCEHEAD_WIRELESS_WIRED: case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL: case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_WHITE_EDITION: - case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_NEW: + case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_2021: case USB_DEVICE_ID_RAZER_MAMBA_WIRELESS_RECEIVER: case USB_DEVICE_ID_RAZER_MAMBA_WIRELESS_WIRED: case USB_DEVICE_ID_RAZER_ABYSSUS_ELITE_DVA_EDITION: @@ -1379,7 +1379,7 @@ ssize_t razer_attr_write_scroll_mode_none(IOUSBDeviceInterface **usb_dev, const case USB_DEVICE_ID_RAZER_LANCEHEAD_WIRELESS_WIRED: case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL: case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_WHITE_EDITION: - case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_NEW: + case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_2021: case USB_DEVICE_ID_RAZER_MAMBA_WIRELESS_RECEIVER: case USB_DEVICE_ID_RAZER_MAMBA_WIRELESS_WIRED: case USB_DEVICE_ID_RAZER_ABYSSUS_ELITE_DVA_EDITION: @@ -2031,7 +2031,7 @@ ushort razer_attr_read_scroll_led_brightness(IOUSBDeviceInterface **usb_dev) case USB_DEVICE_ID_RAZER_LANCEHEAD_WIRELESS_WIRED: case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL: case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_WHITE_EDITION: - case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_NEW: + case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_2021: case USB_DEVICE_ID_RAZER_MAMBA_WIRELESS_RECEIVER: case USB_DEVICE_ID_RAZER_MAMBA_WIRELESS_WIRED: case USB_DEVICE_ID_RAZER_BASILISK: @@ -2083,7 +2083,7 @@ void razer_attr_write_scroll_led_brightness(IOUSBDeviceInterface **usb_dev, unsi case USB_DEVICE_ID_RAZER_LANCEHEAD_WIRELESS_WIRED: case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL: case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_WHITE_EDITION: - case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_NEW: + case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_2021: case USB_DEVICE_ID_RAZER_MAMBA_WIRELESS_RECEIVER: case USB_DEVICE_ID_RAZER_MAMBA_WIRELESS_WIRED: case USB_DEVICE_ID_RAZER_BASILISK: @@ -2132,7 +2132,7 @@ ushort razer_attr_read_logo_led_brightness(IOUSBDeviceInterface **usb_dev) case USB_DEVICE_ID_RAZER_LANCEHEAD_WIRELESS_WIRED: case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL: case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_WHITE_EDITION: - case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_NEW: + case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_2021: case USB_DEVICE_ID_RAZER_MAMBA_WIRELESS_RECEIVER: case USB_DEVICE_ID_RAZER_MAMBA_WIRELESS_WIRED: case USB_DEVICE_ID_RAZER_ABYSSUS_ELITE_DVA_EDITION: @@ -2194,7 +2194,7 @@ void razer_attr_write_logo_led_brightness(IOUSBDeviceInterface **usb_dev, unsign case USB_DEVICE_ID_RAZER_LANCEHEAD_WIRELESS_WIRED: case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL: case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_WHITE_EDITION: - case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_NEW: + case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_2021: case USB_DEVICE_ID_RAZER_MAMBA_WIRELESS_RECEIVER: case USB_DEVICE_ID_RAZER_MAMBA_WIRELESS_WIRED: case USB_DEVICE_ID_RAZER_ABYSSUS_ELITE_DVA_EDITION: -- cgit v1.2.3 From e3404376badc8f806077e630925069154f8ec7d5 Mon Sep 17 00:00:00 2001 From: WrathofthePast <75559873+WrathofthePast@users.noreply.github.com> Date: Thu, 27 Jan 2022 17:32:33 -0500 Subject: Fix for Basilisk Ultimate (Wired & Receiver) For `is_charging` & `get_battery`, the Basilisk Ultimate had the wrong transaction id. --- src/lib/razermouse_driver.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/razermouse_driver.c b/src/lib/razermouse_driver.c index 685c869..a10521e 100644 --- a/src/lib/razermouse_driver.c +++ b/src/lib/razermouse_driver.c @@ -1693,12 +1693,12 @@ ssize_t razer_attr_read_get_battery(IOUSBDeviceInterface **usb_dev, char *buf) case USB_DEVICE_ID_RAZER_LANCEHEAD_WIRELESS: case USB_DEVICE_ID_RAZER_MAMBA_WIRELESS_RECEIVER: case USB_DEVICE_ID_RAZER_MAMBA_WIRELESS_WIRED: - case USB_DEVICE_ID_RAZER_BASILISK_ULTIMATE: - case USB_DEVICE_ID_RAZER_BASILISK_ULTIMATE_RECEIVER: case USB_DEVICE_ID_RAZER_DEATHADDER_V2_PRO_WIRED: case USB_DEVICE_ID_RAZER_DEATHADDER_V2_PRO_WIRELESS: report.transaction_id.id = 0x3f; break; + case USB_DEVICE_ID_RAZER_BASILISK_ULTIMATE_RECEIVER: + case USB_DEVICE_ID_RAZER_BASILISK_ULTIMATE: case USB_DEVICE_ID_RAZER_LANCEHEAD_WIRELESS_RECEIVER: case USB_DEVICE_ID_RAZER_LANCEHEAD_WIRELESS_WIRED: report.transaction_id.id = 0x1f; @@ -1725,12 +1725,12 @@ ssize_t razer_attr_read_is_charging(IOUSBDeviceInterface **usb_dev, char *buf) case USB_DEVICE_ID_RAZER_LANCEHEAD_WIRELESS: case USB_DEVICE_ID_RAZER_MAMBA_WIRELESS_RECEIVER: case USB_DEVICE_ID_RAZER_MAMBA_WIRELESS_WIRED: - case USB_DEVICE_ID_RAZER_BASILISK_ULTIMATE: - case USB_DEVICE_ID_RAZER_BASILISK_ULTIMATE_RECEIVER: case USB_DEVICE_ID_RAZER_DEATHADDER_V2_PRO_WIRED: case USB_DEVICE_ID_RAZER_DEATHADDER_V2_PRO_WIRELESS: report.transaction_id.id = 0x3f; break; + case USB_DEVICE_ID_RAZER_BASILISK_ULTIMATE_RECEIVER: + case USB_DEVICE_ID_RAZER_BASILISK_ULTIMATE: case USB_DEVICE_ID_RAZER_LANCEHEAD_WIRELESS_RECEIVER: case USB_DEVICE_ID_RAZER_LANCEHEAD_WIRELESS_WIRED: report.transaction_id.id = 0x1f; -- cgit v1.2.3 From a0d55638d16c49505ecb123ee098b78ac58d41fd Mon Sep 17 00:00:00 2001 From: WrathofthePast <75559873+WrathofthePast@users.noreply.github.com> Date: Wed, 16 Feb 2022 00:06:39 -0500 Subject: Resolve kIOMasterPortDefault Deprecation --- src/lib/razerdevice.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/razerdevice.c b/src/lib/razerdevice.c index c5f157c..3933b13 100755 --- a/src/lib/razerdevice.c +++ b/src/lib/razerdevice.c @@ -238,7 +238,7 @@ IOUSBDeviceInterface **getRazerUSBDeviceInterface(int type) io_iterator_t iter; kern_return_t kReturn = - IOServiceGetMatchingServices(kIOMasterPortDefault, matchingDict, &iter); + IOServiceGetMatchingServices(kIOMainPortDefault, matchingDict, &iter); if (kReturn != kIOReturnSuccess) { return NULL; @@ -384,7 +384,7 @@ RazerDevices getAllRazerDevices() io_iterator_t iter; kern_return_t kReturn = - IOServiceGetMatchingServices(kIOMasterPortDefault, matchingDict, &iter); + IOServiceGetMatchingServices(kIOMainPortDefault, matchingDict, &iter); if (kReturn != kIOReturnSuccess) { return allDevices; -- cgit v1.2.3 From 12edcab514aafd6ac39696993efd757e8e2291d1 Mon Sep 17 00:00:00 2001 From: WrathofthePast <75559873+WrathofthePast@users.noreply.github.com> Date: Wed, 16 Feb 2022 17:21:29 -0500 Subject: Update razerdevice.c --- src/lib/razerdevice.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/razerdevice.c b/src/lib/razerdevice.c index 3933b13..4d5d1ef 100755 --- a/src/lib/razerdevice.c +++ b/src/lib/razerdevice.c @@ -238,7 +238,7 @@ IOUSBDeviceInterface **getRazerUSBDeviceInterface(int type) io_iterator_t iter; kern_return_t kReturn = - IOServiceGetMatchingServices(kIOMainPortDefault, matchingDict, &iter); + IOServiceGetMatchingServices(MACH_PORT_NULL, matchingDict, &iter); if (kReturn != kIOReturnSuccess) { return NULL; @@ -384,7 +384,7 @@ RazerDevices getAllRazerDevices() io_iterator_t iter; kern_return_t kReturn = - IOServiceGetMatchingServices(kIOMainPortDefault, matchingDict, &iter); + IOServiceGetMatchingServices(MACH_PORT_NULL, matchingDict, &iter); if (kReturn != kIOReturnSuccess) { return allDevices; -- cgit v1.2.3 From 6cdb3c5c7b8af1911d08794ca1e8e725f13bec01 Mon Sep 17 00:00:00 2001 From: WrathofthePast <75559873+WrathofthePast@users.noreply.github.com> Date: Thu, 24 Feb 2022 12:27:57 -0500 Subject: Orochi V2 Support Adds support for both Bluetooth and Receiver connections DPI Stage support was excluded as librazermacos does not yet support the feature. I'm working on it though :) --- src/include/razermouse_driver.h | 2 ++ src/lib/razerdevice.c | 2 ++ src/lib/razermouse_driver.c | 10 ++++++++++ 3 files changed, 14 insertions(+) diff --git a/src/include/razermouse_driver.h b/src/include/razermouse_driver.h index f80345b..ac3dc7a 100644 --- a/src/include/razermouse_driver.h +++ b/src/include/razermouse_driver.h @@ -76,6 +76,8 @@ #define USB_DEVICE_ID_RAZER_NAGA_LEFT_HANDED_2020 0x008D #define USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_2021 0x0098 #define USB_DEVICE_ID_RAZER_BASILISK_V3 0x0099 +#define USB_DEVICE_ID_RAZER_OROCHI_V2_RECEIVER 0x0094 +#define USB_DEVICE_ID_RAZER_OROCHI_V2 0x0095 /* Each keyboard report has 90 bytes*/ #define RAZER_REPORT_LEN 0x5A diff --git a/src/lib/razerdevice.c b/src/lib/razerdevice.c index 3f0896b..d2d9bdd 100755 --- a/src/lib/razerdevice.c +++ b/src/lib/razerdevice.c @@ -138,6 +138,8 @@ bool is_mouse(IOUSBDeviceInterface **usb_dev) case USB_DEVICE_ID_RAZER_DEATHADDER_ESSENTIAL_2021: case USB_DEVICE_ID_RAZER_BASILISK_V3: case USB_DEVICE_ID_RAZER_BASILISK_ESSENTIAL: + case USB_DEVICE_ID_RAZER_OROCHI_V2_RECEIVER: + case USB_DEVICE_ID_RAZER_OROCHI_V2_BLUETOOTH: return true; } diff --git a/src/lib/razermouse_driver.c b/src/lib/razermouse_driver.c index 336f2af..847a3df 100644 --- a/src/lib/razermouse_driver.c +++ b/src/lib/razermouse_driver.c @@ -65,6 +65,8 @@ static int razer_get_report(IOUSBDeviceInterface **usb_dev, struct razer_report break; case USB_DEVICE_ID_RAZER_ATHERIS_RECEIVER: + case USB_DEVICE_ID_RAZER_OROCHI_V2_RECEIVER: + case USB_DEVICE_ID_RAZER_OROCHI_V2_BLUETOOTH: return razer_get_usb_response(usb_dev, 0x00, request_report, 0x00, response_report, RAZER_ATHERIS_RECEIVER_WAIT_MIN_US); break; @@ -1706,6 +1708,8 @@ ssize_t razer_attr_read_get_battery(IOUSBDeviceInterface **usb_dev, char *buf) case USB_DEVICE_ID_RAZER_ATHERIS_RECEIVER: case USB_DEVICE_ID_RAZER_LANCEHEAD_WIRELESS_RECEIVER: case USB_DEVICE_ID_RAZER_LANCEHEAD_WIRELESS_WIRED: + case USB_DEVICE_ID_RAZER_OROCHI_V2_RECEIVER: + case USB_DEVICE_ID_RAZER_OROCHI_V2_BLUETOOTH: report.transaction_id.id = 0x1f; break; } @@ -1729,6 +1733,8 @@ ssize_t razer_attr_read_is_charging(IOUSBDeviceInterface **usb_dev, char *buf) // Wireless mice that don't support is_charging // Use AA batteries case USB_DEVICE_ID_RAZER_ATHERIS_RECEIVER: + case USB_DEVICE_ID_RAZER_OROCHI_V2_RECEIVER: + case USB_DEVICE_ID_RAZER_OROCHI_V2_BLUETOOTH: return sprintf(buf, "0\n"); break; @@ -1803,6 +1809,8 @@ ushort razer_attr_read_poll_rate(IOUSBDeviceInterface **usb_dev) case USB_DEVICE_ID_RAZER_ATHERIS_RECEIVER: case USB_DEVICE_ID_RAZER_BASILISK_V2: case USB_DEVICE_ID_RAZER_BASILISK_V3: + case USB_DEVICE_ID_RAZER_OROCHI_V2_RECEIVER: + case USB_DEVICE_ID_RAZER_OROCHI_V2_BLUETOOTH: report.transaction_id.id = 0x1f; break; } @@ -1894,6 +1902,8 @@ void razer_attr_write_poll_rate(IOUSBDeviceInterface **usb_dev, ushort polling_r case USB_DEVICE_ID_RAZER_ATHERIS_RECEIVER: case USB_DEVICE_ID_RAZER_BASILISK_V2: case USB_DEVICE_ID_RAZER_BASILISK_V3: + case USB_DEVICE_ID_RAZER_OROCHI_V2_RECEIVER: + case USB_DEVICE_ID_RAZER_OROCHI_V2_BLUETOOTH: report.transaction_id.id = 0x1f; break; } -- cgit v1.2.3