Skip to content

Several improvements for the handy tech driver #8016

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
michaelDCurran merged 22 commits into from
Apr 20, 2018
Merged

Several improvements for the handy tech driver #8016

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
efe01be
Revert "Drop support for the Braillino for now"
Jan 2, 2018
9d42111
Basic support for old protocol
Jan 2, 2018
0adec27
More work on old protocol
Jan 2, 2018
8680bfb
Support the old protocol
Jan 3, 2018
f9bb3c2
cleanup
Jan 3, 2018
d01edb4
Support time synchronization and fix reconnecting for bluetooth.
Jan 1, 2018
37c8552
Python3 compat
Jan 3, 2018
cac7c1b
Basic preparation for #7452
Jan 2, 2018
cc6d7ff
Comments
Feb 15, 2018
0d79b6f
Use old protocol for easy braille
Feb 15, 2018
d2f5047
Fixes
Feb 16, 2018
66a65a0
Refactor onReceive
Feb 16, 2018
42f01f6
Added support for Braillino and the old protocol
Jan 2, 2018
faa784b
Hopefully, some changes that ease python 3 porting in future
Jan 3, 2018
9b94a71
Use old protocol for easy braille
Feb 15, 2018
d47bd82
Last refactoring, including onReceive. Old protocol input is now dstable
Feb 16, 2018
6bcdfb7
Remove the com server
Feb 17, 2018
f437652
Merge branch 'handytech-followup' of github.com:/babbagecom/nvda into…
Feb 20, 2018
e5b30b4
Review action
Feb 20, 2018
6ca6642
Use Old Protocol for Braille Wave
Feb 20, 2018
607a4f4
Merge remote-tracking branch 'origin/master' into handytech-followup
Mar 6, 2018
4e55bc5
Catch ValueError for Handy Tech time sync datetime.datetime
Mar 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
More work on old protocol
  • Loading branch information
Leonard de Ruijter
Leonard de Ruijter committed Feb 15, 2018
commit 0adec27f242cf670cec4c71bfaf0783ce99410b2
38 changes: 24 additions & 14 deletions source/brailleDisplayDrivers/handyTech.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,16 +223,16 @@ def display(self, cells):
self._display.sendExtendedPacket(HT_EXTPKT_BRAILLE,
"".join(chr(cell) for cell in cells))


class OldProtocolMixin(object):
"Mixin for displays using an older protocol to send braille cells and handle input"

def display(self, cells):
"""Write cells to the display according to the old protocol

This older protocol sends a simple packet starting with HT_PKT_BRAILLE,
followed by the cells. No model ID or lenghth are included.
"""
return self._display.sendPacket(HT_PKT_BRAILLE, [chr(cell) for cell in cells])
self._display.sendPacket(HT_PKT_BRAILLE, "".join(chr(cell) for cell in cells))


class AtcMixin(object):
Expand Down Expand Up @@ -405,6 +405,12 @@ class ActiveStar40(TimeSyncMixin, AtcMixin, TripleActionKeysMixin, Model):
genericName = "Active Star"


class Braillino(TripleActionKeysMixin, OldProtocolMixin, Model):
deviceId = MODEL_BRAILLINO
numCells = 20
genericName = name = 'Braillino'


class BrailleWave(Model):
deviceId = MODEL_BRAILLE_WAVE
numCells = 40
Expand Down Expand Up @@ -460,7 +466,7 @@ class BrailleStar80(BrailleStar):
numCells = 80


class Modular(StatusCellMixin, TripleActionKeysMixin, Model):
class Modular(StatusCellMixin, TripleActionKeysMixin, OldProtocolMixin, Model):
genericName = "Modular"

def _get_name(self):
Expand Down Expand Up @@ -713,6 +719,7 @@ def _handleKeyRelease(self):
# being released, so they should be ignored.
self._ignoreKeyReleases = True


# pylint: disable=R0912
# Pylint complains about many branches, might be worth refactoring
def _onReceive(self, data):
Expand Down Expand Up @@ -798,17 +805,7 @@ def _onReceive(self, data):
elif packet[1] == HT_PKT_NAK:
log.debugWarning("NAK received!")
elif extPacketType == HT_EXTPKT_KEY:
key = ord(packet[1])
release = (key & KEY_RELEASE) != 0
if release:
key = key ^ KEY_RELEASE
self._handleKeyRelease()
self._keysDown.discard(key)
else:
# Press.
# This begins a new key combination.
self._ignoreKeyReleases = False
self._keysDown.add(key)
self._handleInput(ord(packet[1]))
elif extPacketType == HT_EXTPKT_ATC_INFO:
# Ignore ATC packets for now
pass
Expand All @@ -825,6 +822,19 @@ def _onReceive(self, data):
log.debugWarning("Unhandled packet of type %r" % serPacketType)


def _handleInput(self, key):
release = (key & KEY_RELEASE) != 0
if release:
key ^= KEY_RELEASE
self._handleKeyRelease()
self._keysDown.discard(key)
else:
# Press.
# This begins a new key combination.
self._ignoreKeyReleases = False
self._keysDown.add(key)


def display(self, cells):
# cells will already be padded up to numCells.
self._model.display(cells)
Expand Down