The QWERTY keyboard on the Papenmeier BRAILLEX Live Plus braille disp…

…lay is now supported. Fixes #5181.
nvaccess · Jul 14, 2015 · f52bd5a · f52bd5a
1 parent 1973d33
commit f52bd5a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/source/brailleDisplayDrivers/papenmeier.py b/source/brailleDisplayDrivers/papenmeier.py
@@ -15,6 +15,7 @@
 import inputCore
 import brailleInput
 import struct
+import keyboardHandler
 
 try:
 	import ftdi2
@@ -528,7 +529,13 @@ def __init__(self, keys, driver):
 			self.id=brl_join_keys(brl_decode_key_names_repeat(driver))
 			return
 
-		if driver._baud != 1 and keys[0] == 'L' and not ((ord(keys[3])-48) >>3):
+		if driver._baud != 1 and keys[0] == 'L':
+			if ((ord(keys[3]) -48) >>3):
+				scancode=ord(keys[5])-48 << 4| ord(keys[6])-48
+				press = not ord(keys[4]) & 1
+				ext = bool(ord(keys[4]) & 2)
+				keyboardHandler.injectRawKeyboardInput(press,scancode,ext)
+				return
 			#get dots
 			z  = ord('0')
 			b = ord(keys[4])-z

diff --git a/user_docs/en/changes.t2t b/user_docs/en/changes.t2t
@@ -12,6 +12,7 @@
 - Support for the EcoBraille 20, EcoBraille 40, EcoBraille 80 and EcoBraille Plus braille displays. (#4078)
 - In browse mode, you can now toggle single letter navigation on and off by pressing NVDA+shift+space. When off, single letter keys are passed to the application, which is useful for some web applications such as Gmail, Twitter and Facebook. (#3203)
 - New braille translation tables: Finnish 6 dot, Irish grade 1, Irish grade 2, Korean grade 1 (2006), Korean grade 2 (2006). (#5137, #5074, #5097)
+- The QWERTY keyboard on the Papenmeier BRAILLEX Live Plus braille display is now supported. (#5181)
 
 
 == Changes ==

diff --git a/user_docs/en/userGuide.t2t b/user_docs/en/userGuide.t2t
@@ -1762,10 +1762,9 @@ The following Braille displays are supported:
 -
 
 If BrxCom is installed, NVDA will use BrxCom.
-BrxCom is a tool that allows you to use the Braille input independently from a screen reader.
+BrxCom is a tool that allows keyboard input from the braille display to function independently from a screen reader.
 A new version of BrxCom which works with NVDA will be released by Papenmeier soon.
-Braille input is possible with the Trio, BRAILLEX Live 20 and Braillex Live devices without BrxCom.
-Braille input is also possible with the Live Plus model, but with BrxCom only.
+Keyboard input is possible with the Trio and BRAILLEX Live models.
 
 Most devices have an Easy Access Bar (EAB) that allows intuitive and fast operation.
 The EAB can be moved in four directions where generally each direction has two switches.