Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added Ornata V3 support #35

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

added Ornata V3 support #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f4edff
added Ornata V3 support
Sep 28, 2022
c39764c
remove spaces that accidentally added
Sep 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/include/razerkbd_driver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
#define USB_DEVICE_ID_RAZER_HUNTSMAN_V2 0x026c
#define USB_DEVICE_ID_RAZER_HUNTSMAN_V2_TKL 0x026b
#define USB_DEVICE_ID_RAZER_BLACKWIDOW_V3_MINI_WIRELESS 0x0271
#define USB_DEVICE_ID_RAZER_ORNATA_V3 0x028F

/* Each keyboard report has 90 bytes*/
#define RAZER_BLACKWIDOW_REPORT_LEN 0x5A
Expand Down
1 change: 1 addition & 0 deletions src/lib/razerdevice.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ bool is_keyboard(IOUSBDeviceInterface **usb_dev)
case USB_DEVICE_ID_RAZER_HUNTSMAN_V2_TKL:
case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3_MINI_WIRED:
case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3_MINI_WIRELESS:
case USB_DEVICE_ID_RAZER_ORNATA_V3:
return true;
}

Expand Down
14 changes: 14 additions & 0 deletions src/lib/razerkbd_driver.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_V3:
report = razer_chroma_standard_set_led_effect(NOSTORE, MACRO_LED, enabled);
report.transaction_id.id = 0x3F;
break;
Expand Down Expand Up @@ -355,6 +356,7 @@ ssize_t razer_attr_write_mode_none(IOUSBDeviceInterface **usb_dev, const char *b
case USB_DEVICE_ID_RAZER_HUNTSMAN_V2:
case USB_DEVICE_ID_RAZER_HUNTSMAN_V2_TKL:
case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3_MINI_WIRED:
case USB_DEVICE_ID_RAZER_ORNATA_V3:
report = razer_chroma_extended_matrix_effect_none(VARSTORE, BACKLIGHT_LED);
report.transaction_id.id = 0x1F;
break;
Expand Down Expand Up @@ -430,6 +432,7 @@ ssize_t razer_attr_write_mode_wave(IOUSBDeviceInterface **usb_dev, const char *b
case USB_DEVICE_ID_RAZER_HUNTSMAN_V2:
case USB_DEVICE_ID_RAZER_HUNTSMAN_V2_TKL:
case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3_MINI_WIRED:
case USB_DEVICE_ID_RAZER_ORNATA_V3:
report = razer_chroma_extended_matrix_effect_wave(VARSTORE, BACKLIGHT_LED, direction, speed);
report.transaction_id.id = 0x1F;
break;
Expand Down Expand Up @@ -484,6 +487,7 @@ ssize_t razer_attr_write_mode_spectrum(IOUSBDeviceInterface **usb_dev, const cha
case USB_DEVICE_ID_RAZER_HUNTSMAN_V2:
case USB_DEVICE_ID_RAZER_HUNTSMAN_V2_TKL:
case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3_MINI_WIRED:
case USB_DEVICE_ID_RAZER_ORNATA_V3:
report = razer_chroma_extended_matrix_effect_spectrum(VARSTORE, BACKLIGHT_LED);
report.transaction_id.id = 0x1F;
break;
Expand Down Expand Up @@ -558,6 +562,7 @@ ssize_t razer_attr_write_mode_reactive(IOUSBDeviceInterface **usb_dev, const cha
case USB_DEVICE_ID_RAZER_HUNTSMAN_V2:
case USB_DEVICE_ID_RAZER_HUNTSMAN_V2_TKL:
case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3_MINI_WIRED:
case USB_DEVICE_ID_RAZER_ORNATA_V3:
report = razer_chroma_extended_matrix_effect_reactive(VARSTORE, BACKLIGHT_LED, speed, (struct razer_rgb *)&buf[1]);
report.transaction_id.id = 0x1F;
break;
Expand Down Expand Up @@ -706,6 +711,7 @@ ssize_t razer_attr_write_mode_static(IOUSBDeviceInterface **usb_dev, const char
case USB_DEVICE_ID_RAZER_HUNTSMAN_V2:
case USB_DEVICE_ID_RAZER_HUNTSMAN_V2_TKL:
case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3_MINI_WIRED:
case USB_DEVICE_ID_RAZER_ORNATA_V3:
if (count == 3)
{
report = razer_chroma_extended_matrix_effect_static(VARSTORE, BACKLIGHT_LED, (struct razer_rgb *)&buf[0]);
Expand Down Expand Up @@ -875,6 +881,7 @@ ssize_t razer_attr_write_mode_static_no_store(IOUSBDeviceInterface **usb_dev, co
case USB_DEVICE_ID_RAZER_HUNTSMAN_V2:
case USB_DEVICE_ID_RAZER_HUNTSMAN_V2_TKL:
case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3_MINI_WIRED:
case USB_DEVICE_ID_RAZER_ORNATA_V3:
if (count == 3)
{
report = razer_chroma_extended_matrix_effect_static(NOSTORE, BACKLIGHT_LED, (struct razer_rgb *)&buf[0]);
Expand Down Expand Up @@ -993,6 +1000,7 @@ ssize_t razer_attr_write_mode_starlight(IOUSBDeviceInterface **usb_dev, const ch
case USB_DEVICE_ID_RAZER_HUNTSMAN_V2:
case USB_DEVICE_ID_RAZER_HUNTSMAN_V2_TKL:
case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3_MINI_WIRED:

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]);
Expand Down Expand Up @@ -1192,6 +1200,7 @@ ssize_t razer_attr_write_mode_breath(IOUSBDeviceInterface **usb_dev, const char
case USB_DEVICE_ID_RAZER_HUNTSMAN_V2:
case USB_DEVICE_ID_RAZER_HUNTSMAN_V2_TKL:
case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3_MINI_WIRED:
case USB_DEVICE_ID_RAZER_ORNATA_V3:
if (count == 3)
{ // Single colour mode
report = razer_chroma_extended_matrix_effect_breathing_single(VARSTORE, BACKLIGHT_LED, (struct razer_rgb *)&buf[0]);
Expand Down Expand Up @@ -1397,6 +1406,7 @@ ssize_t razer_attr_write_mode_custom(IOUSBDeviceInterface **usb_dev, const char
case USB_DEVICE_ID_RAZER_HUNTSMAN_V2:
case USB_DEVICE_ID_RAZER_HUNTSMAN_V2_TKL:
case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3_MINI_WIRED:
case USB_DEVICE_ID_RAZER_ORNATA_V3:
report = razer_chroma_extended_matrix_effect_custom_frame();
report.transaction_id.id = 0x1F;
break;
Expand Down Expand Up @@ -1478,6 +1488,7 @@ ssize_t razer_attr_write_set_brightness(IOUSBDeviceInterface **usb_dev, ushort b
case USB_DEVICE_ID_RAZER_HUNTSMAN_V2:
case USB_DEVICE_ID_RAZER_HUNTSMAN_V2_TKL:
case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3_MINI_WIRED:
case USB_DEVICE_ID_RAZER_ORNATA_V3:
report = razer_chroma_extended_matrix_brightness(VARSTORE, BACKLIGHT_LED, brightness);
report.transaction_id.id = 0x1F;
break;
Expand Down Expand Up @@ -1561,6 +1572,7 @@ ushort razer_attr_read_set_brightness(IOUSBDeviceInterface **usb_dev)
case USB_DEVICE_ID_RAZER_HUNTSMAN_V2:
case USB_DEVICE_ID_RAZER_HUNTSMAN_V2_TKL:
case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3_MINI_WIRED:
case USB_DEVICE_ID_RAZER_ORNATA_V3:
report = razer_chroma_extended_matrix_get_brightness(VARSTORE, BACKLIGHT_LED);
report.transaction_id.id = 0x1F;
is_matrix_brightness = true;
Expand Down Expand Up @@ -1684,6 +1696,7 @@ ssize_t razer_attr_write_matrix_custom_frame(IOUSBDeviceInterface **usb_dev, con
case USB_DEVICE_ID_RAZER_HUNTSMAN_V2:
case USB_DEVICE_ID_RAZER_HUNTSMAN_V2_TKL:
case USB_DEVICE_ID_RAZER_BLACKWIDOW_V3_MINI_WIRED:
case USB_DEVICE_ID_RAZER_ORNATA_V3:
report = razer_chroma_extended_matrix_set_custom_frame(row_id, start_col, stop_col, (unsigned char *)&buf[offset]);
report.transaction_id.id = 0x1F;
break;
Expand Down Expand Up @@ -1756,6 +1769,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_V3:
report_index = 0x02;
response_index = 0x02;
break;
Expand Down