Merge 561a375 into 18572e4

michaelDCurran · web-flow · commit e212c4a0f317 · 2020-11-10T08:24:28.000+10:00
diff --git a/source/bdDetect.py b/source/bdDetect.py
@@ -465,6 +465,8 @@ def driverSupportsAutoDetection(driver):
 	"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_C131",  # Brailliant BI 40X
+	"VID_1C71&PID_C141",  # Brailliant BI 20X
 	"VID_1C71&PID_C00A", # BrailleNote Touch
 	"VID_1C71&PID_C00E",  # BrailleNote Touch v2
 })
@@ -491,6 +493,8 @@ def driverSupportsAutoDetection(driver):
 			"Humanware BrailleOne",
 			"NLS eReader",
 			"NLS eReader Humanware",
+			"Brailliant BI 40X",
+			"Brailliant BI 20X",
 		)
 	)
 )
diff --git a/user_docs/en/changes.t2t b/user_docs/en/changes.t2t
@@ -14,6 +14,7 @@ What's New in NVDA
 - Added support for the new chinese Traditional Quick and Pinyin Input methods in Windows 10. (#11562)
 - Tab headers are now considered form fields with quick navigation f key. (#10432)
 - Added a command to toggle reporting of marked (highlighted) text; There is no default associated gesture. (#11807)
+- NVDA will now automatically detect the Humanware BI 40X and 20X devices via both USB and Bluetooth. (#11819)
 
 
 == Changes ==
diff --git a/user_docs/en/userGuide.t2t b/user_docs/en/userGuide.t2t
@@ -2508,7 +2508,7 @@ Please see the display's documentation for descriptions of where these keys can
 %kc:endInclude
 
 ++ HumanWare Brailliant BI/B Series / BrailleNote Touch  ++[HumanWareBrailliant]
-The Brailliant BI and B series of displays  from [HumanWare https://www.humanware.com/], including the BI 14, BI 32, BI 40 and B 80, are supported when connected via USB or bluetooth.
+The Brailliant BI and B series of displays  from [HumanWare https://www.humanware.com/], including the BI 14, BI 32, BI 20X, BI 40, BI 40X and B 80, are supported when connected via USB or bluetooth.
 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.
 

Original file line number	Diff line number	Diff line change
`@@ -465,6 +465,8 @@ def driverSupportsAutoDetection(driver):`
`465`	`465`	`"VID_1C71&PID_CE01", # NLS eReader 20 HID`
`466`	`466`	`"VID_1C71&PID_C006", # Brailliant BI 32, 40 and 80`
`467`	`467`	`"VID_1C71&PID_C022", # Brailliant BI 14`
	`468`	`+ "VID_1C71&PID_C131", # Brailliant BI 40X`
	`469`	`+ "VID_1C71&PID_C141", # Brailliant BI 20X`
`468`	`470`	`"VID_1C71&PID_C00A", # BrailleNote Touch`
`469`	`471`	`"VID_1C71&PID_C00E", # BrailleNote Touch v2`
`470`	`472`	`})`
`@@ -491,6 +493,8 @@ def driverSupportsAutoDetection(driver):`
`491`	`493`	`"Humanware BrailleOne",`
`492`	`494`	`"NLS eReader",`
`493`	`495`	`"NLS eReader Humanware",`
	`496`	`+ "Brailliant BI 40X",`
	`497`	`+ "Brailliant BI 20X",`
`494`	`498`	`)`
`495`	`499`	`)`
`496`	`500`	`)`