Merge b9c2665 into 2c4caa6

michaelDCurran · web-flow · commit 031e2e6a0914 · 2020-03-02T09:35:16.000+10:00
diff --git a/source/bdDetect.py b/source/bdDetect.py
@@ -459,23 +459,40 @@ def driverSupportsAutoDetection(driver):
 
 # brailliantB
 addUsbDevices("brailliantB", KEY_HID, {
+	"VID_1C71&PID_C111",  # Mantis Q 40
+	"VID_1C71&PID_C101",  # Chameleon 20
+	"VID_1C71&PID_C121",  # Humanware BrailleOne 20 HID
+	"VID_1C71&PID_CE01",  # NLS eReader 20  HID
 	"VID_1C71&PID_C006", # Brailliant BI 32, 40 and 80
 	"VID_1C71&PID_C022", # Brailliant BI 14
 	"VID_1C71&PID_C00A", # BrailleNote Touch
+	"VID_1C71&PID_C00E",  # BrailleNote Touch v2
 })
 addUsbDevices("brailliantB", KEY_SERIAL, {
 	"VID_1C71&PID_C005", # Brailliant BI 32, 40 and 80
 	"VID_1C71&PID_C021", # Brailliant BI 14
 })
-addBluetoothDevices("brailliantB", lambda m: (
-	m.type==KEY_SERIAL
-		and (m.id.startswith("Brailliant B")
-		or m.id == "Brailliant 80"
-		or "BrailleNote Touch" in m.id
-	)) or (m.type==KEY_HID
+addBluetoothDevices(
+	"brailliantB", lambda m: (
+		m.type == KEY_SERIAL
+		and (
+			m.id.startswith("Brailliant B")
+			or m.id == "Brailliant 80"
+			or "BrailleNote Touch" in m.id
+		)
+	)
+	or (
+		m.type == KEY_HID
 		and m.deviceInfo.get("manufacturer") == "Humanware"
-		and m.deviceInfo.get("product") == "Brailliant HID"
-))
+		and m.deviceInfo.get("product") in (
+			"Brailliant HID",
+			"APH Chameleon 20",
+			"APH Mantis Q40",
+			"Humanware BrailleOne",
+			"NLS eReader",
+		)
+	)
+)
 
 # eurobraille
 addUsbDevices("eurobraille", KEY_HID, {
diff --git a/user_docs/en/userGuide.t2t b/user_docs/en/userGuide.t2t
@@ -2425,7 +2425,12 @@ The Brailliant BI and B series of displays  from [HumanWare https://www.humanwar
 If connecting via USB with the protocol set to HumanWare, you must first install the USB drivers provided by the manufacturer.
 USB drivers are not required if the protocol is set to OpenBraille.
 
-The BrailleNote Touch is also supported, and does not require any drivers to be installed.
+The following extra devices are also supported (and do not require any special drivers to be installed):
+- APH Mantis Q40
+- APH Chameleon 20
+- Humanware BrailleOne
+- NLS eReader
+
 
 Following are the key assignments for  the Brailliant BI/B and BrailleNote touch displays with NVDA.
 Please see the display's documentation for descriptions of where these keys can be found.
