diff --git a/README.md b/README.md index 11cfc7d0174857e0bc2ad536772c673c98c6371e..6147ee362157f0f94be6c2dc0c5e3eb3624e76cf 100644 --- a/README.md +++ b/README.md @@ -69,6 +69,7 @@ The devices below are fully feature supported by OpenRazer, which means all avai | Razer Blade Stealth (Late 2020) | 1532:0259 | | Razer Ornata Chroma V2 | 1532:025D | | Razer Cynosa V2 | 1532:025E | +| Razer Book 13 (2020) | 1532:026A | ### Mice | Device | USB VID:PID | diff --git a/daemon/openrazer_daemon/hardware/keyboards.py b/daemon/openrazer_daemon/hardware/keyboards.py index cf2c333dee47f79aa0989006203deaaab917ec51..cf1dd4c089ed5bb80576bec0eaa22fb2626a5938 100644 --- a/daemon/openrazer_daemon/hardware/keyboards.py +++ b/daemon/openrazer_daemon/hardware/keyboards.py @@ -1095,6 +1095,20 @@ class RazerBladeStealthLate2020(_RippleKeyboard): DEVICE_IMAGE = "https://assets2.razerzone.com/images/blade-stealth-13/shop/sl25p-fhd-4.jpg" +class RazerBook2020(_RippleKeyboard): + """ + Class for the Razer Book (2020) + """ + EVENT_FILE_REGEX = re.compile(r'.*Razer_Blade(-if01)?-event-kbd') + + USB_VID = 0x1532 + USB_PID = 0x026A + METHODS = ['get_device_type_keyboard', 'set_static_effect', 'set_spectrum_effect', + 'set_none_effect', 'set_breath_random_effect', 'set_breath_single_effect'] + + DEVICE_IMAGE = "https://assets.razerzone.com/eeimages/support/products/1743/razerbook132020.png" + + class RazerBlade2019Adv(_RippleKeyboard): """ Class for the Razer Blade 15 (2019) Advanced diff --git a/driver/razerkbd_driver.c b/driver/razerkbd_driver.c index 7157cbce650d2a9b184e5c791c8269704cd676ca..b30a244e561234c4d82ff0b1bcc67dbf25ce2786 100644 --- a/driver/razerkbd_driver.c +++ b/driver/razerkbd_driver.c @@ -134,6 +134,7 @@ static bool is_blade_laptop(struct usb_device *usb_dev) case USB_DEVICE_ID_RAZER_BLADE_PRO_LATE_2019: case USB_DEVICE_ID_RAZER_BLADE_STEALTH_EARLY_2020: case USB_DEVICE_ID_RAZER_BLADE_STEALTH_LATE_2020: + case USB_DEVICE_ID_RAZER_BOOK_2020: case USB_DEVICE_ID_RAZER_BLADE_15_ADV_2020: case USB_DEVICE_ID_RAZER_BLADE_EARLY_2020_BASE: return true; @@ -388,6 +389,10 @@ static ssize_t razer_attr_read_device_type(struct device *dev, struct device_att device_type = "Razer Blade Stealth (Late 2020)\n"; break; + case USB_DEVICE_ID_RAZER_BOOK_2020: + device_type = "Razer Book 13 (2020)\n"; + break; + case USB_DEVICE_ID_RAZER_BLADE_STEALTH_LATE_2016: device_type = "Razer Blade Stealth (Late 2016)\n"; break; @@ -1128,6 +1133,7 @@ static ssize_t razer_attr_write_mode_static(struct device *dev, struct device_at case USB_DEVICE_ID_RAZER_BLADE_STEALTH_LATE_2019: case USB_DEVICE_ID_RAZER_BLADE_STEALTH_EARLY_2020: case USB_DEVICE_ID_RAZER_BLADE_STEALTH_LATE_2020: + case USB_DEVICE_ID_RAZER_BOOK_2020: case USB_DEVICE_ID_RAZER_BLADE_QHD: case USB_DEVICE_ID_RAZER_BLADE_PRO_LATE_2016: case USB_DEVICE_ID_RAZER_BLADE_2018: @@ -2351,6 +2357,7 @@ static int razer_kbd_probe(struct hid_device *hdev, const struct hid_device_id * case USB_DEVICE_ID_RAZER_BLADE_STEALTH_LATE_2019: case USB_DEVICE_ID_RAZER_BLADE_STEALTH_EARLY_2020: case USB_DEVICE_ID_RAZER_BLADE_STEALTH_LATE_2020: + case USB_DEVICE_ID_RAZER_BOOK_2020: case USB_DEVICE_ID_RAZER_BLADE_2019_BASE: case USB_DEVICE_ID_RAZER_BLADE_EARLY_2020_BASE: CREATE_DEVICE_FILE(&hdev->dev, &dev_attr_matrix_effect_none); // No effect @@ -2671,6 +2678,7 @@ static void razer_kbd_disconnect(struct hid_device *hdev) case USB_DEVICE_ID_RAZER_BLADE_STEALTH_LATE_2019: case USB_DEVICE_ID_RAZER_BLADE_STEALTH_EARLY_2020: case USB_DEVICE_ID_RAZER_BLADE_STEALTH_LATE_2020: + case USB_DEVICE_ID_RAZER_BOOK_2020: case USB_DEVICE_ID_RAZER_BLADE_2019_BASE: case USB_DEVICE_ID_RAZER_BLADE_EARLY_2020_BASE: device_remove_file(&hdev->dev, &dev_attr_matrix_effect_none); // No effect @@ -2917,6 +2925,7 @@ static const struct hid_device_id razer_devices[] = { { HID_USB_DEVICE(USB_VENDOR_ID_RAZER,USB_DEVICE_ID_RAZER_BLADE_STEALTH_LATE_2019) }, { HID_USB_DEVICE(USB_VENDOR_ID_RAZER,USB_DEVICE_ID_RAZER_BLADE_STEALTH_EARLY_2020) }, { HID_USB_DEVICE(USB_VENDOR_ID_RAZER,USB_DEVICE_ID_RAZER_BLADE_STEALTH_LATE_2020) }, + { HID_USB_DEVICE(USB_VENDOR_ID_RAZER,USB_DEVICE_ID_RAZER_BOOK_2020) }, { HID_USB_DEVICE(USB_VENDOR_ID_RAZER,USB_DEVICE_ID_RAZER_BLADE_EARLY_2020_BASE) }, { 0 } }; diff --git a/driver/razerkbd_driver.h b/driver/razerkbd_driver.h index 88b9145a25876030eddea7b1a9437df49f7b0f52..7b7df93bab267f7baa8e18a0169eb9d70b6523d1 100644 --- a/driver/razerkbd_driver.h +++ b/driver/razerkbd_driver.h @@ -72,6 +72,7 @@ #define USB_DEVICE_ID_RAZER_BLADE_STEALTH_LATE_2020 0x0259 #define USB_DEVICE_ID_RAZER_ORNATA_CHROMA_V2 0x025D #define USB_DEVICE_ID_RAZER_CYNOSA_V2 0x025E +#define USB_DEVICE_ID_RAZER_BOOK_2020 0x026A /* Each keyboard report has 90 bytes*/ #define RAZER_BLACKWIDOW_REPORT_LEN 0x5A diff --git a/install_files/appstream/io.github.openrazer.openrazer.metainfo.xml b/install_files/appstream/io.github.openrazer.openrazer.metainfo.xml index 3dfa621f828c0858b04e166abe77130605c1858a..46af1acb51868f05d627fc697f04f2aa2a277a09 100644 --- a/install_files/appstream/io.github.openrazer.openrazer.metainfo.xml +++ b/install_files/appstream/io.github.openrazer.openrazer.metainfo.xml @@ -129,6 +129,7 @@ <modalias>usb:v1532p0259d*</modalias> <modalias>usb:v1532p025Dd*</modalias> <modalias>usb:v1532p025Ed*</modalias> + <modalias>usb:v1532p026Ad*</modalias> <modalias>usb:v1532p0501d*</modalias> <modalias>usb:v1532p0504d*</modalias> <modalias>usb:v1532p0506d*</modalias> diff --git a/install_files/udev/99-razer.rules b/install_files/udev/99-razer.rules index 945fd6cf1b289fae761d649b92e39fb603854b6c..d5b9f646068640fcaa2af1052b47c100c12d972a 100644 --- a/install_files/udev/99-razer.rules +++ b/install_files/udev/99-razer.rules @@ -10,7 +10,7 @@ ATTRS{idProduct}=="0013|0016|0020|0024|0025|002e|002f|0032|0034|0036|0037|0038|0 ENV{ID_RAZER_CHROMA}="1", ENV{RAZER_DRIVER}="razermouse" # Keyboards -ATTRS{idProduct}=="010d|010e|010f|0111|0113|011a|011b|0201|0202|0203|0204|0205|0207|0208|0209|020f|0210|0211|0214|0216|0217|021a|021e|021f|0220|0221|0224|0225|0226|0227|0228|022a|022b|022d|022f|0232|0233|0234|0235|0237|0239|023a|023b|023f|0240|0241|0243|0245|0246|024a|024c|024d|0252|0253|0255|0259|025d|025e", \ +ATTRS{idProduct}=="010d|010e|010f|0111|0113|011a|011b|0201|0202|0203|0204|0205|0207|0208|0209|020f|0210|0211|0214|0216|0217|021a|021e|021f|0220|0221|0224|0225|0226|0227|0228|022a|022b|022d|022f|0232|0233|0234|0235|0237|0239|023a|023b|023f|0240|0241|0243|0245|0246|024a|024c|024d|0252|0253|0255|0259|025d|025e|026a", \ ATTRS{idVendor}=="1532", \ ENV{ID_RAZER_CHROMA}="1", ENV{RAZER_DRIVER}="razerkbd" diff --git a/pylib/openrazer/_fake_driver/razerbook132020.cfg b/pylib/openrazer/_fake_driver/razerbook132020.cfg new file mode 100644 index 0000000000000000000000000000000000000000..7cde3d68e58d4e31e305aed506d829463910362d --- /dev/null +++ b/pylib/openrazer/_fake_driver/razerbook132020.cfg @@ -0,0 +1,14 @@ +[device] +dir_name = 0003:1532:026A.0001 +name = Razer Book 13 (2020) +files = r,device_serial,XX000000026A + r,device_type,%(name)s + r,firmware_version,v1.0 + r,kbd_layout,01 + rw,matrix_brightness,0 + w,matrix_effect_breath + w,matrix_effect_none + w,matrix_effect_reactive + w,matrix_effect_spectrum + w,matrix_effect_static + r,version,1.0.0