Merge 13faeef into 64b6074

burmancomp · web-flow · commit 46b0964ab065 · 2023-08-18T19:22:20.000+10:00
diff --git a/source/brailleDisplayDrivers/albatross/driver.py b/source/brailleDisplayDrivers/albatross/driver.py
@@ -25,8 +25,10 @@
 	Lock,
 )
 from typing import (
+	Iterator,
 	List,
 	Optional,
+	Tuple,
 )
 
 import braille
@@ -204,11 +206,20 @@ def _initConnection(self) -> bool:
 		If no connection, Albatross sends continuously INIT_START_BYTE
 		followed by byte containing various settings like number of cells.
 
-		@return: C{True} on success, C{False} on failure
+		@raises: RuntimeError if port initialization fails
+		@return: C{True} on success, C{False} on connection failure
 		"""
 		for i in range(MAX_INIT_RETRIES):
 			if not self._dev:
-				if not self._initPort(i):
+				initState: Optional[bool] = self._initPort(i)
+				# Port initialization failed. No need to try with 9600 bps,
+				# and there is no other port to try.
+				if initState is None:
+					raise RuntimeError(
+						f"Port {self._currentPort} cannot be initialized for Albatross"
+					)
+				# I/O buffers reset failed, retried again in L{_openPort}
+				elif not initState:
 					continue
 			elif not self._dev.is_open:
 				if not self._openPort(i):
@@ -226,10 +237,11 @@ def _initConnection(self) -> bool:
 				return True
 		return False
 
-	def _initPort(self, i: int = MAX_INIT_RETRIES - 1) -> bool:
+	def _initPort(self, i: int = MAX_INIT_RETRIES - 1) -> Optional[bool]:
 		"""Initializes port.
 		@param i: Just for logging retries.
-		@return: C{True} on success, C{False} on failure
+		@return: C{True} on success, C{False} on I/O buffers reset failure,
+		C{None} on port initialization failure
 		"""
 		try:
 			self._dev = serial.Serial(
@@ -251,16 +263,8 @@ def _initPort(self, i: int = MAX_INIT_RETRIES - 1) -> bool:
 				return False
 			return True
 		except IOError:
-			if i == MAX_INIT_RETRIES - 1:
-				log.debug(f"Port {self._currentPort} not initialized", exc_info=True)
-				return False
-			log.debug(
-				f"Port {self._currentPort} not initialized, sleeping {SLEEP_TIMEOUT} seconds "
-				f"before try {i + 2} / {MAX_INIT_RETRIES}",
-				exc_info=True
-			)
-			time.sleep(SLEEP_TIMEOUT)
-			return False
+			log.debug(f"Port {self._currentPort} not initialized", exc_info=True)
+			return None
 
 	def _openPort(self, i: int = MAX_INIT_RETRIES - 1) -> bool:
 		"""Opens port.
