steven-y-e
/
vial
1
0
Fork 0
Code Pull Requests Releases Activity

matrix_test: don't crash when switching to another device

main
Ilya Zhuravlev 2021-05-10 13:56:55 -04:00
parent 8d56cdb191
commit 7ceb37700d
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/python/matrix_test.py
View File

@ -62,6 +62,10 @@ class MatrixTest(BasicEditor):
self.keyboardWidget.updateGeometry() self.keyboardWidget.updateGeometry()
def matrix_poller(self): def matrix_poller(self):
if not self.valid():
self.stop()
return
# Get size for matrix # Get size for matrix
rows = self.keyboard.rows rows = self.keyboard.rows
cols = self.keyboard.cols cols = self.keyboard.cols
@ -69,7 +73,12 @@ class MatrixTest(BasicEditor):
matrix = [[None] * cols for x in range(rows)] matrix = [[None] * cols for x in range(rows)]
# Get matrix data from keyboard # Get matrix data from keyboard
data = self.keyboard.matrix_poll() try:
data = self.keyboard.matrix_poll()
except (RuntimeError, ValueError):
self.stop()
return
# Calculate the amount of bytes belong to 1 row, each bit is 1 key, so per 8 keys in a row, # Calculate the amount of bytes belong to 1 row, each bit is 1 key, so per 8 keys in a row,
# a byte is needed for the row. # a byte is needed for the row.
row_size = math.ceil(cols / 8) row_size = math.ceil(cols / 8)
@ -112,7 +121,11 @@ class MatrixTest(BasicEditor):
def stop(self): def stop(self):
self.timer.stop() self.timer.stop()
self.keyboard.lock() try:
self.keyboard.lock()
except (RuntimeError, ValueError):
# if keyboard disappeared, we can't relock it
pass
self.startButtonWidget.setText("Start testing") self.startButtonWidget.setText("Start testing")
self.polling = False self.polling = False