Merge 5cbdbe6 into 617f865

moyanming · web-flow · commit ee9926a8db93 · 2020-11-12T20:18:51.000+10:00
diff --git a/source/brailleDisplayDrivers/seika.py b/source/brailleDisplayDrivers/seika.py
@@ -1,25 +1,24 @@
 # -*- coding: UTF-8 -*-
-#brailleDisplayDrivers/seika.py
-#A part of NonVisual Desktop Access (NVDA)
-#This file is covered by the GNU General Public License.
-#See the file COPYING for more details.
-#Copyright (C) 2012 Ulf Beckmann <beckmann@flusoft.de>
-
-# Parts of this code are inherited from the baum braille driver
-# written by James Teh <jamie@jantrid.net>
-
+# brailleDisplayDrivers/seika.py
+# A part of NonVisual Desktop Access (NVDA)
+# This file is covered by the GNU General Public License.
+# See the file COPYING for more details.
+# Copyright (C) 2012/20 Ulf Beckmann <beckmann@flusoft.de>
+
+# A redesign was made for Python V3.7 in 2020
+#
 # This file represents the braille display driver for
-# Seika3 V2.00, Seika80, a product from Nippon Telesoft
+# Seika3/5 V1.x/2.0, Seika80, a product from Nippon Telesoft
 # see www.seika-braille.com for more details
-# 18.08.2012 13:54
+# 24.07.2020 17:03
 
 from typing import List
-
 import wx
 import serial
 import braille
 import inputCore
 import hwPortUtils
+from hwIo import intToByte
 from logHandler import log
 
 TIMEOUT = 0.2
@@ -29,16 +28,14 @@
 class BrailleDisplayDriver(braille.BrailleDisplayDriver):
 	name = "seika"
 	# Translators: Names of braille displays.
-	description = _("Seika braille displays")
+	description = _("Seika Braille Displays")
 	numCells = 0
 
 	@classmethod
 	def check(cls):
 		return True
-
 	def __init__(self):
 		super(BrailleDisplayDriver, self).__init__()
-
 		for portInfo in hwPortUtils.listComPorts(onlyAvailable=True):
 			port = portInfo["port"]
 			hwID = portInfo["hardwareID"]
@@ -52,18 +49,22 @@ def __init__(self):
 			except serial.SerialException:
 				continue
 			log.debug("serial port open {port}".format(port=port))
+			# get the version infos			
 			self._ser.write(b"\xFF\xFF\x1C")
 			self._ser.flush()
 			# Read out the input buffer
 			versionS = self._ser.read(13)
 			log.debug("receive {p}".format(p=versionS))
-			if versionS.startswith("seika80"):
+			if versionS.startswith(b"seika80"):
 				log.info("Found Seika80 connected via {port} Version {versionS}".format(port=port, versionS=versionS))
 				self.numCells = 80
+				# Handshake data for seika 80
+				self.s40 = b"\xff\xff\x73\x38\x30\x00\x00\x00"
 				break
-			if versionS.startswith("seika3"):
-				log.info("Found Seika40 connected via {port} Version {versionS}".format(port=port, versionS=versionS))
+			if versionS.startswith(b"seika3"):
+				log.info("Found Seika3/5 connected via {port} Version {versionS}".format(port=port, versionS=versionS))
 				self.numCells = 40
+				# Handshake data for v3, v5
 				self.s40 = b"\xFF\xFF\x73\x65\x69\x6B\x61\x00"
 				break
 			# is it a old Seika3?
@@ -96,18 +97,18 @@ def terminate(self):
 			self._ser.close()
 
 	def display(self, cells: List[int]):
+		# add padding so total length is 1 + numberOfStatusCells + numberOfRegularCells
+		cellPadding: bytes = bytes(self.numCells - len(cells))
+		writeBytes: List[bytes] = [self.s40, ]
 		# every transmitted line consists of the preamble SEIKA_SENDHEADER and the Cells
 		if self.numCells==80:
-			lineBytes = b"".join([
-				b"\xff\xff\x73\x38\x30\x00\x00\x00",
-				bytes(cells)
-			])
+			lineBytes: bytes = self.s40 + bytes(cells) + cellPadding
 		else:
-			lineBytes = b"".join([
-				self.s40,
-				b"\0",
-				bytes(cells)
-			])
+			for cell in cells:
+				writeBytes.append(b"\x00")
+				writeBytes.append(intToByte(cell))
+		lineBytes = b"".join(writeBytes) + cellPadding	
+		# log.info("senden....{p}".format(p=len(lineBytes)))	
 		self._ser.write(lineBytes)
 
 	def handleResponses(self):
