Skip to content

Retry read/write once if it fails #270

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
merged 1 commit into from
Jun 27, 2023
Merged

Retry read/write once if it fails #270

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 22 additions & 11 deletions library/lcd/lcd_comm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@ def openSerial(self):
if self.com_port == 'AUTO':
lcd_com_port = self.auto_detect_com_port()
if not lcd_com_port:
logger.error("Cannot find COM port automatically, please run Configuration again and select COM port manually")
logger.error(
"Cannot find COM port automatically, please run Configuration again and select COM port manually")
try:
sys.exit(0)
except:
Expand All @@ -95,12 +96,7 @@ def closeSerial(self):
pass

def WriteData(self, byteBuffer: bytearray):
try:
self.lcd_serial.write(bytes(byteBuffer))
except serial.serialutil.SerialTimeoutException:
# We timed-out trying to write to our device, slow things down.
logger.warning("(Write data) Too fast! Slow down!")

self.WriteLine(bytes(byteBuffer))

def SendLine(self, line: bytes):
if self.update_queue:
Expand All @@ -116,14 +112,29 @@ def WriteLine(self, line: bytes):
except serial.serialutil.SerialTimeoutException:
# We timed-out trying to write to our device, slow things down.
logger.warning("(Write line) Too fast! Slow down!")
except serial.serialutil.SerialException:
# Error writing data to device: close and reopen serial port, try to write again
logger.error(
"SerialException: Failed to send serial data to device. Closing and reopening COM port before retrying once.")
self.closeSerial()
self.openSerial()
self.lcd_serial.write(line)

def ReadData(self, readSize: int):
try:
response = self.lcd_serial.read(readSize)
#logger.debug("Received: [{}]".format(str(response, 'utf-8')))
except serial.serialutil.SerialException:
# We timed-out trying to read to our device, slow things down.
# logger.debug("Received: [{}]".format(str(response, 'utf-8')))
return response
except serial.serialutil.SerialTimeoutException:
# We timed-out trying to read from our device, slow things down.
logger.warning("(Read data) Too fast! Slow down!")
except serial.serialutil.SerialException:
# Error writing data to device: close and reopen serial port, try to read again
logger.error(
"SerialException: Failed to read serial data from device. Closing and reopening COM port before retrying once.")
self.closeSerial()
self.openSerial()
return self.lcd_serial.read(readSize)

@staticmethod
@abstractmethod
Expand Down Expand Up @@ -342,7 +353,7 @@ def DisplayRadialProgressBar(self, xc: int, yc: int, radius: int, bar_width: int
bar_image = bar_image.crop(box=bbox)

# Draw progress bar
pct = (value - min_value)/(max_value - min_value)
pct = (value - min_value) / (max_value - min_value)
draw = ImageDraw.Draw(bar_image)

# PIL arc method uses angles with
Expand Down