Merge branch 't3307' into next

Incubates #3307.
nvaccess · Jul 11, 2013 · 1a5fe8b · 1a5fe8b
2 parents 8eb77c4 + 1d42139
commit 1a5fe8b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/source/brailleDisplayDrivers/freedomScientific.py b/source/brailleDisplayDrivers/freedomScientific.py
@@ -49,7 +49,11 @@
 inputType_wizWheel=5
 
 # Names of freedom scientific bluetooth devices
-bluetoothNames = ("Focus 40 BT",)
+bluetoothNames = (
+	"F14", "Focus 14 BT",
+	"Focus 40 BT",
+	"Focus 80 BT",
+)
 
 keysPressed=0
 extendedKeysPressed=0
@@ -130,7 +134,14 @@ def getPossiblePorts(cls):
 
 	@classmethod
 	def _getBluetoothPorts(cls):
-		return (p["port"].encode("mbcs") for p in hwPortUtils.listComPorts() if p.get("bluetoothName") in bluetoothNames)
+		for p in hwPortUtils.listComPorts():
+			try:
+				btName = p["bluetoothName"]
+			except KeyError:
+				continue
+			if not any(btName == prefix or btName.startswith(prefix + " ") for prefix in bluetoothNames):
+				continue
+			yield p["port"].encode("mbcs")
 
 	wizWheelActions=[
 		# Translators: The name of a key on a braille display, that scrolls the display to show previous/next part of a long line.

diff --git a/user_docs/en/changes.t2t b/user_docs/en/changes.t2t
@@ -16,6 +16,7 @@
 - Sleep mode is automatically enabled when using Dolphin Cicero. (#2055)
 - The Windows x64 version of Miranda IM/Miranda NG is now supported. (#3296)
 - Search suggestions in the Windows 8.1 Start Screen are automatically reported. (#3322)
+- The Freedom Scientific Focus 14 Blue and Focus 80 Blue braille displays, as well as the Focus 40 Blue in certain configurations that weren't supported previously, are now supported when connected via Bluetooth. (#3307)
 
 
 == Changes ==