diff --git a/docs/devices.md b/docs/devices.md index 02ad3965..372bd2e6 100644 --- a/docs/devices.md +++ b/docs/devices.md @@ -25,8 +25,8 @@ Linux system configuration) are supported: * The DPI can be changed on the [Performance MX Mouse][P_MX]. * Smooth scrolling (higher sensitivity on vertical scrolling with the wheel) can - be toggled on the [M705 Marathon Mouse][M705], [M510 Wireless Mouse][M510] and - [M325][M325]. + be toggled on the [M705 Marathon Mouse][M705], [M510 Wireless Mouse][M510], + [M325][M325] and [G700s][G700s]. # Supported features @@ -97,6 +97,8 @@ Mice (Nano): | Device | HID++ | Battery | DPI | Other supported features | |------------------|-------|---------|-------|---------------------------------| +| G700s | 1.0 | yes | - | smooth scrolling | +| G700 | 1.0 | yes | - | smooth scrolling | | V450 Nano | 1.0 | yes | - | smooth scrolling | | V550 Nano | 1.0 | yes | - | smooth scrolling | | VX Nano | 1.0 | yes | - | smooth scrolling | @@ -152,6 +154,7 @@ Mouse-Keyboard combos: [unifying]: http://logitech.com/en-us/66/6079 [nano]: http://logitech.com/mice-pointers/articles/5926 +[G700s]: https://gaming.logitech.com/en-us/product/g700s-rechargeable-wireless-gaming-mouse [K360]: http://logitech.com/product/keyboard-k360 [K700]: http://logitech.com/product/wireless-desktop-mk710 [K750]: http://logitech.com/product/k750-keyboard diff --git a/lib/logitech_receiver/descriptors.py b/lib/logitech_receiver/descriptors.py index 17bf7003..200cdb7d 100644 --- a/lib/logitech_receiver/descriptors.py +++ b/lib/logitech_receiver/descriptors.py @@ -280,7 +280,18 @@ _D('G7 Cordless Laser Mouse', codename='G7', protocol=1.0, wpid='1002', registers=(_R.battery_status, ), ) _D('G700 Gaming Mouse', codename='G700', protocol=1.0, wpid='1023', - registers=(_R.battery_status, ), + registers=(_R.battery_status, _R.three_leds, ), + settings=[ + _RS.smooth_scroll(), + _RS.side_scroll(), + ], + ) +_D('G700s Gaming Mouse', codename='G700s', protocol=1.0, wpid='102A', + registers=(_R.battery_status, _R.three_leds, ), + settings=[ + _RS.smooth_scroll(), + _RS.side_scroll(), + ], ) # Trackballs diff --git a/packaging/debian/solaar.udev b/packaging/debian/solaar.udev index 05899ea8..777c79bf 100644 --- a/packaging/debian/solaar.udev +++ b/packaging/debian/solaar.udev @@ -20,6 +20,9 @@ ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c526", GOTO="solaar_apply" # classic Nano receiver -- MK220/MK320 mouse and keyboard combo ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c52e", GOTO="solaar_apply" +# G-Series receiver -- G-Series mouse +ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c531", GOTO="solaar_apply" + GOTO="solaar_end" # diff --git a/rules.d/42-logitech-unify-permissions.rules b/rules.d/42-logitech-unify-permissions.rules index 83afe5b3..28c31ced 100644 --- a/rules.d/42-logitech-unify-permissions.rules +++ b/rules.d/42-logitech-unify-permissions.rules @@ -9,7 +9,6 @@ SUBSYSTEM != "hidraw", GOTO="solaar_end" # official Unifying receivers ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c52b", GOTO="solaar_apply" -ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c531", GOTO="solaar_apply" ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c532", GOTO="solaar_apply" # Nano receiver, "Unifying Ready" @@ -21,6 +20,9 @@ ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c526", GOTO="solaar_apply" # classic Nano receiver -- MK220/MK320 mouse and keyboard combo ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c52e", GOTO="solaar_apply" +# G-Series receiver -- G-Series mouse +ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c531", GOTO="solaar_apply" + GOTO="solaar_end" LABEL="solaar_apply"