From 39ec568ab1460da4bd86b1af19f6f9d5d44f9252 Mon Sep 17 00:00:00 2001
From: Daniel Pavel <daniel.pavel@gmail.com>
Date: Tue, 25 Jun 2013 18:54:27 +0200
Subject: [PATCH] descriptors table and devices documentation updated

---
 docs/devices.md                               | 19 ++++++++++++++-----
 lib/logitech/unifying_receiver/descriptors.py | 15 +++++++++++----
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/docs/devices.md b/docs/devices.md
index 9c7a09b4..76659993 100644
--- a/docs/devices.md
+++ b/docs/devices.md
@@ -40,6 +40,9 @@ Solaar, but its supported features are not specified here, I would love to hear
 about it.
 
 
+Devices marked with an asterisk (*) use a Nano receiver that knows the Unifying
+protocol, and should be fully supported by Solaar.
+
 The HID++ column specifies the device's HID++ version.
 
 The Battery column specifies if Solaar is able to read the device's battery
@@ -72,16 +75,22 @@ Mice:
 
 | Device           | HID++ | Battery | DPI   | Other supported features        |
 |------------------|-------|---------|-------|---------------------------------|
-| M215             | 1.0   | yes     |       |                                 |
-| M305             |       |         |       |                                 |
-| M310             |       |         |       |                                 |
-| M315             |       |         |       |                                 |
+| M175 *           | 1.0   | yes     |       |                                 |
+| M185 *           | 1.0   | yes     |       |                                 |
+| M187 *           | 1.0   | yes     |       |                                 |
+| M215 *           | 1.0   | yes     |       |                                 |
+| M235 *           | 1.0   | yes     |       |                                 |
+| M305 *           | 1.0   | yes     |       |                                 |
+| M310 *           | 1.0   | yes     |       |                                 |
+| M315 *           | 1.0   | yes     |       |                                 |
+| M317             |       |         |       |                                 |
 | M325             |       |         |       |                                 |
 | M345             |       |         |       |                                 |
 | M505             |       |         |       |                                 |
 | M510             | 1.0   | yes     |       | smooth scrolling                |
 | M515 Couch       | 2.0   | yes     | -     |                                 |
 | M525             | 2.0   | yes     | -     |                                 |
+| M600 Touch       |       |         |       |                                 |
 | M705 Marathon    | 1.0   | yes     | -     | smooth scrolling                |
 | T400 Zone Touch  |       |         |       |                                 |
 | T620 Touch       |       |         |       |                                 |
@@ -102,7 +111,7 @@ Touchpads:
 | Device           | HID++ | Battery | DPI   | Other supported features        |
 |------------------|-------|---------|-------|---------------------------------|
 | Wireless Touch   | 2.0   |         |       |                                 |
-| T650 Touchpad    |       |         |       |                                 |
+| T650 Touchpad    | 2.0   |         |       |                                 |
 
 
 Mouse-Keyboard combos:
diff --git a/lib/logitech/unifying_receiver/descriptors.py b/lib/logitech/unifying_receiver/descriptors.py
index e66424e0..5d661b2f 100644
--- a/lib/logitech/unifying_receiver/descriptors.py
+++ b/lib/logitech/unifying_receiver/descriptors.py
@@ -162,11 +162,17 @@ _D('Wireless Illuminated Keyboard K800', protocol=1.0,
 
 # Mice
 
+_D('Wireless Mouse M175', protocol=1.0)
+_D('Wireless Mouse M185', protocol=1.0)
+_D('Wireless Mouse M187', protocol=1.0)
 _D('Wireless Mouse M215', protocol=1.0)
-_D('Wireless Mouse M305')
-_D('Wireless Mouse M310')
-_D('Wireless Mouse M315')
+_D('Wireless Mouse M235', protocol=1.0)
+_D('Wireless Mouse M305', protocol=1.0)
+_D('Wireless Mouse M310', protocol=1.0)
+_D('Wireless Mouse M315', protocol=1.0)
+_D('Wireless Mouse M317')
 _D('Wireless Mouse M325')
+_D('Wireless Mouse M345')
 _D('Wireless Mouse M505')
 _D('Wireless Mouse M510', protocol=1.0,
 				registers={'battery_charge': -0x0D, 'battery_status': 0x07},
@@ -200,7 +206,8 @@ _D('Wireless Trackball M570')
 
 # Touchpads
 
-_D('Wireless Rechargeable Touchpad T650')
+_D('Wireless Rechargeable Touchpad T650', protocol=2.0)
+_D('Wireless Touchpad', codename='Wireless Touch', protocol=2.0)
 
 #
 # classic Nano devices